diff options
| author | Filippos Karapetis | 2009-05-15 09:04:21 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-15 09:04:21 +0000 |
| commit | 565cfa074d25fbfc2458a65fe8fc300d78a2afa8 (patch) | |
| tree | aba4ba158ef3bd890652710a9d238e95d0915e7e /engines/sci/engine/game.cpp | |
| parent | adaa0472c5e64d0ff6cae12368ffdfa61b24d2f7 (diff) | |
| download | scummvm-rg350-565cfa074d25fbfc2458a65fe8fc300d78a2afa8.tar.gz scummvm-rg350-565cfa074d25fbfc2458a65fe8fc300d78a2afa8.tar.bz2 scummvm-rg350-565cfa074d25fbfc2458a65fe8fc300d78a2afa8.zip | |
Simplified SCI versions to be SCI version generations, and fixed some game entries in the process. Also, added a sanity check for invalid game entries
svn-id: r40596
Diffstat (limited to 'engines/sci/engine/game.cpp')
| -rw-r--r-- | engines/sci/engine/game.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index aaa9b38a78..720bf04176 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -97,7 +97,7 @@ int _reset_graphics_input(EngineState *s) { } else { resource = s->resmgr->findResource(kResourceTypePalette, 999, 1); if (resource) { - if (s->version < SCI_VERSION(1, 001, 000)) + if (s->version < SCI_VERSION_1_1) s->gfx_state->gfxResMan->setStaticPalette(gfxr_read_pal1(999, resource->data, resource->size)); else s->gfx_state->gfxResMan->setStaticPalette(gfxr_read_pal11(999, resource->data, resource->size)); @@ -388,12 +388,12 @@ int script_init_engine(EngineState *s, sci_version_t version) { s->kernel_opt_flags = 0; s->version = version; - if (s->version >= SCI_VERSION(1, 001, 000)) + if (s->version >= SCI_VERSION_1_1) result = create_class_table_sci11(s); else result = create_class_table_sci0(s); - s->seg_manager = new SegManager(s->version >= SCI_VERSION(1, 001, 000)); + s->seg_manager = new SegManager(s->version >= SCI_VERSION_1_1); s->gc_countdown = GC_INTERVAL - 1; if (result) { @@ -444,7 +444,7 @@ int script_init_engine(EngineState *s, sci_version_t version) { s->bp_list = NULL; // No breakpoints defined s->have_bp = 0; - if (s->flags & GF_SCI1_LOFSABSOLUTE && s->version < SCI_VERSION(1, 001, 000)) + if (s->flags & GF_SCI1_LOFSABSOLUTE && s->version < SCI_VERSION_1_1) s->seg_manager->setExportWidth(1); else s->seg_manager->setExportWidth(0); |