teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 17:01:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- some minor stuff

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-27 16:47:46 +02:00
parent 41316f7f8f
commit cce3d8f440
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/blood/src/aiunicult.cpp
View file

@ -2058,7 +2058,7 @@ void genDudeTransform(DBloodActor* actor)
if (actIncarnation == NULL) if (actIncarnation == NULL)
{ {
if (pXSprite->sysData1 == kGenDudeTransformStatus) pXSprite->sysData1 = 0; if (pXSprite->sysData1 == kGenDudeTransformStatus) pXSprite->sysData1 = 0;
trTriggerSprite(pSprite->index, pXSprite, kCmdOff); trTriggerSprite(actor, kCmdOff);
return; return;
} }
@ -2075,7 +2075,7 @@ void genDudeTransform(DBloodActor* actor)
pXIncarnation->triggerOff = false; pXIncarnation->triggerOff = false;
// trigger dude death before transform // trigger dude death before transform
trTriggerSprite(pSprite->index, pXSprite, kCmdOff); trTriggerSprite(actor, kCmdOff);
pSprite->type = pSprite->inittype = pIncarnation->type; pSprite->type = pSprite->inittype = pIncarnation->type;
pSprite->flags = pIncarnation->flags; pSprite->flags = pIncarnation->flags;

10
source/games/blood/src/callback.cpp
View file

@ -501,11 +501,13 @@ void returnFlagToBase(DBloodActor* actor, int) // 17
{ {
if (!actor) return; if (!actor) return;
spritetype* pSprite = &actor->s(); spritetype* pSprite = &actor->s();
if (pSprite->owner >= 0 && pSprite->owner < kMaxSprites) auto owner = actor->GetOwner();
if (owner)
{ {
spritetype* pOwner = &sprite[pSprite->owner]; spritetype* pOwner = &owner->s();
XSPRITE* pXOwner = &xsprite[pOwner->extra]; XSPRITE* pXOwner = &owner->x();
switch (pSprite->type) { switch (pSprite->type)
{
case kItemFlagA: case kItemFlagA:
trTriggerSprite(pOwner->index, pXOwner, kCmdOn); trTriggerSprite(pOwner->index, pXOwner, kCmdOn);
sndStartSample(8003, 255, 2, 0); sndStartSample(8003, 255, 2, 0);