vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Fixed mp_timelimit! Thanks to wastelandpanda for reporting this.

Browse source
This commit is contained in:
Marco Cawthorne 2018-01-29 20:32:00 -08:00
parent 0eaf9f5bc3
commit 4b3ef40880
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Source/Server/Timer.c
View file

@ -52,23 +52,25 @@ void Timer_Update( void ) {
static float fVoxTimer;
// This map has been played enough we think
if ( cvar( "mp_timelimit" ) > 0 ) {
if ( autocvar_sv_voxannounce == TRUE ) {
if ( fVoxTimer > time ) {
return;
}
float fTimeLeft = ( cvar( "mp_timelimit" ) * 60 ) - time;
for ( int i = 0; i <= 10; i++ ) {
if ( rint( fTimeLeft ) == ( i * 60 ) ) {
Vox_Broadcast( sprintf( "%s minutes remaining", Vox_TimeToString( fTimeLeft / 60 ) ) );
fVoxTimer = time + 10.0f;
if ( fGameState != GAME_OVER ) {
if ( cvar( "mp_timelimit" ) > 0 ) {
if ( autocvar_sv_voxannounce == TRUE ) {
if ( fVoxTimer > time ) {
return;
}
float fTimeLeft = ( cvar( "mp_timelimit" ) * 60 ) - time;
for ( int i = 0; i <= 10; i++ ) {
if ( rint( fTimeLeft ) == ( i * 60 ) ) {
Vox_Broadcast( sprintf( "%s minutes remaining", Vox_TimeToString( fTimeLeft / 60 ) ) );
fVoxTimer = time + 10.0f;
}
}
}
}
if ( time >= ( cvar( "mp_timelimit" ) * 60 ) ) {
Timer_Begin( 5, GAME_OVER );
if ( time >= ( cvar( "mp_timelimit" ) * 60 ) ) {
Timer_Begin( 5, GAME_OVER );
}
}
}

BIN
freecs/progs.dat
View file

Binary file not shown.