diff options
| author | Filippos Karapetis | 2009-05-12 18:57:28 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-12 18:57:28 +0000 |
| commit | 5e83e27bf6990f316d4fb2571b213fd8689dd861 (patch) | |
| tree | e4b0f27d106fa5d7cf14c28b109548bf109de6a5 | |
| parent | 4c156d3c784094ddf07db73ca06b729f505feb0c (diff) | |
| download | scummvm-rg350-5e83e27bf6990f316d4fb2571b213fd8689dd861.tar.gz scummvm-rg350-5e83e27bf6990f316d4fb2571b213fd8689dd861.tar.bz2 scummvm-rg350-5e83e27bf6990f316d4fb2571b213fd8689dd861.zip | |
Performed some cleanup on the different version checks
svn-id: r40499
| -rw-r--r-- | engines/sci/engine/game.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/scicore/versions.h | 16 |
3 files changed, 8 insertions, 18 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index 905ed878f7..a8e3316a4d 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -388,7 +388,7 @@ int script_init_engine(EngineState *s, sci_version_t version) { s->max_version = SCI_VERSION(9, 999, 999); s->min_version = 0; //Set no real limits - s->version = SCI_VERSION_DEFAULT_SCI0; + s->version = 0; s->kernel_opt_flags = 0; if (!version) { diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 9d1b1c88ca..abf2fc8fdb 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -1129,8 +1129,14 @@ void _k_base_setter(EngineState *s, reg_t object) { if (lookup_selector(s, object, s->selector_map.brLeft, NULL, NULL) != kSelectorVariable) return; // non-fatal - if (s->version <= SCI_VERSION_LTU_BASE_OB1) + // Note: there was a check here for a very old version of SCI, which supposedly needed + // to subtract 1 from absrect.top. The original check was for version 0.000.256, which + // does not exist (earliest one was KQ4 SCI, version 0.000.274). This code is left here + // for reference only +#if 0 + if (s->version <= SCI_VERSION(0,000,256)) --absrect.top; // Compensate for early SCI OB1 'bug' +#endif PUT_SEL32V(object, brLeft, absrect.left); PUT_SEL32V(object, brRight, absrect.right); diff --git a/engines/sci/scicore/versions.h b/engines/sci/scicore/versions.h index fe11160449..adde1b60fb 100644 --- a/engines/sci/scicore/versions.h +++ b/engines/sci/scicore/versions.h @@ -46,17 +46,6 @@ namespace Sci { ** - "FTU" means "First To Use" */ -#define SCI_VERSION_LAST_SCI0 SCI_VERSION(0,000,685) - -#define SCI_VERSION_DEFAULT_SCI0 SCI_VERSION_LAST_SCI0 -/* AFAIK this is the last published SCI0 version */ -#define SCI_VERSION_DEFAULT_SCI01 SCI_VERSION(1,000,72) -/* The version used by my implementation of QfG2 */ - - -#define SCI_VERSION_FTU_CENTERED_TEXT_AS_DEFAULT SCI_VERSION(0,000,629) -/* Last version known not to do this: 0.000.502 */ - #define SCI_VERSION_FTU_NEW_GETTIME SCI_VERSION(0,000,629) /* These versions of SCI has a different set of subfunctions in GetTime() */ @@ -79,11 +68,6 @@ namespace Sci { ** word header. */ -#define SCI_VERSION_LTU_BASE_OB1 SCI_VERSION(0,000,256) -/* First version version known not to have this bug: ? -** When doing CanBeHere(), augment y offset by 1 -*/ - #define SCI_VERSION_FTU_2ND_ANGLES SCI_VERSION(0,000,395) /* Last version known not to use this: ? ** Earlier versions assign 120 degrees to left & right , and 60 to up and down. |