diff options
| author | Filippos Karapetis | 2014-05-04 15:34:10 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2014-05-04 15:34:10 +0300 |
| commit | 5f2ca95771241f657b02cdbcb5c17c1038776c77 (patch) | |
| tree | 299a6e6d12deb9937271427fe710c45b5d67b957 | |
| parent | d730abf16fa6b41d9f4d620ea4e6c709980ccb44 (diff) | |
| download | scummvm-rg350-5f2ca95771241f657b02cdbcb5c17c1038776c77.tar.gz scummvm-rg350-5f2ca95771241f657b02cdbcb5c17c1038776c77.tar.bz2 scummvm-rg350-5f2ca95771241f657b02cdbcb5c17c1038776c77.zip | |
MADS: Replace some more article magic numbers with their enum
| -rw-r--r-- | engines/mads/action.cpp | 4 | ||||
| -rw-r--r-- | engines/mads/hotspots.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp index ab4a112b71..3367521d88 100644 --- a/engines/mads/action.cpp +++ b/engines/mads/action.cpp @@ -62,7 +62,7 @@ MADSAction::MADSAction(MADSEngine *vm) : _vm(vm) { _savedFields._mainObject = 0; _savedFields._secondObject = 0; _savedFields._secondObjectSource = 0; - _savedFields._articleNumber = 0; + _savedFields._articleNumber = PREP_NONE; _savedFields._lookFlag = false; } @@ -223,7 +223,7 @@ void MADSAction::set() { } if ((_hotspotId >= 0) && (_articleNumber > 0) && !flag) { - if (_articleNumber == 0xff) { + if (_articleNumber == PREP_RELATIONAL) { if (_secondObject >= 0) { int articleNum = 0; diff --git a/engines/mads/hotspots.cpp b/engines/mads/hotspots.cpp index 0853f66eac..ca05ad618c 100644 --- a/engines/mads/hotspots.cpp +++ b/engines/mads/hotspots.cpp @@ -66,7 +66,7 @@ int DynamicHotspots::add(int descId, int verbId, int seqIndex, const Common::Rec _entries[idx]._feetPos = Common::Point(-3, 0); _entries[idx]._facing = FACING_NONE; _entries[idx]._verbId = verbId; - _entries[idx]._articleNumber = 6; + _entries[idx]._articleNumber = PREP_IN; _entries[idx]._cursor = CURSOR_NONE; ++_count; |