diff options
| -rw-r--r-- | engines/scumm/cursor.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/intern_he.h | 4 | ||||
| -rw-r--r-- | engines/scumm/intern.h | 2 | ||||
| -rw-r--r-- | engines/scumm/plugin.cpp | 10 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 5 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 3 |
6 files changed, 9 insertions, 17 deletions
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp index 812d70f60e..b9dd2302e3 100644 --- a/engines/scumm/cursor.cpp +++ b/engines/scumm/cursor.cpp @@ -184,7 +184,7 @@ void ScummEngine_v70he::setCursorFromImg(uint img, uint room, uint imgindex) { _resExtractor->setCursor(img); } -void ScummEngine_v90he::setDefaultCursor() { +void ScummEngine_v70he::setDefaultCursor() { const uint16 *src; int i, j; static byte palette[] = { 0xff, 0xff, 0xff, 0, diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h index c319c319ac..281ecfa237 100644 --- a/engines/scumm/he/intern_he.h +++ b/engines/scumm/he/intern_he.h @@ -146,6 +146,7 @@ protected: void appendSubstring(int dst, int src, int len2, int len); virtual void setCursorFromImg(uint img, uint room, uint imgindex); + virtual void setDefaultCursor(); virtual void clearDrawQueues(); @@ -464,9 +465,6 @@ protected: void copyHEPalette(int dstPalSlot, int srcPalSlot); void copyHEPaletteColor(int palSlot, uint8 dstColor, uint8 srcColor); - - void setDefaultCursor(); - protected: /* HE version 90 script opcodes */ void o90_dup_n(); diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h index 3d2c540744..489214a473 100644 --- a/engines/scumm/intern.h +++ b/engines/scumm/intern.h @@ -585,7 +585,7 @@ protected: virtual void writeArray(int array, int index, int base, int value); void shuffleArray(int num, int minIdx, int maxIdx); - void setDefaultCursor(); + virtual void setDefaultCursor(); void setCursorTransparency(int a); void setCursorHotspot(int x, int y); diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp index 027fc746b1..303911fe88 100644 --- a/engines/scumm/plugin.cpp +++ b/engines/scumm/plugin.cpp @@ -319,7 +319,7 @@ static const ScummGameSettings scumm_settings[] = { // these and later games can easily be identified by the .(a) file instead of a .he1 // and INIB chunk in the .he0 {"lost", 0, GID_HEGAME, 6, 98, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows}, + GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, {"puttrace", 0, GID_PUTTRACE, 6, 98, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, {"bluesabctime", 0, GID_HEGAME, 6, 98, MDT_NONE, @@ -489,8 +489,8 @@ static const ScummGameSettings extra_versions[] = { {"freddicove", "unenc", GID_HEGAME, 6, 99, MDT_NONE, GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows}, {"freddicove", "HE 100", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_NOSUBTITLES | GF_HE_LOCALIZED | GF_16BIT_COLOR, Common::kPlatformWindows}, - {"lost", "HE 99", GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows}, - {"lost", "HE 100", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows}, + {"lost", "HE 99", GID_HEGAME, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, + {"lost", "HE 100", GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // The following are meant to be generic HE game variants and as such do // not specify a game ID. Make sure that these are last in the table, else @@ -691,9 +691,9 @@ static const ScummGameSettings multiple_versions_md5_settings[] = { GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_985, Common::kPlatformWindows}, // PJP2DEMO {"a2bb6aa0537402c1b3c2ea899ccef64b", "Test", GID_HEGAME, 6, 99, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows}, + GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, {"a561d2e2413cc1c71d5a1bf87bf493ea", "Updated", GID_HEGAME, 6, 100, MDT_NONE, - GF_USE_KEY | GF_NEW_COSTUMES | GF_HE_CURSORLESS, Common::kPlatformWindows}, + GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, {"055ffe4f47753e47594ac67823220c54", "German", GID_PUTTRACE, 6, 99, MDT_NONE, GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows}, // ToffRennen diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index f504a00a4e..e0cb903f65 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1249,7 +1249,7 @@ void ScummEngine_v6::scummInit() { } void ScummEngine_v60he::scummInit() { - ScummEngine::scummInit(); + ScummEngine_v6::scummInit(); // HACK cursor hotspot is wrong // Original games used @@ -1276,9 +1276,6 @@ void ScummEngine_v90he::scummInit() { _sprite->resetTables(0); memset(&_wizParams, 0, sizeof(_wizParams)); - if (_game.features & GF_HE_CURSORLESS) - setDefaultCursor(); - if (_game.heversion >= 98) { switch (_game.id) { case GID_PUTTRACE: diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index bd869d9868..88d9d6453e 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -119,9 +119,6 @@ enum GameFeatures { */ GF_FEW_LOCALS = 1 << 11, - /** HE games without cursor resources */ - GF_HE_CURSORLESS = 1 << 12, - /** HE games for which localized versions exist */ GF_HE_LOCALIZED = 1 << 13, |