From 7f8bdb4cfa29e7353162bd737e0eea06073580fb Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Wed, 9 Oct 2013 01:00:24 +0000
Subject: [PATCH] fix non-windows ports.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4503 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/m_mp3.c     | 6 +++---
 engine/client/pr_csqc.c   | 4 ++++
 engine/client/sys_droid.c | 2 +-
 engine/common/zone.c      | 9 ++++++++-
 engine/server/sv_init.c   | 2 ++
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c
index 11e750853..f49d7810e 100644
--- a/engine/client/m_mp3.c
+++ b/engine/client/m_mp3.c
@@ -196,7 +196,7 @@ void Media_EndedTrack(void)
 	cdplayingtrack = 0;
 	cdpausedtrack = 0;
 
-	if (cdloopingtrack)
+	if (*cdloopingtrack)
 		Media_BackgroundTrack(cdloopingtrack, cdloopingtrack);
 }
 
@@ -536,9 +536,9 @@ void CD_f (void)
 	{
 		Con_Printf("%u tracks\n", cdnumtracks);
 		if (cdplayingtrack > 0)
-			Con_Printf("Currently %s track %u\n", cdloopingtrack ? "looping" : "playing", cdplayingtrack);
+			Con_Printf("Currently %s track %u\n", *cdloopingtrack ? "looping" : "playing", cdplayingtrack);
 		else if (cdpausedtrack > 0)
-			Con_Printf("Paused %s track %u\n", cdloopingtrack ? "looping" : "playing", cdpausedtrack);
+			Con_Printf("Paused %s track %u\n", *cdloopingtrack ? "looping" : "playing", cdpausedtrack);
 		return;
 	}
 }
diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c
index e2e458704..3228d27fa 100644
--- a/engine/client/pr_csqc.c
+++ b/engine/client/pr_csqc.c
@@ -835,6 +835,7 @@ static void QCBUILTIN PF_R_DynamicLight_Set(pubprogfuncs_t *prinst, struct globa
 		else
 			l->cubetexture = r_nulltex;
 		break;
+#ifdef RTLIGHTS
 	case lfield_ambientscale:
 		l->lightcolourscales[0] = G_FLOAT(OFS_PARM2);
 		break;
@@ -844,6 +845,7 @@ static void QCBUILTIN PF_R_DynamicLight_Set(pubprogfuncs_t *prinst, struct globa
 	case lfield_specularscale:
 		l->lightcolourscales[2] = G_FLOAT(OFS_PARM2);
 		break;
+#endif
 	default:
 		break;
 	}
@@ -894,6 +896,7 @@ static void QCBUILTIN PF_R_DynamicLight_Get(pubprogfuncs_t *prinst, struct globa
 	case lfield_cubemapname:
 		RETURN_TSTRING(l->cubemapname);
 		break;
+#ifdef RTLIGHTS
 	case lfield_ambientscale:
 		G_FLOAT(OFS_RETURN) = l->lightcolourscales[0];
 		break;
@@ -903,6 +906,7 @@ static void QCBUILTIN PF_R_DynamicLight_Get(pubprogfuncs_t *prinst, struct globa
 	case lfield_specularscale:
 		G_FLOAT(OFS_RETURN) = l->lightcolourscales[2];
 		break;
+#endif
 	default:
 		G_INT(OFS_RETURN) = 0;
 		break;
diff --git a/engine/client/sys_droid.c b/engine/client/sys_droid.c
index 92cefb28b..09bcd028a 100644
--- a/engine/client/sys_droid.c
+++ b/engine/client/sys_droid.c
@@ -131,7 +131,7 @@ JNIEXPORT jint JNICALL Java_com_fteqw_FTEDroidEngine_frame(JNIEnv *env, jobject
 	#endif
 
 	ret = 0;
-	if (key_dest == key_console || key_dest == key_message || (key_dest == key_game && cls.state == ca_disconnected) || sys_osk.ival)
+	if (Key_Dest_Has(kdm_console|kdm_message) || (!Key_Dest_Has(~kdm_game) && cls.state == ca_disconnected) || sys_osk.ival)
 		ret |= 1;
 	if (vibrateduration)
 		ret |= 2;
diff --git a/engine/common/zone.c b/engine/common/zone.c
index e738d25de..8e7db6ef5 100644
--- a/engine/common/zone.c
+++ b/engine/common/zone.c
@@ -186,7 +186,14 @@ void *Z_MallocNamed(int size, char *file, int line)
 #else
 void *ZF_Malloc(int size)
 {
-#ifdef __linux__
+#ifdef ANDROID
+	void *ret = NULL;
+	//android is linux, but not gnu and thus not posix...
+	ret = memalign(max(sizeof(float)*4, sizeof(void*)), size);
+	if (ret)
+		memset(ret, 0, size);
+	return ret;
+#elif defined(__linux__)
 	void *ret = NULL;
 	if (!posix_memalign(&ret, max(sizeof(float)*4, sizeof(void*)), size))
 		memset(ret, 0, size);
diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c
index 14455c9bc..db5feff8f 100644
--- a/engine/server/sv_init.c
+++ b/engine/server/sv_init.c
@@ -1503,10 +1503,12 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
 			}
 		}
 	}
+#ifdef Q3SERVER
 	if (svs.gametype == GT_QUAKE3)
 	{
 		SVQ3_NewMapConnects();
 	}
+#endif
 
 	FS_ReferenceControl(0, 0);