diff options
author | Oystein Eftevaag | 2006-02-09 07:37:19 +0000 |
---|---|---|
committer | Oystein Eftevaag | 2006-02-09 07:37:19 +0000 |
commit | 56d918edbe5feecb4c0239a8927adb60602ae154 (patch) | |
tree | d1e167b1b890d3718d60c734149518f9d75a3907 /kyra/script_v1.cpp | |
parent | 91222cc6acacc2a399ac982eae61d5c0f204bbb9 (diff) | |
download | scummvm-rg350-56d918edbe5feecb4c0239a8927adb60602ae154.tar.gz scummvm-rg350-56d918edbe5feecb4c0239a8927adb60602ae154.tar.bz2 scummvm-rg350-56d918edbe5feecb4c0239a8927adb60602ae154.zip |
Moved tons of code out of kyra.cpp, and removed three redundant functions (two stubs
to sound functions, and one duplicate function (one with 'posion' in the name, one with 'poison').
The bulk of the moved code is moved to the newly created files items.cpp, scene.cpp and
sequences.cpp
svn-id: r20437
Diffstat (limited to 'kyra/script_v1.cpp')
-rw-r--r-- | kyra/script_v1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index b3e1c4eeb8..53310f1237 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -112,13 +112,13 @@ int KyraEngine::cmd_setSpecialExitList(ScriptState *script) { int KyraEngine::cmd_blockInWalkableRegion(ScriptState *script) { debug(3, "cmd_blockInWalkableRegion(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); - blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1); + _screen->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1); return 0; } int KyraEngine::cmd_blockOutWalkableRegion(ScriptState *script) { debug(3, "cmd_blockOutWalkableRegion(0x%X) (%d, %d, %d, %d)", script, stackPos(0), stackPos(1), stackPos(2), stackPos(3)); - blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1); + _screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1); return 0; } @@ -1113,8 +1113,8 @@ int KyraEngine::cmd_getCharactersFacing(ScriptState *script) { int KyraEngine::cmd_bkgdScrollSceneAndMasksRight(ScriptState *script) { debug(3, "cmd_bkgdScrollSceneAndMasksRight(0x%X) (%d)", script, stackPos(0)); - copyBackgroundBlock(stackPos(0), 2, 0); - copyBackgroundBlock2(stackPos(0)); + _screen->copyBackgroundBlock(stackPos(0), 2, 0); + _screen->copyBackgroundBlock2(stackPos(0)); // update the whole screen _screen->copyRegion(7, 7, 7, 7, 305, 129, 3, 0); _screen->updateScreen(); |