From: FruitieX <rasse@rasse-laptop.(none)>
Date: Tue, 26 Oct 2010 15:44:25 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into terencehill/newpanelhud-dom_points
X-Git-Tag: xonotic-v0.5.0~348^2~6^2~2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e862d0f2930f432932fed5ab8126c1e28ee118cb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into terencehill/newpanelhud-dom_points

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

e862d0f2930f432932fed5ab8126c1e28ee118cb
diff --cc qcsrc/client/hud.qc
index 23405fef6,7ce1a202d..f7ff56060
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -4452,7 -4386,7 +4486,7 @@@ void HUD_ModIcons(void
  	if(!autocvar_hud_panel_modicons && !autocvar__hud_configure)
  		return;
  
- 	if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_DOMINATION && !autocvar__hud_configure)
 -	if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && !autocvar__hud_configure)
++	if (gametype != GAME_KEYHUNT && gametype != GAME_CTF && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_DOMINATION && !autocvar__hud_configure)
  		return;
  
  	active_panel = HUD_PANEL_MODICONS;
@@@ -4489,8 -4423,8 +4523,10 @@@
  		HUD_Mod_NexBall(pos, mySize);
  	else if(gametype == GAME_CTS || gametype == GAME_RACE)
  		HUD_Mod_Race(pos, mySize);
 +	else if(gametype == GAME_DOMINATION)
 +		HUD_Mod_Dom(pos, mySize);
+ 	else if(gametype == GAME_CA)
+ 		HUD_Mod_CA(pos, mySize);
  }
  
  // Draw pressed keys (#11)
diff --cc qcsrc/common/constants.qh
index 417526e78,b4b92ff8b..3f96e9a24
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -310,13 -310,8 +310,14 @@@ const float STAT_SHOTORG = 46; // compr
  const float STAT_LEADLIMIT = 47;
  const float STAT_BULLETS_LOADED = 48;
  const float STAT_NEX_CHARGE = 49;
+ const float STAT_HUD = 50;
  
 +const float STAT_DOM_TOTAL_PPS = 70;
 +const float STAT_DOM_PPS_RED = 71;
 +const float STAT_DOM_PPS_BLUE = 72;
 +const float STAT_DOM_PPS_PINK = 73;
 +const float STAT_DOM_PPS_YELLOW = 74;
 +
  // see DP source, quakedef.h
  const float STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222;
  const float STAT_MOVEVARS_AIRSTRAFEACCEL_QW = 223;