zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Oh hey I fucked something up... again... :D

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6821 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-04-06 01:43:27 +00:00
parent d20df1ec9a
commit 4dabba7bb6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1610,7 +1610,7 @@ int A_ShootWithZvel(int const spriteNum, int const projecTile, int const forceZv
} }
#ifdef EDUKE32_STANDALONE #ifdef EDUKE32_STANDALONE
return A_ShootCustom(spriteNum, projecTile, shootAng, &startPos); return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE) ? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos) : -1;
#else #else
return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE) return A_CheckSpriteTileFlags(projecTile, SFLAG_PROJECTILE)
? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos) ? A_ShootCustom(spriteNum, projecTile, shootAng, &startPos)
@ -2115,8 +2115,7 @@ void P_DisplayWeapon(void)
weaponX -= 58 + pPlayer->weapon_ang; weaponX -= 58 + pPlayer->weapon_ang;
weaponYOffset -= (pPlayer->hard_landing << 3); weaponYOffset -= (pPlayer->hard_landing << 3);
currentWeapon = PWEAPON(screenpeek, (pPlayer->last_weapon >= 0) ? pPlayer->last_weapon currentWeapon = PWEAPON(screenpeek, (pPlayer->last_weapon >= 0) ? pPlayer->last_weapon : pPlayer->curr_weapon, WorksLike);
: pPlayer->curr_weapon, WorksLike);
hudweap.gunposy = weaponYOffset; hudweap.gunposy = weaponYOffset;
hudweap.lookhoriz = weaponY; hudweap.lookhoriz = weaponY;
hudweap.cur = currentWeapon; hudweap.cur = currentWeapon;