[Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.31,1.32 build_display.h,1.6,1.7 console.cpp,1.16,1.17 mouse.cpp,1.23,1.24 save_rest.cpp,1.24,1.25 walker.cpp,1.12,1.13

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv31958

Modified Files:
	build_display.cpp build_display.h console.cpp mouse.cpp 
	save_rest.cpp walker.cpp 
Log Message:
Some more cosmetic changes while I'm considering the next move. (Or maybe
I'm just hoping that if I stall long enough, someone else will make the
move for me. :-)


Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- build_display.cpp	5 Oct 2003 15:28:13 -0000	1.31
+++ build_display.cpp	8 Oct 2003 06:58:34 -0000	1.32
@@ -244,7 +244,7 @@
 			// walkgrid, mouse & player markers & mouse area
 			// rectangle
 
-			Draw_debug_graphics();	// JAMES (08apr97)
+			Draw_debug_graphics();
 
  			// ---------------------------------------------------
 			// text blocks
@@ -408,31 +408,25 @@
 }
 
 void Send_back_par0_frames(void) {
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_bgp0; j++) {
+	for (uint i = 0; i < cur_bgp0; i++) {
 		// frame attached to 1st background parallax
-		Process_image(&bgp0_list[j]);
+		Process_image(&bgp0_list[i]);
 	}
 }
 
 void Send_back_par1_frames(void) {
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_bgp1; j++) {
-		// frame attached to 1nd background parallax
-		Process_image(&bgp1_list[j]);
+	for (uint i = 0; i < cur_bgp1; i++) {
+		// frame attached to 2nd background parallax
+		Process_image(&bgp1_list[i]);
 	}
 }
 
 void Send_back_frames(void) {
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_back; j++) {
-		Process_image(&back_list[j]);
+	for (uint i = 0; i < cur_back; i++) {
+		Process_image(&back_list[i]);
 	}
 }
 
