diff options
Diffstat (limited to 'engines/sherlock/scalpel')
-rw-r--r-- | engines/sherlock/scalpel/scalpel_map.cpp | 8 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_people.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_scene.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_talk.cpp | 2 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_user_interface.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/sherlock/scalpel/scalpel_map.cpp b/engines/sherlock/scalpel/scalpel_map.cpp index bde56c874d..2177fc5885 100644 --- a/engines/sherlock/scalpel/scalpel_map.cpp +++ b/engines/sherlock/scalpel/scalpel_map.cpp @@ -142,7 +142,7 @@ int ScalpelMap::show() { // Load the entire map ImageFile *bigMap = NULL; - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { // PC bigMap = new ImageFile("bigmap.vgs"); screen.setPalette(bigMap->_palette); @@ -154,7 +154,7 @@ int ScalpelMap::show() { // Load need sprites setupSprites(); - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { screen._backBuffer1.blitFrom((*bigMap)[0], Common::Point(-_bigPos.x, -_bigPos.y)); screen._backBuffer1.blitFrom((*bigMap)[1], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y)); screen._backBuffer1.blitFrom((*bigMap)[2], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y)); @@ -220,7 +220,7 @@ int ScalpelMap::show() { // Map has scrolled, so redraw new map view changed = false; - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { screen._backBuffer1.blitFrom((*bigMap)[0], Common::Point(-_bigPos.x, -_bigPos.y)); screen._backBuffer1.blitFrom((*bigMap)[1], Common::Point(-_bigPos.x, SHERLOCK_SCREEN_HEIGHT - _bigPos.y)); screen._backBuffer1.blitFrom((*bigMap)[2], Common::Point(SHERLOCK_SCREEN_WIDTH - _bigPos.x, -_bigPos.y)); @@ -300,7 +300,7 @@ void ScalpelMap::setupSprites() { Scene &scene = *_vm->_scene; _savedPos.x = -1; - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { // PC _mapCursors = new ImageFile("omouse.vgs"); _shapes = new ImageFile("mapicon.vgs"); diff --git a/engines/sherlock/scalpel/scalpel_people.cpp b/engines/sherlock/scalpel/scalpel_people.cpp index 3c02eb4d83..af2bdc0256 100644 --- a/engines/sherlock/scalpel/scalpel_people.cpp +++ b/engines/sherlock/scalpel/scalpel_people.cpp @@ -452,7 +452,7 @@ bool ScalpelPeople::loadWalk() { if (_data[HOLMES]->_walkLoaded) { return false; } else { - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { _data[HOLMES]->_images = new ImageFile("walk.vgs"); } else { // Load walk.anim on 3DO, which is a cel animation file diff --git a/engines/sherlock/scalpel/scalpel_scene.cpp b/engines/sherlock/scalpel/scalpel_scene.cpp index af7090332c..1bda827260 100644 --- a/engines/sherlock/scalpel/scalpel_scene.cpp +++ b/engines/sherlock/scalpel/scalpel_scene.cpp @@ -582,7 +582,7 @@ int ScalpelScene::startCAnim(int cAnimNum, int playRate) { } // Now load the resource as an image - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { cObj._images = new ImageFile(fname); } else { cObj._images = new ImageFile3DO(fname, kImageFile3DOType_RoomFormat); diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp index 64904e0a46..5a2427cac2 100644 --- a/engines/sherlock/scalpel/scalpel_talk.cpp +++ b/engines/sherlock/scalpel/scalpel_talk.cpp @@ -543,7 +543,7 @@ void ScalpelTalk::talkWait(const byte *&str) { } void ScalpelTalk::talk3DOMovieTrigger(int subIndex) { - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { // No 3DO? No movie! return; } diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp index 14461cffab..a4a898df02 100644 --- a/engines/sherlock/scalpel/scalpel_user_interface.cpp +++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp @@ -67,7 +67,7 @@ const char *const PRESS_KEY_TO_CONTINUE = "Press any Key to Continue."; ScalpelUserInterface::ScalpelUserInterface(SherlockEngine *vm): UserInterface(vm) { if (_vm->_interactiveFl) { - if (_vm->getPlatform() != Common::kPlatform3DO) { + if (!IS_3DO) { // PC _controls = new ImageFile("menu.all"); _controlPanel = new ImageFile("controls.vgs"); |