AVALANCHE: Remove roomnums.h

4 files changed, 13 insertions, 78 deletions

diff --git a/engines/avalanche/background.cpp b/engines/avalanche/background.cpp
index 5f182bcf2f..d9f606b74e 100644
--- a/engines/avalanche/background.cpp
+++ b/engines/avalanche/background.cpp
@@ -32,7 +32,6 @@
 #include "avalanche/animation.h"
 #include "avalanche/lucerna.h"
 #include "avalanche/gyro.h"
-#include "avalanche/roomnums.h"
 
 #include "common/textconsole.h"
 
diff --git a/engines/avalanche/gyro.h b/engines/avalanche/gyro.h
index a50fa1536e..6bd2040917 100644
--- a/engines/avalanche/gyro.h
+++ b/engines/avalanche/gyro.h
@@ -30,7 +30,6 @@
 #ifndef AVALANCHE_GYRO2_H
 #define AVALANCHE_GYRO2_H
 
-#include "avalanche/roomnums.h"
 #include "avalanche/color.h"
 
 #include "common/str.h"
@@ -42,6 +41,19 @@
 namespace Avalanche {
 class AvalancheEngine;
 
+// CHECKME: kRoomBossKey is a guess
+enum Room {
+	kRoomNowhere = 0,       kRoomYours = 1,        kRoomOutsideYours = 2,          kRoomOutsideSpludwicks = 3,
+	kRoomYourHall = 5,      kRoomMusicRoom = 7,    kRoomOutsideArgentPub = 9,      kRoomArgentRoad = 10,
+	kRoomWiseWomans = 11,   kRoomSpludwicks = 12,  kRoomInsideAbbey = 13,          kRoomOutsideAbbey = 14,
+	kRoomAvvysGarden = 15,  kRoomAylesOffice = 16, kRoomArgentPub = 19,            kRoomBrummieRoad = 20,
+	kRoomBridge = 21,       kRoomLusties = 22,     kRoomLustiesRoom = 23,          kRoomWestHall = 25,
+	kRoomEastHall = 26,     kRoomOubliette = 27,   kRoomGeidas = 28,               kRoomCatacombs = 29,
+	kRoomEntranceHall = 40, kRoomRobins = 42,      kRoomOutsideNottsPub = 46,      kRoomNottsPub = 47,
+	kRoomOutsideDucks = 50, kRoomDucks = 51,       kRoomOutsideCardiffCastle = 70, kRoomInsideCardiffCastle = 71,
+	kRoomBossKey = 98,      kRoomMap = 99,         kRoomDummy = 177 // Dummy room
+};
+
 static const byte kObjectNum = 18; // always preface with a #
 static const int16 kCarryLimit = 12;  // carry limit
 
diff --git a/engines/avalanche/lucerna.cpp b/engines/avalanche/lucerna.cpp
index 3b30739cff..b50a5160ba 100644
--- a/engines/avalanche/lucerna.cpp
+++ b/engines/avalanche/lucerna.cpp
@@ -37,7 +37,6 @@
 #include "avalanche/pingo.h"
 #include "avalanche/sequence.h"
 #include "avalanche/acci.h"
-#include "avalanche/roomnums.h"
 
 #include "common/rect.h"
 #include "common/system.h"
diff --git a/engines/avalanche/roomnums.h b/engines/avalanche/roomnums.h
deleted file mode 100644
index a963468db2..0000000000
--- a/engines/avalanche/roomnums.h
+++ /dev/null
@@ -1,75 +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.
- */
-
-#ifndef AVALANCHE_ROOMNUMS_H
-#define AVALANCHE_ROOMNUMS_H
-
-#include "common/system.h"
-
-namespace Avalanche {
-
-enum Room {
-	kRoomNowhere = 0,
-	kRoomYours = 1,
-	kRoomOutsideYours = 2,
-	kRoomOutsideSpludwicks = 3,
-	kRoomYourHall = 5,
-	kRoomMusicRoom = 7,
-	kRoomOutsideArgentPub = 9,
-	kRoomArgentRoad = 10,
-	kRoomWiseWomans = 11,
-	kRoomSpludwicks = 12,
-	kRoomInsideAbbey = 13,
-	kRoomOutsideAbbey = 14,
-	kRoomAvvysGarden = 15,
-	kRoomAylesOffice = 16,
-	kRoomArgentPub = 19,
-	kRoomBrummieRoad = 20,
-	kRoomBridge = 21, 
-	kRoomLusties = 22,
-	kRoomLustiesRoom = 23,
-	kRoomWestHall = 25,
-	kRoomEastHall = 26,
-	kRoomOubliette = 27,
-	kRoomGeidas = 28,
-	kRoomCatacombs = 29,
-	kRoomEntranceHall = 40,
-	kRoomRobins = 42,
-	kRoomOutsideNottsPub = 46,
-	kRoomNottsPub = 47,
-	kRoomOutsideDucks = 50,
-	kRoomDucks = 51,
-	kRoomOutsideCardiffCastle = 70,
-	kRoomInsideCardiffCastle = 71,
-	kRoomBossKey = 98, // assumed
-	kRoomMap = 99,
-	kRoomDummy = 177 // Dummy room
-};
-
-} // End of namespace Avalanche
-
-#endif // AVALANCHE_ROOMNUMS_H