diff options
| author | Filippos Karapetis | 2009-05-14 07:14:08 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-14 07:14:08 +0000 |
| commit | 3117a8d87fe2f858274fad87f166eb16b1147e2b (patch) | |
| tree | f1ad2c7064b1ea0036e81248e58c093f428d5019 /engines/sci/engine | |
| parent | dd54193f9585b88627355e3da2d8d35581f43ed3 (diff) | |
| download | scummvm-rg350-3117a8d87fe2f858274fad87f166eb16b1147e2b.tar.gz scummvm-rg350-3117a8d87fe2f858274fad87f166eb16b1147e2b.tar.bz2 scummvm-rg350-3117a8d87fe2f858274fad87f166eb16b1147e2b.zip | |
Removed the hack used to check for the existence of the CantBeHere() selector
svn-id: r40549
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp index 48aebef000..ba1f4705cb 100644 --- a/engines/sci/engine/kmovement.cpp +++ b/engines/sci/engine/kmovement.cpp @@ -359,7 +359,7 @@ reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) { SCIkdebug(SCIkBRESEN, "New data: (x,y)=(%d,%d), di=%d\n", x, y, bdi); - if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE) + if (s->selector_map.cantBeHere != -1) invoke_selector(INV_SEL(client, cantBeHere, 0), 0); else invoke_selector(INV_SEL(client, canBeHere, 0), 0); diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index 7eee4800d0..e361601444 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -285,7 +285,7 @@ public: PaletteEntry get_pic_color(EngineState *s, int color); static inline reg_t not_register(EngineState *s, reg_t r) { - if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE) + if (s->selector_map.cantBeHere != -1) return make_reg(0, !r.offset); else return r; |