diff options
| author | Strangerke | 2016-09-11 11:10:22 +0200 |
|---|---|---|
| committer | Strangerke | 2016-09-11 11:10:22 +0200 |
| commit | 2f311a800fe66ad183c49e917acd212cc9316e3b (patch) | |
| tree | c5d1ca059c8b2c70aa4b7f5a22bbd8348a6b4423 /engines/dm/dm.h | |
| parent | b0bfa2e4f535cdaafb389950381fc3fff340e634 (diff) | |
| download | scummvm-rg350-2f311a800fe66ad183c49e917acd212cc9316e3b.tar.gz scummvm-rg350-2f311a800fe66ad183c49e917acd212cc9316e3b.tar.bz2 scummvm-rg350-2f311a800fe66ad183c49e917acd212cc9316e3b.zip | |
DM: Get rid of getBoundedValue, replace it by CLIP
Diffstat (limited to 'engines/dm/dm.h')
| -rw-r--r-- | engines/dm/dm.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/dm/dm.h b/engines/dm/dm.h index 3f4b6f0f5c..6dfc2d4f97 100644 --- a/engines/dm/dm.h +++ b/engines/dm/dm.h @@ -202,11 +202,7 @@ public: #define getFlag(val, mask) ((val) & (mask)) #define clearFlag(val, mask) ((val) &= (~(mask))) // @ M09_CLEAR -//TODO: Directly use CLIP -template<typename T> -inline T getBoundedValue(T min, T val, T max) { - return CLIP<T>(min, val, max); -} // @ F0026_MAIN_GetBoundedValue +// Note: F0026_MAIN_GetBoundedValue<T> has been replaced by CLIP<T> #define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember)) @@ -260,7 +256,7 @@ public: 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 + 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 |