libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: Introduce a IS_3DO define

Browse Source 
This is similar to IS_SERRATED_SCALPEL and IS_ROSE_TATTOO, and makes
the code a bit easier to read
This commit is contained in:
Filippos Karapetis 2015-06-16 09:59:27 +03:00
parent bd75fc1d11
commit 25e729efe0
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sherlock/journal.cpp
View File

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

2
engines/sherlock/music.cpp
View File

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

2
engines/sherlock/objects.cpp
View File

@ -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) {

1
engines/sherlock/sherlock.h
View File

@ -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

2
engines/sherlock/sound.cpp
View File

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