From: terencehill <piuntn@gmail.com>
Date: Mon, 27 Jun 2011 16:28:49 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/centerprint_stuff
X-Git-Tag: xonotic-v0.5.0~173
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73406cea479bf391c611c4c4688d498537797e27;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/centerprint_stuff
---

73406cea479bf391c611c4c4688d498537797e27
diff --cc qcsrc/server/cl_client.qc
index 897f2c5a3,9a1d41004..a3a951b88
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -2583,8 -2620,11 +2583,10 @@@ void SpectatorThink(
  				return;
  			}
  		}
+ 		if(!SpectateUpdate())
+ 			PutObserverInServer();
  	}
  
 -	PrintWelcomeMessage(self);
  	self.flags |= FL_CLIENT | FL_NOTARGET;
  }