From 2ce05f018e2de70c6c9acf0779b32dbb852ccc63 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 27 Jun 2023 18:02:22 -0700
Subject: [PATCH] Add g_battleufo global, add to netsave

---
 src/k_battle.c                               | 1 +
 src/k_battle.h                               | 6 ++++++
 src/objects/{battle-ufo.c => battle-ufo.cpp} | 0
 src/p_saveg.c                                | 8 ++++++++
 4 files changed, 15 insertions(+)
 rename src/objects/{battle-ufo.c => battle-ufo.cpp} (100%)

diff --git a/src/k_battle.c b/src/k_battle.c
index 7c6dd7d09..86f4c6be7 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -24,6 +24,7 @@
 
 // Battle overtime info
 struct battleovertime battleovertime;
+struct battleufo g_battleufo;
 
 // Capsules mode enabled for this map?
 boolean battleprisons = false;
diff --git a/src/k_battle.h b/src/k_battle.h
index bd15f8b55..caa68c58a 100644
--- a/src/k_battle.h
+++ b/src/k_battle.h
@@ -19,6 +19,12 @@ extern struct battleovertime
 	fixed_t x, y, z; ///< Position to center on
 } battleovertime;
 
+extern struct battleufo
+{
+	INT32 previousId;
+	tic_t due;
+} g_battleufo;
+
 extern boolean battleprisons;
 extern INT32 nummapboxes, numgotboxes; // keep track of spawned battle mode items
 extern UINT8 maptargets, numtargets;
diff --git a/src/objects/battle-ufo.c b/src/objects/battle-ufo.cpp
similarity index 100%
rename from src/objects/battle-ufo.c
rename to src/objects/battle-ufo.cpp
diff --git a/src/p_saveg.c b/src/p_saveg.c
index e6f7a61d6..87a8f636b 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -5738,6 +5738,10 @@ static void P_NetArchiveMisc(savebuffer_t *save, boolean resending)
 	WRITEFIXED(save->p, battleovertime.y);
 	WRITEFIXED(save->p, battleovertime.z);
 
+	// battleufo_t
+	WRITEINT32(save->p, g_battleufo.previousId);
+	WRITEUINT32(save->p, g_battleufo.due);
+
 	WRITEUINT32(save->p, wantedcalcdelay);
 	for (i = 0; i < NUMKARTITEMS-1; i++)
 		WRITEUINT32(save->p, itemCooldowns[i]);
@@ -5908,6 +5912,10 @@ static boolean P_NetUnArchiveMisc(savebuffer_t *save, boolean reloading)
 	battleovertime.y = READFIXED(save->p);
 	battleovertime.z = READFIXED(save->p);
 
+	// battleufo_t
+	g_battleufo.previousId = READINT32(save->p);
+	g_battleufo.due = READUINT32(save->p);
+
 	wantedcalcdelay = READUINT32(save->p);
 	for (i = 0; i < NUMKARTITEMS-1; i++)
 		itemCooldowns[i] = READUINT32(save->p);