aboutsummaryrefslogtreecommitdiff
path: root/engines/lab
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-24 12:38:26 +0200
committerFilippos Karapetis2015-12-24 12:38:26 +0200
commit28b5105f56201d37921521afcfa222c7b593004c (patch)
treef562f02d95e887a1e1abef0a76283ce33401c5aa /engines/lab
parent3097ac8f1e336193755b2386506842ef76951b13 (diff)
downloadscummvm-rg350-28b5105f56201d37921521afcfa222c7b593004c.tar.gz
scummvm-rg350-28b5105f56201d37921521afcfa222c7b593004c.tar.bz2
scummvm-rg350-28b5105f56201d37921521afcfa222c7b593004c.zip
LAB: Move enums to the top of processroom.h
Diffstat (limited to 'engines/lab')
-rw-r--r--engines/lab/processroom.h64
1 files changed, 31 insertions, 33 deletions
diff --git a/engines/lab/processroom.h b/engines/lab/processroom.h
index 37585bc05c..f5201b1bd3 100644
--- a/engines/lab/processroom.h
+++ b/engines/lab/processroom.h
@@ -102,6 +102,37 @@ enum Condition {
kCondUsedHelmet = 184
};
+enum MapDoors {
+ kDoorLeftNorth = 1,
+ kDoorLeftEast = 2,
+ kDoorLeftSouth = 4,
+ kDoorLeftWest = 8,
+
+ kDoorMiddleNorth = 16,
+ kDoorRightNorth = 32,
+ kDoorMiddleSouth = 64,
+ kDoorRightSouth = 128,
+
+ kDoorMiddleEast = 16,
+ kDoorBottomEast = 32,
+ kDoorMiddleWest = 64,
+ kDoorBottomWest = 128
+};
+
+// Special Map ID's
+#define NORMAL 0
+#define UPARROWROOM 1
+#define DOWNARROWROOM 2
+#define BRIDGEROOM 3
+#define VCORRIDOR 4
+#define HCORRIDOR 5
+#define MEDMAZE 6
+#define HEDGEMAZE 7
+#define SURMAZE 8
+#define MULTIMAZEF1 9
+#define MULTIMAZEF2 10
+#define MULTIMAZEF3 11
+
#if defined(WIN32)
#pragma pack(push, 1)
#endif
@@ -154,39 +185,6 @@ struct InventoryData {
Common::String _bitmapName;
};
-// Map Flags
-
-enum MapDoors {
- kDoorLeftNorth = 1,
- kDoorLeftEast = 2,
- kDoorLeftSouth = 4,
- kDoorLeftWest = 8,
-
- kDoorMiddleNorth = 16,
- kDoorRightNorth = 32,
- kDoorMiddleSouth = 64,
- kDoorRightSouth = 128,
-
- kDoorMiddleEast = 16,
- kDoorBottomEast = 32,
- kDoorMiddleWest = 64,
- kDoorBottomWest = 128
-};
-
-// Special Map ID's
-#define NORMAL 0
-#define UPARROWROOM 1
-#define DOWNARROWROOM 2
-#define BRIDGEROOM 3
-#define VCORRIDOR 4
-#define HCORRIDOR 5
-#define MEDMAZE 6
-#define HEDGEMAZE 7
-#define SURMAZE 8
-#define MULTIMAZEF1 9
-#define MULTIMAZEF2 10
-#define MULTIMAZEF3 11
-
struct MapData {
uint16 _x, _y, _pageNumber, _specialID;
uint32 _mapFlags;