diff options
author | Travis Howell | 2006-04-29 12:25:15 +0000 |
---|---|---|
committer | Travis Howell | 2006-04-29 12:25:15 +0000 |
commit | d9ed515f90952635cf3195131ce86905dbd29a08 (patch) | |
tree | df4b3e000af57a69df45dc86e037b1f9af5014d9 /engines/simon/simon.cpp | |
parent | 7e02709e7d6c5c31141cef50bce13ddb64845a34 (diff) | |
download | scummvm-rg350-d9ed515f90952635cf3195131ce86905dbd29a08.tar.gz scummvm-rg350-d9ed515f90952635cf3195131ce86905dbd29a08.tar.bz2 scummvm-rg350-d9ed515f90952635cf3195131ce86905dbd29a08.zip |
Merge fadeToBlack() into o1_specialFade() and cleanup
svn-id: r22214
Diffstat (limited to 'engines/simon/simon.cpp')
-rw-r--r-- | engines/simon/simon.cpp | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 7514f1cb3c..af5292382d 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -2337,27 +2337,6 @@ void SimonEngine::set_video_mode_internal(uint16 mode, uint16 vga_res_id) { } } -void SimonEngine::fadeToBlack() { - uint i; - - memcpy(_videoBuf1, _paletteBackup, 1024); - - 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); - - _system->setPalette(_videoBuf1, 0, 256); - if (_fade) - _system->updateScreen(); - delay(5); - } while (--i); - - memcpy(_paletteBackup, _videoBuf1, 1024); - memcpy(_palette, _videoBuf1, 1024); -} - void SimonEngine::addVgaEvent(uint16 num, const byte *code_ptr, uint16 cur_sprite, uint16 curZoneNum, int32 param) { VgaTimerEntry *vte; @@ -2863,44 +2842,6 @@ void SimonEngine::timer_callback() { } } -bool SimonEngine::itemIsSiblingOf(uint16 a) { - Item *item; - - CHECK_BOUNDS(a, _objectArray); - - item = _objectArray[a]; - if (item == NULL) - return true; - - return me()->parent == item->parent; -} - -bool SimonEngine::itemIsParentOf(uint16 a, uint16 b) { - Item *item_a, *item_b; - - CHECK_BOUNDS(a, _objectArray); - CHECK_BOUNDS(b, _objectArray); - - item_a = _objectArray[a]; - item_b = _objectArray[b]; - - if (item_a == NULL || item_b == NULL) - return true; - - return derefItem(item_a->parent) == item_b; -} - -bool SimonEngine::vc_maybe_skip_proc_1(uint16 a, int16 b) { - Item *item; - - CHECK_BOUNDS(a, _objectArray); - - item = _objectArray[a]; - if (item == NULL) - return true; - return item->state == b; -} - void SimonEngine::closeWindow(uint a) { if (_windowArray[a] == NULL) return; |