From d37536edf4660f3c46e4876b6d72e9a200549ffe Mon Sep 17 00:00:00 2001 From: tma Date: Wed, 5 Sep 2007 18:17:46 +0000 Subject: * Merge unified-sdl to trunk * Bump Q3_VERSION to 1.35 git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/game/ai_chat.c | 2 +- code/game/ai_dmq3.c | 1 - code/game/ai_main.c | 3 --- code/game/bg_lib.c | 9 ++------- code/game/bg_misc.c | 2 +- code/game/g_arenas.c | 2 +- code/game/g_bot.c | 1 - code/game/g_client.c | 2 +- code/game/g_main.c | 4 +--- code/game/g_mem.c | 2 +- code/game/g_session.c | 9 +++------ 11 files changed, 11 insertions(+), 26 deletions(-) (limited to 'code/game') diff --git a/code/game/ai_chat.c b/code/game/ai_chat.c index a513748..a55cbea 100644 --- a/code/game/ai_chat.c +++ b/code/game/ai_chat.c @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "match.h" //string matching types and vars // for the voice chats -#ifdef MISSIONPACK // bk001205 +#ifdef MISSIONPACK #include "../../ui/menudef.h" #endif diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c index 040dff5..894e295 100644 --- a/code/game/ai_dmq3.c +++ b/code/game/ai_dmq3.c @@ -3751,7 +3751,6 @@ void BotMapScripts(bot_state_t *bs) { BotSetMovedir ================== */ -// bk001205 - made these static static vec3_t VEC_UP = {0, -1, 0}; static vec3_t MOVEDIR_UP = {0, 0, 1}; static vec3_t VEC_DOWN = {0, -2, 0}; diff --git a/code/game/ai_main.c b/code/game/ai_main.c index b0cfd70..0250dd9 100644 --- a/code/game/ai_main.c +++ b/code/game/ai_main.c @@ -1626,9 +1626,6 @@ int BotInitLibrary(void) { //game directory trap_Cvar_VariableStringBuffer("fs_game", buf, sizeof(buf)); if (strlen(buf)) trap_BotLibVarSet("gamedir", buf); - //cd directory - trap_Cvar_VariableStringBuffer("fs_cdpath", buf, sizeof(buf)); - if (strlen(buf)) trap_BotLibVarSet("cddir", buf); //home directory trap_Cvar_VariableStringBuffer("fs_homepath", buf, sizeof(buf)); if (strlen(buf)) trap_BotLibVarSet("homedir", buf); diff --git a/code/game/bg_lib.c b/code/game/bg_lib.c index 997b9c9..1e65ae5 100644 --- a/code/game/bg_lib.c +++ b/code/game/bg_lib.c @@ -43,7 +43,6 @@ static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93"; static const char rcsid[] = #endif /* LIBC_SCCS and not lint */ -// bk001127 - needed for DLL's #if !defined( Q3_VM ) typedef int cmp_t(const void *, const void *); #endif @@ -189,8 +188,6 @@ loop: SWAPINIT(a, es); // this file is excluded from release builds because of intrinsics - -// bk001211 - gcc errors on compiling strcpy: parse error before `__extension__' #if defined ( Q3_VM ) size_t strlen( const char *string ) { @@ -265,7 +262,7 @@ char *strstr( const char *string, const char *strCharSet ) { } return (char *)0; } -#endif // bk001211 +#endif #if defined ( Q3_VM ) int tolower( int c ) { @@ -754,8 +751,6 @@ double atan2( double y, double x ) { #endif #ifdef Q3_VM -// bk001127 - guarded this tan replacement -// ld: undefined versioned symbol name tan@@GLIBC_2.0 double tan( double x ) { return sin(x) / cos(x); } @@ -844,7 +839,7 @@ double _atof( const char **stringPtr ) { const char *string; float sign; float value; - int c = '0'; // bk001211 - uninitialized use possible + int c = '0'; string = *stringPtr; diff --git a/code/game/bg_misc.c b/code/game/bg_misc.c index 92a1648..a6ec86e 100644 --- a/code/game/bg_misc.c +++ b/code/game/bg_misc.c @@ -1177,7 +1177,7 @@ qboolean BG_CanItemBeGrabbed( int gametype, const entityState_t *ent, const play Com_Error( ERR_DROP, "BG_CanItemBeGrabbed: IT_BAD" ); default: #ifndef Q3_VM -#ifndef NDEBUG // bk0001204 +#ifndef NDEBUG Com_Printf("BG_CanItemBeGrabbed: unknown enum %d\n", item->giType ); #endif #endif diff --git a/code/game/g_arenas.c b/code/game/g_arenas.c index 1179e6c..da96c47 100644 --- a/code/game/g_arenas.c +++ b/code/game/g_arenas.c @@ -43,7 +43,7 @@ void UpdateTournamentInfo( void ) { int playerClientNum; int n, accuracy, perfect, msglen; int buflen; -#ifdef MISSIONPACK // bk001205 +#ifdef MISSIONPACK int score1, score2; qboolean won; #endif diff --git a/code/game/g_bot.c b/code/game/g_bot.c index 2ce6fc5..4c9cf8c 100644 --- a/code/game/g_bot.c +++ b/code/game/g_bot.c @@ -43,7 +43,6 @@ typedef struct { int spawnTime; } botSpawnQueue_t; -//static int botBeginDelay = 0; // bk001206 - unused, init static botSpawnQueue_t botSpawnQueue[BOT_SPAWN_QUEUE_DEPTH]; vmCvar_t bot_minplayers; diff --git a/code/game/g_client.c b/code/game/g_client.c index 6fe017b..5414240 100644 --- a/code/game/g_client.c +++ b/code/game/g_client.c @@ -1129,7 +1129,7 @@ void ClientSpawn(gentity_t *ent) { } eventSequence = client->ps.eventSequence; - memset (client, 0, sizeof(*client)); // bk FIXME: Com_Memset? + Com_Memset (client, 0, sizeof(*client)); client->pers = saved; client->sess = savedSess; diff --git a/code/game/g_main.c b/code/game/g_main.c index f369ffc..99c1222 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -95,7 +95,6 @@ vmCvar_t g_enableBreath; vmCvar_t g_proxMineTimeout; #endif -// bk001129 - made static to avoid aliasing static cvarTable_t gameCvarTable[] = { // don't override the cheat state set by the system { &g_cheats, "sv_cheats", "", 0, 0, qfalse }, @@ -182,7 +181,6 @@ static cvarTable_t gameCvarTable[] = { }; -// bk001129 - made static to avoid aliasing static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[0] ); @@ -1118,7 +1116,7 @@ Append information about this game to the log file void LogExit( const char *string ) { int i, numSorted; gclient_t *cl; -#ifdef MISSIONPACK // bk001205 +#ifdef MISSIONPACK qboolean won = qtrue; #endif G_LogPrintf( "Exit: %s\n", string ); diff --git a/code/game/g_mem.c b/code/game/g_mem.c index 841fe2f..dbeb301 100644 --- a/code/game/g_mem.c +++ b/code/game/g_mem.c @@ -41,7 +41,7 @@ void *G_Alloc( int size ) { } if ( allocPoint + size > POOLSIZE ) { - G_Error( "G_Alloc: failed on allocation of %i bytes\n", size ); // bk010103 - was %u, but is signed + G_Error( "G_Alloc: failed on allocation of %i bytes\n", size ); return NULL; } diff --git a/code/game/g_session.c b/code/game/g_session.c index 89bceec..26a9e16 100644 --- a/code/game/g_session.c +++ b/code/game/g_session.c @@ -69,8 +69,6 @@ Called on a reconnect void G_ReadSessionData( gclient_t *client ) { char s[MAX_STRING_CHARS]; const char *var; - - // bk001205 - format int teamLeader; int spectatorState; int sessionTeam; @@ -79,16 +77,15 @@ void G_ReadSessionData( gclient_t *client ) { trap_Cvar_VariableStringBuffer( var, s, sizeof(s) ); sscanf( s, "%i %i %i %i %i %i %i", - &sessionTeam, // bk010221 - format + &sessionTeam, &client->sess.spectatorTime, - &spectatorState, // bk010221 - format + &spectatorState, &client->sess.spectatorClient, &client->sess.wins, &client->sess.losses, - &teamLeader // bk010221 - format + &teamLeader ); - // bk001205 - format issues client->sess.sessionTeam = (team_t)sessionTeam; client->sess.spectatorState = (spectatorState_t)spectatorState; client->sess.teamLeader = (qboolean)teamLeader; -- cgit v1.2.3