OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Cleanup the zoom/reload/userX handling for A_WeaponReady

Browse source 
- There was lots of code duplication. Consolidated it.
- Renamed WRF_UserX to WRF_AllowUserX for consistancy.
This commit is contained in:
Randy Heit 2015-12-31 16:41:09 -06:00
commit 1d759283c0
5 changed files with 81 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/g_shared/a_weapons.cpp
View file

@ -683,47 +683,13 @@ FState *AWeapon::GetAltAtkState (bool hold)
//===========================================================================
//
// AWeapon :: GetRelState
// AWeapon :: GetStateForButtonName
//
//===========================================================================
FState *AWeapon::GetRelState ()
FState *AWeapon::GetStateForButtonName (FName button)
{
return FindState(NAME_Reload);
}
//===========================================================================
//
// AWeapon :: GetZoomState
//
//===========================================================================
FState *AWeapon::GetZoomState ()
{
return FindState(NAME_Zoom);
}
//===========================================================================
//
// AWeapon :: GetUserState
//
//===========================================================================
FState *AWeapon::GetUserState(int state)
{
switch (state)
{
case 4:
return FindState(NAME_User4);
case 3:
return FindState(NAME_User3);
case 2:
return FindState(NAME_User2);
case 1:
return FindState(NAME_User1);
default:
return NULL;
}
return FindState(button);
}