[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.229.2.6,1.229.2.7 cursor.cpp,2.3,2.3.2.1 help.cpp,1.17,1.17.2.1 object.cpp,1.166.2.3,1.166.2.4 scumm.h,1.369.2.6,1.369.2.7 scummvm.cpp,2.577.2.19,2.577.2.20
Travis Howell
kirben at users.sourceforge.net
Fri Jul 9 21:12:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12250/scumm
Modified Files:
Tag: branch-0-6-0
actor.cpp cursor.cpp help.cpp object.cpp scumm.h scummvm.cpp
Log Message:
Back port HE games cursor hotspot fix.
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.229.2.6
retrieving revision 1.229.2.7
diff -u -d -r1.229.2.6 -r1.229.2.7
--- actor.cpp 7 Jul 2004 10:09:28 -0000 1.229.2.6
+++ actor.cpp 10 Jul 2004 04:11:36 -0000 1.229.2.7
@@ -1682,7 +1682,7 @@
akpl = findResource(MKID('AKPL'), akos);
if (!akpl) {
- debugC(DEBUG_ACTORS, "Can't remap actor %d costume %d doesn't contain an RGB block", number, costume);
+ warning("Can't remap actor %d, costume %d doesn't contain an AKPL block", number, costume);
return;
}
@@ -1695,7 +1695,7 @@
rgbs = findResource(MKID('RGBS'), akos);
if (!rgbs) {
- warning("Can't remap actor %d costume %d doesn't contain an RGB block", number, costume);
+ debugC(DEBUG_ACTORS, "Can't remap actor %d costume %d doesn't contain an RGB block", number, costume);
return;
}
// skip resource header
Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.3
retrieving revision 2.3.2.1
diff -u -d -r2.3 -r2.3.2.1
--- cursor.cpp 6 Jan 2004 12:45:30 -0000 2.3
+++ cursor.cpp 10 Jul 2004 04:11:37 -0000 2.3.2.1
@@ -160,11 +160,6 @@
void ScummEngine::setCursorHotspot(int x, int y) {
_cursor.hotspotX = x;
_cursor.hotspotY = y;
- // FIXME this hacks around offset cursor in the humongous games
- if (_features & GF_HUMONGOUS) {
- _cursor.hotspotX += 15;
- _cursor.hotspotY += 15;
- }
}
void ScummEngine::updateCursor() {
Index: help.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/help.cpp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- help.cpp 6 Jan 2004 12:45:30 -0000 1.17
+++ help.cpp 10 Jul 2004 04:11:37 -0000 1.17.2.1
@@ -53,7 +53,7 @@
break;
/* TODO - I don't know the controls for these games
case GID_PUTTDEMO:
- case GID_PUTTPUTT:
+ case GID_HEGAME:
*/
default:
return 2;
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.166.2.3
retrieving revision 1.166.2.4
diff -u -d -r1.166.2.3 -r1.166.2.4
--- object.cpp 2 Mar 2004 12:19:33 -0000 1.166.2.3
+++ object.cpp 10 Jul 2004 04:11:37 -0000 1.166.2.4
@@ -1348,8 +1348,9 @@
w = READ_LE_UINT16(&foir.imhd->v7.width) / 8;
h = READ_LE_UINT16(&foir.imhd->v7.height) / 8;
} else {
- setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x),
- READ_LE_UINT16(&foir.imhd->old.hotspot[0].y));
+ if (!(_features & GF_HUMONGOUS))
+ setCursorHotspot(READ_LE_UINT16(&foir.imhd->old.hotspot[0].x),
+ READ_LE_UINT16(&foir.imhd->old.hotspot[0].y));
w = READ_LE_UINT16(&foir.cdhd->v6.w) / 8;
h = READ_LE_UINT16(&foir.cdhd->v6.h) / 8;
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.369.2.6
retrieving revision 1.369.2.7
diff -u -d -r1.369.2.6 -r1.369.2.7
--- scumm.h 7 Jul 2004 10:09:30 -0000 1.369.2.6
+++ scumm.h 10 Jul 2004 04:11:38 -0000 1.369.2.7
@@ -220,13 +220,12 @@
GID_CMI,
GID_MANIAC,
GID_ZAK,
- GID_PUTTPUTT,
+ GID_HEGAME,
GID_PUTTDEMO,
- GID_PUTTMOON,
GID_FBEAR,
GID_PJSDEMO,
GID_MONKEY_SEGA,
- GID_FBPACK
+ GID_FUNPACK
};
#define _baseRooms res.address[rtRoom]
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/Attic/scummvm.cpp,v
retrieving revision 2.577.2.19
retrieving revision 2.577.2.20
diff -u -d -r2.577.2.19 -r2.577.2.20
--- scummvm.cpp 7 Jul 2004 10:09:30 -0000 2.577.2.19
+++ scummvm.cpp 10 Jul 2004 04:11:38 -0000 2.577.2.20
@@ -154,17 +154,17 @@
GF_USE_KEY, 0},
/* Scumm Version 6 */
- {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_PUTTPUTT, 6, MDT_ADLIB | MDT_NATIVE,
+ {"puttputt", "Putt-Putt Joins The Parade (DOS)", GID_HEGAME, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"puttdemo", "Putt-Putt Joins The Parade (DOS Demo)", GID_PUTTDEMO, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0},
- {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
+ {"moondemo", "Putt-Putt Goes To The Moon (DOS Demo)", GID_HEGAME, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
+ {"puttmoon", "Putt-Putt Goes To The Moon (DOS)", GID_HEGAME, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"funpack", "Putt-Putt's Fun Pack", GID_PUTTMOON, 6, MDT_ADLIB | MDT_NATIVE,
+ {"funpack", "Putt-Putt's Fun Pack", GID_FUNPACK, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"fbpack", "Fatty Bear's Fun Pack", GID_FBPACK, 6, MDT_ADLIB | MDT_NATIVE,
+ {"fbpack", "Fatty Bear's Fun Pack", GID_HEGAME, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
{"fbear", "Fatty Bear's Birthday Surprise (DOS)", GID_FBEAR, 6, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
@@ -211,29 +211,29 @@
/* Note that both full versions of Humongous games and demos were often released for
* several interpreter versions... */
#ifdef HEGAMES
- {"puttwin", "Putt-Putt Joins The Parade (Windows)", GID_PUTTPUTT, 6, MDT_NONE,
+ {"puttwin", "Putt-Putt Joins The Parade (Windows)", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, "puttputt"},
// Humongous Entertainment Scumm Version 7
- {"catalog", "Humongous Interactive Catalog", GID_PUTTPUTT, 6, MDT_NONE,
+ {"catalog", "Humongous Interactive Catalog", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"farm", "Let's Explore the Farm with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
+ {"farm", "Let's Explore the Farm with Buzzy", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
+ {"farmdemo", "Let's Explore the Farm with Buzzy (Demo)", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"airport", "Let's Explore the Airport with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
+ {"airport", "Let's Explore the Airport with Buzzy", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
+ {"airdemo", "Let's Explore the Airport with Buzzy (Demo)", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"jungle", "Let's Explore the Jungle with Buzzy", GID_PUTTPUTT, 6, MDT_NONE,
+ {"jungle", "Let's Explore the Jungle with Buzzy", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"puttzoo", "Putt-Putt Saves the Zoo", GID_PUTTPUTT, 6, MDT_NONE,
+ {"puttzoo", "Putt-Putt Saves the Zoo", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
+ {"zoodemo", "Putt-Putt Saves the Zoo (Demo)", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_PUTTPUTT, 6, MDT_NONE,
+ {"freddi", "Freddi Fish 1: The Case of the Missing Kelp Seeds", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
- {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_PUTTPUTT, 6, MDT_NONE,
+ {"freddemo", "Freddi Fish 1: The Case of the Missing Kelp Seeds (Demo)", GID_HEGAME, 6, MDT_NONE,
GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
// Humongous Entertainment Scumm Version 8.0 ? Scummsrc.80
@@ -1083,6 +1083,12 @@
_flashlight.buffer = NULL;
}
+ // HACK curcor hotspot is wrong
+ // Original games used
+ // setCursorHotspot(8, 7);
+ if (_gameId == GID_FUNPACK)
+ setCursorHotspot(16, 16);
+
_mouse.x = 104;
_mouse.y = 56;
More information about the Scummvm-git-logs
mailing list