diff options
Diffstat (limited to 'engines/saga')
-rw-r--r-- | engines/saga/actor.h | 2 | ||||
-rw-r--r-- | engines/saga/saga.h | 2 | ||||
-rw-r--r-- | engines/saga/scene.cpp | 2 | ||||
-rw-r--r-- | engines/saga/script.cpp | 6 | ||||
-rw-r--r-- | engines/saga/script.h | 2 | ||||
-rw-r--r-- | engines/saga/sndres.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/saga/actor.h b/engines/saga/actor.h index d2ef43caf3..d998c65240 100644 --- a/engines/saga/actor.h +++ b/engines/saga/actor.h @@ -649,7 +649,7 @@ public: struct DebugPoint { Point point; byte color; - + DebugPoint() : color(0) {} DebugPoint(const Point &p, byte c): point(p), color(c) {} diff --git a/engines/saga/saga.h b/engines/saga/saga.h index 27a1e2ae9b..7265860d86 100644 --- a/engines/saga/saga.h +++ b/engines/saga/saga.h @@ -104,7 +104,7 @@ enum GameFileTypes { GAME_SOUNDFILE = 1 << 2, // SFX (also contains voices and MIDI music in SAGA 2 games) GAME_VOICEFILE = 1 << 3, // Voices (also contains SFX in the ITE floppy version) // ITE specific - GAME_DIGITALMUSICFILE = 1 << 4, // ITE digital music, added by Wyrmkeep + GAME_DIGITALMUSICFILE = 1 << 4, // ITE digital music, added by Wyrmkeep GAME_MACBINARY = 1 << 5, // ITE Mac CD Guild GAME_DEMOFILE = 1 << 6, // Early ITE demo GAME_SWAPENDIAN = 1 << 7, // Used to identify the BE voice file in the ITE combined version diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 5546e81992..a7c802f0c9 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -399,7 +399,7 @@ void Scene::skipScene() { _sceneQueue.erase(_sceneQueue.begin(), queueIterator); endScene(); - + loadScene(*_sceneQueue.begin()); break; } diff --git a/engines/saga/script.cpp b/engines/saga/script.cpp index 7a7e15c249..6fd6adfa10 100644 --- a/engines/saga/script.cpp +++ b/engines/saga/script.cpp @@ -316,7 +316,7 @@ void Script::setupScriptOpcodeList() { // String manipulation OPCODE(opDummy), // 71: opStrCat, string concatenation (unused) OPCODE(opDummy), // 72: opStrFormat, string formatting (unused) - // Assignment + // Assignment OPCODE(opDummy), // 73: assign (unused) OPCODE(opDummy), // 74: += (unused) OPCODE(opDummy), // 75: -= (unused) @@ -434,7 +434,7 @@ void Script::setupScriptOpcodeList() { // String manipulation OPCODE(opDummy), // 80: opStrCat, string concatenation (unused) OPCODE(opDummy), // 81: opStrFormat, string formatting (unused) - // Assignment + // Assignment OPCODE(opDummy), // 82: assign (unused) OPCODE(opDummy), // 83: += (unused) OPCODE(opDummy), // 84: -= (unused) @@ -660,7 +660,7 @@ void Script::opCcallV(SCRIPTOP_PARAMS) { (this->*scriptFunction)(thread, argumentsCount, stopParsing); if (stopParsing) return; - + if (scriptFunction == &Saga::Script::sfScriptGotoScene) { stopParsing = true; breakOut = true; diff --git a/engines/saga/script.h b/engines/saga/script.h index 85eb92b96c..fa2ea35c5d 100644 --- a/engines/saga/script.h +++ b/engines/saga/script.h @@ -444,7 +444,7 @@ protected: void setupScriptOpcodeList(); void opDummy(SCRIPTOP_PARAMS) { warning("Dummy opcode called"); } - void opNextBlock(SCRIPTOP_PARAMS) { + void opNextBlock(SCRIPTOP_PARAMS) { thread->_instructionOffset = (((thread->_instructionOffset) >> 10) + 1) << 10; } void opDup(SCRIPTOP_PARAMS); diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index 29f2ab28ce..b2744482bd 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -219,7 +219,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff file->open(soundFileName); soundResourceLength = file->size(); context->isBigEndian = true; - } else + } else #endif { ResourceData* resourceData = context->getResourceData(resourceId); |