Skip to content

Commit

Permalink
LAB: Move enums to the top of processroom.h
Browse files Browse the repository at this point in the history
  • Loading branch information
bluegr committed Dec 24, 2015
1 parent 3097ac8 commit 28b5105
Showing 1 changed file with 31 additions and 33 deletions.
64 changes: 31 additions & 33 deletions engines/lab/processroom.h
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 28b5105

Please sign in to comment.