diff options
| author | Strangerke | 2016-09-11 09:46:35 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-11 09:46:35 +0200 |
| commit | f90bf31bea635b8c78b72fb5147cf7108f4227db (patch) | |
| tree | 95686a36d7d1d8ae67ea5ed11f6319d27de4abbb /engines/dm/dm.h | |
| parent | 8eaf094bf59a30255f6e981bd9e1c593fc17b2fb (diff) | |
| download | scummvm-rg350-f90bf31bea635b8c78b72fb5147cf7108f4227db.tar.gz scummvm-rg350-f90bf31bea635b8c78b72fb5147cf7108f4227db.tar.bz2 scummvm-rg350-f90bf31bea635b8c78b72fb5147cf7108f4227db.zip | |
DM: Move some globals to DMEngine
Diffstat (limited to 'engines/dm/dm.h')
| -rw-r--r-- | engines/dm/dm.h | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/engines/dm/dm.h b/engines/dm/dm.h index 051b5e8e0e..c37ab23f40 100644 --- a/engines/dm/dm.h +++ b/engines/dm/dm.h @@ -200,26 +200,10 @@ public: bool operator!=(const Thing &rhs) const { return _data != rhs._data; } }; // @ THING -void turnDirRight(Direction &dir); -void turnDirLeft(Direction &dir); -Direction returnOppositeDir(Direction dir); // @ M18_OPPOSITE -uint16 returnPrevVal(uint16 val); // @ M19_PREVIOUS -uint16 returnNextVal(uint16 val); // @ M17_NEXT -bool isOrientedWestEast(Direction dir); // @ M16_IS_ORIENTED_WEST_EAST - #define setFlag(val, mask) ((val) |= (mask)) #define getFlag(val, mask) ((val) & (mask)) #define clearFlag(val, mask) ((val) &= (~(mask))) // @ M09_CLEAR -uint16 toggleFlag(uint16 &val, uint16 mask); // @ M10_TOGGLE -uint16 bitmapByteCount(uint16 pixelWidth, uint16 height); // @ M75_BITMAP_BYTE_COUNT -uint16 normalizeModulo4(uint16 val); // @ M21_NORMALIZE -int32 filterTime(int32 map_time); // @ M30_TIME -int32 setMapAndTime(int32 &map_time, uint32 map, uint32 time); // @ M33_SET_MAP_AND_TIME -uint16 getMap(int32 map_time); // @ M29_MAP -Thing thingWithNewCell(Thing thing, int16 cell); // @ M15_THING_WITH_NEW_CELL -int16 getDistance(int16 mapx1, int16 mapy1, int16 mapx2, int16 mapy2);// @ M38_DISTANCE - //TODO: Directly use CLIP template<typename T> inline T getBoundedValue(T min, T val, T max) { @@ -272,6 +256,21 @@ public: void fuseSequenceUpdate(); // @ F0445_STARTEND_FuseSequenceUpdate Common::Language getGameLanguage(); + void turnDirRight(Direction &dir); + void turnDirLeft(Direction &dir); + Direction returnOppositeDir(Direction dir); // @ M18_OPPOSITE + uint16 returnPrevVal(uint16 val); // @ M19_PREVIOUS + uint16 returnNextVal(uint16 val); // @ M17_NEXT + bool isOrientedWestEast(Direction dir); // @ M16_IS_ORIENTED_WEST_EAST + uint16 toggleFlag(uint16 &val, uint16 mask); // @ M10_TOGGLE + uint16 bitmapByteCount(uint16 pixelWidth, uint16 height); // @ M75_BITMAP_BYTE_COUNT + uint16 normalizeModulo4(uint16 val); // @ M21_NORMALIZE + int32 filterTime(int32 map_time); // @ M30_TIME + int32 setMapAndTime(int32 &map_time, uint32 map, uint32 time); // @ M33_SET_MAP_AND_TIME + uint16 getMap(int32 map_time); // @ M29_MAP + Thing thingWithNewCell(Thing thing, int16 cell); // @ M15_THING_WITH_NEW_CELL + int16 getDistance(int16 mapx1, int16 mapy1, int16 mapx2, int16 mapy2);// @ M38_DISTANCE + private: uint16 _dungeonId; // @ G0526_ui_DungeonID byte *_entranceDoorAnimSteps[10]; // @ G0562_apuc_Bitmap_EntranceDoorAnimationSteps |