X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_superspec.qc;h=96c9f25305534a38d1aba3c695d4b18f0e97a451;hb=4d42bd03a1c0c82d64619668a447a0009f9713c7;hp=5a050356de617f251898f27648ca1736a91065f8;hpb=f5689f55e2665c871cfabcee9f8534c482e2b79b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/mutator_superspec.qc b/qcsrc/server/mutators/mutator_superspec.qc index 5a050356d..96c9f2530 100644 --- a/qcsrc/server/mutators/mutator_superspec.qc +++ b/qcsrc/server/mutators/mutator_superspec.qc @@ -21,11 +21,8 @@ float _spectate(entity _player) { - if(SpectateNext(_player) == 1) - { - PutObserverInServer(); + if(Spectate(_player) == 1) self.classname = "spectator"; - } return TRUE; } @@ -35,7 +32,6 @@ void superspec_save_client_conf() string fn = "superspec-local.options"; float fh; - if not(_ISLOCAL) { if(self.crypto_idfp == "") @@ -65,7 +61,6 @@ void superspec_save_client_conf() 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) @@ -82,7 +77,7 @@ float superspec_filteritem(entity _for, entity _item) { float i; - if(!_for.superspec_itemfilter) + if(_for.superspec_itemfilter == "") return TRUE; if(_for.superspec_itemfilter == "") @@ -117,11 +112,10 @@ MUTATOR_HOOKFUNCTION(superspec_ItemTouch) _spectate(other); self = _oldself; - return FALSE; + return MUT_ITEMTOUCH_CONTINUE; } } - 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") || @@ -129,12 +123,12 @@ MUTATOR_HOOKFUNCTION(superspec_ItemTouch) (self.autospec_flags& ASF_FLAG_GRAB && _item.classname == "item_flag_team")) { - if((self.enemy != other) || self.classname == "observer") + if((self.enemy != other) || IS_OBSERVER(self)) { - if(self.autospec_flags & ASF_OBSERVER_ONLY && self.classname != "observer") + if(self.autospec_flags & ASF_OBSERVER_ONLY && !IS_OBSERVER(self)) { 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); + superspec_msg("", "", self, sprintf("^8Ignored that ^7%s^8 grabbed %s^8 since the observer_only option is ON\n", other.netname, _item.netname), 2); } else { @@ -149,7 +143,7 @@ MUTATOR_HOOKFUNCTION(superspec_ItemTouch) self = _oldself; - return FALSE; + return MUT_ITEMTOUCH_CONTINUE; } MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) @@ -161,7 +155,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) if(MUTATOR_RETURNVALUE) // command was already handled? return FALSE; - if(self.classname == "player") + if(IS_PLAYER(self)) return FALSE; if(cmd_name == "superspec_itemfilter") @@ -207,7 +201,6 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) self.superspec_itemfilter = strzone(argv(1)); } - return TRUE; } @@ -221,9 +214,9 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) if(argv(1) == "help") { _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, "^3 silent ^7(short^5 si^7) supresses ALL messages from superspectate.\n"); + _aspeco = strcat(_aspeco, "^3 verbose ^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 were 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; @@ -258,15 +251,14 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) } } - _aspeco = ""; 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; + return TRUE; } ///////////////////// @@ -284,10 +276,10 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) _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"); + _aspeco = strcat(_aspeco, "^3 observer_only ^7(short^5 oo^7) for automatic spectate only if in observer mode\n"); + _aspeco = strcat(_aspeco, "^3 show_what ^7(short^5 sw^7) to display what event triggered autospectate\n"); + _aspeco = strcat(_aspeco, "^3 item_msg ^7(short^5 im^7) to autospec when item_message in superspectate is triggered\n"); + _aspeco = strcat(_aspeco, "^3 all ^7(short ^5aa^7) to 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; } @@ -334,7 +326,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) 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_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"); @@ -351,7 +343,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) return _spectate(_player); } - superspec_msg("", "", self, "No active powerups\n", 1); + superspec_msg("", "", self, "No active powerup\n", 1); return TRUE; } @@ -368,7 +360,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) return TRUE; } - if(cmd_name == "followstshield") + if(cmd_name == "followshield") { entity _player; FOR_EACH_PLAYER(_player) @@ -388,6 +380,7 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) entity _player; float _team = 0; + float found = FALSE; if(cmd_argc == 2) { @@ -400,10 +393,16 @@ MUTATOR_HOOKFUNCTION(superspec_SV_ParseClientCommand) FOR_EACH_PLAYER(_player) { if(_player.flagcarried && (_player.team == _team || _team == 0)) + { + found = TRUE; + if(_team == 0 && IS_SPEC(self) && self.enemy == _player) + continue; // already spectating a fc, try to find the other fc return _spectate(_player); + } } - superspec_msg("", "", self, "No active flag carrier\n", 1); + if(!found) + superspec_msg("", "", self, "No active flag carrier\n", 1); return TRUE; } @@ -423,27 +422,19 @@ MUTATOR_HOOKFUNCTION(superspec_BuildMutatorsPrettyString) return 0; } -/* -MUTATOR_HOOKFUNCTION(superspec_PlayerSpawn) -{ - - return FALSE; -} -*/ - void superspec_hello() { if(self.enemy.crypto_idfp == "") centerprint(self.enemy, "Your client 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)); + centerprint(self.enemy, sprintf("Hello %s\nSince your client has a Crypto ID, your superspec preferences will be persisted on this server.", self.enemy.netname)); remove(self); } MUTATOR_HOOKFUNCTION(superspec_ClientConnect) { - if(clienttype(self) != CLIENTTYPE_REAL) + if(!IS_REAL_CLIENT(self)) return FALSE; string fn = "superspec-local.options"; @@ -475,7 +466,7 @@ MUTATOR_HOOKFUNCTION(superspec_ClientConnect) string _magic = fgets(fh); if(_magic != _SSMAGIX) { - dprint("^1ERROR^7 While reading superspec options file: unkown magic\n"); + dprint("^1ERROR^7 While reading superspec options file: unknown magic\n"); } else { @@ -495,19 +486,6 @@ MUTATOR_HOOKFUNCTION(superspec_ClientDisconnect) return FALSE; } - -/* -MUTATOR_HOOKFUNCTION(superspec_MakePlayerObserver) -{ - return FALSE; -} - -MUTATOR_HOOKFUNCTION(superspec_PlayerPreThink) -{ - return FALSE; -} -*/ - MUTATOR_DEFINITION(mutator_superspec) { @@ -516,9 +494,6 @@ MUTATOR_DEFINITION(mutator_superspec) 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(PlayerSpawn, superspec_PlayerSpawn, CBC_ORDER_ANY); - //MUTATOR_HOOK(PlayerPreThink, superspec_PlayerPreThink, CBC_ORDER_ANY); - //MUTATOR_HOOK(MakePlayerObserver, superspec_MakePlayerObserver, CBC_ORDER_ANY); MUTATOR_HOOK(ClientDisconnect, superspec_ClientDisconnect, CBC_ORDER_ANY); return 0;