[Scummvm-cvs-logs] scummvm master -> 4c9f0af320bd619ab0d3fac5353a9be7e0ab64fc
Strangerke
Strangerke at scummvm.org
Sat Oct 4 15:05:08 CEST 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:
4c9f0af320 TSAGE: R2R - Fix a crash when playing a counter card
Commit: 4c9f0af320bd619ab0d3fac5353a9be7e0ab64fc
https://github.com/scummvm/scummvm/commit/4c9f0af320bd619ab0d3fac5353a9be7e0ab64fc
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-10-04T15:02:15+02:00
Commit Message:
TSAGE: R2R - Fix a crash when playing a counter card
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes1.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index bcfae4d..ac1bea4 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;
}
More information about the Scummvm-git-logs
mailing list