- moved more code to 'common'.

This is all low level utilities with no dependencies on game logic. Having this in a separate directory makes sharing with Raze a lot easier.

src/CMakeLists.txt

@@ -1121,7 +1121,10 @@ set (PCH_SOURCES
 	rendering/swrenderer/textures/warptexture.cpp
 	rendering/swrenderer/textures/swcanvastexture.cpp
 	events.cpp
-	utility/i_module.cpp
+	common/utility/engineerrors.cpp
+	common/utility/i_module.cpp
+	common/utility/m_alloc.cpp
+	common/utility/utf8.cpp
 	utility/palette.cpp
 	utility/palettecontainer.cpp
 	utility/files.cpp
@@ -1140,13 +1143,11 @@ set (PCH_SOURCES
 	utility/cmdlib.cpp
 	utility/configfile.cpp
 	utility/i_time.cpp
-	utility/m_alloc.cpp
 	utility/m_argv.cpp
 	utility/m_bbox.cpp
 	utility/name.cpp
 	utility/s_playlist.cpp
 	utility/v_collection.cpp
-	utility/utf8.cpp
 	utility/zstrformat.cpp
 	common/thirdparty/md5.cpp
  	common/thirdparty/superfasthash.cpp

src/common/utility/engineerrors.cpp

@@ -0,0 +1,115 @@
+/*
+** engineerrors.cpp
+** Contains error classes that can be thrown around
+**
+**---------------------------------------------------------------------------
+** Copyright 1998-2016 Randy Heit
+** Copyright 2005-2020 Christoph Oelckers
+** All rights reserved.
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions
+** are met:
+**
+** 1. Redistributions of source code must retain the above copyright
+**    notice, this list of conditions and the following disclaimer.
+** 2. Redistributions in binary form must reproduce the above copyright
+**    notice, this list of conditions and the following disclaimer in the
+**    documentation and/or other materials provided with the distribution.
+** 3. The name of the author may not be used to endorse or promote products
+**    derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**---------------------------------------------------------------------------
+**
+*/
+
+bool gameisdead;
+
+#ifdef _WIN32
+#include <windows.h>
+#include "zstring.h"
+void I_DebugPrint(const char *cp)
+{
+	if (IsDebuggerPresent())
+	{
+		auto wstr = WideString(cp);
+		OutputDebugStringW(wstr.c_str());
+	}
+}
+#else
+void I_DebugPrint(const char *cp)
+{
+}	
+#endif
+
+#include "engineerrors.h"
+#include "printf.h"
+
+//==========================================================================
+//
+// I_Error
+//
+// Throw an error that will send us to the console if we are far enough
+// along in the startup process.
+//
+//==========================================================================
+
+void I_Error(const char *error, ...)
+{
+	va_list argptr;
+	char errortext[MAX_ERRORTEXT];
+
+	va_start(argptr, error);
+	myvsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
+	va_end(argptr);
+	I_DebugPrint(errortext);
+
+	throw CRecoverableError(errortext);
+}
+
+//==========================================================================
+//
+// I_FatalError
+//
+// Throw an error that will end the game.
+//
+//==========================================================================
+extern FILE *Logfile;
+
+void I_FatalError(const char *error, ...)
+{
+	static bool alreadyThrown = false;
+	gameisdead = true;
+
+	if (!alreadyThrown)		// ignore all but the first message -- killough
+	{
+		alreadyThrown = true;
+		char errortext[MAX_ERRORTEXT];
+		va_list argptr;
+		va_start(argptr, error);
+		myvsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
+		va_end(argptr);
+		I_DebugPrint(errortext);
+
+		// Record error to log (if logging)
+		if (Logfile)
+		{
+			fprintf(Logfile, "\n**** DIED WITH FATAL ERROR:\n%s\n", errortext);
+			fflush(Logfile);
+		}
+
+		throw CFatalError(errortext);
+	}
+	std::terminate(); // recursive I_FatalErrors must immediately terminate.
+}
+

src/common/utility/engineerrors.h

@@ -39,18 +39,18 @@
 #include <stdio.h>
 #include <exception>
 #include <stdexcept>
-#include "doomtype.h"
+#include "basics.h"
 
 #define MAX_ERRORTEXT	1024
 
-class CDoomError : public std::exception
+class CEngineError : public std::exception
 {
 public:
-	CDoomError ()
+	CEngineError ()
 	{
 		m_Message[0] = '\0';
 	}
-	CDoomError (const char *message)
+	CEngineError (const char *message)
 	{
 		SetMessage (message);
 	}
@@ -83,25 +83,18 @@ protected:
 };
 
 
-class CRecoverableError : public CDoomError
+class CRecoverableError : public CEngineError
 {
 public:
-	CRecoverableError() : CDoomError() {}
+	CRecoverableError() : CEngineError() {}
-	CRecoverableError(const char *message) : CDoomError(message) {}
+	CRecoverableError(const char *message) : CEngineError(message) {}
 };
 
-class CFatalError : public CDoomError
+class CFatalError : public CEngineError
 {
 public:
-	CFatalError() : CDoomError() {}
+	CFatalError() : CEngineError() {}
-	CFatalError(const char *message) : CDoomError(message) {}
+	CFatalError(const char *message) : CEngineError(message) {}
-};
-
-class CVulkanError : public CDoomError
-{
-public:
-	CVulkanError() : CDoomError() {}
-	CVulkanError(const char *message) : CDoomError(message) {}
 };
 
 class CExitEvent : public std::exception

src/common/utility/m_fixed.h

@@ -2,7 +2,8 @@
 #define __M_FIXED__
 
 #include <stdlib.h>
-#include "doomtype.h"
+#include <stdint.h>
+#include "basics.h"
 
 
 // Modern compilers are smart enough to do these multiplications intelligently.

src/common/utility/vectors.h

@@ -314,6 +314,8 @@ struct TVector3
 	{
 	}
 
+	TVector3(std::nullptr_t nul) = delete;
+
 	TVector3(const TVector3 &other) = default;
 
 	TVector3 (const Vector2 &xy, vec_t z)

src/console/c_cmds.cpp

@@ -48,7 +48,7 @@
 #include "c_dispatch.h"
 
 #include "i_system.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "doomstat.h"
 #include "gstrings.h"
 #include "s_sound.h"

src/console/c_console.cpp

@@ -920,7 +920,7 @@ int PrintString (int iprintlevel, const char *outline)
 	return 0;	// Don't waste time on calculating this if nothing at all was printed...
 }
 
-bool gameisdead;
+extern bool gameisdead;
 
 int VPrintf (int printlevel, const char *format, va_list parms)
 {

src/d_iwad.cpp

@@ -45,7 +45,7 @@
 #include "gameconfigfile.h"
 #include "resourcefiles/resourcefile.h"
 #include "version.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "v_text.h"
 
 CVAR (Bool, queryiwad, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG);

src/d_main.cpp

@@ -42,7 +42,7 @@
 #include <math.h>
 #include <assert.h>
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 #include "i_time.h"
 #include "d_gui.h"
@@ -166,7 +166,6 @@ EXTERN_CVAR (Bool, r_drawplayersprites)
 EXTERN_CVAR (Bool, show_messages)
 
 extern bool setmodeneeded;
-extern bool gameisdead;
 extern bool demorecording;
 extern bool M_DemoNoPlay;	// [RH] if true, then skip any demos in the loop
 extern bool insave;
@@ -2345,64 +2344,6 @@ static void CheckCmdLine()
 	}
 }
 
