diff options
author | Eugene Sandulenko | 2005-05-18 23:17:04 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2005-05-18 23:17:04 +0000 |
commit | 7fb2eda235ffb4bcfc6770a2b5292c3642929349 (patch) | |
tree | b72aefe49c907303a355057c554537186eedfd9e /scumm/object.cpp | |
parent | d92c3c7c72bc840df9151187a6d7c92c75a37c19 (diff) | |
download | scummvm-rg350-7fb2eda235ffb4bcfc6770a2b5292c3642929349.tar.gz scummvm-rg350-7fb2eda235ffb4bcfc6770a2b5292c3642929349.tar.bz2 scummvm-rg350-7fb2eda235ffb4bcfc6770a2b5292c3642929349.zip |
Patch from Quietust for MM NES:
o Fix all actor mask bugs
o Simplify masking considerably
o Moved the decodesNESObject call from object.cpp into gfx.cpp
svn-id: r18177
Diffstat (limited to 'scumm/object.cpp')
-rw-r--r-- | scumm/object.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index be6c6ed5e3..de16a942f7 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -484,11 +484,6 @@ void ScummEngine::drawObject(int obj, int arg) { if (numstrip != 0) { byte flags = od.flags | Gdi::dbObjectMode; - if (_version == 1) { - if (_platform == Common::kPlatformNES) { - gdi.decodeNESObject(ptr, xpos, ypos, width, height); - } - } // Sam & Max needs this to fix object-layering problems with // the inventory and conversation icons. if ((_version >= 7 || _gameId == GID_SAMNMAX) && getClass(od.obj_nr, kObjectClassIgnoreBoxes)) |