[Scummvm-cvs-logs] SF.net SVN: scummvm: [25567] scummvm/trunk/engines/agos
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Tue Feb 13 22:41:44 CET 2007
Revision: 25567
http://scummvm.svn.sourceforge.net/scummvm/?rev=25567&view=rev
Author: eriktorbjorn
Date: 2007-02-13 13:41:43 -0800 (Tue, 13 Feb 2007)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/debugger.cpp
scummvm/trunk/engines/agos/res_snd.cpp
scummvm/trunk/engines/agos/vga_s2.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2007-02-13 21:08:11 UTC (rev 25566)
+++ scummvm/trunk/engines/agos/agos.cpp 2007-02-13 21:41:43 UTC (rev 25567)
@@ -531,7 +531,7 @@
midi.setDriver(driver);
int ret = midi.open();
if (ret)
- warning ("MIDI Player init failed: \"%s\"", midi.getErrorName (ret));
+ warning("MIDI Player init failed: \"%s\"", midi.getErrorName (ret));
midi.setVolume(ConfMan.getInt("music_volume"));
if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
Modified: scummvm/trunk/engines/agos/debugger.cpp
===================================================================
--- scummvm/trunk/engines/agos/debugger.cpp 2007-02-13 21:08:11 UTC (rev 25566)
+++ scummvm/trunk/engines/agos/debugger.cpp 2007-02-13 21:41:43 UTC (rev 25567)
@@ -83,9 +83,9 @@
uint music = atoi(argv[1]);
uint range = (_vm->getGameType() == GType_SIMON2) ? 93 : 34;
if (music <= range) {
- _vm->loadMusic (music);
+ _vm->loadMusic(music);
if (_vm->getGameType() == GType_SIMON2)
- _vm->midi.startTrack (0);
+ _vm->midi.startTrack(0);
} else
DebugPrintf("Music out of range (0 - %d)\n", range);
} else
Modified: scummvm/trunk/engines/agos/res_snd.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_snd.cpp 2007-02-13 21:08:11 UTC (rev 25566)
+++ scummvm/trunk/engines/agos/res_snd.cpp 2007-02-13 21:41:43 UTC (rev 25567)
@@ -169,17 +169,17 @@
_gameFile->read(buf, 4);
if (!memcmp(buf, "FORM", 4)) {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music - 1], SEEK_SET);
- midi.loadXMIDI (_gameFile);
+ midi.loadXMIDI(_gameFile);
} else {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music - 1], SEEK_SET);
- midi.loadMultipleSMF (_gameFile);
+ midi.loadMultipleSMF(_gameFile);
}
_lastMusicPlayed = music;
_nextMusicToPlay = -1;
} else if (getGameType() == GType_SIMON1) {
midi.stop();
- midi.setLoop (true); // Must do this BEFORE loading music. (GMF may have its own override.)
+ midi.setLoop(true); // Must do this BEFORE loading music. (GMF may have its own override.)
if (getFeatures() & GF_TALKIE) {
// FIXME: The very last music resource, a cymbal crash for when the
@@ -188,16 +188,16 @@
// a loop override that acomplishes this, but there seems to be nothing
// for this in the SMF resources.
if (music == 35)
- midi.setLoop (false);
+ midi.setLoop(false);
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
_gameFile->read(buf, 4);
if (!memcmp(buf, "GMF\x1", 4)) {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
- midi.loadSMF (_gameFile, music);
+ midi.loadSMF(_gameFile, music);
} else {
_gameFile->seek(_gameOffsetsPtr[_musicIndexBase + music], SEEK_SET);
- midi.loadMultipleSMF (_gameFile);
+ midi.loadMultipleSMF(_gameFile);
}
} else {
@@ -209,15 +209,15 @@
error("loadMusic: Can't load music from '%s'", filename);
if (getFeatures() & GF_DEMO)
- midi.loadS1D (&f);
+ midi.loadS1D(&f);
else
- midi.loadSMF (&f, music);
+ midi.loadSMF(&f, music);
}
- midi.startTrack (0);
+ midi.startTrack(0);
} else {
midi.stop();
- midi.setLoop (true); // Must do this BEFORE loading music.
+ midi.setLoop(true); // Must do this BEFORE loading music.
char filename[15];
File f;
@@ -226,8 +226,8 @@
if (f.isOpen() == false)
error("loadMusic: Can't load music from '%s'", filename);
- midi.loadS1D (&f);
- midi.startTrack (0);
+ midi.loadS1D(&f);
+ midi.startTrack(0);
}
}
Modified: scummvm/trunk/engines/agos/vga_s2.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga_s2.cpp 2007-02-13 21:08:11 UTC (rev 25566)
+++ scummvm/trunk/engines/agos/vga_s2.cpp 2007-02-13 21:41:43 UTC (rev 25567)
@@ -170,7 +170,7 @@
// This command skips the next instruction
// unless (1) there is a track playing, AND
// (2) there is a track queued to play after it.
- if (!midi.isPlaying (true))
+ if (!midi.isPlaying(true))
vcSkipNextInstruction();
}
@@ -194,8 +194,8 @@
if (track == -1 || track == 999) {
midi.stop();
} else {
- midi.setLoop (loop != 0);
- midi.startTrack (track);
+ midi.setLoop(loop != 0);
+ midi.startTrack(track);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list