[Scummvm-git-logs] scummvm master -> 50fdf4bcead4d3d52a0b0f1a4b91b71b992f3a51

[whiterandrek]

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:
50acebd675 PETKA: sync sound settings on start
50fdf4bcea PETKA: fix crash when loading room from game map


Commit: 50acebd67556fb4e0036d32ca0e51790e8ed864f
    https://github.com/scummvm/scummvm/commit/50acebd67556fb4e0036d32ca0e51790e8ed864f
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-08T20:04:50+02:00

Commit Message:
PETKA: sync sound settings on start

Changed paths:
    engines/petka/petka.cpp


diff --git a/engines/petka/petka.cpp b/engines/petka/petka.cpp
index 11a3112dce4..a577ac4aa40 100644
--- a/engines/petka/petka.cpp
+++ b/engines/petka/petka.cpp
@@ -72,6 +72,7 @@ Common::Error PetkaEngine::run() {
 	debug("PetkaEngine::run");
 	const Graphics::PixelFormat format(2, 5, 6, 5, 0, 11, 5, 0, 0);
 	initGraphics(640, 480, &format);
+	syncSoundSettings();
 
 	const char *const videos[] = {"buka.avi", "skif.avi", "adv.avi"};
 	for (uint i = 0; i < sizeof(videos) / sizeof(char *); ++i) {


Commit: 50fdf4bcead4d3d52a0b0f1a4b91b71b992f3a51
    https://github.com/scummvm/scummvm/commit/50fdf4bcead4d3d52a0b0f1a4b91b71b992f3a51
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-08T20:04:50+02:00

Commit Message:
PETKA: fix crash when loading room from game map

Changed paths:
    engines/petka/q_manager.cpp


diff --git a/engines/petka/q_manager.cpp b/engines/petka/q_manager.cpp
index 59f64663c58..1c264414315 100644
--- a/engines/petka/q_manager.cpp
+++ b/engines/petka/q_manager.cpp
@@ -82,7 +82,7 @@ void QManager::removeResource(uint32 id) {
 
 void QManager::clearUnneeded() {
 	for (auto it = _resourceMap.begin(); it != _resourceMap.end(); ++it) {
-		if (!_isAlwaysNeededMap.getVal(it->_key)) {
+		if (!_isAlwaysNeededMap.getValOrDefault(it->_key, false)) {
 			_resourceMap.erase(it);
 		}
 	}