From: Mario Date: Sun, 9 Jul 2017 14:57:19 +0000 (+1000) Subject: Fix a few remaining case of self X-Git-Tag: xonotic-v0.8.5~2654 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=47a7d93632e4a6125241310347cad0b0e0e4bf89;p=xonotic%2Fxonotic-data.pk3dir.git Fix a few remaining case of self --- diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 56219b2c9..3b86ebcec 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -710,14 +710,14 @@ void PM_jetpack(entity this, float maxspd_mod, float dt) float a_up = PHYS_JETPACK_ACCEL_UP(this); float a_add = PHYS_JETPACK_ANTIGRAVITY(this) * PHYS_GRAVITY(this); - if(PHYS_JETPACK_REVERSE_THRUST(this) && PHYS_INPUT_BUTTON_CROUCH(self)) { a_up = PHYS_JETPACK_REVERSE_THRUST(this); } + if(PHYS_JETPACK_REVERSE_THRUST(this) && PHYS_INPUT_BUTTON_CROUCH(this)) { a_up = PHYS_JETPACK_REVERSE_THRUST(this); } wishvel_x *= a_side; wishvel_y *= a_side; wishvel_z *= a_up; wishvel_z += a_add; - if(PHYS_JETPACK_REVERSE_THRUST(this) && PHYS_INPUT_BUTTON_CROUCH(self)) { wishvel_z *= -1; } + if(PHYS_JETPACK_REVERSE_THRUST(this) && PHYS_INPUT_BUTTON_CROUCH(this)) { wishvel_z *= -1; } float best = 0; ////////////////////////////////////////////////////////////////////////////////////// diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc index 7f6e17f5e..7ba7defba 100644 --- a/qcsrc/server/bot/default/scripting.qc +++ b/qcsrc/server/bot/default/scripting.qc @@ -1182,7 +1182,7 @@ float bot_execute_commands_once(entity this) bot_setcurrentcommand(this); // Ignore all commands except continue when the bot is paused - if(!(self.bot_exec_status & BOT_EXEC_STATUS_PAUSED)) + if(!(this.bot_exec_status & BOT_EXEC_STATUS_PAUSED)) { // if we have no bot command, better return // old logic kept pressing previously pressed keys, but that has problems