ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

TSAGE: R2R - WIP work on cursor behavior in scene 1337

Browse Source
This commit is contained in:
Strangerke
2013-12-01 01:47:55 +01:00
parent 3e85976877
commit a6458abb29
2 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/tsage/ringworld2/ringworld2_scenes1.cpp
+32 -17
View File
@@ -2256,6 +2256,10 @@ Scene1337::Scene1337() {
_field3EF0 = nullptr;
_field3EF4 = nullptr;
_field3EF8 = nullptr;
_cursorCurRes = 0;
_cursorCurStrip = 0;
_cursorCurFrame = 0;
}
void Scene1337::synchronize(Serializer &s) {
@@ -4482,6 +4486,12 @@ void Scene1337::dispatch() {
suggestInstructions();
}
}
// The following code is in the original in sceneHandler::process(),
// which is terrible as it's checked in every scene of the game.
setCursorData(5, _cursorCurStrip, _cursorCurFrame);
//
Scene::dispatch();
}
@@ -5262,11 +5272,10 @@ void Scene1337::subC4CD2() {
}
void Scene1337::subC4CEC() {
if (R2_GLOBALS._v57709 != 0)
return;
subD18F5();
subD1940(true);
if (R2_GLOBALS._v57709 == 0) {
subD18F5();
subD1940(true);
}
}
void Scene1337::subC51A0(unkObj1337sub1 *subObj1, unkObj1337sub1 *subObj2) {
@@ -6830,22 +6839,28 @@ void Scene1337::setCursorData(int resNum, int rlbNum, int frameNum) {
if (!frameNum)
return;
uint size;
byte *cursor = g_resourceManager->getSubResource(resNum, rlbNum, frameNum, &size);
// Decode the cursor
GfxSurface s = surfaceFromRes(cursor);
_cursorCurRes = resNum;
_cursorCurStrip = rlbNum;
_cursorCurFrame = frameNum;
Graphics::Surface surface = s.lockSurface();
const byte *cursorData = (const byte *)surface.getPixels();
CursorMan.replaceCursor(cursorData, surface.w, surface.h, s._centroid.x, s._centroid.y, s._transColor);
s.unlockSurface();
if (!frameNum) {
R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
} else {
uint size;
byte *cursor = g_resourceManager->getSubResource(resNum, rlbNum, frameNum, &size);
// Decode the cursor
GfxSurface s = surfaceFromRes(cursor);
Graphics::Surface surface = s.lockSurface();
const byte *cursorData = (const byte *)surface.getPixels();
CursorMan.replaceCursor(cursorData, surface.w, surface.h, s._centroid.x, s._centroid.y, s._transColor);
s.unlockSurface();
}
}
void Scene1337::subD18F5() {
if (R2_GLOBALS._v57709 == 0)
// The cursor looks... very dummy
// To be checked
warning("TODO: CursorManager.setData(R2_GLOBALS.off_57705)");
R2_GLOBALS._events.setCursor(CURSOR_CROSSHAIRS);
++R2_GLOBALS._v57709;
}
@@ -6854,7 +6869,7 @@ void Scene1337::subD1917() {
if (R2_GLOBALS._v57709 != 0) {
R2_GLOBALS._v57709--;
if (R2_GLOBALS._v57709 != 0)
warning("FIXME: subD195F(_width, _data);");
subD195F(_cursorCurStrip, _cursorCurFrame);
}
}
engines/tsage/ringworld2/ringworld2_scenes1.h
+3
View File
@@ -316,6 +316,9 @@ public:
int _field424A;
int _instructionsDisplayedFl;
int _instructionsWaitCount;
int _cursorCurRes;
int _cursorCurStrip;
int _cursorCurFrame;
SceneObject _upperDisplayCard[8];
SceneObject _lowerDisplayCard[8];