vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XashActivity: move loadLibrary call after setting up all envvars.

Browse source
This commit is contained in:
Alibek Omarov (a1batross) 2017-03-02 21:33:27 +03:00
parent dd1607f261
commit 4bfd57037b
1 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/in/celest/xash3d/XashActivity.java
View file

@ -75,11 +75,6 @@ public class XashActivity extends Activity {
private static String SIG = "DMsE8f5hlR7211D8uehbFpbA0n8="; private static String SIG = "DMsE8f5hlR7211D8uehbFpbA0n8=";
private static String SIG_TEST = ""; // a1ba: mittorn, add your signature later private static String SIG_TEST = ""; // a1ba: mittorn, add your signature later
// Load the .so
static {
System.loadLibrary("xash");
}
// Shared between this activity and LauncherActivity // Shared between this activity and LauncherActivity
public static boolean dumbAntiPDALifeCheck( Context context ) public static boolean dumbAntiPDALifeCheck( Context context )
{ {
@ -151,28 +146,12 @@ public class XashActivity extends Activity {
// keep screen on // keep screen on
getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
// Set up the surface
mSurface = new EngineSurface(getApplication());
if( sdk < 12 )
handler = new JoystickHandler();
else
handler = new JoystickHandler_v12();
handler.init();
mLayout = new FrameLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
// setup envs // setup envs
mPref = this.getSharedPreferences("engine", 0); mPref = this.getSharedPreferences("engine", 0);
String argv = intent.getStringExtra("argv"); String argv = intent.getStringExtra("argv");
if(argv == null) argv = mPref.getString("argv", "-dev 3 -log"); if(argv == null)
if(argv == null) argv = "-dev 3 -log"; argv = mPref.getString("argv", "-dev 3 -log");
mArgv= argv.split(" "); mArgv = argv.split(" ");
String gamelibdir = intent.getStringExtra("gamelibdir"); String gamelibdir = intent.getStringExtra("gamelibdir");
if(gamelibdir == null) if(gamelibdir == null)
@ -191,27 +170,32 @@ public class XashActivity extends Activity {
setenv("XASH3D_GAMELIBDIR", gamelibdir, true); setenv("XASH3D_GAMELIBDIR", gamelibdir, true);
setenv("XASH3D_GAMEDIR", gamedir, true); setenv("XASH3D_GAMEDIR", gamedir, true);
setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true); setenv("XASH3D_EXTRAS_PAK1", getFilesDir().getPath() + "/extras.pak", true);
String pakfile = intent.getStringExtra("pakfile"); String pakfile = intent.getStringExtra("pakfile");
if( pakfile != null && pakfile != "" ) if( pakfile != null && pakfile != "" )
setenv("XASH3D_EXTRAS_PAK2", pakfile, true); setenv("XASH3D_EXTRAS_PAK2", pakfile, true);
String[] env = intent.getStringArrayExtra("env"); String[] env = intent.getStringArrayExtra("env");
try if( env != null )
{ {
if( env != null ) try
for(int i = 0; i+1 < env.length; i+=2)
{ {
setenv(env[i],env[i+1], true); for(int i = 0; i+1 < env.length; i+=2)
{
setenv(env[i],env[i+1], true);
}
}
catch(Exception e)
{
e.printStackTrace();
} }
} }
catch(Exception e) // HACKHACK: Call it here, so JNI_OnLoad will have proper envvars
{ // Don't call ANYTHING native before onCreate finish, otherwise you will get a link exception!
e.printStackTrace(); System.loadLibrary("xash");
}
InstallReceiver.extractPAK(this, false); InstallReceiver.extractPAK(this, false);
mPixelFormat = mPref.getInt("pixelformat", 0); mPixelFormat = mPref.getInt("pixelformat", 0);
mUseVolume = mPref.getBoolean("usevolume", false); mUseVolume = mPref.getBoolean("usevolume", false);
if( mPref.getBoolean("enableResizeWorkaround", true) ) if( mPref.getBoolean("enableResizeWorkaround", true) )
@ -222,6 +206,22 @@ public class XashActivity extends Activity {
if( mEnableImmersive ) if( mEnableImmersive )
mImmersiveMode = new ImmersiveMode_v19(); mImmersiveMode = new ImmersiveMode_v19();
mDecorView = getWindow().getDecorView(); mDecorView = getWindow().getDecorView();
// Set up the surface
mSurface = new EngineSurface(getApplication());
mLayout = new FrameLayout(this);
mLayout.addView(mSurface);
setContentView(mLayout);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
if( sdk < 12 )
handler = new JoystickHandler();
else
handler = new JoystickHandler_v12();
handler.init();
} }
// Events // Events