From 42e45f6769364679c676683eca6dfb87e6d705c8 Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Sat, 22 May 2021 13:42:55 +0200 Subject: [PATCH] NANCY: Move debug channels in detection.h to avoid pulling whole nancy.h This one includes C++11 constructs which are not accepted by older compilers --- engines/nancy/detection.cpp | 1 - engines/nancy/detection.h | 6 ++++++ engines/nancy/nancy.h | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/engines/nancy/detection.cpp b/engines/nancy/detection.cpp index 1ae095c280b..091071967dc 100644 --- a/engines/nancy/detection.cpp +++ b/engines/nancy/detection.cpp @@ -23,7 +23,6 @@ #include "common/config-manager.h" #include "engines/nancy/detection.h" -#include "engines/nancy/nancy.h" //#include "engines/nancy/dialogs.h" const char *const directoryGlobs[] = { diff --git a/engines/nancy/detection.h b/engines/nancy/detection.h index b216c38e814..a2ae0fabb01 100644 --- a/engines/nancy/detection.h +++ b/engines/nancy/detection.h @@ -44,6 +44,12 @@ struct NancyGameDescription { GameType gameType; }; +enum NancyDebugChannels { + kDebugEngine = 1 << 0, + kDebugActionRecord = 1 << 1, + kDebugScene = 1 << 2 +}; + } // End of namespace Nancy #endif // NANCY_DETECTION_H diff --git a/engines/nancy/nancy.h b/engines/nancy/nancy.h index e7c9da002b5..3edc956fd97 100644 --- a/engines/nancy/nancy.h +++ b/engines/nancy/nancy.h @@ -55,12 +55,6 @@ namespace Nancy { static const int kSavegameVersion = 1; -enum NancyDebugChannels { - kDebugEngine = 1 << 0, - kDebugActionRecord = 1 << 1, - kDebugScene = 1 << 2 -}; - struct NancyGameDescription; class ResourceManager;