[Scummvm-cvs-logs] SF.net SVN: scummvm:[45450] scummvm/trunk/engines/tinsel
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Oct 27 22:34:52 CET 2009
Revision: 45450
http://scummvm.svn.sourceforge.net/scummvm/?rev=45450&view=rev
Author: fingolfin
Date: 2009-10-27 21:34:43 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
TINSEL: Formatting cleanup, remove a dead var, tweaked comment to Get/SetNoBlocking
Modified Paths:
--------------
scummvm/trunk/engines/tinsel/cliprect.cpp
scummvm/trunk/engines/tinsel/play.cpp
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/engines/tinsel/strres.cpp
scummvm/trunk/engines/tinsel/sysvar.cpp
scummvm/trunk/engines/tinsel/tinlib.cpp
Modified: scummvm/trunk/engines/tinsel/cliprect.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/cliprect.cpp 2009-10-27 19:24:49 UTC (rev 45449)
+++ scummvm/trunk/engines/tinsel/cliprect.cpp 2009-10-27 21:34:43 UTC (rev 45450)
@@ -266,10 +266,9 @@
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;
}
Modified: scummvm/trunk/engines/tinsel/play.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/play.cpp 2009-10-27 19:24:49 UTC (rev 45449)
+++ scummvm/trunk/engines/tinsel/play.cpp 2009-10-27 21:34:43 UTC (rev 45450)
@@ -152,8 +152,7 @@
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 @@
}
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;
}
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2009-10-27 19:24:49 UTC (rev 45449)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2009-10-27 21:34:43 UTC (rev 45450)
@@ -56,8 +56,7 @@
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 @@
/**
* 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;
Modified: scummvm/trunk/engines/tinsel/strres.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/strres.cpp 2009-10-27 19:24:49 UTC (rev 45449)
+++ scummvm/trunk/engines/tinsel/strres.cpp 2009-10-27 21:34:43 UTC (rev 45450)
@@ -288,13 +288,11 @@
}
}
- 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
Modified: scummvm/trunk/engines/tinsel/sysvar.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sysvar.cpp 2009-10-27 19:24:49 UTC (rev 45449)
+++ scummvm/trunk/engines/tinsel/sysvar.cpp 2009-10-27 21:34:43 UTC (rev 45450)
@@ -38,9 +38,6 @@
//----------------- GLOBAL GLOBAL DATA --------------------
-// To prevent assembler from needing to call SysVar()
-uint8 ghostColour;
-
extern int NewestSavedGame(void);
//----------------- LOCAL GLOBAL DATA --------------------
@@ -141,10 +138,6 @@
default:
systemVars[varId] = newValue;
-
- if (varId == ISV_GHOST_COLOUR) {
- ghostColour = (uint8)newValue;
- }
}
}
@@ -183,8 +176,6 @@
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 @@
}
/**
- * 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);
Modified: scummvm/trunk/engines/tinsel/tinlib.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/tinlib.cpp 2009-10-27 19:24:49 UTC (rev 45449)
+++ scummvm/trunk/engines/tinsel/tinlib.cpp 2009-10-27 21:34:43 UTC (rev 45450)
@@ -371,8 +371,7 @@
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 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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list