Merge branch 'pe_exe' of https://github.com/clone2727/scummvm into clone2727-pe_exe

1 files changed, 27 insertions, 3 deletions

diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index abc7f5304e..d75c98bcd4 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -120,21 +120,43 @@ Common::Error MohawkEngine_Riven::run() {
 	_externalScriptHandler = new RivenExternal(this);
 	_optionsDialog = new RivenOptionsDialog(this);
 	_scriptMan = new RivenScriptManager(this);
-	_cursor = new RivenCursorManager();
 
 	_rnd = new Common::RandomSource();
 	g_eventRec.registerRandomSource(*_rnd, "riven");
 
+	// Create the cursor manager
+	if (Common::File::exists("rivendmo.exe"))
+		_cursor = new PECursorManager("rivendmo.exe");
+	else if (Common::File::exists("riven.exe"))
+		_cursor = new PECursorManager("riven.exe");
+	else // last resort: try the Mac executable
+		_cursor = new MacCursorManager("Riven");
+
 	initVars();
 
+	// We need to have a cursor source, or the game won't work
+	if (!_cursor->hasSource()) {
+		Common::String message = "You're missing a Riven executable. The Windows executable is 'riven.exe' or 'rivendemo.exe'. ";
+		message += "Using the 'arcriven.z' installer file also works. In addition, you can use the Mac 'Riven' executable.";
+		GUIErrorMessage(message);
+		warning("%s", message.c_str());
+		return Common::kNoGameDataFoundError;
+	}
+
 	// Open extras.mhk for common images
 	_extrasFile = new MohawkArchive();
 
-	if (!_extrasFile->open("extras.mhk"))
-		error("Could not open extras.mhk");
+	// We need extras.mhk for inventory images, marble images, and credits images
+	if (!_extrasFile->open("extras.mhk")) {
+		Common::String message = "You're missing 'extras.mhk'. Using the 'arcriven.z' installer file also works.";
+		GUIErrorMessage(message);
+		warning("%s", message.c_str());
+		return Common::kNoGameDataFoundError;
+	}
 
 	// Start at main cursor
 	_cursor->setCursor(kRivenMainCursor);
+	_system->updateScreen();
 
 	// Let's begin, shall we?
 	if (getFeatures() & GF_DEMO) {
@@ -488,10 +510,12 @@ void MohawkEngine_Riven::checkHotspotChange() {
 		if (_curHotspot != hotspotIndex) {
 			_curHotspot = hotspotIndex;
 			_cursor->setCursor(_hotspots[_curHotspot].mouse_cursor);
+			_system->updateScreen();
 		}
 	} else {
 		_curHotspot = -1;
 		_cursor->setCursor(kRivenMainCursor);
+		_system->updateScreen();
 	}
 }