Merge remote-tracking branch 'origin/samual/fix_welcome_message'

diff --git a/hud_luminos.cfg b/hud_luminos.cfg
index de4dd05a852441dcd8c85a74b8a8d7697262c38d..0e4e4495b50bfe0a6433806b45f0e303655a38d8 100644 (file)
--- a/hud_luminos.cfg
+++ b/hud_luminos.cfg
@@ -232,7 +232,7 @@ seta hud_panel_physics_progressbar "1"
 seta hud_panel_physics_text "1"
 
 seta hud_panel_centerprint 1
-seta hud_panel_centerprint_pos "0.180000 0.260000"
+seta hud_panel_centerprint_pos "0.175000 0.260000"
 seta hud_panel_centerprint_size "0.650000 0.210000"
 seta hud_panel_centerprint_bg "0"
 seta hud_panel_centerprint_bg_color ""

diff --git a/hud_luminos_minimal.cfg b/hud_luminos_minimal.cfg
index 52d2aef67e98ba520abef50fa35ff2252d0746f8..9d255bb4acba033271d12e8b6de8371f11149bee 100644 (file)
--- a/hud_luminos_minimal.cfg
+++ b/hud_luminos_minimal.cfg
@@ -232,7 +232,7 @@ seta hud_panel_physics_progressbar "3"
 seta hud_panel_physics_text "2"
 
 seta hud_panel_centerprint 1
-seta hud_panel_centerprint_pos "0.180000 0.260000"
+seta hud_panel_centerprint_pos "0.175000 0.260000"
 seta hud_panel_centerprint_size "0.650000 0.210000"
 seta hud_panel_centerprint_bg "0"
 seta hud_panel_centerprint_bg_color ""

diff --git a/hud_luminos_old.cfg b/hud_luminos_old.cfg
index 8ff2dd2a82aab3de02637ca12822368413cba0ed..4308c0b4feb4646b99d23bb8aeff667849e949fd 100644 (file)
--- a/hud_luminos_old.cfg
+++ b/hud_luminos_old.cfg
@@ -232,7 +232,7 @@ seta hud_panel_physics_progressbar "1"
 seta hud_panel_physics_text "1"
 
 seta hud_panel_centerprint 1
-seta hud_panel_centerprint_pos "0.180000 0.260000"
+seta hud_panel_centerprint_pos "0.175000 0.260000"
 seta hud_panel_centerprint_size "0.650000 0.210000"
 seta hud_panel_centerprint_bg "0"
 seta hud_panel_centerprint_bg_color ""

diff --git a/hud_luminos_xhair_minimal.cfg b/hud_luminos_xhair_minimal.cfg
index 1d70bc03e9fe140e9f59163dd8106186de0e16f6..2aca597f6ede5adac177fb42198977e504546f93 100644 (file)
--- a/hud_luminos_xhair_minimal.cfg
+++ b/hud_luminos_xhair_minimal.cfg
@@ -232,7 +232,7 @@ seta hud_panel_physics_progressbar "3"
 seta hud_panel_physics_text "2"
 
 seta hud_panel_centerprint 1
-seta hud_panel_centerprint_pos "0.180000 0.260000"
+seta hud_panel_centerprint_pos "0.175000 0.260000"
 seta hud_panel_centerprint_size "0.650000 0.210000"
 seta hud_panel_centerprint_bg "0"
 seta hud_panel_centerprint_bg_color ""

diff --git a/hud_nexuiz.cfg b/hud_nexuiz.cfg
index 3b17d6cc446bfe9d9fd66231501e0b82fbba2e45..705af40a12ff230625c1ac3762524954050943aa 100644 (file)
--- a/hud_nexuiz.cfg
+++ b/hud_nexuiz.cfg
@@ -232,7 +232,7 @@ seta hud_panel_physics_progressbar "3"
 seta hud_panel_physics_text "2"
 
 seta hud_panel_centerprint 1
-seta hud_panel_centerprint_pos "0.180000 0.260000"
+seta hud_panel_centerprint_pos "0.175000 0.260000"
 seta hud_panel_centerprint_size "0.650000 0.210000"
 seta hud_panel_centerprint_bg "0"
 seta hud_panel_centerprint_bg_color ""

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 26d37400fd6449a9935c51b0b579d2fada848dbf..6ebee9fa1de67cfcdbd00e7d58ea429521593dc0 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2537,6 +2537,42 @@ void checkSpectatorBlock() {
        }
 }
 
