]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Make sure trigger_heal uses the .health field instead of a resource, since this is...
authorMario <mario@smbclan.net>
Sat, 10 Aug 2019 12:02:47 +0000 (22:02 +1000)
committerMario <mario@smbclan.net>
Sat, 10 Aug 2019 12:02:47 +0000 (22:02 +1000)
qcsrc/common/mapobjects/trigger/counter.qc
qcsrc/common/mapobjects/trigger/heal.qc

index 9156439f99e3bf19bb9bdc8425efe1fdcd06d53d..db255ebb7aff0d80f596dfeb91cdf35a43cf988d 100644 (file)
@@ -5,7 +5,7 @@ void counter_reset(entity this);
 void counter_use(entity this, entity actor, entity trigger)
 {
        entity store = this;
-       if(this.spawnflags & COUNTER_PER_PLAYER)
+       if(this.spawnflags & COUNTER_PER_PLAYER) // FIXME: multiple counters in the map will not function correctly, and upon trigger reset the player won't be able to use it again!
        {
                if(!IS_PLAYER(actor))
                        return;
index 94abd4041d3d1ff9a1a6f24f5a7db8284819244e..b110d9913fd97baa5b1d628b69c78fd173d32578 100644 (file)
@@ -18,7 +18,7 @@ void trigger_heal_touch(entity this, entity toucher)
                                toucher.triggerhealtime = time + this.delay;
 
                        bool playthesound = (this.spawnflags & HEAL_SOUND_ALWAYS);
-                       bool healed = Heal(toucher, this, GetResource(this, RES_HEALTH), this.max_health);
+                       bool healed = Heal(toucher, this, this.health, this.max_health);
 
                        if(playthesound || healed)
                                _sound (toucher, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM);
@@ -36,8 +36,8 @@ void trigger_heal_init(entity this)
        this.active = ACTIVE_ACTIVE;
        if(!this.delay)
                this.delay = 1;
-       if(!GetResource(this, RES_HEALTH))
-               SetResourceExplicit(this, RES_HEALTH, 10); // TODO: use a special field for this, it doesn't have actual health!
+       if(!this.health)
+               this.health = 10;
        if(!this.max_health)
                this.max_health = 200; // max health topoff for field
        if(this.noise == "")