aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMax Horn2011-02-07 23:01:06 +0000
committerMax Horn2011-02-07 23:01:06 +0000
commit2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb (patch)
treea538852678f172dec297b83d115a7d76f2638969 /engines/sci
parent377b4c67d99503b19e866ff47c685c57dd2a56e0 (diff)
downloadscummvm-rg350-2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb.tar.gz
scummvm-rg350-2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb.tar.bz2
scummvm-rg350-2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb.zip
ALL: Fix whitespaces / indention
svn-id: r55818
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/palette.cpp2
-rw-r--r--engines/sci/sound/drivers/midi.cpp2
-rw-r--r--engines/sci/sound/drivers/pcjr.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index cc1bffee4e..616ee841c1 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -299,7 +299,7 @@ bool GfxPalette::merge(Palette *newPalette, bool force, bool forceRealMerge) {
bool paletteChanged = false;
// colors 0 (black) and 255 (white) are not affected by merging
- for (i = 1 ; i < 255; i++) {
+ for (i = 1; i < 255; i++) {
if (!newPalette->colors[i].used)// color is not used - so skip it
continue;
// forced palette merging or dest color is not used yet
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index ed3a1e25d2..c274c8bce2 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -785,7 +785,7 @@ void MidiPlayer_Midi::mapMt32ToGm(byte *data, size_t size) {
if (size > pos && ((0x100 * *(data + pos) + *(data + pos + 1)) == 0xdcba)) {
debugC(kDebugLevelSound, "\n[MT32-to-GM] Mapping percussion..");
- for (i = 0; i < 64 ; i++) {
+ for (i = 0; i < 64; i++) {
number = *(data + pos + 4 * i + 2);
byte ins = i + 24;
diff --git a/engines/sci/sound/drivers/pcjr.cpp b/engines/sci/sound/drivers/pcjr.cpp
index 93de072865..e1c3302fef 100644
--- a/engines/sci/sound/drivers/pcjr.cpp
+++ b/engines/sci/sound/drivers/pcjr.cpp
@@ -52,7 +52,7 @@ static const int freq_table[12] = { // A4 is 440Hz, halftone map is x |-> ** 2^(
static inline int get_freq(int note) {
int halftone_delta = note - BASE_NOTE;
int oct_diff = ((halftone_delta + BASE_OCTAVE * 12) / 12) - BASE_OCTAVE;
- int halftone_index = (halftone_delta + (12 * 100)) % 12 ;
+ int halftone_index = (halftone_delta + (12 * 100)) % 12;
int freq = (!note) ? 0 : freq_table[halftone_index] / (1 << (-oct_diff));
return freq;