aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/dm.h
diff options
context:
space:
mode:
authorStrangerke2016-09-11 10:45:20 +0200
committerStrangerke2016-09-11 10:45:20 +0200
commitb17f3490f84bb7342d240f31e884984c38110425 (patch)
treec17f99e46b7dc922e5a193951c0166fa8c4fba4f /engines/dm/dm.h
parentf0a6f6b269fb121affa252e36d23c895c7d32e4e (diff)
downloadscummvm-rg350-b17f3490f84bb7342d240f31e884984c38110425.tar.gz
scummvm-rg350-b17f3490f84bb7342d240f31e884984c38110425.tar.bz2
scummvm-rg350-b17f3490f84bb7342d240f31e884984c38110425.zip
DM: Rework functions related to Directions in order to make them consistent and remove redundancy
Diffstat (limited to 'engines/dm/dm.h')
-rw-r--r--engines/dm/dm.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/dm/dm.h b/engines/dm/dm.h
index eeca0a8c96..3f4b6f0f5c 100644
--- a/engines/dm/dm.h
+++ b/engines/dm/dm.h
@@ -157,8 +157,6 @@ struct DMADGameDescription {
OriginalSavePlatform _origPlatformToAccept[kDMSavePlatformTotal + 1];
};
-const char *debugGetDirectionName(Direction dir);
-
class Thing {
public:
uint16 _data;
@@ -258,13 +256,12 @@ public:
void fuseSequence(); // @ F0446_STARTEND_FuseSequence
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 normalizeModulo4(uint16 val); // @ M21_NORMALIZE
+ Direction turnDirRight(int16 dir); // @ M17_NEXT
+ Direction turnDirLeft(int16 dir); // @ M19_PREVIOUS
+ Direction returnOppositeDir(int16 dir); // @ M18_OPPOSITE
+ bool isOrientedWestEast(int16 dir); // @ M16_IS_ORIENTED_WEST_EAST
+ uint16 normalizeModulo4(int16 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