Merge branch 'master' into terencehill/infomessages_panel_update

Conflicts:
	qcsrc/client/hud/panel/infomessages.qc

diff --cc _hud_common.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/infomessages.qc
index 4d82cf3468d774d47396b93d3e101c2edf6d5817,30b7fa8a7929bf46a9b618e3e7c2b67d918b8aa6..6f1777e25276a91a8e9aa5653a5110ba26ae06e9
--- 1/qcsrc/client/hud/panel/infomessages.qc
--- 2/qcsrc/client/hud/panel/infomessages.qc
+++ b/qcsrc/client/hud/panel/infomessages.qc
@@@ -82,29 -72,22 +82,29 @@@ void HUD_InfoMessages(
                                s = _("^1Observing");
                        else
                                s = sprintf(_("^1Spectating: ^7%s"), entcs_GetName(current_player));
 -                      drawInfoMessage(s);
 +                      InfoMessage(s, panel_fg_alpha);
  
 -                      if(spectatee_status == -1)
 -                              s = sprintf(_("^1Press ^3%s^1 to spectate"), getcommandkey("primary fire", "+fire"));
 -                      else
 -                              s = sprintf(_("^1Press ^3%s^1 or ^3%s^1 for next or previous player"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev"));
 -                      drawInfoMessage(s);
 -
 -                      if(spectatee_status == -1)
 -                              s = sprintf(_("^1Use ^3%s^1 or ^3%s^1 to change the speed"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev"));
 -                      else
 -                              s = sprintf(_("^1Press ^3%s^1 to observe, ^3%s^1 to change camera mode"), getcommandkey("secondary fire", "+fire2"), getcommandkey("drop weapon", "dropweapon"));
 -                      drawInfoMessage(s);
 -
 -                      s = sprintf(_("^1Press ^3%s^1 for gamemode info"), getcommandkey("server info", "+show_info"));
 -                      drawInfoMessage(s);
 +                      img_group = 0;
 +                      switch(img_select(img_group, 3))
 +                      {
 +                              default:
 +                              case 0:
 +                                      if(spectatee_status == -1)
 +                                              s = sprintf(_("^1Press ^3%s^1 to spectate"), getcommandkey(_("primary fire"), "+fire"));
 +                                      else
 +                                              s = sprintf(_("^1Press ^3%s^1 or ^3%s^1 for next or previous player"), getcommandkey(_("next weapon"), "weapnext"), getcommandkey(_("previous weapon"), "weapprev"));
 +                                      break;
 +                              case 1:
 +                                      if(spectatee_status == -1)
 +                                              s = sprintf(_("^1Use ^3%s^1 or ^3%s^1 to change the speed"), getcommandkey(_("next weapon"), "weapnext"), getcommandkey(_("previous weapon"), "weapprev"));
 +                                      else
-                                               s = sprintf(_("^1Press ^3%s^1 to observe"), getcommandkey(_("secondary fire"), "+fire2"));
++                                              s = sprintf(_("^1Press ^3%s^1 to observe, ^3%s^1 to change camera mode"), getcommandkey(_("secondary fire"), "+fire2"), getcommandkey(_("drop weapon"), "dropweapon"));
 +                                      break;
 +                              case 2:
 +                                      s = sprintf(_("^1Press ^3%s^1 for gamemode info"), getcommandkey(_("server info"), "+show_info"));
 +                                      break;
 +                      }
 +                      InfoMessage(s, img_fade[img_group] * panel_fg_alpha);
  
                        if(gametype == MAPINFO_TYPE_LMS)
                        {