[Scummvm-cvs-logs] SF.net SVN: scummvm: [21576] scummvm/trunk/engines/scumm
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Mon Apr 3 04:36:03 CEST 2006
Revision: 21576
Author: kirben
Date: 2006-04-03 04:35:02 -0700 (Mon, 03 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21576&view=rev
Log Message:
-----------
GF_HE_CURSORLESS feature flag not required, since HE games always set a default cursor too.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/cursor.cpp
scummvm/trunk/engines/scumm/he/intern_he.h
scummvm/trunk/engines/scumm/intern.h
scummvm/trunk/engines/scumm/plugin.cpp
scummvm/trunk/engines/scumm/scumm.cpp
scummvm/trunk/engines/scumm/scumm.h
Modified: scummvm/trunk/engines/scumm/cursor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/cursor.cpp 2006-04-03 11:12:42 UTC (rev 21575)
+++ scummvm/trunk/engines/scumm/cursor.cpp 2006-04-03 11:35:02 UTC (rev 21576)
@@ -184,7 +184,7 @@
_resExtractor->setCursor(img);
}
-void ScummEngine_v90he::setDefaultCursor() {
+void ScummEngine_v70he::setDefaultCursor() {
const uint16 *src;
int i, j;
static byte palette[] = { 0xff, 0xff, 0xff, 0,
Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h 2006-04-03 11:12:42 UTC (rev 21575)
+++ scummvm/trunk/engines/scumm/he/intern_he.h 2006-04-03 11:35:02 UTC (rev 21576)
@@ -146,6 +146,7 @@
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 @@
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();
Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h 2006-04-03 11:12:42 UTC (rev 21575)
+++ scummvm/trunk/engines/scumm/intern.h 2006-04-03 11:35:02 UTC (rev 21576)
@@ -585,7 +585,7 @@
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);
Modified: scummvm/trunk/engines/scumm/plugin.cpp
===================================================================
--- scummvm/trunk/engines/scumm/plugin.cpp 2006-04-03 11:12:42 UTC (rev 21575)
+++ scummvm/trunk/engines/scumm/plugin.cpp 2006-04-03 11:35:02 UTC (rev 21576)
@@ -319,7 +319,7 @@
// 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 @@
{"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 @@
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
Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp 2006-04-03 11:12:42 UTC (rev 21575)
+++ scummvm/trunk/engines/scumm/scumm.cpp 2006-04-03 11:35:02 UTC (rev 21576)
@@ -1249,7 +1249,7 @@
}
void ScummEngine_v60he::scummInit() {
- ScummEngine::scummInit();
+ ScummEngine_v6::scummInit();
// HACK cursor hotspot is wrong
// Original games used
@@ -1276,9 +1276,6 @@
_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:
Modified: scummvm/trunk/engines/scumm/scumm.h
===================================================================
--- scummvm/trunk/engines/scumm/scumm.h 2006-04-03 11:12:42 UTC (rev 21575)
+++ scummvm/trunk/engines/scumm/scumm.h 2006-04-03 11:35:02 UTC (rev 21576)
@@ -119,9 +119,6 @@
*/
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,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list