From: Samual <samual@xonotic.org>
Date: Tue, 16 Aug 2011 19:35:49 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e29603d545018c97349769107c7541212dc65cd3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/flyingspectators

Conflicts:
	qcsrc/server/defs.qh
---

e29603d545018c97349769107c7541212dc65cd3
diff --cc qcsrc/server/cl_client.qc
index 66d2b05ab,0cf0d9ea5..60dbeda7e
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2527,10 -2503,8 +2503,9 @@@ void checkSpectatorBlock() 
  
  void ObserverThink()
  {
 +	float prefered_movetype;
  	if (self.flags & FL_JUMPRELEASED) {
  		if (self.BUTTON_JUMP && !self.version_mismatch) {
- 			self.welcomemessage_time = 0;
  			self.flags &~= FL_JUMPRELEASED;
  			self.flags |= FL_SPAWNING;
  		} else if(self.BUTTON_ATCK && !self.version_mismatch) {
diff --cc qcsrc/server/defs.qh
index 4dda28437,9e6a73b5e..6ef2bfcd0
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@@ -312,9 -309,6 +309,8 @@@ float default_weapon_alpha
  .float() customizeentityforclient;
  .float cvar_cl_handicap;
  .float cvar_cl_playerdetailreduction;
- .float cvar_scr_centertime;
 +.float cvar_cl_clippedspectating;
 +
  .string cvar_g_xonoticversion;
  .string cvar_cl_weaponpriority;
  .string cvar_cl_weaponpriorities[10];
diff --cc qcsrc/server/miscfunctions.qc
index 9a952ab54,9b0324755..1ca176896
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@@ -579,10 -584,8 +584,9 @@@ void GetCvars(float f
  	MUTATOR_CALLHOOK(GetCvars);
  	GetCvars_handleFloat(s, f, autoswitch, "cl_autoswitch");
  	GetCvars_handleFloat(s, f, cvar_cl_playerdetailreduction, "cl_playerdetailreduction");
- 	GetCvars_handleFloat(s, f, cvar_scr_centertime, "scr_centertime");
  	GetCvars_handleString(s, f, cvar_g_xonoticversion, "g_xonoticversion");
  	GetCvars_handleFloat(s, f, cvar_cl_handicap, "cl_handicap");
 +	GetCvars_handleFloat(s, f, cvar_cl_clippedspectating, "cl_clippedspectating");
  	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList);
  	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete);
  	GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete);