[Scummvm-git-logs] scummvm master -> 54de4a00710733a87091dd025ae6729b86162276

[dreammaster]

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:
54de4a0071 XEEN: Fix crash when accessing character stats with keyboard


Commit: 54de4a00710733a87091dd025ae6729b86162276
    https://github.com/scummvm/scummvm/commit/54de4a00710733a87091dd025ae6729b86162276
Author: Jonathan Phénix (greaterd at gmail.com)
Date: 2020-06-13T15:50:33-07:00

Commit Message:
XEEN: Fix crash when accessing character stats with keyboard

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 66d28b6dfd..b3c3bdb48d 100644
--- a/engines/xeen/dialogs/dialogs_char_info.cpp
+++ b/engines/xeen/dialogs/dialogs_char_info.cpp
@@ -139,11 +139,6 @@ void CharacterInfo::execute(int charIndex) {
 			w.update();
 			break;
 
-		case Common::KEYCODE_RETURN:
-		case Common::KEYCODE_KP_ENTER:
-			_buttonValue = _cursorCell + Common::KEYCODE_a;
-			// fall through
-
 		case 1001:
 		case 1002:
 		case 1003:
@@ -163,12 +158,15 @@ void CharacterInfo::execute(int charIndex) {
 		case 1017:
 		case 1018:
 		case 1019:
-		case 1020: {
+		case 1020:
 			showCursor(false);
 			_cursorCell = _buttonValue - 1001;
 			showCursor(true);
 			w.update();
+			// fall through
 
+		case Common::KEYCODE_RETURN:
+		case Common::KEYCODE_KP_ENTER: {
 			bool result = expandStat(_cursorCell, *c);
 			_vm->_mode = MODE_COMBAT;
 			if (result)