[Scummvm-cvs-logs] SF.net SVN: scummvm:[43725] scummvm/trunk/engines/sci

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Aug 25 11:02:00 CEST 2009


Revision: 43725
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43725&view=rev
Author:   thebluegr
Date:     2009-08-25 09:02:00 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Silenced warnings (thanks wjp)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2009-08-25 08:41:29 UTC (rev 43724)
+++ scummvm/trunk/engines/sci/detection.cpp	2009-08-25 09:02:00 UTC (rev 43725)
@@ -341,7 +341,6 @@
 	}
 
 	ResourceManager *resourceManager = new ResourceManager(fslist);
-	SciVersion version = resourceManager->sciVersion();
 	ViewType gameViews = resourceManager->getViewType();
 
 	// Have we identified the game views? If not, stop here

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-08-25 08:41:29 UTC (rev 43724)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-08-25 09:02:00 UTC (rev 43725)
@@ -952,12 +952,8 @@
 				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;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list