From: Rudolf Polzer Date: Wed, 27 Oct 2010 19:17:25 +0000 (+0200) Subject: more warning fixes X-Git-Tag: xonotic-v0.1.0preview~238^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7dc5d96dd162cd28fde064d3bb8e044e3b4070f4;p=xonotic%2Fxonotic-data.pk3dir.git more warning fixes --- diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index a98b70683..ac721eda1 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -59,7 +59,6 @@ var string autocvar_hud_panel_weapons_bg_border; var string autocvar_hud_panel_weapons_bg_padding; var float autocvar_hud_panel_weapons_aspect; var float autocvar_hud_panel_weapons_accuracy; -var float autocvar_hud_panel_weapons_accuracy_yellow; var float autocvar_hud_panel_weapons_ammo; var vector autocvar_hud_panel_weapons_ammo_color; var float autocvar_hud_panel_weapons_ammo_alpha; diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc index 78826f8f3..86b970c1a 100644 --- a/qcsrc/client/gibs.qc +++ b/qcsrc/client/gibs.qc @@ -153,14 +153,14 @@ void Ent_GibSplash(float isNew) org_z = ReadShort() * 4 + 2; vel = decompressShortVector(ReadShort()); - if(cvar("cl_gentle_gibs") || cvar("cl_gentle")) + if(autocvar_cl_gentle_gibs || cvar("cl_gentle")) type |= 0x80; // set gentle bit if(type & 0x80) { - if(cvar("cl_gentle_gibs") == 2) + if(autocvar_cl_gentle_gibs == 2) gentle_prefix = ""; - else if(cvar("cl_gentle_gibs") == 3) + else if(autocvar_cl_gentle_gibs == 3) gentle_prefix = "happy_"; else gentle_prefix = "morphed_"; @@ -171,7 +171,7 @@ void Ent_GibSplash(float isNew) gentle_prefix = "particlegibs_"; } - if not(cvar("cl_gentle_gibs") || cvar("cl_gentle")) + if not(autocvar_cl_gentle_gibs || cvar("cl_gentle")) amount *= 1 - cvar("cl_nogibs"); if(cvar("ekg")) diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 3494e9998..7a61b515c 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -80,14 +80,6 @@ var float panel_bg_border; var string panel_bg_border_str; var float panel_bg_padding; var string panel_bg_padding_str; -var float panel_accuracy_yellow; -var float panel_accuracy_onlycurrent; -var float panel_accuracy_flip; -var float panel_accuracy_iconalign; -var float panel_accuracy_baralign; -var float panel_accuracy_info_top; -var float panel_accuracy_foreground_alpha; -var float panel_accuracy_alreadyvoted_alpha; // Because calling lots of functions in QC apparently cuts fps in half on many machines: // ---------------------- @@ -232,7 +224,7 @@ else\ panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_panelpos; // return smoothly faded size of given panel when a dialog is active -var vector menu_enable_maxsize; +var vector menu_enable_maxsize; FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(menu_enable_maxsize); var vector menu_enable_size; #define HUD_Panel_GetMenuSize()\ menu_enable_maxsize_x = 0.3 * vid_conwidth;\ diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 55b565074..a486af68e 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -172,7 +172,6 @@ float hud_panel_radar_scale; float hud_panel_radar_foreground_alpha; float hud_panel_radar_rotation; vector hud_panel_radar_size; -vector hud_panel_radar_position; float hud_panel_radar_zoommode; void teamradar_loadcvars() @@ -191,8 +190,7 @@ void teamradar_loadcvars() if(!hud_panel_radar_size_y) hud_panel_radar_size_y = hud_panel_radar_size_x; hud_panel_radar_size_z = 0; - hud_panel_radar_nohudhack = hud_panel_radar_position_z; - hud_panel_radar_position_z = 0; + hud_panel_radar_nohudhack = 0; } // radar links diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc index 725f84ffb..f02fa4a30 100644 --- a/qcsrc/warpzonelib/client.qc +++ b/qcsrc/warpzonelib/client.qc @@ -15,7 +15,7 @@ void WarpZone_Read(float isnew) { float f; - ++warpzone_warpzones_exist; + warpzone_warpzones_exist = 1; if not(self.enemy) { self.enemy = spawn(); @@ -84,7 +84,7 @@ void WarpZone_Read(float isnew) void WarpZone_Camera_Read(float isnew) { float f; - ++warpzone_cameras_exist; + warpzone_cameras_exist = 1; self.classname = "func_warpzone_camera"; f = ReadByte(); @@ -170,7 +170,6 @@ void WarpZone_Outside() vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3) { - float nearclipdistance; vector mi, ma; entity e; float pd; @@ -210,7 +209,7 @@ var float autocvar_cl_rollkillspeed = 10; #endif void WarpZone_FixView() { - float pd, f; + float f; vector o; entity e; vector corner0, corner1, corner2, corner3, nearclip; diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc index 42cc94c3a..f71fbe2d9 100644 --- a/qcsrc/warpzonelib/server.qc +++ b/qcsrc/warpzonelib/server.qc @@ -359,7 +359,7 @@ void WarpZoneCamera_InitStep_FindTarget() error("Camera with nonexisting target"); return; } - ++warpzone_cameras_exist; + warpzone_cameras_exist = 1; WarpZone_Camera_SetUp(self, self.enemy.origin, self.enemy.angles); self.SendFlags = 0xFFFFFF; } @@ -494,7 +494,7 @@ void WarpZone_InitStep_FinalizeTransform() return; } - ++warpzone_warpzones_exist; + warpzone_warpzones_exist = 1; WarpZone_SetUp(self, self.warpzone_origin, self.warpzone_angles, self.enemy.warpzone_origin, self.enemy.warpzone_angles); self.touch = WarpZone_Touch; self.SendFlags = 0xFFFFFF;