aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2015-06-16 09:59:27 +0300
committerFilippos Karapetis2015-06-16 09:59:27 +0300
commit25e729efe0dc9cedf31bbedc12c393de756ed9d7 (patch)
tree7e9fe2fc9105f83fedb227cfc639200988346cae
parentbd75fc1d118b96a4951b69b0a06a1f2e3e47d4b8 (diff)
downloadscummvm-rg350-25e729efe0dc9cedf31bbedc12c393de756ed9d7.tar.gz
scummvm-rg350-25e729efe0dc9cedf31bbedc12c393de756ed9d7.tar.bz2
scummvm-rg350-25e729efe0dc9cedf31bbedc12c393de756ed9d7.zip
SHERLOCK: Introduce a IS_3DO define
This is similar to IS_SERRATED_SCALPEL and IS_ROSE_TATTOO, and makes the code a bit easier to read
-rw-r--r--engines/sherlock/journal.cpp4
-rw-r--r--engines/sherlock/music.cpp2
-rw-r--r--engines/sherlock/objects.cpp2
-rw-r--r--engines/sherlock/sherlock.h1
-rw-r--r--engines/sherlock/sound.cpp2
5 files changed, 6 insertions, 5 deletions
diff --git a/engines/sherlock/journal.cpp b/engines/sherlock/journal.cpp
index 98ac320108..0fd094741d 100644
--- a/engines/sherlock/journal.cpp
+++ b/engines/sherlock/journal.cpp
@@ -71,7 +71,7 @@ void Journal::record(int converseNum, int statementNum, bool replyOnly) {
int saveIndex = _index;
int saveSub = _sub;
- if (_vm->getPlatform() == Common::kPlatform3DO) {
+ if (IS_3DO) {
// there seems to be no journal in the 3DO version
return;
}
@@ -123,7 +123,7 @@ void Journal::loadJournalLocations() {
_locations.clear();
- if (_vm->getPlatform() == Common::kPlatform3DO) {
+ if (IS_3DO) {
// 3DO: storage of locations is currently unknown TODO
return;
}
diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 9682714fcf..1c92682e69 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -209,7 +209,7 @@ Music::Music(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
_midiMusicData = NULL;
_midiMusicDataSize = 0;
- if (_vm->getPlatform() == Common::kPlatform3DO) {
+ if (IS_3DO) {
// 3DO - uses digital samples for music
_musicOn = true;
return;
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 6113571501..d838f32b31 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -597,7 +597,7 @@ void Sprite::setImageFrame() {
ImageFile *images = _altSeq ? _altImages : _images;
assert(images);
- if (_vm->getPlatform() == Common::kPlatform3DO) {
+ if (IS_3DO) {
// only do this to the image-array with 110 entries
// map uses another image-array and this code
if (images->size() == 110) {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index f06ee5e30a..d0e7bf2e2c 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -219,6 +219,7 @@ public:
#define IS_ROSE_TATTOO (_vm->getGameID() == GType_RoseTattoo)
#define IS_SERRATED_SCALPEL (_vm->getGameID() == GType_SerratedScalpel)
+#define IS_3DO (_vm->getPlatform() == Common::kPlatform3DO)
} // End of namespace Sherlock
diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 70d42a737c..32fa99b223 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -64,7 +64,7 @@ Sound::Sound(SherlockEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer) {
_soundOn = true;
_speechOn = true;
- if (_vm->getPlatform() == Common::kPlatform3DO) {
+ if (IS_3DO) {
// 3DO: we don't need to prepare anything for sound
return;
}