diff --git a/source/games/blood/src/nnexts.cpp b/source/games/blood/src/nnexts.cpp index a5b787f06..d186b34f8 100644 --- a/source/games/blood/src/nnexts.cpp +++ b/source/games/blood/src/nnexts.cpp @@ -3190,7 +3190,7 @@ void useTeleportTarget(DBloodActor* sourceactor, DBloodActor* actor) if (actor->sector() != sourceactor->sector()) ChangeActorSect(actor, sourceactor->sector()); - actor->set_int_xy(sourceactor->int_pos().X, sourceactor->int_pos().Y); + actor->copyXY(sourceactor); int zTop, zBot; GetActorExtents(sourceactor, &zTop, &zBot); actor->set_int_z(zBot); diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index c61726b4f..412e592d3 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -2665,7 +2665,7 @@ void handle_se00(DDukeActor* actor) if (actor->temp_data[3] == 0) actor->temp_data[3] = ldist(actor, Owner); actor->spr.xvel = actor->temp_data[3]; - actor->set_int_xy(Owner->int_pos().X, Owner->int_pos().Y); + actor->copyXY(Owner); actor->spr.ang += (l * q); actor->temp_data[2] += (l * q); } diff --git a/source/games/duke/src/spawn.cpp b/source/games/duke/src/spawn.cpp index 2a50e1362..5acb68f79 100644 --- a/source/games/duke/src/spawn.cpp +++ b/source/games/duke/src/spawn.cpp @@ -933,7 +933,7 @@ void spawneffector(DDukeActor* actor, TArray* actors) { if (actor->spr.ang == 512) { - actor->set_int_xy(act2->int_pos().X, act2->int_pos().Y); + actor->copyXY(act2); } found = true; actor->SetOwner(act2); diff --git a/source/games/exhumed/src/object.cpp b/source/games/exhumed/src/object.cpp index 59b1ead38..d2b644aa8 100644 --- a/source/games/exhumed/src/object.cpp +++ b/source/games/exhumed/src/object.cpp @@ -1355,7 +1355,7 @@ DExhumedActor* BuildSpark(DExhumedActor* pActor, int nVal) { auto pSpark = insertActor(pActor->sector(), 0); - pSpark->set_int_xy(pActor->int_pos().X, pActor->int_pos().Y); + pSpark->copyXY(pActor); pSpark->spr.cstat = 0; pSpark->spr.shade = -127; pSpark->spr.pal = 1; diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 4a75b5de7..a6dc36355 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -1258,7 +1258,7 @@ sectdone: DExhumedActor* pFloorActor = PlayerList[nPlayer].pPlayerFloorSprite; if (nTotalPlayers > 1 && pFloorActor) { - pFloorActor->set_int_xy(pPlayerActor->int_pos().X, pPlayerActor->int_pos().Y); + pFloorActor->copyXY(pPlayerActor); if (pFloorActor->sector() != pPlayerActor->sector()) { diff --git a/source/games/sw/src/bunny.cpp b/source/games/sw/src/bunny.cpp index 65d7521ec..96b4518b3 100644 --- a/source/games/sw/src/bunny.cpp +++ b/source/games/sw/src/bunny.cpp @@ -1024,7 +1024,7 @@ int DoBunnyQuickJump(DSWActor* actor) } } - actor->set_int_xy(hitActor->int_pos().X, hitActor->int_pos().Y); + actor->copyXY(hitActor); actor->spr.ang = hitActor->spr.ang; actor->spr.ang = NORM_ANGLE(actor->spr.ang + 1024); HelpMissileLateral(actor, 2000); diff --git a/source/games/sw/src/jweapon.cpp b/source/games/sw/src/jweapon.cpp index d808a82b5..6316504b3 100644 --- a/source/games/sw/src/jweapon.cpp +++ b/source/games/sw/src/jweapon.cpp @@ -445,7 +445,7 @@ int DoBloodSpray(DSWActor* actor) actor->spr.xvel = actor->spr.yvel = actor->user.change.X = actor->user.change.Y = 0; actor->spr.xrepeat = actor->spr.yrepeat = 70 - RandomRange(25); - actor->set_int_xy(bldActor->int_pos().X, bldActor->int_pos().Y); + actor->copyXY(bldActor); // !FRANK! bit of a hack // yvel is the hit_wall