X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=android%2Fsrc%2Forg%2Fd2df%2Fapp%2FDoom2DF.java;h=47220cbd80278d638d80b7320584d5ea71fa83dc;hp=4f7b00d82d370c77394ae50cb8b541a7285dbdf5;hb=0d9765413a5600fb512aeb6c926a22a9a3768c82;hpb=313488322d2a198aaf0f4d272ca6ef9d1718f132 diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java index 4f7b00d..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,38 +9,46 @@ import org.libsdl.app.SDLActivity; public class Doom2DF extends SDLActivity { - @Override - protected String[] getLibraries() { - return new String[] { - "crystax", - "SDL2", - "mpg123", - "SDL2_mixer", - "enet", - "miniupnpc", - "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); - } + @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); + } }