[Scummvm-cvs-logs] CVS: scummvm/bs2 build_display.cpp,1.1,1.2 debug.cpp,1.1,1.2 debug.h,1.1,1.2

[Max Horn]

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

Modified Files:
	build_display.cpp debug.cpp debug.h 
Log Message:
fixed some warnings

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/build_display.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- build_display.cpp	28 Jul 2003 01:44:37 -0000	1.1
+++ build_display.cpp	28 Jul 2003 02:10:24 -0000	1.2
@@ -98,7 +98,6 @@
 void	Start_new_palette(void);	//Tony25Sept96
 
 void	Register_frame(int32 *params, buildit *build_unit);	// (1nov96JEL)
-void	Process_image(buildit	*frame);
 void	Process_layer(uint32	layer_number);	//Tony24Sept96
 void	Sort_the_sort_list(void);	//Tony18Sept96
 
@@ -119,7 +118,9 @@
 void	Build_display(void)	//Tony21Sept96
 {
 	BOOL		end;
+#ifdef _DEBUG
 	uint8		pal[12]={0,0,0,0,0,0,0,0,0,255,0,0};
+#endif
 	uint8		*file;
 	_multiScreenHeader *screenLayerTable;
 
@@ -323,7 +324,6 @@
 	mem *text_spr;
 	_frameHeader *frame;
 	_spriteInfo  spriteInfo;
-	bool		 done = false;
 	_palEntry	 pal[256];
 	_palEntry	 oldPal[256];
 	int16		 oldY;
@@ -1035,7 +1035,6 @@
 void Start_new_palette(void)	//Tony25Sept96
 {
 	//start layer palette fading up
-	uint8 black[4]={0,0,0,0};
 
 	uint8 *screenFile;
 
@@ -1145,7 +1144,6 @@
 	// params 0 resource number of palette file
 	//			or 0 if it's to be the palette from the current screen
 
-	uint8 black[4]={0,0,0,0};
 	uint8 *file;
 	_standardHeader *head;
 
@@ -1156,7 +1154,7 @@
 	// - but restoring the screen palette after 'dark_plaette_13' should now work properly too!
 	if (LOCATION==13)	// hut interior
 	{
-		if (palRes==0xffffffff)	// unpausing
+		if (palRes==-1)	// unpausing
 			palRes = lastPaletteRes;	// restore whatever palette was last set (screen palette or 'dark_palette_13')
 	}
 	else
@@ -1166,7 +1164,7 @@
 		// because we might actually need to use a separate palette file anyway
 		// eg. for pausing & unpausing during the eclipse
 
- 		if (palRes==0xffffffff)	// unpausing (fudged for location 13)
+ 		if (palRes==-1)	// unpausing (fudged for location 13)
 			palRes=0;			// we really meant '0'
 
 		if ((palRes==0) && (lastPaletteRes))

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.cpp	28 Jul 2003 01:44:37 -0000	1.1
+++ debug.cpp	28 Jul 2003 02:10:24 -0000	1.2
@@ -25,7 +25,7 @@
 #include "debug.h"
 //--------------------------------------------------------------------------------------
 
-#if _DEBUG  // this whole file (except ExitWithReport) only included on debug versions
+#ifdef _DEBUG  // this whole file (except ExitWithReport) only included on debug versions
 
 #include <stdlib.h>
 
@@ -89,7 +89,7 @@
 
 // THIS FUNCTION STAYS IN THE RELEASE VERSION
 // IN FACT, CON_FATAL_ERROR IS MAPPED TO THIS AS WELL, SO WE HAVE A MORE PRESENTABLE ERROR REPORT
-void ExitWithReport(char *format,...)	// (6dec96 JEL)
+void ExitWithReport(const char *format,...)	// (6dec96 JEL)
 {
 	//	Send a printf type string to Paul's windows routine
 	char buf[500];
@@ -105,16 +105,16 @@
 		ServiceWindows();
 
 	RestoreDisplay();
-	ReportFatalError((uint8 *)buf);	// display message box
+	ReportFatalError((const uint8 *)buf);	// display message box
 	CloseAppWindow();
 	while (ServiceWindows() != RDERR_APPCLOSED);
 
 	exit(0);
 }
 
-#if _DEBUG	// all other functions only for _DEBUG version
+#ifdef _DEBUG	// all other functions only for _DEBUG version
 //--------------------------------------------------------------------------------------
-void Zdebug(char *format,...)	//Tony's special debug logging file March96
+void Zdebug(const char *format,...)	//Tony's special debug logging file March96
 {
 //	Write a printf type string to a debug file
 
@@ -142,7 +142,7 @@
 }
 
 //--------------------------------------------------------------------------------------
-void Zdebug(uint32	stream, char *format,...)	//Tony's special debug logging file March96
+void Zdebug(uint32 stream, const char *format,...)	//Tony's special debug logging file March96
 {
 //	Write a printf type string to a debug file
 

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/debug.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug.h	28 Jul 2003 01:44:37 -0000	1.1
+++ debug.h	28 Jul 2003 02:10:24 -0000	1.2
@@ -61,8 +61,8 @@
 extern	int32 showVar[MAX_SHOWVARS];
 
 
-void Zdebug(char * ,...);		// Tony's special debug logging file March96
-void Zdebug(uint32	stream, char *format,...);
+void Zdebug(const char * ,...);		// Tony's special debug logging file March96
+void Zdebug(uint32 stream, const char *format,...);
 void Build_debug_text(void);	// James's debug text display
 void Draw_debug_graphics(void);	// James's debug graphics display
 
@@ -78,14 +78,14 @@
 #define Print_current_info	NULL
 */
 
-void Zdebug(char * ,...);		// Tony's special debug logging file March96
+void Zdebug(const char * ,...);		// Tony's special debug logging file March96
 void Build_debug_text(void);	// James's debug text display
 void Draw_debug_graphics(void);	// James's debug graphics display
 
 #endif	// _DEBUG	// this whole file only included on debug versions
 //--------------------------------------------------------------------------------------
 
-void ExitWithReport(char *format,...);	// (6dec96 JEL) IN BOTH DEBUG & RELEASE VERSIONS
+void ExitWithReport(const char *format,...);	// (6dec96 JEL) IN BOTH DEBUG & RELEASE VERSIONS