From: Mario <mario.mario@y7mail.com>
Date: Tue, 7 May 2013 05:52:10 +0000 (+1000)
Subject: Fix new clienttype checks
X-Git-Tag: xonotic-v0.7.0~57^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c92d2b2db2fef225b4bdc61102296c534010fc37;p=xonotic%2Fxonotic-data.pk3dir.git

Fix new clienttype checks
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4f741fa44..60454e09e 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -602,9 +602,9 @@ Called when a client spawns in the server
 
 void PutClientInServer (void)
 {
-	if(clienttype(self) == CLIENTTYPE_BOT)
+	if(IS_BOT_CLIENT(self))
 		self.classname = "player";
-	else if(clienttype(self) == CLIENTTYPE_REAL)
+	else if(IS_REAL_CLIENT(self))
 	{
 		msg_entity = self;
 		WriteByte(MSG_ONE, SVC_SETVIEW);
diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 337f8260a..125182c8a 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -334,7 +334,7 @@ void reset_map(float dorespawn)
 	lms_next_place = player_count;
 
 	for(self = world; (self = nextent(self)); )
-	if(clienttype(self) == CLIENTTYPE_NOTACLIENT)
+	if(IS_NOT_A_CLIENT(self))
 	{
 		if(self.reset)
 		{
@@ -351,7 +351,7 @@ void reset_map(float dorespawn)
 
 	// Waypoints and assault start come LAST
 	for(self = world; (self = nextent(self)); )
-	if(clienttype(self) == CLIENTTYPE_NOTACLIENT)
+	if(IS_NOT_A_CLIENT(self))
 	{
 		if(self.reset2)
 		{
diff --git a/qcsrc/server/mutators/gamemode_ca.qc b/qcsrc/server/mutators/gamemode_ca.qc
index 11330fbd7..ff491dadc 100644
--- a/qcsrc/server/mutators/gamemode_ca.qc
+++ b/qcsrc/server/mutators/gamemode_ca.qc
@@ -147,7 +147,7 @@ MUTATOR_HOOKFUNCTION(ca_PutClientInServer)
 		if(!self.caplayer)
 		{
 			self.caplayer = 0.5;
-			if(clienttype(self) == CLIENTTYPE_REAL)
+			if(IS_REAL_CLIENT(self))
 				sprint(self, "You will join the game in the next round.\n");
 		}
 	}
diff --git a/qcsrc/server/mutators/mutator_superspec.qc b/qcsrc/server/mutators/mutator_superspec.qc
index 0b7089014..02c226853 100644
--- a/qcsrc/server/mutators/mutator_superspec.qc
+++ b/qcsrc/server/mutators/mutator_superspec.qc
@@ -443,7 +443,7 @@ void superspec_hello()
 
 MUTATOR_HOOKFUNCTION(superspec_ClientConnect)
 {
-	if(clienttype(self) != CLIENTTYPE_REAL)
+	if(!IS_REAL_CLIENT(self))
 		return FALSE;
 
 	string fn = "superspec-local.options";