libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 21:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

yet more v2 var fixes

Browse Source 
svn-id: r7397
This commit is contained in:
Max Horn 2003-05-08 21:14:21 +00:00
parent af14dabc75
commit 4d7f7a8c80
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/gfx.cpp
View File

@ -1982,7 +1982,7 @@ void Scumm::setCameraAt(int pos_x, int pos_y) {
if (camera._cur.x > VAR(VAR_CAMERA_MAX_X))
camera._cur.x = VAR(VAR_CAMERA_MAX_X);
if (VAR(VAR_SCROLL_SCRIPT)) {
if (VAR_SCROLL_SCRIPT != 0xFF && VAR(VAR_SCROLL_SCRIPT)) {
VAR(VAR_CAMERA_POS_X) = camera._cur.x;
runScript(VAR(VAR_SCROLL_SCRIPT), 0, 0, 0);
}

12
scumm/script.cpp
View File

@ -589,10 +589,14 @@ bool Scumm::isScriptInUse(int script) {
void Scumm::runHook(int i) {
int tmp[16];
tmp[0] = i;
if (VAR(VAR_HOOK_SCRIPT)) {
runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp);
if (_features & GF_AFTER_V2) {
// FIXME - TODO
} else {
int tmp[16];
tmp[0] = i;
if (VAR(VAR_HOOK_SCRIPT)) {
runScript(VAR(VAR_HOOK_SCRIPT), 0, 0, tmp);
}
}
}