diff options
Diffstat (limited to 'engines/made')
| -rw-r--r-- | engines/made/database.cpp | 2 | ||||
| -rw-r--r-- | engines/made/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/made/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/made/made.cpp | 2 | ||||
| -rw-r--r-- | engines/made/made.h | 2 | ||||
| -rw-r--r-- | engines/made/resource.cpp | 4 | ||||
| -rw-r--r-- | engines/made/screenfx.cpp | 6 | ||||
| -rw-r--r-- | engines/made/screenfx.h | 2 | ||||
| -rw-r--r-- | engines/made/scriptfuncs.cpp | 2 | ||||
| -rw-r--r-- | engines/made/sound.cpp | 6 |
10 files changed, 15 insertions, 15 deletions
diff --git a/engines/made/database.cpp b/engines/made/database.cpp index 7656d9c5c4..763ea0840d 100644 --- a/engines/made/database.cpp +++ b/engines/made/database.cpp @@ -431,7 +431,7 @@ void GameDatabaseV2::load(Common::SeekableReadStream &sourceS) { // "Decrypt" the text data for (uint32 i = 0; i < textSize; i++) _gameText[i] += 0x1E; - + sourceS.seek(objectsOffs); if (version == 40) { diff --git a/engines/made/detection.cpp b/engines/made/detection.cpp index 950db959f3..e43b00146f 100644 --- a/engines/made/detection.cpp +++ b/engines/made/detection.cpp @@ -244,7 +244,7 @@ static const MadeGameDescription gameDescriptions[] = { GF_CD_COMPRESSED, 3, }, - + { // Return to Zork - French CD version 1.2 5/13/95 (installed) // Patch #2685032 submitted by goodoldgeorg diff --git a/engines/made/graphics.cpp b/engines/made/graphics.cpp index 89ec7b20a4..7e8330d3f4 100644 --- a/engines/made/graphics.cpp +++ b/engines/made/graphics.cpp @@ -77,7 +77,7 @@ void decompressImage(byte *source, Graphics::Surface &surface, uint16 cmdOffs, u byte *cmdBuffer = source + cmdOffs; ValueReader maskReader(source + maskOffs, (maskFlags & 2) != 0); ValueReader pixelReader(source + pixelOffs, (pixelFlags & 2) != 0); - + if ((maskFlags != 0) && (maskFlags != 2) && (pixelFlags != 0) && (pixelFlags != 2) && (cmdFlags != 0)) error("decompressImage() Unsupported flags: cmdFlags = %02X; maskFlags = %02X, pixelFlags = %02X", cmdFlags, maskFlags, pixelFlags); diff --git a/engines/made/made.cpp b/engines/made/made.cpp index 10e8c5d7e9..50a14c3e34 100644 --- a/engines/made/made.cpp +++ b/engines/made/made.cpp @@ -280,7 +280,7 @@ Common::Error MadeEngine::run() { } else { error ("Unknown MADE game"); } - + if ((getFeatures() & GF_CD) || (getFeatures() & GF_CD_COMPRESSED)) checkCD(); diff --git a/engines/made/made.h b/engines/made/made.h index be369053cb..c512ecde1d 100644 --- a/engines/made/made.h +++ b/engines/made/made.h @@ -117,7 +117,7 @@ public: bool _autoStopSound; uint _soundEnergyIndex; SoundEnergyArray *_soundEnergyArray; - + uint32 _musicBeatStart; uint32 _cdTimeStart; diff --git a/engines/made/resource.cpp b/engines/made/resource.cpp index b44c2d100c..b8742b1327 100644 --- a/engines/made/resource.cpp +++ b/engines/made/resource.cpp @@ -64,7 +64,7 @@ void PictureResource::load(byte *source, int size) { void PictureResource::loadRaw(byte *source, int size) { // Loads a "raw" picture as used in RtZ, LGoP2, Manhole:N&E and Rodney's Funscreen - + Common::MemoryReadStream *sourceS = new Common::MemoryReadStream(source, size); _hasPalette = (sourceS->readByte() != 0); @@ -118,7 +118,7 @@ void PictureResource::loadChunked(byte *source, int size) { uint32 chunkType = sourceS->readUint32BE(); uint32 chunkSize = sourceS->readUint32BE(); - + if (sourceS->eos()) break; diff --git a/engines/made/screenfx.cpp b/engines/made/screenfx.cpp index b89ecce70a..7d1c3ed0a7 100644 --- a/engines/made/screenfx.cpp +++ b/engines/made/screenfx.cpp @@ -51,15 +51,15 @@ ScreenEffects::ScreenEffects(Screen *screen) : _screen(screen) { vfxY1 = 0; vfxWidth = 0; vfxHeight = 0; - + _fxPalette = new byte[768]; - + } ScreenEffects::~ScreenEffects() { delete[] _fxPalette; } - + void ScreenEffects::run(int16 effectNum, Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount) { // Workaround: we set up the final palette beforehand, to reduce CPU usage during the screen effect. // The visual difference is not noticeable, but CPU load is much much less (as palette updates are very expensive). diff --git a/engines/made/screenfx.h b/engines/made/screenfx.h index 9004cc9a35..912eb8e0f7 100644 --- a/engines/made/screenfx.h +++ b/engines/made/screenfx.h @@ -53,7 +53,7 @@ private: void setPalette(byte *palette); void setBlendedPalette(byte *palette, byte *newPalette, int colorCount, int16 value, int16 maxValue); void copyFxRect(Graphics::Surface *surface, int16 x1, int16 y1, int16 x2, int16 y2); - + void vfx00(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount); void vfx01(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount); void vfx02(Graphics::Surface *surface, byte *palette, byte *newPalette, int colorCount); diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp index 5b6ff37905..c0373dfa0d 100644 --- a/engines/made/scriptfuncs.cpp +++ b/engines/made/scriptfuncs.cpp @@ -632,7 +632,7 @@ int16 ScriptFunctions::sfClearMono(int16 argc, int16 *argv) { } int16 ScriptFunctions::sfGetSoundEnergy(int16 argc, int16 *argv) { - // This is called while in-game voices are played to animate + // This is called while in-game voices are played to animate // mouths when NPCs are talking int result = 0; if (_vm->_mixer->isSoundHandleActive(_audioStreamHandle) && _vm->_soundEnergyArray) { diff --git a/engines/made/sound.cpp b/engines/made/sound.cpp index 99186fc008..5ff1f73b05 100644 --- a/engines/made/sound.cpp +++ b/engines/made/sound.cpp @@ -150,7 +150,7 @@ void decompressSound(byte *source, byte *dest, uint16 chunkSize, uint16 chunkCou uint16 ofs = 0; uint16 i = 0, l = 0; byte val; - + SoundEnergyItem soundEnergyItem; const int modeValues[3][4] = { @@ -225,11 +225,11 @@ void decompressSound(byte *source, byte *dest, uint16 chunkSize, uint16 chunkCou for (i = 0; i < workChunkSize; i++) soundBuffer[i] = *source++; workSample = soundBuffer[workChunkSize - 1] - 128; - + soundEnergyItem.energy = 4; if (soundEnergyArray) soundEnergyArray->push_back(soundEnergyItem); - + break; default: |