[Scummvm-cvs-logs] CVS: scummvm/simon debug.cpp,1.36,1.37 saveload.cpp,1.9,1.10 simon.cpp,1.497,1.498

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


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

Modified Files:
	debug.cpp saveload.cpp simon.cpp 
Log Message:
Comply to our coding conventions

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- debug.cpp	6 May 2005 13:22:45 -0000	1.36
+++ debug.cpp	8 May 2005 21:49:48 -0000	1.37
@@ -409,7 +409,7 @@
 	
 	i = 538;
 
-	for(i = 1; ; i++) {
+	for (i = 1; ; i++) {
 		p2 = vga + i * 8;
 		offs = READ_BE_UINT32(p2);
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- saveload.cpp	6 May 2005 11:37:33 -0000	1.9
+++ saveload.cpp	8 May 2005 21:49:48 -0000	1.10
@@ -71,7 +71,7 @@
 	slot = curpos;
 
 	while (curpos + 6 > slot) {
-		if(!(in = _saveFileMan->openForLoading(gen_savename(slot))))
+		if (!(in = _saveFileMan->openForLoading(gen_savename(slot))))
 			break;
 
 		in->read(dst, 18);
@@ -95,7 +95,7 @@
 		}
 	} else {
 		if (curpos + 6 == slot) {
-			if((in = _saveFileMan->openForLoading(gen_savename(slot)))) {
+			if ((in = _saveFileMan->openForLoading(gen_savename(slot)))) {
 				slot++;
 				delete in;
 			}

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -d -r1.497 -r1.498
--- simon.cpp	8 May 2005 05:56:08 -0000	1.497
+++ simon.cpp	8 May 2005 21:49:48 -0000	1.498
@@ -3560,17 +3560,17 @@
 	}                           \
 	(var) = bb & 1;             \
 	bb >>= 1;                   \
-}while(0)
+}while (0)
 
 #define SD_GETBITS(var, nbits) do { \
 	bc = (nbits);                   \
 	(var) = 0;                      \
-	while(bc--) {                   \
+	while (bc--) {                   \
 		(var) <<= 1;                \
 		SD_GETBIT(bit);             \
 		(var) |= bit;               \
 	}                               \
-}while(0)
+}while (0)
 
 #define SD_TYPE_LITERAL (0)
 #define SD_TYPE_MATCH   (1)





More information about the Scummvm-git-logs mailing list