- split the TObjPtr serializers into a separate file to avoid polluting everything that needs to use the serializer.

To use these it is necessary to include dobject.h and all its dependencies, so this should not be done unless necessary.

src/g_statusbar/hudmessages.cpp

@@ -39,6 +39,7 @@
 #include "v_video.h"
 #include "cmdlib.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "doomstat.h"
 #include "vm.h"
 

src/g_statusbar/shared_sbar.cpp

@@ -49,6 +49,7 @@
 #include "d_net.h"
 #include "d_player.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "r_utility.h"
 #include "cmdlib.h"
 #include "g_levellocals.h"

src/p_saveg.cpp

@@ -53,6 +53,7 @@
 #include "r_utility.h"
 #include "r_sky.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "g_levellocals.h"
 #include "events.h"
 #include "p_destructible.h"

src/playsim/a_flashfader.cpp

@@ -35,6 +35,7 @@
 #include "a_sharedglobal.h"
 #include "d_player.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "g_levellocals.h"
 
 IMPLEMENT_CLASS(DFlashFader, false, true)

src/playsim/fragglescript/t_script.cpp

@@ -38,6 +38,7 @@
 #include "p_spec.h"
 #include "c_dispatch.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "g_levellocals.h"
 
 //==========================================================================

src/playsim/fragglescript/t_variable.cpp

@@ -42,6 +42,7 @@
 #include "t_script.h"
 #include "a_pickups.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "g_levellocals.h"
 
 

src/playsim/mapthinkers/a_decalfx.cpp

@@ -35,6 +35,7 @@
 #include "decallib.h"
 #include "a_decalfx.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "a_sharedglobal.h"
 #include "g_levellocals.h"
 #include "m_fixed.h"

src/playsim/mapthinkers/a_floor.cpp

@@ -34,6 +34,7 @@
 #include "doomstat.h"
 #include "r_state.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "p_3dmidtex.h"
 #include "p_spec.h"
 #include "r_data/r_interpolate.h"

src/playsim/mapthinkers/a_pillar.cpp

@@ -38,6 +38,7 @@
 #include "g_level.h"
 #include "s_sndseq.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "r_data/r_interpolate.h"
 #include "g_levellocals.h"
 

src/playsim/mapthinkers/a_pusher.cpp

@@ -30,6 +30,7 @@
 #include "actor.h"
 #include "p_spec.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "p_lnspec.h"
 #include "p_maputl.h"
 #include "p_local.h"

src/playsim/mapthinkers/a_quake.cpp

@@ -29,6 +29,7 @@
 #include "actor.h"
 #include "a_sharedglobal.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "d_player.h"
 #include "r_utility.h"
 #include "g_levellocals.h"

src/playsim/mapthinkers/a_scroll.cpp

@@ -59,6 +59,7 @@
 #include "actor.h"
 #include "p_spec.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "p_lnspec.h"
 #include "r_data/r_interpolate.h"
 #include "g_levellocals.h"

src/playsim/p_user.cpp

@@ -78,6 +78,7 @@
 #include "c_dispatch.h"
 #include "d_net.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "d_player.h"
 #include "r_utility.h"
 #include "p_blockmap.h"

src/r_data/r_canvastexture.cpp

@@ -38,6 +38,7 @@
 #include "r_canvastexture.h"
 #include "g_levellocals.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "texturemanager.h"
 
 //==========================================================================

src/serialize_obj.h

@@ -0,0 +1,17 @@
+#pragma once
+
+// These are in a separate header because they require some rather 'dirty' headers to work which should not be part of serializer.h
+
+template<class T>
+FSerializer &Serialize(FSerializer &arc, const char *key, TObjPtr<T> &value, TObjPtr<T> *)
+{
+	Serialize(arc, key, value.o, nullptr);
+	return arc; 
+}
+
+template<class T>
+FSerializer &Serialize(FSerializer &arc, const char *key, TObjPtr<T> &value, T *)
+{
+	Serialize(arc, key, value.o, nullptr);
+	return arc;
+}

src/serializer.cpp

@@ -950,7 +950,7 @@ void FSerializer::ReadObjects(bool hubtravel)
 					{
 						Printf(TEXTCOLOR_RED "Unknown object class '%s' in savegame\n", clsname.GetChars());
 						founderrors = true;
-						r->mDObjects[i] = RUNTIME_CLASS(AActor)->CreateNew();	// make sure we got at least a valid pointer for the duration of the loading process.
+						r->mDObjects[i] = RUNTIME_CLASS(DObject)->CreateNew();	// make sure we got at least a valid pointer for the duration of the loading process.
 						r->mDObjects[i]->Destroy();								// but we do not want to keep this around, so destroy it right away.
 					}
 					else
@@ -1485,7 +1485,8 @@ FSerializer &Serialize(FSerializer &arc, const char *key, FTextureID &value, FTe
 			arc.WriteKey(key);
 			arc.w->StartArray();
 			arc.w->String(name);
-			arc.w->Int(static_cast<int>(pic->UseType));
+			int ut = static_cast<int>(pic->GetUseType());
+			arc.w->Int(ut);
 			arc.w->EndArray();
 		}
 	}

src/serializer.h

@@ -217,19 +217,6 @@ FSerializer &Serialize(FSerializer &arc, const char *key, T *&value, T **)
 	return arc;
 }
 
-template<class T>
-FSerializer &Serialize(FSerializer &arc, const char *key, TObjPtr<T> &value, TObjPtr<T> *)
-{
-	Serialize(arc, key, value.o, nullptr);
-	return arc; 
-}
-
-template<class T>
-FSerializer &Serialize(FSerializer &arc, const char *key, TObjPtr<T> &value, T *)
-{
-	Serialize(arc, key, value.o, nullptr);
-	return arc;
-}
 
 template<class T, class TT>
 FSerializer &Serialize(FSerializer &arc, const char *key, TArray<T, TT> &value, TArray<T, TT> *def)

src/sound/s_sndseq.cpp

@@ -37,6 +37,7 @@
 
 #include "g_level.h"
 #include "serializer.h"
+#include "serialize_obj.h"
 #include "d_player.h"
 #include "g_levellocals.h"
 #include "vm.h"