diff options
| -rw-r--r-- | scumm/script_v100he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 10 | ||||
| -rw-r--r-- | scumm/sound.cpp | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index a8f09e345e..f27baaef37 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -244,7 +244,7 @@ void ScummEngine_v100he::setupOpcodes() { OPCODE(o90_atan2), OPCODE(o90_getSegmentAngle), OPCODE(o90_getActorAnimProgress), - OPCODE(o6_invalid), + OPCODE(o90_getDistanceBetweenPoints), /* A4 */ OPCODE(o6_ifClassOfIs), OPCODE(o6_invalid), diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index 1adeedae51..e4b7d93e02 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -634,7 +634,7 @@ void ScummEngine_v72he::o72_addMessageToStack() { // Filter out pointless trace messages, which often flood if (strcmp((char *)_stringBuffer, "no trace") && strcmp((char *)_stringBuffer, "trace on")) - debug(0,"o72_addMessageToStack(\"%s\")", _scriptPointer); + debug(1,"o72_addMessageToStack(\"%s\")", _scriptPointer); _scriptPointer += _stringLength; } diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index 6e4654b6e3..a857f98113 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -526,7 +526,7 @@ void ScummEngine_v70he::o70_startSound() { break; case 255: - debug(0, "o70_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags); + debug(1, "o70_startSound (ID %d, Offset %d, Channel %d, Flags %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags); _sound->addSoundToQueue(_heSndSoundId, _heSndOffset, _heSndChannel, _heSndFlags); _heSndFlags = 0; break; diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 746488cca7..93bed6bc42 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -664,6 +664,7 @@ void ScummEngine_v90he::o90_getDistanceBetweenPoints() { int x1, y1, z1, x2, y2, z2, dx, dy, dz, d; switch (subOp) { + case 23: // HE100 case 28: y2 = pop(); x2 = pop(); @@ -678,6 +679,7 @@ void ScummEngine_v90he::o90_getDistanceBetweenPoints() { push((int)sqrt((double)(d + 1))); } break; + case 24: // HE100 case 29: z2 = pop(); y2 = pop(); @@ -708,7 +710,7 @@ void ScummEngine_v90he::o90_getSpriteInfo() { byte subOp = fetchScriptByte(); subOp -= 30; - debug(1,"o90_getSpriteInfo (%d)", subOp); + debug(0,"o90_getSpriteInfo (%d)", subOp); switch (subOp) { case 0: spriteId = pop(); @@ -967,7 +969,7 @@ void ScummEngine_v90he::o90_setSpriteInfo() { byte subOp = fetchScriptByte(); subOp -= 34; - debug(1,"o90_setSpriteInfo (%d)", subOp); + debug(0,"o90_setSpriteInfo (%d)", subOp); switch (subOp) { case 0: args[0] = pop(); @@ -1300,7 +1302,7 @@ void ScummEngine_v90he::o90_getSpriteGroupInfo() { byte subOp = fetchScriptByte(); - debug(1,"o90_getSpriteGroupInfo (%d)", subOp); + debug(0,"o90_getSpriteGroupInfo (%d)", subOp); switch (subOp) { case 8: // HE 99+ spriteGroupId = pop(); @@ -1382,7 +1384,7 @@ void ScummEngine_v90he::o90_setSpriteGroupInfo() { byte subOp = fetchScriptByte(); subOp -= 37; - debug(1,"o90_setSpriteGroupInfo (%d)", subOp); + debug(0,"o90_setSpriteGroupInfo (%d)", subOp); switch (subOp) { case 0: type = pop() - 1; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 2b24f1694d..c3d184701f 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -167,7 +167,7 @@ void Sound::playSound(int soundID, int heOffset, int heChannel, int heFlags) { byte flags = SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE; if (_vm->_heversion >= 70 && soundID > _vm->_numSounds) { - debug(0, "playSound #%d", soundID); + debug(1, "playSound #%d", soundID); int music_offs, total_size; uint tracks, skip = 0; |