diff options
| author | Walter van Niftrik | 2016-03-31 23:42:03 +0200 |
|---|---|---|
| committer | Walter van Niftrik | 2016-06-06 20:35:49 +0200 |
| commit | 2c8e0cefb15205c61a10a650e63d7fb53fad00a6 (patch) | |
| tree | 09df2bf556b829cc5fc99aab1bd43164502f0abc /engines/adl/adl_v2.cpp | |
| parent | b24f30527b4ff79e5341e76a7fd3dc21d75e2ed2 (diff) | |
| download | scummvm-rg350-2c8e0cefb15205c61a10a650e63d7fb53fad00a6.tar.gz scummvm-rg350-2c8e0cefb15205c61a10a650e63d7fb53fad00a6.tar.bz2 scummvm-rg350-2c8e0cefb15205c61a10a650e63d7fb53fad00a6.zip | |
ADL: Store items in a List instead of an Array
Item IDs are not necessarily sequential
Diffstat (limited to 'engines/adl/adl_v2.cpp')
| -rw-r--r-- | engines/adl/adl_v2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp index 8a826e577a..cc38bebe3f 100644 --- a/engines/adl/adl_v2.cpp +++ b/engines/adl/adl_v2.cpp @@ -213,7 +213,7 @@ int AdlEngine_v2::o2_isRandomGT(ScriptEnv &e) { } int AdlEngine_v2::o2_isNounNotInRoom(ScriptEnv &e) { - Common::Array<Item>::const_iterator item; + Common::List<Item>::const_iterator item; for (item = _state.items.begin(); item != _state.items.end(); ++item) if (item->noun == e.getNoun() && (item->room == roomArg(e.arg(1)))) @@ -223,7 +223,7 @@ int AdlEngine_v2::o2_isNounNotInRoom(ScriptEnv &e) { } int AdlEngine_v2::o2_isCarryingSomething(ScriptEnv &e) { - Common::Array<Item>::const_iterator item; + Common::List<Item>::const_iterator item; for (item = _state.items.begin(); item != _state.items.end(); ++item) if (item->room == IDI_ANY) @@ -248,7 +248,7 @@ int AdlEngine_v2::o2_moveAllItems(ScriptEnv &e) { byte room1 = roomArg(e.arg(1)); byte room2 = roomArg(e.arg(2)); - Common::Array<Item>::iterator item; + Common::List<Item>::iterator item; for (item = _state.items.begin(); item != _state.items.end(); ++item) if (item->room == room1) { |