diff --git a/source/games/whaven/src/ai.cpp b/source/games/whaven/src/ai.cpp index 0bb7794e6..c017b023a 100644 --- a/source/games/whaven/src/ai.cpp +++ b/source/games/whaven/src/ai.cpp @@ -264,14 +264,14 @@ void aiProcess() { if (bcos(spr.ang) * (plr.x - spr.x) + bsin(spr.ang) * (plr.y - spr.y) >= 0) { if (cansee(plr.x, plr.y, plr.z, plr.sector, spr.x, spr.y, spr.z - (tileHeight(spr.picnum) << 7), spr.sectnum)) { - newstatus(i, CHASE); + SetNewStatus(actor, CHASE); } } else if (moveStat.type != kHitNone) { if (moveStat.type == kHitWall) { // hit a wall actoruse(i); } - newstatus(i, FINDME); + SetNewStatus(actor, FINDME); } } diff --git a/source/games/whaven/src/spellbooks.cpp b/source/games/whaven/src/spellbooks.cpp index 79e05b39c..c0af8612a 100644 --- a/source/games/whaven/src/spellbooks.cpp +++ b/source/games/whaven/src/spellbooks.cpp @@ -282,7 +282,7 @@ void nukespell(PLAYER& plr, short const j) { switch (spr.detail) { case WILLOWTYPE: case SPIDERTYPE: - deletesprite((short) j); + DeleteActor(actor); addscore(&plr, 10); break; case KOBOLDTYPE: diff --git a/source/games/whaven/src/whani.cpp b/source/games/whaven/src/whani.cpp index 75fc02d42..c7dde6a69 100644 --- a/source/games/whaven/src/whani.cpp +++ b/source/games/whaven/src/whani.cpp @@ -238,7 +238,7 @@ void animateobjs(PLAYER& plr) { spr.cstat = 0x303; spr.pal = 0; spr.extra = 12; - newstatus((short) i, EVILSPIRIT); + SetNewStatus(actor, EVILSPIRIT); } } diff --git a/source/games/whaven/src/whfx.cpp b/source/games/whaven/src/whfx.cpp index ad7b3333e..d88106f35 100644 --- a/source/games/whaven/src/whfx.cpp +++ b/source/games/whaven/src/whfx.cpp @@ -1081,9 +1081,9 @@ void weaponpowerup(PLAYER& plr) { int j = actor->GetSpriteIndex(); if (tspr.picnum == CONE) { - deletesprite(j); + DeleteActor(actor); } else if (tspr.picnum == SPARKBALL) { - deletesprite(j); + DeleteActor(actor); } } } diff --git a/source/games/whaven/src/whtag.cpp b/source/games/whaven/src/whtag.cpp index 5976e31ad..f69f7d8a5 100644 --- a/source/games/whaven/src/whtag.cpp +++ b/source/games/whaven/src/whtag.cpp @@ -28,7 +28,7 @@ void operatesprite(PLAYER& plr, short s) { auto actor = &whActors[s]; auto& spr = actor->s(); if (spr.picnum == SPAWNFIREBALL) - newstatus(s, DEVILFIRE); + SetNewStatus(actor, DEVILFIRE); if (spr.picnum == SPAWNJAVLIN) trowajavlin(s); @@ -42,7 +42,7 @@ void operatesprite(PLAYER& plr, short s) { break; case GONZOHMJUMP: case GONZOSHJUMP: - newstatus((short) s, AMBUSH); + SetNewStatus(actor, AMBUSH); break; case STAINGLASS1: case STAINGLASS2: