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

[whiterandrek]

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:
a1baf46899 PETKA: more original bug fixes


Commit: a1baf46899e48703153d7a39321d933dd1561a45
    https://github.com/scummvm/scummvm/commit/a1baf46899e48703153d7a39321d933dd1561a45
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-10-05T19:08:45+03:00

Commit Message:
PETKA: more original bug fixes

Changed paths:
    engines/petka/interfaces/dialog_interface.cpp
    engines/petka/q_system.cpp


diff --git a/engines/petka/interfaces/dialog_interface.cpp b/engines/petka/interfaces/dialog_interface.cpp
index 410a3228fd..cf3a6b17b2 100644
--- a/engines/petka/interfaces/dialog_interface.cpp
+++ b/engines/petka/interfaces/dialog_interface.cpp
@@ -74,7 +74,7 @@ void DialogInterface::initCursor() {
 	_wasCursorAnim = cursor->_animate;
 	_wasCursorShown = cursor->_isShown;
 
-	cursor->_isShown = false;
+	cursor->show(false);
 	cursor->_animate = true;
 	cursor->_resourceId = 5006;
 	cursor->_actionType = kActionTalk;
@@ -86,6 +86,12 @@ void DialogInterface::restoreCursor() {
 	cursor->_animate = _wasCursorAnim;
 	cursor->_resourceId = _savedCursorId;
 	cursor->_actionType = _savedCursorActType;
+
+	// original bug fix
+	Common::Event ev;
+	ev.type = Common::EVENT_MOUSEMOVE;
+	ev.mouse = g_system->getEventManager()->getMousePos();
+	_qsys->onEvent(ev);
 }
 
 void DialogInterface::next(int choice) {
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index 70787caa28..dfad2d7010 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -190,8 +190,12 @@ void QSystem::toggleMapInterface() {
 
 void QSystem::setCursorAction(int action) {
 	if (getStar()->_isActive && _currInterface == _mainInterface.get()) {
-		if (action != kActionObjUseChapayev || getChapay()->_isShown)
+		if (action != kActionObjUseChapayev || getChapay()->_isShown) {
 			getCursor()->setAction(action);
+
+			// original bug fix
+			_mainInterface->onMouseMove(g_system->getEventManager()->getMousePos());
+		}
 	}
 }