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

[bluegr]

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:
f238ed18ec SCI: Fix compilation when SCI32 is not enabled


Commit: f238ed18ec24debf7f1b8713abf1ce3ebbeeaec3
    https://github.com/scummvm/scummvm/commit/f238ed18ec24debf7f1b8713abf1ce3ebbeeaec3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-08-23T01:48:06+03:00

Commit Message:
SCI: Fix compilation when SCI32 is not enabled

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



diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 70a1d69..f2a3c6b 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -514,9 +514,12 @@ reg_t kMacPlatform(EngineState *s, int argc, reg_t *argv) {
 		// In SCI1, its usage is still unknown
 		// In SCI1.1, it's NOP
 		// In SCI32, it's used for remapping cursor ID's
+#ifdef ENABLE_SCI32
 		if (getSciVersion() >= SCI_VERSION_2_1_EARLY) // Set Mac cursor remap
 			g_sci->_gfxCursor32->setMacCursorRemapList(argc - 1, argv + 1);
-		else if (getSciVersion() != SCI_VERSION_1_1)
+		else
+#endif
+		if (getSciVersion() != SCI_VERSION_1_1)
 			warning("Unknown SCI1 kMacPlatform(0) call");
 		break;
 	case 4: // Handle icon bar code