diff options
author | Filippos Karapetis | 2009-10-21 19:19:03 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-10-21 19:19:03 +0000 |
commit | b105d690e398b47063b332245a783190f2cc84de (patch) | |
tree | 304b3c0fc5c2538430f949f77ec8075d3f7894ee /engines/sci/engine/kmovement.cpp | |
parent | 95cefe311c29a5ea81ac17db25ecf142bd8352de (diff) | |
download | scummvm-rg350-b105d690e398b47063b332245a783190f2cc84de.tar.gz scummvm-rg350-b105d690e398b47063b332245a783190f2cc84de.tar.bz2 scummvm-rg350-b105d690e398b47063b332245a783190f2cc84de.zip |
- Removed kShow() and the related code it uses - it's a debugging function, and we have the same functionality in the debug console
- Merged the view signal flags from kernel.h and gui_animate.h, and named them appropriately. Also, updated the notes next to them, cause some were incorrectly marked as not used in our engine
- Added a note about a hack used in the old GUI in the view signal flags
- Moved the control state flags inside gui_helpers.h
svn-id: r45310
Diffstat (limited to 'engines/sci/engine/kmovement.cpp')
-rw-r--r-- | engines/sci/engine/kmovement.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 62a8bc88b0..7c8d070d10 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -27,6 +27,7 @@ #include "sci/resource.h" #include "sci/engine/state.h" #include "sci/engine/kernel.h" +#include "sci/gui/gui_animate.h" namespace Sci { @@ -247,7 +248,7 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) { int max_movcnt = GET_SEL32V(segMan, client, moveSpeed); if (getSciVersion() > SCI_VERSION_01) - signal &= ~_K_VIEW_SIG_FLAG_HIT_OBSTACLE; + signal &= ~kSignalHitObstacle; PUT_SEL32(segMan, client, signal, make_reg(0, signal)); // This is a NOP for SCI0 oldx = x; @@ -324,7 +325,7 @@ reg_t kDoBresen(EngineState *s, int argc, reg_t *argv) { PUT_SEL32V(segMan, client, x, oldx); PUT_SEL32V(segMan, client, y, oldy); - PUT_SEL32V(segMan, client, signal, (signal | _K_VIEW_SIG_FLAG_HIT_OBSTACLE)); + PUT_SEL32V(segMan, client, signal, (signal | kSignalHitObstacle)); debugC(2, kDebugLevelBresen, "Finished mover %04x:%04x by collision\n", PRINT_REG(mover)); completed = 1; |