[Scummvm-cvs-logs] scummvm master -> 2eb67edd0f48d60ff63207c7a561824d57cf0486
fuzzie
fuzzie at fuzzie.org
Wed Feb 16 00:02:03 CET 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
ea857a6f80 SKY: Stop intro sound before freeing the buffer.
2eb67edd0f SKY: Fix array access in debug code.
Commit: ea857a6f804d324722379f15826ead63282a5c1b
https://github.com/scummvm/scummvm/commit/ea857a6f804d324722379f15826ead63282a5c1b
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-02-15T15:05:09-08:00
Commit Message:
SKY: Stop intro sound before freeing the buffer.
Changed paths:
engines/sky/intro.cpp
diff --git a/engines/sky/intro.cpp b/engines/sky/intro.cpp
index 6455f3b..0d1948b 100644
--- a/engines/sky/intro.cpp
+++ b/engines/sky/intro.cpp
@@ -647,6 +647,7 @@ Intro::~Intro() {
free(_textBuf);
free(_saveBuf);
+ _mixer->stopID(SOUND_BG);
free(_bgBuf);
}
Commit: 2eb67edd0f48d60ff63207c7a561824d57cf0486
https://github.com/scummvm/scummvm/commit/2eb67edd0f48d60ff63207c7a561824d57cf0486
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2011-02-15T15:05:15-08:00
Commit Message:
SKY: Fix array access in debug code.
The script data is already byteswapped at load time.
Changed paths:
engines/sky/debug.cpp
diff --git a/engines/sky/debug.cpp b/engines/sky/debug.cpp
index b43ec91..2839665 100644
--- a/engines/sky/debug.cpp
+++ b/engines/sky/debug.cpp
@@ -1071,11 +1071,11 @@ void Debug::logic(uint32 logic) {
void Debug::script(uint32 command, uint16 *scriptData) {
debug(6, "SCRIPT: %s", opcodes[command]);
if (command == 0 || command == 6)
- debug(6, " %s", scriptVars[READ_LE_UINT16(scriptData)/4]);
+ debug(6, " %s", scriptVars[(*scriptData)/4]);
else {
int i;
for (i = 0; i < opcode_par[command]; i++) {
- debug(6, " %d", READ_LE_UINT16(scriptData + i));
+ debug(6, " %d", *(scriptData + i));
}
}
debug(6, " "); // Print an empty line as separator
More information about the Scummvm-git-logs
mailing list