teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-22 11:41:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- converted FuncBullets into a class.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-15 21:10:16 +02:00
parent 832b394561
commit 8f9e9de4b4
2 changed files with 59 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/exhumed/src/aistuff.h
View file

@ -452,6 +452,12 @@ struct AIBubble : ExhumedAI
void Draw(RunListEvent* ev) override; void Draw(RunListEvent* ev) override;
}; };
class AIBullet : public ExhumedAI
{
void Tick(RunListEvent* ev) override;
void Draw(RunListEvent* ev) override;
};
void runlist_DispatchEvent(ExhumedAI* ai, int nObject, int nMessage, int nDamage, int nRun); void runlist_DispatchEvent(ExhumedAI* ai, int nObject, int nMessage, int nDamage, int nRun);

112
source/games/exhumed/src/bullet.cpp
View file

@ -811,76 +811,70 @@ int BuildBullet(short nSprite, int nType, int, int, int val1, int nAngle, int va
return nBulletSprite | (nBullet << 16); return nBulletSprite | (nBullet << 16);
} }
void FuncBullet(int nObject, int nMessage, int, int nRun) void AIBullet::Tick(RunListEvent* ev)
{ {
short nBullet = RunData[nRun].nVal; short nBullet = RunData[ev->nRun].nVal;
assert(nBullet >= 0 && nBullet < kMaxBullets); assert(nBullet >= 0 && nBullet < kMaxBullets);
short nSeq = SeqOffsets[BulletList[nBullet].nSeq]; short nSeq = SeqOffsets[BulletList[nBullet].nSeq];
short nSprite = BulletList[nBullet].nSprite; short nSprite = BulletList[nBullet].nSprite;
auto pSprite = &sprite[nSprite]; auto pSprite = &sprite[nSprite];
switch (nMessage) short nFlag = FrameFlag[SeqBase[nSeq] + BulletList[nBullet].nFrame];
seq_MoveSequence(nSprite, nSeq, BulletList[nBullet].nFrame);
if (nFlag & 0x80)
{ {
case 0x20000: BuildAnim(-1, 45, 0, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, pSprite->xrepeat, 0);
}
BulletList[nBullet].nFrame++;
if (BulletList[nBullet].nFrame >= SeqSize[nSeq])
{
if (!BulletList[nBullet].field_12)
{ {
short nFlag = FrameFlag[SeqBase[nSeq] + BulletList[nBullet].nFrame]; BulletList[nBullet].nSeq = BulletInfo[BulletList[nBullet].nType].nSeq;
BulletList[nBullet].field_12++;
seq_MoveSequence(nSprite, nSeq, BulletList[nBullet].nFrame);
if (nFlag & 0x80)
{
BuildAnim(-1, 45, 0, pSprite->x, pSprite->y, pSprite->z, pSprite->sectnum, pSprite->xrepeat, 0);
}
BulletList[nBullet].nFrame++;
if (BulletList[nBullet].nFrame >= SeqSize[nSeq])
{
if (!BulletList[nBullet].field_12)
{
BulletList[nBullet].nSeq = BulletInfo[BulletList[nBullet].nType].nSeq;
BulletList[nBullet].field_12++;
}
BulletList[nBullet].nFrame = 0;
}
if (BulletList[nBullet].field_E != -1 && --BulletList[nBullet].field_E == 0)
{
DestroyBullet(nBullet);
}
else
{
MoveBullet(nBullet);
}
break;
} }
case 0x90000: BulletList[nBullet].nFrame = 0;
{ }
short nSprite2 = nObject;
mytsprite[nSprite2].statnum = 1000;
if (BulletList[nBullet].nType == 15) if (BulletList[nBullet].field_E != -1 && --BulletList[nBullet].field_E == 0)
{ {
seq_PlotArrowSequence(nSprite2, nSeq, BulletList[nBullet].nFrame); DestroyBullet(nBullet);
} }
else else
{ {
seq_PlotSequence(nSprite2, nSeq, BulletList[nBullet].nFrame, 0); MoveBullet(nBullet);
mytsprite[nSprite2].owner = -1;
}
break;
}
case 0xA0000:
break;
default:
{
Printf("unknown msg %d for bullet\n", nMessage);
return;
}
} }
} }
void AIBullet::Draw(RunListEvent* ev)
{
short nBullet = RunData[ev->nRun].nVal;
assert(nBullet >= 0 && nBullet < kMaxBullets);
short nSeq = SeqOffsets[BulletList[nBullet].nSeq];
short nSprite2 = ev->nIndex;
mytsprite[nSprite2].statnum = 1000;
if (BulletList[nBullet].nType == 15)
{
seq_PlotArrowSequence(nSprite2, nSeq, BulletList[nBullet].nFrame);
}
else
{
seq_PlotSequence(nSprite2, nSeq, BulletList[nBullet].nFrame, 0);
ev->pTSprite->owner = -1;
}
}
void FuncBullet(int nObject, int nMessage, int nDamage, int nRun)
{
AIBullet ai;
runlist_DispatchEvent(&ai, nObject, nMessage, nDamage, nRun);
}
END_PS_NS END_PS_NS