diff options
| author | Max Horn | 2004-01-19 20:23:27 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-19 20:23:27 +0000 |
| commit | 8e89f7d060ca5fac1efc7c244df91b678f7e2c9d (patch) | |
| tree | 89c54551d525b732be98d953205ea15e837e5db3 /scumm/object.cpp | |
| parent | bcf805234115b0fc38e494672883919ed94e6cb6 (diff) | |
| download | scummvm-rg350-8e89f7d060ca5fac1efc7c244df91b678f7e2c9d.tar.gz scummvm-rg350-8e89f7d060ca5fac1efc7c244df91b678f7e2c9d.tar.bz2 scummvm-rg350-8e89f7d060ca5fac1efc7c244df91b678f7e2c9d.zip | |
moved the sam&max inventory hack into o6_setOwner
svn-id: r12520
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 56e4b49eaf..e5ad18080e 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -1188,23 +1188,6 @@ int ScummEngine::getInventorySlot() { return -1; } -void ScummEngine::SamInventoryHack(int obj) { - // FIXME: Sam and Max hack - int base = 6; - - while (base < 80) { - int value = readArray(178, 0, base); - if (value == obj) - return; - if (value == 0) { - _scummVars[179]++; - writeArray(178, 0, base, obj); - return; - } - base++; - } -} - void ScummEngine::setOwnerOf(int obj, int owner) { ScriptSlot *ss; if (owner == 0) { @@ -1217,8 +1200,6 @@ void ScummEngine::setOwnerOf(int obj, int owner) { return; } } - if ((owner == 2) && (_gameId == GID_SAMNMAX)) - SamInventoryHack(obj); putOwner(obj, owner); runInventoryScript(0); |