[Scummvm-cvs-logs] scummvm master -> 0f711c4a2e6d03d481cbb7d396e3e494b2351b38
sev-
sev at scummvm.org
Thu Nov 3 02:35:21 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:
55b95e3f50 SCUMM: Fix copy/paste errors
0f711c4a2e SCUMM: Fix warnings
Commit: 55b95e3f50198e93873fc57440b37ac5fbe5b153
https://github.com/scummvm/scummvm/commit/55b95e3f50198e93873fc57440b37ac5fbe5b153
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-02T18:34:53-07:00
Commit Message:
SCUMM: Fix copy/paste errors
Changed paths:
engines/scumm/debugger.cpp
engines/scumm/palette.cpp
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index 9cfdfbc..54f7fea 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -292,7 +292,7 @@ bool ScummDebugger::Cmd_ImportRes(int argc, const char** argv) {
if (_vm->_game.features & GF_SMALL_HEADER) {
size = file.readUint16LE();
file.seek(-2, SEEK_CUR);
- } else if (_vm->_game.features & GF_SMALL_HEADER) {
+ } else if (_vm->_game.features & GF_SMALL_HEADER) { // FIXME: This never was executed
if (_vm->_game.version == 4)
file.seek(8, SEEK_CUR);
size = file.readUint32LE();
diff --git a/engines/scumm/palette.cpp b/engines/scumm/palette.cpp
index 2c10758..bd085dd 100644
--- a/engines/scumm/palette.cpp
+++ b/engines/scumm/palette.cpp
@@ -823,7 +823,7 @@ void ScummEngine::setShadowPalette(int slot, int redScale, int greenScale, int b
if (slot < 0 || slot >= NUM_SHADOW_PALETTE)
error("setShadowPalette: invalid slot %d", slot);
- if (startColor < 0 || startColor > 255 || endColor < 0 || startColor > 255 || endColor < startColor)
+ if (startColor < 0 || startColor > 255 || endColor < 0 || endColor > 255 || endColor < startColor)
error("setShadowPalette: invalid range from %d to %d", startColor, endColor);
table = _shadowPalette + slot * 256;
Commit: 0f711c4a2e6d03d481cbb7d396e3e494b2351b38
https://github.com/scummvm/scummvm/commit/0f711c4a2e6d03d481cbb7d396e3e494b2351b38
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-02T18:34:53-07:00
Commit Message:
SCUMM: Fix warnings
Changed paths:
engines/scumm/object.cpp
engines/scumm/sound.cpp
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp
index ae4bbc4..da238dc 100644
--- a/engines/scumm/object.cpp
+++ b/engines/scumm/object.cpp
@@ -1842,7 +1842,7 @@ void ScummEngine::loadFlObject(uint object, uint room) {
if (_dumpScripts) {
char buf[32];
const byte *ptr = foir.obcd;
- sprintf(buf, "roomobj-%d-", room);
+ sprintf(buf, "roomobj-%u-", room);
ptr = findResource(MKTAG('V','E','R','B'), ptr);
dumpResource(buf, object, ptr);
}
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 0dcaf2a..8178fc2 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -524,14 +524,14 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
}
_sfxFile->close();
- sprintf(filename, "audio/%s.%d/%d.voc", roomname, offset, b);
+ sprintf(filename, "audio/%s.%u/%u.voc", roomname, offset, b);
_vm->openFile(*_sfxFile, filename);
if (!_sfxFile->isOpen()) {
- sprintf(filename, "audio/%s_%d/%d.voc", roomname, offset, b);
+ sprintf(filename, "audio/%s_%u/%u.voc", roomname, offset, b);
_vm->openFile(*_sfxFile, filename);
}
if (!_sfxFile->isOpen()) {
- sprintf(filename, "%d.%d.voc", offset, b);
+ sprintf(filename, "%u.%u.voc", offset, b);
_vm->openFile(*_sfxFile, filename);
}
if (!_sfxFile->isOpen()) {
More information about the Scummvm-git-logs
mailing list