aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-07-29 13:25:39 +0200
committeruruk2014-07-29 13:25:39 +0200
commit800ff40219c44c0961ff02faaf75d692f0d9a98a (patch)
tree4cd16c055808e6a74c864a9ccbcf8b8b21cfd826
parentcee669e76325dd9f6dca12262faf61cbe0392828 (diff)
downloadscummvm-rg350-800ff40219c44c0961ff02faaf75d692f0d9a98a.tar.gz
scummvm-rg350-800ff40219c44c0961ff02faaf75d692f0d9a98a.tar.bz2
scummvm-rg350-800ff40219c44c0961ff02faaf75d692f0d9a98a.zip
CGE2: Move ColorBank and kColorNum to one place.
They are strongly connected.
-rw-r--r--engines/cge2/cge2.h6
-rw-r--r--engines/cge2/talk.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 4febca32d1..05afd2640d 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -112,6 +112,10 @@ struct SavegameHeader;
#define kSavegameStrSize 12
#define kSavegameStr "SCUMMVM_CGE2"
+#define kColorNum 6
+
+enum ColorBank { kCBRel, kCBStd, kCBSay, kCBInf, kCBMnu, kCBWar };
+
// our engine debug channels
enum {
kCGE2DebugOpcode = 1 << 0
@@ -123,8 +127,6 @@ enum CallbackType {
enum Action { kNear, kMTake, kFTake, kActions };
-enum ColorBank { kCBRel, kCBStd, kCBSay, kCBInf, kCBMnu, kCBWar };
-
typedef void (CGE2Engine::*NotifyFunctionType)();
class CGE2Engine : public Engine {
diff --git a/engines/cge2/talk.h b/engines/cge2/talk.h
index ec4a347c69..d7484655cc 100644
--- a/engines/cge2/talk.h
+++ b/engines/cge2/talk.h
@@ -44,7 +44,6 @@ namespace CGE2 {
#define kCaptionSide 24
#define kInfName 101
#define kSayName 102
-#define kColorNum 6
class Font {
void load();