Merge branch 'build-better' into staging

Author: drzel

ssqc/engineer.qc

@@ -586,7 +586,7 @@ void (float objtobuild, float offset) TeamFortress_Build = {
         return;
     }
 
-    if (objtobuild == 1) {
+    if (objtobuild == BUILD_DISPENSER) {
         if (self.has_dispenser) {
             sprint(self, PRINT_HIGH, "You can only have one dispenser\n");
             dremove(newmis);
@@ -598,7 +598,7 @@ void (float objtobuild, float offset) TeamFortress_Build = {
         newmis.netname = "dispenser";
         btime = time + 2;
         self.dispenser_ticks = 0;
-    } else if (objtobuild == 2) {
+    } else if (objtobuild == BUILD_SENTRYGUN) {
         if (self.has_sentry) {
             sprint(self, PRINT_HIGH, "You can only have one sentry gun\n");
             dremove(newmis);
@@ -658,15 +658,15 @@ void (float objtobuild, float offset) TeamFortress_Build = {
         newmis.team_no = self.team_no;
         newmis.max_health = newmis.health;
         newmis.takedamage = DAMAGE_AIM;
-        if (objtobuild == 1) {
-            self.has_dispenser = TRUE;   
+        if (objtobuild == BUILD_DISPENSER) {
+            self.has_dispenser = TRUE;
             newmis.th_die = Dispenser_Die;
             self.ammo_cells = self.ammo_cells - ENG_DISPENSER_COST;
             newmis.classname = "building_dispenser";
         }
-        if (objtobuild == 2) {            
+        if (objtobuild == BUILD_SENTRYGUN) {
             self.sentry_ent = newmis;
-            self.has_sentry = TRUE;            
+            self.has_sentry = TRUE;
             newmis.th_die = Sentry_Die;
             newmis.th_pain = Sentry_Pain;
             newmis.takedamage = DAMAGE_AIM;
@@ -1152,7 +1152,7 @@ void () Dispenser_Die = {
     self.real_owner.has_dispenser = 0;
     self.think = Dispenser_Explode;
     self.nextthink = time + 0.1;
-    if (self.real_owner.is_building == 1) {
+    if (self.real_owner.is_building == BUILD_DISPENSER) {
         self = self.real_owner;
         TeamFortress_EngineerBuildStop();
     }

ssqc/menu.qc

@@ -810,7 +810,7 @@ void (float offset) TeamFortress_BuildSentry = {
     if (self.has_sentry) return;
 
     if (self.ammo_cells >= ENG_SENTRY_COST)
-        TeamFortress_Build(2, offset);
+        TeamFortress_Build(BUILD_SENTRYGUN, offset);
     else
         Status_Print(self, "\n\n\n\n\n\n\n", strcat("You need ", ftos(ENG_SENTRY_COST - self.ammo_cells), " more cells to build a sentry gun"));
 }
@@ -820,16 +820,16 @@ void (float inp) Menu_Engineer_Input = {
         case 5:
             break;
 
-        // build dispenser
+        // build sentry
         case 1:
             TeamFortress_BuildSentry(0);
             break;
 
-        // build sentry
+        // build dispenser
         case 2:
             if (!self.has_dispenser) {
                 if (self.ammo_cells >= ENG_DISPENSER_COST)
-                    TeamFortress_Build(1, 0);
+                    TeamFortress_Build(BUILD_DISPENSER, 0);
                 else
                     Status_Print(self, "\n\n\n\n\n\n\n", strcat("You need ", ftos(ENG_DISPENSER_COST), " cells to build a dispenser"));
             }

ssqc/qw.qc

@@ -48,7 +48,7 @@ float remote_client_time();
 .float cheat_check;             // Time when we'll next check for team cheats
 .float is_removed;              // TRUE if the entity has been removed
 .float is_undercover;           // TRUE for a SPY if they're undercover
-.float is_building;             // TRUE for an ENGINEER if they're building something
+.float is_building;             // BUILD_DISPENSER, BUILD_SENTRYGUN or FALSE for an ENGINEER
 .float is_detpacking;           // TRUE for a DEMOMAN if they're setting a detpack
 .float is_button_feigning;      // TRUE for a SPY if they're feigning death with +feign or +special
 .float feign_next_damage;       // TRUE for a SPY if they're going to feign death on next damage