zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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:
Christoph Oelckers 2009-09-03 19:51:55 +00:00
parent 41be75a49e
commit f55d1718f2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/rh-log.txt
View File

@ -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. - fixed: The newly altered WAD code could not load embedded WADs anymore.
September 1, 2009 September 1, 2009

8
src/p_pspr.cpp
View File

@ -844,14 +844,14 @@ void P_MovePsprites (player_t *player)
} }
player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx; player->psprites[ps_flash].sx = player->psprites[ps_weapon].sx;
player->psprites[ps_flash].sy = player->psprites[ps_weapon].sy; 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) if (player->cheats & CF_WEAPONSWITCHOK)
{ {
P_CheckWeaponSwitch (player); P_CheckWeaponSwitch (player);
} }
if (player->cheats & (CF_WEAPONREADY | CF_WEAPONREADYALT))
{
P_CheckWeaponFire (player);
}
} }
} }