AVALANCHE: Remove color.h

3 files changed, 7 insertions, 62 deletions

diff --git a/engines/avalanche/color.h b/engines/avalanche/color.h
deleted file mode 100644
index e9f9c460bc..0000000000
--- a/engines/avalanche/color.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 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.
- *
- */
-
-/*
- * This code is based on the original source code of Lord Avalot d'Argent version 1.3.
- * Copyright (c) 1994-1995 Mike, Mark and Thomas Thurman.
- */
-
-// Color constants replacing the colors from the CRT unit of Pascal
-
-#ifndef AVALANCHE_COLOR_H
-#define AVALANCHE_COLOR_H
-
-#include "common/system.h"
-
-namespace Avalanche {
-
-enum Color {
-	kColorBlack,
-	kColorBlue,
-	kColorGreen,
-	kColorCyan,
-	kColorRed,
-	kColorMagenta,
-	kColorBrown,
-	kColorLightgray,
-	kColorDarkgray,
-	kColorLightblue,
-	kColorLightgreen,
-	kColorLightcyan,
-	kColorLightred,
-	kColorLightmagenta,
-	kColorYellow,
-	kColorWhite
-};
-
-} // End of namespace Avalanche
-
-#endif // AVALANCHE_COLOR_H
diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h
index 6bd2040917..43809becee 100644
--- a/engines/avalanche/gyro.h
+++ b/engines/avalanche/gyro.h
@@ -30,8 +30,6 @@
 #ifndef AVALANCHE_GYRO2_H
 #define AVALANCHE_GYRO2_H
 
-#include "avalanche/color.h"
-
 #include "common/str.h"
 #include "common/scummsys.h"
 #include "common/file.h"
@@ -41,6 +39,13 @@
 namespace Avalanche {
 class AvalancheEngine;
 
+enum Color {
+	kColorBlack,      kColorBlue,      kColorGreen,     kColorCyan,         kColorRed,
+	kColorMagenta,    kColorBrown,     kColorLightgray, kColorDarkgray,     kColorLightblue,
+	kColorLightgreen, kColorLightcyan, kColorLightred,  kColorLightmagenta, kColorYellow,
+	kColorWhite
+};
+
 // CHECKME: kRoomBossKey is a guess
 enum Room {
 	kRoomNowhere = 0,       kRoomYours = 1,        kRoomOutsideYours = 2,          kRoomOutsideSpludwicks = 3,
diff --git a/engines/avalanche/menu.h b/engines/avalanche/menu.h
index 9a00a2821f..5f9c896131 100644
--- a/engines/avalanche/menu.h
+++ b/engines/avalanche/menu.h
@@ -30,8 +30,6 @@
 #ifndef AVALANCHE_DROPDOWN2_H
 #define AVALANCHE_DROPDOWN2_H
 
-#include "avalanche/color.h"
-
 #include "common/scummsys.h"
 #include "common/str.h"