Numerous enhancements to the new status effects system, split powerups into a dedicat...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / status_effects / sv_status_effects.qc

diff --git a/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc b/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc
index df97b0589721b4d321c318d75b8d5abe87b96338..0ec5d4d5c5760ac87fbc44b70b81637bb26a068f 100644 (file)
--- a/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc
+++ b/qcsrc/common/mutators/mutator/status_effects/sv_status_effects.qc
@@ -50,7 +50,10 @@ METHOD(StatusEffects, m_remove, void(StatusEffects this, entity actor, int remov
 
 MUTATOR_HOOKFUNCTION(status_effects, SV_StartFrame)
 {
+       if(game_stopped)
+               return;
        // TODO: explicitly only loop through entities with a valid statuseffects object
+       // NOTE: due to the way vehicles work currently, this does not function correctly! effect does not tick while inside a vehicle
        IL_EACH(g_damagedbycontents, it.damagedbycontents,
        {
                if (it.move_movetype == MOVETYPE_NOCLIP || !it.statuseffects) continue;
@@ -95,7 +98,7 @@ MUTATOR_HOOKFUNCTION(status_effects, SpectateCopy)
        client.statuseffects = spectatee.statuseffects;
 }
 
-MUTATOR_HOOKFUNCTION(status_effects, PlayerSpawn)
+MUTATOR_HOOKFUNCTION(status_effects, PutClientInServer)
 {
        entity player = M_ARGV(0, entity);
 
@@ -109,8 +112,4 @@ MUTATOR_HOOKFUNCTION(status_effects, PlayerSpawn)
                StatusEffects_clearall(player.statuseffects_store);
                player.statuseffects = NULL;
        }
-
-       // TODO: special hook for when effects are initialized?
-       if(STAT(WEAPONS, player) & WEPSET_SUPERWEAPONS)
-               StatusEffects_apply(STATUSEFFECT_Superweapons, player, time + autocvar_g_balance_superweapons_time, 0);
 }