From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 26 Nov 2011 11:35:44 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/csqcmodel
X-Git-Tag: xonotic-v0.6.0~74^2~100^2~43
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b925457ba78521c1d9caf37a855be35d476dae6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/csqcmodel

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

6b925457ba78521c1d9caf37a855be35d476dae6
diff --cc qcsrc/client/miscfunctions.qc
index ce779634c,84b6d3da6..c63a7952d
--- a/qcsrc/client/miscfunctions.qc
+++ b/qcsrc/client/miscfunctions.qc
@@@ -575,15 -575,9 +575,15 @@@ vector getplayerorigin(float pl
  	string s;
  	entity e;
  
 +	e = CSQCPlayer_GetPlayer(pl + 1);
 +	if(e)
 +		return e.origin;
 +
 +#ifndef NO_LEGACY_NETWORKING
- 	s = getplayerkey(pl, "TEMPHACK_origin");
+ 	s = getplayerkeyvalue(pl, "TEMPHACK_origin");
  	if(s != "")
  		return stov(s);
 +#endif
  
  	e = entcs_receiver[pl];
  	if(e)