[Scummvm-cvs-logs] scummvm master -> a41db1939cdff632d16aa3849e23b844c46bafef
Strangerke
Strangerke at scummvm.org
Sun Feb 16 19:27:07 CET 2014
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:
a41db1939c TSAGE: Fix bug #6519 - Mouse pointer behavior in dialog menu
Commit: a41db1939cdff632d16aa3849e23b844c46bafef
https://github.com/scummvm/scummvm/commit/a41db1939cdff632d16aa3849e23b844c46bafef
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-16T10:25:32-08:00
Commit Message:
TSAGE: Fix bug #6519 - Mouse pointer behavior in dialog menu
Changed paths:
engines/tsage/ringworld2/ringworld2_dialogs.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_dialogs.cpp b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
index 24504f2..adc0856 100644
--- a/engines/tsage/ringworld2/ringworld2_dialogs.cpp
+++ b/engines/tsage/ringworld2/ringworld2_dialogs.cpp
@@ -197,6 +197,11 @@ int RightClickDialog::execute() {
void CharacterDialog::show() {
CharacterDialog *dlg = new CharacterDialog();
+ CursorType cursorNum = R2_GLOBALS._events.getCursor();
+
+ // Reset the current cursor
+ R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+
dlg->draw();
// Make the default button the currently active character
@@ -315,12 +320,11 @@ void CharacterDialog::show() {
}
}
- // Reset the current cursor
- R2_GLOBALS._events.setCursor(CURSOR_USE);
-
// Change to whichever scene the newly selected character is in
R2_GLOBALS._sceneManager.changeScene(R2_GLOBALS._player._characterScene[R2_GLOBALS._player._characterIndex]);
- }
+ } else
+ // Restore previous cursor
+ R2_GLOBALS._events.setCursor(cursorNum);
}
CharacterDialog::CharacterDialog() {
More information about the Scummvm-git-logs
mailing list