]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Make frozen state spectate-able
authorMario <mario.mario@y7mail.com>
Sun, 2 Jun 2013 22:16:16 +0000 (08:16 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 2 Jun 2013 22:16:16 +0000 (08:16 +1000)
qcsrc/server/cl_client.qc
qcsrc/server/mutators/gamemode_freezetag.qc

index 72011d4790e57d0f14a89a1adf962f8a08d47739..a1206c58363b3618339c9fd4ad5d343d3721b50c 100644 (file)
@@ -1735,6 +1735,8 @@ void SpectateCopy(entity spectatee) {
        self.dmg_inflictor = spectatee.dmg_inflictor;
        self.v_angle = spectatee.v_angle;
        self.angles = spectatee.v_angle;
+       self.frozen = spectatee.frozen;
+       self.revive_progress = spectatee.revive_progress;
        if(!self.BUTTON_USE)
                self.fixangle = TRUE;
        setorigin(self, spectatee.origin);
index d5daee2173fcfb961aa8824f8948cd204512683d..325b6c29c891633af5dab355785051e96230853f 100644 (file)
@@ -500,13 +500,6 @@ MUTATOR_HOOKFUNCTION(freezetag_BotRoles)
        return TRUE;
 }
 
-MUTATOR_HOOKFUNCTION(freezetag_SpectateCopy)
-{
-       self.frozen = other.frozen;
-       self.revive_progress = other.revive_progress;
-       return 0;
-}
-
 MUTATOR_HOOKFUNCTION(freezetag_GetTeamCount)
 {
        freezetag_teams = autocvar_g_freezetag_teams_override;
@@ -542,7 +535,6 @@ MUTATOR_DEFINITION(gamemode_freezetag)
        MUTATOR_HOOK(PlayerPreThink, freezetag_PlayerPreThink, CBC_ORDER_FIRST);
        MUTATOR_HOOK(PlayerDamage_Calculate, freezetag_PlayerDamage_Calculate, CBC_ORDER_ANY);
        MUTATOR_HOOK(HavocBot_ChooseRule, freezetag_BotRoles, CBC_ORDER_ANY);
-       MUTATOR_HOOK(SpectateCopy, freezetag_SpectateCopy, CBC_ORDER_ANY);
        MUTATOR_HOOK(GetTeamCount, freezetag_GetTeamCount, CBC_ORDER_EXCLUSIVE);
 
        MUTATOR_ONADD