diff options
| author | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-25 01:39:44 +0000 |
| commit | aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2 (patch) | |
| tree | 95f119e687a666f65aad5041910c43bdfd4f2929 /engines/sword1 | |
| parent | ec14cd6e6add76ce4f719edd7ce508d67ebd9f14 (diff) | |
| download | scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.gz scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.tar.bz2 scummvm-rg350-aed02365ec81e77b3c8aa4f4ecd9a9d3893326f2.zip | |
Strip trailing spaces/tabs.
svn-id: r47541
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/detection.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/sword1.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp index 1dd9b97a10..e6cc5e09fa 100644 --- a/engines/sword1/detection.cpp +++ b/engines/sword1/detection.cpp @@ -49,7 +49,7 @@ static const PlainGameDescriptorGUIOpts sword1PSXSettings = {"sword1psx", "Broken Sword: The Shadow of the Templars (PlayStation)", Common::GUIO_NOMIDI}; static const PlainGameDescriptorGUIOpts sword1PSXDemoSettings = {"sword1psxdemo", "Broken Sword: The Shadow of the Templars (PlayStation demo)", Common::GUIO_NOMIDI}; - + // check these subdirectories (if present) static const char *g_dirNames[] = { "clusters", "speech", "english", "italian"}; @@ -57,7 +57,7 @@ static const char *g_dirNames[] = { "clusters", "speech", "english", "italian"}; #define NUM_COMMON_FILES_TO_CHECK 1 #define NUM_PC_FILES_TO_CHECK 3 #define NUM_MAC_FILES_TO_CHECK 4 -#define NUM_PSX_FILES_TO_CHECK 1 +#define NUM_PSX_FILES_TO_CHECK 1 #define NUM_PSX_DEMO_FILES_TO_CHECK 2 #define NUM_DEMO_FILES_TO_CHECK 1 #define NUM_MAC_DEMO_FILES_TO_CHECK 1 diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index d28ab8efd9..88c50f8121 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -257,7 +257,7 @@ void Sound::playSample(QueueElement *elem) { int8 pan = (volR - volL) / 2; uint8 volume = (volR + volL) / 2; - if (SwordEngine::isPsx()) { + if (SwordEngine::isPsx()) { uint32 size = READ_LE_UINT32(sampleData); Audio::AudioStream *audStream = Audio::makeLoopingAudioStream(new Audio::VagStream(new Common::MemoryReadStream(sampleData + 4, size-4)), (_fxList[elem->id].type == FX_LOOP) ? 0 : 1); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &elem->handle, audStream, elem->id, volume, pan); @@ -316,7 +316,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { warning ("Could not open speech.inf"); return false; } - + uint16 numRooms = file.readUint16LE(); // Read number of rooms referenced in this file file.seek(locIndex * 4 + 2); // 4 bytes per room, skip first 2 bytes diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp index a1ff5087cf..45ad91d6ea 100644 --- a/engines/sword1/sword1.cpp +++ b/engines/sword1/sword1.cpp @@ -139,7 +139,7 @@ Common::Error SwordEngine::init() { _systemVars.playSpeech = 1; _mouseState = 0; - + // Some Mac versions use big endian for the speech files but not all of them. if (_systemVars.platform == Common::kPlatformMacintosh) _sound->checkSpeechFileEndianness(); |