X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fsrc%2Forg%2Fd2df%2Fapp%2FDoom2DF.java;h=fe9bc1531694ead501903c37ab48d8deb15a1136;hb=5c6d35a607a760b6ff6623247db43a42f775fff7;hp=0c1aa21b4fa1e05bd24482758b81fd9f97e89568;hpb=92b319e1feed5079e42c779aa49b12ffa8672f54;p=d2df-sdl.git

diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index 0c1aa21..fe9bc15 100644
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -3,6 +3,7 @@ package org.d2df.app;
 import android.app.Activity;
 import android.os.Bundle;
 
+import org.libsdl.app.SDL;
 import org.libsdl.app.SDLActivity;
 
 public class Doom2DF extends SDLActivity {
@@ -11,10 +12,32 @@ public class Doom2DF extends SDLActivity {
 	protected String[] getLibraries() {
 		return new String[] {
 			"SDL2",
+			"mpg123",
 			"SDL2_mixer",
 			"enet",
-			"nanoGL",
 			"Doom2DF"
 		};
 	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		CopyAssets.copyAssets(SDL.getContext(), "");
+		CopyAssets.copyAssets(SDL.getContext(), "data");
+		CopyAssets.copyAssets(SDL.getContext(), "data/models");
+		CopyAssets.copyAssets(SDL.getContext(), "maps");
+		CopyAssets.copyAssets(SDL.getContext(), "maps/megawads");
+		CopyAssets.copyAssets(SDL.getContext(), "wads");
+		CopyAssets.copyAssets(SDL.getContext(), "instruments");
+		CopyAssets.copyAssets(SDL.getContext(), "timidity.cfg");
+	}
+
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+
+		/* This will fix bug #31 and may be #32 */
+		System.exit(0);
+	}
 }