From c77487dab8d0e41b479aca270328b1e71bf04d7c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 31 Jan 2019 19:44:04 +0100 Subject: [PATCH] - moved the menu.h include from oalsound.h to oalsound.cpp. The menu is a very 'dirty' header, and forcing it to be pulled in with something entirely unrelated is not good - even though only two files include oalsound.h. --- src/sound/i_sound.cpp | 2 ++ src/sound/oalsound.cpp | 1 + src/sound/oalsound.h | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sound/i_sound.cpp b/src/sound/i_sound.cpp index a3587e3a5..de9c9a6a9 100644 --- a/src/sound/i_sound.cpp +++ b/src/sound/i_sound.cpp @@ -46,6 +46,8 @@ #include "i_music.h" #include "m_argv.h" #include "v_text.h" +#include "c_cvars.h" +#include "stats.h" EXTERN_CVAR (Float, snd_sfxvolume) CVAR (Int, snd_samplerate, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) diff --git a/src/sound/oalsound.cpp b/src/sound/oalsound.cpp index 697a7a91f..98c3621f4 100644 --- a/src/sound/oalsound.cpp +++ b/src/sound/oalsound.cpp @@ -44,6 +44,7 @@ #include "i_music.h" #include "i_musicinterns.h" #include "cmdlib.h" +#include "menu/menu.h" FModule OpenALModule{"OpenAL"}; diff --git a/src/sound/oalsound.h b/src/sound/oalsound.h index a2a7869ce..0cf72a133 100644 --- a/src/sound/oalsound.h +++ b/src/sound/oalsound.h @@ -9,7 +9,6 @@ #include "i_sound.h" #include "s_sound.h" -#include "menu/menu.h" #ifndef NO_OPENAL