zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 20:42:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Fish AI. Was miscalculating yvel (too many shifts)

Browse source
This commit is contained in:
sirlemonhead 2019-11-15 22:18:54 +00:00 committed by Christoph Oelckers
parent 69a6715997
commit 21459b4ba8
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/exhumed/src/fish.cpp
View file

@ -259,7 +259,8 @@ void IdleFish(short nFish, short edx)
{
short nSprite = FishList[nFish].nSprite;
sprite[nSprite].ang += ((256 - RandomSize(9)) + 1024) & kAngleMask;
sprite[nSprite].ang += (256 - RandomSize(9)) + 1024;
sprite[nSprite].ang &= kAngleMask;
sprite[nSprite].xvel = (sprite[nSprite].ang + 512) >> 8;
sprite[nSprite].yvel = (sprite[nSprite].ang) >> 8;
@ -309,6 +310,13 @@ void FuncFish(int a, int nDamage, int nRun)
return;
}
case 0x90000:
{
seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqFish] + ActionSeq[nAction].a, FishList[nFish].field_2, ActionSeq[nAction].b);
tsprite[a & 0xFFFF].owner = -1;
return;
}
case 0xA0000:
{
if (FishList[nFish].nHealth <= 0) {
@ -320,10 +328,8 @@ void FuncFish(int a, int nDamage, int nRun)
if (!nDamage) {
return;
}
else
{
FishList[nFish].field_C = 10;
}
FishList[nFish].field_C = 10;
}
// fall through
}
@ -375,13 +381,6 @@ void FuncFish(int a, int nDamage, int nRun)
return;
}
case 0x90000:
{
seq_PlotSequence(a & 0xFFFF, SeqOffsets[kSeqFish] + ActionSeq[nAction].a, FishList[nFish].field_2, ActionSeq[nAction].b);
tsprite[a & 0xFFFF].owner = -1;
return;
}
case 0x20000:
{
if (!(SectFlag[sprite[nSprite].sectnum] & kSectUnderwater))
@ -459,7 +458,7 @@ void FuncFish(int a, int nDamage, int nRun)
if (z <= nHeight)
{
sprite[nSprite].xvel = (Sin(sprite[nSprite].ang + 512) >> 5) - (Sin(sprite[nSprite].ang + 512) >> 7);
sprite[nSprite].yvel = ((Sin(sprite[nSprite].ang) >> 5) >> 5) - ((Sin(sprite[nSprite].ang) >> 5) >> 7);
sprite[nSprite].yvel = (Sin(sprite[nSprite].ang) >> 5) - (Sin(sprite[nSprite].ang) >> 7);
}
else
{
@ -474,7 +473,7 @@ void FuncFish(int a, int nDamage, int nRun)
case 4:
{
if (!FishList[nFish].field_2)
if (FishList[nFish].field_2 == 0)
{
IdleFish(nFish, 0);
}
@ -488,7 +487,7 @@ void FuncFish(int a, int nDamage, int nRun)
case 9:
{
if (!FishList[nFish].field_2)
if (FishList[nFish].field_2 == 0)
{
DestroyFish(nFish);
}