From b1e5dbb1101a8ab8358e46c09dc063a059c89f74 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 26 Dec 2016 16:17:49 +1000 Subject: [PATCH] Fix crouch checking wrong hook entity --- qcsrc/server/client.qc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index 672ad6f92..a05999d62 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -2418,8 +2418,18 @@ void PlayerPreThink (entity this) this.prevorigin = this.origin; + bool have_hook = false; + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if(this.(weaponentity).hook.state) + { + have_hook = true; + break; + } + } bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this); - if (this.hook.state) { + if (have_hook) { do_crouch = false; } else if (this.waterlevel >= WATERLEVEL_SWIMMING) { do_crouch = false; -- 2.39.2