Clean up a bunch of unneeded crap

Author: MaximDude

GUIEditor.vcxproj

@@ -61,7 +61,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir)external\include;$(ProjectDir)GUI\Wrappers;$(SolutionDir)GUI;$(ProjectDir)System;$(ProjectDir)Editor;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;GUI_STANDALONE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;_HAS_ITERATOR_DEBUGGING=0;ALLEGRO_STATICLINK;ALLEGRO_NO_ASM;ALLEGRO_NO_STD_HEADERS;ALLEGRO_NO_MAGIC_MAIN;GUI_STANDALONE;_DEBUG;DEBUG_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

System/Constants.h

@@ -3,35 +3,7 @@
 
 namespace RTE {
 
-#pragma region Type Definitions
-	// TODO: Look into not using distinctive types for IDs.
-	typedef int MOID; //!< Distinctive type definition for MovableObject IDs.
-	typedef int MID; //!< Distinctive type definition for Material IDs.
-#pragma endregion
-
-#pragma region Game Version
-	static constexpr char *c_GameVersion = "Pre-Release 3";
-#pragma endregion
-
-#pragma region Filesystem Constants
-	static constexpr char *c_ScreenshotDirectory = { "_Screenshots" };
-#pragma endregion
-
-#pragma region Physics Constants
-	static constexpr float c_PPM = 20.0F; //!< Pixels per Meter constant.
-	static constexpr float c_MPP = 1.0F / c_PPM; //!< Meters per Pixel constant.
-	static constexpr float c_PPL = 1000.0F / ((100.0F / c_PPM) * (100.0F / c_PPM) * (100.0F / c_PPM)); //!< Pixels per Liter constant.
-	static constexpr float c_LPP = 1.0F / c_PPL; //!< Liters per Pixel constant.
-
-	static constexpr int c_DefaultAtomGroupResolution = 5; //!< The global default AtomGroup resolution setting.
-#pragma endregion
-
 #pragma region Graphics Constants
-	static constexpr unsigned short c_MaxScreenCount = 4; //!< Maximum number of player screens.
-	static constexpr unsigned short c_PaletteEntriesNumber = 256; //!< Number of indexes in the graphics palette.
-	static constexpr unsigned short c_MOIDLayerBitDepth = 16; //!< Bit depth of MOID layer bitmap.
-	static constexpr unsigned short c_GoldMaterialID = 2; //!< Index of gold material in the material palette.
-
 	enum ColorKeys {
 		g_MaskColor = 0, //!< Mask color for all 8bpp bitmaps (palette index 0 (255,0,255)). This color is fully transparent.
 		//g_MOIDMaskColor = 0, //!< Mask color for 8bpp MOID layer bitmaps (palette index 0 (255,0,255)). This color is fully transparent.
@@ -44,7 +16,6 @@ namespace RTE {
 		g_NoMOID = 255
 	};
 
-	enum DotGlowColor { NoDot = 0, YellowDot, RedDot, BlueDot };
 	enum TransparencyPreset { LessTrans = 0, HalfTrans, MoreTrans };
 
 	// GUI colors
@@ -56,10 +27,6 @@ namespace RTE {
 	#define c_GUIColorBlue makecol(59, 65, 83)
 	#define c_GUIColorDarkBlue makecol(12, 20, 39)
 	#define c_GUIColorGray makecol(232, 232, 248)
-
-	#define c_PlayerSlotColorDefault makecol(161, 109, 20) 
-	#define c_PlayerSlotColorHovered makecol(203, 130, 56) 
-	#define c_PlayerSlotColorDisabled makecol(104, 67, 15)
 #pragma endregion
 
 #pragma region Math Constants
@@ -71,147 +38,6 @@ namespace RTE {
 	static constexpr float c_SixteenthPI = 0.19634954F;
 #pragma endregion
 
-#pragma region Audio Constants
-	static constexpr std::array<const char*, 3> c_SupportedAudioFormats = { ".wav", ".ogg", ".flac" };
-
-	static constexpr unsigned short c_MaxSoftwareChannels = 128;
-	static constexpr unsigned short c_MaxVirtualChannels = 1024;
-	static constexpr unsigned short c_MaxPlayingSoundsPerContainer = 128;
-	/* TODO These have been temporarily replaced with variables in settingsman to allow for easy tweaking. This needs to be undone once our soundscape is sorted out.
-	static constexpr unsigned short c_ListenerZOffset = 50; //!< The Z offset for Audio listeners. Can be used to lessen harsh panning if panning effect strength is at max.
-	static constexpr unsigned short c_MinimumDistanceForPanning = 50; //!< The minimum distance before which sound panning should not occur. Not relevant for immobile sounds or in splitscreen.
-	*/
-	static constexpr unsigned short c_DefaultAttenuationStartDistance = 100; //!< The default start distance for attenuating sounds. Individual sounds can have different values for this.
-	static constexpr unsigned int c_SoundMaxAudibleDistance = 100000; //!< The maximum distance at which any sound can possibly be heard, after which point it will have 0 volume. Arbitrary default suggested by FMOD.
-#pragma endregion
-
-#pragma region Network Constants
-	static constexpr unsigned short c_MaxClients = 4;
-	static constexpr unsigned short c_FramesToRemember = 3;
-	static constexpr unsigned short c_MaxLayersStoredForNetwork = 10;
-	static constexpr unsigned short c_MaxPixelLineBufferSize = 8192;
-#pragma endregion
-
-#pragma region Input Constants
-	/// <summary>
-	/// Enumeration for different types of input devices.
-	/// </summary>
-	enum InputDevice {
-		DEVICE_KEYB_ONLY = 0,
-		DEVICE_MOUSE_KEYB,
-		DEVICE_GAMEPAD_1,
-		DEVICE_GAMEPAD_2,
-		DEVICE_GAMEPAD_3,
-		DEVICE_GAMEPAD_4,
-		DEVICE_COUNT
-	};
-
-	/// <summary>
-	/// Enumeration for different input scheme presets.
-	/// </summary>
-	enum InputPreset {
-		PRESET_P1DEFAULT = -1,
-		PRESET_P2DEFAULT = -2,
-		PRESET_P3DEFAULT = -3,
-		PRESET_P4DEFAULT = -4,
-		PRESET_NONE = 0,
-		PRESET_WASDKEYS,
-		PRESET_CURSORKEYS,
-		PRESET_XBOX360,
-		PRESET_COUNT
-	};
-
-	/// <summary>
-	/// Enumeration for different elements the input scheme is composed of.
-	/// </summary>
-	enum InputElements {
-		INPUT_L_UP = 0,
-		INPUT_L_DOWN,
-		INPUT_L_LEFT,
-		INPUT_L_RIGHT,
-		INPUT_R_UP,
-		INPUT_R_DOWN,
-		INPUT_R_LEFT,
-		INPUT_R_RIGHT,
-		INPUT_FIRE,
-		INPUT_AIM,
-		INPUT_AIM_UP,
-		INPUT_AIM_DOWN,
-		INPUT_AIM_LEFT,
-		INPUT_AIM_RIGHT,
-		INPUT_PIEMENU,
-		INPUT_JUMP,
-		INPUT_CROUCH,
-		INPUT_NEXT,
-		INPUT_PREV,
-		INPUT_START,
-		INPUT_BACK,
-		INPUT_WEAPON_CHANGE_NEXT,
-		INPUT_WEAPON_CHANGE_PREV,
-		INPUT_WEAPON_PICKUP,
-		INPUT_WEAPON_DROP,
-		INPUT_WEAPON_RELOAD,
-		INPUT_COUNT
-	};
-
-	/// <summary>
-	/// Enumeration for mouse button types.
-	/// </summary>
-	enum MouseButtons {
-		MOUSE_NONE = -1,
-		MOUSE_LEFT = 0,
-		MOUSE_RIGHT,
-		MOUSE_MIDDLE,
-		MAX_MOUSE_BUTTONS
-	};
-
-	/// <summary>
-	/// Enumeration for joystick button types.
-	/// </summary>
-	enum JoyButtons {
-		JOY_NONE = -1,
-		JOY_1 = 0,
-		JOY_2,
-		JOY_3,
-		JOY_4,
-		JOY_5,
-		JOY_6,
-		JOY_7,
-		JOY_8,
-		JOY_9,
-		JOY_10,
-		JOY_11,
-		JOY_12,
-		MAX_JOY_BUTTONS
-	};
-
-	/// <summary>
-	/// Enumeration for joystick direction types.
-	/// </summary>
-	enum JoyDirections { JOYDIR_ONE = 0, JOYDIR_TWO };
-
-	/// <summary>
-	/// Enumeration for joystick dead zone types. 
-	/// Square deadzone cuts-off any input from every axis separately. For example if x-axis has less than 20% input and y-axis has more, x-axis input is ignored.
-	/// Circle uses a round zone to capture stick position on both axis then cut-off if this position is inside the round dead zone.
-	/// </summary>
-	enum DeadZoneType { CIRCLE = 0, SQUARE = 1 };
-#pragma endregion
-
-#pragma region Global Enumerations
-	/// <summary>
-	/// Enumeration all available players.
-	/// </summary>
-	enum Players {
-		NoPlayer = -1,
-		PlayerOne = 0,
-		PlayerTwo,
-		PlayerThree,
-		PlayerFour,
-		MaxPlayerCount
-	};
-#pragma endregion
-
 #pragma region Un-Definitions
 	// Allegro defines these via define in astdint.h and Boost with stdlib go crazy so we need to undefine them manually.
 	#undef int8_t

System/ContentFile.cpp

@@ -3,7 +3,7 @@
 
 namespace RTE {
 
-	const string ContentFile::m_ClassName = "ContentFile";
+	const std::string ContentFile::m_ClassName = "ContentFile";
 	std::unordered_map<std::string, BITMAP *> ContentFile::m_LoadedBitmaps;
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

System/ContentFile.h

@@ -8,7 +8,7 @@ struct BITMAP;
 namespace RTE {
 
 /// <summary>
-/// A representation of a content file that is stored either directly on on disk or packaged in another file.
+/// A representation of a content file that is stored either directly on disk or packaged in another file.
 /// </summary>
 class ContentFile : public Serializable {
 
@@ -28,7 +28,7 @@ class ContentFile : public Serializable {
 	/// <summary>
 	/// Destructor method used to clean up a ContentFile object before deletion from system memory.
 	/// </summary>
-    virtual ~ContentFile() { Destroy(); }
+    ~ContentFile() { Destroy(); }
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Create
@@ -39,7 +39,7 @@ class ContentFile : public Serializable {
 // Return value:    An error return value signaling success or any particular failure.
 //                  Anything below 0 is an error signal.
 
-    virtual int Create(const char *filePath);
+    int Create(const char *filePath);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -53,20 +53,6 @@ class ContentFile : public Serializable {
     int Create(const ContentFile &reference);
 
 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  Reset
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Resets the entire ContentFile, including its inherited members, to their
-//                  default settings or values.
-// Arguments:       None.
-// Return value:    None.
-
-    virtual void Reset() { Clear(); /*Serializable::Reset();*/ }
-
-
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  Destroy
 //////////////////////////////////////////////////////////////////////////////////////////

System/RTEError.cpp

@@ -10,23 +10,14 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	extern bool RTEAbortFunc(const char *description, const char *file, int line) {
-		// Save out the screen bitmap, after making a copy of it, faster sometimes
-		if (screen) {
-			BITMAP *abortScreenBuffer = create_bitmap(screen->w, screen->h);
-			blit(screen, abortScreenBuffer, 0, 0, 0, 0, screen->w, screen->h);
-			PALETTE palette;
-			get_palette(palette);
-			save_bmp("abortscreen.bmp", abortScreenBuffer, palette);
-			destroy_bitmap(abortScreenBuffer);
-		}
 		// Ditch the video mode so the message box appears without problems
 		if (screen != 0) { set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); }
 		// Set title of the messagebox
 		set_window_title("RTE Aborted! (x_x)");
 
 		char message[512];
 
-#if defined DEBUG_BUILD || defined MIN_DEBUG_BUILD 	
+#if defined DEBUG_BUILD	
 		// Show message box with explanation
 		std::snprintf(message, sizeof(message), "Runtime Error in file %s, line %i, because:\n\n%s\n\nThe last frame has been dumped to 'abortscreen.bmp'", file, line, description);
 		allegro_message(message);

System/RTEError.h

@@ -2,19 +2,12 @@
 #define _RTEERROR_
 
 #include "allegro.h"
-//#include "loadpng.h"
 
 #undef max
 #undef min
 
-#ifdef _WIN32
-#define DebuggerBreak __debugbreak();
-#else
-#define DebuggerBreak ;
-#endif
-
-#if defined DEBUG_BUILD || defined MIN_DEBUG_BUILD
-#define AbortAction DebuggerBreak
+#if defined DEBUG_BUILD
+#define AbortAction __debugbreak();
 #else
 #define AbortAction std::exit(EXIT_FAILURE);
 #endif