[Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.8,1.9 game.cpp,1.20,1.21 pack.cpp,1.4,1.5 parse.cpp,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sun May 8 14:52:14 CEST 2005


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

Modified Files:
	draw.cpp game.cpp pack.cpp parse.cpp 
Log Message:
Comply to our coding conventions

Index: draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/draw.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- draw.cpp	13 Apr 2005 18:27:27 -0000	1.8
+++ draw.cpp	8 May 2005 21:49:41 -0000	1.9
@@ -604,7 +604,7 @@
 				draw_cursorAnim++;
 				draw_cursorTimeKey = util_getTimeKey();
 			} else {
-/*				if(draw_noInvalidated && 
+/*				if (draw_noInvalidated && 
 					inter_mouseX == draw_cursorX &&	inter_mouseY == draw_cursorY)
 						return;*/
 			}
@@ -696,7 +696,7 @@
 				draw_unusedPalette1[i] = *inter_execPtr;
 				continue;
 			}
-			//if(*inter_execPtr != 0)
+			//if (*inter_execPtr != 0)
 			//      var_B = 0;
 
 			ind1 = *inter_execPtr >> 4;

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- game.cpp	5 May 2005 11:11:49 -0000	1.20
+++ game.cpp	8 May 2005 21:49:41 -0000	1.21
@@ -1688,7 +1688,7 @@
 	game_extTable->itemsCount = FROM_LE_16(game_extTable->itemsCount);
 	data_readData(game_extHandle, (char *)&game_extTable->unknown, 1);
 
-	for(i = 0; i < count; i++) {
+	for (i = 0; i < count; i++) {
 		data_readData(game_extHandle, (char *)&game_extTable->items[i].offset, 4);
 		game_extTable->items[i].offset = FROM_LE_32(game_extTable->items[i].offset);
 		data_readData(game_extHandle, (char *)&game_extTable->items[i].size, 2);

Index: pack.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/pack.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pack.cpp	9 Apr 2005 19:32:28 -0000	1.4
+++ pack.cpp	8 May 2005 21:49:41 -0000	1.5
@@ -47,7 +47,7 @@
 	 * Don't need this anymore :)
 	 */
 	/*
-	 * if(realSize < 65000)
+	 * if (realSize < 65000)
 	 * {
 	 * asm_unpackData(sourceBuf, destBuf, tmpBuf);
 	 * free(tmpBuf);

Index: parse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/parse.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- parse.cpp	5 May 2005 14:38:32 -0000	1.11
+++ parse.cpp	8 May 2005 21:49:41 -0000	1.12
@@ -331,7 +331,7 @@
 
 					if (operation != arg_0)
 						break;
-				}	// if(operPtr[-2] == 9 && ...)
+				}	// if (operPtr[-2] == 9 && ...)
 
 				for (brackStart = stkPos - 2; brackStart > 0 &&
 				    operStack[brackStart] < 30 &&
@@ -535,7 +535,7 @@
 
 				if (var_1A != 0)
 					break;
-			}	// while(stkPos >= 2)
+			}	// while (stkPos >= 2)
 
 			if (operation == 30 || operation == 31) {
 				if (operPtr[-1] == 20) {
@@ -696,7 +696,7 @@
 				parse_skipExpr(10);
 			}
 			continue;
-		}		// if(operation >= 19 && operation <= 29)
+		}		// if (operation >= 19 && operation <= 29)
 
 		if (operation == 9) {
 			num++;
@@ -844,7 +844,7 @@
 					valPtr[0] &= valPtr[2];
 					break;
 				}
-			}	// if(stkPos > 0 && cmdPtr[-1] > 4 && cmdPtr[-1] < 9)
+			}	// if (stkPos > 0 && cmdPtr[-1] > 4 && cmdPtr[-1] < 9)
 			continue;
 		}
 
@@ -1102,7 +1102,7 @@
 				break;
 			}
 			continue;
-		}		// if(operation >= 19 && operation <= 29)
+		}		// if (operation >= 19 && operation <= 29)
 		switch (operation) {
 		case 9:
 			debug(5, "(");





More information about the Scummvm-git-logs mailing list