diff options
| author | Strangerke | 2016-09-19 07:05:37 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-19 07:06:55 +0200 |
| commit | 1670cb035ffef58af7dff4c87f5408736e10f8ff (patch) | |
| tree | 6d6924e9463e339fa0e4d9e35d6295fe3b1b31a7 /engines/dm/dm.h | |
| parent | 1cf5c7f7c91559962ddd8c43af7bf4ce05deebc3 (diff) | |
| download | scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.tar.gz scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.tar.bz2 scummvm-rg350-1670cb035ffef58af7dff4c87f5408736e10f8ff.zip | |
DM: Change the definition of setMapAndTime, move SoundIndex enum to SoundMan
Diffstat (limited to 'engines/dm/dm.h')
| -rw-r--r-- | engines/dm/dm.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/dm/dm.h b/engines/dm/dm.h index e4fc837558..e2f5f4186c 100644 --- a/engines/dm/dm.h +++ b/engines/dm/dm.h @@ -265,11 +265,13 @@ public: bool isOrientedWestEast(int16 dir); // @ M16_IS_ORIENTED_WEST_EAST uint16 normalizeModulo4(int16 dir); // @ 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 + int32 filterTime(int32 mapTime); // @ M30_TIME + int32 setMapAndTime(uint32 map, uint32 time); // @ M33_SET_MAP_AND_TIME + uint16 getMap(int32 mapTime); // @ 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 + int16 getDistance(int16 mapx1, int16 mapy1, int16 mapx2, int16 mapy2); // @ M38_DISTANCE + int32 setMap(int32 mapTime, uint32 map); // @ M31_setMap + private: uint16 _dungeonId; // @ G0526_ui_DungeonID |