diff options
| author | Max Horn | 2009-06-04 21:44:39 +0000 |
|---|---|---|
| committer | Max Horn | 2009-06-04 21:44:39 +0000 |
| commit | 10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc (patch) | |
| tree | 06064a5a492015e1f79f3a3b8d2129c39346aa1f /engines/sci/engine/kmovement.cpp | |
| parent | 870db34cd1e435891e02f54c1c0dc013f257135d (diff) | |
| download | scummvm-rg350-10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc.tar.gz scummvm-rg350-10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc.tar.bz2 scummvm-rg350-10c54394bd2f97a6a59a4fc1aedfcad09c40f1dc.zip | |
SCI: Renamed EngineState::flags and version to _flags and _version (following our conventions); also slightly changed the EngineState constructor to init _version & _flags, and used this to make them constant
svn-id: r41177
Diffstat (limited to 'engines/sci/engine/kmovement.cpp')
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index cd4307678b..b116fa4093 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -273,7 +273,7 @@ static void bresenham_autodetect(EngineState *s) { } buf = s->seg_manager->getScript(fptr.segment)->buf + fptr.offset; - handle_movecnt = (s->version <= SCI_VERSION_0 || checksum_bytes(buf, 8) == 0x216) ? INCREMENT_MOVECNT : IGNORE_MOVECNT; + handle_movecnt = (s->_version <= SCI_VERSION_0 || checksum_bytes(buf, 8) == 0x216) ? INCREMENT_MOVECNT : IGNORE_MOVECNT; sciprintf("b-moveCnt action based on checksum: %s\n", handle_movecnt == IGNORE_MOVECNT ? "ignore" : "increment"); } else { warning("bresenham_autodetect failed"); @@ -292,7 +292,7 @@ reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) { int completed = 0; int max_movcnt = GET_SEL32V(client, moveSpeed); - if (s->version > SCI_VERSION_0) + if (s->_version > SCI_VERSION_0) signal &= ~_K_VIEW_SIG_FLAG_HIT_OBSTACLE; if (handle_movecnt == UNINITIALIZED) @@ -379,7 +379,7 @@ reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) { completed = 1; } - if (s->version > SCI_VERSION_0) + if (s->_version > SCI_VERSION_0) if (completed) invoke_selector(INV_SEL(mover, moveDone, kStopOnInvalidSelector), 0); |