diff options
| author | Johannes Schickel | 2008-05-05 17:12:48 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-05 17:12:48 +0000 |
| commit | 81cfd2a716ff42d5425a456faff9068c92130969 (patch) | |
| tree | e12f84f4b29eb9816f12e5436ab794c832f1c0a0 /engines/kyra/scene_mr.cpp | |
| parent | 0f62fb0a88d89703f3f3029e57005ace07b112ee (diff) | |
| download | scummvm-rg350-81cfd2a716ff42d5425a456faff9068c92130969.tar.gz scummvm-rg350-81cfd2a716ff42d5425a456faff9068c92130969.tar.bz2 scummvm-rg350-81cfd2a716ff42d5425a456faff9068c92130969.zip | |
Implemented support for Kyra3 game options menu (including studio audience and skip flag options).
svn-id: r31879
Diffstat (limited to 'engines/kyra/scene_mr.cpp')
| -rw-r--r-- | engines/kyra/scene_mr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index 57ac328286..196c87424d 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -670,7 +670,9 @@ int KyraEngine_MR::trySceneChange(int *moveTable, int unk1, int updateChar) { } if (unk1) { - if (skipFlag()) { + // Notice that we can't use KyraEngine_MR's skipFlag handling + // here, since Kyra3 allows disabling of skipFlag support + if (KyraEngine_v2::skipFlag()) { resetSkipFlag(false); running = false; _unk4 = 1; |