diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp index f457c825d..8ccd77929 100644 --- a/source/games/sw/src/bunny.cpp +++ b/source/games/sw/src/bunny.cpp @@ -1173,7 +1173,6 @@ void BunnyHatch(DSWActor* actor) np->x = sp->x; np->y = sp->y; np->z = sp->z; - ClearOwner(actorNew); np->xrepeat = 30; // Baby size np->yrepeat = 24; np->ang = rip_ang[i]; @@ -1239,7 +1238,6 @@ DSWActor* BunnyHatch2(DSWActor* actor) np->x = wp->x; np->y = wp->y; np->z = wp->z; - ClearOwner(actorNew); np->xrepeat = 30; // Baby size np->yrepeat = 24; np->ang = RANDOM_P2(2048); diff --git a/source/games/sw/src/quake.cpp b/source/games/sw/src/quake.cpp index 72bd3dfe7..53a81c9f4 100644 --- a/source/games/sw/src/quake.cpp +++ b/source/games/sw/src/quake.cpp @@ -64,7 +64,6 @@ short CopyQuakeSpotToOn(SPRITEp sp) np->cstat = 0; np->extra = 0; - ClearOwner(actorNew); change_actor_stat(actorNew, STAT_QUAKE_ON); @@ -248,7 +247,6 @@ int SpawnQuake(short sectnum, int x, int y, int z, sp->y = y; sp->z = z; sp->cstat = 0; - ClearOwner(actorNew); sp->extra = 0; QUAKE_Match(sp) = -1; diff --git a/source/games/sw/src/ripper.cpp b/source/games/sw/src/ripper.cpp index 37b952f17..8f5e0ec9b 100644 --- a/source/games/sw/src/ripper.cpp +++ b/source/games/sw/src/ripper.cpp @@ -1240,8 +1240,6 @@ void RipperHatch(DSWActor* actor) np->x = wp->x; np->y = wp->y; np->z = wp->z; - ClearOwner(actorNew); - //np->xrepeat = np->yrepeat = 36; np->xrepeat = np->yrepeat = 64; np->ang = rip_ang[i]; np->pal = 0; diff --git a/source/games/sw/src/ripper2.cpp b/source/games/sw/src/ripper2.cpp index 6add381c5..8a3412e2e 100644 --- a/source/games/sw/src/ripper2.cpp +++ b/source/games/sw/src/ripper2.cpp @@ -1250,7 +1250,6 @@ void Ripper2Hatch(DSWActor* actor) np->x = wp->x; np->y = wp->y; np->z = wp->z; - ClearOwner(actorNew); //np->xrepeat = np->yrepeat = 36; np->xrepeat = np->yrepeat = 64; np->ang = rip_ang[i]; diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index e527dd8ac..801ef3365 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -985,7 +985,6 @@ int16_t SpawnSprite(short stat, short id, STATEp state, short sectnum, int x, in sp->xvel = vel; sp->zvel = 0; - sp->owner = -1; sp->lotag = 0L; sp->hitag = 0L; sp->extra = 0; @@ -2974,7 +2973,7 @@ void SpriteSetup(void) case SPEAR_TRAP: { u = SpawnUser(actor, 0, nullptr); - sp->owner = -1; + ClearOwner(actor); change_actor_stat(actor, STAT_TRAP); break; } diff --git a/source/games/sw/src/vis.cpp b/source/games/sw/src/vis.cpp index 216f2ed44..2701db345 100644 --- a/source/games/sw/src/vis.cpp +++ b/source/games/sw/src/vis.cpp @@ -176,7 +176,6 @@ void SpawnVis(DSWActor* parentActor, short sectnum, int x, int y, int z, int amt sp->x = x; sp->y = y; sp->z = z - Z(20); - ClearOwner(actorNew); } sp->cstat = 0;