Remove some `#ifdef GMQCC` conditionals

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 308665dc43191a6d4dc95c3162ada1964fa0660b..33d7f9f5c1c850f260757cd9d6064bd4a829e2d4 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2672,14 +2672,9 @@ float mod_active; // is there any active mod icon?
 
 void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i)
 {
-       float stat;
-       string pic;
-       vector color;
-#ifdef GMQCC
-       stat = -1;
-       pic = "";
-       color = '0 0 0';
-#endif
+       float stat = -1;
+       string pic = "";
+       vector color = '0 0 0';
        switch(i)
        {
                case 0:
@@ -3266,14 +3261,9 @@ void HUD_Mod_Race(vector pos, vector mySize)
 
 void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, float i)
 {
-       float stat, pps_ratio;
-       string pic;
-       vector color;
-#ifdef GMQCC
-       stat = -1;
-       pic = "";
-       color = '0 0 0';
-#endif
+       float stat = -1;
+       string pic = "";
+       vector color = '0 0 0';
        switch(i)
        {
                case 0:
@@ -3298,7 +3288,7 @@ void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, fl
                        color = '1 0 1';
                        break;
        }
-       pps_ratio = stat / getstatf(STAT_DOM_TOTAL_PPS);
+       float pps_ratio = stat / getstatf(STAT_DOM_TOTAL_PPS);
 
        if(mySize_x/mySize_y > aspect_ratio)
        {

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 9a1cef2788855fc64bdbac28fa25e3974eb6b940..e9b4ea03ad75c0a304eec5405316a4b43e73d80f 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1289,19 +1289,12 @@ void HUD_DrawScoreboard()
 
                        pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
                }
-
-#ifdef GMQCC
-               rgb = '0 0 0';
-#endif
                rgb_x = autocvar_scoreboard_color_bg_r;
                rgb_y = autocvar_scoreboard_color_bg_g;
                rgb_z = autocvar_scoreboard_color_bg_b;
        }
        else
        {
-#ifdef GMQCC
-               rgb = '0 0 0';
-#endif
                rgb_x = autocvar_scoreboard_color_bg_r;
                rgb_y = autocvar_scoreboard_color_bg_g;
                rgb_z = autocvar_scoreboard_color_bg_b;

diff --git a/qcsrc/common/weapons/w_tuba.qc b/qcsrc/common/weapons/w_tuba.qc
index e08cf676fb76eb92508241aec738317d3d824b0d..37f1e3868b004907e5999078f67d07419e68f562 100644 (file)
--- a/qcsrc/common/weapons/w_tuba.qc
+++ b/qcsrc/common/weapons/w_tuba.qc
@@ -184,16 +184,13 @@ void W_Tuba_NoteOff(void)
 
 float W_Tuba_GetNote(entity pl, float hittype)
 {
-       float note;
-       float movestate;
-       movestate = 5;
-       if(pl.movement_x < 0) movestate -= 3;
-       if(pl.movement_x > 0) movestate += 3;
-       if(pl.movement_y < 0) movestate -= 1;
-       if(pl.movement_y > 0) movestate += 1;
-#ifdef GMQCC
-       note = 0;
-#endif
+       float movestate = 5;
+       if (pl.movement_x < 0)          movestate -= 3;
+       else if (pl.movement_x > 0)     movestate += 3;
+       if (pl.movement_y < 0)          movestate -= 1;
+       else if (pl.movement_y > 0)     movestate += 1;
+
+       float note = 0;
        switch(movestate)
        {
        // layout: originally I wanted

diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index aa771649d663fa705e6980d4870ef3d5174624b0..8a7d04193a8e5ae8e2fb08bf1fc7920fa9c38e85 100644 (file)
--- a/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@ -318,9 +318,6 @@ void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
        isz_w = '1 0 0' + '0 1 0' * ((sz_y / sz_x) * (draw_scale_x / draw_scale_y));
        isz_h = '0 1 0' + '1 0 0' * ((sz_x / sz_y) * (draw_scale_y / draw_scale_x));
 
-#ifdef GMQCC
-       isz = '0 0 0';
-#endif
        switch(scalemode)
        {
                default:

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 7c8f6a3195537713dd808c03f2c0eb94601f6112..88b4c7a032e7a85b9cc873850a4c6693be5b409f 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1390,10 +1390,7 @@ void spawnfunc_target_items (void)
                else
                {
                        error("invalid spawnflags");
-#ifdef GMQCC
-                       itemprefix = string_null;
-                       valueprefix = string_null;
-#endif
+                       itemprefix = valueprefix = string_null;
                }
 
                self.netname = "";

diff --git a/qcsrc/server/tturrets/system/system_aimprocs.qc b/qcsrc/server/tturrets/system/system_aimprocs.qc
index c3dbe55a4848d9d5d0505192a77cfab3057cd77c..1901e4e25c2ff7cb65c4e0a4e3b80bcc51bbedb4 100644 (file)
--- a/qcsrc/server/tturrets/system/system_aimprocs.qc
+++ b/qcsrc/server/tturrets/system/system_aimprocs.qc
@@ -11,7 +11,7 @@ vector turret_stdproc_aim_generic()
 {
 
     vector pre_pos, prep;
-    float distance, impact_time, i, mintime;
+    float distance, i, mintime;
 
     turret_tag_fire_update();
 
@@ -30,9 +30,7 @@ vector turret_stdproc_aim_generic()
                {
                        // FIXME: this cant be the best way to do this..
                        prep = pre_pos;
-#ifdef GMQCC
-                       impact_time = 0;
-#endif
+                       float impact_time = 0;
                        for(i = 0; i < 4; ++i)
                        {
                                distance = vlen(prep - self.tur_shotorg);

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index d25c769b08ba7957c0f11460657a2c759df8a564..4b18d381bb0856bfe80ba0bf3a1e0b423b137641 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -570,9 +570,7 @@ void WarpZone_InitStep_UpdateTransform()
                norm = normalize(norm);
        }
 
-#ifdef GMQCC
        ang = '0 0 0';
-#endif
        if(self.aiment)
        {
                org = self.aiment.origin;