mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-25 13:31:37 +00:00
- fixed: Weapons must first check if they can be switched and afterwards
if they can be fired. These checks were reversed. SVN r1789 (trunk)
This commit is contained in:
parent
41be75a49e
commit
f55d1718f2
2 changed files with 9 additions and 5 deletions
|
@ -1,4 +1,8 @@
|
|||
September 2, 2009 (Changes by Graf Zahl)
|
||||
September 3, 2009 (Changes by Graf Zahl)
|
||||
- fixed: Weapons must first check if they can be switched and afterwards
|
||||
if they can be fired. These checks were reversed.
|
||||
|
||||
September 2, 2009 (Changes by Graf Zahl)
|
||||
- fixed: The newly altered WAD code could not load embedded WADs anymore.
|
||||
|
||||
September 1, 2009
|
||||
|
|
|
@ -844,14 +844,14 @@ void P_MovePsprites (player_t *player)
|
|||
}
|
||||
player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
|
||||
player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy;
|
||||
if (player->cheats & (CF_WEAPONREADY | CF_WEAPONREADYALT))
|
||||
{
|
||||
P_CheckWeaponFire (player);
|
||||
}
|
||||
if (player->cheats & CF_WEAPONSWITCHOK)
|
||||
{
|
||||
P_CheckWeaponSwitch (player);
|
||||
}
|
||||
if (player->cheats & (CF_WEAPONREADY | CF_WEAPONREADYALT))
|
||||
{
|
||||
P_CheckWeaponFire (player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue