From 97504df1243cd03418fbecf1467127721f5e7e0a Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 3 Oct 2023 19:07:47 +1100 Subject: [PATCH] - Duke: Remove `PlayerSetInput()` wrapper. --- source/games/duke/src/inlines.h | 5 ----- source/games/duke/src/player_d.cpp | 2 +- source/games/duke/src/player_r.cpp | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/source/games/duke/src/inlines.h b/source/games/duke/src/inlines.h index 669930683..b710c4c4e 100644 --- a/source/games/duke/src/inlines.h +++ b/source/games/duke/src/inlines.h @@ -116,11 +116,6 @@ inline ESyncBits PlayerInputBits(int pl, ESyncBits bits) return (getPlayer(pl)->cmd.ucmd.actions & bits); } -inline void PlayerSetInput(int pl, ESyncBits bit) -{ - getPlayer(pl)->cmd.ucmd.actions |= bit; -} - inline void PlayerSetItemUsed(int pl, int num) { getPlayer(pl)->cmd.ucmd.setItemUsed(num - 1); diff --git a/source/games/duke/src/player_d.cpp b/source/games/duke/src/player_d.cpp index f07a57870..40d879edf 100644 --- a/source/games/duke/src/player_d.cpp +++ b/source/games/duke/src/player_d.cpp @@ -284,7 +284,7 @@ void selectweapon_d(int snum, int weap) // playernum, weaponnum if (p->holster_weapon) { - PlayerSetInput(snum, SB_HOLSTER); + p->cmd.ucmd.actions |= SB_HOLSTER; p->oweapon_pos = p->weapon_pos = -9; } else if (j >= MIN_WEAPON && p->gotweapon[j] && p->curr_weapon != j) switch (j) diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 3e9c991d9..fc8c72a49 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -262,7 +262,7 @@ void selectweapon_r(int snum, int weap) if (p->holster_weapon) { - PlayerSetInput(snum, SB_HOLSTER); + p->cmd.ucmd.actions |= SB_HOLSTER; p->oweapon_pos = p->weapon_pos = -9; } else if (j >= MIN_WEAPON && p->gotweapon[j] && p->curr_weapon != j) switch (j)