-//==========================================================================
-//
-// I_Error
-//
-// Throw an error that will send us to the console if we are far enough
-// along in the startup process.
-//
-//==========================================================================
-
-void I_Error(const char *error, ...)
-{
-	va_list argptr;
-	char errortext[MAX_ERRORTEXT];
-
-	va_start(argptr, error);
-	myvsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
-	va_end(argptr);
-	I_DebugPrint(errortext);
-
-	throw CRecoverableError(errortext);
-}
-
-//==========================================================================
-//
-// I_FatalError
-//
-// Throw an error that will end the game.
-//
-//==========================================================================
-extern FILE *Logfile;
-
-void I_FatalError(const char *error, ...)
-{
-	static bool alreadyThrown = false;
-	gameisdead = true;
-
-	if (!alreadyThrown)		// ignore all but the first message -- killough
-	{
-		alreadyThrown = true;
-		char errortext[MAX_ERRORTEXT];
-		va_list argptr;
-		va_start(argptr, error);
-		myvsnprintf(errortext, MAX_ERRORTEXT, error, argptr);
-		va_end(argptr);
-		I_DebugPrint(errortext);
-
-		// Record error to log (if logging)
-		if (Logfile)
-		{
-			fprintf(Logfile, "\n**** DIED WITH FATAL ERROR:\n%s\n", errortext);
-			fflush(Logfile);
-		}
-
-		throw CFatalError(errortext);
-	}
-	std::terminate(); // recursive I_FatalErrors must immediately terminate.
-}
-
 static void NewFailure ()
 {
     I_FatalError ("Failed to allocate memory from system heap");
@@ -2906,6 +2847,8 @@ static int D_DoomMain_Internal (void)
 	while (1);
 }
 
