[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.88,1.89 imuse_digi.cpp,1.47,1.48 object.cpp,1.141,1.142 script.cpp,1.133,1.134 script_v2.cpp,2.201,2.202 script_v5.cpp,1.191,1.192 script_v6.cpp,1.196,1.197 script_v8.cpp,2.196,2.197 sound.cpp,1.253,1.254
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Sep 23 23:35:09 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.17,1.18 imuse_channel.cpp,1.20,1.21 saud_channel.cpp,1.17,1.18 smush_player.cpp,1.52,1.53
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.22,1.23 console.cpp,1.9,1.10 interpreter.cpp,1.12,1.13 maketext.cpp,1.11,1.12 resman.cpp,1.41,1.42 router.cpp,1.14,1.15 speech.cpp,1.20,1.21 sword2.cpp,1.37,1.38 walker.cpp,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv10736
Modified Files:
debugger.cpp imuse_digi.cpp object.cpp script.cpp
script_v2.cpp script_v5.cpp script_v6.cpp script_v8.cpp
sound.cpp
Log Message:
Whitespace changes
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- debugger.cpp 23 Sep 2003 08:56:12 -0000 1.88
+++ debugger.cpp 24 Sep 2003 06:33:58 -0000 1.89
@@ -278,68 +278,61 @@
if (num_params > 1) {
// Alright, we need to check the TYPE of the variable to deref and stuff... the array stuff is a bit ugly :)
switch(_dvars[i].type) {
- // Integer
- case DVAR_INT:
- *(int *)_dvars[i].variable = atoi(param[1]);
- Debug_Printf("(int)%s = %d\n", param[0], *(int *)_dvars[i].variable);
- break;
-
- // Integer Array
- case DVAR_INTARRAY: {
- char *chr = strchr(param[0], '[');
- if (!chr) {
- Debug_Printf("You must access this array as %s[element]\n", param[0]);
+ // Integer
+ case DVAR_INT:
+ *(int *)_dvars[i].variable = atoi(param[1]);
+ Debug_Printf("(int)%s = %d\n", param[0], *(int *)_dvars[i].variable);
+ break;
+ // Integer Array
+ case DVAR_INTARRAY: {
+ char *chr = strchr(param[0], '[');
+ if (!chr) {
+ Debug_Printf("You must access this array as %s[element]\n", param[0]);
+ } else {
+ int element = atoi(chr+1);
+ int32 *var = *(int32 **)_dvars[i].variable;
+ if (element > _dvars[i].optional) {
+ Debug_Printf("%s is out of range (array is %d elements big)\n", param[0], _dvars[i].optional);
} else {
- int element = atoi(chr+1);
- int32 *var = *(int32 **)_dvars[i].variable;
- if (element > _dvars[i].optional) {
- Debug_Printf("%s is out of range (array is %d elements big)\n", param[0], _dvars[i].optional);
- } else {
- var[element] = atoi(param[1]);
- Debug_Printf("(int)%s = %d\n", param[0], var[element]);
-
- }
+ var[element] = atoi(param[1]);
+ Debug_Printf("(int)%s = %d\n", param[0], var[element]);
}
}
- break;
-
- default:
- Debug_Printf("Failed to set variable %s to %s - unknown type\n", _dvars[i].name, param[1]);
+ }
+ break;
+ default:
+ Debug_Printf("Failed to set variable %s to %s - unknown type\n", _dvars[i].name, param[1]);
break;
}
} else {
// And again, type-dependent prints/defrefs. The array one is still ugly.
switch(_dvars[i].type) {
- // Integer
- case DVAR_INT:
- Debug_Printf("(int)%s = %d\n", param[0], *(int *)_dvars[i].variable);
- break;
-
- // Integer array
- case DVAR_INTARRAY: {
- char *chr = strchr(param[0], '[');
- if (!chr) {
- Debug_Printf("You must access this array as %s[element]\n", param[0]);
+ // Integer
+ case DVAR_INT:
+ Debug_Printf("(int)%s = %d\n", param[0], *(int *)_dvars[i].variable);
+ break;
+ // Integer array
+ case DVAR_INTARRAY: {
+ char *chr = strchr(param[0], '[');
+ if (!chr) {
+ Debug_Printf("You must access this array as %s[element]\n", param[0]);
+ } else {
+ int element = atoi(chr+1);
+ int16 *var = *(int16 **)_dvars[i].variable;
+ if (element > _dvars[i].optional) {
+ Debug_Printf("%s is out of range (array is %d elements big)\n", param[0], _dvars[i].optional);
} else {
- int element = atoi(chr+1);
- int16 *var = *(int16 **)_dvars[i].variable;
- if (element > _dvars[i].optional) {
- Debug_Printf("%s is out of range (array is %d elements big)\n", param[0], _dvars[i].optional);
- } else {
- Debug_Printf("(int)%s = %d\n", param[0], var[element]);
-
- }
+ Debug_Printf("(int)%s = %d\n", param[0], var[element]);
}
}
+ }
+ break;
+ // String
+ case DVAR_STRING:
+ Debug_Printf("(string)%s = %s\n", param[0], *(char **)_dvars[i].variable);
break;
-
- // String
- case DVAR_STRING:
- Debug_Printf("(string)%s = %s\n", param[0], *(char **)_dvars[i].variable);
- break;
-
- default:
- Debug_Printf("%s = (unknown type)\n", param[0]);
+ default:
+ Debug_Printf("%s = (unknown type)\n", param[0]);
break;
}
}
Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- imuse_digi.cpp 10 Sep 2003 12:43:53 -0000 1.47
+++ imuse_digi.cpp 24 Sep 2003 06:33:58 -0000 1.48
@@ -653,34 +653,34 @@
code = len & 0xFF;
len >>= 8;
switch(code) {
- case 0: quit = 1; break;
- case 1: {
- int time_constant = ptr[offset++];
- int packing = ptr[offset++];
- len -= 2;
- rate = getSampleRateFromVOCRate(time_constant);
- debug(9, "VOC Data Bloc : %d, %d, %d", rate, packing, len);
- if (packing == 0) {
- if (size) {
- ret_sound = (byte *)realloc(ret_sound, size + len);
- } else {
- ret_sound = (byte *)malloc(len);
- }
- memcpy(ret_sound + size, ptr + offset, len);
- size += len;
+ case 0: quit = 1; break;
+ case 1: {
+ int time_constant = ptr[offset++];
+ int packing = ptr[offset++];
+ len -= 2;
+ rate = getSampleRateFromVOCRate(time_constant);
+ debug(9, "VOC Data Bloc : %d, %d, %d", rate, packing, len);
+ if (packing == 0) {
+ if (size) {
+ ret_sound = (byte *)realloc(ret_sound, size + len);
} else {
- warning("VOC file packing %d unsupported", packing);
+ ret_sound = (byte *)malloc(len);
}
- } break;
- case 6: // begin of loop
- loops = len + 1;
- break;
- case 7: // end of loop
- break;
- default:
- warning("Invalid code in VOC file : %d", code);
- quit = 1;
- break;
+ memcpy(ret_sound + size, ptr + offset, len);
+ size += len;
+ } else {
+ warning("VOC file packing %d unsupported", packing);
+ }
+ } break;
+ case 6: // begin of loop
+ loops = len + 1;
+ break;
+ case 7: // end of loop
+ break;
+ default:
+ warning("Invalid code in VOC file : %d", code);
+ quit = 1;
+ break;
}
// FIXME some FT samples (ex. 362) has bad length, 2 bytes too short
offset += len;
@@ -848,30 +848,30 @@
for (;;) {
tag = READ_BE_UINT32(ptr); ptr += 4;
switch(tag) {
- case MKID_BE('FRMT'):
- ptr += 12;
- _channel[l]._bits = READ_BE_UINT32(ptr); ptr += 4;
- _channel[l]._freq = READ_BE_UINT32(ptr); ptr += 4;
- _channel[l]._channels = READ_BE_UINT32(ptr); ptr += 4;
- break;
- case MKID_BE('TEXT'):
- size = READ_BE_UINT32(ptr); ptr += size + 4;
+ case MKID_BE('FRMT'):
+ ptr += 12;
+ _channel[l]._bits = READ_BE_UINT32(ptr); ptr += 4;
+ _channel[l]._freq = READ_BE_UINT32(ptr); ptr += 4;
+ _channel[l]._channels = READ_BE_UINT32(ptr); ptr += 4;
+ break;
+ case MKID_BE('TEXT'):
+ size = READ_BE_UINT32(ptr); ptr += size + 4;
break;
- case MKID_BE('REGN'):
- ptr += 12;
+ case MKID_BE('REGN'):
+ ptr += 12;
break;
- case MKID_BE('STOP'):
- ptr += 4;
- _channel[l]._offsetStop = READ_BE_UINT32(ptr); ptr += 4;
+ case MKID_BE('STOP'):
+ ptr += 4;
+ _channel[l]._offsetStop = READ_BE_UINT32(ptr); ptr += 4;
break;
- case MKID_BE('JUMP'):
- ptr += 20;
+ case MKID_BE('JUMP'):
+ ptr += 20;
break;
- case MKID_BE('DATA'):
- size = READ_BE_UINT32(ptr); ptr += 4;
+ case MKID_BE('DATA'):
+ size = READ_BE_UINT32(ptr); ptr += 4;
break;
- default:
- error("IMuseDigital::startSound(%d) Unknown sfx header %c%c%c%c", sound, (byte)(tag >> 24), (byte)(tag >> 16), (byte)(tag >> 8), (byte)tag);
+ default:
+ error("IMuseDigital::startSound(%d) Unknown sfx header %c%c%c%c", sound, (byte)(tag >> 24), (byte)(tag >> 16), (byte)(tag >> 8), (byte)tag);
}
if (tag == MKID_BE('DATA')) break;
}
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- object.cpp 19 Sep 2003 01:12:05 -0000 1.141
+++ object.cpp 24 Sep 2003 06:33:58 -0000 1.142
@@ -59,18 +59,18 @@
// Translate the new (V5) object classes to the old classes
// (for those which differ).
switch (cls) {
- case kObjectClassUntouchable:
- cls = 24;
- break;
- case kObjectClassPlayer:
- cls = 23;
- break;
- case kObjectClassXFlip:
- cls = 19;
- break;
- case kObjectClassYFlip:
- cls = 18;
- break;
+ case kObjectClassUntouchable:
+ cls = 24;
+ break;
+ case kObjectClassPlayer:
+ cls = 23;
+ break;
+ case kObjectClassXFlip:
+ cls = 19;
+ break;
+ case kObjectClassYFlip:
+ cls = 18;
+ break;
}
}
@@ -86,18 +86,18 @@
// Translate the new (V5) object classes to the old classes
// (for those which differ).
switch (cls) {
- case kObjectClassUntouchable:
- cls = 24;
- break;
- case kObjectClassPlayer:
- cls = 23;
- break;
- case kObjectClassXFlip:
- cls = 19;
- break;
- case kObjectClassYFlip:
- cls = 18;
- break;
+ case kObjectClassUntouchable:
+ cls = 24;
+ break;
+ case kObjectClassPlayer:
+ cls = 23;
+ break;
+ case kObjectClassXFlip:
+ cls = 19;
+ break;
+ case kObjectClassYFlip:
+ cls = 18;
+ break;
}
}
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- script.cpp 13 Sep 2003 23:50:29 -0000 1.133
+++ script.cpp 24 Sep 2003 06:33:58 -0000 1.134
@@ -907,7 +907,7 @@
if (_version <= 2) {
verbScript = 4;
_scummVars[VAR_CLICK_AREA] = a;
- switch(a) {
+ switch (a) {
case 1: // Verb clicked
_scummVars[33] = cmd;
break;
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.201
retrieving revision 2.202
diff -u -d -r2.201 -r2.202
--- script_v2.cpp 19 Sep 2003 14:13:24 -0000 2.201
+++ script_v2.cpp 24 Sep 2003 06:33:58 -0000 2.202
@@ -692,36 +692,32 @@
a = derefActor(act, "actorSet");
switch (_opcode) {
- case 1: // Actor Sound
- a->sound[0] = arg;
- break;
-
- case 2: // Actor Set Color
- if (_version == 1)
- i = act;
- else
- i = fetchScriptByte();
-
- a->palette[i] = arg;
- a->needRedraw = true;
- break;
-
- case 3: // Actor Name
- loadPtrToResource(rtActorName, a->number, NULL);
- break;
-
- case 4: // Actor Costume
- a->setActorCostume(arg);
- break;
+ case 1: // Actor Sound
+ a->sound[0] = arg;
+ break;
+ case 2: // Actor Set Color
+ if (_version == 1)
+ i = act;
+ else
+ i = fetchScriptByte();
- case 5: // Talk Color
- if ((_gameId == GID_MANIAC) && (_version == 1))
- v1_mm_actor_speech_color[act] = arg;
- else
- a->talkColor = arg;
- break;
- default:
- warning("o2_actorSet: opcode %d not yet supported", _opcode);
+ a->palette[i] = arg;
+ a->needRedraw = true;
+ break;
+ case 3: // Actor Name
+ loadPtrToResource(rtActorName, a->number, NULL);
+ break;
+ case 4: // Actor Costume
+ a->setActorCostume(arg);
+ break;
+ case 5: // Talk Color
+ if ((_gameId == GID_MANIAC) && (_version == 1))
+ v1_mm_actor_speech_color[act] = arg;
+ else
+ a->talkColor = arg;
+ break;
+ default:
+ warning("o2_actorSet: opcode %d not yet supported", _opcode);
}
}
Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- script_v5.cpp 19 Sep 2003 14:13:24 -0000 1.191
+++ script_v5.cpp 24 Sep 2003 06:33:59 -0000 1.192
@@ -874,33 +874,31 @@
while ((_opcode = fetchScriptByte()) != 0) {
switch (_opcode & 0x1F) {
- case 0x01: // write a range of variables
- getResultPos();
- a = _resultVarNumber;
- getResultPos();
- b = _resultVarNumber;
- warning("stub saveVars: vars %d -> %d", a, b);
- break;
-
- case 0x02: // write a range of string variables
- a = getVarOrDirectByte(0x80);
- b = getVarOrDirectByte(0x40);
- warning("stub saveVars: strings %d -> %d", a, b);
- break;
- case 0x03: // open file
- a = resStrLen(_scriptPointer);
- warning("stub saveVars to %s", _scriptPointer);
- _scriptPointer += a + 1;
- break;
- case 0x04:
- return;
- break;
- case 0x1F: // close file
- warning("stub saveVars close file");
- return;
- break;
+ case 0x01: // write a range of variables
+ getResultPos();
+ a = _resultVarNumber;
+ getResultPos();
+ b = _resultVarNumber;
+ warning("stub saveVars: vars %d -> %d", a, b);
+ break;
+ case 0x02: // write a range of string variables
+ a = getVarOrDirectByte(0x80);
+ b = getVarOrDirectByte(0x40);
+ warning("stub saveVars: strings %d -> %d", a, b);
+ break;
+ case 0x03: // open file
+ a = resStrLen(_scriptPointer);
+ warning("stub saveVars to %s", _scriptPointer);
+ _scriptPointer += a + 1;
+ break;
+ case 0x04:
+ return;
+ break;
+ case 0x1F: // close file
+ warning("stub saveVars close file");
+ return;
+ break;
}
-
}
}
@@ -910,34 +908,32 @@
hexdump(_scriptPointer, 64);
while ((_opcode = fetchScriptByte()) != 0) {
switch (_opcode & 0x1F) {
- case 0x01: // read a range of variables
- getResultPos();
- a = _resultVarNumber;
- getResultPos();
- b = _resultVarNumber;
- warning("stub loadVars: vars %d -> %d", a, b);
- break;
- case 0x02: // read a range of string variables
- a = getVarOrDirectByte(0x80);
- b = getVarOrDirectByte(0x40);
- warning("stub loadVars: strings %d -> %d", a, b);
- break;
- case 0x03: // open file
- a = resStrLen(_scriptPointer);
- warning("stub loadVars from %s", _scriptPointer);
- _scriptPointer += a + 1;
- break;
- case 0x04:
- return;
- break;
- case 0x1F: // close file
- warning("stub loadVars close file");
- return;
- break;
+ case 0x01: // read a range of variables
+ getResultPos();
+ a = _resultVarNumber;
+ getResultPos();
+ b = _resultVarNumber;
+ warning("stub loadVars: vars %d -> %d", a, b);
+ break;
+ case 0x02: // read a range of string variables
+ a = getVarOrDirectByte(0x80);
+ b = getVarOrDirectByte(0x40);
+ warning("stub loadVars: strings %d -> %d", a, b);
+ break;
+ case 0x03: // open file
+ a = resStrLen(_scriptPointer);
+ warning("stub loadVars from %s", _scriptPointer);
+ _scriptPointer += a + 1;
+ break;
+ case 0x04:
+ return;
+ break;
+ case 0x1F: // close file
+ warning("stub loadVars close file");
+ return;
+ break;
}
-
}
-
}
void Scumm_v5::o5_expression() {
@@ -1142,37 +1138,37 @@
_opcode = a & 0xE0;
switch (_opcode) {
- case 0x00: // num slots available
- result = 100;
- break;
- case 0x20: // drive
- // 0 = hard drive
- // 1 = disk drive
+ case 0x00: // num slots available
+ result = 100;
+ break;
+ case 0x20: // drive
+ // 0 = hard drive
+ // 1 = disk drive
+ result = 0;
+ break;
+ case 0x40: // load
+ if (loadState(slot, _saveLoadCompatible))
+ result = 3; // sucess
+ else
+ result = 5; // failed to load
+ break;
+ case 0x80: // save
+ if (saveState(slot, _saveLoadCompatible))
result = 0;
- break;
- case 0x40: // load
- if (loadState(slot, _saveLoadCompatible))
- result = 3; // sucess
- else
- result = 5; // failed to load
- break;
- case 0x80: // save
- if (saveState(slot, _saveLoadCompatible))
- result = 0;
- else
- result = 2;
- break;
- case 0xC0: // test if save exists
- bool avail_saves[100];
- char filename[256];
- SaveFileManager *mgr = _system->get_savefile_manager();
- listSavegames(avail_saves, ARRAYSIZE(avail_saves), mgr);
- makeSavegameName(filename, slot, false);
- if (avail_saves[slot] && (mgr->open_savefile(filename, getSavePath(), false)))
- result = 6; // save file exists
- else
- result = 7; // save file does not exist
- break;
+ else
+ result = 2;
+ break;
+ case 0xC0: // test if save exists
+ bool avail_saves[100];
+ char filename[256];
+ SaveFileManager *mgr = _system->get_savefile_manager();
+ listSavegames(avail_saves, ARRAYSIZE(avail_saves), mgr);
+ makeSavegameName(filename, slot, false);
+ if (avail_saves[slot] && (mgr->open_savefile(filename, getSavePath(), false)))
+ result = 6; // save file exists
+ else
+ result = 7; // save file does not exist
+ break;
}
setResult(result);
}
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -r1.196 -r1.197
--- script_v6.cpp 14 Sep 2003 18:16:45 -0000 1.196
+++ script_v6.cpp 24 Sep 2003 06:33:59 -0000 1.197
@@ -3116,14 +3116,14 @@
eax = fetchScriptByte();
switch (eax) {
- case 197:
- unknownEA_func(5, esi, edi, fetchScriptWord(), eax);
- break;
- case 202:
- unknownEA_func(3, esi, edi, fetchScriptWord(), eax);
- break;
- default:
- break;
+ case 197:
+ unknownEA_func(5, esi, edi, fetchScriptWord(), eax);
+ break;
+ case 202:
+ unknownEA_func(3, esi, edi, fetchScriptWord(), eax);
+ break;
+ default:
+ break;
}
}
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.196
retrieving revision 2.197
diff -u -d -r2.196 -r2.197
--- script_v8.cpp 14 Sep 2003 18:16:45 -0000 2.196
+++ script_v8.cpp 24 Sep 2003 06:33:59 -0000 2.197
@@ -1401,19 +1401,19 @@
break;
case 0xD3: // getKeyState
switch(args[1]) {
- // Stub out a few specific cases, just to make things less noisy
+ // Stub out a few specific cases, just to make things less noisy
- // To actually implement this, we may need a new OSystem call to do
- // asyncronous keyboard state checking...
- case 0x14B: // Left Arrow depressed?
- case 0x14D: // Right Arrow depressed?
- case 0x09: // Tab depressed (fire in ship combat)
- push(0);
- break;
- default:
- warning("getKeyState(0x%X)", args[1]);
- push(0);
- break;
+ // To actually implement this, we may need a new OSystem call to do
+ // asyncronous keyboard state checking...
+ case 0x14B: // Left Arrow depressed?
+ case 0x14D: // Right Arrow depressed?
+ case 0x09: // Tab depressed (fire in ship combat)
+ push(0);
+ break;
+ default:
+ warning("getKeyState(0x%X)", args[1]);
+ push(0);
+ break;
}
break;
case 0xCE: // getRGBSlot
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- sound.cpp 16 Sep 2003 11:44:48 -0000 1.253
+++ sound.cpp 24 Sep 2003 06:33:59 -0000 1.254
@@ -347,63 +347,65 @@
rate = 11025;
int type = *(ptr + 0x0D);
+ int numInstruments;
+
switch(type) {
- case 0: { // Sound effect
- int numInstruments = *(ptr + 0x14);
- ptr += 0x16;
- size -= 0x16;
- while (numInstruments--) {
- int waveSize = READ_LE_UINT32(ptr + 0x0C);
- int loopStart = READ_LE_UINT32(ptr + 0x10);
- int loopEnd = READ_LE_UINT32(ptr + 0x14);
- // it's not exactly * 10, maybe it's not even linear, but * 10 sounds ok.
- rate = READ_LE_UINT32(ptr + 0x18) * 10;
+ case 0: // Sound effect
+ numInstruments = *(ptr + 0x14);
+ ptr += 0x16;
+ size -= 0x16;
+ while (numInstruments--) {
+ int waveSize = READ_LE_UINT32(ptr + 0x0C);
+ int loopStart = READ_LE_UINT32(ptr + 0x10);
+ int loopEnd = READ_LE_UINT32(ptr + 0x14);
+ // it's not exactly * 10, maybe it's not even linear, but * 10 sounds ok.
+ rate = READ_LE_UINT32(ptr + 0x18) * 10;
- ptr += 0x20;
- size -= 0x20;
- if (size < waveSize) {
- warning("Wrong wave size in sound #%i: %i", soundID, waveSize);
- waveSize = size;
- }
- sound = (char *)malloc(waveSize);
- for (int x = 0; x < waveSize; x++) {
- int bit = *ptr++;
- if (bit < 0x80)
- sound[x] = 0x7F - bit;
- else
- sound[x] = bit;
- }
- size -= waveSize;
+ ptr += 0x20;
+ size -= 0x20;
+ if (size < waveSize) {
+ warning("Wrong wave size in sound #%i: %i", soundID, waveSize);
+ waveSize = size;
+ }
+ sound = (char *)malloc(waveSize);
+ for (int x = 0; x < waveSize; x++) {
+ int bit = *ptr++;
+ if (bit < 0x80)
+ sound[x] = 0x7F - bit;
+ else
+ sound[x] = bit;
+ }
+ size -= waveSize;
- if (loopEnd > 0)
- flags |= SoundMixer::FLAG_LOOP;
+ if (loopEnd > 0)
+ flags |= SoundMixer::FLAG_LOOP;
- _scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, soundID, 255, 0, loopStart, loopEnd);
- }
- break;
+ _scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, soundID, 255, 0, loopStart, loopEnd);
}
+ break;
+ case 1:
+ // Music (Euphony format)
+ if (_scumm->_musicEngine)
+ _scumm->_musicEngine->startSound (soundID);
+ break;
+ case 2: // CD track resource
+ ptr += 0x16;
- case 1: { // Music (Euphony format)
- if (_scumm->_musicEngine)
- _scumm->_musicEngine->startSound (soundID);
- break;
- }
-
- case 2: { // CD track resource
- ptr += 0x16;
+ if (soundID == _currentCDSound)
+ if (pollCD() == 1)
+ return;
+
+ {
int track = ptr[0];
int loops = ptr[1];
int start = (ptr[2] * 60 + ptr[3]) * 75 + ptr[4];
int end = (ptr[5] * 60 + ptr[6]) * 75 + ptr[7];
- if (soundID == _currentCDSound)
- if (pollCD() == 1)
- return;
-
playCDTrack(track, loops == 0xff ? -1 : loops, start, end - start);
- _currentCDSound = soundID;
- break;
- }
+ }
+
+ _currentCDSound = soundID;
+ break;
}
}
else if ((_scumm->_gameId == GID_LOOM) && (_scumm->_features & GF_MACINTOSH)) {
@@ -1277,30 +1279,28 @@
while (tag != MKID_BE('DATA')) {
tag = READ_BE_UINT32(ptr); ptr += 4;
switch(tag) {
- case MKID_BE('FRMT'):
- ptr += 12;
- bits = READ_BE_UINT32(ptr); ptr += 4;
- rate = READ_BE_UINT32(ptr); ptr += 4;
- channels = READ_BE_UINT32(ptr); ptr += 4;
+ case MKID_BE('FRMT'):
+ ptr += 12;
+ bits = READ_BE_UINT32(ptr); ptr += 4;
+ rate = READ_BE_UINT32(ptr); ptr += 4;
+ channels = READ_BE_UINT32(ptr); ptr += 4;
break;
- case MKID_BE('TEXT'):
- case MKID_BE('REGN'):
- case MKID_BE('STOP'):
- case MKID_BE('JUMP'):
- case MKID_BE('SYNC'):
- size = READ_BE_UINT32(ptr); ptr += size + 4;
+ case MKID_BE('TEXT'):
+ case MKID_BE('REGN'):
+ case MKID_BE('STOP'):
+ case MKID_BE('JUMP'):
+ case MKID_BE('SYNC'):
+ size = READ_BE_UINT32(ptr); ptr += size + 4;
break;
-
- case MKID_BE('DATA'):
- size = READ_BE_UINT32(ptr); ptr += 4;
+ case MKID_BE('DATA'):
+ size = READ_BE_UINT32(ptr); ptr += 4;
break;
-
- default:
- error("Unknown sound header %c%c%c%c",
- (byte)(tag >> 24),
- (byte)(tag >> 16),
- (byte)(tag >> 8),
- (byte)tag);
+ default:
+ error("Unknown sound header %c%c%c%c",
+ (byte)(tag >> 24),
+ (byte)(tag >> 16),
+ (byte)(tag >> 8),
+ (byte)tag);
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.17,1.18 imuse_channel.cpp,1.20,1.21 saud_channel.cpp,1.17,1.18 smush_player.cpp,1.52,1.53
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.22,1.23 console.cpp,1.9,1.10 interpreter.cpp,1.12,1.13 maketext.cpp,1.11,1.12 resman.cpp,1.41,1.42 router.cpp,1.14,1.15 speech.cpp,1.20,1.21 sword2.cpp,1.37,1.38 walker.cpp,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list