diff options
| author | Travis Howell | 2003-12-20 04:34:24 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-12-20 04:34:24 +0000 |
| commit | 19fe4c947a7ac035eb3b8f670090f97b1821db5b (patch) | |
| tree | ebcc987af700a0f6bfabf78fbe104c7f02363d5e | |
| parent | 20a6ad7572a9cb58503d9320817d7a7ccd4f63bd (diff) | |
| download | scummvm-rg350-19fe4c947a7ac035eb3b8f670090f97b1821db5b.tar.gz scummvm-rg350-19fe4c947a7ac035eb3b8f670090f97b1821db5b.tar.bz2 scummvm-rg350-19fe4c947a7ac035eb3b8f670090f97b1821db5b.zip | |
Simpler check
svn-id: r11769
| -rw-r--r-- | simon/simon.cpp | 3 | ||||
| -rw-r--r-- | simon/vga.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 4f3725110d..c98c13bd95 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -1735,7 +1735,8 @@ void SimonEngine::setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index) { ha->unk3 = 1; // Simon1 specific - _keep_arrows = 1; + if (!(_game & GF_WIN)) + _keep_arrows = 1; o_kill_sprite_simon1(0x80); start_vga_code(0, 1, 0x80, 0, 0, 0xE); } else { diff --git a/simon/vga.cpp b/simon/vga.cpp index b914fbc5ff..6a80f1be30 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -1195,8 +1195,7 @@ void SimonEngine::vc_25_halt_sprite() { VgaSprite *vsp = find_cur_sprite(); // Work around to allow inventory arrows to be // showned in some versions of Simon the Sorcerer 1 - if (!(_game & GF_SIMON2) && !(_game & GF_WIN) && - vsp->id == 0x80 && _keep_arrows) { + if (vsp->id == 0x80 && _keep_arrows) { _keep_arrows = 0; return; } |