Fix gibfountin turrets (health rounding issue)

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 55fcd88bc2b3c593df8d9023d0788d00899b488a..caca8ca04aab2de27e222b9b0a8486fddfc1af3e 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -498,8 +498,9 @@ void ent_turret()
             self.team = _team;
             turret_changeteam();        
         }
+        
+        if(self.health == 0)
+            turret_die();
     } 
     
-    if(self.health == 0)
-        turret_die();
 }

diff --git a/qcsrc/server/tturrets/system/system_damage.qc b/qcsrc/server/tturrets/system/system_damage.qc
index 88358e771e3c2392fb63a2d5ddd3a023bc74bd7d..8daad2734101a1e53f8ebe5f42bf599effa7e0eb 100644 (file)
--- a/qcsrc/server/tturrets/system/system_damage.qc
+++ b/qcsrc/server/tturrets/system/system_damage.qc
@@ -84,7 +84,7 @@ void turret_stdproc_respawn()
 void turret_stdproc_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
 {
     // Enougth allready!
-    if (self.health <= 0)
+    if(self.deadflag == DEAD_DEAD)
         return;
 
     // Inactive turrets take no damage. (hm..)

diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index 2bc9f929adfdd915daa7ef1a642a745a1d000e2b..de3e06537552308ec721306c96947a2c7bc16853 100644 (file)
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -64,12 +64,13 @@ float turret_send(entity to, float sf)
     }
     
     if(sf & TNSF_STATUS)
-    {        
+    {
         WriteByte(MSG_ENTITY, self.team);
+        
         if(self.health <= 0)
             WriteByte(MSG_ENTITY, 0);
         else
-            WriteByte(MSG_ENTITY, rint((self.health / self.tur_health) * 255)); // Send health as 0-255 insted of real value, where 255 = 100%
+            WriteByte(MSG_ENTITY, ceil((self.health / self.tur_health) * 255));
     }
     
        return TRUE;