OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Restructured the action function interface to remove the dependence on

Browse source 
the global CallingState variable.


SVN r1163 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-12 14:30:07 +00:00
commit 1957659b1b
34 changed files with 405 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/g_shared/a_weapons.cpp
View file

@ -751,19 +751,7 @@ static bool FindMostRecentWeapon (player_t *player, int *slot, int *index)
{
if (player->PendingWeapon != WP_NOCHANGE)
{
if (player->psprites[ps_weapon].state != NULL &&
player->psprites[ps_weapon].state->GetAction() == GET_ACTION(A_Raise))
{
if (LocalWeapons.LocateWeapon (player->PendingWeapon->GetClass(), slot, index))
{
return true;
}
return false;
}
else
{
return LocalWeapons.LocateWeapon (player->PendingWeapon->GetClass(), slot, index);
}
return LocalWeapons.LocateWeapon (player->PendingWeapon->GetClass(), slot, index);
}
else if (player->ReadyWeapon != NULL)
{