r2849 - branches/nexuiz-2.0/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Oct 21 17:52:46 EDT 2007
Author: div0
Date: 2007-10-21 17:52:46 -0400 (Sun, 21 Oct 2007)
New Revision: 2849
Modified:
branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
Log:
minor fix
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2007-10-21 21:50:40 UTC (rev 2848)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2007-10-21 21:52:46 UTC (rev 2849)
@@ -697,6 +697,7 @@
if(cvar("g_campaign"))
{
CampaignPostIntermission();
+ alreadychangedlevel = TRUE;
return TRUE;
}
if(cvar("quit_when_empty"))
@@ -704,12 +705,14 @@
if(player_count <= currentbots)
{
localcmd("quit\n");
+ alreadychangedlevel = TRUE;
return TRUE;
}
}
if(cvar_string("quit_and_redirect") != "")
{
redirection_target = strzone(cvar_string("quit_and_redirect"));
+ alreadychangedlevel = TRUE;
return TRUE;
}
if (cvar("samelevel")) // if samelevel is set, stay on same level
@@ -719,6 +722,7 @@
// so instead just restart the current map using the restart command (DOES NOT WORK PROPERLY WITH exit_cfg STUFF)
localcmd("restart\n");
//changelevel (mapname);
+ alreadychangedlevel = TRUE;
return TRUE;
}
if(cvar_string("nextmap") != "")
@@ -726,12 +730,14 @@
{
Map_Goto_SetStr(cvar_string("nextmap"));
Map_Goto();
+ alreadychangedlevel = TRUE;
return TRUE;
}
if(cvar("lastlevel"))
{
GameResetCfg();
localcmd("set lastlevel 0\ntogglemenu\n");
+ alreadychangedlevel = TRUE;
return TRUE;
}
return FALSE;
@@ -1767,6 +1773,7 @@
Map_Goto_SetStr(mapvote_maps[mappos]);
Map_Goto();
+ alreadychangedlevel = TRUE;
return TRUE;
}
void MapVote_CheckRules_1()
@@ -1954,10 +1961,7 @@
{
mapvote_initialized = TRUE;
if(DoNextMapOverride())
- {
- alreadychangedlevel = TRUE;
return;
- }
if(!cvar("g_maplist_votable") || player_count <= 0)
{
GotoNextMap();
More information about the nexuiz-commits
mailing list