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

[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:
0b53e0b262 PETKA: fix crash when playing intro videos
a60c701bdf PETKA: fix lag when loading backgrounds


Commit: 0b53e0b262fc45db61d8d981c248b4932c37c6c2
    https://github.com/scummvm/scummvm/commit/0b53e0b262fc45db61d8d981c248b4932c37c6c2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-06T11:58:39+02:00

Commit Message:
PETKA: fix crash when playing intro videos

Changed paths:
    engines/petka/petka.cpp


diff --git a/engines/petka/petka.cpp b/engines/petka/petka.cpp
index a9bceeb8b98..8f5b4cca819 100644
--- a/engines/petka/petka.cpp
+++ b/engines/petka/petka.cpp
@@ -207,7 +207,9 @@ void PetkaEngine::playVideo(Common::SeekableReadStream *stream) {
 	}
 
 end:
-	_vsys->makeAllDirty();
+	if (_vsys) {
+		_vsys->makeAllDirty();
+	}
 	_videoDec.reset();
 }
 


Commit: a60c701bdfd43d22d7b4ac3204003fcb2076cec2
    https://github.com/scummvm/scummvm/commit/a60c701bdfd43d22d7b4ac3204003fcb2076cec2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-06T11:58:39+02:00

Commit Message:
PETKA: fix lag when loading backgrounds
bug #12075, #12076, #12077

Changed paths:
    engines/petka/q_manager.cpp


diff --git a/engines/petka/q_manager.cpp b/engines/petka/q_manager.cpp
index 7251f66da31..eb7567c39de 100644
--- a/engines/petka/q_manager.cpp
+++ b/engines/petka/q_manager.cpp
@@ -117,7 +117,8 @@ Graphics::Surface *QManager::getSurface(uint32 id) {
 		return nullptr;
 	}
 
-	Graphics::Surface *s = loadBitmapSurface(*stream);
+	Common::ScopedPtr<Common::SeekableReadStream> preloaded_stream (stream->readStream(stream->size()));
+	Graphics::Surface *s = loadBitmapSurface(*preloaded_stream);
 	if (s) {
 		QResource &res = _resourceMap.getOrCreateVal(id);
 		res.type = QResource::kSurface;