From 18bd49fa931fff143ba3cfff468774aea65bd882 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Mon, 18 Apr 2022 05:23:00 +1000 Subject: [PATCH] Remove legacy MOTD logic --- qcsrc/client/main.qc | 2 +- qcsrc/common/physics/player.qh | 2 +- qcsrc/server/client.qc | 62 ---------------------------------- qcsrc/server/client.qh | 2 -- 4 files changed, 2 insertions(+), 66 deletions(-) diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 40d6cbbc2..ea7e1dda8 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1449,7 +1449,7 @@ void Welcome_Message_Show_Try() localcmd("\ntogglemenu 0\n"); } else - centerprint_Add(ORDINAL(CPID_MOTD), strcat(hostname, "\n\n\n", welcome_msg), -1, 0); + centerprint_Add(ORDINAL(CPID_MOTD), strcat(hostname, "\n\n\n", welcome_msg), 15, 0); strfree(welcome_msg); welcome_msg_menu_check_maxtime = 0; diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index 0a5b049f5..4bd214929 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -149,7 +149,7 @@ REPLICATE_INIT(bool, cvar_cl_movement_track_canjump); #define PHYS_INPUT_BUTTON_ZOOM(s) PHYS_INPUT_BUTTON_BUTTON4(s) #define PHYS_INPUT_BUTTON_CROUCH(s) PHYS_INPUT_BUTTON_BUTTON5(s) #define PHYS_INPUT_BUTTON_HOOK(s) PHYS_INPUT_BUTTON_BUTTON6(s) -#define PHYS_INPUT_BUTTON_INFO(s) PHYS_INPUT_BUTTON_BUTTON7(s) +#define PHYS_INPUT_BUTTON_INFO(s) PHYS_INPUT_BUTTON_BUTTON7(s) // button7 is FREE #define PHYS_INPUT_BUTTON_DRAG(s) PHYS_INPUT_BUTTON_BUTTON8(s) #define PHYS_INPUT_BUTTON_USE(s) PHYS_INPUT_BUTTON_BUTTON_USE(s) #define PHYS_INPUT_BUTTON_CHAT(s) PHYS_INPUT_BUTTON_BUTTON_CHAT(s) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 2e6e9e6b8..08f9ff664 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -1177,9 +1177,6 @@ void ClientConnect(entity this) if (player_count == 1) localcmd("\nsv_hook_firstjoin\n"); - - if (IS_REAL_CLIENT(this) && !IS_PLAYER(this) && !autocvar_g_campaign) - CS(this).motd_actived_time = -1; // the welcome message is shown by the client } /* ============= @@ -2038,62 +2035,6 @@ int nJoinAllowed(entity this, entity ignore) return free_slots; } -void PrintWelcomeMessage(entity this) -{ - if(CS(this).motd_actived_time == 0) - { - if (autocvar_g_campaign) { - if ((IS_PLAYER(this) && PHYS_INPUT_BUTTON_INFO(this)) || (!IS_PLAYER(this))) { - CS(this).motd_actived_time = time; - SendWelcomemessage(this, false); - } - } else { - if (PHYS_INPUT_BUTTON_INFO(this)) { - CS(this).motd_actived_time = time; - SendWelcomemessage(this, true); - } - } - } - else if(CS(this).motd_actived_time > 0) // showing MOTD or campaign message - { - if (autocvar_g_campaign) { - if (PHYS_INPUT_BUTTON_INFO(this)) - CS(this).motd_actived_time = time; - else if ((time - CS(this).motd_actived_time > 2) && IS_PLAYER(this)) { // hide it some seconds after BUTTON_INFO has been released - CS(this).motd_actived_time = 0; - Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_MOTD); - } - } else { - if (PHYS_INPUT_BUTTON_INFO(this)) - CS(this).motd_actived_time = time; - else if (time - CS(this).motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released - CS(this).motd_actived_time = 0; - Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_MOTD); - } - } - } - else //if(CS(this).motd_actived_time < 0) // just connected, motd is active - { - if(PHYS_INPUT_BUTTON_INFO(this)) // BUTTON_INFO hides initial MOTD - CS(this).motd_actived_time = -2; // wait until BUTTON_INFO gets released - else if (CS(this).motd_actived_time == -2) - { - // instantly hide MOTD - CS(this).motd_actived_time = 0; - Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_MOTD); - } - else if (IS_PLAYER(this) || IS_SPEC(this)) - { - // FIXME occasionally for some reason MOTD never goes away - // delay MOTD removal a little bit in the hope it fixes this bug - if (CS(this).motd_actived_time == -1) // MOTD marked to fade away as soon as client becomes player or spectator - CS(this).motd_actived_time = -(5 + floor(random() * 10)); // add small delay - else //if (CS(this).motd_actived_time < -2) - CS(this).motd_actived_time++; - } - } -} - bool joinAllowed(entity this) { if (CS(this).version_mismatch) return false; @@ -2525,9 +2466,6 @@ void PlayerPreThink (entity this) PlayerUseKey(this); CS(this).usekeypressed = PHYS_INPUT_BUTTON_USE(this); - if (IS_REAL_CLIENT(this)) - PrintWelcomeMessage(this); - if (IS_PLAYER(this)) { if (IS_REAL_CLIENT(this) && time < CS(this).jointime + MIN_SPEC_TIME) error("Client can't be spawned as player on connection!"); diff --git a/qcsrc/server/client.qh b/qcsrc/server/client.qh index 5fc5422c6..996a68f62 100644 --- a/qcsrc/server/client.qh +++ b/qcsrc/server/client.qh @@ -64,7 +64,6 @@ bool autocvar_sv_showspectators; .float jointime; // time of connecting .float startplaytime; // time of switching from spectator to player .float alivetime; // time of being alive -.float motd_actived_time; // used for both motd and campaign_message .bool wasplayer; @@ -159,7 +158,6 @@ CLASS(Client, Object) ATTRIB(Client, teamkill_soundtime, float, this.teamkill_soundtime); ATTRIB(Client, teamkill_soundsource, entity, this.teamkill_soundsource); ATTRIB(Client, usekeypressed, bool, this.usekeypressed); - ATTRIB(Client, motd_actived_time, float, this.motd_actived_time); ATTRIB(Client, jointime, float, this.jointime); ATTRIB(Client, spectatortime, float, this.spectatortime); ATTRIB(Client, startplaytime, float, this.startplaytime); -- 2.39.2