[Scummvm-git-logs] scummvm master -> 90ac129cdb0bb297be9f89aebc2e2a30176ab501

whiterandrek whiterandrek at gmail.com
Sun May 17 18:46:21 UTC 2020


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:
521eff2bbc PETKA: fixed toggling map
90ac129cdb PETKA: added missing initialization to cursor object


Commit: 521eff2bbc4b8161a6f0a88650b87b4ad191a9d5
    https://github.com/scummvm/scummvm/commit/521eff2bbc4b8161a6f0a88650b87b4ad191a9d5
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-17T21:37:06+03:00

Commit Message:
PETKA: fixed toggling map

Changed paths:
    engines/petka/q_system.cpp


diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 94e9cb7a30..724bd5fe90 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -240,7 +240,7 @@ void QSystem::toggleMapInterface() {
 		if (_currInterface == _mapInterface.get()) {
 			_currInterface->stop();
 		} else if (_currInterface == _mainInterface.get()) {
-			// setText
+			_currInterface->setText(Common::U32String(""), 0, 0);
 			_mapInterface->start(0);
 		}
 	}


Commit: 90ac129cdb0bb297be9f89aebc2e2a30176ab501
    https://github.com/scummvm/scummvm/commit/90ac129cdb0bb297be9f89aebc2e2a30176ab501
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-17T21:39:51+03:00

Commit Message:
PETKA: added missing initialization to cursor object

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


diff --git a/engines/petka/objects/object_cursor.cpp b/engines/petka/objects/object_cursor.cpp
index 70580b925e..739cca9fc0 100644
--- a/engines/petka/objects/object_cursor.cpp
+++ b/engines/petka/objects/object_cursor.cpp
@@ -46,6 +46,8 @@ QObjectCursor::QObjectCursor() {
 	_y = pos.y;
 	g_vm->resMgr()->loadFlic(5002);
 	_actionType = kLook;
+	_invObj = nullptr;
+	_name = "Cursor";
 }
 
 void QObjectCursor::draw() {




More information about the Scummvm-git-logs mailing list