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

- DropVoodooCb

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-28 11:51:41 +02:00
parent be9e423d7c
commit 63ae861765
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
source/games/blood/src/actor.cpp
View file

@ -6415,16 +6415,17 @@ DBloodActor* actSpawnSprite(DBloodActor* source, int nStat)
{
auto pSource = &source->s();
int nSprite = InsertSprite(pSource->sectnum, nStat);
DBloodActor* actor;
if (nSprite < 0)
{
StatIterator it(kStatPurge);
nSprite = it.NextIndex();
assert(nSprite >= 0);
BloodStatIterator it(kStatPurge);
actor = it.Next();
assert(actor);
assert(pSource->sectnum >= 0 && pSource->sectnum < kMaxSectors);
ChangeSpriteSect(nSprite, pSource->sectnum);
actPostSprite(nSprite, nStat);
ChangeActorSect(actor, pSource->sectnum);
actPostSprite(actor, nStat);
}
auto actor = &bloodActors[nSprite];
else actor = &bloodActors[nSprite];
spritetype* pSprite = &actor->s();
pSprite->x = pSource->x;

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

@ -630,13 +630,13 @@ void DropVoodooCb(DBloodActor* actor, int) // unused
{
if (!actor) return;
spritetype *pSprite = &actor->s();
int nOwner = pSprite->owner;
if (nOwner < 0 || nOwner >= kMaxSprites)
auto Owner = actor->GetOwner();
if (Owner == nullptr)
{
evPostActor(actor, 0, kCallbackRemove);
return;
}
spritetype *pOwner = &sprite[nOwner];
spritetype *pOwner = &Owner->s();
PLAYER *pPlayer;
if (IsPlayerSprite(pOwner))
pPlayer = &gPlayer[pOwner->type-kDudePlayer1];
@ -657,24 +657,23 @@ void DropVoodooCb(DBloodActor* actor, int) // unused
evPostActor(actor, 0, kCallbackRemove);
return;
}
int nSprite2;
StatIterator it(kStatDude);
while ((nSprite2 = it.NextIndex()) >= 0)
BloodStatIterator it(kStatDude);
while (auto actor2 = it.Next())
{
int nNextSprite = it.PeekIndex();
if (nOwner == nSprite2)
auto nextactor = it.Peek();
if (Owner == actor2)
continue;
auto actor2 = &bloodActors[nSprite2];
spritetype *pSprite2 = &sprite[nSprite2];
int nXSprite2 = pSprite2->extra;
if (nXSprite2 > 0 && nXSprite2 < kMaxXSprites)
spritetype *pSprite2 = &actor2->s();
if (actor2->hasX())
{
XSPRITE *pXSprite2 = &xsprite[nXSprite2];
XSPRITE *pXSprite2 = &actor2->x();
PLAYER *pPlayer2;
if (IsPlayerSprite(pSprite2))
if (actor2->IsPlayerActor())
pPlayer2 = &gPlayer[pSprite2->type-kDudePlayer1];
else
pPlayer2 = NULL;
pPlayer2 = nullptr;
if (pXSprite2->health > 0 && (pPlayer2 || pXSprite2->key == 0))
{
if (pPlayer2)
@ -686,7 +685,7 @@ void DropVoodooCb(DBloodActor* actor, int) // unused
int t = 0x8000/ClipLow(gNetPlayers-1, 1);
if (!powerupCheck(pPlayer2, kPwUpDeathMask))
t += ((3200-pPlayer2->armor[2])<<15)/3200;
if (Chance(t) || nNextSprite < 0)
if (Chance(t) || nextactor == nullptr)
{
int nDmg = actDamageSprite(actor, actor2, kDamageSpirit, pXSprite->data1<<4);
pXSprite->data1 = ClipLow(pXSprite->data1-nDmg, 0);
@ -729,7 +728,7 @@ void DropVoodooCb(DBloodActor* actor, int) // unused
vd = 0;
break;
}
if (vd && (Chance(vd) || nNextSprite < 0))
if (vd && (Chance(vd) || nextactor == nullptr))
{
sub_76A08(actor2, pSprite, NULL);
evPostActor(actor, 0, kCallbackRemove);