From fe4e66ee1b02f33b2e9bf1492be8f499b148d15c Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 8 Jul 2012 23:28:41 +0000 Subject: [PATCH] Fix silly hunk misalignment. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4065 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/sys_droid.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/engine/client/sys_droid.c b/engine/client/sys_droid.c index 37dd735ab..cc4912b09 100644 --- a/engine/client/sys_droid.c +++ b/engine/client/sys_droid.c @@ -27,7 +27,7 @@ int sys_glesversion; static void *sys_memheap; static unsigned int sys_lastframe; -JNIEXPORT void JNICALL Java_com_fteqw_FTEDroidEngine_frame(JNIEnv *env, jobject obj, +JNIEXPORT int JNICALL Java_com_fteqw_FTEDroidEngine_frame(JNIEnv *env, jobject obj, jfloat ax, jfloat ay, jfloat az) { static vec3_t oac; @@ -46,6 +46,10 @@ JNIEXPORT void JNICALL Java_com_fteqw_FTEDroidEngine_frame(JNIEnv *env, jobject Host_Frame(tdelta); sys_lastframe = now; #endif + + if (key_dest == key_console || key_dest == key_message) + return 1; + return 0; } JNIEXPORT void JNICALL Java_com_fteqw_FTEDroidEngine_init(JNIEnv *env, jobject obj, @@ -67,6 +71,7 @@ JNIEXPORT void JNICALL Java_com_fteqw_FTEDroidEngine_init(JNIEnv *env, jobject o "", "" }; + int align; quakeparms_t parms; if (sys_memheap) free(sys_memheap); @@ -96,6 +101,14 @@ JNIEXPORT void JNICALL Java_com_fteqw_FTEDroidEngine_init(JNIEnv *env, jobject o parms.membase += strlen(parms.basedir)+1; parms.memsize -= strlen(parms.basedir)+1; + align = (int)parms.membase & 15; + if (align) + { + align = 16-align; + parms.membase += align; + parms.memsize -= align; + } + Sys_Printf("Starting up (apk=%s, usr=%s)\n", args[2], parms.basedir);