From: terencehill <piuntn@gmail.com>
Date: Mon, 25 Jul 2016 17:47:00 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/infomessages_panel_update
X-Git-Tag: xonotic-v0.8.2~758^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c13fdf2b49eff1d26abc73d42e33636162a9b527;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/infomessages_panel_update

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

c13fdf2b49eff1d26abc73d42e33636162a9b527
diff --cc qcsrc/client/hud/panel/infomessages.qc
index 4d82cf346,30b7fa8a7..6f1777e25
--- a/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)
  			{