From 4dabba7bb6bffaed9c89d88c9654012217afc22c Mon Sep 17 00:00:00 2001 From: terminx Date: Fri, 6 Apr 2018 01:43:27 +0000 Subject: [PATCH] Oh hey I fucked something up... again... :D git-svn-id: https://svn.eduke32.com/eduke32@6821 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/player.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index cb9a4a805..242fa9f28 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -1610,7 +1610,7 @@ int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZv } #ifdef EDUKE32_STANDALONE - return A_ShootCustom(spriteNum, projecTile, shootAng, &startPos); + return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE) ? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos) : -1; #else return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE) ? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos) @@ -2115,8 +2115,7 @@ void P_DisplayWeapon(void) weaponX -= 58 + pPlayer->weapon_ang; weaponYOffset -= (pPlayer->hard_landing << 3); - currentWeapon = PWEAPON(screenpeek, (pPlayer->last_weapon >= 0) ? pPlayer->last_weapon - : pPlayer->curr_weapon, WorksLike); + currentWeapon = PWEAPON(screenpeek, (pPlayer->last_weapon >= 0) ? pPlayer->last_weapon : pPlayer->curr_weapon, WorksLike); hudweap.gunposy = weaponYOffset; hudweap.lookhoriz = weaponY; hudweap.cur = currentWeapon;