From 24a8ac5aa048dd4710018da5ead5470ee8668cb2 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 3 Sep 2016 20:21:37 +0200 Subject: [PATCH] spawnAllowed --> joinAllowed --- qcsrc/server/client.qc | 6 +++--- qcsrc/server/command/cmd.qc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index d2c6c9918..71c2b2265 100644 --- 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 7536b526a..96708399c 100644 --- 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 -- 2.39.2