From f55d1718f2a3572339bd94a15adf7f4d92b2f8ad Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 3 Sep 2009 19:51:55 +0000 Subject: [PATCH] - fixed: Weapons must first check if they can be switched and afterwards if they can be fired. These checks were reversed. SVN r1789 (trunk) --- docs/rh-log.txt | 6 +++++- src/p_pspr.cpp | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 202792890f..6627d9e723 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -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 diff --git a/src/p_pspr.cpp b/src/p_pspr.cpp index 4eb8b7d3e6..ee287a8f14 100644 --- a/src/p_pspr.cpp +++ b/src/p_pspr.cpp @@ -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); + } } }