diff options
| author | Travis Howell | 2006-05-03 01:11:50 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-05-03 01:11:50 +0000 |
| commit | 91a67d1150f79665437c83181081e1abb48a7408 (patch) | |
| tree | 20836fa8968fe0958ddee4f763cc9951cde2aef4 /engines/simon/items.cpp | |
| parent | 2552f6e17e68d7dc03099a74f6a74d4b0a330305 (diff) | |
| download | scummvm-rg350-91a67d1150f79665437c83181081e1abb48a7408.tar.gz scummvm-rg350-91a67d1150f79665437c83181081e1abb48a7408.tar.bz2 scummvm-rg350-91a67d1150f79665437c83181081e1abb48a7408.zip | |
Cleanup
svn-id: r22289
Diffstat (limited to 'engines/simon/items.cpp')
| -rw-r--r-- | engines/simon/items.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index dc7f733491..0dccf649e0 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -1187,7 +1187,7 @@ void SimonEngine::o_setDollar() { void SimonEngine::o_isBox() { // 142: is hitarea 0x40 clear - setScriptCondition(is_hitarea_0x40_clear(getVarOrWord())); + setScriptCondition(isBoxDead(getVarOrWord())); } void SimonEngine::o_doTable() { @@ -1625,9 +1625,9 @@ void SimonEngine::o1_specialFade() { i = NUM_PALETTE_FADEOUT; do { - palette_fadeout((uint32 *)_videoBuf1, 32); - palette_fadeout((uint32 *)_videoBuf1 + 32 + 16, 144); - palette_fadeout((uint32 *)_videoBuf1 + 32 + 16 + 144 + 16, 48); + paletteFadeOut((uint32 *)_videoBuf1, 32); + paletteFadeOut((uint32 *)_videoBuf1 + 32 + 16, 144); + paletteFadeOut((uint32 *)_videoBuf1 + 32 + 16 + 144 + 16, 48); _system->setPalette(_videoBuf1, 0, 256); if (_fade) |