[Scummvm-git-logs] scummvm master -> 9c039d027e7ffb9d83ae2e274147e2daf8d57ce2

[whiterandrek]

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

Summary:
461c76e062 PETKA: fix issue with scene offset when saving
d6a501304d PETKA: properly save when saving from dialog
9c039d027e PETKA: set save desc when saving from game menu


Commit: 461c76e062b7f044072bd62ee8560447ba70934d
    https://github.com/scummvm/scummvm/commit/461c76e062b7f044072bd62ee8560447ba70934d
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-10T22:06:47+02:00

Commit Message:
PETKA: fix issue with scene offset when saving

Changed paths:
    engines/petka/interfaces/main.cpp
    engines/petka/interfaces/sequence.cpp
    engines/petka/q_manager.cpp


diff --git a/engines/petka/interfaces/main.cpp b/engines/petka/interfaces/main.cpp
index 4daf91f67d9..7ae6609de8b 100644
--- a/engines/petka/interfaces/main.cpp
+++ b/engines/petka/interfaces/main.cpp
@@ -96,7 +96,12 @@ void InterfaceMain::loadRoom(int id, bool fromSave) {
 	sys->_room = room;
 	_objs.push_back(room);
 
-	resMgr->getSurface(room->_resourceId);
+	const auto *surface = resMgr->getSurface(room->_resourceId);
+	if (surface) {
+		assert(surface->w >= 640);
+		sys->_sceneWidth = MAX<int>(surface->w, 640);
+		sys->_xOffset = 0;
+	}
 
 	for (uint i = 0; i < info->attachedObjIds.size(); ++i) {
 		QMessageObject *obj = sys->findObject(info->attachedObjIds[i]);
diff --git a/engines/petka/interfaces/sequence.cpp b/engines/petka/interfaces/sequence.cpp
index 5b0b6a1822b..d5f98567ca7 100644
--- a/engines/petka/interfaces/sequence.cpp
+++ b/engines/petka/interfaces/sequence.cpp
@@ -48,6 +48,13 @@ void InterfaceSequence::start(int id) {
 	QObjectBG* bg = (QObjectBG *)g_vm->getQSystem()->findObject(id);
 	_objs.push_back(bg);
 
+	const auto *surface = g_vm->resMgr()->getSurface(bg->_resourceId);
+	if (surface) {
+		assert(surface->w >= 640);
+		g_vm->getQSystem()->_sceneWidth = MAX<int>(surface->w, 640);
+		g_vm->getQSystem()->_xOffset = 0;
+	}
+
 	playSound(bg->_musicId, Audio::Mixer::kMusicSoundType);
 	playSound(bg->_fxId, Audio::Mixer::kSFXSoundType);
 
diff --git a/engines/petka/q_manager.cpp b/engines/petka/q_manager.cpp
index 1c264414315..78d869be41e 100644
--- a/engines/petka/q_manager.cpp
+++ b/engines/petka/q_manager.cpp
@@ -30,7 +30,6 @@
 
 #include "petka/flc.h"
 #include "petka/q_manager.h"
-#include "petka/q_system.h"
 #include "petka/petka.h"
 
 namespace Petka {
@@ -121,10 +120,6 @@ Graphics::Surface *QManager::getSurface(uint32 id) {
 	Common::ScopedPtr<Common::SeekableReadStream> preloaded_stream (stream->readStream(stream->size()));
 	Graphics::Surface *s = loadBitmapSurface(*preloaded_stream);
 	if (s) {
-		assert(s->w >= 640);
-		g_vm->getQSystem()->_sceneWidth = MAX<int>(s->w, 640);
-		g_vm->getQSystem()->_xOffset = 0;
-
 		QResource &res = _resourceMap.getOrCreateVal(id);
 		res.type = QResource::kSurface;
 		res.surface = s;


Commit: d6a501304dad89bff6f6f17ccd89ddd5379ee26e
    https://github.com/scummvm/scummvm/commit/d6a501304dad89bff6f6f17ccd89ddd5379ee26e
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-10T22:10:45+02:00

Commit Message:
PETKA: properly save when saving from dialog

Changed paths:
    engines/petka/saveload.cpp


diff --git a/engines/petka/saveload.cpp b/engines/petka/saveload.cpp
index 83347d275c1..eb5f7f05432 100644
--- a/engines/petka/saveload.cpp
+++ b/engines/petka/saveload.cpp
@@ -64,6 +64,12 @@ Common::Error PetkaEngine::saveGameState(int slot, const Common::String &desci,
 	if (!out)
 		return Common::kUnknownError;
 
+	if (_qsystem->_currInterface == _qsystem->_panelInterface.get() ||
+		_qsystem->_currInterface == _qsystem->_saveLoadInterface.get())
+	{
+		_qsystem->goPrevInterface();
+	}
+
 	out->writeUint32BE(MKTAG('p', 'e', 't', 'k'));
 	out->writeByte(desci.size());
 	out->writeString(desci);


Commit: 9c039d027e7ffb9d83ae2e274147e2daf8d57ce2
    https://github.com/scummvm/scummvm/commit/9c039d027e7ffb9d83ae2e274147e2daf8d57ce2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-10T22:20:23+02:00

Commit Message:
PETKA: set save desc when saving from game menu

Changed paths:
    engines/petka/interfaces/save_load.cpp


diff --git a/engines/petka/interfaces/save_load.cpp b/engines/petka/interfaces/save_load.cpp
index f7105380eb5..53e5f07457c 100644
--- a/engines/petka/interfaces/save_load.cpp
+++ b/engines/petka/interfaces/save_load.cpp
@@ -113,7 +113,9 @@ void InterfaceSaveLoad::onLeftButtonDown(Common::Point p) {
 		}
 	} else {
 		stop();
-		_loadMode ? g_vm->loadGameState(_page * 6 + index) : g_vm->saveGameState(_page * 6 + index, "", false);
+
+		const uint slot = _page * 6 + index;
+		_loadMode ? g_vm->loadGameState(slot) : g_vm->saveGameState(slot, Common::String::format("Save %d", slot + 1), false);
 	}
 }