Merge branch 'master' into Mario/monsters_broken

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / sv_monsters.qc

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index c977aa67e121e8afe284a7544fb593f0307cf5be..e7ea9f8c48520182793b32e30a25a6457e6e1774 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -579,7 +579,7 @@ vector Monster_Move_Target(entity targ)
 
                if(self.enemy)
                {
-                       /*WarpZone_TrailParticles(world, particleeffectnum("red_pass"), self.origin, targ_origin);
+                       /*WarpZone_TrailParticles(world, particleeffectnum(EFFECT_RED_PASS), self.origin, targ_origin);
                        print("Trace origin: ", vtos(targ_origin), "\n");
                        print("Target origin: ", vtos(self.enemy.origin), "\n");
                        print("My origin: ", vtos(self.origin), "\n"); */
@@ -915,7 +915,7 @@ void Monster_Remove(entity mon)
        if(!mon) { return; }
 
        if(!MUTATOR_CALLHOOK(MonsterRemove, mon))
-               Send_Effect("item_pickup", mon.origin, '0 0 0', 1);
+               Send_Effect(EFFECT_ITEM_PICKUP, mon.origin, '0 0 0', 1);
 
        if(mon.weaponentity) { remove(mon.weaponentity); }
        if(mon.iceblock) { remove(mon.iceblock); }