From d02d53e9a3b3caa337777d549ece0d24c1260329 Mon Sep 17 00:00:00 2001 From: aryanrawlani28 Date: Thu, 6 Aug 2020 22:44:35 +0530 Subject: [PATCH] HUGO: Move common game-detection related enums to new header file. --- engines/hugo/detection_enums.h | 46 ++++++++++++++++++++++++++++++++++ engines/hugo/hugo.h | 22 +--------------- 2 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 engines/hugo/detection_enums.h diff --git a/engines/hugo/detection_enums.h b/engines/hugo/detection_enums.h new file mode 100644 index 00000000000..f8ce67ca849 --- /dev/null +++ b/engines/hugo/detection_enums.h @@ -0,0 +1,46 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +namespace Hugo { + +enum HugoGameFeatures { + GF_PACKED = (1 << 0) // Database +}; + +enum GameType { + kGameTypeNone = 0, + kGameTypeHugo1, + kGameTypeHugo2, + kGameTypeHugo3 +}; + +enum GameVariant { + kGameVariantH1Win = 0, + kGameVariantH2Win, + kGameVariantH3Win, + kGameVariantH1Dos, + kGameVariantH2Dos, + kGameVariantH3Dos, + kGameVariantNone +}; + +} // End of namespace Hugo diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 15576ee7def..288d73b20ca 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -27,6 +27,7 @@ // This include is here temporarily while the engine is being refactored. #include "hugo/game.h" +#include "hugo/detection_enums.h" #define HUGO_DAT_VER_MAJ 0 // 1 byte #define HUGO_DAT_VER_MIN 42 // 1 byte @@ -90,23 +91,6 @@ typedef byte Icondib[kXPix * kInvDy]; // Icon bar dib typedef byte Viewdib[(long)kXPix * kYPix]; // Viewport dib typedef byte Overlay[kOvlSize]; // Overlay file -enum GameType { - kGameTypeNone = 0, - kGameTypeHugo1, - kGameTypeHugo2, - kGameTypeHugo3 -}; - -enum GameVariant { - kGameVariantH1Win = 0, - kGameVariantH2Win, - kGameVariantH3Win, - kGameVariantH1Dos, - kGameVariantH2Dos, - kGameVariantH3Dos, - kGameVariantNone -}; - enum HugoDebugChannels { kDebugSchedule = 1 << 0, kDebugEngine = 1 << 1, @@ -157,10 +141,6 @@ enum Dupdate {kDisplayInit, kDisplayAdd, kDisplayDisplay, kDisplayRestore}; */ enum Priority {kSoundPriorityLow, kSoundPriorityMedium, kSoundPriorityHigh}; -enum HugoGameFeatures { - GF_PACKED = (1 << 0) // Database -}; - // Strings used by the engine enum seqTextEngine { kEsAdvertise = 0