Fix new clienttype checks

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4f741fa4435abe5481cecf737e67e0a1ced851fb..60454e09ecad5d30567d0f706f5df8dc9bc606ee 100644 (file)
--- 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 337f8260aee8eba31d1ed44001f937228f6a4db1..125182c8a78e3f31dfbf9f0466e6aaf5bd54c931 100644 (file)
--- 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 11330fbd7d6b370f851aa8425bd11d0dfab4322d..ff491dadc6ba63bf344a7bb66fb7ec052589c65f 100644 (file)
--- 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 0b70890141f2d4fc5e77e004a3433d18e45ac829..02c226853d6359b16171a57341633c82d67c262a 100644 (file)
--- 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";