RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-11 14:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix and rework launch

Browse Source
This commit is contained in:
mittorn
2016-05-06 14:58:09 +00:00
parent 126433c42c
commit aeee1419a2
7 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/in/celest/xash3d/XashActivity.java
+14 -20
View File
@@ -28,7 +28,7 @@ public class XashActivity extends Activity {
// Main components
protected static XashActivity mSingleton;
private static EngineSurface mSurface;
private static String mArgv[];
public static String mArgv[];
public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
// Preferences
@@ -44,18 +44,18 @@ public class XashActivity extends Activity {
// Setup
protected void onCreate(Bundle savedInstanceState) {
//Log.v("SDL", "onCreate()");
super.onCreate(savedInstanceState);
//Log.v("SDL", "onCreate()");
super.onCreate(savedInstanceState);
// So we can call stuff from static callbacks
mSingleton = this;
Intent intent = getIntent();
// mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
// Set up the surface
mSurface = new EngineSurface(getApplication());
setContentView(mSurface);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
// So we can call stuff from static callbacks
mSingleton = this;
Intent intent = getIntent();
// mArgv = intent.getStringExtra(in.celest.xash3d.LauncherActivity.ARGV);
// Set up the surface
mSurface = new EngineSurface(getApplication());
setContentView(mSurface);
SurfaceHolder holder = mSurface.getHolder();
holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
mPref = this.getSharedPreferences("engine", 0);
String argv = intent.getStringExtra("argv");
if(argv == null) argv = mPref.getString("argv", "-dev 3 -log");
@@ -126,12 +126,6 @@ public class XashActivity extends Activity {
msg.obj = data;
commandHandler.sendMessage(msg);
}
public static String[] getArguments()
{
return "-dev 5 -log +map crossfire -noch +deathmatch 1 +map crossfire".split(" ");
}
// C functions we call
public static native int nativeInit(Object arguments);
public static native void nativeQuit();
@@ -274,7 +268,7 @@ class XashMain implements Runnable {
XashActivity.createGLContext();
XashActivity.nativeInit(XashActivity.getArguments());
XashActivity.nativeInit(XashActivity.mArgv);
//Log.v("SDL", "SDL thread terminated");
}
@@ -310,7 +304,7 @@ View.OnKeyListener {
requestFocus();
setOnKeyListener(this);
if( XashActivity.sdk >= 5 )
setOnTouchListener(new EngineTouchListener_v5());
setOnTouchListener(new EngineTouchListener_v5());
else
setOnTouchListener(new EngineTouchListener_v1());
}