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

[whiterandrek]

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

Summary:
beb688cae2 PETKA: fixed saving scene width in map interface
be886c5212 PETKA: properly init background with scrolling
1e4d84e26d PETKA: added buttons for scroll debugging
b9c6f5fec7 PETKA: implemented drawing scrolling background


Commit: beb688cae2d7d9c47dba55ad22298e7b45755af6
    https://github.com/scummvm/scummvm/commit/beb688cae2d7d9c47dba55ad22298e7b45755af6
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T14:32:03+03:00

Commit Message:
PETKA: fixed saving scene width in map interface

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


diff --git a/engines/petka/interfaces/map.cpp b/engines/petka/interfaces/map.cpp
index bd452d1a9b..6f53f1ba01 100644
--- a/engines/petka/interfaces/map.cpp
+++ b/engines/petka/interfaces/map.cpp
@@ -73,8 +73,8 @@ void InterfaceMap::start(int id) {
 
 	initCursor(4901, 1, 0);
 
-	_savedXOffset = 0; // g_vm->getQSystem()->xOffset;
-	_savedSceneWidth = 640; // g_vm->getQSystem()->savedSceneWidth
+	_savedXOffset = sys->_xOffset;
+	_savedSceneWidth =  sys->_sceneWidth;
 
 	g_vm->getQSystem()->addMessageForAllObjects(kInitBG, 0, 0, 0, 0, bg);
 


Commit: be886c52129da97682e0c6c4a85eaa5639164bfe
    https://github.com/scummvm/scummvm/commit/be886c52129da97682e0c6c4a85eaa5639164bfe
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T14:32:39+03:00

Commit Message:
PETKA: properly init background with scrolling

Changed paths:
    engines/petka/q_manager.cpp


diff --git a/engines/petka/q_manager.cpp b/engines/petka/q_manager.cpp
index 28fa9f06e6..bf348ea523 100644
--- a/engines/petka/q_manager.cpp
+++ b/engines/petka/q_manager.cpp
@@ -30,6 +30,7 @@
 
 #include "petka/flc.h"
 #include "petka/q_manager.h"
+#include "petka/q_system.h"
 #include "petka/petka.h"
 
 namespace Petka {
@@ -144,6 +145,9 @@ Graphics::Surface *QManager::loadBitmap(uint32 id) {
 	Graphics::Surface *s = loadBitmapSurface(*stream);
 	if (s) {
 		s->convertToInPlace(g_system->getScreenFormat());
+		g_vm->getQSystem()->_sceneWidth = s->w;
+		g_vm->getQSystem()->_xOffset = 0;
+
 		QResource &res = _resourceMap.getVal(id);
 		res.type = QResource::kSurface;
 		res.surface = s;


Commit: 1e4d84e26defa986a8baeb6a7ad26a7a20069a9f
    https://github.com/scummvm/scummvm/commit/1e4d84e26defa986a8baeb6a7ad26a7a20069a9f
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T14:33:43+03:00

Commit Message:
PETKA: added buttons for scroll debugging

Changed paths:
    engines/petka/q_system.cpp


diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index a5cff6dc76..041440b3f0 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -364,6 +364,16 @@ void QSystem::onEvent(const Common::Event &event) {
 				_mainInterface->_dialog.fixCursor(); // Buggy in original
 			}
 			break;
+#if 1
+		case Common::KEYCODE_RIGHT:
+			_xOffset += 6;
+			g_vm->videoSystem()->makeAllDirty();
+			break;
+		case Common::KEYCODE_LEFT:
+			_xOffset -= 6;
+			g_vm->videoSystem()->makeAllDirty();
+			break;
+#endif
 		default:
 			break;
 		}


Commit: b9c6f5fec716f762670ba3f284180968edd2f61b
    https://github.com/scummvm/scummvm/commit/b9c6f5fec716f762670ba3f284180968edd2f61b
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-29T14:36:14+03:00

Commit Message:
PETKA: implemented drawing scrolling background

Changed paths:
    engines/petka/objects/object_bg.cpp


diff --git a/engines/petka/objects/object_bg.cpp b/engines/petka/objects/object_bg.cpp
index ef3fd39021..e6786e92c6 100644
--- a/engines/petka/objects/object_bg.cpp
+++ b/engines/petka/objects/object_bg.cpp
@@ -89,7 +89,9 @@ void QObjectBG::draw() {
 	if (s) {
 		const Common::List<Common::Rect> &dirty = g_vm->videoSystem()->rects();
 		for (Common::List<Common::Rect>::const_iterator it = dirty.begin(); it != dirty.end(); ++it) {
-			g_vm->videoSystem()->blitFrom(*s, *it, Common::Point(it->left, it->top));
+			Common::Rect srcRect = *it;
+			srcRect.translate(g_vm->getQSystem()->_xOffset, 0);
+			g_vm->videoSystem()->blitFrom(*s, srcRect, Common::Point(it->left, it->top));
 		}
 	}
 }