From 3e511f33b814606e239303ecdcaaa670d633dad7 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 13 Sep 2022 20:11:45 +0200 Subject: [PATCH] - movetripbomb and movecrack --- source/games/duke/src/actors_d.cpp | 6 +++--- source/games/duke/src/actors_r.cpp | 4 ++-- source/games/duke/src/animatesprites_d.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index 1f6053b7e..cb495b69c 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -901,7 +901,7 @@ static void movetripbomb(DDukeActor *actor) { SetActor(spawned, spawned->spr.pos); spawned->spr.hitag = actor->spr.hitag; - spawned->temp_data[1] = spawned->int_pos().Z; + spawned->temp_pos.Z = spawned->spr.pos.Z; // doesn't look to be used anywhere... if (x < 64) { @@ -970,7 +970,7 @@ static void movecrack(DDukeActor* actor) if (actor->spr.hitag > 0) { actor->temp_data[0] = actor->spr.cstat; - actor->temp_data[1] = actor->int_ang(); + actor->temp_angle = actor->spr.angle; int j = fi.ifhitbyweapon(actor); if (gs.actorinfo[j].flags2 & SFLAG2_EXPLOSIVE) { @@ -986,7 +986,7 @@ static void movecrack(DDukeActor* actor) else { actor->spr.cstat = ESpriteFlags::FromInt(actor->temp_data[0]); - actor->set_int_ang(actor->temp_data[1]); + actor->spr.angle = actor->temp_angle; actor->spr.extra = 0; } } diff --git a/source/games/duke/src/actors_r.cpp b/source/games/duke/src/actors_r.cpp index 2a6bb816e..4db2212c4 100644 --- a/source/games/duke/src/actors_r.cpp +++ b/source/games/duke/src/actors_r.cpp @@ -723,7 +723,7 @@ static void movecrack(DDukeActor* actor) if (actor->spr.hitag > 0) { actor->temp_data[0] = actor->spr.cstat; - actor->temp_data[1] = actor->int_ang(); + actor->temp_angle = actor->spr.angle; int j = fi.ifhitbyweapon(actor); if (gs.actorinfo[j].flags2 & SFLAG2_EXPLOSIVE) { @@ -739,7 +739,7 @@ static void movecrack(DDukeActor* actor) else { actor->spr.cstat = ESpriteFlags::FromInt(actor->temp_data[0]); - actor->set_int_ang(actor->temp_data[1]); + actor->spr.angle = actor->temp_angle; actor->spr.extra = 0; } } diff --git a/source/games/duke/src/animatesprites_d.cpp b/source/games/duke/src/animatesprites_d.cpp index edfbd32fb..d68ea3413 100644 --- a/source/games/duke/src/animatesprites_d.cpp +++ b/source/games/duke/src/animatesprites_d.cpp @@ -611,7 +611,7 @@ void animatesprites_d(tspriteArray& tsprites, int x, int y, int a, double interp case LASERLINE: if (!OwnerAc) break; if (t->sectp->lotag == 2) t->pal = 8; - t->set_int_z(OwnerAc->int_pos().Z - (3 << 8)); + t->pos.Z = OwnerAc->spr.pos.Z - 3; if (gs.lasermode == 2 && ps[screenpeek].heat_on == 0) t->yrepeat = 0; t->shade = -127;