[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.173,2.174 script_v6.cpp,1.348,1.349 script_v6he.cpp,2.73,2.74 scumm.cpp,1.72,1.73
Travis Howell
kirben at users.sourceforge.net
Wed Jun 30 04:05:01 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27857/scumm
Modified Files:
intern.h script_v6.cpp script_v6he.cpp scumm.cpp
Log Message:
Changes for non-akos version of puttputt
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.173
retrieving revision 2.174
diff -u -d -r2.173 -r2.174
--- intern.h 28 Jun 2004 13:47:39 -0000 2.173
+++ intern.h 30 Jun 2004 11:03:55 -0000 2.174
@@ -573,7 +573,6 @@
void o6_drawBlastObject();
void o6_setBlastObjectWindow();
void o6_setState();
- void o6_startSound();
void o6_roomOps();
void o6_actorOps();
void o6_wait();
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.348
retrieving revision 1.349
diff -u -d -r1.348 -r1.349
--- script_v6.cpp 29 Jun 2004 11:02:15 -0000 1.348
+++ script_v6.cpp 30 Jun 2004 11:03:55 -0000 1.349
@@ -403,12 +403,12 @@
int size;
ArrayHeader *ah;
- if (!(_features & GF_HUMONGOUS)) {
- if (type != rtSound)
- type = rtInventory;
- } else {
+ if (_heversion >= 60) {
if (type == rtScript || type == rtRoom)
type = rtCostume;
+ } else {
+ if (type != rtSound)
+ type = rtInventory;
}
nukeArray(array);
@@ -502,8 +502,7 @@
assert(base >= 0 && base < FROM_LE_16(ah->dim1) * FROM_LE_16(ah->dim2));
- if (FROM_LE_16(ah->type) == 4 || (_features & GF_HUMONGOUS
- && FROM_LE_16(ah->type) == rtCostume)) {
+ if (FROM_LE_16(ah->type) == 4 || (_heversion >= 60 && FROM_LE_16(ah->type) == rtCostume)) {
return ah->data[base];
} else if (_version == 8) {
return (int32)READ_LE_UINT32(ah->data + base * 4);
@@ -520,8 +519,7 @@
assert(base >= 0 && base < FROM_LE_16(ah->dim1) * FROM_LE_16(ah->dim2));
- if (FROM_LE_16(ah->type) == rtSound || (_features & GF_HUMONGOUS
- && FROM_LE_16(ah->type) == rtCostume)) {
+ if (FROM_LE_16(ah->type) == rtSound || (_heversion >= 60 && FROM_LE_16(ah->type) == rtCostume)) {
ah->data[base] = value;
} else if (_version == 8) {
#if defined(SCUMM_NEED_ALIGNMENT)
@@ -1028,8 +1026,17 @@
void ScummEngine_v6::o6_startSound() {
if (_features & GF_DIGI_IMUSE)
_imuseDigital->startSfx(pop(), 64);
- else
+ else {
+ if (_features & GF_HUMONGOUS) {
+ // Seems to range between 952 - 9000
+ // In Fatty Bear's Birthday Surprise the piano uses offsets 1 - 23 to
+ // indicate which note to play, but only when using the standard piano
+ // sound. See also o6_soundOps().
+ int offset = pop();
+ debug(2, "o6_startSound: offset %d", offset);
+ }
_sound->addSoundToQueue(pop());
+ }
}
void ScummEngine_v6::o6_stopSound() {
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.73
retrieving revision 2.74
diff -u -d -r2.73 -r2.74
--- script_v6he.cpp 29 Jun 2004 11:02:15 -0000 2.73
+++ script_v6he.cpp 30 Jun 2004 11:03:55 -0000 2.74
@@ -400,16 +400,6 @@
clearDrawObjectQueue();
}
-void ScummEngine_v6he::o6_startSound() {
- // Seems to range between 952 - 9000
- // In Fatty Bear's Birthday Surprise the piano uses offsets 1 - 23 to
- // indicate which note to play, but only when using the standard piano
- // sound. See also o6_soundOps().
- int offset = pop();
- debug(2, "o6_startSound: offset %d", offset);
- _sound->addSoundToQueue(pop());
-}
-
void ScummEngine_v6he::o6_roomOps() {
int a, b, c, d, e;
byte op;
@@ -611,10 +601,7 @@
j = pop();
i = pop();
checkRange(255, 0, i, "Illegal palette slot %d");
- if (_features & GF_NEW_COSTUMES)
- a->remapActorPaletteColor(i, j);
- else
- a->setPalette(i, j);
+ a->remapActorPaletteColor(i, j);
break;
case 87: // SO_TALK_COLOR
a->talkColor = pop();
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- scumm.cpp 30 Jun 2004 06:46:32 -0000 1.72
+++ scumm.cpp 30 Jun 2004 11:03:55 -0000 1.73
@@ -343,7 +343,7 @@
//
// Use main table to specify default flags and this table to override defaults.
static const ScummGameSettings he_md5_settings[] = {
- {"0b3222aaa7efcf283eb621e0cefd26cc", "Putt-Putt Joins The Parade (early version)", GID_HEGAME, 6, 60, MDT_ADLIB | MDT_NATIVE,
+ {"0b3222aaa7efcf283eb621e0cefd26cc", "Putt-Putt Joins The Parade (early version)", GID_HEGAME, 6, 0, MDT_ADLIB | MDT_NATIVE,
GF_NEW_OPCODES | GF_USE_KEY | GF_HUMONGOUS, 0},
{NULL, NULL, 0, 0, 0, MDT_NONE, 0, 0}
};
More information about the Scummvm-git-logs
mailing list