Commit 189ed293 authored by Richard Gobeille's avatar Richard Gobeille
Browse files

Duke3d: fix warnings in EDUKE32_STANDALONE build

parent 7784da28
......@@ -3113,11 +3113,11 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
A_DamageObject(otherSprite, spriteNum);
#ifndef EDUKE32_STANDALONE
if (sprite[otherSprite].picnum == APLAYER)
{
int playerNum = P_Get(otherSprite);
#ifndef EDUKE32_STANDALONE
if (!FURY)
{
A_PlaySound(PISTOL_BODYHIT, otherSprite);
......@@ -3125,8 +3125,8 @@ ACTOR_STATIC void Proj_MoveCustom(int const spriteNum)
if (pProj->workslike & PROJECTILE_SPIT)
P_HandleBeingSpitOn(g_player[playerNum].ps);
}
#endif
}
#endif
if (pProj->workslike & PROJECTILE_RPG_IMPACT)
{
......
......@@ -1900,6 +1900,7 @@ static void G_DrawTileScaled(int drawX, int drawY, int tileNum, int drawShade, i
guniqhudid = restoreid;
}
#ifndef EDUKE32_STANDALONE
static void G_DrawWeaponTile(int weaponX, int weaponY, int weaponTile, int weaponShade, int weaponBits, int weaponPal, int uniqueID = 0)
{
static int shadef = 0;
......@@ -1938,7 +1939,7 @@ static void G_DrawWeaponTile(int weaponX, int weaponY, int weaponTile, int weapo
G_DrawTileScaled(weaponX, weaponY, weaponTile, shadef, weaponBits, weaponPal, uniqueID);
}
#endif
static inline void G_DrawWeaponTileUnfaded(int weaponX, int weaponY, int weaponTile, int weaponShade, int weaponBits, int p, int uniqueID = 0)
{
......@@ -2231,8 +2232,9 @@ void P_DisplayWeapon(void)
// fixes trying to interpolate between the weapon_pos 0 and fully lowered positions when placing tripbombs
// FFS, WEAPON_POS_RAISE gets set in P_DoCounters() and then P_ProcessWeapon() decrements it before we can check for it when drawing
#ifndef EDUKE32_STANDALONE
int32_t weaponBits = pPlayer->weapon_pos == WEAPON_POS_LOWER || pPlayer->weapon_pos >= WEAPON_POS_RAISE-1 ? 0 : RS_LERP;
#endif
if (P_DisplayFist(weaponShade) || P_DisplayKnuckles(weaponShade) || P_DisplayTip(weaponShade) || P_DisplayAccess(weaponShade))
goto enddisplayweapon;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment