zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 17:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- evSend

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-27 16:44:24 +02:00
parent b8f8c0fe04
commit 41316f7f8f
2 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -605,7 +605,7 @@ void sub_76A08(DBloodActor *actor, spritetype *pSprite2, PLAYER *pPlayer) // ???
pSprite->y = pSprite2->y; pSprite->y = pSprite2->y;
pSprite->z = sector[pSprite2->sectnum].floorz-(bottom-pSprite->z); pSprite->z = sector[pSprite2->sectnum].floorz-(bottom-pSprite->z);
pSprite->ang = pSprite2->ang; pSprite->ang = pSprite2->ang;
ChangeSpriteSect(pSprite->index, pSprite2->sectnum); ChangeActorSect(actor, pSprite2->sectnum);
sfxPlay3DSound(pSprite2, 201, -1, 0); sfxPlay3DSound(pSprite2, 201, -1, 0);
actor->xvel() = actor->yvel() = actor->zvel() = 0; actor->xvel() = actor->yvel() = actor->zvel() = 0;
viewBackupSpriteLoc(pSprite->index, pSprite); viewBackupSpriteLoc(pSprite->index, pSprite);

27
source/games/blood/src/eventq.cpp
View file

@ -417,19 +417,17 @@ void evSend(DBloodActor* actor, int nIndex, int nType, int rxId, COMMAND_ID comm
case kChannelRemoteBomb6: case kChannelRemoteBomb6:
case kChannelRemoteBomb7: case kChannelRemoteBomb7:
{ {
int nSprite; BloodStatIterator it(kStatThing);
StatIterator it(kStatThing); while (auto actor = it.Next())
while ((nSprite = it.NextIndex()) >= 0)
{ {
spritetype* pSprite = &sprite[nSprite]; spritetype* pSprite = &actor->s();
if (pSprite->flags & 32) if (pSprite->flags & 32)
continue; continue;
int nXSprite = pSprite->extra; if (actor->hasX())
if (nXSprite > 0)
{ {
XSPRITE* pXSprite = &xsprite[nXSprite]; XSPRITE* pXSprite = &actor->x();
if (pXSprite->rxID == rxId) if (pXSprite->rxID == rxId)
trMessageSprite(nSprite, event); trMessageSprite(actor->s().index, event);
} }
} }
return; return;
@ -438,18 +436,17 @@ void evSend(DBloodActor* actor, int nIndex, int nType, int rxId, COMMAND_ID comm
case kChannelTeamBFlagCaptured: case kChannelTeamBFlagCaptured:
{ {
int nSprite; int nSprite;
StatIterator it(kStatItem); BloodStatIterator it(kStatItem);
while ((nSprite = it.NextIndex()) >= 0) while (auto actor = it.Next())
{ {
spritetype* pSprite = &sprite[nSprite]; spritetype* pSprite = &actor->s();
if (pSprite->flags & 32) if (pSprite->flags & 32)
continue; continue;
int nXSprite = pSprite->extra; if (actor->hasX())
if (nXSprite > 0)
{ {
XSPRITE* pXSprite = &xsprite[nXSprite]; XSPRITE* pXSprite = &actor->x();
if (pXSprite->rxID == rxId) if (pXSprite->rxID == rxId)
trMessageSprite(nSprite, event); trMessageSprite(actor->s().index, event);
} }
} }
return; return;