libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 23:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more v2 var access fixes

Browse Source 
svn-id: r7395
This commit is contained in:
Max Horn 2003-05-08 20:37:06 +00:00
parent 0461222181
commit 6d2c0de5f2
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scumm/gfx.cpp
View File

@ -2759,9 +2759,14 @@ void Scumm::cyclePalette() {
byte *start, *end;
byte tmp[3];
valueToAdd = VAR(VAR_TIMER);
if (valueToAdd < VAR(VAR_TIMER_NEXT))
if (_features & GF_AFTER_V2) {
// FIXME - no idea if this is right :-/
valueToAdd = VAR(VAR_TIMER_NEXT);
} else {
valueToAdd = VAR(VAR_TIMER);
if (valueToAdd < VAR(VAR_TIMER_NEXT))
valueToAdd = VAR(VAR_TIMER_NEXT);
}
if (!_colorCycle) // FIXME
return;

8
scumm/scummvm.cpp
View File

@ -878,9 +878,11 @@ int Scumm::scummLoop(int delta) {
VAR(VAR_HAVE_MSG) = (_haveMsg == 0xFE) ? 0xFF : _haveMsg;
VAR(VAR_VIRT_MOUSE_X) = _virtual_mouse_x;
VAR(VAR_VIRT_MOUSE_Y) = _virtual_mouse_y;
VAR(VAR_MOUSE_X) = mouse.x;
VAR(VAR_MOUSE_Y) = mouse.y;
VAR(VAR_DEBUGMODE) = _debugMode;
if (!(_features & GF_AFTER_V2)) {
VAR(VAR_MOUSE_X) = mouse.x;
VAR(VAR_MOUSE_Y) = mouse.y;
VAR(VAR_DEBUGMODE) = _debugMode;
}
if (_features & GF_AUDIOTRACKS) {
// Covered automatically by the Sound class