diff options
| -rw-r--r-- | engines/sci/engine/features.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/graphics/screen_item32.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/resource.cpp | 3 | ||||
| -rw-r--r-- | engines/sci/sound/soundcmd.cpp | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp index 03e8019753..c4e23b59aa 100644 --- a/engines/sci/engine/features.cpp +++ b/engines/sci/engine/features.cpp @@ -675,7 +675,6 @@ MoveCountType GameFeatures::detectMoveCountType() { } else { if (!autoDetectMoveCountType()) { error("Move count autodetection failed"); - _moveCountType = kIncrementMoveCount; // Most games do this, so best guess } } diff --git a/engines/sci/graphics/screen_item32.cpp b/engines/sci/graphics/screen_item32.cpp index cac643edf9..8e4f713eb6 100644 --- a/engines/sci/graphics/screen_item32.cpp +++ b/engines/sci/graphics/screen_item32.cpp @@ -361,7 +361,7 @@ void ScreenItem::calcRects(const Plane &plane) { const Ratio scriptToScreenX = Ratio(screenWidth, scriptWidth); const Ratio scriptToScreenY = Ratio(screenHeight, scriptHeight); - if (/* TODO: dword_C6288 */ false && _celInfo.type == kCelTypePic) { + if (/* TODO: dword_C6288 */ (false) && _celInfo.type == kCelTypePic) { _scaledPosition.x = _position.x; _scaledPosition.y = _position.y; } else { diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 54484698d6..b73b14b125 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -2615,9 +2615,6 @@ void ResourceManager::detectSciVersion() { } error("Failed to accurately determine SCI version"); - // No parser, we assume SCI_VERSION_01. - s_sciVersion = SCI_VERSION_01; - return; } // New decompressors. It's either SCI_VERSION_1_EGA_ONLY or SCI_VERSION_1_EARLY. diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp index 280015f222..57e7516b49 100644 --- a/engines/sci/sound/soundcmd.cpp +++ b/engines/sci/sound/soundcmd.cpp @@ -678,6 +678,7 @@ reg_t SoundCommandParser::kDoSoundStopAll(EngineState *s, int argc, reg_t *argv) // this doesn't make sense, so i disable it for now return s->r_acc; +#if 0 Common::StackLock(_music->_mutex); const MusicList::iterator end = _music->getPlayListEnd(); @@ -693,6 +694,7 @@ reg_t SoundCommandParser::kDoSoundStopAll(EngineState *s, int argc, reg_t *argv) _music->soundStop(*i); } return s->r_acc; +#endif } reg_t SoundCommandParser::kDoSoundSetVolume(EngineState *s, int argc, reg_t *argv) { |