[Scummvm-git-logs] scummvm master -> f302cd7c57cce6eff6bda918f93f833f67072c4d

[sev-]

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

Summary:
3133cf1c73 PINK: Dispatch webpage menu items to a stub function
77a4ab29cb PINK: Implement openLocalWebPage for real
ada7ed7114 PINK: Mark openLocalWebPage as const
f302cd7c57 PINK: File scheme still requires a hostname, even if it's the empty string


Commit: 3133cf1c73d2caaa9fcc638d480fabadbb491819
    https://github.com/scummvm/scummvm/commit/3133cf1c73d2caaa9fcc638d480fabadbb491819
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-02-13T08:59:08+01:00

Commit Message:
PINK: Dispatch webpage menu items to a stub function

Changed paths:
    engines/pink/gui.cpp
    engines/pink/pink.h


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 9988587..309746c 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -338,10 +338,30 @@ void PinkEngine::executeMenuCommand(uint id) {
 		_actor->loadPDA("SIBOVER");
 		break;
 
+	case kShowGameWebPage:
+		openLocalWebPage("PINK.HTM");
+		break;
+	case kShowTechSupport:
+		openLocalWebPage("SUPPORT.HTM");
+		break;
+	case kShowWinnnerPage:
+		openLocalWebPage("WINNER.HTM");
+		break;
+	case kShowWanderLustWebPage:
+		openLocalWebPage("LUST.HTM");
+		break;
+	case kShowOnlineHints:
+		openLocalWebPage("HINTS.HTM");
+		break;
+
 	default:
 		warning("Unprocessed command id %d", id);
 		break;
 	}
 }
 
+void PinkEngine::openLocalWebPage(const Common::String &pageName) {
+	warning("Trying to open local webpage \"%s\", but webpage opening isn't implemented yet",pageName.c_str());
+}
+
 } // End of namespace Pink
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index 3d69e39..d67cd44 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -143,6 +143,8 @@ private:
 	void addModule(const Common::String &moduleName);
 	void removeModule();
 
+	void openLocalWebPage(const Common::String &pageName);
+
 private:
 	Console *_console;
 	Common::RandomSource _rnd;


Commit: 77a4ab29cbbdcd4cc481bb6255942ff2748c36ab
    https://github.com/scummvm/scummvm/commit/77a4ab29cbbdcd4cc481bb6255942ff2748c36ab
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-02-13T08:59:08+01:00

Commit Message:
PINK: Implement openLocalWebPage for real

Changed paths:
    engines/pink/gui.cpp


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 309746c..7d1c82a 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -20,6 +20,8 @@
  *
  */
 
+#include "common/config-manager.h"
+
 #include "graphics/macgui/macwindowmanager.h"
 #include "graphics/macgui/macmenu.h"
 
@@ -361,7 +363,10 @@ void PinkEngine::executeMenuCommand(uint id) {
 }
 
 void PinkEngine::openLocalWebPage(const Common::String &pageName) {
-	warning("Trying to open local webpage \"%s\", but webpage opening isn't implemented yet",pageName.c_str());
+	Common::FSNode gameFolder= Common::FSNode(ConfMan.get("path"));
+	Common::FSNode filePath = gameFolder.getChild("INSTALL").getChild(pageName);
+	Common::String fullUrl = Common::String::format("file://%s", filePath.getPath().c_str());
+	_system->openUrl(fullUrl);
 }
 
 } // End of namespace Pink


Commit: ada7ed71148e985fecae85b4bb0e6a3af8e28b98
    https://github.com/scummvm/scummvm/commit/ada7ed71148e985fecae85b4bb0e6a3af8e28b98
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-02-13T08:59:08+01:00

Commit Message:
PINK: Mark openLocalWebPage as const

Changed paths:
    engines/pink/gui.cpp
    engines/pink/pink.h


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 7d1c82a..086560f 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -362,7 +362,7 @@ void PinkEngine::executeMenuCommand(uint id) {
 	}
 }
 
-void PinkEngine::openLocalWebPage(const Common::String &pageName) {
+void PinkEngine::openLocalWebPage(const Common::String &pageName) const {
 	Common::FSNode gameFolder= Common::FSNode(ConfMan.get("path"));
 	Common::FSNode filePath = gameFolder.getChild("INSTALL").getChild(pageName);
 	Common::String fullUrl = Common::String::format("file://%s", filePath.getPath().c_str());
diff --git a/engines/pink/pink.h b/engines/pink/pink.h
index d67cd44..d9a30bd 100644
--- a/engines/pink/pink.h
+++ b/engines/pink/pink.h
@@ -143,7 +143,7 @@ private:
 	void addModule(const Common::String &moduleName);
 	void removeModule();
 
-	void openLocalWebPage(const Common::String &pageName);
+	void openLocalWebPage(const Common::String &pageName) const;
 
 private:
 	Console *_console;


Commit: f302cd7c57cce6eff6bda918f93f833f67072c4d
    https://github.com/scummvm/scummvm/commit/f302cd7c57cce6eff6bda918f93f833f67072c4d
Author: Henrik "Henke37" Andersson (henke at henke37.cjb.net)
Date: 2020-02-13T08:59:08+01:00

Commit Message:
PINK: File scheme still requires a hostname, even if it's the empty string

Changed paths:
    engines/pink/gui.cpp


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 086560f..fccd0f8 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -365,7 +365,7 @@ void PinkEngine::executeMenuCommand(uint id) {
 void PinkEngine::openLocalWebPage(const Common::String &pageName) const {
 	Common::FSNode gameFolder= Common::FSNode(ConfMan.get("path"));
 	Common::FSNode filePath = gameFolder.getChild("INSTALL").getChild(pageName);
-	Common::String fullUrl = Common::String::format("file://%s", filePath.getPath().c_str());
+	Common::String fullUrl = Common::String::format("file:///%s", filePath.getPath().c_str());
 	_system->openUrl(fullUrl);
 }