From 8f5340c3a70eaa383c6c3b7fd3e862d231ad9b17 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 29 Aug 2022 00:02:17 +0200 Subject: [PATCH] - set_int_ang(...int_ang()) --- source/games/duke/src/actors.cpp | 6 +++--- source/games/duke/src/input.cpp | 2 +- source/games/duke/src/player_r.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/games/duke/src/actors.cpp b/source/games/duke/src/actors.cpp index 2494f5d0d..11854614c 100644 --- a/source/games/duke/src/actors.cpp +++ b/source/games/duke/src/actors.cpp @@ -400,7 +400,7 @@ void moveplayers(void) { act->spr.pos = p->opos.plusZ(gs.playerheight); act->backupz(); - act->set_int_ang(p->angle.oang.Buildang()); + act->spr.angle = p->angle.oang; SetActor(act, act->spr.pos); } else @@ -464,7 +464,7 @@ void moveplayers(void) p->angle.addadjustment(deltaangle(p->angle.ang, VecToAngle(p->wackedbyactor->spr.pos.X - p->pos.X, p->wackedbyactor->spr.pos.Y - p->pos.Y)) * (1. / 2.)); } } - act->set_int_ang(p->angle.ang.Buildang()); + act->spr.angle = p->angle.ang; } } else @@ -497,7 +497,7 @@ void moveplayers(void) if (act->spr.extra < 8) { act->spr.xvel = 128; - act->set_int_ang(p->angle.ang.Buildang()); + act->spr.angle = p->angle.ang; act->spr.extra++; ssp(act, CLIPMASK0); } diff --git a/source/games/duke/src/input.cpp b/source/games/duke/src/input.cpp index 16ba1c180..13857158f 100644 --- a/source/games/duke/src/input.cpp +++ b/source/games/duke/src/input.cpp @@ -846,7 +846,7 @@ void GameInterface::GetInput(ControlInfo* const hidInput, double const scaleAdju p->angle.processhelpers(scaleAdjust); p->horizon.processhelpers(scaleAdjust); - p->GetActor()->set_int_ang(p->angle.ang.Buildang()); + p->GetActor()->spr.angle = p->angle.ang; } if (packet) diff --git a/source/games/duke/src/player_r.cpp b/source/games/duke/src/player_r.cpp index 09bda17b9..5c4b9c222 100644 --- a/source/games/duke/src/player_r.cpp +++ b/source/games/duke/src/player_r.cpp @@ -1505,7 +1505,7 @@ void checkweapons_r(player_struct* p) auto j = spawn(p->GetActor(), 7220); if (j) { - j->set_int_ang(p->angle.ang.Buildang()); + j->spr.angle = p->angle.ang; j->saved_ammo = p->ammo_amount[MOTORCYCLE_WEAPON]; } p->OnMotorcycle = 0; @@ -1524,7 +1524,7 @@ void checkweapons_r(player_struct* p) auto j = spawn(p->GetActor(), 7233); if (j) { - j->set_int_ang(p->angle.ang.Buildang()); + j->spr.angle = p->angle.ang; j->saved_ammo = p->ammo_amount[BOAT_WEAPON]; } p->OnBoat = 0; @@ -4102,7 +4102,7 @@ void OffMotorcycle(player_struct *p) auto spawned = spawn(p->GetActor(), EMPTYBIKE); if (spawned) { - spawned->set_int_ang(p->angle.ang.Buildang()); + spawned->spr.angle = p->angle.ang; spawned->spr.xvel += p->angle.ang.Cos() * (1 << 7); spawned->spr.yvel += p->angle.ang.Sin() * (1 << 7); spawned->saved_ammo = p->ammo_amount[MOTORCYCLE_WEAPON]; @@ -4167,7 +4167,7 @@ void OffBoat(player_struct *p) auto spawned = spawn(p->GetActor(), EMPTYBOAT); if (spawned) { - spawned->set_int_ang(p->angle.ang.Buildang()); + spawned->spr.angle = p->angle.ang; spawned->spr.xvel += p->angle.ang.Cos() * (1 << 7); spawned->spr.yvel += p->angle.ang.Sin() * (1 << 7); spawned->saved_ammo = p->ammo_amount[BOAT_WEAPON];