SUPERNOVA: Removes color macros

2 files changed, 13 insertions, 45 deletions

diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h
index 3b2bd494cb..88b59fa4c8 100644
--- a/engines/supernova/msn_def.h
+++ b/engines/supernova/msn_def.h
@@ -82,7 +82,6 @@ struct AudioInfo {
 	int _offsetEnd;
 };
 
-// Colors
 const int kColorBlack       =  0;
 const int kColorWhite25     =  1;
 const int kColorWhite35     =  2;
@@ -101,37 +100,6 @@ const int kColorLightYellow = 14;
 const int kColorLightRed    = 15;
 const int kColorCursorTransparent = kColorWhite25;
 
-#define HGR_BEF      kColorWhite25
-#define COL_BEF      kColorDarkGreen
-#define HGR_BEF_HELL kColorWhite44
-#define COL_BEF_HELL kColorGreen
-
-#define HGR_INV      kColorWhite25
-#define COL_INV      kColorDarkRed
-#define HGR_INV_HELL kColorWhite35
-#define COL_INV_HELL kColorRed
-
-#define HGR_BEF_ANZ  kColorWhite25
-#define COL_BEF_ANZ  kColorDarkGreen
-
-#define HGR_AUSG     kColorWhite25
-#define COL_AUSG     kColorDarkRed
-
-#define HGR_MELD     kColorWhite35
-#define COL_MELD     kColorWhite99
-
-#define COL_LWIN     kColorDarkRed
-#define HGR_LADEN    kColorBlue
-#define COL_LADEN    kColorWhite99
-#define HGR_LADEN2   kColorDarkBlue
-#define COL_LADEN2   kColorWhite63
-#define HGR_NAME     kColorDarkBlue
-#define COL_NAME     kColorLightRed
-
-#define HGR_EDIT     kColorDarkBlue
-#define COL_EDIT     kColorWhite99
-
-
 const byte mouseNormal[64] = {
     0xff,0x3f,0xff,0x1f,0xff,0x0f,0xff,0x07,
     0xff,0x03,0xff,0x01,0xff,0x00,0x7f,0x00,
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp
index 521f90b53d..6453f39fb1 100644
--- a/engines/supernova/state.cpp
+++ b/engines/supernova/state.cpp
@@ -749,8 +749,8 @@ void GameManager::drawInventory() {
 		                _guiInventory[i]._textColor);
 	}
 
-	_vm->renderBox(272, 161, 7, 19, HGR_INV);
-	_vm->renderBox(272, 181, 7, 19, HGR_INV);
+	_vm->renderBox(272, 161, 7, 19, kColorWhite25);
+	_vm->renderBox(272, 181, 7, 19, kColorWhite25);
 }
 
 uint16 GameManager::getKeyInput(bool blockForPrintChar) {
@@ -885,15 +885,15 @@ void GameManager::shock() {
 
 void GameManager::showMenu() {
 	_vm->renderBox(0, 138, 320, 62, 0);
-	_vm->renderBox(0, 140, 320, 9, HGR_BEF_ANZ);
+	_vm->renderBox(0, 140, 320, 9, kColorWhite25);
 	drawCommandBox();
-	_vm->renderBox(281, 161, 39, 39, HGR_AUSG);
+	_vm->renderBox(281, 161, 39, 39, kColorWhite25);
 	drawInventory();
 }
 
 void GameManager::drawMapExits() {
 // TODO: Preload _exitList on room entry instead on every call
-	_vm->renderBox(281, 161, 39, 39, HGR_AUSG);
+	_vm->renderBox(281, 161, 39, 39, kColorWhite25);
 
 	for (int i = 0; i < 25; i++)
 		_exitList[i] = -1;
@@ -903,7 +903,7 @@ void GameManager::drawMapExits() {
 			_exitList[r] = i;
 			int x = 284 + 7 * (r % 5);
 			int y = 164 + 7 * (r / 5);
-			_vm->renderBox(x, y, 5, 5, COL_AUSG);
+			_vm->renderBox(x, y, 5, 5, kColorDarkRed);
 		}
 	}
 }
@@ -926,22 +926,22 @@ void GameManager::edit(Common::String &input, int x, int y, uint length) {
 	while (isEditing) {
 		_vm->_textCursorX = x;
 		_vm->_textCursorY = y;
-		_vm->_textColor = COL_EDIT;
-		_vm->renderBox(x, y - 1, overdrawWidth, 9, HGR_EDIT);
+		_vm->_textColor = kColorWhite99;
+		_vm->renderBox(x, y - 1, overdrawWidth, 9, kColorDarkBlue);
 		for (uint i = 0; i < input.size(); ++i) {
 			// Draw char highlight depending on cursor position
 			if (i == cursorIndex) {
-				_vm->renderBox(_vm->_textCursorX, y - 1, _vm->textWidth(input[i]), 9, COL_EDIT);
-				_vm->_textColor = HGR_EDIT;
+				_vm->renderBox(_vm->_textCursorX, y - 1, _vm->textWidth(input[i]), 9, kColorWhite99);
+				_vm->_textColor = kColorDarkBlue;
 				_vm->renderText(input[i]);
-				_vm->_textColor = COL_EDIT;
+				_vm->_textColor = kColorWhite99;
 			} else {
 				_vm->renderText(input[i]);
 			}
 		}
 		if (cursorIndex == input.size()) {
-			_vm->renderBox(_vm->_textCursorX + 1, y - 1, 6, 9, HGR_EDIT);
-			_vm->renderBox(_vm->_textCursorX    , y - 1, 1, 9, COL_EDIT);
+			_vm->renderBox(_vm->_textCursorX + 1, y - 1, 6, 9, kColorDarkBlue);
+			_vm->renderBox(_vm->_textCursorX    , y - 1, 1, 9, kColorWhite99);
 		}
 
 		getKeyInput(true);