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

whiterandrek noreply at scummvm.org
Tue Feb 8 19:52:33 UTC 2022


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

Summary:
cad05c054e PETKA: update cursor when picking item


Commit: cad05c054e370151b3493c4c5662f198cd4c0c88
    https://github.com/scummvm/scummvm/commit/cad05c054e370151b3493c4c5662f198cd4c0c88
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2022-02-08T21:38:39+02:00

Commit Message:
PETKA: update cursor when picking item

Changed paths:
    engines/petka/interfaces/dialog_interface.cpp
    engines/petka/objects/object.cpp
    engines/petka/petka.cpp
    engines/petka/petka.h


diff --git a/engines/petka/interfaces/dialog_interface.cpp b/engines/petka/interfaces/dialog_interface.cpp
index 6d4f8c64ea7..4e8f1777672 100644
--- a/engines/petka/interfaces/dialog_interface.cpp
+++ b/engines/petka/interfaces/dialog_interface.cpp
@@ -87,10 +87,7 @@ void DialogInterface::restoreCursor() {
 	cursor->_actionType = _savedCursorActType;
 
 	// original bug fix
-	Common::Event ev;
-	ev.type = Common::EVENT_MOUSEMOVE;
-	ev.mouse = g_system->getEventManager()->getMousePos();
-	_qsys->onEvent(ev);
+	g_vm->pushMouseMoveEvent();
 }
 
 void DialogInterface::next(int choice) {
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 7b922fb18a6..1793b630705 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -90,6 +90,8 @@ void QMessageObject::processMessage(const QMessage &msg) {
 		switch (msg.opcode) {
 		case kAddInv:
 			g_vm->getQSystem()->getCase()->addItem(msg.objId);
+			// original bug fix
+			g_vm->pushMouseMoveEvent();
 			break;
 		case kDelInv:
 			g_vm->getQSystem()->getCase()->removeItem(msg.objId);
diff --git a/engines/petka/petka.cpp b/engines/petka/petka.cpp
index a577ac4aa40..64c47e67afa 100644
--- a/engines/petka/petka.cpp
+++ b/engines/petka/petka.cpp
@@ -329,4 +329,11 @@ void PetkaEngine::pauseEngineIntern(bool pause) {
 	Engine::pauseEngineIntern(pause);
 }
 
+void PetkaEngine::pushMouseMoveEvent() {
+	Common::Event ev;
+	ev.type = Common::EVENT_MOUSEMOVE;
+	ev.mouse = g_system->getEventManager()->getMousePos();
+	_eventMan->pushEvent(ev);
+}
+
 } // End of namespace Petka
diff --git a/engines/petka/petka.h b/engines/petka/petka.h
index f0d0a7a0b12..e75e07b868b 100644
--- a/engines/petka/petka.h
+++ b/engines/petka/petka.h
@@ -112,6 +112,8 @@ public:
 	Graphics::Font *getTextFont() const { return _textFont.get(); }
 	Graphics::Font *getDescriptionFont() const { return _descriptionFont.get(); }
 
+	void pushMouseMoveEvent();
+
 	Common::Error loadGameState(int slot) override;
 	bool canLoadGameStateCurrently() override;
 




More information about the Scummvm-git-logs mailing list