From 409108df82789d462320da6b5280a3218d0c3ba7 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Sat, 8 Nov 2003 19:47:20 +0000
Subject: cleanup whitespaces

svn-id: r11212
---
 sword2/driver/_mouse.cpp  | 2 +-
 sword2/driver/d_draw.cpp  | 1 -
 sword2/driver/d_draw.h    | 2 +-
 sword2/driver/d_sound.cpp | 2 +-
 sword2/driver/driver96.h  | 6 +++---
 sword2/scroll.cpp         | 4 ++--
 sword2/sound.cpp          | 2 +-
 sword2/speech.cpp         | 2 +-
 sword2/sword2.cpp         | 2 +-
 sword2/walker.cpp         | 4 ++--
 10 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'sword2')

diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp
index 8da4538daf..8216c5fa07 100644
--- a/sword2/driver/_mouse.cpp
+++ b/sword2/driver/_mouse.cpp
@@ -52,7 +52,7 @@ void LogMouseEvent(uint16 buttons) {
 	// We need to leave the one, which is the current event, alone!
 	if (mouseBacklog == MAX_MOUSE_EVENTS - 1)
 		return;
-	
+
 	me = &mouseLog[(mouseBacklog + mouseLogPos) % MAX_MOUSE_EVENTS];
 	me->buttons = buttons;
 	mouseBacklog++;
diff --git a/sword2/driver/d_draw.cpp b/sword2/driver/d_draw.cpp
index e5ec0ba705..8ccb28ab56 100644
--- a/sword2/driver/d_draw.cpp
+++ b/sword2/driver/d_draw.cpp
@@ -87,7 +87,6 @@ void Display::setRenderLevel(int8 level) {
 	}
 }
 
-
 /**
  * Fill the screen buffer with palette colour zero. Note that it does not
  * touch the menu areas of the screen.
diff --git a/sword2/driver/d_draw.h b/sword2/driver/d_draw.h
index 9fe87e16ab..cea1941ad6 100644
--- a/sword2/driver/d_draw.h
+++ b/sword2/driver/d_draw.h
@@ -236,7 +236,7 @@ public:
 	int32 openLightMask(_spriteInfo *s);
 	int32 closeLightMask(void);
 };
- 
+
 } // End of namespace Sword2
 
 #endif
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 2794f45989..c86a14193a 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -682,7 +682,7 @@ int32 Sound::playFx(int32 id, uint8 *data, uint8 vol, int8 pan, uint8 type) {
 					return RDERR_FXFUCKED;
 				}
 				_fx[i]._flags &= ~SoundMixer::FLAG_LOOP;
-				
+
 				byte volume = _musicMuted ? 0 : musicVolTable[_musicVol];
 
 				g_engine->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, 0);
diff --git a/sword2/driver/driver96.h b/sword2/driver/driver96.h
index 2e56e39cc8..fde513ba77 100644
--- a/sword2/driver/driver96.h
+++ b/sword2/driver/driver96.h
@@ -39,7 +39,7 @@ namespace Sword2 {
 #define _MAX_PATH 260
 
 #endif
-	
+
 //Generic error codes
 #define RD_OK				0x00000000
 #define RDERR_UNKNOWN			0x00000001
@@ -147,7 +147,7 @@ namespace Sword2 {
 //Menubar defines.
 #define RDMENU_TOP			0x00
 #define RDMENU_BOTTOM			0x01
-									
+
 #define RDMENU_HIDDEN			0x00
 #define RDMENU_SHOWN			0x01
 #define RDMENU_OPENING			0x02
@@ -169,7 +169,7 @@ namespace Sword2 {
 #define RDSE_FXLEADIN			2
 #define RDSE_FXLEADOUT			3
 #define RDSE_QUIET			1
-#define RDSE_SPEAKING          		0
+#define RDSE_SPEAKING			0
 
 
 #define RDPAL_FADE			0
diff --git a/sword2/scroll.cpp b/sword2/scroll.cpp
index 49719524bf..4caf606f7d 100644
--- a/sword2/scroll.cpp
+++ b/sword2/scroll.cpp
@@ -52,13 +52,13 @@ void Sword2Engine::setScrolling(void) {
 		if (_thisScreen.max_scroll_offset_x > SCROLL_X)
 			_thisScreen.scroll_offset_x = SCROLL_X;
 		else
- 			_thisScreen.scroll_offset_x = _thisScreen.max_scroll_offset_x;
+			_thisScreen.scroll_offset_x = _thisScreen.max_scroll_offset_x;
 
 		// ensure not too far down
 		if (_thisScreen.max_scroll_offset_y > SCROLL_Y)
 			_thisScreen.scroll_offset_y = SCROLL_Y;
 		else
- 			_thisScreen.scroll_offset_y = _thisScreen.max_scroll_offset_y;
+			_thisScreen.scroll_offset_y = _thisScreen.max_scroll_offset_y;
 	} else {
 		// George's offset from the centre - the desired position
 		// for him
diff --git a/sword2/sound.cpp b/sword2/sound.cpp
index d21671622f..04fcca7696 100644
--- a/sword2/sound.cpp
+++ b/sword2/sound.cpp
@@ -357,7 +357,7 @@ int32 Logic::fnPlayMusic(int32 *params) {
 		// interruption to gameplay
 		_vm->_loopingMusicId = params[0];
 	} else {
- 		loopFlag = false;
+		loopFlag = false;
 
 		// don't need to restart this tune after control panel or
 		// restore
diff --git a/sword2/speech.cpp b/sword2/speech.cpp
index e00da21fa7..9b1886783e 100644
--- a/sword2/speech.cpp
+++ b/sword2/speech.cpp
@@ -1453,7 +1453,7 @@ void Logic::formText(int32 *params) {
 		// if a specific width has been set up for this character,
 		// then override the default
 
- 		if (ob_speech->width)
+		if (ob_speech->width)
 			textWidth = ob_speech->width;
 		else
 			textWidth = 400;
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp
index 11bd4b7895..a5d1a56e5e 100644
--- a/sword2/sword2.cpp
+++ b/sword2/sword2.cpp
@@ -546,7 +546,7 @@ void Sword2Engine::unpauseGame(void) {
 	setFullPalette(0xffffffff);
 
 	// If graphics level at max, turn up again
- 	if (_graphicsLevelFudged) {
+	if (_graphicsLevelFudged) {
 		gui->updateGraphicsLevel(3);
 		_graphicsLevelFudged = false;
 	}
diff --git a/sword2/walker.cpp b/sword2/walker.cpp
index 06d4a6a98b..c9ff1c984f 100644
--- a/sword2/walker.cpp
+++ b/sword2/walker.cpp
@@ -327,7 +327,7 @@ int32 Logic::fnTurn(int32 *params) {
 			error("Invalid direction (%d) in fnTurn", params[4]);
 
 	 	ob_mega = (Object_mega *) params[2];
-	
+
 		pars[4] = ob_mega->feet_x;
 		pars[5] = ob_mega->feet_y;
 		pars[6] = params[4];		// DIRECTION to turn to
@@ -704,7 +704,7 @@ int32 Logic::fnWalkToTalkToMega(int32 *params) {
 		}
 	}
 
-  	// first cycle builds the route - thereafter merely follows it
+	// first cycle builds the route - thereafter merely follows it
 
 	// Call fnWalk() with target coords set to feet coords. RESULT will
 	// be 1 when it finishes, or 0 if it failed to build route.
-- 
cgit v1.2.3