A ton of code formatting fixes; also fixed warnings about single line loops like 'while(cond);' by inserting newlines

svn-id: r36127

8 files changed, 37 insertions, 35 deletions

diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index a66ec12e3f..5525cfef99 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -289,7 +289,8 @@ void AgiEngine::handleKeys(int key) {
 		_game.keypress = 0;
 
 		/* Remove all leading spaces */
-		for (p = _game.inputBuffer; *p && *p == 0x20; p++);
+		for (p = _game.inputBuffer; *p && *p == 0x20; p++)
+			;
 
 		/* Copy to internal buffer */
 		for (; *p; p++) {
diff --git a/engines/agi/picture.cpp b/engines/agi/picture.cpp
index 3ada698b79..01d66296b9 100644
--- a/engines/agi/picture.cpp
+++ b/engines/agi/picture.cpp
@@ -446,8 +446,7 @@ void PictureMgr::plotPattern(int x, int y) {
 	circle_ptr = &circle_data[circle_list[pen_size]];
 
 	// SGEORGE : Fix v3 picture data for drawing circles. Manifests in goldrush
-	if(_pictureVersion == 3)
-	{
+	if (_pictureVersion == 3) {
 		circle_data[1] = 0;
 		circle_data[3] = 0;
 	}
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp
index da56db0493..8ebd24e6d9 100644
--- a/engines/agi/preagi_mickey.cpp
+++ b/engines/agi/preagi_mickey.cpp
@@ -974,10 +974,10 @@ bool Mickey::loadGame() {
 
 			_game.nXtals = infile->readByte();
 
-			for(i = 0; i < IDI_MSA_MAX_DAT; i++)
+			for (i = 0; i < IDI_MSA_MAX_DAT; i++)
 				_game.iPlanetXtal[i] = infile->readByte();
 
-			for(i = 0; i < IDI_MSA_MAX_PLANET; i++)
+			for (i = 0; i < IDI_MSA_MAX_PLANET; i++)
 				_game.iClue[i] = infile->readUint16LE();
 
 			infile->read(_game.szAddr, IDI_MSA_MAX_BUTTON + 1);
@@ -992,30 +992,30 @@ bool Mickey::loadGame() {
 			_game.fTempleDoorOpen = infile->readByte() == 1;
 			_game.fAnimXL30 = infile->readByte() == 1;
 
-			for(i = 0; i < IDI_MSA_MAX_ITEM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ITEM; i++)
 				_game.fItem[i] = infile->readByte() == 1;
 
-			for(i = 0; i < IDI_MSA_MAX_ITEM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ITEM; i++)
 				_game.fItemUsed[i] = infile->readByte() == 1;
 
-			for(i = 0; i < IDI_MSA_MAX_ITEM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ITEM; i++)
 				_game.iItem[i] = infile->readSByte();
 
 			_game.nItems = infile->readByte();
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				_game.iRmObj[i] = infile->readSByte();
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				_game.iRmPic[i] = infile->readByte();
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				_game.oRmTxt[i] = infile->readUint16LE();
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				_game.iRmMenu[i] = infile->readByte();
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				_game.nRmMenu[i] = infile->readByte();
 
 			_game.nFrame = infile->readSByte();
@@ -1079,10 +1079,10 @@ void Mickey::saveGame() {
 
 			outfile->writeByte(_game.nXtals);
 
-			for(i = 0; i < IDI_MSA_MAX_DAT; i++)
+			for (i = 0; i < IDI_MSA_MAX_DAT; i++)
 				outfile->writeByte(_game.iPlanetXtal[i]);
 
-			for(i = 0; i < IDI_MSA_MAX_PLANET; i++)
+			for (i = 0; i < IDI_MSA_MAX_PLANET; i++)
 				outfile->writeUint16LE(_game.iClue[i]);
 
 			outfile->write(_game.szAddr, IDI_MSA_MAX_BUTTON + 1);
@@ -1097,30 +1097,30 @@ void Mickey::saveGame() {
 			outfile->writeByte(_game.fTempleDoorOpen ? 1 : 0);
 			outfile->writeByte(_game.fAnimXL30 ? 1 : 0);
 
-			for(i = 0; i < IDI_MSA_MAX_ITEM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ITEM; i++)
 				outfile->writeByte(_game.fItem[i] ? 1 : 0);
 
-			for(i = 0; i < IDI_MSA_MAX_ITEM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ITEM; i++)
 				outfile->writeByte(_game.fItemUsed[i] ? 1 : 0);
 
-			for(i = 0; i < IDI_MSA_MAX_ITEM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ITEM; i++)
 				outfile->writeSByte(_game.iItem[i]);
 
 			outfile->writeByte(_game.nItems);
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				outfile->writeSByte(_game.iRmObj[i]);
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				outfile->writeByte(_game.iRmPic[i]);
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				outfile->writeUint16LE(_game.oRmTxt[i]);
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				outfile->writeByte(_game.iRmMenu[i]);
 
-			for(i = 0; i < IDI_MSA_MAX_ROOM; i++)
+			for (i = 0; i < IDI_MSA_MAX_ROOM; i++)
 				outfile->writeByte(_game.nRmMenu[i]);
 
 			outfile->writeSByte(_game.nFrame);
diff --git a/engines/agi/preagi_winnie.cpp b/engines/agi/preagi_winnie.cpp
index c7a29b94af..ab9d59da3e 100644
--- a/engines/agi/preagi_winnie.cpp
+++ b/engines/agi/preagi_winnie.cpp
@@ -1150,13 +1150,13 @@ void Winnie::saveGame() {
 	outfile->writeByte(_game.nObjRet);
 	outfile->writeByte(_game.iObjHave);
 
-	for(i = 0; i < IDI_WTP_MAX_FLAG; i++)
+	for (i = 0; i < IDI_WTP_MAX_FLAG; i++)
 		outfile->writeByte(_game.fGame[i]);
 
-	for(i = 0; i < IDI_WTP_MAX_OBJ_MISSING; i++)
+	for (i = 0; i < IDI_WTP_MAX_OBJ_MISSING; i++)
 		outfile->writeByte(_game.iUsedObj[i]);
 
-	for(i = 0; i < IDI_WTP_MAX_ROOM_OBJ; i++)
+	for (i = 0; i < IDI_WTP_MAX_ROOM_OBJ; i++)
 		outfile->writeByte(_game.iObjRoom[i]);
 
 	outfile->finalize();
@@ -1216,13 +1216,13 @@ void Winnie::loadGame() {
 		infile->readUint16LE();				// skip unused field
 	}
 
-	for(i = 0; i < IDI_WTP_MAX_FLAG; i++)
+	for (i = 0; i < IDI_WTP_MAX_FLAG; i++)
 		_game.fGame[i] = infile->readByte();
 
-	for(i = 0; i < IDI_WTP_MAX_OBJ_MISSING; i++)
+	for (i = 0; i < IDI_WTP_MAX_OBJ_MISSING; i++)
 		_game.iUsedObj[i] = infile->readByte();
 
-	for(i = 0; i < IDI_WTP_MAX_ROOM_OBJ; i++)
+	for (i = 0; i < IDI_WTP_MAX_ROOM_OBJ; i++)
 		_game.iObjRoom[i] = infile->readByte();
 
 	// Note that saved games from the original interpreter have 2 more 16-bit fields here
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 5dce7679b4..04cb9a579f 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -843,7 +843,8 @@ void SoundMgr::playSound() {
 
 	if (!_playing) {
 		if (_vm->_soundemu != SOUND_EMU_APPLE2GS) {
-			for (i = 0; i < NUM_CHANNELS; _chn[i++].vol = 0);
+			for (i = 0; i < NUM_CHANNELS; _chn[i++].vol = 0)
+				;
 		}
 
 		if (_endflag != -1)
diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp
index 2735809ac5..5ca0d5ca1e 100644
--- a/engines/agi/sprite.cpp
+++ b/engines/agi/sprite.cpp
@@ -105,8 +105,8 @@ void SpritesMgr::blitPixel(uint8 *p, uint8 *end, uint8 col, int spr, int width,
 	if ((pr = *p & 0xf0) < 0x30) {
 		uint8 *p1;
 		/* Yes, get effective priority going down */
-		for (p1 = p; p1 < end && (epr = *p1 & 0xf0) < 0x30;
-		    p1 += width);
+		for (p1 = p; p1 < end && (epr = *p1 & 0xf0) < 0x30; p1 += width)
+		    ;
 		if (p1 >= end)
 			epr = 0x40;
 	} else {
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 853ede650e..ebce45ab2e 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -548,8 +548,8 @@ char *AgiEngine::agiSprintf(const char *s) {
 				if (i == 99) {
 					/* remove all leading 0 */
 					/* don't remove the 3rd zero if 000 */
-					for (i = 0;
-					    z[i] == '0' && i < 14; i++);
+					for (i = 0; z[i] == '0' && i < 14; i++)
+					    ;
 				} else {
 					i = 15 - i;
 				}
diff --git a/engines/agi/words.cpp b/engines/agi/words.cpp
index ed33b9463a..d3726731ca 100644
--- a/engines/agi/words.cpp
+++ b/engines/agi/words.cpp
@@ -193,7 +193,8 @@ void AgiEngine::dictionaryWords(char *msg) {
 		}
 
 		if (q != NULL) {
-			for (; (*q != 0 && *q != 0x20); q++);
+			for (; (*q != 0 && *q != 0x20); q++)
+				;
 			if (*q) {
 				*q = 0;
 				q++;