aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/tinsel/cliprect.cpp7
-rw-r--r--engines/tinsel/play.cpp6
-rw-r--r--engines/tinsel/sound.cpp6
-rw-r--r--engines/tinsel/strres.cpp6
-rw-r--r--engines/tinsel/sysvar.cpp17
-rw-r--r--engines/tinsel/tinlib.cpp6
6 files changed, 15 insertions, 33 deletions
diff --git a/engines/tinsel/cliprect.cpp b/engines/tinsel/cliprect.cpp
index d9520af9e9..2ec9907149 100644
--- a/engines/tinsel/cliprect.cpp
+++ b/engines/tinsel/cliprect.cpp
@@ -266,10 +266,9 @@ void UpdateClipRect(OBJECT *pObjList, Common::Point *pWin, Common::Rect *pClip)
if (currentObj.leftClip < 0) {
// negative - object is not clipped
currentObj.leftClip = 0;
- }
- else
- // NOTE: This else statement is disabled in tinsel v1
- { // clipped - adjust start position to left of clip rect
+ } else {
+ // NOTE: This else statement is disabled in tinsel v1
+ // clipped - adjust start position to left of clip rect
x = pClip->left;
}
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index fd086dbcb0..ae40c11ae9 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -152,8 +152,7 @@ static int RegisterSoundReel(SCNHANDLE hFilm, int column, int actorCol) {
if (soundReels[i].hFilm == hFilm && soundReels[i].column == column)
break;
- if (!soundReels[i].hFilm)
- {
+ if (!soundReels[i].hFilm) {
soundReels[i].hFilm = hFilm;
soundReels[i].column = column;
soundReels[i].actorCol = actorCol;
@@ -181,8 +180,7 @@ static void DeRegisterSoundReel(SCNHANDLE hFilm, int column) {
}
void SaveSoundReels(PSOUNDREELS psr) {
- for (int i = 0; i < MAX_SOUNDREELS; i++)
- {
+ for (int i = 0; i < MAX_SOUNDREELS; i++) {
if (IsCdPlayHandle(soundReels[i].hFilm))
soundReels[i].hFilm = 0;
}
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index bc1ae8c6b9..264a9e403e 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -56,8 +56,7 @@ extern LANGUAGE sampleLanguage;
SoundManager::SoundManager(TinselEngine *vm) :
//_vm(vm), // TODO: Enable this once global _vm var is gone
_sampleIndex(0), _sampleIndexLen(0),
- _soundMode(kVOCMode)
- {
+ _soundMode(kVOCMode) {
for (int i = 0; i < kNumChannels; i++)
_channels[i].sampleNum = _channels[i].subSample = -1;
@@ -339,8 +338,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p
/**
* Returns FALSE if sample doesn't need playing
*/
-bool SoundManager::offscreenChecks(int x, int &y)
-{
+bool SoundManager::offscreenChecks(int x, int &y) {
// No action if no x specification
if (x == -1)
return true;
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index 532bc9267f..50eeda4d00 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -288,13 +288,11 @@ int LoadStringResource(int id, int sub, char *pBuffer, int bufferMax) {
}
}
- if (len)
- {
+ if (len) {
// the string exists
// copy the string to the buffer
- if (len < bufferMax)
- {
+ if (len < bufferMax) {
memcpy(pBuffer, pText + 1, len);
// null terminate
diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp
index 88c702609d..41437c069b 100644
--- a/engines/tinsel/sysvar.cpp
+++ b/engines/tinsel/sysvar.cpp
@@ -38,9 +38,6 @@ typedef enum { DOS_PC, WIN_PC, APPLE_MAC, SONY_PSX, SEGA_SATURN } platform;
//----------------- GLOBAL GLOBAL DATA --------------------
-// To prevent assembler from needing to call SysVar()
-uint8 ghostColour;
-
extern int NewestSavedGame(void);
//----------------- LOCAL GLOBAL DATA --------------------
@@ -141,10 +138,6 @@ void SetSysVar(int varId, int newValue) {
default:
systemVars[varId] = newValue;
-
- if (varId == ISV_GHOST_COLOUR) {
- ghostColour = (uint8)newValue;
- }
}
}
@@ -183,8 +176,6 @@ void SaveSysVars(int *pSv) {
void RestoreSysVars(int *pSv) {
memcpy(systemVars, pSv, sizeof(systemVars));
-
- ghostColour = (uint8)SysVar(ISV_GHOST_COLOUR);
}
void SetSysString(int number, SCNHANDLE hString) {
@@ -200,16 +191,16 @@ SCNHANDLE SysString(int number) {
}
/**
- * Gets the no blocking flag. Note that for convenience, the systemVars arrray entry is
- * used even for Tinsel 1, which used a separate boolean variable
+ * Gets the no blocking flag. Note that for convenience, the systemVars array
+ * entry is used even for Tinsel 1, which originally used a separate variable.
*/
bool GetNoBlocking(void) {
return SysVar(ISV_NO_BLOCKING);
}
/**
- * Sets the no blocking flag. Note that for convenience, the systemVars arrray entry is
- * used even for Tinsel 1, which used a separate boolean variable
+ * Sets the no blocking flag. Note that for convenience, the systemVars array
+ * entry is used even for Tinsel 1, which originally used a separate variable.
*/
void SetNoBlocking(bool flag) {
SetSysVar(ISV_NO_BLOCKING, flag);
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index 0bbe65d8c6..ff9a65c2a3 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -371,8 +371,7 @@ static void ScrollMonitorProcess(CORO_PARAM, const void *param) {
break;
// If ESCAPE is pressed...
- if (psm->myEscape != GetEscEvents())
- {
+ if (psm->myEscape != GetEscEvents()) {
// Instant completion!
Offset(EX_USEXY, psm->x, psm->y);
break;
@@ -974,8 +973,7 @@ static void DecLead(uint32 id, SCNHANDLE *rp = 0, SCNHANDLE text = 0) {
static void DecScale(int actor, int scale,
SCNHANDLE wkl, SCNHANDLE wkr, SCNHANDLE wkf, SCNHANDLE wka,
SCNHANDLE stl, SCNHANDLE str, SCNHANDLE stf, SCNHANDLE sta,
- SCNHANDLE tal, SCNHANDLE tar, SCNHANDLE taf, SCNHANDLE taa)
-{
+ SCNHANDLE tal, SCNHANDLE tar, SCNHANDLE taf, SCNHANDLE taa) {
PMOVER pMover = GetMover(actor);
assert(pMover);