From 1529ed0891b9721c349e84468dcb28d4f655dc1b Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 17 Oct 2011 09:21:49 -0400
Subject: PEGASUS: Implement deleting items when inventory is full

---
 engines/pegasus/neighborhood/mars/mars.cpp   | 3 ---
 engines/pegasus/neighborhood/mars/mars.h     | 3 +++
 engines/pegasus/neighborhood/tsa/fulltsa.cpp | 1 -
 engines/pegasus/neighborhood/tsa/fulltsa.h   | 1 +
 engines/pegasus/neighborhood/wsc/wsc.cpp     | 3 ---
 engines/pegasus/neighborhood/wsc/wsc.h       | 3 +++
 6 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/pegasus/neighborhood')

diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 3f46edb9a3..f13890cc18 100755
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -292,11 +292,9 @@ const tRoomID kMars28 = 29;
 const tRoomID kMars29 = 30;
 const tRoomID kMars30 = 31;
 const tRoomID kMars31 = 32;
-const tRoomID kMars31South = 33;
 const tRoomID kMars32 = 34;
 const tRoomID kMars33 = 35;
 const tRoomID kMars33North = 36;
-const tRoomID kMars34 = 37;
 const tRoomID kMars36 = 39;
 const tRoomID kMars37 = 40;
 const tRoomID kMars38 = 41;
@@ -308,7 +306,6 @@ const tRoomID kMars45 = 47;
 const tRoomID kMars46 = 48;
 const tRoomID kMars47 = 49;
 const tRoomID kMars48 = 50;
-const tRoomID kMars49 = 51;
 const tRoomID kMars50 = 52;
 const tRoomID kMars51 = 53;
 const tRoomID kMars52 = 54;
diff --git a/engines/pegasus/neighborhood/mars/mars.h b/engines/pegasus/neighborhood/mars/mars.h
index 3eb0fc80e6..b663a621af 100755
--- a/engines/pegasus/neighborhood/mars/mars.h
+++ b/engines/pegasus/neighborhood/mars/mars.h
@@ -53,8 +53,11 @@ enum tShuttleWeaponSelection {
 };
 
 const tRoomID kMars0A = 0;
+const tRoomID kMars31South = 33;
+const tRoomID kMars34 = 37;
 const tRoomID kMars35 = 38;
 const tRoomID kMars39 = 42;
+const tRoomID kMars49 = 51;
 const tRoomID kMars60 = 58;
 const tRoomID kMarsMaze004 = 60;
 const tRoomID kMarsMaze200 = 224;
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index 8f5bf47338..1aac583ccc 100755
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -112,7 +112,6 @@ const tRoomID kTSA23Cyan = 24;
 const tRoomID kTSA24Cyan = 25;
 const tRoomID kTSA25Cyan = 26;
 const tRoomID kTSA21Red = 27;
-const tRoomID kTSA22Red = 28;
 const tRoomID kTSA23Red = 29;
 const tRoomID kTSA24Red = 30;
 const tRoomID kTSA25Red = 31;
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.h b/engines/pegasus/neighborhood/tsa/fulltsa.h
index 447482f737..aa21192a33 100755
--- a/engines/pegasus/neighborhood/tsa/fulltsa.h
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.h
@@ -50,6 +50,7 @@ protected:
 //	Room IDs.
 
 const tRoomID kTSA00 = 0;
+const tRoomID kTSA22Red = 28;
 const tRoomID kTSA37 = 42;
 
 class FullTSA : public Neighborhood {
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index cc12a2fe69..e42b90e821 100755
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -173,8 +173,6 @@ const tAlternateID kAltWSCPeopleAtW19North = 3;
 //	Room IDs.
 
 const tRoomID kWSC02 = 1;
-const tRoomID kWSC02Morph = 2;
-const tRoomID kWSC02Messages = 3;
 const tRoomID kWSC03 = 4;
 const tRoomID kWSC04 = 5;
 const tRoomID kWSC06 = 6;
@@ -233,7 +231,6 @@ const tRoomID kWSC60North = 58;
 const tRoomID kWSC61 = 59;
 const tRoomID kWSC61South = 60;
 const tRoomID kWSC61West = 61;
-const tRoomID kWSC62 = 62;
 const tRoomID kWSC63 = 63;
 const tRoomID kWSC64 = 64;
 const tRoomID kWSC65 = 65;
diff --git a/engines/pegasus/neighborhood/wsc/wsc.h b/engines/pegasus/neighborhood/wsc/wsc.h
index 554c2f713d..8646da3dbe 100755
--- a/engines/pegasus/neighborhood/wsc/wsc.h
+++ b/engines/pegasus/neighborhood/wsc/wsc.h
@@ -35,6 +35,9 @@ const tDisplayOrder kWSCMoleculeBinOrder = kMonitorLayer;
 const tDisplayOrder kWSCMoleculesMovieOrder = kWSCMoleculeBinOrder + 1;
 
 const tRoomID kWSC01 = 0;
+const tRoomID kWSC02Morph = 2;
+const tRoomID kWSC02Messages = 3;
+const tRoomID kWSC62 = 62;
 
 class WSC : public Neighborhood {
 public:
-- 
cgit v1.2.3