[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.79,1.80 cutaway.cpp,1.143,1.144 display.cpp,1.85,1.86 talk.cpp,1.114,1.115

[Max Horn]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28088/queen

Modified Files:
	command.cpp cutaway.cpp display.cpp talk.cpp 
Log Message:
Comply to our coding conventions

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- command.cpp	1 Jan 2005 16:09:07 -0000	1.79
+++ command.cpp	8 May 2005 21:49:42 -0000	1.80
@@ -954,7 +954,7 @@
 int16 Command::setConditions(uint16 command, bool lastCmd) {
 	debug(9, "Command::setConditions(%d, %d)", command, lastCmd);
 	// Test conditions, if FAIL write &&  exit, Return -1
-	// if(Joe speaks before he returns, -2 is returned
+	// if (Joe speaks before he returns, -2 is returned
 	// This way a -1 return will allow Joe to speak normal description
 
 	uint16 temp[21];

Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- cutaway.cpp	7 Apr 2005 08:57:39 -0000	1.143
+++ cutaway.cpp	8 May 2005 21:49:42 -0000	1.144
@@ -350,7 +350,7 @@
 				}
 
 			}
-		} // for()
+		} // for ()
 	}
 
 	// set coordinates for Joe if he is on screen
@@ -686,7 +686,7 @@
 			if (objAnim[i].song > 0)
 				_vm->sound()->playSong(objAnim[i].song);
 
-		} // for()
+		} // for ()
 	}
 
 	bool moving = true;
@@ -886,7 +886,7 @@
 			_roomFade = false;
 		}
 
-	} // for()
+	} // for ()
 	
 	_vm->display()->clearTexts(0, 198);
 	// XXX lines 1887-1895 in cutaway.c
@@ -1086,7 +1086,7 @@
 					}
 				}
 			}
-		} // for()
+		} // for ()
 		
 		int16 specialMove = (int16)READ_BE_INT16(ptr); ptr += 2;
 		if (specialMove > 0)
@@ -1162,7 +1162,7 @@
 			}
 
 		}
-	} // for()
+	} // for ()
 }
 
 void Cutaway::talk(char *nextFilename) {

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- display.cpp	11 Mar 2005 11:06:43 -0000	1.85
+++ display.cpp	8 May 2005 21:49:43 -0000	1.86
@@ -721,9 +721,9 @@
 		}
 	} else if (!xflip) { // Masked bitmap unflipped
 		while (h--) {
-			for(int i = 0; i < w; ++i) {
+			for (int i = 0; i < w; ++i) {
 				uint8 b = *(srcBuf + i);
-				if(b != 0) {
+				if (b != 0) {
 					*(dstBuf + i) = b;
 				}
 			}
@@ -732,9 +732,9 @@
 		}
 	} else { // Masked bitmap flipped
 		while (h--) {
-			for(int i = 0; i < w; ++i) {
+			for (int i = 0; i < w; ++i) {
 				uint8 b = *(srcBuf + i);
-				if(b != 0) {
+				if (b != 0) {
 					*(dstBuf - i) = b;
 				}
 			}

Index: talk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/talk.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- talk.cpp	1 Jan 2005 16:09:09 -0000	1.114
+++ talk.cpp	8 May 2005 21:49:43 -0000	1.115
@@ -156,7 +156,7 @@
 			sprintf(_joeVoiceFilePrefix[i], "%2d%4xJ", _talkKey, _dialogueTree[level][i].head);
 		}
 
-		// Check to see if(all the dialogue options have been selected.
+		// Check to see if (all the dialogue options have been selected.
 		// if this is the case, and the last one left is the exit option,
 		// then automatically set S to that and exit.
 
@@ -495,7 +495,7 @@
 			else
 				_vm->walk()->movePerson(person, x, y, _vm->graphics()->numFrames(), 0);
 			index += 11;
-			// if(JOEWALK==3) CUTQUIT=0;
+			// if (JOEWALK==3) CUTQUIT=0;
 			// XXX personWalking = true;
 		}
 		break;
@@ -1312,7 +1312,7 @@
 					selectedSentence = zone;
 				}
 
-			} // while()
+			} // while ()
 		}
 	}