From 5beb1619d57f0f7f4dddc4ec3f3104d1bd13920c Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Mon, 22 Sep 2025 15:15:09 -0400
Subject: [PATCH] Update some loops stuff to be more up to date

---
 src/objects/loops.cpp | 28 +++++++++++++---------------
 src/p_loop.c          |  4 ++--
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/objects/loops.cpp b/src/objects/loops.cpp
index 64c190f17..490d80cf5 100644
--- a/src/objects/loops.cpp
+++ b/src/objects/loops.cpp
@@ -1,7 +1,7 @@
 // BLANKART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2023 by James R.
-// Copyright (C) 2023 by Kart Krew
+// Copyright (C) 2025 by James Robert Roman
+// Copyright (C) 2025 by Kart Krew
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -180,10 +180,8 @@ Obj_InitLoopEndpoint
 void
 Obj_InitLoopCenter (mobj_t *center)
 {
-	const mapthing_t *mt = center->spawnpoint;
-
-	center_max_revolution(center) = mt->args[1] * FRACUNIT / 360;
-	center_set_flip(center, mt->args[0]);
+	center_max_revolution(center) = center->args[1] * FRACUNIT / 360;
+	center_set_flip(center, center->args[0]);
 }
 
 void
@@ -260,7 +258,7 @@ Obj_LoopEndpointCollide
 		const fixed_t magnitude = R_PointToDist2(0, 0, px, py);
 		const fixed_t newX = FixedDiv(px, magnitude);
 		const fixed_t newY = FixedDiv(py, magnitude);
-		
+
 		s->origin_shift = {FixedMul(newX, FCOS(anchor->angle)),
 			FixedMul(newY, FSIN(anchor->angle))};
 	}
@@ -285,15 +283,15 @@ Obj_LoopEndpointCollide
 	cam->enter_tic = leveltime;
 	cam->exit_tic = INFTICS;
 
-	if (center->spawnpoint->args[4]) // is camera distance set?
+	if (center->args[4]) // is camera distance set?
 	{
-		cam->zoom_out_speed = center->spawnpoint->args[2];
-		cam->zoom_in_speed = center->spawnpoint->args[3];
-		cam->dist = center->spawnpoint->args[4] * FRACUNIT;
-		cam->pan = FixedAngle(center->spawnpoint->args[5] * FRACUNIT);
-		cam->pan_speed = center->spawnpoint->args[6] * FRACUNIT;
-		cam->pan_accel = center->spawnpoint->args[7];
-		cam->pan_back = center->spawnpoint->args[8];
+		cam->zoom_out_speed = center->args[2];
+		cam->zoom_in_speed = center->args[3];
+		cam->dist = center->args[4] * FRACUNIT;
+		cam->pan = FixedAngle(center->args[5] * FRACUNIT);
+		cam->pan_speed = center->args[6] * FRACUNIT;
+		cam->pan_accel = center->args[7];
+		cam->pan_back = center->args[8];
 	}
 	else
 	{
diff --git a/src/p_loop.c b/src/p_loop.c
index 0b17e3956..b6de89e34 100644
--- a/src/p_loop.c
+++ b/src/p_loop.c
@@ -1,6 +1,7 @@
 // BLANKART
 //-----------------------------------------------------------------------------
-// Copyright (C) 2023 by Kart Krew
+// Copyright (C) 2025 by James Robert Roman.
+// Copyright (C) 2025 by Kart Krew.
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -11,7 +12,6 @@
 
 #include "doomdef.h"
 #include "d_player.h"
-#include "doomstat.h"
 #include "k_kart.h"
 #include "p_local.h"
 #include "p_setup.h"