[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.246,1.247 script_v7he.cpp,2.172,2.173 sound.cpp,1.491,1.492
kirben
kirben at users.sourceforge.net
Tue Jan 3 21:04:03 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob cdrom.cpp,1.5,1.6 dataio.cpp,1.12,1.13 draw.cpp,1.16,1.17 draw.h,1.7,1.8 game.cpp,1.30,1.31 global.cpp,1.10,1.11 global.h,1.9,1.10 gob.cpp,1.28,1.29 gob.h,1.12,1.13 goblin.cpp,1.26,1.27 init.cpp,1.13,1.14 init.h,1.5,1.6 inter.cpp,1.27,1.28 mult.cpp,1.14,1.15 palanim.cpp,1.13,1.14 parse.cpp,1.16,1.17 scenery.cpp,1.21,1.22 sound.cpp,1.14,1.15 sound.h,1.10,1.11 util.cpp,1.19,1.20 video.cpp,1.17,1.18
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.149,2.150
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9681/scumm
Modified Files:
akos.cpp script_v7he.cpp sound.cpp
Log Message:
Update comments
Add missing akos case.
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- akos.cpp 27 Nov 2005 23:22:42 -0000 1.246
+++ akos.cpp 4 Jan 2006 05:03:46 -0000 1.247
@@ -1538,7 +1538,6 @@
a->_flip = GW(2) != 0;
continue;
case AKC_CmdQue3:
- case AKC_C042:
if (_heversion >= 61)
tmp = GB(2);
else
@@ -1662,8 +1661,11 @@
break;
}
continue;
+ case AKC_C042:
+ akos_queCommand(9, a, a->_sound[GB(2)], 0);
+ continue;
case AKC_C044:
- akos_queCommand(3, a, a->_sound[a->getAnimVar(GB(2))], 0);
+ akos_queCommand(9, a, a->_sound[a->getAnimVar(GB(2))], 0);
continue;
case AKC_C045:
a->setUserCondition(GB(3), a->getAnimVar(GB(4)));
@@ -1786,6 +1788,9 @@
actorTalk(a->_heTalkQueue[param_1].sentence);
break;
+ case 9:
+ _sound->addSoundToQueue(param_1, 0, -1, 4);
+ break;
default:
error("akos_queCommand(%d,%d,%d,%d)", cmd, a->_number, param_1, param_2);
}
Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.172
retrieving revision 2.173
diff -u -d -r2.172 -r2.173
--- script_v7he.cpp 16 Nov 2005 06:51:02 -0000 2.172
+++ script_v7he.cpp 4 Jan 2006 05:03:46 -0000 2.173
@@ -436,7 +436,7 @@
value = pop();
var = pop();
_heSndSoundId = pop();
- debug(0,"o70_startSound: case 29 (snd %d, var %d, value %d)", _heSndSoundId, var, value);
+ debug(0,"o70_startSound: case 23 (snd %d, var %d, value %d)", _heSndSoundId, var, value);
break;
case 25:
value = pop();
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -d -r1.491 -r1.492
--- sound.cpp 30 Dec 2005 14:18:20 -0000 1.491
+++ sound.cpp 4 Jan 2006 05:03:46 -0000 1.492
@@ -328,7 +328,7 @@
_vm->_mixer->playRaw(NULL, sound, size, rate, flags, soundID);
}
- // Support for later Backyard sports games sounds
+ // Support for sound in later Backyard sports games
else if (READ_UINT32(ptr) == MKID('RIFF')) {
uint16 type;
int blockAlign;
@@ -352,12 +352,16 @@
}
_vm->_mixer->playRaw(&_heSoundChannels[heChannel], sound, size, rate, flags, soundID);
}
- // Support for Putt-Putt sounds - very hackish, too 8-)
+ // Support for sound in Humongous Entertainment games
else if (READ_UINT32(ptr) == MKID('DIGI') || READ_UINT32(ptr) == MKID('TALK') || READ_UINT32(ptr) == MKID('HSHD')) {
+ int priority;
+
if (READ_UINT32(ptr) == MKID('HSHD')) {
+ priority = READ_LE_UINT16(ptr + 10);
rate = READ_LE_UINT16(ptr + 14);
ptr += READ_BE_UINT32(ptr + 4);
} else {
+ priority = READ_LE_UINT16(ptr + 18);
rate = READ_LE_UINT16(ptr + 22);
ptr += 8 + READ_BE_UINT32(ptr + 12);
}
@@ -391,8 +395,8 @@
memcpy(sound, ptr + heOffset + 8, size);
_vm->_mixer->playRaw(&_heSoundChannels[heChannel], sound, size, rate, flags, soundID);
}
+ // Support for PCM music in 3DO versions of Humongous Entertainment games
else if (READ_UINT32(ptr) == MKID('MRAW')) {
- // pcm music in 3DO humongous games
ptr += 8 + READ_BE_UINT32(ptr+12);
if (READ_UINT32(ptr) != MKID('SDAT'))
return;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob cdrom.cpp,1.5,1.6 dataio.cpp,1.12,1.13 draw.cpp,1.16,1.17 draw.h,1.7,1.8 game.cpp,1.30,1.31 global.cpp,1.10,1.11 global.h,1.9,1.10 gob.cpp,1.28,1.29 gob.h,1.12,1.13 goblin.cpp,1.26,1.27 init.cpp,1.13,1.14 init.h,1.5,1.6 inter.cpp,1.27,1.28 mult.cpp,1.14,1.15 palanim.cpp,1.13,1.14 parse.cpp,1.16,1.17 scenery.cpp,1.21,1.22 sound.cpp,1.14,1.15 sound.h,1.10,1.11 util.cpp,1.19,1.20 video.cpp,1.17,1.18
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm-md5.h,2.149,2.150
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list