diff options
| author | Torbjörn Andersson | 2006-04-10 07:21:44 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-04-10 07:21:44 +0000 |
| commit | 2695cb6f88de69bb66f5f40cb936773736a85672 (patch) | |
| tree | f55fcd2c44f3eb657c0f4308fa99ba5b022088e1 | |
| parent | 50700d7ac6c9bb200ba0ec3b7448d84e4bf8acf9 (diff) | |
| download | scummvm-rg350-2695cb6f88de69bb66f5f40cb936773736a85672.tar.gz scummvm-rg350-2695cb6f88de69bb66f5f40cb936773736a85672.tar.bz2 scummvm-rg350-2695cb6f88de69bb66f5f40cb936773736a85672.zip | |
Merged o_loadBeard() and o_unloadBeard() into o1_loadBeard() and
o1_unloadBeard().
svn-id: r21750
| -rw-r--r-- | engines/simon/items.cpp | 14 | ||||
| -rw-r--r-- | engines/simon/simon.h | 2 | ||||
| -rw-r--r-- | engines/simon/vga.cpp | 20 |
3 files changed, 12 insertions, 24 deletions
diff --git a/engines/simon/items.cpp b/engines/simon/items.cpp index e9160f908d..a0e081bf31 100644 --- a/engines/simon/items.cpp +++ b/engines/simon/items.cpp @@ -1376,12 +1376,22 @@ void SimonEngine::o1_mouseOff() { void SimonEngine::o1_loadBeard() { // 182: load beard - o_loadBeard(); + if (_beardLoaded == false) { + _beardLoaded = true; + _lockWord |= 0x8000; + read_vga_from_datfile_1(328); + _lockWord &= ~0x8000; + } } void SimonEngine::o1_unloadBeard() { // 183: unload beard - o_unloadBeard(); + if (_beardLoaded == true) { + _beardLoaded = false; + _lockWord |= 0x8000; + read_vga_from_datfile_1(23); + _lockWord &= ~0x8000; + } } void SimonEngine::o1_unloadZone() { diff --git a/engines/simon/simon.h b/engines/simon/simon.h index fdde41a313..40bfbc10b2 100644 --- a/engines/simon/simon.h +++ b/engines/simon/simon.h @@ -587,8 +587,6 @@ protected: void o_pathfind(int x, int y, uint var_1, uint var_2); void o_mouseOn(); void o_mouseOff(); - void o_loadBeard(); - void o_unloadBeard(); void o_unloadZone(uint a); void o_unfreezeBottom(); void o_fadeToBlack(); diff --git a/engines/simon/vga.cpp b/engines/simon/vga.cpp index 4b109bbccc..b30b306c28 100644 --- a/engines/simon/vga.cpp +++ b/engines/simon/vga.cpp @@ -224,26 +224,6 @@ void SimonEngine::vcSkipNextInstruction() { fprintf(_dumpFile, "; skipped\n"); } -void SimonEngine::o_unloadBeard() { - // Simon1 Only - if (_beardLoaded == true) { - _beardLoaded = false; - _lockWord |= 0x8000; - read_vga_from_datfile_1(23); - _lockWord &= ~0x8000; - } -} - -void SimonEngine::o_loadBeard() { - // Simon1 Only - if (_beardLoaded == false) { - _beardLoaded = true; - _lockWord |= 0x8000; - read_vga_from_datfile_1(328); - _lockWord &= ~0x8000; - } -} - // VGA Script commands void SimonEngine::vc1_fadeOut() { /* dummy opcode */ |