diff options
author | Tim Angus <tim@ngus.net> | 2005-07-28 15:23:13 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2005-07-28 15:23:13 +0000 |
commit | 34ef13ee1769a3ec5fd6f93394f8903c9f5570ea (patch) | |
tree | 49aa021f596113b1a5e2e92aa12c86d07efea67d /src/game | |
parent | 3b81f6766f4042b5ec01379d92badf0a0e094405 (diff) |
* Extended the chat period at the end of games
* Disabled the anticamp trigger when you buy a weapon
* Fixed bug where the "Ready" text would render over the icons on the final scoreboard
* Changed the testmodel code to render gun barrels
Diffstat (limited to 'src/game')
-rw-r--r-- | src/game/g_cmds.c | 4 | ||||
-rw-r--r-- | src/game/g_main.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 3cfee5c0..3a826333 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1665,8 +1665,8 @@ void Cmd_Buy_f( gentity_t *ent ) ent->client->ps.stats[ STAT_MISC ] = 0; //prevent filling up ammo again soon - ent->client->lastBoughtAmmoTime = level.time; - ent->client->campingAtTheArmoury = qtrue; + //ent->client->lastBoughtAmmoTime = level.time; + //ent->client->campingAtTheArmoury = qtrue; //subtract from funds G_AddCreditToClient( ent->client, -(short)BG_FindPriceForWeapon( weapon ), qfalse ); diff --git a/src/game/g_main.c b/src/game/g_main.c index 14ec7d58..dc4a3064 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -1529,16 +1529,16 @@ void CheckIntermissionExit( void ) return; } - // the first person to ready starts the ten second timeout + // the first person to ready starts the thirty second timeout if( !level.readyToExit ) { level.readyToExit = qtrue; level.exitTime = level.time; } - // if we have waited ten seconds since at least one player + // if we have waited thirty seconds since at least one player // wanted to exit, go ahead - if( level.time < level.exitTime + 10000 ) + if( level.time < level.exitTime + 30000 ) return; ExitLevel( ); |