diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-02 02:01:16 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-02 02:01:16 +0000 |
| commit | 48342c98ae336ca268ddbf5acf66bfeb0b18a91b (patch) | |
| tree | 21e9809d3a7803d23ef8afe888d06bf06ca2d2b3 /src/game/g_main.c | |
| parent | 988e67ce2a9c9eea540f6907b6fede1b70a3f3ae (diff) | |
* Conditionals in the map rotation now work
* Voting for "nextmap" plays nice with old and new map rotation systems
Diffstat (limited to 'src/game/g_main.c')
| -rw-r--r-- | src/game/g_main.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/game/g_main.c b/src/game/g_main.c index 31b45e09..23677497 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -89,6 +89,7 @@ vmCvar_t g_alienStage3Threshold; vmCvar_t g_debugMapRotation; vmCvar_t g_currentMapRotation; vmCvar_t g_currentMap; +vmCvar_t g_initialMapRotation; static cvarTable_t gameCvarTable[ ] = { @@ -168,6 +169,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_debugMapRotation, "g_debugMapRotation", "0", 0, 0, qfalse }, { &g_currentMapRotation, "g_currentMapRotation", "-1", 0, 0, qfalse }, // -1 = NOT_ROTATING { &g_currentMap, "g_currentMap", "0", 0, 0, qfalse }, + { &g_initialMapRotation, "g_initialMapRotation", "", CVAR_ARCHIVE, 0, qfalse }, { &g_rankings, "g_rankings", "0", 0, 0, qfalse} }; @@ -1307,7 +1309,8 @@ void CheckExitRules( void ) ( level.numAlienSpawns == 0 ) && ( level.numLiveAlienClients == 0 ) ) { - //aliens lose + //humans win + level.lastWin = PTE_HUMANS; trap_SendServerCommand( -1, "print \"Humans win.\n\""); LogExit( "Humans win." ); return; @@ -1316,7 +1319,8 @@ void CheckExitRules( void ) ( level.numHumanSpawns == 0 ) && ( level.numLiveHumanClients == 0 ) ) { - //humans lose + //aliens win + level.lastWin = PTE_ALIENS; trap_SendServerCommand( -1, "print \"Aliens win.\n\""); LogExit( "Aliens win." ); return; @@ -1347,7 +1351,12 @@ void CheckVote( void ) if( level.voteExecuteTime && level.voteExecuteTime < level.time ) { level.voteExecuteTime = 0; - trap_SendConsoleCommand( EXEC_APPEND, va( "%s\n", level.voteString ) ); + + //SUPAR HAK + if( !Q_stricmp( level.voteString, "vstr nextmap" ) ) + LogExit( "Vote for next map." ); + else + trap_SendConsoleCommand( EXEC_APPEND, va( "%s\n", level.voteString ) ); } if( !level.voteTime ) |