[Scummvm-cvs-logs] scummvm master -> 571fa943106009b99a39bbe0a729f9c32afa8a9a
lordhoto
lordhoto at gmail.com
Thu Aug 9 03:28:52 CEST 2012
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
84426c6355 AUDIO: Fix "if" formatting in QDM2 code.
73598c64dc CREATE_PROJECT: Fix "if" formatting.
8aa8cb4dd6 DINGUX: Fix "if" formatting.
18ab9a1ef1 TSAGE: Fix "if" formatting.
571fa94310 TESTBED: Fix "if" formatting.
Commit: 84426c63553f94c26fa299dc2659cec16c24cd3f
https://github.com/scummvm/scummvm/commit/84426c63553f94c26fa299dc2659cec16c24cd3f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-08T18:25:14-07:00
Commit Message:
AUDIO: Fix "if" formatting in QDM2 code.
Changed paths:
audio/decoders/qdm2.cpp
diff --git a/audio/decoders/qdm2.cpp b/audio/decoders/qdm2.cpp
index 31405d3..732de31 100644
--- a/audio/decoders/qdm2.cpp
+++ b/audio/decoders/qdm2.cpp
@@ -689,7 +689,7 @@ static int getVlc2(Common::BitStream *s, int16 (*table)[2], int bits, int maxDep
code = table[index][0];
n = table[index][1];
- if(maxDepth > 2 && n < 0) {
+ if (maxDepth > 2 && n < 0) {
s->skip(nbBits);
index = s->getBits(-n) + code;
code = table[index][0];
@@ -861,9 +861,9 @@ void initVlcSparse(VLC *vlc, int nb_bits, int nb_codes,
const void *symbols, int symbols_wrap, int symbols_size) {
vlc->bits = nb_bits;
- if(vlc->table_size && vlc->table_size == vlc->table_allocated) {
+ if (vlc->table_size && vlc->table_size == vlc->table_allocated) {
return;
- } else if(vlc->table_size) {
+ } else if (vlc->table_size) {
error("called on a partially initialized table");
}
@@ -1353,7 +1353,7 @@ void QDM2Stream::fix_coding_method_array(int sb, int channels, sb_int8_array cod
for (ch = 0; ch < channels; ch++) {
for (j = 0; j < 64; ) {
- if((coding_method[ch][sb][j] - 8) > 22) {
+ if ((coding_method[ch][sb][j] - 8) > 22) {
run = 1;
case_val = 8;
} else {
Commit: 73598c64dc317362c5fd534485b6a083aa1531f1
https://github.com/scummvm/scummvm/commit/73598c64dc317362c5fd534485b6a083aa1531f1
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-08T18:25:37-07:00
Commit Message:
CREATE_PROJECT: Fix "if" formatting.
Changed paths:
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 0574814..62dd417 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -917,7 +917,7 @@ std::string XCodeProvider::writeSetting(const std::string &variable, const Setti
for (unsigned int i = 0, count = 0; i < setting.entries.size(); ++i) {
std::string value = setting.entries.at(i).value;
- if(!value.empty()) {
+ if (!value.empty()) {
if (count++ > 0)
output += "," + newline;
Commit: 8aa8cb4dd661ec39dd5f03e39f2ed19e4968ff2c
https://github.com/scummvm/scummvm/commit/8aa8cb4dd661ec39dd5f03e39f2ed19e4968ff2c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-08T18:25:55-07:00
Commit Message:
DINGUX: Fix "if" formatting.
Changed paths:
backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 205dcfd..f515343 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -432,7 +432,7 @@ bool DINGUXSdlGraphicsManager::loadGFXMode() {
// Forcefully disable aspect ratio correction for games
// which starts with a native 240px height resolution.
// This fixes games with weird resolutions, like MM Nes (256x240)
- if(_videoMode.screenHeight == 240) {
+ if (_videoMode.screenHeight == 240) {
_videoMode.aspectRatioCorrection = false;
}
Commit: 18ab9a1ef12aa2d929245e14d2e04aaf05437247
https://github.com/scummvm/scummvm/commit/18ab9a1ef12aa2d929245e14d2e04aaf05437247
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-08T18:26:55-07:00
Commit Message:
TSAGE: Fix "if" formatting.
Changed paths:
engines/tsage/ringworld/ringworld_scenes5.cpp
diff --git a/engines/tsage/ringworld/ringworld_scenes5.cpp b/engines/tsage/ringworld/ringworld_scenes5.cpp
index 3b415bd..004ccbb 100644
--- a/engines/tsage/ringworld/ringworld_scenes5.cpp
+++ b/engines/tsage/ringworld/ringworld_scenes5.cpp
@@ -1893,7 +1893,7 @@ void Scene4045::postInit(SceneObjectList *OwnerList) {
_olloFace.setStrip(4);
_olloFace.fixPriority(152);
- if(g_globals->_sceneManager._previousScene == 4050) {
+ if (g_globals->_sceneManager._previousScene == 4050) {
g_globals->_soundHandler.play(155);
g_globals->_player.setPosition(Common::Point(72, 128));
g_globals->_player.enableControl();
Commit: 571fa943106009b99a39bbe0a729f9c32afa8a9a
https://github.com/scummvm/scummvm/commit/571fa943106009b99a39bbe0a729f9c32afa8a9a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-08-08T18:27:21-07:00
Commit Message:
TESTBED: Fix "if" formatting.
Changed paths:
engines/testbed/graphics.cpp
engines/testbed/testsuite.cpp
diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp
index 082694b..590e6c6 100644
--- a/engines/testbed/graphics.cpp
+++ b/engines/testbed/graphics.cpp
@@ -1028,7 +1028,7 @@ TestExitStatus GFXtests::paletteRotation() {
GFXTestSuite::setCustomColor(255, 0, 0);
Testsuite::clearScreen();
- if(Testsuite::handleInteractiveInput("Did you see a rotation in colors of rectangles displayed on screen?", "Yes", "No", kOptionRight)) {
+ if (Testsuite::handleInteractiveInput("Did you see a rotation in colors of rectangles displayed on screen?", "Yes", "No", kOptionRight)) {
return kTestFailed;
}
@@ -1121,7 +1121,7 @@ TestExitStatus GFXtests::pixelFormats() {
g_system->updateScreen();
g_system->delayMillis(500);
- if(Testsuite::handleInteractiveInput("Were you able to notice the colored rectangles on the screen for this format?", "Yes", "No", kOptionLeft)) {
+ if (Testsuite::handleInteractiveInput("Were you able to notice the colored rectangles on the screen for this format?", "Yes", "No", kOptionLeft)) {
numPassed++;
} else {
numFailed++;
diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp
index 655179a..39eeca3 100644
--- a/engines/testbed/testsuite.cpp
+++ b/engines/testbed/testsuite.cpp
@@ -289,7 +289,7 @@ void Testsuite::execute() {
continue;
}
- if((*i)->isInteractive && !ConfParams.isSessionInteractive()) {
+ if ((*i)->isInteractive && !ConfParams.isSessionInteractive()) {
logPrintf("Info! Skipping Test: %s, non-interactive environment is selected\n", ((*i)->featureName).c_str());
_numTestsSkipped++;
continue;
More information about the Scummvm-git-logs
mailing list