aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-12-18 09:04:13 +0000
committerTravis Howell2003-12-18 09:04:13 +0000
commit592822fbe551a7ade0de51a1e30dedc0d3b73f04 (patch)
treeb1a16c899639a08e9c2a157eeca6c03bf4db69fd /simon
parent1a4ede14c63c3f7cd479bc98bed441698bc1c2f4 (diff)
downloadscummvm-rg350-592822fbe551a7ade0de51a1e30dedc0d3b73f04.tar.gz
scummvm-rg350-592822fbe551a7ade0de51a1e30dedc0d3b73f04.tar.bz2
scummvm-rg350-592822fbe551a7ade0de51a1e30dedc0d3b73f04.zip
Don't use bug work around on simon1dos, since copy protection screen causes odd effects.
svn-id: r11733
Diffstat (limited to 'simon')
-rw-r--r--simon/items.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 1e2f04f0ac..cc8900269f 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -384,9 +384,9 @@ int SimonEngine::runScript() {
_speechid_array_4[var] = speech_id;
}
} else {
- if (var < 20)
- _stringid_array_3_backup[var] = _stringid_array_3[var];
+ if (var < 20) {
_stringid_array_3[var] = string_id;
+ }
}
}
break;
@@ -936,7 +936,7 @@ int SimonEngine::runScript() {
_show_preposition = true;
o_setup_cond_c();
_show_preposition = false;
- if (!(_game & GF_SIMON2))
+ if (!(_game & GF_SIMON2) && (_game & GF_TALKIE))
_reset_arrays = true;
}
break;