X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fsrc%2Forg%2Fd2df%2Fapp%2FDoom2DF.java;h=47220cbd80278d638d80b7320584d5ea71fa83dc;hb=f9d99d6e5b67984253827ecf73be6f34a67d1a7c;hp=ca1766609ac4b4a689bca384dba7db7d0a530ff8;hpb=defbc8a87bbfc67290bdbe413be9b58c27f20b53;p=d2df-sdl.git

diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index ca17666..47220cb 100644
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -1,5 +1,6 @@
 package org.d2df.app;
 
+import android.content.Intent;
 import android.app.Activity;
 import android.os.Bundle;
 
@@ -8,26 +9,46 @@ import org.libsdl.app.SDLActivity;
 
 public class Doom2DF extends SDLActivity {
 
-	@Override
-	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");
-	}
+  @Override
+  protected String[] getLibraries () {
+    return new String[] {
+      "crystax",
+      "SDL2",
+      "mpg123",
+      "SDL2_mixer",
+      "enet",
+      "miniupnpc",
+      "Doom2DF"
+    };
+  }
+
+  @Override
+  protected String[] getArguments () {
+    Intent intent = getIntent();
+    String value = intent.getStringExtra(Launcher.prefArgs);
+    String[] args = value.split("\\s+");
+    return args;
+  }
+
+  @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);
+  }
 }