diff options
| author | Filippos Karapetis | 2009-05-14 11:11:56 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-05-14 11:11:56 +0000 |
| commit | 4ec6c4127fec21a4c24e1d98bb93459a5dd182f5 (patch) | |
| tree | b1e491a35d910fb6c4d2ad9add10281ec08f7a98 /engines/sci/engine | |
| parent | 891a8fae05d81f7cbc8da1e191e2da84107e0737 (diff) | |
| download | scummvm-rg350-4ec6c4127fec21a4c24e1d98bb93459a5dd182f5.tar.gz scummvm-rg350-4ec6c4127fec21a4c24e1d98bb93459a5dd182f5.tar.bz2 scummvm-rg350-4ec6c4127fec21a4c24e1d98bb93459a5dd182f5.zip | |
Added a feature flag for the SCI1.1 behavior of kSetCursor() in Eco 1 and KQ5 CD. Some cleanup
svn-id: r40554
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 5 | ||||
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index c7e0102d18..e6ec13b0e2 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -309,10 +309,7 @@ reg_t kSetCursor(EngineState *s, int funct_nr, int argc, reg_t *argv) { } case 2 : case 4 : - if (s->version >= SCI_VERSION(1, 1, 0) || - s->_gameName.equalsIgnoreCase("eco") || - (s->_gameName.equalsIgnoreCase("KQ5") && s->version == SCI_VERSION(1, 000, 784)) // KQ5 CD - ) { + if (s->version >= SCI_VERSION(1, 1, 0) || (s->flags & GF_SCI1_NEWSETCURSOR)) { GFX_ASSERT(gfxop_set_pointer_position(s->gfx_state, Common::Point(UKPV(0), UKPV(1)))); } else { if (SKPV_OR_ALT(1, 1)) { diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index e6b2a688cb..db7c0651a7 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -136,7 +136,7 @@ void process_sound_events(EngineState *s) { /* Get all sound events, apply their song_handle_t handle; int cue; - if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_1) + if (s->version >= SCI_VERSION(1,000,000)) return; /* SCI01 and later explicitly poll for everything */ @@ -984,7 +984,7 @@ reg_t kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) { reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) { if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_2) return kDoSound_SCI1(s, funct_nr, argc, argv); - else if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_1) + else if (s->version >= SCI_VERSION(1,000,000)) return kDoSound_SCI01(s, funct_nr, argc, argv); else return kDoSound_SCI0(s, funct_nr, argc, argv); |