Merge branch 'terencehill/campaign_message_tweak' into 'master'

Campaign message tweaks

See merge request xonotic/xonotic-data.pk3dir!763

diff --combined qcsrc/server/client.qc
index b06f16310cea3f1e036631b7bd39016577d56d26,e0c5762e962972c06861723c90a002f5602610af..dd906931176d48a4293b2792044ff4258da73496
--- 1/qcsrc/server/client.qc
--- 2/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -611,8 -611,7 +611,8 @@@ void PutPlayerInServer(entity this
        this.respawn_flags = 0;
        this.respawn_time = 0;
        STAT(RESPAWN_TIME, this) = 0;
 -      this.scale = autocvar_sv_player_scale;
 +      bool q3dfcompat = autocvar_sv_q3defragcompat && autocvar_sv_q3defragcompat_changehitbox;
 +      this.scale = ((q3dfcompat) ? 0.9 : autocvar_sv_player_scale);
        this.fade_time = 0;
        this.pain_frame = 0;
        this.pain_finished = 0;
@@@ -1069,7 -1068,7 +1069,7 @@@ string getwelcomemessage(entity this
        return s;
  }
  
 -bool autocvar_sv_qcphysics = false; // TODO this is for testing - remove when qcphysics work
 +bool autocvar_sv_qcphysics = true; // TODO this is for testing - remove when qcphysics work
  
  /**
  =============
@@@ -1108,7 -1107,7 +1108,7 @@@ void ClientConnect(entity this
                CS(this).allowed_timeouts = autocvar_sv_timeout_number;
  
        if (autocvar_sv_eventlog)
 -              GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? this.netaddress : "bot"), ":", playername(this, false)));
 +              GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? GameLog_ProcessIP(this.netaddress) : "bot"), ":", playername(this, false)));
  
        CS(this).just_joined = true;  // stop spamming the eventlog with additional lines when the client connects
  
@@@ -1781,11 -1780,6 +1781,11 @@@ void SetSpectatee_status(entity this, i
  
        if (CS(this).spectatee_status != oldspectatee_status)
        {
 +              if (STAT(PRESSED_KEYS, this))
 +              {
 +                      CS(this).pressedkeys = 0;
 +                      STAT(PRESSED_KEYS, this) = 0;
 +              }
                ClientData_Touch(this);
                if (g_race || g_cts) race_InitSpectator();
        }
@@@ -2027,7 -2021,7 +2027,7 @@@ void PrintWelcomeMessage(entity this
                if (autocvar_g_campaign) {
                        if ((IS_PLAYER(this) && PHYS_INPUT_BUTTON_INFO(this)) || (!IS_PLAYER(this))) {
                                CS(this).motd_actived_time = time;
-                               Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, campaign_message);
+                               Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_CAMPAIGN_MESSAGE, Campaign_GetMessage(), Campaign_GetLevelNum());
                        }
                } else {
                        if (PHYS_INPUT_BUTTON_INFO(this)) {
@@@ -2043,7 -2037,7 +2043,7 @@@
                                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);
+                               Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_CAMPAIGN_MESSAGE);
                        }
                } else {
                        if (PHYS_INPUT_BUTTON_INFO(this))
@@@ -2062,7 -2056,10 +2062,10 @@@
                {
                        // instantly hide MOTD
                        CS(this).motd_actived_time = 0;
-                       Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_MOTD);
+                       if (autocvar_g_campaign)
+                               Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_CAMPAIGN_MESSAGE);
+                       else
+                               Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_MOTD);
                }
                else if (IS_PLAYER(this) || IS_SPEC(this))
                {
@@@ -2725,11 -2722,6 +2728,11 @@@ void PlayerPostThink (entity this
                }
                GetPressedKeys(this);
        }
 +      else if (IS_OBSERVER(this) && STAT(PRESSED_KEYS, this))
 +      {
 +              CS(this).pressedkeys = 0;
 +              STAT(PRESSED_KEYS, this) = 0;
 +      }
  
        if (this.waypointsprite_attachedforcarrier) {
                float hp = healtharmor_maxdamage(GetResource(this, RES_HEALTH), GetResource(this, RES_ARMOR), autocvar_g_balance_armor_blockpercent, DEATH_WEAPON.m_id).x;