aboutsummaryrefslogtreecommitdiff
path: root/engines/sword1
diff options
context:
space:
mode:
authorMax Horn2011-02-07 23:01:06 +0000
committerMax Horn2011-02-07 23:01:06 +0000
commit2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb (patch)
treea538852678f172dec297b83d115a7d76f2638969 /engines/sword1
parent377b4c67d99503b19e866ff47c685c57dd2a56e0 (diff)
downloadscummvm-rg350-2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb.tar.gz
scummvm-rg350-2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb.tar.bz2
scummvm-rg350-2d1c8a35331d4c73032a6fcd50ab3f7a27513dbb.zip
ALL: Fix whitespaces / indention
svn-id: r55818
Diffstat (limited to 'engines/sword1')
-rw-r--r--engines/sword1/control.cpp2
-rw-r--r--engines/sword1/mouse.cpp4
-rw-r--r--engines/sword1/music.cpp2
-rw-r--r--engines/sword1/router.cpp8
-rw-r--r--engines/sword1/screen.cpp2
-rw-r--r--engines/sword1/sound.cpp4
6 files changed, 11 insertions, 11 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 1d310d55e2..c61d0b7c85 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -122,7 +122,7 @@ ControlButton::ControlButton(uint16 x, uint16 y, uint32 resId, uint8 id, uint8 f
_width = (_width > SCREEN_WIDTH) ? SCREEN_WIDTH : _width;
_height = _resMan->getUint16(tmp->height);
if ((x == 0) && (y == 0)) { // center the frame (used for panels);
- _x = (((640 - _width) / 2) < 0)? 0 : ((640 - _width) / 2) ;
+ _x = (((640 - _width) / 2) < 0)? 0 : ((640 - _width) / 2);
_y = (((480 - _height) / 2) < 0)? 0 : ((480 - _height) / 2);
}
_dstBuf = screenBuf + _y * SCREEN_WIDTH + _x;
diff --git a/engines/sword1/mouse.cpp b/engines/sword1/mouse.cpp
index 3df55fc7d2..cdc60d7634 100644
--- a/engines/sword1/mouse.cpp
+++ b/engines/sword1/mouse.cpp
@@ -313,7 +313,7 @@ void Mouse::animate() {
void Mouse::fnNoHuman() {
if (Logic::_scriptVars[MOUSE_STATUS] & 2) // locked, can't do anything
- return ;
+ return;
Logic::_scriptVars[MOUSE_STATUS] = 0; // off & unlocked
setLuggage(0, 0);
setPointer(0, 0);
@@ -321,7 +321,7 @@ void Mouse::fnNoHuman() {
void Mouse::fnAddHuman() {
if (Logic::_scriptVars[MOUSE_STATUS] & 2) // locked, can't do anything
- return ;
+ return;
Logic::_scriptVars[MOUSE_STATUS] = 1;
Logic::_scriptVars[SPECIAL_ITEM] = 0;
_getOff = SCR_std_off;
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index 23cc30e4b1..d860e1c69d 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -306,7 +306,7 @@ void Music::startMusic(int32 tuneId, int32 loopFlag) {
/* The handle will load the music file now. It can take a while, so unlock
the mutex before, to have the soundthread playing normally.
As the corresponding _converter is NULL, the handle will be ignored by the playing thread */
- if (SwordEngine::isPsx()) { ;
+ if (SwordEngine::isPsx()) {
if (_handles[newStream].playPSX(tuneId, loopFlag != 0)) {
_mutex.lock();
_converter[newStream] = Audio::makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
diff --git a/engines/sword1/router.cpp b/engines/sword1/router.cpp
index 84cc81cd0e..9ff5ae0c8e 100644
--- a/engines/sword1/router.cpp
+++ b/engines/sword1/router.cpp
@@ -783,7 +783,7 @@ void Router::slidyWalkAnimator(WalkData *walkAnim) {
stepCount += 1;
step += 1;
module += 1;
- } while ( module < moduleEnd) ;
+ } while ( module < moduleEnd);
stepX = _modX[_modularPath[p].dir];
stepY = _modY[_modularPath[p].dir];
errorX = _modularPath[p].x - moduleX;
@@ -1238,7 +1238,7 @@ int32 Router::solidWalkAnimator(WalkData *walkAnim) {
stepCount += 1;
module += 1;
step += 1;
- } while ( module < moduleEnd) ;
+ } while ( module < moduleEnd);
errorX = _modularPath[p].x - moduleX;
errorX = errorX * _modX[_modularPath[p].dir];
errorY = _modularPath[p].y - moduleY;
@@ -1951,8 +1951,8 @@ int32 Router::LoadWalkResources(Object *megaObject, int32 x, int32 y, int32 dir)
//ResClose(megaObject->o_mega_resource); // mouse wiggle
_resMan->resClose(megaObject->o_mega_resource);
- _diagonalx = _modX[3] ;//36
- _diagonaly = _modY[3] ;//8
+ _diagonalx = _modX[3]; //36
+ _diagonaly = _modY[3]; //8
// mega data ready
diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp
index 9c8d352fda..031ab74d9a 100644
--- a/engines/sword1/screen.cpp
+++ b/engines/sword1/screen.cpp
@@ -760,7 +760,7 @@ void Screen::drawPsxFullShrinkedSprite(uint8 *sprData, uint16 sprX, uint16 sprY,
uint8 *dest = _screenBuf + (sprY * _scrnSizeX) + sprX;
for (uint16 cnty = 0; cnty < sprHeight; cnty++) {
- for (uint16 cntx = 0; cntx < sprWidth ; cntx++)
+ for (uint16 cntx = 0; cntx < sprWidth; cntx++)
if (sprData[cntx]) {
dest[cntx * 3] = sprData[cntx]; //In these sprites we need to double vertical lines too...
dest[cntx * 3 + 1] = sprData[cntx];
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp
index 92bed1b624..ff2f1060ee 100644
--- a/engines/sword1/sound.cpp
+++ b/engines/sword1/sound.cpp
@@ -130,7 +130,7 @@ void Sound::checkSpeechFileEndianness() {
else
size /= 2;
int16 prev_be_value = (int16)SWAP_BYTES_16(*((uint16*)(data)));
- for (uint32 i = 1 ; i < size ; ++i) {
+ for (uint32 i = 1; i < size; ++i) {
le_diff_sum += fabs((double)(data[i] - data[i-1]));
int16 be_value = (int16)SWAP_BYTES_16(*((uint16*)(data + i)));
be_diff_sum += fabs((double)(be_value - prev_be_value));
@@ -209,7 +209,7 @@ void Sound::fnStopFx(int32 fxNo) {
if (cnt != _endOfQueue-1)
_fxQueue[cnt] = _fxQueue[_endOfQueue-1];
_endOfQueue--;
- return ;
+ return;
}
debug(8, "fnStopFx: id not found in queue");
}