Merge branch 'master' into TimePath/global_self

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

diff --git a/qcsrc/server/mutators/mutator_campcheck.qc b/qcsrc/server/mutators/mutator_campcheck.qc
index 2839ae09b6e546ee01faa1adf04be0ed0fc39e90..e4ad5ba19854f13851fb987bca87c111f189e1cf 100644 (file)
--- a/qcsrc/server/mutators/mutator_campcheck.qc
+++ b/qcsrc/server/mutators/mutator_campcheck.qc
@@ -8,7 +8,7 @@
 .float campcheck_traveled_distance;
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerDies)
 .float campcheck_traveled_distance;
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerDies)

-{
+{SELFPARAM();

        Kill_Notification(NOTIF_ONE, self, MSG_CENTER_CPID, CPID_CAMPCHECK);
 
        return false;
        Kill_Notification(NOTIF_ONE, self, MSG_CENTER_CPID, CPID_CAMPCHECK);
 
        return false;


@@ -28,7 +28,7 @@ MUTATOR_HOOKFUNCTION(campcheck_PlayerDamage)
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerThink)
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerThink)

-{
+{SELFPARAM();

        if(!gameover)
        if(!warmup_stage) // don't consider it camping during warmup?
        if(time >= game_starttime)
        if(!gameover)
        if(!warmup_stage) // don't consider it camping during warmup?
        if(time >= game_starttime)


@@ -74,7 +74,7 @@ MUTATOR_HOOKFUNCTION(campcheck_PlayerThink)
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerSpawn)
 }
 
 MUTATOR_HOOKFUNCTION(campcheck_PlayerSpawn)

-{
+{SELFPARAM();

        self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
        self.campcheck_traveled_distance = 0;
 
        self.campcheck_nextcheck = time + autocvar_g_campcheck_interval * 2;
        self.campcheck_traveled_distance = 0;