Merge remote branch 'refs/remotes/origin/fruitiex/racefixes'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / assault.qc

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index f5b71b8533210ca1abca7f4063eda2ea328f74f8..d7ea87d33211d9799b9fbef9ed45bf1139676a15 100644 (file)
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -70,7 +70,7 @@ void assault_objective_decrease_use() {
                return;
        }
 
                return;
        }
 

-       if(other.assault_sprite.classname == "assault_decreaser_sprite")
+       if(other.assault_sprite)

                WaypointSprite_Disown(other.assault_sprite, waypointsprite_deadlifetime);
        else
                return; // already activated! cannot activate again!
                WaypointSprite_Disown(other.assault_sprite, waypointsprite_deadlifetime);
        else
                return; // already activated! cannot activate again!


@@ -142,7 +142,7 @@ void target_objective_decrease_activate()
                spr = WaypointSprite_SpawnFixed("<placeholder>", 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite);
                spr.assault_decreaser = self;
                spr.waypointsprite_visible_for_player = assault_decreaser_sprite_visible;
                spr = WaypointSprite_SpawnFixed("<placeholder>", 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite);
                spr.assault_decreaser = self;
                spr.waypointsprite_visible_for_player = assault_decreaser_sprite_visible;

-               spr.classname = "assault_decreaser_sprite";
+               spr.classname = "sprite_waypoint";

                WaypointSprite_UpdateRule(spr, assault_attacker_team, SPRITERULE_TEAMPLAY);
                if(ent.classname == "func_assault_destructible")
                        WaypointSprite_UpdateSprites(spr, "as-defend", "as-destroy", "as-destroy");
                WaypointSprite_UpdateRule(spr, assault_attacker_team, SPRITERULE_TEAMPLAY);
                if(ent.classname == "func_assault_destructible")
                        WaypointSprite_UpdateSprites(spr, "as-defend", "as-destroy", "as-destroy");