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

Factor out P_GetKneePal().

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6954 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-07-23 02:56:08 +00:00
parent e14d92a2af
commit 5cf6c2110c
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
source/duke3d/src/player.cpp
View file

@ -1678,6 +1678,16 @@ int P_GetHudPal(const DukePlayer_t *p)
return 0; return 0;
} }
int P_GetKneePal(DukePlayer_t const * pPlayer)
{
return P_GetKneePal(pPlayer, P_GetHudPal(pPlayer));
}
int P_GetKneePal(DukePlayer_t const * pPlayer, int const hudPal)
{
return hudPal == 0 ? pPlayer->palookup : hudPal;
}
static int P_DisplayFist(int const fistShade) static int P_DisplayFist(int const fistShade)
{ {
DukePlayer_t const *const pPlayer = g_player[screenpeek].ps; DukePlayer_t const *const pPlayer = g_player[screenpeek].ps;
@ -1855,10 +1865,7 @@ static int P_DisplayKnee(int kneeShade)
return 0; return 0;
int const kneeY = knee_y[ps->knee_incs] + (klabs(ps->look_ang) / 9) - (ps->hard_landing << 3); int const kneeY = knee_y[ps->knee_incs] + (klabs(ps->look_ang) / 9) - (ps->hard_landing << 3);
int kneePal = P_GetHudPal(ps); int const kneePal = P_GetKneePal(ps);
if (kneePal == 0)
kneePal = ps->palookup;
G_DrawTileScaled(105+(fix16_to_int(g_player[screenpeek].inputBits->q16avel)>>5)-(ps->look_ang>>1)+(knee_y[ps->knee_incs]>>2), G_DrawTileScaled(105+(fix16_to_int(g_player[screenpeek].inputBits->q16avel)>>5)-(ps->look_ang>>1)+(knee_y[ps->knee_incs]>>2),
kneeY+280-(fix16_to_int(ps->q16horiz-ps->q16horizoff)>>4),KNEE,kneeShade,4+DRAWEAP_CENTER,kneePal); kneeY+280-(fix16_to_int(ps->q16horiz-ps->q16horizoff)>>4),KNEE,kneeShade,4+DRAWEAP_CENTER,kneePal);
@ -2159,10 +2166,7 @@ void P_DisplayWeapon(void)
if ((quickKickFrame != 14 || pPlayer->last_quick_kick) && ud.drawweapon == 1) if ((quickKickFrame != 14 || pPlayer->last_quick_kick) && ud.drawweapon == 1)
{ {
int weaponPal = P_GetHudPal(pPlayer); int const weaponPal = P_GetKneePal(pPlayer);
if (weaponPal == 0)
weaponPal = pPlayer->palookup;
guniqhudid = 100; guniqhudid = 100;
@ -2217,23 +2221,24 @@ void P_DisplayWeapon(void)
int const doAnim = !(sprite[pPlayer->i].pal == 1 || ud.pause_on || g_player[myconnectindex].ps->gm & MODE_MENU); int const doAnim = !(sprite[pPlayer->i].pal == 1 || ud.pause_on || g_player[myconnectindex].ps->gm & MODE_MENU);
int const halfLookAng = pPlayer->look_ang >> 1; int const halfLookAng = pPlayer->look_ang >> 1;
int weaponPal = P_GetHudPal(pPlayer); int const weaponPal = P_GetHudPal(pPlayer);
switch (currentWeapon) switch (currentWeapon)
{ {
case KNEE_WEAPON: case KNEE_WEAPON:
if (weaponPal == 0) {
weaponPal = pPlayer->palookup; int const kneePal = P_GetKneePal(pPlayer, weaponPal);
guniqhudid = currentWeapon; guniqhudid = currentWeapon;
if (*weaponFrame < 5 || *weaponFrame > 9) if (*weaponFrame < 5 || *weaponFrame > 9)
G_DrawTileScaled(weaponX + 220 - halfLookAng, weaponY + 250 - weaponYOffset, KNEE, G_DrawTileScaled(weaponX + 220 - halfLookAng, weaponY + 250 - weaponYOffset, KNEE,
weaponShade, weaponBits, weaponPal); weaponShade, weaponBits, kneePal);
else else
G_DrawTileScaled(weaponX + 160 - halfLookAng, weaponY + 214 - weaponYOffset, KNEE + 1, G_DrawTileScaled(weaponX + 160 - halfLookAng, weaponY + 214 - weaponYOffset, KNEE + 1,
weaponShade, weaponBits, weaponPal); weaponShade, weaponBits, kneePal);
guniqhudid = 0; guniqhudid = 0;
break; break;
}
case TRIPBOMB_WEAPON: case TRIPBOMB_WEAPON:
weaponX += 8; weaponX += 8;

6
source/duke3d/src/player.h
View file

@ -362,6 +362,12 @@ void P_UpdateScreenPal(DukePlayer_t *pPlayer);
void P_EndLevel(void); void P_EndLevel(void);
void P_CheckWeaponI(int playerNum); void P_CheckWeaponI(int playerNum);
int P_GetHudPal(const DukePlayer_t *pPlayer); int P_GetHudPal(const DukePlayer_t *pPlayer);
int P_GetKneePal(const DukePlayer_t *pPlayer);
#ifdef __cplusplus
}
int P_GetKneePal(const DukePlayer_t *pPlayer, int const hudPal);
extern "C" {
#endif
int Proj_GetDamage(projectile_t const *pProj); int Proj_GetDamage(projectile_t const *pProj);