Merge branch 'master' into Lyberta/WaypointIcons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / gamemodes / gamemode / onslaught / cl_generator.qc

diff --git a/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc b/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc
index 9d12c5548e6d4eafd4abdb336b6aa7208274bda3..3a72c8d497d089417b33b18e6d4524741f6aea50 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc
+++ b/qcsrc/common/gamemodes/gamemode/onslaught/cl_generator.qc
@@ -48,10 +48,10 @@ void generator_draw(entity this)
        if(time < this.move_time)
                return;
 
-       if(GetResourceAmount(this, RESOURCE_HEALTH) > 0)
+       if(GetResource(this, RES_HEALTH) > 0)
        {
                // damaged fx (less probable the more damaged is the generator)
-               if(random() < 0.9 - GetResourceAmount(this, RESOURCE_HEALTH) / this.max_health)
+               if(random() < 0.9 - GetResource(this, RES_HEALTH) / this.max_health)
                if(random() < 0.01)
                {
                        pointparticles(EFFECT_ELECTRO_BALLEXPLODE, this.origin + randompos('-50 -50 -20', '50 50 50'), '0 0 0', 1);
@@ -195,7 +195,7 @@ NET_HANDLE(ENT_CLIENT_GENERATOR, bool isnew)
                this.origin = ReadVector();
                setorigin(this, this.origin);
 
-               SetResourceAmountExplicit(this, RESOURCE_HEALTH, ReadByte());
+               SetResourceExplicit(this, RES_HEALTH, ReadByte());
                this.max_health = ReadByte();
                this.count = ReadByte();
                this.team = ReadByte();
@@ -219,9 +219,9 @@ NET_HANDLE(ENT_CLIENT_GENERATOR, bool isnew)
 
                _tmp = ReadByte();
 
-               if(_tmp != GetResourceAmount(this, RESOURCE_HEALTH))
+               if(_tmp != GetResource(this, RES_HEALTH))
                        generator_damage(this, _tmp);
 
-               SetResourceAmountExplicit(this, RESOURCE_HEALTH, _tmp);
+               SetResourceExplicit(this, RES_HEALTH, _tmp);
        }
 }