rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-04-19 17:02:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Collision with SDL's g_log fixed

Browse source
This commit is contained in:
Richard Allen 2009-07-08 21:07:47 +00:00
parent 2ba76d233e
commit 032e03c563
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/code/game/bg_pmove.c
View file

@ -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;

2
reaction/code/game/g_local.h
View file

@ -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);

18
reaction/code/game/g_main.c
View file

@ -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];