diff options
| author | Paul Gilbert | 2014-04-08 23:01:46 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-08 23:01:46 -0400 |
| commit | 09adb571d35c45941246bdce5db895d9d81fd59c (patch) | |
| tree | 6051a6e34a3b13e3f30fc2deb8d88dd3dbfb7253 /engines/mads/inventory.cpp | |
| parent | 21a0e38f34324423e0f571ccb37a800737cd78d2 (diff) | |
| download | scummvm-rg350-09adb571d35c45941246bdce5db895d9d81fd59c.tar.gz scummvm-rg350-09adb571d35c45941246bdce5db895d9d81fd59c.tar.bz2 scummvm-rg350-09adb571d35c45941246bdce5db895d9d81fd59c.zip | |
MADS: Cleanup of verb/preposition flags handling
Diffstat (limited to 'engines/mads/inventory.cpp')
| -rw-r--r-- | engines/mads/inventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mads/inventory.cpp b/engines/mads/inventory.cpp index 89ca9f84c2..607179a3c2 100644 --- a/engines/mads/inventory.cpp +++ b/engines/mads/inventory.cpp @@ -33,8 +33,8 @@ void InventoryObject::load(Common::SeekableReadStream &f) { _vocabCount = f.readByte(); for (int i = 0; i < 3; ++i) { - _vocabList[i]._actionFlags1 = f.readByte(); - _vocabList[i]._actionFlags2 = f.readByte(); + _vocabList[i]._verbType = (VerbType)f.readByte(); + _vocabList[i]._prepType = (PrepType)f.readByte(); _vocabList[i]._vocabId = f.readUint16LE(); } @@ -71,7 +71,7 @@ void InventoryObjects::setQuality(int objIndex, int id, const byte *p) { // more of the engine is implemented for (int i = 0; i < (int)size(); ++i) { InventoryObject &obj = (*this)[i]; - if (obj._vocabList[0]._actionFlags1 <= i) + if (obj._vocabList[0]._verbType <= i) break; if (obj._mutilateString[6 + i] == id) { |