From: FruitieX <fruitiex@gmail.com>
Date: Wed, 15 Dec 2010 12:04:55 +0000 (+0200)
Subject: Merge remote branch 'origin/terencehill/newpanelhud-dom_points' into terencehill... 
X-Git-Tag: xonotic-v0.5.0~348^2~6
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2f2147a6c665f04d1b6e860dce8a8a093e7d2b9e

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

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

2f2147a6c665f04d1b6e860dce8a8a093e7d2b9e
diff --cc qcsrc/client/hud.qc
index e8a8250e6c,4b4408e7ef..a8d82dd76a
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -4736,14 -4482,13 +4835,14 @@@ float mod_change; // "time" when mod_ac
  
  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_CA && gametype != GAME_DOMINATION && !autocvar__hud_configure)
 -		return;
 +	if(!autocvar__hud_configure)
 +	{
 +		if(!autocvar_hud_panel_modicons) return;
- 		if (gametype != GAME_CTF && gametype != GAME_KEYHUNT && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_FREEZETAG && gametype != GAME_KEEPAWAY) return;
++		if (gametype != GAME_CTF && gametype != GAME_KEYHUNT && gametype != GAME_NEXBALL && gametype != GAME_CTS && gametype != GAME_RACE && gametype != GAME_CA && gametype != GAME_FREEZETAG && gametype != GAME_KEEPAWAY && gametype != GAME_DOMINATION) return;
 +	}
 +	else
 +		hud_configure_active_panel = HUD_PANEL_MODICONS;
  
 -	active_panel = HUD_PANEL_MODICONS;
  	HUD_Panel_UpdateCvars(modicons);
  	vector pos, mySize;
  	pos = panel_pos;
@@@ -4777,10 -4522,10 +4876,12 @@@
  		HUD_Mod_NexBall(pos, mySize);
  	else if(gametype == GAME_CTS || gametype == GAME_RACE)
  		HUD_Mod_Race(pos, mySize);
 +	else if(gametype == GAME_CA || gametype == GAME_FREEZETAG)
 +		HUD_Mod_CA(pos, mySize);
+ 	else if(gametype == GAME_DOMINATION)
+ 		HUD_Mod_Dom(pos, mySize);
 -	else if(gametype == GAME_CA)
 -		HUD_Mod_CA(pos, mySize);
 +	else if(gametype == GAME_KEEPAWAY)
 +		HUD_Mod_Keepaway(pos, mySize);
  }
  
  // Draw pressed keys (#11)
diff --cc qcsrc/server/cl_client.qc
index fea11ec930,2a72a1a46b..e59d453ab3
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1738,9 -1600,11 +1739,11 @@@ void ClientConnect (void
  			race_SendRankings(i, 0, 0, MSG_ONE);
  		}
  	}
 -	else if(cvar("sv_teamnagger") && !(cvar("bot_vs_human") && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
 +	else if(autocvar_sv_teamnagger && !(autocvar_bot_vs_human && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
  		send_CSQC_teamnagger();
  
+ 	if (g_domination)
+ 		send_CSQC_dom_all();
  	send_CSQC_cr_maxbullets(self);
  
  	CheatInitClient();
diff --cc qcsrc/server/domination.qc
index 891863f97a,bde905a07d..2b6650b3d3
--- a/qcsrc/server/domination.qc
+++ b/qcsrc/server/domination.qc
@@@ -648,5 -725,12 +722,8 @@@ void dom_init(
  	precache_model("models/domination/dom_unclaimed.md3");
  	precache_sound("domination/claim.wav");
  	InitializeEntity(world, dom_delayedinit, INITPRIO_GAMETYPE);
+ 
+ 	g_domination_point_rate = cvar("g_domination_point_rate");
+ 	g_domination_point_amt = cvar("g_domination_point_amt");
 -
 -	// teamplay is always on in domination, defaults to hurt self but not teammates
 -	//if(!teams_matter)
 -	//	cvar_set("teamplay", "3");
  };