r5943 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-24 03:53:21 -0500 (Tue, 24 Feb 2009)
New Revision: 5943

Modified:
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/vote.qc
Log:
fix a warning, and g_grappling_hook now gives initial cells


Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-02-24 07:13:50 UTC (rev 5942)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-02-24 08:53:21 UTC (rev 5943)
@@ -934,6 +934,16 @@
 	if(start_weapons & WEPBIT_HOOK)
 	{
 		// can't have off-hand hook, if hook weapon is enabled
+
+		// note: if g_grappling_hook is 1, also give some initial cells
+		if(g_grappling_hook)
+		{
+			if(!start_ammo_cells)
+				start_ammo_cells = g_pickup_cells;
+			if(!warmup_start_ammo_cells)
+				warmup_start_ammo_cells = g_pickup_cells;
+		}
+
 		g_grappling_hook = 0;
 	}
 

Modified: trunk/data/qcsrc/server/vote.qc
===================================================================
--- trunk/data/qcsrc/server/vote.qc	2009-02-24 07:13:50 UTC (rev 5942)
+++ trunk/data/qcsrc/server/vote.qc	2009-02-24 08:53:21 UTC (rev 5943)
@@ -497,7 +497,7 @@
 	if(stopper == votecaller) {
 		// no wait for next vote so you can correct your vote
 		if(votecaller) {
-			votecaller.vote_next = time + cvar("sv_vote_stop");;
+			votecaller.vote_next = time + cvar("sv_vote_stop");
 		}
 	}
 	VoteReset();