[Scummvm-git-logs] scummvm master -> 63a87ac1f7f890edfd3b2b183260b4859dabc6b2

csnover csnover at users.noreply.github.com
Mon May 22 02:38:16 CEST 2017


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

Summary:
2d3c86187f MACOSX: Fix flipped return value of openUrl
63a87ac1f7 SCI32: Fix return value of kWebConnect


Commit: 2d3c86187f5efbb096c566cb223ce4e9726aa5b2
    https://github.com/scummvm/scummvm/commit/2d3c86187f5efbb096c566cb223ce4e9726aa5b2
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-21T19:37:14-05:00

Commit Message:
MACOSX: Fix flipped return value of openUrl

Changed paths:
    backends/platform/sdl/macosx/macosx.cpp


diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 8669bf6..7e6ef95 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -137,7 +137,7 @@ bool OSystem_MacOSX::openUrl(const Common::String &url) {
 	CFURLRef urlRef = CFURLCreateWithBytes (NULL, (UInt8*)url.c_str(), url.size(), kCFStringEncodingASCII, NULL);
 	OSStatus err = LSOpenCFURLRef(urlRef, NULL);
 	CFRelease(urlRef);
-	return err != noErr;
+	return err == noErr;
 }
 
 Common::String OSystem_MacOSX::getSystemLanguage() const {


Commit: 63a87ac1f7f890edfd3b2b183260b4859dabc6b2
    https://github.com/scummvm/scummvm/commit/63a87ac1f7f890edfd3b2b183260b4859dabc6b2
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-05-21T19:37:42-05:00

Commit Message:
SCI32: Fix return value of kWebConnect

On macOS, the return code from OSystem::openUrl was the opposite
of what it was supposed to be; it is now fixed, so this caller
needs to be fixed too.

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


diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 31b9f77..7650d2f 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -656,7 +656,7 @@ reg_t kPlatform32(EngineState *s, int argc, reg_t *argv) {
 reg_t kWebConnect(EngineState *s, int argc, reg_t *argv) {
 	const Common::String baseUrl = "https://web.archive.org/web/1996/";
 	const Common::String gameUrl = argc > 0 ? s->_segMan->getString(argv[0]) : "http://www.sierra.com";
-	return make_reg(0, !g_system->openUrl(baseUrl + gameUrl));
+	return make_reg(0, g_system->openUrl(baseUrl + gameUrl));
 }
 
 reg_t kWinExec(EngineState *s, int argc, reg_t *argv) {





More information about the Scummvm-git-logs mailing list