From 6e715e186a857e8ed35c7e49f80ce951d8897e35 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:26 +0100
Subject: TSAGE: Make GPL headers consistent with themselves.

---
 engines/tsage/converse.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/tsage/converse.cpp')

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index ba8cfb82a9..577c08255b 100644
--- a/engines/tsage/converse.cpp
+++ b/engines/tsage/converse.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3


From a05ec5ea9e8f2fae9f44e513a1b02c2c1d02ef75 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 24 Feb 2014 00:39:51 +0100
Subject: R2R: Fix bug #6547 - Invalid cursor during dialogs

---
 engines/tsage/converse.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'engines/tsage/converse.cpp')

diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp
index 577c08255b..d1faca5dac 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
-- 
cgit v1.2.3