(svn r3512) Yet more whitespace fixes (mostly by Rubidium)

5 files changed, 26 insertions, 27 deletions

diff --git a/os/macosx/splash.c b/os/macosx/splash.c
index 2d4373ce5..351aa9e0b 100644
--- a/os/macosx/splash.c
+++ b/os/macosx/splash.c
@@ -87,13 +87,13 @@ void DisplaySplashImage(void)
 	bit_depth        = png_get_bit_depth(png_ptr, info_ptr);
 	color_type       = png_get_color_type(png_ptr, info_ptr);
 
-	if(color_type != PNG_COLOR_TYPE_PALETTE || bit_depth != 8) {
+	if (color_type != PNG_COLOR_TYPE_PALETTE || bit_depth != 8) {
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
 		fclose(f);
 		return;
 	}
 
-	if(!png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
+	if (!png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
 		fclose(f);
 		return;
@@ -105,14 +105,12 @@ void DisplaySplashImage(void)
 
 	memset(_screen.dst_ptr, 0xff, _screen.pitch * _screen.height);
 
-	if(width > (uint) _screen.width)
-		width = _screen.width;
-	if(height > (uint) _screen.height)
-		height = _screen.height;
+	if (width > (uint) _screen.width) width = _screen.width;
+	if (height > (uint) _screen.height) height = _screen.height;
 
 	xoff = (_screen.width - width) / 2;
 	yoff = (_screen.height - height) / 2;
-	for(y = 0; y < height; y++) {
+	for (y = 0; y < height; y++) {
 		src = row_pointers[y];
 		dst = ((uint8 *) _screen.dst_ptr) + (yoff + y) * _screen.pitch + xoff;
 
diff --git a/queue.c b/queue.c
index 08e018e7b..0927c67bd 100644
--- a/queue.c
+++ b/queue.c
@@ -182,7 +182,7 @@ static bool InsSort_Push(Queue* q, void* item, int priority)
 		q->data.inssort.first = newnode;
 	} else {
 		InsSortNode* node = q->data.inssort.first;
-		while( node != NULL ) {
+		while (node != NULL) {
 			if (node->next == NULL || node->next->priority >= priority) {
 				newnode->next = node->next;
 				node->next = newnode;
diff --git a/roadveh_cmd.c b/roadveh_cmd.c
index 515faac57..0ee646ae6 100644
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -944,7 +944,7 @@ static int PickRandomBit(uint bits)
 
 	num = RandomRange(num);
 
-	for(i=0; !((bits & 1) && ((int)--num) < 0); bits>>=1,i++);
+	for (i = 0; !((bits & 1) && ((int)--num) < 0); bits >> = 1, i++);
 	return i;
 }
 
diff --git a/settings.c b/settings.c
index 564fad6b9..14026c8e2 100644
--- a/settings.c
+++ b/settings.c
@@ -130,10 +130,11 @@ static IniGroup *ini_group_alloc(IniFile *ini, const char *grpt, int len)
 	IniGroup *grp = pool_alloc(&ini->pool, sizeof(IniGroup));
 	grp->ini = ini;
 	grp->name = pool_strdup(&ini->pool, grpt, len);
-	if(!strcmp(grp->name, "newgrf") || !strcmp(grp->name, "servers") || !strcmp(grp->name, "bans") )
+	if (!strcmp(grp->name, "newgrf") || !strcmp(grp->name, "servers") || !strcmp(grp->name, "bans")) {
 		grp->type = IGT_LIST;
-	else
+	} else {
 		grp->type = IGT_VARIABLES;
+	}
 	grp->next = NULL;
 	grp->item = NULL;
 	grp->comment = NULL;
diff --git a/sound/cocoa_s.c b/sound/cocoa_s.c
index abc44d134..5104b6ccf 100644
--- a/sound/cocoa_s.c
+++ b/sound/cocoa_s.c
@@ -1,19 +1,19 @@
 /* $Id$ */
 
-/******************************************************************************************
- *                             Cocoa sound driver                                         *
- * Known things left to do:                                                               *
- * - Might need to do endian checking for it to work on both ppc and x86                  *
- ******************************************************************************************/
+/*****************************************************************************
+ *                             Cocoa sound driver                            *
+ * Known things left to do:                                                  *
+ * - Might need to do endian checking for it to work on both ppc and x86     *
+ *****************************************************************************/
 
 #ifdef WITH_COCOA
 
 #include <AudioUnit/AudioUnit.h>
 
 /* Name conflict */
-#define Rect		OTTDRect
-#define Point		OTTDPoint
-#define WindowClass	OTTDWindowClass
+#define Rect        OTTDRect
+#define Point       OTTDPoint
+#define WindowClass OTTDWindowClass
 /* Defined in stdbool.h */
 #ifndef __cplusplus
 # ifndef __BEOS__
@@ -40,7 +40,7 @@
 static AudioUnit _outputAudioUnit;
 
 /* The CoreAudio callback */
-static OSStatus audioCallback (void *inRefCon,  AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData)
+static OSStatus audioCallback(void *inRefCon, AudioUnitRenderActionFlags inActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, AudioBuffer *ioData)
 {
 	MxMixSamples(_mixer, ioData->mData, ioData->mDataByteSize / 4);
 
@@ -87,24 +87,24 @@ static const char *CocoaSoundStart(const char * const *parm)
 		return "cocoa_s: Failed to start CoreAudio: FindNextComponent returned NULL";
 
 	/* Open & initialize the default output audio unit */
-	if(OpenAComponent(comp, &_outputAudioUnit) != noErr)
+	if (OpenAComponent(comp, &_outputAudioUnit) != noErr)
 		return "cocoa_s: Failed to start CoreAudio: OpenAComponent";
 
-	if(AudioUnitInitialize(_outputAudioUnit) != noErr)
+	if (AudioUnitInitialize(_outputAudioUnit) != noErr)
 		return "cocoa_s: Failed to start CoreAudio: AudioUnitInitialize";
 
 	/* Set the input format of the audio unit. */
-	if(AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &requestedDesc, sizeof (requestedDesc)) != noErr)
-		return "cocoa_s: Failed to start CoreAudio:  AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)";
+	if (AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &requestedDesc, sizeof(requestedDesc)) != noErr)
+		return "cocoa_s: Failed to start CoreAudio: AudioUnitSetProperty (kAudioUnitProperty_StreamFormat)";
 
 	/* Set the audio callback */
 	callback.inputProc = audioCallback;
 	callback.inputProcRefCon = NULL;
-	if(AudioUnitSetProperty(_outputAudioUnit,  kAudioUnitProperty_SetInputCallback,  kAudioUnitScope_Input,  0, &callback,  sizeof(callback)) != noErr)
+	if (AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &callback, sizeof(callback)) != noErr)
 		return "cocoa_s: Failed to start CoreAudio: AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback)";
 
 	/* Finally, start processing of the audio unit */
-	if(AudioOutputUnitStart (_outputAudioUnit) != noErr)
+	if (AudioOutputUnitStart(_outputAudioUnit) != noErr)
 		return "cocoa_s: Failed to start CoreAudio: AudioOutputUnitStart";
 
 	/* We're running! */
@@ -127,7 +127,7 @@ static void CocoaSoundStop(void)
 	/* Remove the input callback */
 	callback.inputProc = 0;
 	callback.inputProcRefCon = 0;
-	if(AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &callback, sizeof(callback)) != noErr) {
+	if (AudioUnitSetProperty(_outputAudioUnit, kAudioUnitProperty_SetInputCallback, kAudioUnitScope_Input, 0, &callback, sizeof(callback)) != noErr) {
 		DEBUG(driver, 1)("cocoa_s: Core_CloseAudio: AudioUnitSetProperty (kAudioUnitProperty_SetInputCallback) failed");
 		return;
 	}