From 44cfff453ab1bc20889f009755b1490fe8db590d Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 16 Jul 2017 07:06:21 +1000 Subject: [PATCH] Port netname_previous to ClientState --- qcsrc/server/client.qc | 12 +++++------- qcsrc/server/client.qh | 1 + 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index d891ac1d0..b1059ca49 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -154,8 +154,6 @@ void ClientData_Touch(entity e) FOREACH_CLIENT(IS_REAL_CLIENT(it) && it != e && IS_SPEC(it) && it.enemy == e, LAMBDA(it.clientdata.SendFlags = 1)); } -.string netname_previous; - void SetSpectatee(entity this, entity spectatee); void SetSpectatee_status(entity this, int spectatee_num); @@ -1191,7 +1189,7 @@ void ClientConnect(entity this) this.just_joined = true; // stop spamming the eventlog with additional lines when the client connects - this.netname_previous = strzone(this.netname); + CS(this).netname_previous = strzone(this.netname); if(teamplay && IS_PLAYER(this)) Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_CONNECT_TEAM), this.netname); @@ -1320,7 +1318,7 @@ void ClientDisconnect(entity this) bot_relinkplayerlist(); - if (this.netname_previous) strunzone(this.netname_previous); + if (CS(this).netname_previous) strunzone(CS(this).netname_previous); if (this.clientstatus) strunzone(this.clientstatus); if (this.weaponorder_byimpulse) strunzone(this.weaponorder_byimpulse); if (this.personal) delete(this.personal); @@ -2476,12 +2474,12 @@ void PlayerPreThink (entity this) this.netname = strzone(sprintf("Player#%d", this.playerid)); // stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe? } - if (this.netname != this.netname_previous) { + if (this.netname != CS(this).netname_previous) { if (autocvar_sv_eventlog) { GameLogEcho(strcat(":name:", ftos(this.playerid), ":", playername(this, false))); } - if (this.netname_previous) strunzone(this.netname_previous); - this.netname_previous = strzone(this.netname); + if (CS(this).netname_previous) strunzone(CS(this).netname_previous); + CS(this).netname_previous = strzone(this.netname); } // version nagging diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index 924346553..660cb7c1e 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -84,6 +84,7 @@ CLASS(Client, Object) ATTRIB(Client, jointime, float, this.jointime); ATTRIB(Client, spectatortime, float, this.spectatortime); ATTRIB(Client, version_nagtime, float, this.version_nagtime); + ATTRIB(Client, netname_previous, string, this.netname_previous); METHOD(Client, m_unwind, bool(Client this)); -- 2.39.2