]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/mutators/mutator_superspec.qc
Merge branch 'master' into Mario/race_cts_mutators
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_superspec.qc
index 9a69047233e765d292733e032d07fce92df2a850..c323262f069b7a198f7e29ca75b20c4d186408cc 100644 (file)
@@ -33,7 +33,7 @@ void superspec_save_client_conf()
        string fn = "superspec-local.options";
        float fh;
 
-       if not(_ISLOCAL)
+       if (!_ISLOCAL)
        {
                if(self.crypto_idfp == "")
                        return;
@@ -68,7 +68,7 @@ void superspec_msg(string _center_title, string _con_title, entity _to, string _
                return;
 
        if(_spamlevel > 1)
-               if not(_to.superspec_flags & SSF_VERBOSE)
+               if (!(_to.superspec_flags & SSF_VERBOSE))
                        return;
 
        centerprint(_to, strcat(_center_title, _msg));
@@ -108,7 +108,7 @@ MUTATOR_HOOKFUNCTION(superspec_ItemTouch)
                                        superspec_msg("", "", self, sprintf("Player %s^7 just picked up ^3%s\n", other.netname, _item.netname), 1);
                                else
                                        superspec_msg("", "", self, sprintf("Player %s^7 just picked up ^3%s\n^8(%s^8)\n", other.netname, _item.netname, _item.classname), 1);
-                               if(self.autospec_flags& ASF_SSIM && self.enemy != other)
+                               if((self.autospec_flags & ASF_SSIM) && self.enemy != other)
                                {
                                        _spectate(other);
 
@@ -239,7 +239,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                else if(argv(i) == "off" || argv(i) == "0")
                                {
                                        if(_start == 1)
-                                               self.superspec_flags &~= _bits;
+                                               self.superspec_flags &= ~_bits;
 
                                        _bits = 0;
                                }
@@ -303,7 +303,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                else if(argv(i) == "off" || argv(i) == "0")
                                {
                                        if(_start == 1)
-                                               self.autospec_flags &~= _bits;
+                                               self.autospec_flags &= ~_bits;
 
                                        _bits = 0;
                                }
@@ -409,19 +409,6 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                        superspec_msg("", "", self, "No active flag carrier\n", 1);
                return TRUE;
        }
-       
-       if(cmd_name == "followkiller")
-       {
-               entity _player;
-               FOR_EACH_PLAYER(_player)
-               {
-                       if(_player.deadflag)
-                               return _spectate(frag_attacker);
-               }
-
-               superspec_msg("", "", self, "Following the killer\n", 1);
-               return TRUE;
-       }
 
        return FALSE;
 #undef OPTIONINFO
@@ -465,7 +452,7 @@ MUTATOR_HOOKFUNCTION(superspec_ClientConnect)
        _hello.think = superspec_hello;
        _hello.nextthink = time + 5;
 
-       if not(_ISLOCAL)
+       if (!_ISLOCAL)
        {
                if(self.crypto_idfp == "")
                        return FALSE;
@@ -497,6 +484,25 @@ MUTATOR_HOOKFUNCTION(superspec_ClientConnect)
        return FALSE;
 }
 
+MUTATOR_HOOKFUNCTION(superspec_PlayerDies)
+{
+       entity _old_self = self;
+
+       FOR_EACH_SPEC(self)
+       {
+               if(self.autospec_flags & ASF_FOLLOWKILLER && IS_PLAYER(frag_attacker) && self.enemy == _old_self)
+               {
+                       if(self.autospec_flags & ASF_SHOWWHAT)
+                               superspec_msg("", "", self, sprintf("^7Following %s^7 due to followkiller\n", frag_attacker.netname), 2);
+
+                       _spectate(frag_attacker);
+               }
+       }
+
+       self = _old_self;
+       return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(superspec_ClientDisconnect)
 {
        superspec_save_client_conf();
@@ -512,6 +518,7 @@ MUTATOR_DEFINITION(mutator_superspec)
        MUTATOR_HOOK(ItemTouch, superspec_ItemTouch, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientConnect, superspec_ClientConnect, CBC_ORDER_ANY);
        MUTATOR_HOOK(ClientDisconnect, superspec_ClientDisconnect, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDies, superspec_PlayerDies, CBC_ORDER_ANY);
 
        return 0;
 }