+void I_ShowFatalError(const char* message);
+
 int D_DoomMain()
 {
 	int ret = 0;

src/dobjgc.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <stdint.h>
+#include "tarray.h"
 class DObject;
 class FSerializer;
 

src/doomtype.h

@@ -58,14 +58,6 @@ typedef TMap<int, PClassActor *> FClassMap;
 extern bool batchrun;
 
 // Bounding box coordinate storage.
-enum
-{
-	BOXTOP,
-	BOXBOTTOM,
-	BOXLEFT,
-	BOXRIGHT
-};		// bbox coordinates
-
 #include "palentry.h"
 
 enum class ETextureType : uint8_t

src/g_level.cpp

@@ -40,7 +40,7 @@
 #include "s_sound.h"
 #include "d_event.h"
 #include "m_random.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "doomstat.h"
 #include "wi_stuff.h"
 #include "w_wad.h"

src/gamedata/d_dehacked.cpp

@@ -57,7 +57,7 @@
 #include "c_dispatch.h"
 #include "decallib.h"
 #include "a_sharedglobal.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "p_effect.h"
 #include "serializer.h"
 #include "thingdef.h"

src/gamedata/fonts/hexfont.cpp

@@ -32,7 +32,7 @@
 **
 */
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "textures.h"
 #include "image.h"
 #include "v_font.h"

src/gamedata/fonts/singlelumpfont.cpp

@@ -33,7 +33,7 @@
 **
 */
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "textures.h"
 #include "image.h"
 #include "v_font.h"

src/gamedata/fonts/singlepicfont.cpp

@@ -33,7 +33,7 @@
 **
 */
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "textures.h"
 #include "v_font.h"
 #include "w_wad.h"

src/gamedata/g_doomedmap.cpp

@@ -38,7 +38,7 @@
 #include "p_lnspec.h"
 #include "c_dispatch.h"
 #include "v_text.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 
 const char *SpecialMapthingNames[] = {

src/gamedata/resourcefiles/ancientzip.h

@@ -1,5 +1,5 @@
 #include "files.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 class FZipExploder
 {

src/gamedata/resourcefiles/file_wad.cpp

@@ -38,7 +38,7 @@
 #include "v_text.h"
 #include "w_wad.h"
 #include "gi.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 //==========================================================================
 //

src/gamedata/statistics.cpp

@@ -45,7 +45,7 @@
 #include "d_net.h"
 #include "g_game.h"
 #include "m_png.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "w_wad.h"
 #include "p_local.h"
 #include "p_setup.h"

src/gamedata/textures/animations.cpp

@@ -34,7 +34,7 @@
 
 #include "doomtype.h"
 #include "cmdlib.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "r_sky.h"
 #include "m_random.h"
 #include "d_player.h"

src/gamedata/textures/formats/fontchars.cpp

@@ -42,7 +42,7 @@
 #include "image.h"
 #include "imagehelpers.h"
 #include "fontchars.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 //==========================================================================
 //

src/gamedata/textures/multipatchtexturebuilder.cpp

@@ -53,7 +53,7 @@
 #include "imagehelpers.h"
 #include "image.h"
 #include "formats/multipatchtexture.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 // On the Alpha, accessing the shorts directly if they aren't aligned on a
 // 4-byte boundary causes unaligned access warnings. Why it does this at

src/i_net.cpp

@@ -61,7 +61,7 @@
 #include "d_player.h"
 #include "st_start.h"
 #include "m_misc.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "cmdlib.h"
 
 #include "i_net.h"

src/maploader/glnodes.cpp

@@ -51,7 +51,7 @@
 #include "p_local.h"
 #include "nodebuild.h"
 #include "doomstat.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "p_setup.h"
 #include "version.h"
 #include "md5.h"

src/maploader/maploader.cpp

@@ -68,7 +68,7 @@
 #include "v_text.h"
 #include "p_setup.h"
 #include "gi.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "types.h"
 #include "w_wad.h"
 #include "p_conversation.h"

src/maploader/usdf.cpp

@@ -36,7 +36,7 @@
 #include "p_lnspec.h"
 #include "p_conversation.h"
 #include "udmf.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "actor.h"
 #include "a_pickups.h"
 #include "w_wad.h"

src/p_setup.cpp

@@ -44,7 +44,7 @@
 #include "p_acs.h"
 #include "announcer.h"
 #include "wi_stuff.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "gi.h"
 #include "p_conversation.h"
 #include "a_keys.h"

src/playsim/fragglescript/t_script.h

@@ -28,7 +28,7 @@
 #include "p_lnspec.h"
 #include "m_fixed.h"
 #include "actor.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 #ifdef _MSC_VER
 // This pragma saves 8kb of wasted code.
@@ -38,11 +38,11 @@
 class DFraggleThinker;
 
 
-class CFraggleScriptError : public CDoomError
+class CFraggleScriptError : public CEngineError
 {
 public:
-	CFraggleScriptError() : CDoomError() {}
+	CFraggleScriptError() : CEngineError() {}
-	CFraggleScriptError(const char *message) : CDoomError(message) {}
+	CFraggleScriptError(const char *message) : CEngineError(message) {}
 };
 
 

src/playsim/p_acs.h

@@ -37,7 +37,7 @@
 
 #include "doomtype.h"
 #include "dthinker.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 #define LOCAL_SIZE				20
 #define NUM_MAPVARS				128

src/playsim/p_actionfunctions.cpp

@@ -50,7 +50,7 @@
 #include "decallib.h"
 #include "p_local.h"
 #include "c_console.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "a_sharedglobal.h"
 #include "v_font.h"
 #include "doomstat.h"

src/posix/cocoa/i_main.mm

@@ -44,7 +44,7 @@
 #include "m_argv.h"
 #include "st_console.h"
 #include "version.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "s_music.h"
 
 

src/posix/cocoa/i_system.mm

@@ -66,12 +66,6 @@ void I_SetIWADInfo()
 }
 
 
-void I_DebugPrint(const char *cp)
-{
-	NSLog(@"%s", cp);
-}
-
-
 void I_PrintStr(const char* const message)
 {
 	FConsoleWindow::GetInstance().AddText(message);

src/posix/cocoa/i_video.mm

@@ -53,7 +53,7 @@
 #include "st_console.h"
 #include "v_text.h"
 #include "version.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 #include "gl/system/gl_framebuffer.h"
 #include "vulkan/system/vk_framebuffer.h"

src/posix/cocoa/st_start.mm

@@ -39,7 +39,7 @@
 #include "doomtype.h"
 #include "st_console.h"
 #include "st_start.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 
 FStartupScreen *StartScreen;

src/posix/i_steam.cpp

@@ -38,7 +38,7 @@
 #include "m_misc.h"
 #endif // __APPLE__
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "d_main.h"
 #include "sc_man.h"
 #include "cmdlib.h"

src/posix/i_system.h

@@ -83,8 +83,6 @@ ticcmd_t *I_BaseTiccmd (void);
 
 void I_Tactile (int on, int off, int total);
 
-void I_DebugPrint (const char *cp);
-
 // Print a console string
 void I_PrintStr (const char *str);
 

src/posix/osx/iwadpicker_cocoa.mm

@@ -40,7 +40,7 @@
 #include "m_argv.h"
 #include "m_misc.h"
 #include "gameconfigfile.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 #include <Cocoa/Cocoa.h>
 #include <wordexp.h>

src/posix/sdl/hardware.cpp

@@ -41,7 +41,7 @@
 #include "v_text.h"
 #include "doomstat.h"
 #include "m_argv.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "swrenderer/r_swrenderer.h"
 
 IVideo *Video;

src/posix/sdl/i_input.cpp

@@ -47,7 +47,7 @@
 #include "g_game.h"
 #include "g_levellocals.h"
 #include "utf8.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 
 static void I_CheckGUICapture ();

src/posix/sdl/i_main.cpp

@@ -41,7 +41,7 @@
 #include <sys/param.h>
 #include <locale.h>
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "m_argv.h"
 #include "d_main.h"
 #include "c_console.h"
@@ -53,7 +53,7 @@
 #include "r_utility.h"
 #include "doomstat.h"
 #include "vm.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "i_system.h"
 #include "g_game.h"
 

src/posix/sdl/i_system.cpp

@@ -102,10 +102,6 @@ void CalculateCPUSpeed()
 {
 }
 
-void I_DebugPrint(const char *cp)
-{
-}
-
 void I_PrintStr(const char *cp)
 {
 	// Strip out any color escape sequences before writing to debug output

src/posix/sdl/st_start.cpp

@@ -42,7 +42,7 @@
 #include "doomdef.h"
 #include "i_system.h"
 #include "c_cvars.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 // MACROS ------------------------------------------------------------------
 

src/posix/unix/i_specialpaths.cpp

@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include "i_system.h"
 #include "cmdlib.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 #include "version.h"	// for GAMENAME
 

src/r_data/r_translate.cpp

@@ -40,7 +40,7 @@
 #include "g_game.h"
 #include "d_netinf.h"
 #include "sc_man.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "w_wad.h"
 #include "serializer.h"
 #include "d_player.h"

src/rendering/gl/shaders/gl_shader.cpp

@@ -30,7 +30,7 @@
 #include "c_cvars.h"
 #include "v_video.h"
 #include "w_wad.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "cmdlib.h"
 #include "md5.h"
 #include "m_misc.h"

src/rendering/gl_load/gl_interface.cpp

@@ -27,7 +27,7 @@
 */
 
 #include "gl_load/gl_system.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "tarray.h"
 #include "doomtype.h"
 #include "m_argv.h"

src/rendering/polyrenderer/backend/poly_buffers.cpp

@@ -24,7 +24,7 @@
 #include "poly_framebuffer.h"
 #include "poly_renderstate.h"
 #include "rendering/polyrenderer/drawers/poly_thread.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 PolyBuffer *PolyBuffer::First = nullptr;
 

src/rendering/polyrenderer/backend/poly_framebuffer.cpp

@@ -51,7 +51,7 @@
 #include "poly_buffers.h"
 #include "poly_renderstate.h"
 #include "poly_hwtexture.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 void Draw2D(F2DDrawer *drawer, FRenderState &state);
 void DoWriteSavePic(FileWriter *file, ESSType ssformat, uint8_t *scr, int width, int height, sector_t *viewsector, bool upsidedown);

src/rendering/swrenderer/line/r_line.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include "templates.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "doomdef.h"
 #include "doomstat.h"
 #include "doomdata.h"

src/rendering/swrenderer/plane/r_flatplane.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <float.h>
 #include "templates.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "w_wad.h"
 #include "doomdef.h"
 #include "doomstat.h"

src/rendering/swrenderer/r_swscene.cpp

@@ -34,7 +34,7 @@
 #include "textures/bitmap.h"
 #include "swrenderer/scene/r_light.h"
 #include "image.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 // [RH] Base blending values (for e.g. underwater)
 int BaseBlendR, BaseBlendG, BaseBlendB;

src/rendering/swrenderer/scene/r_opaque_pass.cpp

@@ -34,7 +34,7 @@
 
 #include "m_bbox.h"
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "p_lnspec.h"
 #include "p_setup.h"
 

src/rendering/swrenderer/viewport/r_viewport.h

@@ -7,7 +7,7 @@
 #include "r_defs.h"
 #include "r_utility.h"
 #include "actorinlines.h"
-#include "utility/matrix.h"
+#include "matrix.h"
 
 #define MINZ double((2048*4) / double(1 << 20))
 

src/rendering/vulkan/shaders/vk_shader.cpp

@@ -24,7 +24,7 @@
 #include "vulkan/system/vk_builders.h"
 #include "hwrenderer/utility/hw_shaderpatcher.h"
 #include "w_wad.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include <ShaderLang.h>
 
 VkShaderManager::VkShaderManager(VulkanDevice *device) : device(device)

src/rendering/vulkan/shaders/vk_shader.h

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "utility/vectors.h"
+#include "vectors.h"
 #include "matrix.h"
 #include "name.h"
 #include "hwrenderer/scene/hw_renderstate.h"

src/rendering/vulkan/system/vk_buffers.cpp

@@ -25,7 +25,7 @@
 #include "vk_framebuffer.h"
 #include "vulkan/renderer/vk_renderstate.h"
 #include "vulkan/renderer/vk_renderpass.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 VKBuffer *VKBuffer::First = nullptr;
 

src/rendering/vulkan/system/vk_builders.cpp

@@ -21,7 +21,7 @@
 */
 
 #include "vk_builders.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "r_data/renderstyle.h"
 #include <ShaderLang.h>
 #include <GlslangToSpv.h>

src/rendering/vulkan/system/vk_device.cpp

@@ -40,7 +40,7 @@
 #include "c_dispatch.h"
 #include "i_system.h"
 #include "version.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "gamedata/fonts/v_text.h"
 
 bool I_GetVulkanPlatformExtensions(unsigned int *count, const char **names);

src/rendering/vulkan/system/vk_device.h

@@ -2,11 +2,12 @@
 
 #include "volk/volk.h"
 #include "vk_mem_alloc/vk_mem_alloc.h"
-#include "utility/doomerrors.h"
+#include "engineerrors.h"
 #include <mutex>
 #include <vector>
 #include <algorithm>
 #include <memory>
+#include "zstring.h"
 
 class VulkanSwapChain;
 class VulkanSemaphore;
@@ -105,6 +106,14 @@ private:
 
 FString VkResultToString(VkResult result);
 
+class CVulkanError : public CEngineError
+{
+public:
+	CVulkanError() : CEngineError() {}
+	CVulkanError(const char* message) : CEngineError(message) {}
+};
+
+
 inline void VulkanError(const char *text)
 {
 	throw CVulkanError(text);

src/rendering/vulkan/system/vk_framebuffer.cpp

@@ -58,7 +58,7 @@
 #include "vulkan/textures/vk_hwtexture.h"
 #include "vulkan/system/vk_builders.h"
 #include "vulkan/system/vk_swapchain.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 void Draw2D(F2DDrawer *drawer, FRenderState &state);
 void DoWriteSavePic(FileWriter *file, ESSType ssformat, uint8_t *scr, int width, int height, sector_t *viewsector, bool upsidedown);

src/rendering/vulkan/system/vk_objects.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "vk_device.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 
 class VulkanCommandPool;
 class VulkanDescriptorPool;

src/scripting/vm/vm.h

@@ -40,7 +40,7 @@
 #include "zstring.h"
 #include "vectors.h"
 #include "cmdlib.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "memarena.h"
 #include "scripting/backend/scopebarrier.h"
 
@@ -98,7 +98,7 @@ enum EVMAbortException
 	X_FORMAT_ERROR
 };
 
-class CVMAbortException : public CDoomError
+class CVMAbortException : public CEngineError
 {
 public:
 	static FString stacktrace;

src/serializer.cpp

@@ -55,7 +55,7 @@
 #include "a_sharedglobal.h"
 #include "po_man.h"
 #include "v_font.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "v_text.h"
 #include "cmdlib.h"
 #include "g_levellocals.h"

src/utility/lists.h

@@ -1,146 +0,0 @@
-/*
-** lists.h
-** Essentially, Amiga Exec lists and nodes
-**
-**---------------------------------------------------------------------------
-** Copyright 1998-2006 Randy Heit
-** All rights reserved.
-**
-** Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions
-** are met:
-**
-** 1. Redistributions of source code must retain the above copyright
-**    notice, this list of conditions and the following disclaimer.
-** 2. Redistributions in binary form must reproduce the above copyright
-**    notice, this list of conditions and the following disclaimer in the
-**    documentation and/or other materials provided with the distribution.
-** 3. The name of the author may not be used to endorse or promote products
-**    derived from this software without specific prior written permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-**---------------------------------------------------------------------------
-**
-*/
-
-#ifndef __LISTS_H__
-#define __LISTS_H__
-
-struct Node
-{
-	Node *Succ, *Pred;
-
-	void Insert (Node *putAfter)
-	{
-		Succ = putAfter->Succ;
-		Pred = putAfter;
-		putAfter->Succ = this;
-		Succ->Pred = this;
-	}
-
-	void InsertBefore (Node *putBefore)
-	{
-		Succ = putBefore;
-		Pred = putBefore->Pred;
-		putBefore->Pred = this;
-		Pred->Succ = this;
-	}
-
-	void Remove ()
-	{
-		Pred->Succ = Succ;
-		Succ->Pred = Pred;
-	}
-};
-
-struct List
-{
-	Node *Head;
-	const Node *const Tail;
-	Node *TailPred;
-
-	List () : Head ((Node *)&Tail), Tail (NULL), TailPred ((Node *)&Head)
-	{
-	}
-
-	bool IsEmpty () const
-	{
-		return TailPred == (Node *)this;
-	}
-
-	void MakeEmpty ()
-	{
-		Head = (Node *)&Tail;
-		TailPred = (Node *)&Head;
-	}
-
-	void AddHead (Node *node)
-	{
-		node->Succ = Head;
-		node->Pred = (Node *)&Head;
-		Head->Pred = node;
-		Head = node;
-	}
-
-	void AddTail (Node *node)
-	{
-		node->Pred = TailPred;
-		node->Succ = (Node *)&Tail;
-		TailPred->Succ = node;
-		TailPred = node;
-	}
-	
-	Node *RemHead ()
-	{
-		Node *node = Head;
-		if (node->Succ == NULL)
-		{
-			return NULL;
-		}
-		Head = node->Succ;
-		Head->Pred = (Node *)&Head;
-		return node;
-	}
-
-	Node *RemHeadQ ()	// Only use if list is definitely not empty
-	{
-		Node *node = Head;
-		Head = node->Succ;
-		Head->Pred = (Node *)&Head;
-		return node;
-	}
-
-	Node *RemTail ()
-	{
-		Node *node = TailPred;
-		if (node->Pred == NULL)
-		{
-			return NULL;
-		}
-		TailPred = node->Pred;
-		TailPred->Succ = (Node *)&Tail;
-		return node;
-	}
-
-	Node *RemTailQ ()	// Only use if list is definitely not empty
-	{
-		Node *node = TailPred;
-		TailPred = node->Pred;
-		TailPred->Succ = (Node *)&Tail;
-		return node;
-	}
-
-private:
-	List &operator= (const List&) { return *this; }
-};
-
-#endif //__LISTS_H__

src/utility/m_bbox.h

@@ -34,6 +34,15 @@
 struct line_t;
 struct node_t;
 
+enum
+{
+	BOXTOP,
+	BOXBOTTOM,
+	BOXLEFT,
+	BOXRIGHT
+};		// bbox coordinates
+
+
 class FBoundingBox
 {
 public:

src/utility/sc_man.cpp

@@ -38,7 +38,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "doomtype.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "sc_man.h"
 #include "w_wad.h"
 #include "cmdlib.h"

src/win32/base_sysfb.cpp

@@ -49,7 +49,7 @@
 #include "doomstat.h"
 #include "v_text.h"
 #include "m_argv.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "base_sysfb.h"
 #include "win32basevideo.h"
 #include "c_dispatch.h"

src/win32/gl_sysfb.cpp

@@ -49,7 +49,7 @@
 #include "doomstat.h"
 #include "v_text.h"
 #include "m_argv.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "win32glvideo.h"
 
 extern HWND			Window;

src/win32/hardware.cpp

@@ -47,7 +47,7 @@
 #ifdef HAVE_VULKAN
 #include "win32vulkanvideo.h"
 #endif
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "i_system.h"
 #include "swrenderer/r_swrenderer.h"
 

src/win32/i_input.cpp

@@ -85,7 +85,7 @@
 #include "v_text.h"
 #include "version.h"
 #include "events.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "i_system.h"
 #include "g_levellocals.h"
 

src/win32/i_main.cpp

@@ -55,7 +55,7 @@
 #endif
 #include "resource.h"
 
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "hardware.h"
 
 #include "m_argv.h"

src/win32/i_system.cpp

@@ -61,7 +61,7 @@
 #include <wincrypt.h>
 
 #include "hardware.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "cmdlib.h"
 
 #include "version.h"
@@ -481,15 +481,6 @@ static void DoPrintStr(const char *cpt, HWND edit, HANDLE StdOut)
 
 static TArray<FString> bufferedConsoleStuff;
 
-void I_DebugPrint(const char *cp)
-{
-	if (IsDebuggerPresent())
-	{
-		auto wstr = WideString(cp);
-		OutputDebugStringW(wstr.c_str());
-	}
-}
-
 void I_PrintStr(const char *cp)
 {
 	if (ConWindowHidden)

src/win32/i_system.h

@@ -87,8 +87,6 @@ bool I_SetCursor(FTexture *cursor);
 // Repaint the pre-game console
 void I_PaintConsole (void);
 
-void I_DebugPrint (const char *cp);
-
 // Print a console string
 void I_PrintStr (const char *cp);
 

src/win32/st_start.cpp

@@ -50,7 +50,7 @@
 #include "s_sound.h"
 #include "m_argv.h"
 #include "d_main.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "s_music.h"
 
 // MACROS ------------------------------------------------------------------

src/win32/win32basevideo.cpp

@@ -48,7 +48,7 @@
 #include "doomstat.h"
 #include "v_text.h"
 #include "m_argv.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "win32basevideo.h"
 #include "cmdlib.h"
 

src/win32/win32glvideo.cpp

@@ -48,7 +48,7 @@
 #include "doomstat.h"
 #include "v_text.h"
 #include "m_argv.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include "win32glvideo.h"
 
 #include "gl/system/gl_framebuffer.h"

src/win32/win32polyvideo.cpp

@@ -1,7 +1,7 @@
 
 #include <assert.h>
 #include "hardware.h"
-#include "doomerrors.h"
+#include "engineerrors.h"
 #include <Windows.h>
 
 EXTERN_CVAR(Bool, vid_vsync)