]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
#woxblox#
authorJakob MG <jakob_mg@hotmail.com>
Tue, 28 Aug 2012 14:20:57 +0000 (16:20 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 28 Aug 2012 14:20:57 +0000 (16:20 +0200)
When g_superspectate is enabled (server side) These commands are available to spectator clients:

cmd autospec options:
strength or st: auto-spectate on strength powerup.
shield or sh: auto-spectate on shield powerup.
mega_health or mh: auto-spectate on mega health.
mega_armor or ma: auto-spectate on mega armor.
flag_grab or fg: auto-spectate on CTF flag grab.
observer_only or oo: auto-spectate only if in observer mode.
show_what or sw: Display what event / item triggerd auto-spectate.
item_msg or im: Auto-spectate when item_message in superspec is triggerd.
all or aa: turn everything on/off
clear: Turn everything off

Options can be combines as: cmd autospec clear st ma mh on
This first turns all options off then turns on auto-spectate for strength, mega armor and health.

cmd superspec options:
clear: turn everything off.
silent or si: suppress ALL centerprint messages from super/auto spectate (you still get console ones).
verbose or ve: makes super and auto spectate print some additional information.
item_message or im: makes superspectate print items that was picked up.
See cmd superspec_itemfilter for more info

Options can be combines as: cmd superspec si off ve im on
This first turns off silent then turn on verbose and item messages

cmd superspec_itemfilter options:
\"item_class1 item_class2\" to set up a filter of what to show with item_message (note the \").
clear: Remove the filter
show: Display current filter

cmd followpowerup
Find and spectate a player with a powerup (strength or shield)

cmd followstrength
Find and spectate player with the strength powerup (if any)

cmd followstshield
Find and spectate player with the shield powerup (if any)

cmd followfc [red|blue]
Find and follow a flag carrier, optionally only for read or blue team (if any)

If the spectator client support crypto_idfp, per client settings will be saved/restored server side.

qcsrc/server/cl_client.qc
qcsrc/server/ctf.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutator_superspec.qc

index 391bff6829be36236d585090d5a5b0392218728a..2be7889e99985c75da72c912dc597d5bad063766 100644 (file)
@@ -1597,6 +1597,8 @@ void ClientConnect (void)
         return;
         
     sv_notice_join();
+    
+    MUTATOR_CALLHOOK(ClientConnect);
 }
 /*
 =============
index d84075cf4c959b725d97de65c6d85b2ec498dcf5..d65d866ca60132011470f2a058dcd407ed2db2f4 100644 (file)
@@ -518,6 +518,9 @@ void FlagTouch()
        if (!other.flagcarried)
        if (!other.ctf_captureshielded)
        {
+               if(MUTATOR_CALLHOOK(ItemTouch))
+                       return;
+               
                if (other.next_take_time > time)
                        return;
 
index 2ab407e1c9d9267789e8c40c664c141a8721f1bf..e46d5b6728244e42a67bc2c837543ed175b5f969 100644 (file)
@@ -217,3 +217,7 @@ MUTATOR_HOOKABLE(ItemTouch);
        // called at when a item is touched. Called early, can edit item properties.
        entity self;    // item
        entity other;   // player
+
+MUTATOR_HOOKABLE(ClientConnect);
+       // called at when a player connect
+       entity self;    // player
index cee1b70ba2b1aefdfaf0a937e181828dd4f542ef..90ed16137758c7e7950f14f71f3da27d2c22ab11 100644 (file)
@@ -1,12 +1,24 @@
-#define ASF_STRENGTH 1
-#define ASF_SHIELD 2
-#define ASF_MEGA_AR 4
-#define ASF_MEGA_HP 8
-#define ASF_FLAG_GRAB 16
-#define ASF_ALL 0xFFFFFF
+#define _SSMAGIX "SUPERSPEC_OPTIONSFILE_V1"
+#define _ISLOCAL ((edict_num(1) == self) ? TRUE : FALSE)
 
+#define ASF_STRENGTH        1
+#define ASF_SHIELD          2
+#define ASF_MEGA_AR         4
+#define ASF_MEGA_HP         8
+#define ASF_FLAG_GRAB       16
+#define ASF_OBSERVER_ONLY   32
+#define ASF_SHOWWHAT        64
+#define ASF_SSIM            128
+#define ASF_ALL             0xFFFFFF
 .float autospec_flags;
 
+#define SSF_SILENT          1
+#define SSF_VERBOSE         2
+#define SSF_ITEMMSG         4
+.float superspec_flags;
+
+.string superspec_itemfilter; //"classname1 classname2 ..."
+
 float _spectate(entity _player)
 {
        if(SpectateNext(_player) == 1)
@@ -14,44 +26,272 @@ float _spectate(entity _player)
                PutObserverInServer();
                self.classname = "spectator";
        }
-       
+
        return TRUE;
 }
 
+void superspec_save_client_conf()
+{
+       string fn = "superspec-local.options";
+       float fh;
+
+
+       if not(_ISLOCAL)
+       {
+               if(self.crypto_idfp == "")
+                       return;
+
+               fn = sprintf("superspec-%s.options", uri_escape(self.crypto_idfp));
+       }
+
+       if((fh = fopen(fn, FILE_WRITE)) < 0)
+       {
+               dprint("^1ERROR: ^7 superspec can not open ", fn, " for writing.\n");
+       }
+       else
+       {
+               fputs(fh, _SSMAGIX);
+               fputs(fh, "\n");
+               fputs(fh, ftos(self.autospec_flags));
+               fputs(fh, "\n");
+               fputs(fh, ftos(self.superspec_flags));
+               fputs(fh, "\n");
+               fputs(fh, self.superspec_itemfilter);
+               fputs(fh, "\n");
+               fclose(fh);
+       }
+}
+
+void superspec_msg(string _center_title, string _con_title, entity _to, string _msg, float _spamlevel)
+{
+
+       sprint(_to, strcat(_con_title, _msg));
+
+       if(_to.superspec_flags & SSF_SILENT)
+               return;
+
+       if(_spamlevel > 1)
+               if not(_to.superspec_flags & SSF_VERBOSE)
+                       return;
+
+       centerprint(_to, strcat(_center_title, _msg));
+}
+
+float superspec_filteritem(entity _for, entity _item)
+{
+       float i;
+
+       if(!_for.superspec_itemfilter)
+               return TRUE;
+
+       if(_for.superspec_itemfilter == "")
+               return TRUE;
+
+       float l = tokenize_console(_for.superspec_itemfilter);
+       for(i = 0; i < l; ++i)
+       {
+               if(argv(i) == _item.classname)
+                       return TRUE;
+       }
+
+       return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(superspec_ItemTouch)
 {
        entity _oldself = self;
        entity _item = self;
-       
+
        FOR_EACH_SPEC(self)
        {
-               //centerprint(self, sprintf("Player %s^7 just grabbed a ^3%s\n", other.netname, _item.classname));
-               
-               if( (self.autospec_flags & ASF_SHIELD && _item.invincible_finished) ||
-                       (self.autospec_flags & ASF_STRENGTH && _item.strength_finished) ||
-                       (self.autospec_flags & ASF_MEGA_AR && _item.classname == "item_armor_large") ||
-                       (self.autospec_flags & ASF_MEGA_HP && _item.classname == "item_health_mega") )          
-                               _spectate(other);
+               if(self.superspec_flags & SSF_ITEMMSG)
+                       if(superspec_filteritem(self, _item))
+                       {
+                               if(self.superspec_flags & SSF_VERBOSE)
+                                       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)
+                               {
+                                       _spectate(other);
+
+                                       self = _oldself;
+                                       return FALSE;
+                               }
+                       }
+
+
+               if((self.autospec_flags & ASF_SHIELD && _item.invincible_finished) ||
+                               (self.autospec_flags & ASF_STRENGTH && _item.strength_finished) ||
+                               (self.autospec_flags& ASF_MEGA_AR && _item.classname == "item_armor_large") ||
+                               (self.autospec_flags& ASF_MEGA_HP && _item.classname == "item_health_mega") ||
+                               (self.autospec_flags& ASF_FLAG_GRAB && _item.classname == "item_flag_team"))
+               {
+
+                       if((self.enemy != other) || self.classname == "observer")
+                       {
+                               if(self.autospec_flags & ASF_OBSERVER_ONLY && self.classname != "observer")
+                               {
+                                       if(self.superspec_flags & SSF_VERBOSE)
+                                               superspec_msg("", "", self, sprintf("^8Ignored that %s^8 grabbed %s^8 since the observer_only option is ON\n", other.netname, _item.netname), 2);
+                               }
+                               else
+                               {
+                                       if(self.autospec_flags & ASF_SHOWWHAT)
+                                               superspec_msg("", "", self, sprintf("^7Following %s^7 due to picking up %s\n", other.netname, _item.netname), 2);
+
+                                       _spectate(other);
+                               }
+                       }
+               }
        }
-       
+
        self = _oldself;
-       
+
        return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
 {
+#define OPTIONINFO(flag,var,test,text,long,short) \
+    var = strcat(var, ((flag & test) ? "^2[ON]  ^7" : "^1[OFF] ^7")); \
+    var = strcat(var, text," ^7(^3 ", long, "^7 | ^3", short, " ^7)\n")
+
        if(MUTATOR_RETURNVALUE) // command was already handled?
                return FALSE;
 
        if(self.classname == "player")
                return FALSE;
 
+       if(cmd_name == "superspec_itemfilter")
+       {
+               if(argv(1) == "help")
+               {
+                       string _aspeco;
+                       _aspeco = strcat(_aspeco, "^7 superspec_itemfilter ^3\"item_classname1 item_classname2\"^7 only show thise items when ^2superspec ^3item_message^7 is on\n");
+                       _aspeco = strcat(_aspeco, "^3 clear^7 Remove the filter (show all pickups)\n");
+                       _aspeco = strcat(_aspeco, "^3 show ^7 Display current filter\n");
+                       superspec_msg("^3superspec_itemfilter help:\n\n\n", "\n^3superspec_itemfilter help:\n", self, _aspeco, 1);
+               }
+               else if(argv(1) == "clear")
+               {
+                       if(self.superspec_itemfilter != "")
+                               strunzone(self.superspec_itemfilter);
+
+                       self.superspec_itemfilter = "";
+               }
+               else if(argv(1) == "show" || argv(1) == "")
+               {
+                       if(self.superspec_itemfilter == "")
+                       {
+                               superspec_msg("^3superspec_itemfilter^7 is ^1not^7 set", "\n^3superspec_itemfilter^7 is ^1not^7 set\n", self, "", 1);
+                               return TRUE;
+                       }
+                       float i;
+                       float l = tokenize_console(self.superspec_itemfilter);
+                       string _msg;
+                       for(i = 0; i < l; ++i)
+                               _msg = strcat(_msg, "^3#", ftos(i), " ^7", argv(i), "\n");
+                               //_msg = sprintf("^3#%d^7 %s\n%s", i, _msg, argv(i));
+
+                       _msg = strcat(_msg,"\n");
+
+                       superspec_msg("^3superspec_itemfilter is:\n\n\n", "\n^3superspec_itemfilter is:\n", self, _msg, 1);
+               }
+               else
+               {
+                       if(self.superspec_itemfilter != "")
+                               strunzone(self.superspec_itemfilter);
+
+                       self.superspec_itemfilter = strzone(argv(1));
+               }
+
+
+               return TRUE;
+       }
+
+       if(cmd_name == "superspec")
+       {
+               string _aspeco;
+
+               if(cmd_argc > 1)
+               {
+                       float i, _bits, _start = 1;
+                       if(argv(1) == "help")
+                       {
+                               _aspeco = "";
+                               _aspeco = strcat(_aspeco, "use cmd superspec [option] [on|off] to set options\n\n");
+                               _aspeco = strcat(_aspeco, "^3 silent ^7(short^5 si^7) supress ALL mesagess from superspectate.\n");
+                               _aspeco = strcat(_aspeco, "^3 verrbose ^7(short^5 ve^7) makes superspectate print some additional information.\n");
+                               _aspeco = strcat(_aspeco, "^3 item_message ^7(short^5 im^7) makes superspectate print items that was picked up.\n");
+                               _aspeco = strcat(_aspeco, "^7    Use cmd superspec_itemfilter \"item_class1 item_class2\" to set up a filter of what to show with ^3item_message.\n");
+                               superspec_msg("^2Available Super Spectate ^3options:\n\n\n", "\n^2Available Super Spectate ^3options:\n", self, _aspeco, 1);
+                               return TRUE;
+                       }
+
+                       if(argv(1) == "clear")
+                       {
+                               self.superspec_flags = 0;
+                               _start = 2;
+                       }
+
+                       for(i = _start; i < cmd_argc; ++i)
+                       {
+                               if(argv(i) == "on" || argv(i) == "1")§
+                               {
+                                       self.superspec_flags |= _bits;
+                                       _bits = 0;
+                               }
+                               else if(argv(i) == "off" || argv(i) == "0")
+                               {
+                                       if(_start == 1)
+                                               self.superspec_flags &~= _bits;
+
+                                       _bits = 0;
+                               }
+                               else
+                               {
+                                       if((argv(i) == "silent") || (argv(i) == "si"§)) _bits |= SSF_SILENT ;
+                                       if((argv(i) == "verbose") || (argv(i) == "ve")) _bits |= SSF_VERBOSE;
+                                       if((argv(i) == "item_message") || (argv(i) == "im")) _bits |= SSF_ITEMMSG;
+                               }
+                       }
+               }
+
+
+               OPTIONINFO(self.superspec_flags, _aspeco, SSF_SILENT, "Silent", "silent", "si");
+               OPTIONINFO(self.superspec_flags, _aspeco, SSF_VERBOSE, "Verbose", "verbose", "ve");
+               OPTIONINFO(self.superspec_flags, _aspeco, SSF_ITEMMSG, "Item pickup messages", "item_message", "im");
+
+               superspec_msg("^3Current Super Spectate options are:\n\n\n\n\n", "\n^3Current Super Spectate options are:\n", self, _aspeco, 1);
+               return TRUE;
+
+       }
+
+/////////////////////
+
        if(cmd_name == "autospec")
        {
+               string _aspeco;
                if(cmd_argc > 1)
                {
-#define STRING2FLAG(str,flg) if(argv(i) == str) _bits |= flg
+                       if(argv(1) == "help")
+                       {
+                               _aspeco = "";
+                               _aspeco = strcat(_aspeco, "use cmd autospec [option] [on|off] to set options\n\n");
+                               _aspeco = strcat(_aspeco, "^3 strength ^7(short^5 st^7) for automatic spectate on strength powerup\n");
+                               _aspeco = strcat(_aspeco, "^3 shield ^7(short^5 sh^7) for automatic spectate on shield powerup\n");
+                               _aspeco = strcat(_aspeco, "^3 mega_health ^7(short^5 mh^7) for automatic spectate on mega health\n");
+                               _aspeco = strcat(_aspeco, "^3 mega_armor ^7(short^5 ma^7) for automatic spectate on mega armor\n");
+                               _aspeco = strcat(_aspeco, "^3 flag_grab ^7(short^5 fg^7) for automatic spectate on CTF flag grab\n");
+                               _aspeco = strcat(_aspeco, "^3 observer_only (short^5 oo^7) for automatic spectate only if in observer mode\n");
+                               _aspeco = strcat(_aspeco, "^3 show_what (short^5 sw^7) to display what event triggerd autospectate\n");
+                               _aspeco = strcat(_aspeco, "^3 item_msg ^7(short^5 im^7) to autospec when item_message in superspectate is triggerd\n");
+                               _aspeco = strcat(_aspeco, "^3 all ^7(short ^5aa^7) turn everything on/off\n");
+                               superspec_msg("^2Available Auto Spectate ^3options:\n\n\n", "\n^2Available Auto Spectate ^3options:\n", self, _aspeco, 1);
+                               return TRUE;
+                       }
+
                        float i, _bits, _start = 1;
                        if(argv(1) == "clear")
                        {
@@ -61,7 +301,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
 
                        for(i = _start; i < cmd_argc; ++i)
                        {
-                               if(argv(i) == "on" || argv(i) == "1")§
+                               if(argv(i) == "on" || argv(i) == "1")
                                {
                                        self.autospec_flags |= _bits;
                                        _bits = 0;
@@ -75,32 +315,32 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                                }
                                else
                                {
-                                       STRING2FLAG("strength", ASF_STRENGTH);
-                                       STRING2FLAG("shield", ASF_SHIELD);
-                                       STRING2FLAG("mega_health", ASF_MEGA_HP);
-                                       STRING2FLAG("mega_armor", ASF_MEGA_AR);
-                                       STRING2FLAG("all", ASF_ALL);
+                                       if((argv(i) == "strength") || (argv(i) == "st")) _bits |= ASF_STRENGTH;
+                                       if((argv(i) == "shield") || (argv(i) == "sh")) _bits |= ASF_SHIELD;
+                                       if((argv(i) == "mega_health") || (argv(i) == "mh")) _bits |= ASF_MEGA_HP;
+                                       if((argv(i) == "mega_armor") || (argv(i) == "ma")) _bits |= ASF_MEGA_AR;
+                                       if((argv(i) == "flag_grab") || (argv(i) == "fg")) _bits |= ASF_FLAG_GRAB;
+                                       if((argv(i) == "observer_only") || (argv(i) == "oo")) _bits |= ASF_OBSERVER_ONLY;
+                                       if((argv(i) == "show_what") || (argv(i) == "sw")) _bits |= ASF_SHOWWHAT;
+                                       if((argv(i) == "item_msg") || (argv(i) == "im")) _bits |= ASF_SSIM;
+                                       if((argv(i) == "all") || (argv(i) == "aa")) _bits |= ASF_ALL;
                                }
                        }
                }
-               
-               string _aspeco = "^3Current auto spectate options are:\n\n\n\n\n";
-#undef STRING2FLAG
-
-#define SPECOCLR(var,test,text) \
-    var = strcat(var, ((self.autospec_flags & test) ? "^2" : "^1")); \
-    var = strcat(var,text)
 
-               SPECOCLR(_aspeco, ASF_STRENGTH, "Strength\n\n");
-               SPECOCLR(_aspeco, ASF_SHIELD, "Shiled\n\n");
-               SPECOCLR(_aspeco, ASF_MEGA_HP, "Mega Health\n\n");
-               SPECOCLR(_aspeco, ASF_MEGA_AR, "Mega Armor\n\n");
-#undef SPECOCLR
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_STRENGTH, "Strength", "strength", "st");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_SHIELD, "Shiled", "shield", "sh");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_MEGA_HP, "Mega Health", "mega_health", "mh");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_MEGA_AR, "Mega Armor", "mega_armor", "ma");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_FLAG_GRAB, "Flag grab", "flag_grab","fg");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_OBSERVER_ONLY, "Only switch if Observer", "observer_only", "oo");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_SHOWWHAT, "Show what item triggered spectate", "show_what", "sw");
+               OPTIONINFO(self.autospec_flags, _aspeco, ASF_SSIM, "Switch on superspec item message", "item_msg", "im");
 
-               centerprint(self, _aspeco);
+               superspec_msg("^3Current auto spectate options are:\n\n\n\n\n", "\n^3Current auto spectate options are:\n", self, _aspeco, 1);
                return TRUE;
        }
-       
+
        if(cmd_name == "followpowerup")
        {
                entity _player;
@@ -109,8 +349,8 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                        if(_player.strength_finished > time || _player.invincible_finished > time)
                                return _spectate(_player);
                }
-               
-               centerprint(self, "No active powerups\n");
+
+               superspec_msg("", "", self, "No active powerups\n", 1);
                return TRUE;
        }
 
@@ -122,8 +362,8 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                        if(_player.strength_finished > time)
                                return _spectate(_player);
                }
-               
-               centerprint(self, "No active Strength\n");
+
+               superspec_msg("", "", self, "No active Strength\n", 1);
                return TRUE;
        }
 
@@ -135,8 +375,8 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
                        if(_player.invincible_finished > time)
                                return _spectate(_player);
                }
-               
-               centerprint(self, "No active Shield\n");
+
+               superspec_msg("", "", self, "No active Shield\n", 1);
                return TRUE;
        }
 
@@ -144,29 +384,30 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand)
        {
                if(!g_ctf)
                        return TRUE;
-               
-               entity _player;         
+
+               entity _player;
                float _team;
-               
+
                if(cmd_argc == 2)
-               {                       
+               {
                        if(argv(1) == "red")
                                _team = COLOR_TEAM1;
                        else
                                _team = COLOR_TEAM2;
                }
-               
+
                FOR_EACH_PLAYER(_player)
                {
                        if(_player.flagcarried && (_player.team == _team || _team == 0))
                                return _spectate(_player);
                }
-               
-               centerprint(self, "No active flag carrier\n");
+
+               superspec_msg("", "", self, "No active flag carrier\n", 1);
                return TRUE;
-       }       
+       }
 
        return FALSE;
+#undef OPTIONINFO
 }
 
 MUTATOR_HOOKFUNCTION(superspec_BuildMutatorsString)
@@ -185,17 +426,80 @@ MUTATOR_HOOKFUNCTION(superspec_BuildMutatorsPrettyString)
 MUTATOR_HOOKFUNCTION(superspec_PlayerSpawn)
 {
 
+    return FALSE;
+}
+*/
+
+void superspec_hello()
+{
+       if(self.enemy.crypto_idfp == "")
+               centerprint(self.enemy, "Your clinet have/allow no crypto id, superspec options will not be saved/restored.");
+       else
+               centerprint(self.enemy, sprintf("Hello %s\nSince your client has a Crypto ID, your superspec preferenses will be presisted on this server.", self.enemy.netname));
+
+       remove(self);
+}
+
+MUTATOR_HOOKFUNCTION(superspec_ClientConnect)
+{
+       string fn = "superspec-local.options";
+       float fh;
+
+       self.superspec_flags = SSF_VERBOSE;
+       self.superspec_itemfilter = "";
+
+       entity _hello = spawn();
+       _hello.enemy = self;
+       _hello.think = superspec_hello;
+       _hello.nextthink = time + 5;
+
+       if not(_ISLOCAL)
+       {
+               if(self.crypto_idfp == "")
+                       return FALSE;
+
+               fn = sprintf("superspec-%s.options", uri_escape(self.crypto_idfp));
+       }
+
+       if((fh = fopen(fn, FILE_READ)) < 0)
+       {
+               dprint("^1ERROR: ^7 superspec can not open ", fn, " for reading.\n");
+       }
+       else
+       {
+               string _magic = fgets(fh);
+               if(_magic != _SSMAGIX)
+               {
+                       dprint("^1ERROR^7 While reading superspec options file: unkown magic\n");
+               }
+               else
+               {
+                       self.autospec_flags = stof(fgets(fh));
+                       self.superspec_flags = stof(fgets(fh));
+                       self.superspec_itemfilter = strzone(fgets(fh));
+               }
+               fclose(fh);
+       }
+
        return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(superspec_ClientDisconnect)
 {
-
+       superspec_save_client_conf();
        return FALSE;
 }
+
+
+/*
+MUTATOR_HOOKFUNCTION(superspec_MakePlayerObserver)
+{
+    return FALSE;
+}
+
 MUTATOR_HOOKFUNCTION(superspec_PlayerPreThink)
 {
-       return FALSE;
+    return FALSE;
 }
 */
 
@@ -206,10 +510,11 @@ MUTATOR_DEFINITION(mutator_superspec)
        MUTATOR_HOOK(BuildMutatorsPrettyString, superspec_BuildMutatorsPrettyString, CBC_ORDER_ANY);
        MUTATOR_HOOK(SV_ParseClientCommand, superspec_SV_ParseClientCommand, CBC_ORDER_ANY);
        MUTATOR_HOOK(ItemTouch, superspec_ItemTouch, CBC_ORDER_ANY);
-       //MUTATOR_HOOK(ClientConnect, superspec_ClientConnect, CBC_ORDER_ANY);
+       MUTATOR_HOOK(ClientConnect, superspec_ClientConnect, CBC_ORDER_ANY);
        //MUTATOR_HOOK(PlayerSpawn, superspec_PlayerSpawn, CBC_ORDER_ANY);
        //MUTATOR_HOOK(PlayerPreThink, superspec_PlayerPreThink, CBC_ORDER_ANY);
-       //MUTATOR_HOOK(ClientDisconnect, superspec_ClientDisconnect, CBC_ORDER_ANY);
+       //MUTATOR_HOOK(MakePlayerObserver, superspec_MakePlayerObserver, CBC_ORDER_ANY);
+       MUTATOR_HOOK(ClientDisconnect, superspec_ClientDisconnect, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {