zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-02-21 02:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed the quite redundant GetStateForButtonName function

Browse source 
Since it forwards directly to FindState and has no script bindings there is no need to keep it, it'd only complicate the full scriptification of the weapon class if it stuck around.
This commit is contained in:
Christoph Oelckers 2018-11-19 18:26:23 +01:00 committed by drfrag
parent 95767fb63a
commit cc8e390dce
3 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_inventory/a_weapons.cpp
View file

@ -474,17 +474,6 @@ FState *AWeapon::GetReadyState ()
return nullptr;
}
//===========================================================================
//
// AWeapon :: GetStateForButtonName
//
//===========================================================================
FState *AWeapon::GetStateForButtonName (FName button)
{
return FindState(button);
}
/* Weapon slots ***********************************************************/

2
src/g_inventory/a_weapons.h
View file

@ -132,8 +132,6 @@ public:
FState *GetUpState ();
FState *GetDownState ();
FState *GetReadyState ();
FState *GetStateForButtonName (FName button);
enum
{

2
src/p_pspr.cpp
View file

@ -893,7 +893,7 @@ static void P_CheckWeaponButtons (player_t *player)
if ((player->WeaponState & ButtonChecks[i].StateFlag) &&
(player->cmd.ucmd.buttons & ButtonChecks[i].ButtonFlag))
{
FState *state = weapon->GetStateForButtonName(ButtonChecks[i].StateName);
FState *state = weapon->FindState(ButtonChecks[i].StateName);
// [XA] don't change state if still null, so if the modder
// sets WRF_xxx to true but forgets to define the corresponding
// state, the weapon won't disappear. ;)