- split game dependent parts out of menudef.cpp.

src/common/audio/music/music_midi_base.cpp

@@ -35,7 +35,7 @@
 #include "c_dispatch.h"
 
 #include "v_text.h"
-#include "menu/menu.h"
+#include "menu.h"
 #include <zmusic.h>
 #include "s_music.h"
 #include "c_cvars.h"

src/common/audio/sound/oalsound.cpp

@@ -2071,7 +2071,7 @@ FSoundChan *OpenALSoundRenderer::FindLowestChannel()
 
 #endif // NO_OPENAL
 
-#include "menu/menu.h"
+#include "menu.h"
 
 void I_BuildALDeviceList(FOptionValues* opt)
 {

src/common/menu/menu.h

@@ -288,6 +288,7 @@ void M_SetMenu(FName menu, int param = -1);
 void M_StartMessage(const char *message, int messagemode, FName action = NAME_None);
 DMenu *StartPickerMenu(DMenu *parent, const char *name, FColorCVar *cvar);
 void M_MarkMenus();
+FTextureID GetMenuTexture(const char* const name);
 
 
 struct IJoystickConfig;

src/common/objects/dobjgc.cpp

@@ -59,8 +59,9 @@
 #include "dobject.h"
 #include "templates.h"
 #include "c_dispatch.h"
-#include "menu/menu.h"
+#include "menu.h"
 #include "stats.h"
+#include "printf.h"
 
 // MACROS ------------------------------------------------------------------
 

src/common/rendering/hwrenderer/data/hw_cvars.cpp

@@ -40,7 +40,8 @@
 #include "c_dispatch.h"
 #include "v_video.h"
 #include "hw_cvars.h"
-#include "menu/menu.h"
+#include "menu.h"
+#include "printf.h"
 
 
 CUSTOM_CVAR(Int, gl_fogmode, 1, CVAR_ARCHIVE | CVAR_NOINITCALL)

src/common/rendering/v_video.cpp

@@ -53,7 +53,7 @@
 #include "cmdlib.h"
 #include "hardware.h"
 #include "m_png.h"
-#include "menu/menu.h"
+#include "menu.h"
 #include "vm.h"
 #include "r_videoscale.h"
 #include "i_time.h"

src/common/scripting/core/imports.cpp

@@ -36,7 +36,7 @@
 
 #include "gstrings.h"
 #include "v_font.h"
-#include "menu/menu.h"
+#include "menu.h"
 #include "types.h"
 #include "dictionary.h"
 #include "vm.h"