diff options
Diffstat (limited to 'engines/tinsel')
-rw-r--r-- | engines/tinsel/actors.cpp | 10 | ||||
-rw-r--r-- | engines/tinsel/actors.h | 2 | ||||
-rw-r--r-- | engines/tinsel/background.h | 2 | ||||
-rw-r--r-- | engines/tinsel/bmv.cpp | 8 | ||||
-rw-r--r-- | engines/tinsel/cursor.cpp | 6 | ||||
-rw-r--r-- | engines/tinsel/dialogs.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/drives.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/handle.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/mareels.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/move.cpp | 20 | ||||
-rw-r--r-- | engines/tinsel/music.cpp | 6 | ||||
-rw-r--r-- | engines/tinsel/pcode.cpp | 4 | ||||
-rw-r--r-- | engines/tinsel/pcode.h | 2 | ||||
-rw-r--r-- | engines/tinsel/pdisplay.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/play.cpp | 4 | ||||
-rw-r--r-- | engines/tinsel/rince.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/sched.cpp | 4 | ||||
-rw-r--r-- | engines/tinsel/sound.cpp | 8 | ||||
-rw-r--r-- | engines/tinsel/strres.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/sysvar.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/timers.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/tinlib.cpp | 4 |
22 files changed, 49 insertions, 49 deletions
diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp index 4d4587bf8b..279c482376 100644 --- a/engines/tinsel/actors.cpp +++ b/engines/tinsel/actors.cpp @@ -95,7 +95,7 @@ struct ACTORINFO { const FREEL *presReel; // the present reel int presRnum; // the present reel number - SCNHANDLE presFilm; // the film that reel belongs to + SCNHANDLE presFilm; // the film that reel belongs to OBJECT *presObj; // reference for position information int presPlayX, presPlayY; @@ -108,9 +108,9 @@ struct ACTORINFO { COLORREF textColour; // Text colour - SCNHANDLE playFilm; // revert to this after talks - SCNHANDLE talkFilm; // this be deleted in the future! - SCNHANDLE latestFilm; // the last film ordered + SCNHANDLE playFilm; // revert to this after talks + SCNHANDLE talkFilm; // this be deleted in the future! + SCNHANDLE latestFilm; // the last film ordered bool bTalking; int steps; @@ -162,7 +162,7 @@ static Z_POSITIONS zPositions[NUM_ZPOSITIONS]; * @param num Chunk Id */ void RegisterActors(int num) { - if (actorInfo == NULL) { + if (actorInfo == NULL) { // Store the total number of actors in the game NumActors = num; diff --git a/engines/tinsel/actors.h b/engines/tinsel/actors.h index 03fd0151b4..74a5ba4185 100644 --- a/engines/tinsel/actors.h +++ b/engines/tinsel/actors.h @@ -147,7 +147,7 @@ struct SAVED_ACTOR { short zFactor; bool bAlive; bool bHidden; - SCNHANDLE presFilm; //!< the film that reel belongs to + SCNHANDLE presFilm; //!< the film that reel belongs to short presRnum; //!< the present reel number short presPlayX, presPlayY; }; diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h index 245507841c..3b9d11fee6 100644 --- a/engines/tinsel/background.h +++ b/engines/tinsel/background.h @@ -93,7 +93,7 @@ void PlayfieldGetPos( // Returns the xy position of the specified playfield in int *pXpos, // returns current x position int *pYpos); // returns current y position -int PlayfieldGetCentreX( // Returns the xy position of the specified playfield in the current background +int PlayfieldGetCentreX( // Returns the xy position of the specified playfield in the current background int which); // which playfield OBJECT *GetPlayfieldList( // Returns the display list for the specified playfield diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp index 2607ed068b..208184035b 100644 --- a/engines/tinsel/bmv.cpp +++ b/engines/tinsel/bmv.cpp @@ -97,8 +97,8 @@ bool bOldAudio; #define BIT0 0x01 #define CD_XSCR 0x04 // Screen has a scroll offset -#define CD_CMAP 0x08 // Colour map is included -#define CD_CMND 0x10 // Command is included +#define CD_CMAP 0x08 // Colour map is included +#define CD_CMND 0x10 // Command is included #define CD_AUDIO 0x20 // Audio data is included #define CD_EXTEND 0x40 // Extended modes "A"-"z" #define CD_PRINT 0x80 // goes in conjunction with CD_CMD @@ -264,7 +264,7 @@ static void PrepBMV(const byte *sourceData, int length, short deltaFetchDisp) { firstLoop = false; } - // Is lo nibble '00xx'? + // Is lo nibble '00xx'? if ((eax & 0xC) == 0) { for (;;) { //@_rDN_Lp_1: @@ -438,7 +438,7 @@ static void MoviePalette(int paletteOffset) { r = bigBuffer + paletteOffset; - for (i = 0; i < 256; i++, r += 3) { + for (i = 0; i < 256; i++, r += 3) { moviePal[i] = TINSEL_RGB(*r, *(r + 1), *(r + 2)); } diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp index 53ad6094da..1775eab891 100644 --- a/engines/tinsel/cursor.cpp +++ b/engines/tinsel/cursor.cpp @@ -303,7 +303,7 @@ void HideCursorTrails(void) { bTempNoTrailers = true; - for (i = 0; i < numTrails; i++) { + for (i = 0; i < numTrails; i++) { if (ntrailData[i].trailObj != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj); ntrailData[i].trailObj = NULL; @@ -512,7 +512,7 @@ static void InitCurPos(void) { DoCursorMove(); MultiHideObject(McurObj); - IterationSize = ITERATION_BASE; + IterationSize = ITERATION_BASE; } /** @@ -646,7 +646,7 @@ void DropCursor(void) { bWhoa = true; // Suspend cursor processes for (int i = 0; i < numTrails; i++) { - if (ntrailData[i].trailObj != NULL) { + if (ntrailData[i].trailObj != NULL) { MultiDeleteObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj); ntrailData[i].trailObj = NULL; } diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp index ce4ba5858b..2987e091b3 100644 --- a/engines/tinsel/dialogs.cpp +++ b/engines/tinsel/dialogs.cpp @@ -3584,7 +3584,7 @@ void SetConvDetails(CONV_PARAM fn, HPOLYGON hPoly, int ano) { bMoveOnUnHide = true; // Get the Actor Tag's or Tagged Actor's label for the conversation window title - if (hPoly != NOPOLY) { + if (hPoly != NOPOLY) { int x, y; GetTagTag(hPoly, &InvD[INV_CONV].hInvTitle, &x, &y); } else { diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index 2e87eb1715..a674211f66 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -115,7 +115,7 @@ bool GotoCD(void) { currentCD = nextCD; -/* if (bNoCD) { +/* if (bNoCD) { strcpy(cdDirectory, hdDirectory); cdLastBit[3] = currentCD; strcat(cdDirectory, cdLastBit); diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index ba09675b3f..ca91670bee 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -235,7 +235,7 @@ void LoadCDGraphData(MEMHANDLE *pH) { bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK); // New code to try and handle CD read failures 24/2/97 - while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES) { + while (bytes != ((cdTopHandle - cdBaseHandle) & OFFSETMASK) && retries++ < MAX_READ_RETRIES) { // Try again cdGraphStream.seek(cdBaseHandle & OFFSETMASK, SEEK_SET); bytes = cdGraphStream.read(addr, (cdTopHandle - cdBaseHandle) & OFFSETMASK); diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp index 8c09787690..a7cf95bc62 100644 --- a/engines/tinsel/mareels.cpp +++ b/engines/tinsel/mareels.cpp @@ -155,7 +155,7 @@ SCNHANDLE ScalingReel(int ano, int scale1, int scale2, DIRECTION reel) { else d = D_UP; - for (int i = 0; i < scrEntries; i++) { + for (int i = 0; i < scrEntries; i++) { if (SCIdata[i].actor == ano && SCIdata[i].scale == scale1 && SCIdata[i].direction == d) { if (SCIdata[i].reels[reel] == TF_NONE) return 0; diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp index 4422a7cf4a..621d069aa5 100644 --- a/engines/tinsel/move.cpp +++ b/engines/tinsel/move.cpp @@ -726,7 +726,7 @@ static void SetNextDest(PMOVER pMover) { GotThere(pMover); return; } else { - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5001 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5001 SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY); } } @@ -775,7 +775,7 @@ static void SetNextDest(PMOVER pMover) { // Fall through for LEAVING case LEAVING: - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5002 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5002 SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY); targetX = pMover->ItargetX; // Desired position targetY = pMover->ItargetY; @@ -807,7 +807,7 @@ static void SetNextDest(PMOVER pMover) { } else { // Last node - we're off pMover->npstatus = LEAVING; - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5003 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5003 SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY); targetX = pMover->ItargetX; // Desired position targetY = pMover->ItargetY; @@ -840,7 +840,7 @@ static void SetNextDest(PMOVER pMover) { } else { // Last node - we're off pMover->npstatus = LEAVING; - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5004 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5004 SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY); targetX = pMover->ItargetX; // Desired position targetY = pMover->ItargetY; @@ -1396,7 +1396,7 @@ int SetActorDest(PMOVER pMover, int clickX, int clickY, bool igPath, SCNHANDLE h } } - assert(pMover->bIgPath || InPolygon(targetX, targetY, PATH) != NOPOLY); // Error 5005 + assert(pMover->bIgPath || InPolygon(targetX, targetY, PATH) != NOPOLY); // Error 5005 SetMoverUltDest(pMover, targetX, targetY); SetMoverIntDest(pMover, targetX, targetY); @@ -1454,7 +1454,7 @@ static void NotMoving(PMOVER pActor, int x, int y) { if (pActor->ItargetX != -1 || pActor->ItargetY != -1) { SetNextDest(pActor); } else if (pActor->UtargetX != -1 || pActor->UtargetY != -1) { - assert(pActor->bIgPath || InPolygon(pActor->UtargetX, pActor->UtargetY, PATH) != NOPOLY); // Error 5006 + assert(pActor->bIgPath || InPolygon(pActor->UtargetX, pActor->UtargetY, PATH) != NOPOLY); // Error 5006 SetMoverIntDest(pActor, pActor->UtargetX, pActor->UtargetY); SetNextDest(pActor); } @@ -1516,7 +1516,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) { if (lastnode == firstnode) { pMover->hFnpath = NOPOLY; pMover->npstatus = NOT_IN; - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5007 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5007 SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY); SetNextDest(pMover); } else { @@ -1526,7 +1526,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) { pMover->hFnpath = hPath; pMover->line = firstnode ? firstnode - 1 : firstnode; if (pMover->line == pMover->Tline && hPath == pMover->hUpath) { - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5008 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5008 SetMoverIntDest(pMover, pMover->UtargetX, pMover->UtargetY); SetMoverDest(pMover, pMover->UtargetX, pMover->UtargetY); } else { @@ -1547,7 +1547,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) { } else { pMover->hFnpath = NOPOLY; pMover->npstatus = NOT_IN; - assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5009 + assert(pMover->bIgPath || InPolygon(pMover->UtargetX, pMover->UtargetY, PATH) != NOPOLY); // Error 5009 // Added 26/01/95 if (IsPolyCorner(hPath, pMover->ItargetX, pMover->ItargetY)) @@ -1735,7 +1735,7 @@ void DoMoveActor(PMOVER pActor) { MoveActor(pActor); if ((pActor->targetX != -1 || pActor->targetY != -1) - && (wasx == pActor->objX && wasy == pActor->objY)) { + && (wasx == pActor->objX && wasy == pActor->objY)) { for (i=0; i < NUMBER; i++) { MoveActor(pActor); if (wasx != pActor->objX || wasy != pActor->objY) diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 0fbd935507..51ae012e3d 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -141,7 +141,7 @@ const int enhancedAudioSCNVersion[] = { 84, 85, 86, 3124, 88, 89, 90, 88, 2, 2, // 121-130 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 131-140 3141, 91, 92, 93, 94, 94, 95, 96, 52, 4, // 141-150 - 97, 98, 99, 99 // 151-154 + 97, 98, 99, 99 // 151-154 }; int GetTrackNumber(SCNHANDLE hMidi) { @@ -252,7 +252,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { // Store the length //dwLastSeqLen = dwSeqLen; } else { - // dwFileOffset == dwLastMidiIndex + // dwFileOffset == dwLastMidiIndex _vm->_midiMusic->stop(); _vm->_midiMusic->playXMIDI(midiBuffer.pDat, dwSeqLen, bLoop); } @@ -301,7 +301,7 @@ int GetMidiVolume() { void SetMidiVolume(int vol) { assert(vol >= 0 && vol <= Audio::Mixer::kMaxChannelVolume); - if (vol == 0 && volMusic == 0) { + if (vol == 0 && volMusic == 0) { // Nothing to do } else if (vol == 0 && volMusic != 0) { // Stop current midi sequence diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index b90a90bfc2..33550b39e8 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -230,7 +230,7 @@ void FreeMasterInterpretContext(void) { INT_CONTEXT *pic; int i; - for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) { + for (i = 0, pic = icList; i < NUM_INTERPRET; i++, pic++) { if ((pic->GSort == GS_MASTER) || (pic->GSort == GS_GPROCESS)) { memset(pic, 0, sizeof(INT_CONTEXT)); pic->GSort = GS_NONE; @@ -762,7 +762,7 @@ void CheckOutWaiters(void) { int i, j; // Check all waited for have someone waiting - for (i = 0; i < NUM_INTERPRET; i++) { + for (i = 0; i < NUM_INTERPRET; i++) { // If someone is supposedly waiting for this one if ((icList + i)->GSort != GS_NONE && (icList + i)->waitNumber2) { // Someone really must be waiting for this one diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h index ec8b9e4587..0c75cc0df1 100644 --- a/engines/tinsel/pcode.h +++ b/engines/tinsel/pcode.h @@ -129,7 +129,7 @@ void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result); #define CONV_END 2 // #define CONTROL_OFF 0 // control() -#define CONTROL_ON 1 // parameter +#define CONTROL_ON 1 // parameter #define CONTROL_OFFV 2 // #define CONTROL_OFFV2 3 // #define CONTROL_STARTOFF 4 // diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp index 0eecaf28ef..9f0a592be0 100644 --- a/engines/tinsel/pdisplay.cpp +++ b/engines/tinsel/pdisplay.cpp @@ -270,7 +270,7 @@ void DisablePointing(CORO_PARAM) { bPointingActive = false; - for (_ctx->i = 0; _ctx->i < MAX_POLY; _ctx->i++) { + for (_ctx->i = 0; _ctx->i < MAX_POLY; _ctx->i++) { _ctx->hPoly = GetPolyHandle(_ctx->i); if (_ctx->hPoly != NOPOLY && PolyType(_ctx->hPoly) == TAG && PolyIsPointedTo(_ctx->hPoly)) { diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp index e297cb0316..90709f6d31 100644 --- a/engines/tinsel/play.cpp +++ b/engines/tinsel/play.cpp @@ -50,7 +50,7 @@ struct PPINIT { int16 y; // } - set to (-1, -1) if none. int16 z; // normally 0, set if from restore int16 speed; // Film speed - int16 actorid; // Set if called from an actor code block + int16 actorid; // Set if called from an actor code block uint8 splay; // Set if called from splay() uint8 bTop; // Set if called from topplay() uint8 bRestore; @@ -996,7 +996,7 @@ void PlayFilm(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int actorid, bool splay ppi.bTop = bTop; ppi.sf = sfact; ppi.escOn = escOn; - ppi.myescEvent = myescEvent; + ppi.myescEvent = myescEvent; // Start display process for each reel in the film for (int i = FROM_LE_32(pFilm->numreels) - 1; i >= 0; i--) { diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp index 33273ad372..03ca9c074d 100644 --- a/engines/tinsel/rince.cpp +++ b/engines/tinsel/rince.cpp @@ -761,7 +761,7 @@ void T1MoverProcess(CORO_PARAM, const void *param) { while (1) { if (pActor->bSpecReel) { - if (!pActor->bHidden) + if (!pActor->bHidden) #ifdef DEBUG assert(StepAnimScript(&pActor->actorAnim) != ScriptFinished); // Actor reel has finished! #else diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp index b7cfb22473..295df019c8 100644 --- a/engines/tinsel/sched.cpp +++ b/engines/tinsel/sched.cpp @@ -671,7 +671,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) { */ void KillGlobalProcesses(void) { - for (uint32 i = 0; i < numGlobalProcess; ++i) { + for (uint32 i = 0; i < numGlobalProcess; ++i) { g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1); } } @@ -692,7 +692,7 @@ bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWai uint32 i; // Loop counter _ctx->pProc = NULL; - for (i = 0; i < numGlobalProcess; ++i) { + for (i = 0; i < numGlobalProcess; ++i) { if (pGlobalProcess[i].processId == procID) { assert(pGlobalProcess[i].hProcessCode); // Must have some code to run diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 3a03fea6ef..5c4f74e0d2 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -325,7 +325,7 @@ int8 SoundManager::getPan(int x) { * @param id Identifier of sample to be checked */ bool SoundManager::sampleExists(int id) { - if (_vm->_mixer->isReady()) { + if (_vm->_mixer->isReady()) { // make sure id is in range if (id > 0 && id < _sampleIndexLen) { // check for a sample index @@ -406,7 +406,7 @@ void SoundManager::openSampleFiles(void) { return; // open sample index file in binary mode - if (f.open(_vm->getSampleIndex(sampleLanguage))) { + if (f.open(_vm->getSampleIndex(sampleLanguage))) { // get length of index file f.seek(0, SEEK_END); // move to end of file _sampleIndexLen = f.pos(); // get file pointer @@ -445,7 +445,7 @@ void SoundManager::openSampleFiles(void) { char buf[50]; sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage)); GUI::MessageDialog dialog(buf, "OK"); - dialog.runModal(); + dialog.runModal(); error(CANNOT_FIND_FILE, _vm->getSampleIndex(sampleLanguage)); } @@ -455,7 +455,7 @@ void SoundManager::openSampleFiles(void) { char buf[50]; sprintf(buf, CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage)); GUI::MessageDialog dialog(buf, "OK"); - dialog.runModal(); + dialog.runModal(); error(CANNOT_FIND_FILE, _vm->getSampleFile(sampleLanguage)); } diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp index 60ac8cdb2a..bbf02301db 100644 --- a/engines/tinsel/strres.cpp +++ b/engines/tinsel/strres.cpp @@ -100,7 +100,7 @@ void ChangeLanguage(LANGUAGE newLang) { char buf[50]; sprintf(buf, CANNOT_FIND_FILE, _vm->getTextFile(newLang)); GUI::MessageDialog dialog(buf, "OK"); - dialog.runModal(); + dialog.runModal(); error(CANNOT_FIND_FILE, _vm->getTextFile(newLang)); } diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp index 7196e7597d..c489e4523b 100644 --- a/engines/tinsel/sysvar.cpp +++ b/engines/tinsel/sysvar.cpp @@ -93,7 +93,7 @@ static int systemVars[SV_TOPVALID] = { 0, // SYS_MaximumYoffset 0, // SYS_DefaultFxDimFactor - 0, // SYS_SceneFxDimFactor + 0, // SYS_SceneFxDimFactor 0x606060, // SYS_HighlightRGB WIN_PC, // SYS_Platform, diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp index 8446aad0fa..fa74797dd9 100644 --- a/engines/tinsel/timers.cpp +++ b/engines/tinsel/timers.cpp @@ -41,7 +41,7 @@ namespace Tinsel { #define MAX_TIMERS 16 struct TIMER { - int tno; /**< Timer number */ + int tno; /**< Timer number */ int ticks; /**< Tick count */ int secs; /**< Second count */ int delta; /**< Increment/decrement value */ diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index f7aefc5494..d5360b53ed 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -474,7 +474,7 @@ void TinGetVersion(WHICH_VER which, char *buffer, int length) { char *cptr = (char *)FindChunk(MASTER_SCNHANDLE, CHUNK_TIME_STAMPS); - switch (which) { + switch (which) { case VER_GLITTER: memcpy(buffer, cptr, length); break; @@ -1977,7 +1977,7 @@ static void Print(CORO_PARAM, int x, int y, SCNHANDLE text, int time, bool bSust if (_ctx->bSample) { // Wait for sample to end whether or not if (!_vm->_mixer->isSoundHandleActive(_ctx->handle)) { - if (_ctx->pText == NULL || speedText == DEFTEXTSPEED) { + if (_ctx->pText == NULL || speedText == DEFTEXTSPEED) { // No text or speed modification - just depends on sample break; } else { |