[Scummvm-cvs-logs] scummvm master -> c0163de084a29303972e52d2a659f7163795895f

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c0163de084 SCI: Fix build with SCI32 disabled.


Commit: c0163de084a29303972e52d2a659f7163795895f
    https://github.com/scummvm/scummvm/commit/c0163de084a29303972e52d2a659f7163795895f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-03-08T20:20:36+01:00

Commit Message:
SCI: Fix build with SCI32 disabled.

Regression from d4869218200a3dd165c2f1c156f3c1620c813241.

Changed paths:
    engines/sci/engine/vm_types.cpp



diff --git a/engines/sci/engine/vm_types.cpp b/engines/sci/engine/vm_types.cpp
index 00a67fc..d74e2b1 100644
--- a/engines/sci/engine/vm_types.cpp
+++ b/engines/sci/engine/vm_types.cpp
@@ -242,6 +242,7 @@ int reg_t::cmp(const reg_t right, bool treatAsUnsigned) const {
 		return lookForWorkaround(right, "comparison").toSint16();
 }
 
+#ifdef ENABLE_SCI32
 int reg_t::sci32Comparison(const reg_t right) const {
 	// In SCI32, MemIDs are normally indexes into the memory manager's handle
 	// list, but the engine reserves indexes at and above 20000 for objects
@@ -259,6 +260,7 @@ int reg_t::sci32Comparison(const reg_t right) const {
 
 	return getOffset() - right.getOffset();
 }
+#endif
 
 bool reg_t::pointerComparisonWithInteger(const reg_t right) const {
 	// This function handles the case where a script tries to compare a pointer