SUPERNOVA: Moves constants to screen.h

3 files changed, 26 insertions, 23 deletions

diff --git a/engines/supernova/graphics.cpp b/engines/supernova/graphics.cpp
index 7bc9cabe25..9a05a424ca 100644
--- a/engines/supernova/graphics.cpp
+++ b/engines/supernova/graphics.cpp
@@ -30,6 +30,7 @@
 
 #include "supernova/graphics.h"
 #include "supernova/msn_def.h"
+#include "supernova/screen.h"
 #include "supernova/supernova.h"
 
 namespace Supernova {
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index 7738471dee..3f1c69bce5 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -25,10 +25,6 @@
 
 namespace Supernova {
 
-const int kScreenWidth  = 320;
-const int kScreenHeight = 200;
-const int kFontWidth = 5;
-const int kFontHeight = 8;
 const int kTextSpeed[] = {19, 14, 10, 7, 4};
 const int kMsecPerTick = 55;
 
@@ -50,25 +46,6 @@ enum MessagePosition {
 	kMessageTop
 };
 
-const int kColorBlack       =  0;
-const int kColorWhite25     =  1;
-const int kColorWhite35     =  2;
-const int kColorWhite44     =  3;
-const int kColorWhite99     =  4;
-const int kColorDarkGreen   =  5;
-const int kColorGreen       =  6;
-const int kColorDarkRed     =  7;
-const int kColorRed         =  8;
-const int kColorDarkBlue    =  9;
-const int kColorBlue        = 10;
-const int kColorWhite63     = 11;
-const int kColorLightBlue   = 12;
-const int kColorLightGreen  = 13;
-const int kColorLightYellow = 14;
-const int kColorLightRed    = 15;
-const int kColorCursorTransparent = kColorWhite25;
-
-
 enum ObjectType {
 	NULLTYPE    =      0,
 	TAKE        =      1,
diff --git a/engines/supernova/screen.h b/engines/supernova/screen.h
index 84a5375112..a3c37f599a 100644
--- a/engines/supernova/screen.h
+++ b/engines/supernova/screen.h
@@ -40,6 +40,31 @@ class Room;
 class MSNImage;
 class Screen;
 
+const int kScreenWidth  = 320;
+const int kScreenHeight = 200;
+const int kFontWidth = 5;
+const int kFontHeight = 8;
+
+enum Color {
+	kColorBlack       =  0,
+	kColorWhite25     =  1,
+	kColorWhite35     =  2,
+	kColorWhite44     =  3,
+	kColorWhite99     =  4,
+	kColorDarkGreen   =  5,
+	kColorGreen       =  6,
+	kColorDarkRed     =  7,
+	kColorRed         =  8,
+	kColorDarkBlue    =  9,
+	kColorBlue        = 10,
+	kColorWhite63     = 11,
+	kColorLightBlue   = 12,
+	kColorLightGreen  = 13,
+	kColorLightYellow = 14,
+	kColorLightRed    = 15,
+	kColorCursorTransparent = kColorWhite25
+};
+
 class ScreenBuffer {
 	friend class ScreenBufferStack;