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

Fix arrow trap - arrows were appearing to shoot out side-on

Browse source
This commit is contained in:
sirlemonhead 2019-11-01 00:36:20 +00:00 committed by Christoph Oelckers
parent 697948fdf0
commit 102076dc5f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/exhumed/src/object.cpp
View file

@ -1276,14 +1276,15 @@ void FuncTrap(int a, int b, int c)
} }
int nBullet = BuildBullet(nSprite, nType, 0, 0, 0, sprite[nSprite].ang, 0, 1); int nBullet = BuildBullet(nSprite, nType, 0, 0, 0, sprite[nSprite].ang, 0, 1);
short nBulletSprite = nBullet & 0xFFFF; // isolate the sprite index (disregard top 16 bits)
if (nType == 15) if (nType == 15)
{ {
sprite[nSprite].ang = Sin(sprite[nSprite].ang - 512); sprite[nBulletSprite].ang = (sprite[nBulletSprite].ang - 512) & kAngleMask;
D3PlayFX(StaticSound[kSound32], nSprite); D3PlayFX(StaticSound[kSound32], nSprite);
} }
else else
{ {
short nBulletSprite = nBullet & 0xFFFF; // isolate the sprite index (disregard top 16 bits)
sprite[nBulletSprite].clipdist = 50; sprite[nBulletSprite].clipdist = 50;
short nWall = sTrap[nTrap].field_6; short nWall = sTrap[nTrap].field_6;
@ -1309,7 +1310,7 @@ void FuncTrap(int a, int b, int c)
case 0x30000: case 0x30000:
case 0x90000: case 0x90000:
case 0x80000: case 0x80000:
case 0x0A0000: case 0xA0000:
return; return;
default: default: