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

[criezy]

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:
3d36f38221 AGS: Allow showing fps using config file
bbff87e74e NETWORKING: Fix unknow key error when using local server


Commit: 3d36f38221bc130f8ba7b755223f1e56e5afe9b6
    https://github.com/scummvm/scummvm/commit/3d36f38221bc130f8ba7b755223f1e56e5afe9b6
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-31T22:01:23+01:00

Commit Message:
AGS: Allow showing fps using config file

To show the fps in ags games you can now add display_fps=true
in the ScummVM config file.

Changed paths:
    engines/ags/ags.cpp


diff --git a/engines/ags/ags.cpp b/engines/ags/ags.cpp
index 1c814df17f..ea686a9927 100644
--- a/engines/ags/ags.cpp
+++ b/engines/ags/ags.cpp
@@ -135,6 +135,9 @@ Common::Error AGSEngine::run() {
 #endif
 	_G(debug_flags) = 0;
 
+	if (ConfMan.hasKey("display_fps"))
+		_G(display_fps) = ConfMan.getBool("display_fps") ? AGS3::kFPS_Forced : AGS3::kFPS_Hide;
+
 	AGS3::ConfigTree startup_opts;
 	int res = AGS3::main_process_cmdline(startup_opts, ARGC, ARGV);
 	if (res != 0)


Commit: bbff87e74e224f0767d45e5ed788403d584abc8a
    https://github.com/scummvm/scummvm/commit/bbff87e74e224f0767d45e5ed788403d584abc8a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-31T22:01:23+01:00

Commit Message:
NETWORKING: Fix unknow key error when using local server

Changed paths:
    backends/networking/sdl_net/reader.cpp


diff --git a/backends/networking/sdl_net/reader.cpp b/backends/networking/sdl_net/reader.cpp
index 46fb21a47a..0c700bc709 100644
--- a/backends/networking/sdl_net/reader.cpp
+++ b/backends/networking/sdl_net/reader.cpp
@@ -442,7 +442,7 @@ Common::String Reader::path() const { return _path; }
 
 Common::String Reader::query() const { return _query; }
 
-Common::String Reader::queryParameter(Common::String name) const { return _queryParameters[name]; }
+Common::String Reader::queryParameter(Common::String name) const { return _queryParameters.getValOrDefault(name); }
 
 Common::String Reader::anchor() const { return _anchor; }