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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Aug 26 01:15:18 CEST 2009


Revision: 43744
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43744&view=rev
Author:   thebluegr
Date:     2009-08-25 23:15:18 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
Fixed compilation when ENABLE_SCI32 is not set

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

Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp	2009-08-25 23:11:17 UTC (rev 43743)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp	2009-08-25 23:15:18 UTC (rev 43744)
@@ -27,6 +27,8 @@
 
 namespace Sci {
 
+#ifdef ENABLE_SCI32
+
 static const char *sci2_default_knames[] = {
 	/*0x00*/ "Load",
 	/*0x01*/ "UnLoad",
@@ -356,4 +358,6 @@
 	_kernelNames = Common::StringList(sci21_default_knames, ARRAYSIZE(sci21_default_knames));
 }
 
+#endif	// ENABLE_SCI32
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-08-25 23:11:17 UTC (rev 43743)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-08-25 23:15:18 UTC (rev 43744)
@@ -1587,7 +1587,11 @@
 	}
 
 	// Set view type
-	if (viewCompression == kCompDCL || viewCompression == kCompSTACpack) {
+	if (viewCompression == kCompDCL 
+#ifdef ENABLE_SCI32
+		|| viewCompression == kCompSTACpack
+#endif
+		) {
 		// SCI1.1 VGA views
 		_viewType = kViewVga11;
 	} else {


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