[nexuiz-commits] r7168 - in trunk/data/qcsrc: client server server/tturrets/system server/tturrets/units

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-07-08 14:41:21 -0400 (Wed, 08 Jul 2009)
New Revision: 7168

Modified:
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/nexball.qc
   trunk/data/qcsrc/server/t_teleporters.qc
   trunk/data/qcsrc/server/tturrets/system/system_main.qc
   trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
Log:
warning-only fixes


Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-07-08 17:00:58 UTC (rev 7167)
+++ trunk/data/qcsrc/client/sbar.qc	2009-07-08 18:41:21 UTC (rev 7168)
@@ -549,7 +549,7 @@
 		have_secondary = 1;
 	if(ps_primary == ps_secondary)
 		have_secondary = 1;
-	missing = !have_primary + !have_secondary + !have_separator + !have_name;
+	missing = (!have_primary) + (!have_secondary) + (!have_separator) + (!have_name);
 
 	if(sbar_num_fields+missing < MAX_SBAR_FIELDS)
 	{

Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2009-07-08 17:00:58 UTC (rev 7167)
+++ trunk/data/qcsrc/server/g_triggers.qc	2009-07-08 18:41:21 UTC (rev 7168)
@@ -1624,7 +1624,7 @@
 		}
 	}
 
-	if(!a == !b)
+	if((!a) == (!b))
 		print("Invalid use of trigger_disablerelay: ", ftos(a), " relays were on, ", ftos(b), " relays were off!\n");
 }
 

Modified: trunk/data/qcsrc/server/nexball.qc
===================================================================
--- trunk/data/qcsrc/server/nexball.qc	2009-07-08 17:00:58 UTC (rev 7167)
+++ trunk/data/qcsrc/server/nexball.qc	2009-07-08 18:41:21 UTC (rev 7168)
@@ -502,7 +502,7 @@
 void spawnfunc_nexball_basketball (void)
 {
 	self.classname = "nexball_basketball";
-	if(!balls & BALL_BASKET)
+	if not(balls & BALL_BASKET)
 	{
 		CVTOV(g_nexball_basketball_effects_default);
 		CVTOV(g_nexball_basketball_delay_hold);

Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc	2009-07-08 17:00:58 UTC (rev 7167)
+++ trunk/data/qcsrc/server/t_teleporters.qc	2009-07-08 18:41:21 UTC (rev 7168)
@@ -122,7 +122,7 @@
 
 	if (other.health < 1)
 		return;
-	if (!other.flags & FL_CLIENT)	// FIXME: Make missiles firable through the teleport too
+	if not(other.flags & FL_CLIENT)	// FIXME: Make missiles firable through the teleport too
 		return;
 
 	if(self.team)

Modified: trunk/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_main.qc	2009-07-08 17:00:58 UTC (rev 7167)
+++ trunk/data/qcsrc/server/tturrets/system/system_main.qc	2009-07-08 18:41:21 UTC (rev 7168)
@@ -725,11 +725,11 @@
         // This one is doing something.. oddball. assume its handles what needs to be handled.
 
         // Predict?
-        if not((self.aim_flags & TFL_AIM_NO))
+        if not(self.aim_flags & TFL_AIM_NO)
             self.tur_aimpos = turret_stdproc_aim_generic();
 
         // Turn & pitch?
-        if (!self.track_flags & TFL_TRACK_NO)
+        if not(self.track_flags & TFL_TRACK_NO)
             turret_stdproc_track();
 
         turret_do_updates(self);
@@ -745,11 +745,11 @@
             if(self.volly_counter != self.shot_volly)
             {
                 // Predict or whatnot
-                if not((self.aim_flags & TFL_AIM_NO))
+                if not(self.aim_flags & TFL_AIM_NO)
                     self.tur_aimpos = turret_stdproc_aim_generic();
 
                 // Turn & pitch
-                if (!self.track_flags & TFL_TRACK_NO)
+                if not(self.track_flags & TFL_TRACK_NO)
                     turret_stdproc_track();
 
                 turret_do_updates(self);
@@ -780,7 +780,7 @@
         if (self.enemy == world)
         {
             // Turn & pitch
-            if (!self.track_flags & TFL_TRACK_NO)
+            if not(self.track_flags & TFL_TRACK_NO)
                 turret_stdproc_track();
 
             // do any per-turret stuff
@@ -794,11 +794,11 @@
             self.lip = time + cvar("g_turrets_aimidle_delay"); // Keep track of the last time we had a target.
 
         // Predict?
-        if not((self.aim_flags & TFL_AIM_NO))
+        if not(self.aim_flags & TFL_AIM_NO)
             self.tur_aimpos = turret_stdproc_aim_generic();
 
         // Turn & pitch?
-        if (!self.track_flags & TFL_TRACK_NO)
+        if not(self.track_flags & TFL_TRACK_NO)
             turret_stdproc_track();
 
         turret_do_updates(self);

Modified: trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc	2009-07-08 17:00:58 UTC (rev 7167)
+++ trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc	2009-07-08 18:41:21 UTC (rev 7168)
@@ -6,8 +6,8 @@
 {
     if (self.enemy == world) return 0;
 
-    if (!self.enemy.ammo_flags & TFL_AMMO_RECIVE) return 0;
-    if (!self.enemy.ammo_flags & TFL_AMMO_ENERGY) return 0;
+    if (!(self.enemy.ammo_flags & TFL_AMMO_RECIVE)) return 0;
+    if (!(self.enemy.ammo_flags & TFL_AMMO_ENERGY)) return 0;
 
     if (self.ammo < self.shot_dmg) return 0;
     if (self.enemy.ammo >= self.enemy.ammo_max) return 0;