diff options
| author | Strangerke | 2015-02-06 08:24:44 +0100 |
|---|---|---|
| committer | Strangerke | 2015-02-06 08:24:44 +0100 |
| commit | ef9c9b78a3cf4f3392d86593586e076433dd78f8 (patch) | |
| tree | c8fbeb71ddd233dafe59b9215aafcdc26cbcbfa3 /engines/access | |
| parent | a05e8625ccc0f641c0e886a35166c4233d5140fa (diff) | |
| download | scummvm-rg350-ef9c9b78a3cf4f3392d86593586e076433dd78f8.tar.gz scummvm-rg350-ef9c9b78a3cf4f3392d86593586e076433dd78f8.tar.bz2 scummvm-rg350-ef9c9b78a3cf4f3392d86593586e076433dd78f8.zip | |
ACCESS: MM - Fix a crash
Diffstat (limited to 'engines/access')
| -rw-r--r-- | engines/access/inventory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp index 28a5cc2746..cdb50f5e99 100644 --- a/engines/access/inventory.cpp +++ b/engines/access/inventory.cpp @@ -73,19 +73,20 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) { names = Amazon::INVENTORY_NAMES; combineP = &Amazon::COMBO_TABLE[0][0]; _inv.resize(85); + for (uint i = 0; i < _inv.size(); ++i, combineP += 4) + _inv[i].load(names[i], combineP); break; case GType_MartianMemorandum: names = Martian::INVENTORY_NAMES; combineP = nullptr; _inv.resize(55); + for (uint i = 0; i < _inv.size(); ++i) + _inv[i].load(names[i], nullptr); break; default: error("Unknown game"); } - for (uint i = 0; i < _inv.size(); ++i, combineP += 4) - _inv[i].load(names[i], combineP); - for (uint i = 0; i < 26; ++i) { const int *r = INVCOORDS[i]; _invCoords.push_back(Common::Rect(r[0], r[2], r[1], r[3])); |