- removed some Build related includes from core code.

source/core/console/c_console.cpp

@@ -55,7 +55,6 @@
 #include "inputstate.h"
 #include "i_time.h"
 #include "gamecvars.h"
-#include "baselayer.h"
 #include "i_system.h"
 #include "s_soundinternal.h"
 #include "engineerrors.h"

source/core/gamecvars.cpp

@@ -36,7 +36,6 @@
 
 #include "c_cvars.h"
 #include "common.h"
-#include "baselayer.h"
 #include "gameconfigfile.h"
 #include "gamecontrol.h"
 #include "m_argv.h"
@@ -46,6 +45,7 @@
 #include "c_dispatch.h"
 #include "gstrings.h"
 #include "quotemgr.h"
+#include "gamestruct.h"
 
 #define CVAR_FRONTEND_BLOOD 0
 #define CVAR_FRONTEND_DUKELIKE 0

source/core/menu/listmenu.cpp

@@ -39,7 +39,6 @@
 #include "d_event.h"
 #include "menu.h"
 #include "v_draw.h"
-#include "baselayer.h"
 #include "gamecontrol.h"
 #include "build.h"
 #include "v_video.h"

source/core/menu/loadsavemenu.cpp

@@ -113,7 +113,7 @@ protected:
 		savepicHeight = int(180 * wScale);
 
 
-		FontScale = max(screen->GetHeight() / 480, 1);
+		FontScale = std::max(screen->GetHeight() / 480, 1);
 		rowHeight = std::max(int((NewConsoleFont->GetHeight() + 1) * FontScale), 1);
 		listboxLeft = savepicLeft + savepicWidth + int(20 * wScale);
 		listboxTop = savepicTop;

source/core/menu/menu.cpp

@@ -50,7 +50,6 @@
 #include "gamecontrol.h"
 #include "pragmas.h"
 #include "build.h"
-#include "baselayer.h"
 #include "statistics.h"
 #include "m_joy.h"
 #include "raze_sound.h"

source/core/menu/menu.h

@@ -9,9 +9,9 @@
 #include "version.h"
 #include "textures.h"
 #include "zstring.h"
-#include "baselayer.h"
 #include "v_draw.h"
 #include "menustate.h"
+#include "gamestruct.h"
 
 EXTERN_CVAR(Float, snd_menuvolume)
 EXTERN_CVAR(Int, m_use_mouse);

source/core/menu/messagebox.cpp

@@ -42,6 +42,7 @@
 #include "statistics.h"
 #include "v_2ddrawer.h"
 #include "v_video.h"
+#include "engineerrors.h"
 
 extern FSaveGameNode *quickSaveSlot;
 

source/core/menu/optionmenuitems.h

@@ -36,6 +36,7 @@
 #include "gstrings.h"
 #include "v_font.h"
 #include "cmdlib.h"
+#include "templates.h"
 
 
 void M_DrawConText (int color, int x, int y, const char *str);

source/core/menu/resolutionmenu.cpp

@@ -36,6 +36,7 @@
 #include "c_cvars.h"
 #include "v_video.h"
 #include "menu.h"
+#include "printf.h"
 
 CVAR(Int, menu_resolution_custom_width, 640, 0)
 CVAR(Int, menu_resolution_custom_height, 480, 0)

source/core/palette.cpp

@@ -32,7 +32,6 @@
 */ 
 
 #include "build.h"
-#include "baselayer.h"
 #include "imagehelpers.h"
 
 #include "palette.h"

source/core/savegamehelp.cpp

@@ -35,7 +35,6 @@
 
 #include "compositesaveame.h"
 #include "savegamehelp.h"
-#include "baselayer.h"
 #include "gstrings.h"
 #include "i_specialpaths.h"
 #include "cmdlib.h"
@@ -51,6 +50,7 @@
 #include "version.h"
 #include "raze_music.h"
 #include "raze_sound.h"
+#include "gamestruct.h"
 
 static CompositeSavegameWriter savewriter;
 static FResourceFile *savereader;

source/core/screenshot.cpp

@@ -31,9 +31,6 @@
 **
 */
 
-#include "compat.h"
-#include "build.h"
-#include "baselayer.h"
 #include "version.h"
 #include "m_png.h"
 #include "i_specialpaths.h"

source/core/statistics.cpp

@@ -44,11 +44,12 @@
 #include "stats.h"
 #include "c_cvars.h"
 #include "sc_man.h"
-#include "baselayer.h"
 #include "serializer.h"
 #include "gstrings.h"
 #include "version.h"
 #include "engineerrors.h"
+#include "gamestruct.h"
+#include "printf.h"
 
 CVAR(Int, savestatistics, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 CVAR(String, statfile, GAMENAMELOWERCASE "stat.txt", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

source/core/textures/buildtiles.cpp

@@ -38,7 +38,6 @@
 #include "buildtiles.h"
 #include "image.h"
 
-#include "baselayer.h"
 #include "palette.h"
 #include "m_crc32.h"
 #include "build.h"

source/glbackend/gl_palmanager.cpp

@@ -37,7 +37,6 @@
 #include "m_crc32.h"
 #include "glbackend.h"
 
-#include "baselayer.h"
 #include "resourcefile.h"
 #include "imagehelpers.h"
 #include "v_font.h"

source/glbackend/glbackend.cpp

@@ -38,7 +38,6 @@
 #include "textures.h"
 #include "palette.h"
 #include "gamecontrol.h"
-#include "baselayer.h"
 #include "v_2ddrawer.h"
 #include "v_video.h"
 #include "flatvertices.h"