Merge branch 'master' into Mario/hagar_notfixed

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

diff --git a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
index 4916464a1be8dc0e5705d9eebaa801628eb40fae..1d0bd19ebc512f315fb5bdede23a9b0a2c3bac09 100644 (file)
--- a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
+++ b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
@@ -10,7 +10,7 @@ REGISTER_MUTATOR(campcheck, cvar("g_campcheck"));
 
 MUTATOR_HOOKFUNCTION(campcheck, PlayerDies)
 {
-       Kill_Notification(NOTIF_ONE, frag_target, MSG_CENTER_CPID, CPID_CAMPCHECK);
+       Kill_Notification(NOTIF_ONE, frag_target, MSG_CENTER, CPID_CAMPCHECK);
        return false;
 }
 
@@ -36,7 +36,7 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerPreThink)
        if(IS_REAL_CLIENT(self)) // bots may camp, but that's no reason to constantly kill them
        if(!IS_DEAD(self))
        if(!STAT(FROZEN, self))
-       if(!self.BUTTON_CHAT)
+       if(!PHYS_INPUT_BUTTON_CHAT(self))
        if(autocvar_g_campcheck_interval)
        {
                vector dist;