diff options
| author | Filippos Karapetis | 2009-09-23 10:55:35 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-23 10:55:35 +0000 |
| commit | 13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a (patch) | |
| tree | f0e1021c9235d3ad9c03a4a02688f9ba9111bc99 /engines/sci/engine/kmovement.cpp | |
| parent | 63208a20fdc466bb6ec88dc09c7f2901ef144794 (diff) | |
| download | scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.tar.gz scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.tar.bz2 scummvm-rg350-13ad217cdd6bf1dcb74fe9cb4f40622b58c8792a.zip | |
- Moved the SCI version in a global variable
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)
The fallback detector should work correctly now
svn-id: r44269
Diffstat (limited to 'engines/sci/engine/kmovement.cpp')
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 7eb14055b0..a647a84cdb 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -296,7 +296,7 @@ reg_t kDoBresen(EngineState *s, int, int argc, reg_t *argv) { int completed = 0; int max_movcnt = GET_SEL32V(client, moveSpeed); - if (s->resMan->sciVersion() > SCI_VERSION_01) + if (getSciVersion() > SCI_VERSION_01) signal &= ~_K_VIEW_SIG_FLAG_HIT_OBSTACLE; if (handle_movecnt == UNINITIALIZED) @@ -383,7 +383,7 @@ reg_t kDoBresen(EngineState *s, int, int argc, reg_t *argv) { completed = 1; } - if (s->resMan->sciVersion() > SCI_VERSION_01) + if (getSciVersion() > SCI_VERSION_01) if (completed) invoke_selector(INV_SEL(mover, moveDone, kStopOnInvalidSelector), 0); |