[Scummvm-cvs-logs] CVS: scummvm/scumm sound_he.cpp,2.14,2.15
kirben
kirben at users.sourceforge.net
Mon Jan 16 01:28:20 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.187,2.188 script_v6.cpp,1.457,1.458 script_v90he.cpp,2.292,2.293 scumm-md5.h,2.159,2.160 sprite_he.cpp,1.156,1.157 wiz_he.cpp,2.106,2.107 wiz_he.h,2.35,2.36
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.529.2.7,2.529.2.8 resource_v7he.cpp,1.46.2.3,1.46.2.4 script_v100he.cpp,2.173.2.4,2.173.2.5 script_v7he.cpp,2.166.2.5,2.166.2.6 script_v80he.cpp,2.125.2.2,2.125.2.3 script_v90he.cpp,2.281.2.4,2.281.2.5 scumm.cpp,1.603.2.31,1.603.2.32 scumm.h,1.647.2.11,1.647.2.12 sound.cpp,1.479.2.7,1.479.2.8 sound.h,1.92.2.2,1.92.2.3 sound_he.cpp,2.10.2.2,2.10.2.3 vars.cpp,1.150.2.6,1.150.2.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12723/scumm
Modified Files:
sound_he.cpp
Log Message:
Small correction to sound opcodes in HE games.
Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.14
retrieving revision 2.15
diff -u -d -r2.14 -r2.15
--- sound_he.cpp 15 Jan 2006 11:12:57 -0000 2.14
+++ sound_he.cpp 16 Jan 2006 09:27:36 -0000 2.15
@@ -107,7 +107,7 @@
}
if (chan != -1) {
- debug(0, "getSoundVar: sound %d var %d result %d", sound, var, _heChannel[chan].soundVars[var]);
+ debug(1, "getSoundVar: sound %d var %d result %d", sound, var, _heChannel[chan].soundVars[var]);
return _heChannel[chan].soundVars[var];
} else {
return 0;
@@ -124,7 +124,7 @@
}
if (chan != -1) {
- debug(0, "setSoundVar: sound %d var %d val %d", sound, var, val);
+ debug(1, "setSoundVar: sound %d var %d val %d", sound, var, val);
_heChannel[chan].soundVars[var] = val;
}
}
@@ -220,7 +220,7 @@
break;
}
- debug(1, "Channel %d Timer %d Time %d", chan,tmr, time);
+ debug(1, "Channel %d Timer %d Time %d", chan, tmr, time);
if (time >= tmr)
break;
@@ -263,14 +263,18 @@
case 48: // Add
var = READ_LE_UINT16(codePtr); codePtr += 2;;
val = READ_LE_UINT16(codePtr); codePtr += 2;;
-
+ if (edi == 2) {
+ val = getSoundVar(sound, val);
+ }
val = getSoundVar(sound, var) + val;
setSoundVar(sound, var, val);
break;
case 56: // Subtract
var = READ_LE_UINT16(codePtr); codePtr += 2;;
val = READ_LE_UINT16(codePtr); codePtr += 2;;
-
+ if (edi == 2) {
+ val = getSoundVar(sound, val);
+ }
val = getSoundVar(sound, var) - val;
setSoundVar(sound, var, val);
break;
@@ -280,7 +284,6 @@
if (edi == 2) {
val = getSoundVar(sound, val);
}
-
val = getSoundVar(sound, var) * val;
setSoundVar(sound, var, val);
break;
@@ -322,12 +325,12 @@
debug(0,"playHESound: soundID %d heOffset %d heChannel %d heFlags %d", soundID, heOffset, heChannel, heFlags);
- if (soundID > _vm->_numSounds) {
- if (soundID >= 10000) {
- // Special codes, used in pjgames
- return;
- }
+ if (soundID >= 10000) {
+ // Special codes, used in pjgames
+ return;
+ }
+ if (soundID > _vm->_numSounds) {
int music_offs;
char buf[32], buf1[128];
Common::File musicFile;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v100he.cpp,2.187,2.188 script_v6.cpp,1.457,1.458 script_v90he.cpp,2.292,2.293 scumm-md5.h,2.159,2.160 sprite_he.cpp,1.156,1.157 wiz_he.cpp,2.106,2.107 wiz_he.h,2.35,2.36
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.529.2.7,2.529.2.8 resource_v7he.cpp,1.46.2.3,1.46.2.4 script_v100he.cpp,2.173.2.4,2.173.2.5 script_v7he.cpp,2.166.2.5,2.166.2.6 script_v80he.cpp,2.125.2.2,2.125.2.3 script_v90he.cpp,2.281.2.4,2.281.2.5 scumm.cpp,1.603.2.31,1.603.2.32 scumm.h,1.647.2.11,1.647.2.12 sound.cpp,1.479.2.7,1.479.2.8 sound.h,1.92.2.2,1.92.2.3 sound_he.cpp,2.10.2.2,2.10.2.3 vars.cpp,1.150.2.6,1.150.2.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list