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 | |
| 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')
| -rw-r--r-- | engines/sci/engine/kmovement.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/state.h | 2 | ||||
| -rw-r--r-- | engines/sci/sci.h | 1 | ||||
| -rw-r--r-- | engines/sci/scicore/versions.h | 5 |
4 files changed, 2 insertions, 8 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; diff --git a/engines/sci/sci.h b/engines/sci/sci.h index 74a333e5d8..3a4ce5e5fe 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -127,7 +127,6 @@ enum SciGameFlags { GF_LOFSABSOLUTE = (1 << 5), /* Applies to all versions from 1.000.510 onwards - ** In later SCI1 versions, CanBeHere is called inversely. ** Also in kDisplay(), if the text would not fit on the screen, it ** is moved to the left and upwards until it fits. ** Finally, kDoSound() is different than in earlier SCI1 versions. diff --git a/engines/sci/scicore/versions.h b/engines/sci/scicore/versions.h index cccd66e949..22decff28d 100644 --- a/engines/sci/scicore/versions.h +++ b/engines/sci/scicore/versions.h @@ -88,11 +88,6 @@ namespace Sci { instructions is absolute rather than relative. */ -#define SCI_VERSION_FTU_INVERSE_CANBEHERE SCI_VERSION(1,000,510) -/* FIXME: This shouldn't be a version number. - * But it'll do for now. - */ - #define SCI_VERSION_FTU_DISPLAY_COORDS_FUZZY SCI_VERSION(1,000,510) /* First version known to do this: ? In later versions of SCI1 kDisplay(), if the text would not fit on |