[Scummvm-cvs-logs] CVS: scummvm/scumm sound_he.cpp,2.22,2.23
Gregory Montoir
cyx at users.sourceforge.net
Tue Jan 31 11:29:11 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7766/scumm
Modified Files:
sound_he.cpp
Log Message:
Minor cleanup.
Index: sound_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound_he.cpp,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -d -r2.22 -r2.23
--- sound_he.cpp 27 Jan 2006 08:39:29 -0000 2.22
+++ sound_he.cpp 31 Jan 2006 19:28:31 -0000 2.23
@@ -233,17 +233,14 @@
}
void Sound::processSoundOpcodes(int sound, byte *codePtr, int *soundVars) {
- int edi, opcode, var, val;
+ int arg, opcode, var, val;
while(READ_LE_UINT16(codePtr) != 0) {
codePtr += 2;
opcode = READ_LE_UINT16(codePtr); codePtr += 2;
- opcode &= ~0xF000;
- opcode /= 16;
- edi = opcode;
+ opcode = (opcode & 0xFFF) >> 4;
+ arg = opcode & 3;
opcode &= ~3;
- edi &= 3;
-
debug(1, "processSoundOpcodes: sound %d opcode %d", sound, opcode);
switch (opcode) {
case 0: // Continue
@@ -255,42 +252,42 @@
case 32: // Set var
var = READ_LE_UINT16(codePtr); codePtr += 2;
val = READ_LE_UINT16(codePtr); codePtr += 2;
- if (edi == 2) {
+ if (arg == 2) {
val = getSoundVar(sound, val);
}
setSoundVar(sound, var, val);
break;
case 48: // Add
- var = READ_LE_UINT16(codePtr); codePtr += 2;;
- val = READ_LE_UINT16(codePtr); codePtr += 2;;
- if (edi == 2) {
+ var = READ_LE_UINT16(codePtr); codePtr += 2;
+ val = READ_LE_UINT16(codePtr); codePtr += 2;
+ if (arg == 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) {
+ var = READ_LE_UINT16(codePtr); codePtr += 2;
+ val = READ_LE_UINT16(codePtr); codePtr += 2;
+ if (arg == 2) {
val = getSoundVar(sound, val);
}
val = getSoundVar(sound, var) - val;
setSoundVar(sound, var, val);
break;
case 64: // Multiple
- var = READ_LE_UINT16(codePtr); codePtr += 2;;
+ var = READ_LE_UINT16(codePtr); codePtr += 2;
val = READ_LE_UINT16(codePtr); codePtr += 2;
- if (edi == 2) {
+ if (arg == 2) {
val = getSoundVar(sound, val);
}
val = getSoundVar(sound, var) * val;
setSoundVar(sound, var, val);
break;
case 80: // Divide
- var = READ_LE_UINT16(codePtr); codePtr += 2;;
+ var = READ_LE_UINT16(codePtr); codePtr += 2;
val = READ_LE_UINT16(codePtr); codePtr += 2;
- if (edi == 2) {
+ if (arg == 2) {
val = getSoundVar(sound, val);
}
val = getSoundVar(sound, var) / val;
More information about the Scummvm-git-logs
mailing list