From 4c9f0af320bd619ab0d3fac5353a9be7e0ab64fc Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 4 Oct 2014 14:48:37 +0200
Subject: TSAGE: R2R - Fix a crash when playing a counter card

---
 engines/tsage/ringworld2/ringworld2_scenes1.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'engines/tsage')

diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bcfae4d727..ac1bea49b2 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -6704,7 +6704,7 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) {
 		// FIXME: Use another cursor when possible
 		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
 	} else {
-		// TODO: The original was using some ressource caching, which was useless and complex
+		// TODO: The original was using some resource caching, which was useless and complex
 		// and which has been removed. This cursor behavior clearly made intensive use of this caching...
 		// We now have to find a way to cache these cursor pointers and avoid loading them multiple times per seconds
 		uint size;
@@ -6723,7 +6723,9 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) {
 
 void Scene1337::subD18F5() {
 	if (R2_GLOBALS._v57709 == 0)
-		R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
+		// The original restores a copy of the default cursor (the hand), which isn't possible with our implementation
+		// We reload of that cursor instead.
+		setCursorData(5, 1, 4);
 
 	++R2_GLOBALS._v57709;
 }
-- 
cgit v1.2.3