diff options
author | Filippos Karapetis | 2009-08-25 09:02:00 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-08-25 09:02:00 +0000 |
commit | eb83ca267da2393c27835548aa86d931bd760add (patch) | |
tree | 33efaf3a7de46983a75fa1b71798d8d33f5118e1 /engines | |
parent | 7e577673049743a6cefd08df303e20d230b6d95e (diff) | |
download | scummvm-rg350-eb83ca267da2393c27835548aa86d931bd760add.tar.gz scummvm-rg350-eb83ca267da2393c27835548aa86d931bd760add.tar.bz2 scummvm-rg350-eb83ca267da2393c27835548aa86d931bd760add.zip |
Silenced warnings (thanks wjp)
svn-id: r43725
Diffstat (limited to 'engines')
-rw-r--r-- | engines/sci/detection.cpp | 1 | ||||
-rw-r--r-- | engines/sci/engine/vm.cpp | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 5971d1d384..d8097f9b86 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -341,7 +341,6 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl } ResourceManager *resourceManager = new ResourceManager(fslist); - SciVersion version = resourceManager->sciVersion(); ViewType gameViews = resourceManager->getViewType(); // Have we identified the game views? If not, stop here diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 67b15cd212..33682325d8 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -952,12 +952,8 @@ void run_vm(EngineState *s, int restoring) { xs_new = &(s->_executionStack.back()); s->_executionStackPosChanged = true; - { - bool oldScriptHeader = (s->segmentManager->sciVersion() == SCI_VERSION_0_EARLY); - if (!oldScriptHeader) - scriptState.restAdjust = s->restAdjust; - } - + if (!oldScriptHeader) + scriptState.restAdjust = s->restAdjust; } break; |