From 2de1aea4a6cd68cb4a01d82ca404ae046622d61e Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 12 Sep 2022 21:28:57 +0200
Subject: [PATCH] - floatified exit position.

---
 source/games/duke/src/gameexec.cpp | 8 ++++----
 source/games/duke/src/premap.cpp   | 3 +--
 source/games/duke/src/premap_d.cpp | 3 +--
 source/games/duke/src/premap_r.cpp | 3 +--
 source/games/duke/src/savegame.cpp | 4 ++--
 source/games/duke/src/types.h      | 3 ++-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp
index 8201a0bee..24bea9eed 100644
--- a/source/games/duke/src/gameexec.cpp
+++ b/source/games/duke/src/gameexec.cpp
@@ -296,13 +296,13 @@ void DoPlayer(bool bSet, int lVar1, int lLabelID, int lVar2, DDukeActor* sActor,
 		break;
 
 	case PLAYER_EXITX:
-		if (bSet) ps[iPlayer].exit.X = lValue;
-		else SetGameVarID(lVar2, ps[iPlayer].exit.X, sActor, sPlayer);
+		if (bSet) ps[iPlayer].Exit.X = lValue * maptoworld;
+		else SetGameVarID(lVar2, ps[iPlayer].Exit.X / maptoworld, sActor, sPlayer);
 		break;
 
 	case PLAYER_EXITY:
-		if (bSet) ps[iPlayer].exit.Y = lValue;
-		else SetGameVarID(lVar2, ps[iPlayer].exit.Y, sActor, sPlayer);
+		if (bSet) ps[iPlayer].Exit.Y = lValue * maptoworld;
+		else SetGameVarID(lVar2, ps[iPlayer].Exit.Y / maptoworld, sActor, sPlayer);
 		break;
 
 	case PLAYER_LOOGIEX:
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index 14d30c254..ee4fa4ee8 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -746,8 +746,7 @@ void prelevel_common(int g)
 
 		if (sectp->lotag == -1)
 		{
-			ps[0].exit.X = sectp->firstWall()->wall_int_pos().X;
-			ps[0].exit.Y = sectp->firstWall()->wall_int_pos().Y;
+			ps[0].Exit = sectp->firstWall()->pos;
 			continue;
 		}
 	}
diff --git a/source/games/duke/src/premap_d.cpp b/source/games/duke/src/premap_d.cpp
index c27a7e8f4..ef8556cce 100644
--- a/source/games/duke/src/premap_d.cpp
+++ b/source/games/duke/src/premap_d.cpp
@@ -282,8 +282,7 @@ void prelevel_d(int g, TArray<DDukeActor*>& actors)
 
 		if (ac->spr.lotag == -1 && (ac->spr.cstat & CSTAT_SPRITE_ALIGNMENT_WALL))
 		{
-			ps[0].exit.X = ac->int_pos().X;
-			ps[0].exit.Y = ac->int_pos().Y;
+			ps[0].Exit = ac->spr.pos.XY();
 		}
 		else
 			premapcontroller(ac);
diff --git a/source/games/duke/src/premap_r.cpp b/source/games/duke/src/premap_r.cpp
index fceac806a..0e11e68c1 100644
--- a/source/games/duke/src/premap_r.cpp
+++ b/source/games/duke/src/premap_r.cpp
@@ -535,8 +535,7 @@ void prelevel_r(int g, TArray<DDukeActor*>& actors)
 
 		if (ac->spr.lotag == -1 && (ac->spr.cstat & CSTAT_SPRITE_ALIGNMENT_WALL))
 		{
-			ps[0].exit.X = ac->int_pos().X;
-			ps[0].exit.Y = ac->int_pos().Y;
+			ps[0].Exit = ac->spr.pos.XY();
 		}
 		else switch (ac->spr.picnum)
 		{
diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp
index b1181c137..3c55851e4 100644
--- a/source/games/duke/src/savegame.cpp
+++ b/source/games/duke/src/savegame.cpp
@@ -114,8 +114,8 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w,
 			("pals", w.pals)
 			("fricx", w.fric.X)
 			("fricy", w.fric.Y)
-			("exitx", w.exit.X)
-			("exity", w.exit.Y)
+			("exitx", w.Exit.X)
+			("exity", w.Exit.Y)
 			("numloogs", w.numloogs)
 			("loogcnt", w.loogcnt)
 			.Array("loogie", w.loogie, w.numloogs)
diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h
index c796e551f..5c4708cca 100644
--- a/source/games/duke/src/types.h
+++ b/source/games/duke/src/types.h
@@ -206,6 +206,7 @@ struct player_struct
 	DVector3 pos, opos;
 	DVector2 bobpos;
 	DVector2 fric;
+	DVector2 Exit;
 
 	// player's horizon and angle structs.
 	PlayerHorizon horizon;
@@ -219,7 +220,7 @@ struct player_struct
 	PalEntry pals;
 
 	// this was a global variable originally.
-	vec2_t exit, loogie[64];
+	vec2_t loogie[64];
 
 	// weapon drawer variables and their interpolation counterparts.
 	int weapon_sway;