spawnAllowed --> joinAllowed

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index d2c6c991835c74c3c4af80999268d7fcc90d00ae..71c2b22654633f0b311497a9628b45e360499200 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2009,7 +2009,7 @@ void PrintWelcomeMessage(entity this)
        }
 }
 
-bool spawnAllowed(entity this)
+bool joinAllowed(entity this)
 {
        if (this.version_mismatch) return false;
        if (!nJoinAllowed(this, this)) return false;
@@ -2028,7 +2028,7 @@ void ObserverThink(entity this)
        }
 
        if (this.flags & FL_JUMPRELEASED) {
-               if (PHYS_INPUT_BUTTON_JUMP(this) && spawnAllowed(this)) {
+               if (PHYS_INPUT_BUTTON_JUMP(this) && joinAllowed(this)) {
                        this.flags &= ~FL_JUMPRELEASED;
                        this.flags |= FL_SPAWNING;
                } else if(PHYS_INPUT_BUTTON_ATCK(this) && !this.version_mismatch) {
@@ -2069,7 +2069,7 @@ void SpectatorThink(entity this)
        }
 
        if (this.flags & FL_JUMPRELEASED) {
-               if (PHYS_INPUT_BUTTON_JUMP(this) && spawnAllowed(this)) {
+               if (PHYS_INPUT_BUTTON_JUMP(this) && joinAllowed(this)) {
                        this.flags &= ~FL_JUMPRELEASED;
                        this.flags |= FL_SPAWNING;
                } else if(PHYS_INPUT_BUTTON_ATCK(this) || this.impulse == 10 || this.impulse == 15 || this.impulse == 18 || (this.impulse >= 200 && this.impulse <= 209)) {

diff --git a/qcsrc/server/command/cmd.qc b/qcsrc/server/command/cmd.qc
index 7536b526a582d2372c7c69c0e9d74da68d6291a6..96708399c0a00872900925a03f959e36949276e4 100644 (file)
--- a/qcsrc/server/command/cmd.qc
+++ b/qcsrc/server/command/cmd.qc
@@ -159,7 +159,7 @@ void ClientCommand_mv_getpicture(entity caller, float request, float argc)  // i
        }
 }
 
-bool spawnAllowed(entity this);
+bool joinAllowed(entity this);
 void Join(entity this);
 void ClientCommand_join(entity caller, float request)
 {
@@ -169,7 +169,7 @@ void ClientCommand_join(entity caller, float request)
                {
                        if (!gameover)
                        if (IS_CLIENT(caller) && !IS_PLAYER(caller))
-                       if (spawnAllowed(caller))
+                       if (joinAllowed(caller))
                                Join(caller);
 
                        return;  // never fall through to usage