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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-31 09:58:49 -0400 (Tue, 31 Mar 2009)
New Revision: 6394

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
   branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
Log:
r6392 | div0 | 2009-03-31 15:37:36 +0200 (Tue, 31 Mar 2009) | 2 lines
some minor centerprint fixes
r6393 | div0 | 2009-03-31 15:57:09 +0200 (Tue, 31 Mar 2009) | 2 lines
don't spawn item_jetpack if g_grappling_hook is 1


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-31 13:57:09 UTC (rev 6393)
+++ branches/nexuiz-2.0/.patchsets	2009-03-31 13:58:49 UTC (rev 6394)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6390
+revisions_applied = 1-6393

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-03-31 13:57:09 UTC (rev 6393)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-03-31 13:58:49 UTC (rev 6394)
@@ -1975,7 +1975,8 @@
 			PutClientInServer();
 			if(!(self.flags & FL_NOTARGET))
 				bprint ("^4", self.netname, "^4 is playing now\n");
-			centerprint(self,"");
+			if(!cvar("g_campaign"))
+				centerprint(self,""); // clear MOTD
 			return;
 		} else {
 			stuffcmd(self,"menu_showteamselect\n");

Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2009-03-31 13:57:09 UTC (rev 6393)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc	2009-03-31 13:58:49 UTC (rev 6394)
@@ -1318,6 +1318,8 @@
 
 void spawnfunc_item_jetpack(void)
 {
+	if(g_grappling_hook)
+		return; // sorry, but these two can't coexist (same button)
 	if(!self.ammo_fuel)
 		self.ammo_fuel = g_pickup_fuel_jetpack;
 	StartItem ("models/items/g_jetpack.md3", "misc/itempickup.wav", g_pickup_respawntime_powerup, "Jet pack", IT_JETPACK, 0, FL_POWERUP, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);

Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2009-03-31 13:57:09 UTC (rev 6393)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2009-03-31 13:58:49 UTC (rev 6394)
@@ -373,7 +373,7 @@
 	   && !self.BUTTON_INFO)
 		return;
 
-	if( !(timeoutStatus >= 1 || (time < game_starttime) ) ) { //really print the WelcomeMessage to the player every frame when timeout-seconds are shown or the game is restarted, to make sure that the shown number is accurate
+	if( !(timeoutStatus >= 1) ) { //really print the WelcomeMessage to the player every frame when timeout-seconds are shown or the game is restarted, to make sure that the shown number is accurate
 		if(self.welcomemessage_time > time) return;
 		self.welcomemessage_time = time + self.cvar_scr_centertime * 0.6;
 	}