BBVS: Remove trailing whitespace

10 files changed, 188 insertions, 188 deletions

diff --git a/engines/bbvs/minigames/bbairguitar.cpp b/engines/bbvs/minigames/bbairguitar.cpp
index f2e42313e3..1984dbb0fd 100644
--- a/engines/bbvs/minigames/bbairguitar.cpp
+++ b/engines/bbvs/minigames/bbairguitar.cpp
@@ -198,12 +198,12 @@ void MinigameBbAirGuitar::buildDrawList1(DrawList &drawList) {
 
 	if (_trackBarX > kTrackBarMaxX)
 		_trackBarX = kTrackBarMaxX;
-	
+
 	_trackBarThumbRect.top = 208;
 	_trackBarThumbRect.bottom = 218;
 	_trackBarThumbRect.left = _trackBarX;
 	_trackBarThumbRect.right = _trackBarX + 6;
-	
+
 	drawList.add(_objects[5].anim->frameIndices[0], _trackBarX, 208, 100);
 
 	if (_playerMode != 0) {
@@ -228,7 +228,7 @@ void MinigameBbAirGuitar::buildDrawList1(DrawList &drawList) {
 			drawList.add(_objects[i].anim->frameIndices[frameIndex], kPointsTbl2[i - 47].x, kPointsTbl2[i - 47].y, 254);
 		}
 	}
-	
+
 	if (_backgroundSpriteIndex > 0)
 		drawList.add(_backgroundSpriteIndex, 0, 0, 0);
 
@@ -394,7 +394,7 @@ void MinigameBbAirGuitar::initObjects1() {
 	_track[0].noteNum = -1;
 	stop();
 	changePatch(0);
-  
+
 }
 
 bool MinigameBbAirGuitar::updateStatus(int mouseX, int mouseY, uint mouseButtons) {
@@ -408,7 +408,7 @@ bool MinigameBbAirGuitar::updateStatus(int mouseX, int mouseY, uint mouseButtons
 }
 
 bool MinigameBbAirGuitar::updateStatus0(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	if (mouseButtons & kAnyButtonDown) {
 		stopSound(1);
 		_rockTunePlaying = false;
@@ -436,14 +436,14 @@ bool MinigameBbAirGuitar::updateStatus0(int mouseX, int mouseY, uint mouseButton
 		}
 
 	}
-  
+
   	return true;
 }
 
 bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	int currTicks = _vm->_system->getMillis();
-	
+
 	if (_playerMode == 1 && _track[_trackIndex].ticks <= currTicks - _noteStartTime) {
 		noteOff(_track[_trackIndex].noteNum);
 		if (_trackIndex < _trackCount && _track[++_trackIndex].noteNum != -1)
@@ -481,17 +481,17 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 	} else {
 		++_vuMeterRight2;
 	}
-	
+
 	if (_resetAnims && _vm->_system->getMillis() - _noteStartTime >= 1000)
 		resetObjs();
-	
+
 	_objects[0].x = mouseX;
 	_objects[0].y = mouseY;
-	
+
 	_trackBarMouseX = CLIP(mouseX, kTrackBarMinX, kTrackBarMaxX);
-	
+
 	bool checkClick = false;
-	
+
 	if (mouseButtons & kAnyButtonClicked) {
 		checkClick = true;
 	} else if (!(mouseButtons & kAnyButtonDown)) {
@@ -506,14 +506,14 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 		}
 	} else if (!_movingTrackBar)
 		checkClick = true;
-		
+
 	if (checkClick) {
 
 		afterButtonReleased();
 		_objects[0].frameIndex = 1;
-	
+
 		if (ptInRect(&kRect2, mouseX, mouseY)) {
-		
+
 			if (_playerMode != 1 && ptInRect(&kPianoRect, mouseX, mouseY)) {
 				for (int i = 0; i <= 12; ++i) {
 					if (ptInPoly(&kPianoKeyAreas[i], mouseX, mouseY)) {
@@ -538,7 +538,7 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 						break;
 					}
 				}
-				
+
 				if (playerButtonNum >= 0) {
 					_currButtonNum = playerButtonNum;
 					_currPlayerButtonRect = &kPlayerButtonRects[playerButtonNum];
@@ -673,12 +673,12 @@ bool MinigameBbAirGuitar::updateStatus1(int mouseX, int mouseY, uint mouseButton
 			}
 		}
 	}
-	
+
 	if (_buttonClickTicks + 1000 < currTicks)
 		_buttonClickTicks = currTicks;
-	
+
 	int newKind = _buttonClickTicks + 500 < currTicks ? 1 : 0;
-	
+
 	switch (_playerMode) {
 
 	case 1:
@@ -770,20 +770,20 @@ bool MinigameBbAirGuitar::run(bool fromMainGame) {
 	_gameResult = false;
 	_gameDone = false;
 	initObjects();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbairg/bbairg.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	delete _spriteModule;
@@ -803,15 +803,15 @@ void MinigameBbAirGuitar::update() {
 		inputTicks = 1;
 		_gameTicks = _vm->_system->getMillis();
 	}
-	
+
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
 		_gameDone = true;
 		return;
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	bool done;
 
 	do {
@@ -820,9 +820,9 @@ void MinigameBbAirGuitar::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
@@ -1001,7 +1001,7 @@ void MinigameBbAirGuitar::calcTotalTicks1() {
 }
 
 void MinigameBbAirGuitar::noteOn(int noteNum) {
-	
+
 	if (_currNoteNum != -2) {
 		if (noteNum == _currNoteNum)
 			return;
@@ -1087,7 +1087,7 @@ void MinigameBbAirGuitar::noteOn(int noteNum) {
 }
 
 void MinigameBbAirGuitar::noteOff(int noteNum) {
-	
+
 	if (_currNoteNum != noteNum)
 		return;
 
diff --git a/engines/bbvs/minigames/bbairguitar.h b/engines/bbvs/minigames/bbairguitar.h
index d4fd6ec30c..40b8a50a03 100644
--- a/engines/bbvs/minigames/bbairguitar.h
+++ b/engines/bbvs/minigames/bbairguitar.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbAirGuitar(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y;
@@ -44,24 +44,24 @@ public:
 		int16 frameIndexAdd;
 		int16 unk2;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256,
 		kMaxTracks = 2049
 	};
-	
+
 	struct PianoKeyInfo {
 		int x, y;
 		int frameIndex;
 	};
-	
+
 	struct TrackEvt {
 		int8 noteNum;
 		int16 ticks;
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _playerMode;
 
 	bool _modified;
@@ -82,24 +82,24 @@ public:
 
 	int *_currFrameIndex;
 	int _btn3KindToggle;
-	
+
 	const BBPolygon *_currPianoKeyArea;
 	const Rect *_currPlayerButtonRect;
-	
+
 	bool _movingTrackBar;
 	int _trackBarMouseX;
 	int _trackBarX;
 	Rect _trackBarThumbRect;
-	
+
 	int _currTrackPos, _totalTrackLength;
 	int _ticksDelta;
-	
+
 	int _actionStartTrackPos, _actionTrackPos;
 	int _actionStartTime;
 
 	int _currNoteNum;
 	int _currPatchNum;
-	
+
 	const ObjAnimation *getAnimation(int animIndex);
 	bool ptInRect(const Rect *r, int x, int y);
 	bool ptInPoly(const BBPolygon *poly, int x, int y);
@@ -109,14 +109,14 @@ public:
 	void buildDrawList1(DrawList &drawList);
 
 	void drawSprites();
-	
+
 	void initObjs();
 	Obj *getFreeObject();
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
@@ -124,7 +124,7 @@ public:
 	void updateObjs();
 
 	void update();
-	
+
 	void play();
 	void record();
 	void setPlayerMode3();
@@ -136,9 +136,9 @@ public:
 	void noteOn(int noteNum);
 	void noteOff(int noteNum);
 	void resetObjs();
-	
+
 	void loadSounds();
-	void playNote(int noteNum);	
+	void playNote(int noteNum);
 	void stopNote(int noteNum);
 
 };
diff --git a/engines/bbvs/minigames/bbant.cpp b/engines/bbvs/minigames/bbant.cpp
index 9786682ada..3678934345 100644
--- a/engines/bbvs/minigames/bbant.cpp
+++ b/engines/bbvs/minigames/bbant.cpp
@@ -94,7 +94,7 @@ void MinigameBbAnt::buildDrawList1(DrawList &drawList) {
 	drawNumber(drawList, _score, 68, 16);
 	drawList.add(getAnimation(166)->frameIndices[0], 230, 2, 2000);
 	drawNumber(drawList, _levelTimeLeft, 280, 16);
-	
+
 	for (int i = 0; i < _stompCount; ++i)
 		drawList.add(getAnimation(130)->frameIndices[0], 20 + i * 30, 230, 2000);
 
@@ -116,7 +116,7 @@ void MinigameBbAnt::buildDrawList3(DrawList &drawList) {
 	drawNumber(drawList, _hiScore, 208, 107);
 }
 
-void MinigameBbAnt::drawMagnifyingGlass(DrawList &drawList) {	
+void MinigameBbAnt::drawMagnifyingGlass(DrawList &drawList) {
 	scale2x(_objects[0].x - 28, _objects[0].y - 27);
 	drawList.clear();
 	drawList.add(_objects[0].anim->frameIndices[0], _objects[0].x, _objects[0].y, _objects[0].priority);
@@ -358,7 +358,7 @@ bool MinigameBbAnt::updateStatus0(int mouseX, int mouseY, uint mouseButtons) {
 		_objects[0].x = 0;
 	if (_objects[0].y < 0)
 		_objects[0].y = 0;
-	
+
 	if ((mouseButtons & kLeftButtonDown) || (mouseButtons & kRightButtonDown)) {
 		_gameState = 1;
 		initObjects();
@@ -447,7 +447,7 @@ bool MinigameBbAnt::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
 		int maxKindCount = 0, objKind = 0;
 
 		_stompCounter2 = _stompCounter1;
-		
+
 		for (int i = 0; i < 4; ++i)
 			testTbl[i] = _vm->getRandom(_bugsChanceByKind[i] - _bugsCountByKind[i]);
 
@@ -471,7 +471,7 @@ bool MinigameBbAnt::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
 		if (_stompCounter1 > 20)
 			--_stompCounter1;
 	}
-	
+
 	return true;
 }
 
@@ -701,7 +701,7 @@ void MinigameBbAnt::updateBugObjAnim(int objIndex) {
 
 void MinigameBbAnt::updateObjAnim2(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->animIndexIncr += _vm->getRandom(3) - 1;
 	if (obj->animIndexIncr < 0)
 		obj->animIndexIncr = 7;
@@ -736,7 +736,7 @@ bool MinigameBbAnt::isBugOutOfScreen(int objIndex) {
 
 void MinigameBbAnt::updateObjAnim3(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->animIndexIncr += _vm->getRandom(3) - 1;
 	if (obj->animIndexIncr < 0)
 		obj->animIndexIncr = 7;
@@ -752,7 +752,7 @@ void MinigameBbAnt::updateBugObj1(int objIndex) {
 	Obj *obj = &_objects[objIndex];
 	bool flag1 = false;
 	bool flag2 = false;
-	
+
 	if (--obj->ticks == 0) {
 		++obj->frameIndex;
 		if (obj->anim->frameCount == obj->frameIndex) {
@@ -911,7 +911,7 @@ void MinigameBbAnt::updateStompObj(int objIndex) {
 
 void MinigameBbAnt::updateSmokeObj(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->x += obj->xIncr;
 	obj->y += obj->yIncr;
 
@@ -1047,7 +1047,7 @@ bool MinigameBbAnt::isMagGlassAtBug(int objIndex) {
 	Obj *obj = &_objects[objIndex];
 	Obj *obj0 = &_objects[0];
 	bool result = false;
-	
+
 	if (obj->kind >= 1 && obj->kind <= 5) {
 		const BBRect &frameRect1 = obj0->anim->frameRects[0];
 		const int obj1X1 = obj0->x + frameRect1.x;
@@ -1102,7 +1102,7 @@ bool MinigameBbAnt::testObj5(int objIndex) {
 }
 
 void MinigameBbAnt::updateObjs(uint mouseButtons) {
-	
+
 	for (int i = 12; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 
@@ -1162,7 +1162,7 @@ void MinigameBbAnt::updateObjs(uint mouseButtons) {
 			}
 
 		}
-		
+
 	}
 
 }
@@ -1170,9 +1170,9 @@ void MinigameBbAnt::updateObjs(uint mouseButtons) {
 bool MinigameBbAnt::run(bool fromMainGame) {
 
 	memset(_objects, 0, sizeof(_objects));
-	
+
 	_numbersAnim = getAnimation(167);
-	
+
 	_backgroundSpriteIndex = 303;
 	_titleScreenSpriteIndex = 304;
 
@@ -1187,23 +1187,23 @@ bool MinigameBbAnt::run(bool fromMainGame) {
 	_gameDone = false;
 	initObjects();
 	initVars();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbant/bbant.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
 
 	_gameTicks = 0;
 	playSound(12, true);
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	if (!_fromMainGame)
@@ -1243,19 +1243,19 @@ void MinigameBbAnt::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
 
 void MinigameBbAnt::scale2x(int x, int y) {
-	Graphics::Surface *surface = _vm->_screen->_surface; 
-	
+	Graphics::Surface *surface = _vm->_screen->_surface;
+
 	int srcX = x + 14, srcY = y + 14;
 	int srcW = kScaleDim, srcH = kScaleDim;
-	
+
 	if (srcX < 0) {
 		srcW += srcX;
 		srcX = 0;
@@ -1265,21 +1265,21 @@ void MinigameBbAnt::scale2x(int x, int y) {
 		srcH += srcY;
 		srcY = 0;
 	}
-	
+
 	if (srcX + srcW >= 320)
 		srcW = 320 - srcX - 1;
-	
+
 	if (srcY + srcH >= 240)
 		srcH = 240 - srcY - 1;
-	
+
 	for (int yc = 0; yc < srcH; ++yc) {
 		byte *src = (byte*)surface->getBasePtr(srcX, srcY + yc);
 		memcpy(&_scaleBuf[yc * kScaleDim], src, srcW);
 	}
-	
+
 	int dstX = x, dstY = y;
 	int dstW = 2 * kScaleDim, dstH = 2 * kScaleDim;
-	
+
 	if (dstX < 0) {
 		dstW += dstX;
 		dstX = 0;
@@ -1289,15 +1289,15 @@ void MinigameBbAnt::scale2x(int x, int y) {
 		dstH += dstY;
 		dstY = 0;
 	}
-	
+
 	if (dstX + dstW >= 320)
 		dstW = 320 - dstX - 1;
-	
+
 	if (dstY + dstH >= 240)
 		dstH = 240 - dstY - 1;
-	
+
 	int w = MIN(srcW * 2, dstW), h = MIN(srcH * 2, dstH);
-	
+
 	for (int yc = 0; yc < h; ++yc) {
 		byte *src = _scaleBuf + kScaleDim * (yc / 2);
 		byte *dst = (byte*)surface->getBasePtr(dstX, dstY + yc);
diff --git a/engines/bbvs/minigames/bbant.h b/engines/bbvs/minigames/bbant.h
index be2afe688d..88b4af9c71 100644
--- a/engines/bbvs/minigames/bbant.h
+++ b/engines/bbvs/minigames/bbant.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbAnt(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y, priority;
@@ -55,21 +55,21 @@ public:
 		int status2;
 		int flag;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256,
 		kScaleDim = 28
 	};
-	
+
 	struct ObjInit {
 		const ObjAnimation *anim1;
 		const ObjAnimation *anim2;
 		const ObjAnimation *anim3;
 		int x, y;
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _score, _hiScore;
 
 	int _totalBugsCount;
@@ -96,37 +96,37 @@ public:
 	int _countdown6;
 	int _countdown5;
 	int _countdown7;
-	
+
 	byte _scaleBuf[kScaleDim * kScaleDim];
 
 	const ObjAnimation *getAnimation(int animIndex);
 	const ObjInit *getObjInit(int index);
 	const ObjAnimation * const *getObjKindAnimTable(int kind);
 	const ObjAnimation *getObjAnim(int index);
-	
+
 	void buildDrawList0(DrawList &drawList);
 	void buildDrawList1(DrawList &drawList);
 	void buildDrawList2(DrawList &drawList);
 	void buildDrawList3(DrawList &drawList);
 	void drawMagnifyingGlass(DrawList &drawList);
-	
+
 	void drawSprites();
 	void drawSprites0();
 	void drawSprites1();
 	void drawSprites2();
 	void drawSprites3();
-	
+
 	Obj *getFreeObject();
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
-	
+
 	void initVars();
 	void initVars1();
 	void initVars2();
 	void initVars3();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
@@ -161,7 +161,7 @@ public:
 	void updateObjs(uint mouseButtons);
 
 	void update();
-	
+
 	void scale2x(int x, int y);
 
 	void loadSounds();
diff --git a/engines/bbvs/minigames/bbloogie.cpp b/engines/bbvs/minigames/bbloogie.cpp
index 4601e9ff93..68a3147f9a 100644
--- a/engines/bbvs/minigames/bbloogie.cpp
+++ b/engines/bbvs/minigames/bbloogie.cpp
@@ -117,7 +117,7 @@ void MinigameBbLoogie::buildDrawList0(DrawList &drawList) {
 }
 
 void MinigameBbLoogie::buildDrawList1(DrawList &drawList) {
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		switch (obj->kind) {
@@ -163,7 +163,7 @@ void MinigameBbLoogie::buildDrawList1(DrawList &drawList) {
 }
 
 void MinigameBbLoogie::buildDrawList2(DrawList &drawList) {
-	
+
 	buildDrawList1(drawList);
 
 	if (_level > 0 && (_bonusDisplayDelay1 > 0 || _bonusDisplayDelay2 > 0)) {
@@ -180,7 +180,7 @@ void MinigameBbLoogie::buildDrawList2(DrawList &drawList) {
 }
 
 void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 2)
@@ -191,7 +191,7 @@ void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
 
 	if (_backgroundSpriteIndex)
 		drawList.add(_backgroundSpriteIndex, 0, 0, 0);
-		
+
 	drawList.add(getAnimation(10)->frameIndices[0], 230, 2, 2000);
 
 	drawNumber(drawList, _levelTimeLeft, 280, 16);
@@ -201,7 +201,7 @@ void MinigameBbLoogie::buildDrawList3(DrawList &drawList) {
 	int numberX2 = drawNumber(drawList, _currScore, 68, 16);
 	drawList.add(getAnimation(9)->frameIndices[10], numberX2, 16, 2000);
 	drawNumber(drawList, _dispLevelScore, numberX2 + 10, 16);
-	
+
 	drawList.add(getAnimation(20)->frameIndices[0], 120, 70, 2000);
 	drawList.add(getAnimation(13)->frameIndices[0], 95, 95, 2000);
 
@@ -416,7 +416,7 @@ bool MinigameBbLoogie::updateStatus(int mouseX, int mouseY, uint mouseButtons) {
 }
 
 bool MinigameBbLoogie::updateStatus0(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	_objects[0].x = mouseX;
 	_objects[0].y = mouseY;
 
@@ -445,7 +445,7 @@ bool MinigameBbLoogie::updateStatus0(int mouseX, int mouseY, uint mouseButtons)
 		_objects[4].kind = 0;
 		_objects[2].kind = 1;
 	}
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 11) {
@@ -487,12 +487,12 @@ bool MinigameBbLoogie::updateStatus0(int mouseX, int mouseY, uint mouseButtons)
 		initVars();
 		_gameTicks = 0;
 	}
-	
+
 	return true;
 }
 
 bool MinigameBbLoogie::updateStatus1(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	if (--_levelTimeDelay == 0) {
 		_levelTimeDelay = 58;
 		--_levelTimeLeft;
@@ -568,9 +568,9 @@ bool MinigameBbLoogie::updateStatus2(int mouseX, int mouseY, uint mouseButtons)
 }
 
 bool MinigameBbLoogie::updateStatus3(int mouseX, int mouseY, uint mouseButtons) {
-	
+
 	_objects[0].x = mouseX;
-		
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind == 2) {
@@ -582,7 +582,7 @@ bool MinigameBbLoogie::updateStatus3(int mouseX, int mouseY, uint mouseButtons)
 			}
 		}
 	}
-	
+
 	return true;
 }
 
@@ -620,7 +620,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 			break;
 		}
 	}
-	
+
 	if (--_carDelay == 0) {
 		// Car
 		Obj *obj = getFreeObject();
@@ -633,7 +633,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		obj->yIncr = 0;
 		_carDelay = _vm->getRandom(256) + 800;
 	}
-	
+
 	if (--_bikeDelay == 0) {
 		// Bike
 		Obj *obj = getFreeObject();
@@ -646,7 +646,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		obj->yIncr = 0;
 		_bikeDelay = _vm->getRandom(512) + 500;
 	}
-  
+
 	if (--_squirrelDelay == 0) {
 		// Squirrel
 		Obj *obj = getFreeObject();
@@ -662,7 +662,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 			playSound(9);
 		_squirrelDelay = _vm->getRandom(512) + 300;
 	}
-	
+
 	if (--_paperPlaneDelay == 0) {
 		// Paper plane
 		Obj *obj = getFreeObject();
@@ -685,7 +685,7 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		}
 		_paperPlaneDelay = 400;
 	}
-	
+
 	if (_principalDelay >= 0 && --_principalDelay == 0) {
 		// Principal
 		Obj *obj = getFreeObject();
@@ -703,13 +703,13 @@ void MinigameBbLoogie::updateObjs(uint mouseButtons) {
 		_principalFirstFrameIndex = 11;
 		_principalLastFrameIndex = 16;
 	}
-	
+
 }
 
 void MinigameBbLoogie::updatePlayer(int objIndex, uint mouseButtons) {
 
 	Obj *obj = &_objects[0];
-	
+
 	switch (obj->status) {
 
 	case 1:
@@ -817,7 +817,7 @@ void MinigameBbLoogie::updateLoogie(int objIndex) {
 		obj->y -= kLoogieOffY[obj->unk2 / 8];
 		--obj->unk2;
 	}
-	
+
 	if (obj->ticks-- == 0) {
 		obj->ticks = getAnimation(5)->frameTicks[0];
 		++obj->frameIndex;
@@ -832,9 +832,9 @@ void MinigameBbLoogie::updateLoogie(int objIndex) {
 
 void MinigameBbLoogie::updateCar(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->x += obj->xIncr;
-	
+
 	if (obj->ticks-- == 0) {
 		if (obj->frameIndex++ == 3 || obj->frameIndex == 6)
 			obj->frameIndex = 0;
@@ -867,7 +867,7 @@ void MinigameBbLoogie::updateCar(int objIndex) {
 
 void MinigameBbLoogie::updateBike(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	obj->x += obj->xIncr;
 
 	if (obj->ticks-- == 0) {
@@ -965,7 +965,7 @@ void MinigameBbLoogie::updatePaperPlane(int objIndex) {
 			loogieObj = findLoogieObj(loogieObjIndex++);
 		}
 	}
-	
+
 }
 
 void MinigameBbLoogie::updateIndicator(int objIndex) {
@@ -995,7 +995,7 @@ void MinigameBbLoogie::updateIndicator(int objIndex) {
 		obj->kind = 0;
 		obj->anim = getAnimation(6);
 	}
-	
+
 }
 
 void MinigameBbLoogie::updatePrincipal(int objIndex) {
@@ -1281,22 +1281,22 @@ bool MinigameBbLoogie::run(bool fromMainGame) {
 	_gameDone = false;
 	initObjects();
 	initVars();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbloogie/bbloogie.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
 
 	playSound(32, true);
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	if (!_fromMainGame)
@@ -1319,15 +1319,15 @@ void MinigameBbLoogie::update() {
 		inputTicks = 1;
 		_gameTicks = _vm->_system->getMillis();
 	}
-	
+
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
 		_gameDone = true;
 		return;
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	bool done;
 
 	do {
@@ -1336,9 +1336,9 @@ void MinigameBbLoogie::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
diff --git a/engines/bbvs/minigames/bbloogie.h b/engines/bbvs/minigames/bbloogie.h
index 1dd4049b41..04ead51a1e 100644
--- a/engines/bbvs/minigames/bbloogie.h
+++ b/engines/bbvs/minigames/bbloogie.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbLoogie(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y;
@@ -44,33 +44,33 @@ public:
 		int16 frameIndexAdd;
 		int16 unk2;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256
 	};
-	
+
 	enum {
 		kGSTitleScreen		= 0,	// Title screen
 		kGSMainGame			= 1,	// Game when called as part of the main game
 		kGSStandaloneGame	= 2,	// Game when called as standalone game
 		kGSScoreCountUp		= 3		// Score countup and next level text
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _playerKind;
 	const ObjAnimation *_playerAnim;
 	const uint *_playerSounds1, *_playerSounds2;
 	uint _playerSounds1Count, _playerSounds2Count;
-	
+
 	int _level, _levelTimeLeft, _levelTimeDelay;
-	int _numberOfHits, _currScore, _hiScore; 
+	int _numberOfHits, _currScore, _hiScore;
 	int _doubleScore, _megaLoogieCount;
-	
+
 	int _dispLevelScore, _nextLevelScore;
 
 	int _timeBonusCtr, _bonusDisplayDelay1, _bonusDisplayDelay2, _bonusDisplayDelay3;
-	
+
 	int _carDelay;
 	int _bikeDelay;
 	int _squirrelDelay;
@@ -78,37 +78,37 @@ public:
 	int _paperPlaneDelay;
 	int _principalDelay;
 
-	int _prevPrincipalStatus;	
+	int _prevPrincipalStatus;
 	int _principalCtr, _principalFirstFrameIndex, _principalLastFrameIndex;
 	bool _principalAngry;
-	
+
 	const ObjAnimation *getAnimation(int animIndex);
-	
+
 	void buildDrawList(DrawList &drawList);
 	void buildDrawList0(DrawList &drawList);
 	void buildDrawList1(DrawList &drawList);
 	void buildDrawList2(DrawList &drawList);
 	void buildDrawList3(DrawList &drawList);
-	
+
 	void drawSprites();
-	
+
 	void initObjs();
 	Obj *getFreeObject();
 	Obj *findLoogieObj(int startObjIndex);
 	bool isHit(Obj *obj1, Obj *obj2);
 	bool isCursorAtObj(int objIndex);
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
 	void initObjects3();
-	
+
 	void initVars();
 	void initVars0();
 	void initVars1();
 	void initVars2();
 	void initVars3();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
@@ -129,7 +129,7 @@ public:
 	void incNumberOfHits();
 	void incScore(int incrAmount);
 	void playRndSound();
-	
+
 	void update();
 
 	void loadSounds();
diff --git a/engines/bbvs/minigames/bbtennis.cpp b/engines/bbvs/minigames/bbtennis.cpp
index ddd5cfc804..7763548330 100644
--- a/engines/bbvs/minigames/bbtennis.cpp
+++ b/engines/bbvs/minigames/bbtennis.cpp
@@ -86,7 +86,7 @@ void MinigameBbTennis::buildDrawList(DrawList &drawList) {
 }
 
 void MinigameBbTennis::buildDrawList0(DrawList &drawList) {
-	
+
 	drawList.add(_objects[0].anim->frameIndices[_objects[0].frameIndex], _objects[0].x, _objects[0].y, 2000);
 
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
@@ -154,7 +154,7 @@ void MinigameBbTennis::buildDrawList1(DrawList &drawList) {
 				break;
 
 			}
-			
+
 			drawList.add(index, x, y, priority);
 
 		}
@@ -174,16 +174,16 @@ void MinigameBbTennis::buildDrawList1(DrawList &drawList) {
 	drawList.add(getAnimation(9)->frameIndices[0], 256, 52, 500);
 	drawList.add(getAnimation(10)->frameIndices[0], 60, 162, 500);
 	drawList.add(getAnimation(21)->frameIndices[0], 36, 18, 2000);
-	
+
 	drawNumber(drawList, _score, 70, 18);
-	
+
 	for (int i = 0; i < _numHearts; ++i)
 		drawList.add(getAnimation(7)->frameIndices[0], 20 + i * 20, 236, 990);
 
 }
 
 void MinigameBbTennis::buildDrawList2(DrawList &drawList) {
-	
+
 	for (int i = 0; i < kMaxObjectsCount; ++i) {
 		Obj *obj = &_objects[i];
 		if (obj->kind)
@@ -384,7 +384,7 @@ bool MinigameBbTennis::updateStatus1(int mouseX, int mouseY, uint mouseButtons)
 
 	_objects[0].x = mouseX;
 	_objects[0].y = mouseY;
-	
+
 	if (_allHeartsGone) {
 		_gameState = 2;
 		initObjects();
@@ -427,13 +427,13 @@ bool MinigameBbTennis::updateStatus1(int mouseX, int mouseY, uint mouseButtons)
 
 	if (_newBallTimer > 0)
 		--_newBallTimer;
-	
+
 	if (++_delayDecreaseTimer == 30) {
 		_delayDecreaseTimer = 0;
 		if (_playerDecrease < 199)
 			++_playerDecrease;
 	}
-	
+
 	updateObjs();
 
 	if (!_playedThisIsTheCoolest && _score > 3 && _vm->getRandom(10) == 1 && !isAnySoundPlaying(kAllSounds, 11)) {
@@ -482,7 +482,7 @@ void MinigameBbTennis::updateObjs() {
 			break;
 		}
 	}
-	
+
 	if (_rapidFireBallsCount == 0) {
 		--_squirrelDelay;
 		if (--_squirrelDelay == 0) {
@@ -763,7 +763,7 @@ void MinigameBbTennis::updateTennisPlayer(int objIndex) {
 		}
 		++_tennisPlayerDelay;
 		break;
-	
+
 	case 2:
 		if (--obj->ticks == 0) {
 			++obj->frameIndex;
@@ -1077,7 +1077,7 @@ void MinigameBbTennis::updateNetPlayer(int objIndex) {
 
 void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
 	Obj *obj = &_objects[objIndex];
-	
+
 	if (--obj->ticks == 0) {
 		--obj->frameIndex;
 		obj->ticks = getAnimation(6)->frameTicks[obj->frameIndex];
@@ -1103,7 +1103,7 @@ void MinigameBbTennis::updateEnemyTennisBall(int objIndex) {
 	obj->x = (int)obj->fltX;
 	obj->fltY = obj->fltY - obj->fltStepY;
 	obj->y = (int)obj->fltY;
-	
+
 }
 
 void MinigameBbTennis::makeEnemyBall(int x, int y, int frameIndex) {
@@ -1184,7 +1184,7 @@ void MinigameBbTennis::hitSomething() {
 bool MinigameBbTennis::run(bool fromMainGame) {
 
 	memset(_objects, 0, sizeof(_objects));
-	
+
 	_numbersAnim = getAnimation(20);
 
 	_backgroundSpriteIndex = 272;
@@ -1201,23 +1201,23 @@ bool MinigameBbTennis::run(bool fromMainGame) {
 	_gameDone = false;
 	initObjects();
 	initVars();
-	
+
 	_spriteModule = new SpriteModule();
 	_spriteModule->load("bbtennis/bbtennis.000");
 
 	Palette palette = _spriteModule->getPalette();
 	_vm->_screen->setPalette(palette);
-	
+
 	loadSounds();
 
 	_gameTicks = 0;
 	playSound(29, true);
-	
+
 	while (!_vm->shouldQuit() &&!_gameDone) {
 		_vm->updateEvents();
 		update();
 	}
-	
+
 	_vm->_sound->unloadSounds();
 
 	if (!_fromMainGame)
@@ -1240,15 +1240,15 @@ void MinigameBbTennis::update() {
 		inputTicks = 1;
 		_gameTicks = _vm->_system->getMillis();
 	}
-	
+
 	if (_vm->_keyCode == Common::KEYCODE_ESCAPE) {
 		_gameDone = true;
 		return;
 	}
-	
+
 	if (inputTicks == 0)
 		return;
-		
+
 	bool done;
 
 	do {
@@ -1257,9 +1257,9 @@ void MinigameBbTennis::update() {
 		_vm->_mouseButtons &= ~kRightButtonClicked;
 		_vm->_keyCode = Common::KEYCODE_INVALID;
 	} while (--inputTicks && _gameTicks > 0 && !done);
-	
+
 	drawSprites();
-		
+
 	_vm->_system->delayMillis(10);
 
 }
diff --git a/engines/bbvs/minigames/bbtennis.h b/engines/bbvs/minigames/bbtennis.h
index 690bd724a0..7eac904c4d 100644
--- a/engines/bbvs/minigames/bbtennis.h
+++ b/engines/bbvs/minigames/bbtennis.h
@@ -32,7 +32,7 @@ public:
 	MinigameBbTennis(BbvsEngine *vm) : Minigame(vm) {};
 	bool run(bool fromMainGame);
 public:
-	
+
 	struct Obj {
 		int kind;
 		int x, y;
@@ -51,20 +51,20 @@ public:
 		int ballStepCtr;
 		int netPlayDirection;
 	};
-	
+
 	enum {
 		kMaxObjectsCount = 256
 	};
-	
+
 	enum {
 		kGSTitleScreen      = 0,    // Title screen
 		kGSMainGame         = 1,    // Game when called as part of the main game
 		kGSStandaloneGame   = 2,    // Game when called as standalone game
 		kGSScoreCountUp     = 3     // Score countup and next level text
 	};
-	
+
 	Obj _objects[kMaxObjectsCount];
-	
+
 	int _numHearts;
 	int _squirrelDelay;
 	int _tennisPlayerDelay;
@@ -85,29 +85,29 @@ public:
 	bool _endSoundPlaying;
 
 	const ObjAnimation *getAnimation(int animIndex);
-	
+
 	void buildDrawList(DrawList &drawList);
 	void buildDrawList0(DrawList &drawList);
 	void buildDrawList1(DrawList &drawList);
 	void buildDrawList2(DrawList &drawList);
-	
+
 	void drawSprites();
-	
+
 	void initObjs();
 	Obj *getFreeObject();
 	Obj *findTennisBall(int startObjIndex);
 	bool isHit(Obj *obj1, Obj *obj2);
-	
+
 	void initObjects();
 	void initObjects0();
 	void initObjects1();
 	void initObjects2();
-	
+
 	void initVars();
 	void initVars0();
 	void initVars1();
 	void initVars2();
-	
+
 	bool updateStatus(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus0(int mouseX, int mouseY, uint mouseButtons);
 	bool updateStatus1(int mouseX, int mouseY, uint mouseButtons);
diff --git a/engines/bbvs/minigames/minigame.cpp b/engines/bbvs/minigames/minigame.cpp
index aae18072d9..58d98a9df8 100644
--- a/engines/bbvs/minigames/minigame.cpp
+++ b/engines/bbvs/minigames/minigame.cpp
@@ -44,13 +44,13 @@ Minigame::~Minigame() {
 
 int Minigame::drawNumber(DrawList &drawList, int number, int x, int y) {
 	int digits = 1, rightX = x;
-	
+
 	for (int mag = 10; number / mag != 0; mag *= 10)
 		++digits;
-		
+
 	rightX = x + digits * 10;
 	x = rightX;
-	
+
 	while (digits--) {
 		const int n = number % 10;
 		x -= 10;
diff --git a/engines/bbvs/minigames/minigame.h b/engines/bbvs/minigames/minigame.h
index 675dec360d..1c24110519 100644
--- a/engines/bbvs/minigames/minigame.h
+++ b/engines/bbvs/minigames/minigame.h
@@ -51,30 +51,30 @@ public:
 	virtual ~Minigame();
 	virtual bool run(bool fromMainGame) = 0;
 protected:
-	BbvsEngine *_vm;	
+	BbvsEngine *_vm;
 	SpriteModule *_spriteModule;
-	
+
 	int _gameState;
 	int _gameTicks;
 	bool _gameResult;
 	bool _gameDone;
 	bool _fromMainGame;
 	int _hiScoreTable[kMinigameCount];
-	
+
 	int _backgroundSpriteIndex, _titleScreenSpriteIndex;
-	
+
 	const ObjAnimation *_numbersAnim;
-	
+
 	int drawNumber(DrawList &drawList, int number, int x, int y);
 
 	void playSound(uint index, bool loop = false);
 	void stopSound(uint index);
 	bool isSoundPlaying(uint index);
 	bool isAnySoundPlaying(const uint *indices, uint count);
-	
+
 	void saveHiscore(int minigameNum, int score);
 	int loadHiscore(int minigameNum);
-	
+
 };
 
 } // End of namespace Bbvs