diff options
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/bmv.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/coroutine.h | 2 | ||||
| -rw-r--r-- | engines/tinsel/graphics.cpp | 8 | ||||
| -rw-r--r-- | engines/tinsel/palette.cpp | 4 | ||||
| -rw-r--r-- | engines/tinsel/polygons.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/sound.cpp | 6 | ||||
| -rw-r--r-- | engines/tinsel/tinlib.cpp | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index edfc8c1243..dad86f9d43 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -596,7 +596,7 @@ static int MovieCommand(char cmd, int commandOffset) { PPRINT_CMD pCmd; pCmd = (PPRINT_CMD)(bigBuffer + commandOffset); - + MovieText(nullContext, (int16)READ_LE_UINT16(&pCmd->stringId), (int16)READ_LE_UINT16(&pCmd->x), (int16)READ_LE_UINT16(&pCmd->y), diff --git a/engines/tinsel/coroutine.h b/engines/tinsel/coroutine.h index aec2e6cdad..c562ecdabb 100644 --- a/engines/tinsel/coroutine.h +++ b/engines/tinsel/coroutine.h @@ -137,7 +137,7 @@ public: #define CORO_END_CONTEXT(x) } *x = (CoroContextTag *)coroParam /** - * Begin the code section of a coroutine. + * Begin the code section of a coroutine. * @param x name of the coroutine context * @see CORO_BEGIN_CODE */ diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp index 8bf9fb1896..26c912a24a 100644 --- a/engines/tinsel/graphics.cpp +++ b/engines/tinsel/graphics.cpp @@ -53,7 +53,7 @@ extern uint8 transPalette[MAX_COLOURS]; uint8* psxPJCRLEUnwinder(uint16 imageWidth, uint16 imageHeight, uint8 *srcIdx) { uint32 remainingBlocks = 0; - uint16 compressionType = 0; // Kind of decompression to apply + uint16 compressionType = 0; // Kind of decompression to apply uint16 controlBits = 0; // Control bits used to calculate the number of decompressed indexes uint16 baseIndex = 0; // Base index to be repeated / incremented. @@ -82,7 +82,7 @@ uint8* psxPJCRLEUnwinder(uint16 imageWidth, uint16 imageHeight, uint8 *srcIdx) { // else there is no compression. if (controlData & 0x4000) compressionType = 2; - else if (controlData & 0x8000) + else if (controlData & 0x8000) compressionType = 1; else compressionType = 0; @@ -749,10 +749,10 @@ void DrawObject(DRAWOBJECT *pObj) { if (TinselV1PSX) { uint8 paletteType = *(srcPtr); // if 0x88 we are using an 8bit palette type, if 0x44 we are using a 4 bit PSX CLUT uint8 indexType = *(srcPtr + 1); // if 0xCC indexes for this image are compressed with PCJRLE, if 0xDD indexes are not compressed - + switch (paletteType) { case 0x88: // Normal 8-bit palette - psxFourBitClut = false; + psxFourBitClut = false; psxSkipBytes = 0; switch (indexType) { case 0xDD: // Normal uncompressed indexes diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp index 9fb40f8d09..065fc24ae6 100644 --- a/engines/tinsel/palette.cpp +++ b/engines/tinsel/palette.cpp @@ -107,12 +107,12 @@ COLORREF* psxClutToRGBPal(uint8 *srcClut, int *colours) { clutEntry = READ_LE_UINT16(srcClut); // Read PSX CLUT entry srcClut += sizeof(uint16); - if ((clutEntry == 0) && (coloursInPalette == 0)) + if ((clutEntry == 0) && (coloursInPalette == 0)) coloursInPalette++; else if ((clutEntry == 0) && (coloursInPalette != 0)) { *colours = coloursInPalette; return dstPal; - } else + } else coloursInPalette++; // Extract color data diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp index 5631d5551a..f7309bc38c 100644 --- a/engines/tinsel/polygons.cpp +++ b/engines/tinsel/polygons.cpp @@ -138,7 +138,7 @@ struct LINEINFO { /** * POLY structure class. This is implemented as a class, because the structure * of POLY's changed between TINSEL v1 and v2. - * + * * FIXME: Right now, we always read *all* data in a polygon, even if only a single * field is needed. This is rather inefficient. */ diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 47b7ffc51a..a07a417723 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -100,16 +100,16 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound uint32 sampleLen = _sampleStream.readUint32LE(); if (_sampleStream.ioFailed()) error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage)); - + if (TinselV1PSX) { // Read the stream and create a VAG Audio stream Audio::AudioStream *vagStream = new Audio::VagStream(_sampleStream.readStream(sampleLen), false, 44100); - + // FIXME: Should set this in a different place ;) _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, volSound); //_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic); _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, volVoice); - + // Play the audio stream _vm->_mixer->playInputStream(type, &curChan.handle, vagStream); } else { diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index b4e7e14016..54d678c198 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -646,7 +646,7 @@ void CdDoChange(CORO_PARAM) { return; CORO_INVOKE_0(CdCD); - + CdHasChanged(); CORO_END_CODE; |