From: terencehill <piuntn@gmail.com>
Date: Wed, 20 Oct 2010 22:09:40 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/newpanelhud-dom_points
X-Git-Tag: xonotic-v0.5.0~348^2~6^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=81046f42baf4ec980a069a5e9ba88b1e5fc7f2c9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/newpanelhud-dom_points

Conflicts:
	qcsrc/server/cl_client.qc
---

81046f42baf4ec980a069a5e9ba88b1e5fc7f2c9
diff --cc qcsrc/common/constants.qh
index b2c4c53d1,6f0eccfaf..417526e78
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -308,13 -309,8 +309,14 @@@ const float STAT_NB_METERSTART = 45
  const float STAT_SHOTORG = 46; // compressShotOrigin
  const float STAT_LEADLIMIT = 47;
  const float STAT_BULLETS_LOADED = 48;
+ const float STAT_NEX_CHARGE = 49;
  
 +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;
diff --cc qcsrc/server/cl_client.qc
index e935273c6,df6c8d4b2..6cc10bcd6
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -1386,11 -1397,6 +1397,7 @@@ Called when a client connects to the se
  string ColoredTeamName(float t);
  void DecodeLevelParms (void);
  //void dom_player_join_team(entity pl);
- #ifdef UID
- .float uid_kicktime;
- .string uid;
- #endif
 +void set_dom_state(entity e, float connecting);
  void ClientConnect (void)
  {
  	float t;
@@@ -1594,11 -1594,10 +1595,12 @@@
  			race_SendRankings(i, 0, 0, MSG_ONE);
  		}
  	}
- 	else if(cvar("sv_teamnagger") && !g_ca) // teamnagger is currently bad for ca
+ 	else if(cvar("sv_teamnagger") && !(cvar("bot_vs_human") && (c3==-1 && c4==-1)) && !g_ca) // teamnagger is currently bad for ca
  		send_CSQC_teamnagger();
  
 +	if (g_domination)
 +		set_dom_state(self, TRUE);
+ 	send_CSQC_cr_maxbullets(self);
  
  	CheatInitClient();
  }