zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 03:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bug in r5826 regarding display of the WWII GI rocket launcher.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5851 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-09-06 02:15:34 +00:00
parent d466b2ae51
commit da52bac304
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
polymer/eduke32/source/player.c
View file

@ -2069,28 +2069,6 @@ static int P_DisplayAccess(int accessShade)
static int32_t fistPos; static int32_t fistPos;
void P_WW2GIDisplayWeapon(DukePlayer_t * const pPlayer, int weaponNum, int *weaponYOffset)
{
const uint8_t *const weaponFrame = &pPlayer->kickback_pic;
switch (weaponNum)
{
case RPG_WEAPON:
{
int const totalTime = PWEAPON(screenpeek, pPlayer->curr_weapon, TotalTime);
if (*weaponFrame >= totalTime)
{
int const reloadTime = PWEAPON(screenpeek, pPlayer->curr_weapon, Reload);
*weaponYOffset -= (*weaponFrame < ((reloadTime - totalTime) / 2 + totalTime))
? 10 * ((*weaponFrame) - totalTime) // down
: *weaponYOffset -= 10 * (reloadTime - (*weaponFrame)); // up
}
}
break;
}
}
void P_DisplayWeapon(void) void P_DisplayWeapon(void)
{ {
DukePlayer_t *const pPlayer = g_player[screenpeek].ps; DukePlayer_t *const pPlayer = g_player[screenpeek].ps;
@ -2247,7 +2225,17 @@ void P_DisplayWeapon(void)
G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 164, (weaponY << 1) + 176 - weaponYOffset, G_DrawWeaponTileWithID(currentWeapon << 1, weaponX + 164, (weaponY << 1) + 176 - weaponYOffset,
RPGGUN + ((*weaponFrame) >> 1), weaponShade, weaponBits, weaponPal, 0); RPGGUN + ((*weaponFrame) >> 1), weaponShade, weaponBits, weaponPal, 0);
else if (WW2GI) else if (WW2GI)
P_WW2GIDisplayWeapon(pPlayer, currentWeapon, &weaponYOffset); {
int const totalTime = PWEAPON(screenpeek, pPlayer->curr_weapon, TotalTime);
if (*weaponFrame >= totalTime)
{
int const reloadTime = PWEAPON(screenpeek, pPlayer->curr_weapon, Reload);
weaponYOffset -= (*weaponFrame < ((reloadTime - totalTime) / 2 + totalTime))
? 10 * ((*weaponFrame) - totalTime) // down
: 10 * (reloadTime - (*weaponFrame)); // up
}
}
} }
G_DrawWeaponTileWithID(currentWeapon, weaponX + 164, (weaponY << 1) + 176 - weaponYOffset, RPGGUN, weaponShade, G_DrawWeaponTileWithID(currentWeapon, weaponX + 164, (weaponY << 1) + 176 - weaponYOffset, RPGGUN, weaponShade,