r4597 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-03 06:06:10 -0400 (Fri, 03 Oct 2008)
New Revision: 4597

Modified:
   trunk/data/qcsrc/server/cl_weapons.qc
   trunk/data/qcsrc/server/keyhunt.qc
   trunk/data/qcsrc/server/mode_onslaught.qc
Log:
warning fixes


Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc	2008-10-03 10:04:14 UTC (rev 4596)
+++ trunk/data/qcsrc/server/cl_weapons.qc	2008-10-03 10:06:10 UTC (rev 4597)
@@ -157,7 +157,7 @@
 float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector velo)
 {
 	entity oldself, wep;
-	float wa, ammo;
+	float wa, thisammo;
 	var .float ammofield;
 
 	wep = spawn();
@@ -194,9 +194,9 @@
 			return -1;
 		if(doreduce)
 		{
-			ammo = min(own.ammofield, wep.ammofield);
-			wep.ammofield = ammo;
-			own.ammofield -= ammo;
+			thisammo = min(own.ammofield, wep.ammofield);
+			wep.ammofield = thisammo;
+			own.ammofield -= thisammo;
 		}
 		wep.think = thrown_wep_think;
 		wep.nextthink = time + 0.5;

Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc	2008-10-03 10:04:14 UTC (rev 4596)
+++ trunk/data/qcsrc/server/keyhunt.qc	2008-10-03 10:06:10 UTC (rev 4597)
@@ -314,7 +314,7 @@
 				WaypointSprite_UpdateSprites(player.waypointsprite_attachedforcarrier, "keycarrier-yellow", "keycarrier-friend", "");
 			else if(player.team == COLOR_TEAM4)
 				WaypointSprite_UpdateSprites(player.waypointsprite_attachedforcarrier, "keycarrier-pink", "keycarrier-friend", "");
-			WaypointSprite_UpdateTeamRadar(player.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, colormapPaletteColor(player.team - 1));
+			WaypointSprite_UpdateTeamRadar(player.waypointsprite_attachedforcarrier, RADARICON_FLAGCARRIER, colormapPaletteColor(player.team - 1, 0));
 			if(!kh_no_radar_circles)
 				WaypointSprite_Ping(player.waypointsprite_attachedforcarrier);
 		}
@@ -468,9 +468,6 @@
 
 void kh_Key_Collect(entity key, entity player)  //a player picks up a dropped key
 {
-	float ownerteam;
-	entity k;
-
 	sound(player, CHAN_AUTO, kh_sound_collect, VOL_BASE, ATTN_NORM);
 
 	if(key.kh_dropperteam != player.team)

Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc	2008-10-03 10:04:14 UTC (rev 4596)
+++ trunk/data/qcsrc/server/mode_onslaught.qc	2008-10-03 10:06:10 UTC (rev 4597)
@@ -9,10 +9,12 @@
 .float isshielded;
 .float lasthealth;
 
+#ifdef YOU_HAVE_FIXED_ONSLAUGHT_WAYPOINTS
 float ons_sprite_cp_red, ons_sprite_cp_blue, ons_sprite_cp_neut;
 float ons_sprite_cp_atck_red, ons_sprite_cp_atck_blue, ons_sprite_cp_atck_neut;
 float ons_sprite_cp_dfnd_red, ons_sprite_cp_dfnd_blue;
 float ons_sprite_gen_red, ons_sprite_gen_blue, ons_sprite_gen_shielded;
+#endif
 
 void onslaught_updatelinks()
 {