diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /engines/tinsel | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/pcode.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 6 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index 2ab1e653d4..ae4c0d3ce1 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -394,7 +394,7 @@ INT_CONTEXT *RestoreInterpretContext(INT_CONTEXT *ric) { memcpy(ic, ric, sizeof(INT_CONTEXT)); ic->pProc = g_scheduler->getCurrentProcess(); - ic->resumeState = RES_1; + ic->resumeState = RES_NOT; LockCode(ic); diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 80f02ff8d1..635845ab26 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -778,7 +778,7 @@ static const GameSettings tinselSettings[] = { // For the languages, refer to the LANGUAGE enum in dw.h -const char *TinselEngine::_sampleIndices[][3] = { +const char *const TinselEngine::_sampleIndices[][3] = { { "english.idx", "english1.idx", "english2.idx" }, // English { "french.idx", "french1.idx", "french2.idx" }, // French { "german.idx", "german1.idx", "german2.idx" }, // German @@ -789,7 +789,7 @@ const char *TinselEngine::_sampleIndices[][3] = { { "english.idx", "english1.idx", "english2.idx" }, // Japanese (FIXME: not sure if this is correct) { "us.idx", "us1.idx", "us2.idx" } // US English }; -const char *TinselEngine::_sampleFiles[][3] = { +const char *const TinselEngine::_sampleFiles[][3] = { { "english.smp", "english1.smp", "english2.smp" }, // English { "french.smp", "french1.smp", "french2.smp" }, // French { "german.smp", "german1.smp", "german2.smp" }, // German @@ -800,7 +800,7 @@ const char *TinselEngine::_sampleFiles[][3] = { { "english.smp", "english1.smp", "english2.smp" }, // Japanese (FIXME: not sure if this is correct) { "us.smp", "us1.smp", "us2.smp" }, // US English }; -const char *TinselEngine::_textFiles[][3] = { +const char *const TinselEngine::_textFiles[][3] = { { "english.txt", "english1.txt", "english2.txt" }, // English { "french.txt", "french1.txt", "french2.txt" }, // French { "german.txt", "german1.txt", "german2.txt" }, // German diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index e18216cdf7..59344c44f4 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -156,9 +156,9 @@ class TinselEngine : public Engine { Console *_console; Scheduler *_scheduler; - static const char *_sampleIndices[][3]; - static const char *_sampleFiles[][3]; - static const char *_textFiles[][3]; + static const char *const _sampleIndices[][3]; + static const char *const _sampleFiles[][3]; + static const char *const _textFiles[][3]; protected: |