[nexuiz-commits] r6458 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-08 02:21:30 -0400 (Wed, 08 Apr 2009)
New Revision: 6458

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
Log:
r6456 | div0 | 2009-04-07 15:13:04 +0200 (Tue, 07 Apr 2009) | 2 lines
use -1 as team numbers for spectators (PLEASE TEST)
r6457 | div0 | 2009-04-07 15:40:31 +0200 (Tue, 07 Apr 2009) | 2 lines
properly leave campaign state when creating a new game


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-07 13:40:31 UTC (rev 6457)
+++ branches/nexuiz-2.0/.patchsets	2009-04-08 06:21:30 UTC (rev 6458)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6454
+revisions_applied = 1-6457

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-04-07 13:40:31 UTC (rev 6457)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-04-08 06:21:30 UTC (rev 6458)
@@ -40,6 +40,7 @@
 		else if(argv(0) == "changelevel")
 		{
 			fclose(fh);
+			localcmd("\ndisconnect\nwait\ng_campaign 0\nmaxplayers $menu_maxplayers\n");
 			MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH);
 			MapInfo_LoadMap(argv(1));
 			cvar_set("lastlevel", "1");

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c	2009-04-07 13:40:31 UTC (rev 6457)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/maplist.c	2009-04-08 06:21:30 UTC (rev 6458)
@@ -273,7 +273,7 @@
 	}
 	if(MapInfo_CheckMap(m))
 	{
-		localcmd("\ndisconnect\nwait\nmaxplayers $menu_maxplayers\ng_maplist_shufflenow\n");
+		localcmd("\ndisconnect\nwait\ng_campaign 0\nmaxplayers $menu_maxplayers\ng_maplist_shufflenow\n");
 		if(cvar("menu_use_default_hostname"))
 			localcmd("hostname \"", strdecolorize(cvar_string("_cl_name")), "'s Nexuiz server\"\n");
 		MapInfo_LoadMap(m);

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-04-07 13:40:31 UTC (rev 6457)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-04-08 06:21:30 UTC (rev 6458)
@@ -565,6 +565,8 @@
 	self.oldvelocity = self.velocity;
 	self.customizeentityforclient = Client_customizeentityforclient;
 
+	self.team = -1;
+
 	if(g_arena)
 	{
 		if(self.version_mismatch)
@@ -710,6 +712,9 @@
 	if(self.classname == "player") {
 		entity spot, oldself;
 
+		if(self.team < 0)
+			JoinBestTeam(self, FALSE, TRUE);
+
 		race_PreSpawn();
 
 		spot = SelectSpawnPoint (FALSE);
@@ -978,9 +983,7 @@
 		JoinBestTeam( self, FALSE, FALSE );
 	}
 	else
-	{
 		SV_ChangeTeam(self.killindicator_teamchange - 1);
-	}
 }
 
 void ClientKill_Now()
@@ -1137,7 +1140,7 @@
 		if(destteam == -1)
 			return;
 	}
-	if(destteam == self.team && !self.killindicator)
+	if(destteam == self.team && destteam >= 0 && !self.killindicator)
 		return;
 	ClientKill_TeamChange(destteam);
 }