+.float motd_actived_time; // used for both motd and campaign_message
+void PrintWelcomeMessage()
+{
+       if (self.motd_actived_time == 0) { // is there already a message showing?
+               if (autocvar_g_campaign) {
+                       if ((self.classname == "player" && self.BUTTON_INFO) || (self.classname != "player")) {
+                               self.motd_actived_time = time;
+                               Send_CSQC_Centerprint_Generic(self, CPID_MOTD, campaign_message, -1, 0);
+                       }
+               } else {
+                       if ((time - self.jointime > autocvar_welcome_message_time) && self.BUTTON_INFO) {
+                               self.motd_actived_time = time;
+                               Send_CSQC_Centerprint_Generic(self, CPID_MOTD, getwelcomemessage(), -1, 0);
+                       }
+               }
+       } else { // showing MOTD or campaign message
+               if (autocvar_g_campaign) {
+                       if (self.BUTTON_INFO)
+                               self.motd_actived_time = time;
+                       else if ((time - self.motd_actived_time > 2) && self.classname == "player") { // hide it some seconds after BUTTON_INFO has been released
+                               self.motd_actived_time = 0;
+                               Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD);
+                       }
+               } else {
+                       if ((time - self.jointime) > autocvar_welcome_message_time) {
+                               if (self.BUTTON_INFO)
+                                       self.motd_actived_time = time;
+                               else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released
+                                       self.motd_actived_time = 0;
+                                       Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD);
+                               }
+                       }
+               }
+       }
+}
+
 void ObserverThink()
 {
        float prefered_movetype;
@@ -2565,6 +2601,8 @@ void ObserverThink()
                        }
                }
        }
+       
+       PrintWelcomeMessage();
 }
 
 void SpectatorThink()
@@ -2603,6 +2641,7 @@ void SpectatorThink()
                        PutObserverInServer();
        }
 
+       PrintWelcomeMessage();
        self.flags |= FL_CLIENT | FL_NOTARGET;
 }
 
@@ -2638,7 +2677,6 @@ Called every frame for each client before the physics are run
 void() ctf_setstatus;
 void() nexball_setstatus;
 .float items_added;
-.float motd_actived_time; // used for both motd and campaign_message
 void PlayerPreThink (void)
 {
        WarpZone_PlayerPhysics_FixVAngle();
@@ -2717,40 +2755,8 @@ void PlayerPreThink (void)
                PlayerUseKey();
        self.usekeypressed = self.BUTTON_USE;
 
-       if (self.motd_actived_time == 0) {
-               if (autocvar_g_campaign) {
-                       if (self.classname == "player" && self.BUTTON_INFO) {
-                               self.motd_actived_time = time;
-                               Send_CSQC_Centerprint_Generic(self, CPID_MOTD, campaign_message, -1, 0);
-                       }
-               } else {
-                       if ((self.classname == "player" || time - self.jointime > autocvar_welcome_message_time) && self.BUTTON_INFO) {
-                               self.motd_actived_time = time;
-                               Send_CSQC_Centerprint_Generic(self, CPID_MOTD, getwelcomemessage(), -1, 0);
-                       }
-               }
-       } else { // showing MOTD or campaign message
-               if (autocvar_g_campaign) {
-                       if (self.classname == "player") {
-                               if (self.BUTTON_INFO)
-                                       self.motd_actived_time = time;
-                               else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released
-                                       self.motd_actived_time = 0;
-                                       Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD);
-                               }
-                       }
-               } else {
-                       if (self.classname == "player" || (time - self.jointime) > autocvar_welcome_message_time) {
-                               if (self.BUTTON_INFO)
-                                       self.motd_actived_time = time;
-                               else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released
-                                       self.motd_actived_time = 0;
-                                       Send_CSQC_Centerprint_Generic_Expire(self, CPID_MOTD);
-                               }
-                       }
-               }
-       }
-
+       PrintWelcomeMessage();
+       
        if(self.classname == "player") {
 //             if(self.netname == "Wazat")
 //                     bprint(self.classname, "\n");