[Scummvm-cvs-logs] scummvm master -> a05ec5ea9e8f2fae9f44e513a1b02c2c1d02ef75

[Strangerke]

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:
a05ec5ea9e R2R: Fix bug #6547 - Invalid cursor during dialogs


Commit: a05ec5ea9e8f2fae9f44e513a1b02c2c1d02ef75
    https://github.com/scummvm/scummvm/commit/a05ec5ea9e8f2fae9f44e513a1b02c2c1d02ef75
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-23T15:39:51-08:00

Commit Message:
R2R: Fix bug #6547 - Invalid cursor during dialogs

Changed paths:
    engines/tsage/converse.cpp



diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 577c082..d1faca5 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -449,8 +449,13 @@ int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) {
 
 	// Draw the dialog
 	draw();
+
 	g_globals->_events.showCursor();
 
+	// Force the display of an arrow cursor during discussions in R2R
+	if (g_vm->getGameID() == GType_Ringworld2)
+		R2_GLOBALS._events.setCursor(CURSOR_ARROW);
+
 	// WORKAROUND: On-screen dialogs are really meant to use a GfxManager instance
 	// for their lifetime, which prevents saving or loading. Since I don't want to spend a lot
 	// of time refactoring this already working dialog, fake it by putting a dummy gfxmanager at