Merge branch 'master' into TimePath/global_self

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

diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 2b69551e7152c98fc85921b16b99c405d6ed22bb..ee9c6de8cebe2c8e9319168997d24b6d97880b16 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -8,7 +8,7 @@
 #include "../../common/items/all.qc"
 
 void spawnfunc_item_minst_cells (void)
 #include "../../common/items/all.qc"
 
 void spawnfunc_item_minst_cells (void)

-{
+{SELFPARAM();

        if (!g_instagib) { remove(self); return; }
        if (!self.ammo_cells)
                self.ammo_cells = autocvar_g_instagib_ammo_drop;
        if (!g_instagib) { remove(self); return; }
        if (!self.ammo_cells)
                self.ammo_cells = autocvar_g_instagib_ammo_drop;


@@ -17,7 +17,7 @@ void spawnfunc_item_minst_cells (void)
 }
 
 void instagib_health_mega()
 }
 
 void instagib_health_mega()

-{
+{SELFPARAM();

        self.max_health = 1;
        StartItemA (ITEM_ExtraLife);
 }
        self.max_health = 1;
        StartItemA (ITEM_ExtraLife);
 }


@@ -32,7 +32,7 @@ void instagib_stop_countdown(entity e)
        e.instagib_needammo = false;
 }
 void instagib_ammocheck()
        e.instagib_needammo = false;
 }
 void instagib_ammocheck()

-{
+{SELFPARAM();

        if(time < self.instagib_nextthink)
                return;
        if(!IS_PLAYER(self))
        if(time < self.instagib_nextthink)
                return;
        if(!IS_PLAYER(self))


@@ -130,7 +130,7 @@ MUTATOR_HOOKFUNCTION(instagib_MonsterLoot)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_MonsterSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_MonsterSpawn)

-{
+{SELFPARAM();

        // always refill ammo
        if(self.monsterid == MON_MAGE.monsterid)
                self.skin = 1;
        // always refill ammo
        if(self.monsterid == MON_MAGE.monsterid)
                self.skin = 1;


@@ -147,13 +147,13 @@ MUTATOR_HOOKFUNCTION(instagib_BotShouldAttack)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_MakePlayerObserver)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_MakePlayerObserver)

-{
+{SELFPARAM();

        instagib_stop_countdown(self);
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerSpawn)
        instagib_stop_countdown(self);
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerSpawn)

-{
+{SELFPARAM();

        self.effects |= EF_FULLBRIGHT;
        return false;
 }
        self.effects |= EF_FULLBRIGHT;
        return false;
 }


@@ -171,7 +171,7 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerRegen)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)

-{
+{SELFPARAM();

        if (!(self.effects & EF_FULLBRIGHT))
                self.effects |= EF_FULLBRIGHT;
 
        if (!(self.effects & EF_FULLBRIGHT))
                self.effects |= EF_FULLBRIGHT;
 


@@ -220,7 +220,7 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerPhysics)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerPhysics)

-{
+{SELFPARAM();

        if(self.items & ITEM_Shield.m_itemid)
                self.stat_sv_maxspeed = self.stat_sv_maxspeed * autocvar_g_instagib_speed_highspeed;
 
        if(self.items & ITEM_Shield.m_itemid)
                self.stat_sv_maxspeed = self.stat_sv_maxspeed * autocvar_g_instagib_speed_highspeed;
 


@@ -330,7 +330,7 @@ MUTATOR_HOOKFUNCTION(instagib_SetStartItems)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_FilterItem)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_FilterItem)

-{
+{SELFPARAM();

        if(self.classname == "item_cells")
                return true; // no normal cells?
 
        if(self.classname == "item_cells")
                return true; // no normal cells?
 


@@ -342,15 +342,12 @@ MUTATOR_HOOKFUNCTION(instagib_FilterItem)
 
        if(self.weapon == WEP_DEVASTATOR.m_id || self.weapon == WEP_VORTEX.m_id)
        {
 
        if(self.weapon == WEP_DEVASTATOR.m_id || self.weapon == WEP_VORTEX.m_id)
        {

-               entity e = spawn(), oldself;
+               entity e = spawn();

                setorigin(e, self.origin);
                setorigin(e, self.origin);

-               oldself = self;
-               self = e;
-               self.noalign = oldself.noalign;
-               self.cnt = oldself.cnt;
-               self.team = oldself.team;
-               spawnfunc_item_minst_cells();
-               self = oldself;
+               e.noalign = self.noalign;
+        e.cnt = self.cnt;
+        e.team = self.team;
+               WITH(entity, self, e, spawnfunc_item_minst_cells());

                return true;
        }
 
                return true;
        }
 


@@ -367,7 +364,7 @@ MUTATOR_HOOKFUNCTION(instagib_FilterItem)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_CustomizeWaypoint)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_CustomizeWaypoint)

-{
+{SELFPARAM();

        entity e = WaypointSprite_getviewentity(other);
 
        // if you have the invisibility powerup, sprites ALWAYS are restricted to your team
        entity e = WaypointSprite_getviewentity(other);
 
        // if you have the invisibility powerup, sprites ALWAYS are restricted to your team


@@ -380,7 +377,7 @@ MUTATOR_HOOKFUNCTION(instagib_CustomizeWaypoint)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_ItemCountdown)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_ItemCountdown)

-{
+{SELFPARAM();

        switch (self.items)
        {
                case ITEM_Strength.m_itemid:  item_name = "item-invis";     item_color = '0 0 1'; break;
        switch (self.items)
        {
                case ITEM_Strength.m_itemid:  item_name = "item-invis";     item_color = '0 0 1'; break;


@@ -399,7 +396,7 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerDies)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_ItemTouch)

-{
+{SELFPARAM();

        if(self.ammo_cells)
        {
                // play some cool sounds ;)
        if(self.ammo_cells)
        {
                // play some cool sounds ;)


@@ -428,7 +425,7 @@ MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_OnEntityPreSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(instagib_OnEntityPreSpawn)

-{
+{SELFPARAM();

        if (!autocvar_g_powerups) { return false; }
        if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.itemdef == ITEM_HealthMega))
                return false;
        if (!autocvar_g_powerups) { return false; }
        if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.itemdef == ITEM_HealthMega))
                return false;