From b880ad5b25e530c76ca9a9a950a400877c2f96a9 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 3 Oct 2008 10:06:10 +0000 Subject: [PATCH] warning fixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4597 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weapons.qc | 8 ++++---- data/qcsrc/server/keyhunt.qc | 5 +---- data/qcsrc/server/mode_onslaught.qc | 2 ++ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/server/cl_weapons.qc b/data/qcsrc/server/cl_weapons.qc index 61eac3773..b4d8e856f 100644 --- a/data/qcsrc/server/cl_weapons.qc +++ b/data/qcsrc/server/cl_weapons.qc @@ -157,7 +157,7 @@ void thrown_wep_think() 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 @@ float W_ThrowNewWeapon(entity own, float wpn, float doreduce, vector org, vector 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; diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index b7a802086..3068f40d5 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -314,7 +314,7 @@ void kh_Key_AssignTo(entity key, entity player) // runs every time a key is pic 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 @@ float kh_Key_AllOwnedByWhichTeam() // constantly called. check to see if all th 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) diff --git a/data/qcsrc/server/mode_onslaught.qc b/data/qcsrc/server/mode_onslaught.qc index df5dede38..311fefdf9 100644 --- a/data/qcsrc/server/mode_onslaught.qc +++ b/data/qcsrc/server/mode_onslaught.qc @@ -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() { -- 2.39.2