[Scummvm-git-logs] scummvm master -> 7414258dff92658f1163b9a0e762677021dedee3

sev- sev at scummvm.org
Sat Sep 14 22:23:32 CEST 2019


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:
b2fff44647 NETWORKING: Clarify message when web server resources are not available
7414258dff JANITORIAL: Fix indentation


Commit: b2fff446471b8a3cd525fe3478731b76c0e98d2e
    https://github.com/scummvm/scummvm/commit/b2fff446471b8a3cd525fe3478731b76c0e98d2e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-14T22:23:04+02:00

Commit Message:
NETWORKING: Clarify message when web server resources are not available

Changed paths:
    backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp


diff --git a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp
index 55b7a62..a5719ba 100644
--- a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp
+++ b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp
@@ -56,7 +56,7 @@ void FilesAjaxPageHandler::handle(Client &client) {
 	// load stylish response page from the archive
 	Common::SeekableReadStream *const stream = HandlerUtils::getArchiveFile(FILES_PAGE_NAME);
 	if (stream == nullptr) {
-		HandlerUtils::setFilesManagerErrorMessageHandler(client, _("The page is not available without the resources."));
+		HandlerUtils::setFilesManagerErrorMessageHandler(client, _("The page is not available without the resources. Make sure file wwwroot.zip from ScummVM distribution is available in extrapath."));
 		return;
 	}
 


Commit: 7414258dff92658f1163b9a0e762677021dedee3
    https://github.com/scummvm/scummvm/commit/7414258dff92658f1163b9a0e762677021dedee3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-14T22:23:04+02:00

Commit Message:
JANITORIAL: Fix indentation

Changed paths:
    base/main.cpp


diff --git a/base/main.cpp b/base/main.cpp
index ccd213e..a9602e0 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -162,11 +162,11 @@ static Common::Error runGame(const Plugin *plugin, OSystem &system, const Common
 #endif
 
 	// Verify that the game path refers to an actual directory
-        if (!dir.exists()) {
+	if (!dir.exists()) {
 		err = Common::kPathDoesNotExist;
-        } else if (!dir.isDirectory()) {
+	} else if (!dir.isDirectory()) {
 		err = Common::kPathNotDirectory;
-        }
+	}
 
 	// Create the game engine
 	if (err.getCode() == Common::kNoError) {





More information about the Scummvm-git-logs mailing list