diff options
| author | Max Horn | 2005-04-20 18:21:30 +0000 |
|---|---|---|
| committer | Max Horn | 2005-04-20 18:21:30 +0000 |
| commit | c46ea8bc407e60224500e6d6efa08d2ddd6f318e (patch) | |
| tree | 4800c3beb69f0bfe6d1c6f456e8f5ea58780b6f6 /scumm/object.cpp | |
| parent | a18d4d5c2f6dbc985c5b3628228bb6078cf781bb (diff) | |
| download | scummvm-rg350-c46ea8bc407e60224500e6d6efa08d2ddd6f318e.tar.gz scummvm-rg350-c46ea8bc407e60224500e6d6efa08d2ddd6f318e.tar.bz2 scummvm-rg350-c46ea8bc407e60224500e6d6efa08d2ddd6f318e.zip | |
Replaced the platform specific GF_FOO switches (using _platform instead now)
svn-id: r17716
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 0d48f3efea..9e350e567d 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -352,7 +352,7 @@ int ScummEngine::findObject(int x, int y) { } while ((_objs[b].state & mask) == a); } - if ((_features & GF_NES) && (_userState & 0x40) && (v2_mouseover_box >= 0) && + if ((_platform == Common::kPlatformNES) && (_userState & 0x40) && (v2_mouseover_box >= 0) && (v2_mouseover_box < 4)) return findInventory(VAR(VAR_EGO), v2_mouseover_box + _inventoryOffset + 1); @@ -487,7 +487,7 @@ void ScummEngine::drawObject(int obj, int arg) { byte flags = od.flags | Gdi::dbObjectMode; if (_version == 1) { - if (_features & GF_NES) { + if (_platform == Common::kPlatformNES) { gdi.decodeNESObject(ptr, xpos, ypos, width, height); } } |