From 800ff40219c44c0961ff02faaf75d692f0d9a98a Mon Sep 17 00:00:00 2001
From: uruk
Date: Tue, 29 Jul 2014 13:25:39 +0200
Subject: CGE2: Move ColorBank and kColorNum to one place.

They are strongly connected.
---
 engines/cge2/cge2.h | 6 ++++--
 engines/cge2/talk.h | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

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();
-- 
cgit v1.2.3