thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced the platform specific GF_FOO switches (using _platform instead now)

Browse source 
svn-id: r17716
This commit is contained in:
Max Horn 2005-04-20 18:21:30 +00:00
parent a18d4d5c2f
commit c46ea8bc40
29 changed files with 165 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scumm/object.cpp
View file

@ -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);
}
}