aboutsummaryrefslogtreecommitdiff
path: root/simon/simon.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-11-18 12:40:03 +0000
committerTravis Howell2005-11-18 12:40:03 +0000
commit7f8222cd981950b5e32a51afdd7311a85fa6d966 (patch)
tree908a487b3f861cfcebfa7fbb8110b493b398e9bb /simon/simon.cpp
parenteb18e57d08fc48b0b01f9bd41a39a12a28a91447 (diff)
downloadscummvm-rg350-7f8222cd981950b5e32a51afdd7311a85fa6d966.tar.gz
scummvm-rg350-7f8222cd981950b5e32a51afdd7311a85fa6d966.tar.bz2
scummvm-rg350-7f8222cd981950b5e32a51afdd7311a85fa6d966.zip
Updates to FF path finding.
svn-id: r19639
Diffstat (limited to 'simon/simon.cpp')
-rw-r--r--simon/simon.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index abfdf05e47..90c5f30520 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -2671,7 +2671,7 @@ void SimonEngine::o_wait_for_vga(uint a) {
_exitCutscene = false;
_skipSpeech = false;
while (_vgaWaitFor != 0) {
- if (_skipSpeech && getGameType() == GType_SIMON2) {
+ if (_skipSpeech && (getGameType() == GType_SIMON2 || getGameType() == GType_FF)) {
if (_vgaWaitFor == 200 && !vc_get_bit(14)) {
skip_speech();
break;
@@ -3204,7 +3204,7 @@ void SimonEngine::processSpecialKeys() {
vc_write_var(86, 2);
break;
case 63: // F5
- if (getGameType() == GType_SIMON2)
+ if (getGameType() == GType_SIMON2 || getGameType() == GType_FF)
_exitCutscene = true;
break;
case 'p':
@@ -4100,7 +4100,7 @@ void SimonEngine::delay(uint amount) {
#endif
break;
case OSystem::EVENT_RBUTTONDOWN:
- if (getGameType() == GType_SIMON2)
+ if (getGameType() == GType_SIMON2 || getGameType() == GType_FF)
_skipSpeech = true;
else
_exitCutscene = true;