@@ -440,48 +434,40 @@
 	// send the sort frames for printing - layers, shrinkers & normal flat
 	// sprites
 
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_sort; j++) {
-		if (sort_list[sort_order[j]].layer_number) {
+	for (uint i = 0; i < cur_sort; i++) {
+		if (sort_list[sort_order[i]].layer_number) {
 			// its a layer  - minus 1 for true layer number
 			// we need to know from the buildit because the layers
 			// will have been sorted in random order
-			Process_layer(sort_list[sort_order[j]].layer_number - 1);
+			Process_layer(sort_list[sort_order[i]].layer_number - 1);
 		} else {
 			// sprite
-			Process_image(&sort_list[sort_order[j]]);
+			Process_image(&sort_list[sort_order[i]]);
 		}
 	}
 }
 
 void Send_fore_frames(void) {
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_fore; j++) {
-		Process_image(&fore_list[j]);
+	for (uint i = 0; i < cur_fore; i++) {
+		Process_image(&fore_list[i]);
 	}
 }
 
 void Send_fore_par0_frames(void) {
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_fgp0; j++) {
+	for (uint i = 0; i < cur_fgp0; i++) {
 		// frame attached to 1st foreground parallax
-		Process_image(&fgp0_list[j]);
+		Process_image(&fgp0_list[i]);
 	}
 }
 
 void Send_fore_par1_frames(void) {
-	uint32 j;
-
 	// could be none at all - theoretically at least
-	for (j = 0; j < cur_fgp1; j++) {
+	for (uint i = 0; i < cur_fgp1; i++) {
 		// frame attached to 2nd foreground parallax
-		Process_image(&fgp1_list[j]);
+		Process_image(&fgp1_list[i]);
 	}
 }
 
@@ -633,7 +619,6 @@
 	}
 #endif
 
-
 #ifdef _SWORD2_DEBUG
 	if (SYSTEM_TESTING_ANIMS) {	// see anims.cpp
 		// bring the anim into the visible screen
@@ -691,8 +676,8 @@
 	if (cur_sort) {
 		// there are some layers - so rebuild the sort order
 		// positioning
-		for (uint j = 0; j < cur_sort; j++)
-			sort_order[j] = j;	//rebuild the order list
+		for (uint i = 0; i < cur_sort; i++)
+			sort_order[i] = i;	//rebuild the order list
 	}
 }
 
@@ -705,7 +690,6 @@
 
 	for (uint i = 0; i < cur_sort - 1; i++) {
 		for (uint j = 0; j < cur_sort - 1; j++) {
-			//this > next then swap
 			if (sort_list[sort_order[j]].sort_y > sort_list[sort_order[j + 1]].sort_y) {
 				SWAP(sort_order[j], sort_order[j + 1]);
 			}
@@ -819,7 +803,7 @@
 		// passed a mouse structure, so add to the mouse_list
 		ob_mouse = (Object_mouse *) params[0];
 
-		// only if 'pointer' isn't NULL (James13feb97)
+		// only if 'pointer' isn't NULL
 		if (ob_mouse->pointer) {
 #ifdef _SWORD2_DEBUG
 			if (cur_mouse == TOTAL_mouse_list)
@@ -866,7 +850,7 @@
 	//         1 pointer to graphic structure
 	//         2 pointer to mega structure or NULL if not a mega
 
-	Object_graphic	*ob_graph = (Object_graphic *) params[1];
+	Object_graphic *ob_graph = (Object_graphic *) params[1];
 
 	// check low word for sprite type
 	switch (ob_graph->type & 0x0000ffff) {
@@ -1080,7 +1064,7 @@
  			Con_fatal_error("FN_set_palette() called with invalid resource!");
 #endif
 
-		file = (uint8*) (head + 1);
+		file = (uint8 *) (head + 1);
 
 		// always set colour 0 to black because most background screen
 		// palettes have a bright colour 0 although it should come out

Index: build_display.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- build_display.h	4 Oct 2003 08:07:01 -0000	1.6
+++ build_display.h	8 Oct 2003 06:58:34 -0000	1.7
@@ -83,7 +83,7 @@
 // the only build list needed externally - by layers.cpp - for adding layers
 // to sort list
 
-extern	buildit	sort_list[];
+extern buildit sort_list[];
 
 // function prototypes needed externally
 

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/console.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- console.cpp	4 Oct 2003 08:07:01 -0000	1.16
+++ console.cpp	8 Oct 2003 06:58:34 -0000	1.17
@@ -393,7 +393,7 @@
 	// quick check for numbers here
 	if (!isalpha(console_buffer[0])) {
 		Print_to_console("Eh?");
-		return(0);
+		return 0;
 	}
 
 	j = 0;
@@ -599,7 +599,7 @@
 					return 0;
 				case 35:	// VERSION
 					Con_display_version();
-					return(0);
+					return 0;
 				case 36:	// SOFT
 				case 37:	// HARD
 					// ScummVM doesn't distinguish between

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- mouse.cpp	4 Oct 2003 08:07:02 -0000	1.23
+++ mouse.cpp	8 Oct 2003 06:58:34 -0000	1.24
@@ -853,7 +853,7 @@
 				CreatePointerText(mouse_list[j].pointer_text, mouse_list[j].pointer);
 
 				// return pointer type
-				return(mouse_list[j].pointer);
+				return mouse_list[j].pointer;
 			}
 
 			j++;
@@ -1329,7 +1329,7 @@
 
 int32 FN_remove_chooser(int32 *params) {
 	HideMenu(RDMENU_BOTTOM);
-	return(IR_CONT);
+	return IR_CONT;
 }
 
 int32 FN_disable_menu(int32 *params) {

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/save_rest.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- save_rest.cpp	4 Oct 2003 08:07:02 -0000	1.24
+++ save_rest.cpp	8 Oct 2003 06:58:34 -0000	1.25
@@ -163,7 +163,7 @@
 
 uint32 FindBufferSize(void) {
 	// size of savegame header + size of global variables
-	return (sizeof(g_header) + res_man.fetchLen(1));
+	return sizeof(g_header) + res_man.fetchLen(1);
 }
 
 void FillSaveBuffer(mem *buffer, uint32 size, uint8 *desc) {

Index: walker.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/walker.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- walker.cpp	5 Oct 2003 15:28:14 -0000	1.12
+++ walker.cpp	8 Oct 2003 06:58:34 -0000	1.13
@@ -170,7 +170,7 @@
 		RESULT = 0;		// 0 means ok
 
 		// continue the script so that RESULT can be checked!
-		return(IR_CONT);
+		return IR_CONT;
 	}
 
 	// get pointer to walkanim & current frame position