[Scummvm-cvs-logs] SF.net SVN: scummvm:[41784] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Mon Jun 22 22:52:08 CEST 2009
Revision: 41784
http://scummvm.svn.sourceforge.net/scummvm/?rev=41784&view=rev
Author: drmccoy
Date: 2009-06-22 20:52:08 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
Removing trailing tabs
Modified Paths:
--------------
scummvm/trunk/engines/gob/save/savefile.h
scummvm/trunk/engines/gob/save/saveload.cpp
scummvm/trunk/engines/gob/save/saveload_v3.cpp
scummvm/trunk/engines/gob/save/saveload_v4.cpp
scummvm/trunk/engines/gob/sound/adlib.cpp
Modified: scummvm/trunk/engines/gob/save/savefile.h
===================================================================
--- scummvm/trunk/engines/gob/save/savefile.h 2009-06-22 20:51:48 UTC (rev 41783)
+++ scummvm/trunk/engines/gob/save/savefile.h 2009-06-22 20:52:08 UTC (rev 41784)
@@ -163,7 +163,7 @@
bool readPalette(const byte *palette);
/** Read a sprite into the part. */
bool readSprite(const SurfaceDesc &sprite);
-
+
/** Read size bytes of raw data into the sprite. */
bool readSpriteRaw(const byte *data, uint32 size);
Modified: scummvm/trunk/engines/gob/save/saveload.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload.cpp 2009-06-22 20:51:48 UTC (rev 41783)
+++ scummvm/trunk/engines/gob/save/saveload.cpp 2009-06-22 20:52:08 UTC (rev 41784)
@@ -61,7 +61,7 @@
int32 size = handler->getSize();
debugC(4, kDebugSaveLoad, "Size is %d", size);
-
+
return size;
}
Modified: scummvm/trunk/engines/gob/save/saveload_v3.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_v3.cpp 2009-06-22 20:51:48 UTC (rev 41783)
+++ scummvm/trunk/engines/gob/save/saveload_v3.cpp 2009-06-22 20:52:08 UTC (rev 41784)
@@ -302,7 +302,7 @@
if (!_reader || (_reader->getSlot() != ((uint32) slot))) {
Common::String slotFile = _slotFile->build(slot);
-
+
if (slotFile.empty())
return false;
@@ -319,7 +319,7 @@
} else
_reader = new SaveReader(_usesScreenshots ? 3 : 2, slot, slotFile);
-
+
if (!_reader->load()) {
delete _reader;
_reader = 0;
@@ -337,7 +337,7 @@
if (!_writer || (_writer->getSlot() != ((uint32) slot))) {
Common::String slotFile = _slotFile->build(slot);
-
+
if (slotFile.empty())
return false;
@@ -495,7 +495,7 @@
_gameHandler = new GameHandler(vm, targetName, true);
_screenshotHandler = new ScreenshotHandler(vm, _gameHandler, sShotType);
}
-
+
_tempSpriteHandler = new TempSpriteHandler(vm);
_notesHandler = new NotesHandler(2560, vm, targetName);
Modified: scummvm/trunk/engines/gob/save/saveload_v4.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveload_v4.cpp 2009-06-22 20:51:48 UTC (rev 41783)
+++ scummvm/trunk/engines/gob/save/saveload_v4.cpp 2009-06-22 20:52:08 UTC (rev 41784)
@@ -317,7 +317,7 @@
if (!_reader || (_reader->getSlot() != ((uint32) slot))) {
Common::String slotFile = _slotFile->build(slot);
-
+
if (slotFile.empty())
return false;
@@ -334,7 +334,7 @@
} else
_reader = new SaveReader(3, slot, slotFile);
-
+
if (!_reader->load()) {
delete _reader;
_reader = 0;
@@ -352,7 +352,7 @@
if (!_writer || (_writer->getSlot() != ((uint32) slot))) {
Common::String slotFile = _slotFile->build(slot);
-
+
if (slotFile.empty())
return false;
Modified: scummvm/trunk/engines/gob/sound/adlib.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.cpp 2009-06-22 20:51:48 UTC (rev 41783)
+++ scummvm/trunk/engines/gob/sound/adlib.cpp 2009-06-22 20:52:08 UTC (rev 41784)
@@ -66,7 +66,7 @@
_playing = false;
_freeData = false;
-
+
_repCount = -1;
_samplesTillPoll = 0;
@@ -356,11 +356,11 @@
tempo = ((tempo & 3) << 8) | *(_playPos++);
}
_first = false;
-
+
// Instruction
instr = *(_playPos++);
channel = instr & 0x0F;
-
+
switch (instr & 0xF0) {
// Note on + Volume
case 0x00:
@@ -416,7 +416,7 @@
_ended = true;
break;
}
-
+
// Temporization
tempo = *(_playPos++);
// End tempo
@@ -429,7 +429,7 @@
tempo = ((tempo & 3) << 8) | *(_playPos++);
if (!tempo)
tempo ++;
-
+
_samplesTillPoll = tempo * (_rate / 1000);
}
@@ -544,7 +544,7 @@
return loaded;
}
-bool MDYPlayer::loadTBR(Common::SeekableReadStream &stream) {
+bool MDYPlayer::loadTBR(Common::SeekableReadStream &stream) {
unloadTBR();
_timbresSize = stream.size();
@@ -600,7 +600,7 @@
byte volume;
uint8 tempoMult, tempoFrac;
uint8 ctrlByte1, ctrlByte2;
- uint8 timbre;
+ uint8 timbre;
if (_first) {
for (int i = 0; i < 11; i ++)
@@ -666,7 +666,7 @@
break;
case 0xE0:
warning("Pitch bend not yet implemented");
-
+
note = *(_playPos)++;
note += (unsigned)(*(_playPos++)) << 7;
@@ -748,7 +748,7 @@
for (int j = 0; j < 9; j++)
timbreName[j] = _timbres[6 + j + (instr * 9)];
debugC(6, kDebugSound, "Loading timbre %s", timbreName);
-
+
// i = 0 : 0 1 2 3 4 5 6 7 8 9 10 11 12 26
// i = 1 : 13 14 15 16 17 18 19 20 21 22 23 24 25 27
for (int i = 0; i < 2; i++) {
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