REGISTER_MUTATOR(superspec, cvar("g_superspectate"));
#define _SSMAGIX "SUPERSPEC_OPTIONSFILE_V1"
-#define _ISLOCAL ((edict_num(1) == self) ? true : false)
+#define _ISLOCAL(ent) ((edict_num(1) == (ent)) ? true : false)
const float ASF_STRENGTH = BIT(0);
const float ASF_SHIELD = BIT(1);
.string superspec_itemfilter; //"classname1 classname2 ..."
-bool superspec_Spectate(entity _player)
-{SELFPARAM();
- if(Spectate(_player) == 1)
- TRANSMUTE(Spectator, self);
+bool superspec_Spectate(entity this, entity targ)
+{
+ if(Spectate(this, targ) == 1)
+ TRANSMUTE(Spectator, this);
return true;
}
-void superspec_save_client_conf()
-{SELFPARAM();
+void superspec_save_client_conf(entity this)
+{
string fn = "superspec-local.options";
float fh;
- if (!_ISLOCAL)
+ if (!_ISLOCAL(this))
{
- if(self.crypto_idfp == "")
+ if(this.crypto_idfp == "")
return;
- fn = sprintf("superspec-%s.options", uri_escape(self.crypto_idfp));
+ fn = sprintf("superspec-%s.options", uri_escape(this.crypto_idfp));
}
fh = fopen(fn, FILE_WRITE);
{
fputs(fh, _SSMAGIX);
fputs(fh, "\n");
- fputs(fh, ftos(self.autospec_flags));
+ fputs(fh, ftos(this.autospec_flags));
fputs(fh, "\n");
- fputs(fh, ftos(self.superspec_flags));
+ fputs(fh, ftos(this.superspec_flags));
fputs(fh, "\n");
- fputs(fh, self.superspec_itemfilter);
+ fputs(fh, this.superspec_itemfilter);
fputs(fh, "\n");
fclose(fh);
}
}
MUTATOR_HOOKFUNCTION(superspec, ItemTouch)
-{SELFPARAM();
- entity _item = self;
+{
+ entity item = M_ARGV(0, entity);
+ entity toucher = M_ARGV(1, entity);
FOREACH_CLIENT(true, LAMBDA(
if(!IS_SPEC(it) && !IS_OBSERVER(it))
continue;
if(it.superspec_flags & SSF_ITEMMSG)
- if(superspec_filteritem(it, _item))
+ if(superspec_filteritem(it, item))
{
if(it.superspec_flags & SSF_VERBOSE)
- superspec_msg("", "", it, sprintf("Player %s^7 just picked up ^3%s\n", other.netname, _item.netname), 1);
+ superspec_msg("", "", it, sprintf("Player %s^7 just picked up ^3%s\n", toucher.netname, item.netname), 1);
else
- superspec_msg("", "", it, sprintf("Player %s^7 just picked up ^3%s\n^8(%s^8)\n", other.netname, _item.netname, _item.classname), 1);
- if((it.autospec_flags & ASF_SSIM) && it.enemy != other)
+ superspec_msg("", "", it, sprintf("Player %s^7 just picked up ^3%s\n^8(%s^8)\n", toucher.netname, item.netname, item.classname), 1);
+ if((it.autospec_flags & ASF_SSIM) && it.enemy != toucher)
{
- WITHSELF(it, superspec_Spectate(other));
+ superspec_Spectate(it, toucher);
return MUT_ITEMTOUCH_CONTINUE;
}
}
- if((it.autospec_flags & ASF_SHIELD && _item.invincible_finished) ||
- (it.autospec_flags & ASF_STRENGTH && _item.strength_finished) ||
- (it.autospec_flags & ASF_MEGA_AR && _item.itemdef == ITEM_ArmorMega) ||
- (it.autospec_flags & ASF_MEGA_HP && _item.itemdef == ITEM_HealthMega) ||
- (it.autospec_flags & ASF_FLAG_GRAB && _item.classname == "item_flag_team"))
+ if((it.autospec_flags & ASF_SHIELD && item.invincible_finished) ||
+ (it.autospec_flags & ASF_STRENGTH && item.strength_finished) ||
+ (it.autospec_flags & ASF_MEGA_AR && item.itemdef == ITEM_ArmorMega) ||
+ (it.autospec_flags & ASF_MEGA_HP && item.itemdef == ITEM_HealthMega) ||
+ (it.autospec_flags & ASF_FLAG_GRAB && item.classname == "item_flag_team"))
{
- if((it.enemy != other) || IS_OBSERVER(it))
+ if((it.enemy != toucher) || IS_OBSERVER(it))
{
if(it.autospec_flags & ASF_OBSERVER_ONLY && !IS_OBSERVER(it))
{
if(it.superspec_flags & SSF_VERBOSE)
- superspec_msg("", "", it, sprintf("^8Ignored that ^7%s^8 grabbed %s^8 since the observer_only option is ON\n", other.netname, _item.netname), 2);
+ superspec_msg("", "", it, sprintf("^8Ignored that ^7%s^8 grabbed %s^8 since the observer_only option is ON\n", toucher.netname, item.netname), 2);
}
else
{
if(it.autospec_flags & ASF_SHOWWHAT)
- superspec_msg("", "", it, sprintf("^7Following %s^7 due to picking up %s\n", other.netname, _item.netname), 2);
+ superspec_msg("", "", it, sprintf("^7Following %s^7 due to picking up %s\n", toucher.netname, item.netname), 2);
- WITHSELF(it, superspec_Spectate(other));
+ superspec_Spectate(it, toucher);
}
}
}
var = strcat(var, text," ^7(^3 ", long, "^7 | ^3", short, " ^7)\n")
if(MUTATOR_RETURNVALUE) // command was already handled?
- return false;
+ return;
entity player = M_ARGV(0, entity);
string cmd_name = M_ARGV(1, string);
int cmd_argc = M_ARGV(2, int);
if(IS_PLAYER(player))
- return false;
+ return;
if(cmd_name == "superspec_itemfilter")
{
if(cmd_name == "followpowerup")
{
- FOREACH_CLIENT(IS_PLAYER(it) && (it.strength_finished > time || it.invincible_finished > time), LAMBDA(return superspec_Spectate(it)));
+ FOREACH_CLIENT(IS_PLAYER(it) && (it.strength_finished > time || it.invincible_finished > time), LAMBDA(return superspec_Spectate(player, it)));
superspec_msg("", "", player, "No active powerup\n", 1);
return true;
if(cmd_name == "followstrength")
{
- FOREACH_CLIENT(IS_PLAYER(it) && it.strength_finished > time, LAMBDA(return superspec_Spectate(it)));
+ FOREACH_CLIENT(IS_PLAYER(it) && it.strength_finished > time, LAMBDA(return superspec_Spectate(player, it)));
superspec_msg("", "", player, "No active Strength\n", 1);
return true;
if(cmd_name == "followshield")
{
- FOREACH_CLIENT(IS_PLAYER(it) && it.invincible_finished > time, LAMBDA(return superspec_Spectate(it)));
+ FOREACH_CLIENT(IS_PLAYER(it) && it.invincible_finished > time, LAMBDA(return superspec_Spectate(player, it)));
superspec_msg("", "", player, "No active Shield\n", 1);
return true;
}
-
- return false;
#undef OPTIONINFO
}
MUTATOR_HOOKFUNCTION(superspec, BuildMutatorsString)
{
- ret_string = strcat(ret_string, ":SS");
- return 0;
+ M_ARGV(0, string) = strcat(M_ARGV(0, string), ":SS");
}
MUTATOR_HOOKFUNCTION(superspec, BuildMutatorsPrettyString)
{
- ret_string = strcat(ret_string, ", Super Spectators");
- return 0;
+ M_ARGV(0, string) = strcat(M_ARGV(0, string), ", Super Spectators");
}
void superspec_hello(entity this)
{
- if(self.enemy.crypto_idfp == "")
- Send_Notification(NOTIF_ONE_ONLY, self.enemy, MSG_INFO, INFO_SUPERSPEC_MISSING_UID);
+ if(this.enemy.crypto_idfp == "")
+ Send_Notification(NOTIF_ONE_ONLY, this.enemy, MSG_INFO, INFO_SUPERSPEC_MISSING_UID);
- remove(self);
+ remove(this);
}
MUTATOR_HOOKFUNCTION(superspec, ClientConnect)
-{SELFPARAM();
- if(!IS_REAL_CLIENT(self))
- return false;
+{
+ entity player = M_ARGV(0, entity);
+
+ if(!IS_REAL_CLIENT(player))
+ return;
string fn = "superspec-local.options";
float fh;
- self.superspec_flags = SSF_VERBOSE;
- self.superspec_itemfilter = "";
+ player.superspec_flags = SSF_VERBOSE;
+ player.superspec_itemfilter = "";
entity _hello = spawn();
- _hello.enemy = self;
+ _hello.enemy = player;
setthink(_hello, superspec_hello);
_hello.nextthink = time + 5;
- if (!_ISLOCAL)
+ if (!_ISLOCAL(player))
{
- if(self.crypto_idfp == "")
- return false;
+ if(player.crypto_idfp == "")
+ return;
- fn = sprintf("superspec-%s.options", uri_escape(self.crypto_idfp));
+ fn = sprintf("superspec-%s.options", uri_escape(player.crypto_idfp));
}
fh = fopen(fn, FILE_READ);
}
else
{
- self.autospec_flags = stof(fgets(fh));
- self.superspec_flags = stof(fgets(fh));
- self.superspec_itemfilter = strzone(fgets(fh));
+ player.autospec_flags = stof(fgets(fh));
+ player.superspec_flags = stof(fgets(fh));
+ player.superspec_itemfilter = strzone(fgets(fh));
}
fclose(fh);
}
-
- return false;
}
MUTATOR_HOOKFUNCTION(superspec, PlayerDies)
if(it.autospec_flags & ASF_SHOWWHAT)
superspec_msg("", "", it, sprintf("^7Following %s^7 due to followkiller\n", frag_attacker.netname), 2);
- WITHSELF(it, superspec_Spectate(frag_attacker));
+ superspec_Spectate(it, frag_attacker);
}
));
-
- return false;
}
MUTATOR_HOOKFUNCTION(superspec, ClientDisconnect)
{
entity player = M_ARGV(0, entity);
- WITHSELF(player, superspec_save_client_conf());
+ superspec_save_client_conf(player);
}
#endif
projects / xonotic / xonotic-data.pk3dir.git / blobdiff