[Scummvm-git-logs] scummvm master -> 96f702e9a8f10aebd9402a8addb7ba820265bcde

csnover csnover at users.noreply.github.com
Mon Sep 4 04:39:29 CEST 2017


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:
96f702e9a8 SCI: Fix builds with SCI32 disabled


Commit: 96f702e9a8f10aebd9402a8addb7ba820265bcde
    https://github.com/scummvm/scummvm/commit/96f702e9a8f10aebd9402a8addb7ba820265bcde
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-03T21:39:22-05:00

Commit Message:
SCI: Fix builds with SCI32 disabled

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


diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index 0e4e35f..792605c 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -258,6 +258,7 @@ bool GuestAdditions::kGetEventHook() const {
 		return false;
 	}
 
+#ifdef ENABLE_SCI32
 	// Loading a save game while Lighthouse is still initializing itself will
 	// cause loading to fail if the save game contains a saved Robot state,
 	// because the Robot will try to restore itself into a game plane which does
@@ -272,6 +273,7 @@ bool GuestAdditions::kGetEventHook() const {
 			}
 		}
 	}
+#endif
 
 	return g_sci->_guestAdditions->restoreFromLauncher();
 }





More information about the Scummvm-git-logs mailing list