Fix nJoinAllowed returning a negative amount of available player slots if g_maxplayer...

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index a0f5c8a38fc4e61c0457fd3549a6a40bb07a83ab..fe2952711f9cd8970ad815f6fa7fd091cbe7ee9c 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2018,10 +2018,10 @@ int nJoinAllowed(entity this, entity ignore)
 
        int player_limit = GetPlayerLimit();
 
-       float free_slots = 0;
+       int free_slots = 0;
        if (!player_limit)
                free_slots = maxclients - totalClients;
-       else if(currentlyPlaying < player_limit)
+       else if(player_limit > 0 && currentlyPlaying < player_limit)
                free_slots = min(maxclients - totalClients, player_limit - currentlyPlaying);
 
        static float msg_time = 0;

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index a8ec77959af89a584a3b4f03b2806a04e2cb37b2..e12970a9c63d3d912c881170a7c94ddd6a9cfab0 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -146,7 +146,7 @@ void checkSpectatorBlock(entity this);
 .float alivetime; // time of being alive
 .float motd_actived_time; // used for both motd and campaign_message
 
-bool nJoinAllowed(entity this, entity ignore);
+int nJoinAllowed(entity this, entity ignore);
 
 .float spawnshieldtime;
 .float item_spawnshieldtime;