From 032e03c56365941c1c6c21a30b931b01c3b137b2 Mon Sep 17 00:00:00 2001
From: Richard Allen <ra@ra.is>
Date: Wed, 8 Jul 2009 21:07:47 +0000
Subject: [PATCH] Collision with SDL's g_log fixed

---
 reaction/code/game/bg_pmove.c |  2 +-
 reaction/code/game/g_local.h  |  2 ++
 reaction/code/game/g_main.c   | 18 +++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/reaction/code/game/bg_pmove.c b/reaction/code/game/bg_pmove.c
index bb4f0b04..403b32a8 100644
--- a/reaction/code/game/bg_pmove.c
+++ b/reaction/code/game/bg_pmove.c
@@ -160,7 +160,7 @@ pml_t pml;
 #define PM_LADDER_MOVE_REDUCTION	10
 
 #define STOP_EPSILON 0.1f
-//#define Q2PHYSICS
+#define Q2PHYSICS
 
 // movement parameters
 float pm_stopspeed = 100.0f;
diff --git a/reaction/code/game/g_local.h b/reaction/code/game/g_local.h
index 6a880e61..0c8775c5 100644
--- a/reaction/code/game/g_local.h
+++ b/reaction/code/game/g_local.h
@@ -1554,6 +1554,8 @@ extern vmCvar_t g_RQ3_giveMeWhatsMine;
 void trap_Printf(const char *fmt);
 void trap_Error(const char *fmt);
 int trap_Milliseconds(void);
+// JBravo: adding missing trap
+int trap_RealTime(qtime_t *qtime);
 int trap_Argc(void);
 void trap_Argv(int n, char *buffer, int bufferLength);
 void trap_Args(char *buffer, int bufferLength);
diff --git a/reaction/code/game/g_main.c b/reaction/code/game/g_main.c
index d79c9055..4eac160f 100644
--- a/reaction/code/game/g_main.c
+++ b/reaction/code/game/g_main.c
@@ -496,8 +496,8 @@ vmCvar_t g_synchronousClients;
 vmCvar_t g_warmup;
 vmCvar_t g_doWarmup;
 vmCvar_t g_restarted;
-vmCvar_t g_log;
-vmCvar_t g_logSync;
+vmCvar_t g_logfile;
+vmCvar_t g_logfileSync;
 vmCvar_t g_blood;
 vmCvar_t g_podiumDist;
 vmCvar_t g_podiumDrop;
@@ -631,8 +631,8 @@ static cvarTable_t gameCvarTable[] = {
 	{&g_teamForceBalance, "g_teamForceBalance", "0", CVAR_ARCHIVE},
 	{&g_warmup, "g_warmup", "20", CVAR_ARCHIVE, 0, qtrue},
 	{&g_doWarmup, "g_doWarmup", "0", 0, 0, qtrue},
-	{&g_log, "g_log", "reaction.log", CVAR_ARCHIVE, 0, qfalse},
-	{&g_logSync, "g_logSync", "0", CVAR_ARCHIVE, 0, qfalse},
+	{&g_logfile, "g_logfile", "reaction.log", CVAR_ARCHIVE, 0, qfalse},
+	{&g_logfileSync, "g_logfileSync", "0", CVAR_ARCHIVE, 0, qfalse},
 	{&g_password, "g_password", "", CVAR_USERINFO, 0, qfalse},
 	{&g_banIPs, "g_banIPs", "", CVAR_ARCHIVE, 0, qfalse},
 	{&g_filterBan, "g_filterBan", "1", CVAR_ARCHIVE, 0, qfalse},
@@ -1344,14 +1344,14 @@ void G_InitGame(int levelTime, int randomSeed, int restart)
 
 	level.snd_fry = G_SoundIndex("sound/player/fry.wav");	// FIXME standing in lava / slime
 
-	if (g_gametype.integer != GT_SINGLE_PLAYER && g_log.string[0]) {
-		if (g_logSync.integer) {
-			trap_FS_FOpenFile(g_log.string, &level.logFile, FS_APPEND_SYNC);
+	if (g_gametype.integer != GT_SINGLE_PLAYER && g_logfile.string[0]) {
+		if (g_logfileSync.integer) {
+			trap_FS_FOpenFile(g_logfile.string, &level.logFile, FS_APPEND_SYNC);
 		} else {
-			trap_FS_FOpenFile(g_log.string, &level.logFile, FS_APPEND);
+			trap_FS_FOpenFile(g_logfile.string, &level.logFile, FS_APPEND);
 		}
 		if (!level.logFile) {
-			G_Printf("WARNING: Couldn't open logfile: %s\n", g_log.string);
+			G_Printf("WARNING: Couldn't open logfile: %s\n", g_logfile.string);
 		} else {
 			char serverinfo[MAX_INFO_STRING];