zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- converted FuncBubble into a class.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-15 21:07:58 +02:00
parent 0fc490bf40
commit 832b394561
2 changed files with 43 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

82
source/games/exhumed/src/bubbles.cpp
View file

@ -162,60 +162,52 @@ int BuildBubble(int x, int y, int z, short nSector)
return nBubble | 0x140000;
}
void FuncBubble(int nObject, int nMessage, int, int nRun)
void AIBubble::Tick(RunListEvent* ev)
{
short nBubble = RunData[nRun].nVal;
short nBubble = RunData[ev->nRun].nVal;
assert(nBubble >= 0 && nBubble < kMaxBubbles);
short nSprite = BubbleList[nBubble].nSprite;
short nSeq = BubbleList[nBubble].nSeq;
auto pSprite = &sprite[nSprite];
auto pSprite = &sprite[nSprite];
switch (nMessage)
{
case 0x20000:
{
seq_MoveSequence(nSprite, nSeq, BubbleList[nBubble].nFrame);
seq_MoveSequence(nSprite, nSeq, BubbleList[nBubble].nFrame);
BubbleList[nBubble].nFrame++;
BubbleList[nBubble].nFrame++;
if (BubbleList[nBubble].nFrame >= SeqSize[nSeq]) {
BubbleList[nBubble].nFrame = 0;
}
pSprite->z += pSprite->zvel;
short nSector = pSprite->sectnum;
if (pSprite->z <= sector[nSector].ceilingz)
{
short nSectAbove = SectAbove[nSector];
if (pSprite->hitag > -1 && nSectAbove != -1) {
BuildAnim(-1, 70, 0, pSprite->x, pSprite->y, sector[nSectAbove].floorz, nSectAbove, 64, 0);
}
DestroyBubble(nBubble);
}
return;
}
case 0x90000:
{
seq_PlotSequence(nObject, nSeq, BubbleList[nBubble].nFrame, 1);
mytsprite[nObject].owner = -1;
return;
}
case 0x80000:
case 0xA0000:
return;
default:
Printf("unknown msg %d for Bubble\n", nMessage);
return;
if (BubbleList[nBubble].nFrame >= SeqSize[nSeq]) {
BubbleList[nBubble].nFrame = 0;
}
pSprite->z += pSprite->zvel;
short nSector = pSprite->sectnum;
if (pSprite->z <= sector[nSector].ceilingz)
{
short nSectAbove = SectAbove[nSector];
if (pSprite->hitag > -1 && nSectAbove != -1) {
BuildAnim(-1, 70, 0, pSprite->x, pSprite->y, sector[nSectAbove].floorz, nSectAbove, 64, 0);
}
DestroyBubble(nBubble);
}
}
void AIBubble::Draw(RunListEvent* ev)
{
short nBubble = RunData[ev->nRun].nVal;
assert(nBubble >= 0 && nBubble < kMaxBubbles);
seq_PlotSequence(ev->nIndex, BubbleList[nBubble].nSeq, BubbleList[nBubble].nFrame, 1);
ev->pTSprite->owner = -1;
}
void FuncBubble(int nObject, int nMessage, int nDamage, int nRun)
{
AIBubble ai;
runlist_DispatchEvent(&ai, nObject, nMessage, nDamage, nRun);
}
void DoBubbleMachines()