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

[dreammaster]

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:
f9eacae806 XEEN: Fix missing char selection in char info screen
a1df8ce5f1 XEEN: Unselect char when leaving shops like original


Commit: f9eacae8069798d24d7dae9b3c26104b6e7f8aab
    https://github.com/scummvm/scummvm/commit/f9eacae8069798d24d7dae9b3c26104b6e7f8aab
Author: Jonathan Phénix (greaterd at gmail.com)
Date: 2020-11-29T10:00:54-08:00

Commit Message:
XEEN: Fix missing char selection in char info screen

Changed paths:
    engines/xeen/dialogs/dialogs_char_info.cpp


diff --git a/engines/xeen/dialogs/dialogs_char_info.cpp b/engines/xeen/dialogs/dialogs_char_info.cpp
index b3c3bdb48d..d4ac7d7ea7 100644
--- a/engines/xeen/dialogs/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs/dialogs_char_info.cpp
@@ -91,12 +91,12 @@ void CharacterInfo::execute(int charIndex) {
 			if (_buttonValue < (int)(oldMode == MODE_COMBAT ? combat._combatParty.size() : party._activeParty.size())) {
 				charIndex = _buttonValue;
 				c = (oldMode != MODE_COMBAT) ? &party._activeParty[charIndex] : combat._combatParty[charIndex];
+
+				intf.highlightChar(_buttonValue);
+				redrawFlag = true;
 			} else {
 				_vm->_mode = MODE_CHARACTER_INFO;
 			}
-
-			intf.highlightChar(_buttonValue);
-			redrawFlag = true;
 			break;
 
 		case Common::KEYCODE_UP:


Commit: a1df8ce5f1cb189c2c276d3f541923a013a51862
    https://github.com/scummvm/scummvm/commit/a1df8ce5f1cb189c2c276d3f541923a013a51862
Author: Jonathan Phénix (greaterd at gmail.com)
Date: 2020-11-29T10:01:13-08:00

Commit Message:
XEEN: Unselect char when leaving shops like original

Changed paths:
    engines/xeen/locations.cpp


diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 6144c8ea79..71aec14737 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -56,6 +56,7 @@ BaseLocation::~BaseLocation() {
 	for (uint idx = 0; idx < _townSprites.size(); ++idx)
 		_townSprites[idx].clear();
 	intf.mainIconsPrint();
+	intf.unhighlightChar();
 }
 
 int BaseLocation::show() {