nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-17 01:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix silly hunk misalignment.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4065 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-07-08 23:28:41 +00:00
parent fcf33c350d
commit fe4e66ee1b
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
engine/client/sys_droid.c
View file

@ -27,7 +27,7 @@ int sys_glesversion;
static void *sys_memheap; static void *sys_memheap;
static unsigned int sys_lastframe; 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) jfloat ax, jfloat ay, jfloat az)
{ {
static vec3_t oac; static vec3_t oac;
@ -46,6 +46,10 @@ JNIEXPORT void JNICALL Java_com_fteqw_FTEDroidEngine_frame(JNIEnv *env, jobject
Host_Frame(tdelta); Host_Frame(tdelta);
sys_lastframe = now; sys_lastframe = now;
#endif #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, 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; quakeparms_t parms;
if (sys_memheap) if (sys_memheap)
free(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.membase += strlen(parms.basedir)+1;
parms.memsize -= 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); Sys_Printf("Starting up (apk=%s, usr=%s)\n", args[2], parms.basedir);