okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* (bug 3076) Map cycle breaks on empty or bot only servers (misanthropia)

Browse source 
* (bug 3303) Removal of never compiled code from cgame drawing functions (beast 
  <info@dbwatersports.com>)
* (bug 3297) Add missing limit to Q3 UI server info (beast
  <info@dbwatersports.com>)
* (bug 3029) Fix to shader hash table being overpopulated (identified by
  Stefan "#@" Langer <raute_at@gmx.de>)
This commit is contained in:
Tim Angus 2007-08-23 00:22:20 +00:00
parent 557bb5a1ce
commit 5e35d88b9b
4 changed files with 52 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

25
code/game/g_main.c
View file

@ -1189,7 +1189,7 @@ wait 10 seconds before going on.
=================
*/
void CheckIntermissionExit( void ) {
int ready, notReady;
int ready, notReady, playerCount;
int i;
gclient_t *cl;
int readyMask;
@ -1202,6 +1202,7 @@ void CheckIntermissionExit( void ) {
ready = 0;
notReady = 0;
readyMask = 0;
playerCount = 0;
for (i=0 ; i< g_maxclients.integer ; i++) {
cl = level.clients + i;
if ( cl->pers.connected != CON_CONNECTED ) {
@ -1211,6 +1212,7 @@ void CheckIntermissionExit( void ) {
continue;
}
playerCount++;
if ( cl->readyToExit ) {
ready++;
if ( i < 16 ) {
@ -1236,16 +1238,19 @@ void CheckIntermissionExit( void ) {
return;
}
// if nobody wants to go, clear timer
if ( !ready ) {
level.readyToExit = qfalse;
return;
}
// only test ready status when there are real players present
if ( playerCount > 0 ) {
// if nobody wants to go, clear timer
if ( !ready ) {
level.readyToExit = qfalse;
return;
}
// if everyone wants to go, go now
if ( !notReady ) {
ExitLevel();
return;
// if everyone wants to go, go now
if ( !notReady ) {
ExitLevel();
return;
}
}
// the first person to ready starts the ten second timeout