From 3cefda29835f3b8c71d6d976e8275529fe48eb22 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 13 Sep 2022 18:11:40 +0200 Subject: [PATCH] - simplify some angle stuff --- source/games/duke/src/player.cpp | 5 +---- source/games/duke/src/premap.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index 65b8c8bba..13e97a659 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -116,13 +116,10 @@ void quickkill(player_struct* p) void forceplayerangle(int snum) { player_struct* p = &ps[snum]; - int n; - - n = 128 - (krand() & 255); p->horizon.addadjustment(buildhoriz(64)); p->sync.actions |= SB_CENTERVIEW; - p->angle.rotscrnang = p->angle.look_ang = DAngle::fromBuild(n >> 1); + p->angle.rotscrnang = p->angle.look_ang = (DAngle22_5 - randomAngle(45)) / 2.; } //--------------------------------------------------------------------------- diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index ee4fa4ee8..db0c1f942 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -177,7 +177,7 @@ void resetplayerstats(int snum) p->jetpack_on = 0; p->holoduke_on = nullptr; - p->angle.olook_ang = p->angle.look_ang = DAngle::fromBuild(512 - (((~currentLevel->levelNumber) & 1) << 10)); + p->angle.olook_ang = p->angle.look_ang = (currentLevel->levelNumber & 1)? DAngle90 : -DAngle90; p->angle.orotscrnang = p->angle.rotscrnang = nullAngle; p->newOwner =nullptr; @@ -1010,7 +1010,7 @@ static int LoadTheMap(MapRecord *mi, player_struct*p, int gamemode) STAT_NewLevel(mi->fileName); TITLE_InformName(mi->name); - p->angle.ang = DAngle::fromBuild(lbang); + p->angle.ang = mapangle(lbang); gotpic.Zero();