[Scummvm-git-logs] scummvm master -> 82fa66fca35781b607195d183b91a9448922eea2

[neuromancer]

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:
325ac36612 HYPNO: do not reset the background when clicking outside the conversation area in spider
82fa66fca3 HYPNO: also reset cursor after right in conversation in spider


Commit: 325ac366124e6ea3effc8ce42988a75e3f6ff7a5
    https://github.com/scummvm/scummvm/commit/325ac366124e6ea3effc8ce42988a75e3f6ff7a5
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-30T22:59:39+02:00

Commit Message:
HYPNO: do not reset the background when clicking outside the conversation area in spider

Changed paths:
    engines/hypno/spider/talk.cpp


diff --git a/engines/hypno/spider/talk.cpp b/engines/hypno/spider/talk.cpp
index 3eae5aaebe9..7c84efebb4e 100644
--- a/engines/hypno/spider/talk.cpp
+++ b/engines/hypno/spider/talk.cpp
@@ -191,7 +191,7 @@ void SpiderEngine::leftClickedConversation(const Common::Point &mousePos) {
 
 			}
 		}
-		if (!a->background.empty()) {
+		if (_refreshConversation && !a->background.empty()) {
 			loadImage(a->background, a->backgroundPos.x, a->backgroundPos.y, false);
 		}
 	}


Commit: 82fa66fca35781b607195d183b91a9448922eea2
    https://github.com/scummvm/scummvm/commit/82fa66fca35781b607195d183b91a9448922eea2
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-30T23:02:25+02:00

Commit Message:
HYPNO: also reset cursor after right in conversation in spider

Changed paths:
    engines/hypno/spider/talk.cpp


diff --git a/engines/hypno/spider/talk.cpp b/engines/hypno/spider/talk.cpp
index 7c84efebb4e..b5ef70aa527 100644
--- a/engines/hypno/spider/talk.cpp
+++ b/engines/hypno/spider/talk.cpp
@@ -208,6 +208,7 @@ void SpiderEngine::leftClickedConversation(const Common::Point &mousePos) {
 }
 
 void SpiderEngine::rightClickedConversation(const Common::Point &mousePos) {
+	defaultCursor();
 	Videos videos;
 	for (Actions::const_iterator itt = _conversation.begin(); itt != _conversation.end(); ++itt) {
 		Talk *a = (Talk *)*itt;