From 54b2a8c98df204dfe64a27fc830936ec62e3f9ed Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Tue, 12 Oct 2010 04:19:58 +0000 Subject: JANITORIAL: Cleanup (mostly whitespace) svn-id: r53161 --- engines/kyra/resource_intern.cpp | 2 +- engines/kyra/screen.cpp | 2 +- engines/kyra/screen_lol.cpp | 2 +- engines/kyra/script_tim.cpp | 2 +- engines/kyra/sprites.cpp | 4 ++-- engines/kyra/staticres.cpp | 2 +- engines/kyra/text_hof.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'engines/kyra') diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index 0d968de9ff..445ea579a0 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -514,7 +514,7 @@ void FileExpanderSource::advSrcBitsBy1() { _key >>= 1; if (!--_bitsLeft) { if (_dataPtr < _endofBuffer) - _key = ((*_dataPtr++) << 8 ) | (_key & 0xff); + _key = ((*_dataPtr++) << 8) | (_key & 0xff); _bitsLeft = 8; } } diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 7ca3ae89d5..b7e01f31aa 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -787,7 +787,7 @@ void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPag } if (y2 < 0) { - if (y2 <= -h ) + if (y2 <= -h) return; h += y2; y1 -= y2; diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index be3dbe5b21..e8ec7bc180 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -637,7 +637,7 @@ void Screen_LoL::copyRegionSpecial(int page1, int w1, int h1, int x1, int y1, in d++; } - for (int ii = (i & 1) ^ 1; ii < ibw_2; ii += 2 ) { + for (int ii = (i & 1) ^ 1; ii < ibw_2; ii += 2) { *d = *s; d += 2; s += 2; diff --git a/engines/kyra/script_tim.cpp b/engines/kyra/script_tim.cpp index 907c5ee7bd..61916b92c0 100644 --- a/engines/kyra/script_tim.cpp +++ b/engines/kyra/script_tim.cpp @@ -259,7 +259,7 @@ int TIMInterpreter::exec(TIM *tim, bool loop) { if (cur.ip) { cur.ip += cur.ip[0]; cur.lastTime = cur.nextTime; - cur.nextTime += (cur.ip[1] ) * _vm->tickLength(); + cur.nextTime += cur.ip[1] * _vm->tickLength(); } } } diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 4fa12fd687..52689869c6 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -71,7 +71,7 @@ void Sprites::setupSceneAnims() { if (_anims[i].script != 0) { data = _anims[i].script; - assert( READ_LE_UINT16(data) == 0xFF86 ); + assert(READ_LE_UINT16(data) == 0xFF86); data += 4; _anims[i].disable = READ_LE_UINT16(data) != 0; @@ -509,7 +509,7 @@ void Sprites::loadDat(const char *filename, SceneExits &exits) { } void Sprites::freeSceneShapes() { - for (int i = 0; i < ARRAYSIZE(_sceneShapes); i++ ) { + for (int i = 0; i < ARRAYSIZE(_sceneShapes); i++) { delete[] _sceneShapes[i]; _sceneShapes[i] = 0; } diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 4b71b1d69d..a06b488c86 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -878,7 +878,7 @@ void KyraEngine_LoK::loadItems() { _shapes[323] = 0; - for (shape = 1; shape < 6; shape++ ) + for (shape = 1; shape < 6; shape++) _shapes[323 + shape] = _screen->encodeShape((shape - 1) * 32, 0, 32, 17, 0); for (shape = 330; shape <= 334; shape++) diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index 9d20cdd51a..4c292b70db 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -544,7 +544,7 @@ void KyraEngine_HoF::processDialogue(int dlgOffset, int vocH, int csEntry) { } objectChat((const char *)_unkBuf500Bytes, 0, vocHi, vocLo); } else { - if (activeTimSequence != nextTimSequence ) { + if (activeTimSequence != nextTimSequence) { if (activeTimSequence > -1) { deinitTalkObject(activeTimSequence); activeTimSequence = -1; -- cgit v1.2.3