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

SCI: Remove dead code

Browse source
This commit is contained in:
Colin Snover 2017-09-10 22:01:33 -05:00
parent 6e2f18c498
commit 200c8c442b
4 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/sci/engine/features.cpp
View file

@ -675,7 +675,6 @@ MoveCountType GameFeatures::detectMoveCountType() {
} else { } else {
if (!autoDetectMoveCountType()) { if (!autoDetectMoveCountType()) {
error("Move count autodetection failed"); error("Move count autodetection failed");
_moveCountType = kIncrementMoveCount; // Most games do this, so best guess
} }
} }

2
engines/sci/graphics/screen_item32.cpp
View file

@ -361,7 +361,7 @@ void ScreenItem::calcRects(const Plane &plane) {
const Ratio scriptToScreenX = Ratio(screenWidth, scriptWidth); const Ratio scriptToScreenX = Ratio(screenWidth, scriptWidth);
const Ratio scriptToScreenY = Ratio(screenHeight, scriptHeight); 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.x = _position.x;
_scaledPosition.y = _position.y; _scaledPosition.y = _position.y;
} else { } else {

3
engines/sci/resource.cpp
View file

@ -2615,9 +2615,6 @@ void ResourceManager::detectSciVersion() {
} }
error("Failed to accurately determine SCI version"); 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. // New decompressors. It's either SCI_VERSION_1_EGA_ONLY or SCI_VERSION_1_EARLY.

2
engines/sci/sound/soundcmd.cpp
View file

@ -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 // this doesn't make sense, so i disable it for now
return s->r_acc; return s->r_acc;
#if 0
Common::StackLock(_music->_mutex); Common::StackLock(_music->_mutex);
const MusicList::iterator end = _music->getPlayListEnd(); const MusicList::iterator end = _music->getPlayListEnd();
@ -693,6 +694,7 @@ reg_t SoundCommandParser::kDoSoundStopAll(EngineState *s, int argc, reg_t *argv)
_music->soundStop(*i); _music->soundStop(*i);
} }
return s->r_acc; return s->r_acc;
#endif
} }
reg_t SoundCommandParser::kDoSoundSetVolume(EngineState *s, int argc, reg_t *argv) { reg_t SoundCommandParser::kDoSoundSetVolume(EngineState *s, int argc, reg_t *argv) {