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

- useSeqSpawnerGen

Browse source
This commit is contained in:
Christoph Oelckers 2021-09-03 00:04:17 +02:00
parent c59a6bbb86
commit 1ff6dc7c69
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
source/games/blood/src/nnexts.cpp
View file

@ -3555,14 +3555,15 @@ void damageSprites(DBloodActor* sourceactor, DBloodActor* actor)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void useSeqSpawnerGen(XSPRITE* pXSource, int objType, int index) { void useSeqSpawnerGen(DBloodActor* sourceactor, int objType, int index, DBloodActor* iactor)
{
if (pXSource->data2 > 0 && !getSequence(pXSource->data2)) { auto pXSource = &sourceactor->x();
if (pXSource->data2 > 0 && !getSequence(pXSource->data2))
{
Printf(PRINT_HIGH, "Missing sequence #%d", pXSource->data2); Printf(PRINT_HIGH, "Missing sequence #%d", pXSource->data2);
return; return;
} }
auto sourceactor = &bloodActors[pXSource->reference];
spritetype* pSource = &sourceactor->s(); spritetype* pSource = &sourceactor->s();
switch (objType) switch (objType)
@ -3631,19 +3632,23 @@ void useSeqSpawnerGen(XSPRITE* pXSource, int objType, int index) {
return; return;
case OBJ_SPRITE: case OBJ_SPRITE:
{
if (pXSource->data2 <= 0) seqKill(3, sprite[index].extra); auto pSprite = &iactor->s();
else if (sectRangeIsFine(sprite[index].sectnum)) { if (pXSource->data2 <= 0) seqKill(iactor);
if (pXSource->data3 > 0) { else if (sectRangeIsFine(pSprite->sectnum))
int nSprite = InsertSprite(sprite[index].sectnum, kStatDecoration); {
auto spawned = &bloodActors[nSprite]; if (pXSource->data3 > 0)
{
int nSpawned = InsertSprite(pSprite->sectnum, kStatDecoration);
auto spawned = &bloodActors[nSpawned];
auto pSpawned = &spawned->s(); auto pSpawned = &spawned->s();
int top, bottom; GetSpriteExtents(&sprite[index], &top, &bottom); int top, bottom; GetSpriteExtents(&sprite[index], &top, &bottom);
pSpawned->x = sprite[index].x; pSpawned->x = pSprite->x;
pSpawned->y = sprite[index].y; pSpawned->y = pSprite->y;
switch (pXSource->data3) { switch (pXSource->data3)
{
default: default:
pSpawned->z = sprite[index].z; pSpawned->z = pSprite->z;
break; break;
case 2: case 2:
pSpawned->z = bottom; pSpawned->z = bottom;
@ -3652,16 +3657,17 @@ void useSeqSpawnerGen(XSPRITE* pXSource, int objType, int index) {
pSpawned->z = top; pSpawned->z = top;
break; break;
case 4: case 4:
pSpawned->z = sprite[index].z + tileHeight(sprite[index].picnum) / 2 + tileTopOffset(sprite[index].picnum); pSpawned->z = pSprite->z + tileHeight(pSprite->picnum) / 2 + tileTopOffset(pSprite->picnum);
break; break;
case 5: case 5:
case 6: case 6:
if (!sectRangeIsFine(sprite[index].sectnum)) pSpawned->z = top; if (!sectRangeIsFine(pSprite->sectnum)) pSpawned->z = top;
else pSpawned->z = (pXSource->data3 == 5) ? sector[pSpawned->sectnum].floorz : sector[pSpawned->sectnum].ceilingz; else pSpawned->z = (pXSource->data3 == 5) ? sector[pSpawned->sectnum].floorz : sector[pSpawned->sectnum].ceilingz;
break; break;
} }
if (nSprite >= 0) { if (spawned != nullptr)
{
spawned->addX(); spawned->addX();
seqSpawn(pXSource->data2, spawned, -1); seqSpawn(pXSource->data2, spawned, -1);
@ -3686,15 +3692,16 @@ void useSeqSpawnerGen(XSPRITE* pXSource, int objType, int index) {
} }
else else
{ {
seqSpawn(pXSource->data2, 3, sprite[index].extra, -1); seqSpawn(pXSource->data2, iactor, -1);
} }
if (pXSource->data4 > 0) if (pXSource->data4 > 0)
sfxPlay3DSound(&sprite[index], pXSource->data4, -1, 0); sfxPlay3DSound(iactor, pXSource->data4, -1, 0);
} }
return; return;
} }
} }
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
@ -4739,7 +4746,7 @@ void modernTypeTrigger(int destObjType, int destObjIndex, EVENT event) {
break; break;
// takes data2 as SEQ ID and spawns it on it's or TX ID object // takes data2 as SEQ ID and spawns it on it's or TX ID object
case kModernSeqSpawner: case kModernSeqSpawner:
useSeqSpawnerGen(pXSource, destObjType, destObjIndex); useSeqSpawnerGen(event.actor, destObjType, destObjIndex, destactor);
break; break;
// creates wind on TX ID sector // creates wind on TX ID sector
case kModernWindGenerator: case kModernWindGenerator:
@ -5427,7 +5434,7 @@ bool modernTypeOperateSprite(int nSprite, spritetype* pSprite, XSPRITE* pXSprite
[[fallthrough]]; [[fallthrough]];
case kCmdRepeat: case kCmdRepeat:
if (pXSprite->txID > 0) modernTypeSendCommand(nSprite, pXSprite->txID, (COMMAND_ID)pXSprite->command); if (pXSprite->txID > 0) modernTypeSendCommand(nSprite, pXSprite->txID, (COMMAND_ID)pXSprite->command);
else if (pSprite->type == kModernSeqSpawner) useSeqSpawnerGen(pXSprite, 3, pSprite->index); else if (pSprite->type == kModernSeqSpawner) useSeqSpawnerGen(actor, 3, 0, actor);
else useEffectGen(actor, nullptr); else useEffectGen(actor, nullptr);
if (pXSprite->busyTime > 0) if (pXSprite->busyTime > 0)