[Scummvm-cvs-logs] scummvm master -> deb7623fbff4b4d7c993facc4bec43a7509b6da4
sev-
sev at scummvm.org
Sat Nov 28 00:07:31 CET 2015
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7a21929e08 FULLPIPE: Fix cursor comparison
34a1d7aaaa AGI: Improve debug output
b7735b020f TESTBED: Added safety check
deb7623fbf SCUMM: Add safety check
Commit: 7a21929e08cf2b50b06ba9e7372f10b1d6a956b0
https://github.com/scummvm/scummvm/commit/7a21929e08cf2b50b06ba9e7372f10b1d6a956b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-28T00:06:47+01:00
Commit Message:
FULLPIPE: Fix cursor comparison
Changed paths:
engines/fullpipe/scenes/scene04.cpp
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index c0f0960..6c361d6 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -238,7 +238,7 @@ int scene04_updateCursor() {
}
}
- if (g_fp->_objectIdAtCursor == PIC_CSR_ITN && g_fp->_objectIdAtCursor == PIC_SC4_DOWNTRUBA)
+ if (g_fp->_cursorId == PIC_CSR_ITN && g_fp->_objectIdAtCursor == PIC_SC4_DOWNTRUBA)
g_fp->_cursorId = PIC_CSR_GOD;
return g_fp->_cursorId;
Commit: 34a1d7aaaadf0aae731d57e324955dfbcc3a9986
https://github.com/scummvm/scummvm/commit/34a1d7aaaadf0aae731d57e324955dfbcc3a9986
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-28T00:06:47+01:00
Commit Message:
AGI: Improve debug output
Changed paths:
engines/agi/sound_2gs.cpp
diff --git a/engines/agi/sound_2gs.cpp b/engines/agi/sound_2gs.cpp
index b940eed..b221afb 100644
--- a/engines/agi/sound_2gs.cpp
+++ b/engines/agi/sound_2gs.cpp
@@ -345,7 +345,7 @@ void SoundGen2GS::advanceMidiPlayer() {
case MIDI_PITCH_WHEEL:
parm1 = *p++;
parm2 = *p++;
- debugC(3, kDebugLevelSound, "channel %X: pitch wheel (unimplemented)", chn);
+ debugC(3, kDebugLevelSound, "channel %X: pitch wheel (unimplemented) %02X, %02X", chn, parm1, parm2);
break;
default:
Commit: b7735b020fa03219d96d3dce44b508d1da6dbc96
https://github.com/scummvm/scummvm/commit/b7735b020fa03219d96d3dce44b508d1da6dbc96
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-28T00:06:47+01:00
Commit Message:
TESTBED: Added safety check
Changed paths:
engines/testbed/testsuite.cpp
diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp
index 7729c49..853f128 100644
--- a/engines/testbed/testsuite.cpp
+++ b/engines/testbed/testsuite.cpp
@@ -283,6 +283,9 @@ void Testsuite::execute() {
pt.y += getLineSeparation();
int numEnabledTests = getNumTestsEnabled();
+ if (!numEnabledTests)
+ return;
+
for (Common::Array<Test *>::iterator i = _testsToExecute.begin(); i != _testsToExecute.end(); ++i) {
if (!(*i)->enabled) {
logPrintf("Info! Skipping Test: %s, Skipped by configuration.\n", ((*i)->featureName).c_str());
Commit: deb7623fbff4b4d7c993facc4bec43a7509b6da4
https://github.com/scummvm/scummvm/commit/deb7623fbff4b4d7c993facc4bec43a7509b6da4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2015-11-28T00:06:47+01:00
Commit Message:
SCUMM: Add safety check
Changed paths:
engines/scumm/dialogs.cpp
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index c22525b..21c7428 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -308,6 +308,8 @@ void HelpDialog::reflowLayout() {
int16 x, y;
uint16 w, h;
+ assert(lineHeight);
+
g_gui.xmlEval()->getWidgetData("ScummHelp.HelpText", x, y, w, h);
// Make sure than we don't have more lines than what we can fit
More information about the Scummvm-git-logs
mailing list