[Scummvm-cvs-logs] SF.net SVN: scummvm:[54376] scummvm/trunk/engines/sci/engine/vm.cpp

[anotherguest at users.sourceforge.net]

Revision: 54376
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54376&view=rev
Author:   anotherguest
Date:     2010-11-19 13:03:31 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
SCI: Only handle seg_type_string if ENABLE_SCI32 is defined

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2010-11-19 12:57:38 UTC (rev 54375)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2010-11-19 13:03:31 UTC (rev 54376)
@@ -640,7 +640,7 @@
 	case SEG_TYPE_DYNMEM:
 		base.offset += offset;
 		return base;
-
+#ifdef ENABLE_SCI32
 	case SEG_TYPE_STRING: {
 		// We need to copy over the string into a new one
 		// Make sure that the offset is positive
@@ -664,7 +664,7 @@
 
 		return newStringAddr;
 	}
-
+#endif
 	default:
 		// FIXME: Changed this to warning, because iceman does this during dancing with girl.
 		// Investigate why that is so and either fix the underlying issue or implement a more


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