[Scummvm-cvs-logs] CVS: scummvm/bs2 console.h,1.1,1.2 interpreter.h,1.1,1.2 maketext.cpp,1.1,1.2 mem_view.cpp,1.1,1.2 mem_view.h,1.1,1.2 mouse.cpp,1.1,1.2

[Max Horn]

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

Modified Files:
	console.h interpreter.h maketext.cpp mem_view.cpp mem_view.h 
	mouse.cpp 
Log Message:
fixed more warnings

Index: console.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/console.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- console.h	28 Jul 2003 01:44:37 -0000	1.1
+++ console.h	28 Jul 2003 02:23:04 -0000	1.2
@@ -30,9 +30,9 @@
 void	StartConsole(void);	//Tony12Aug96
 void	EndConsole(void);	//Tony9Oct96
 
-void	Con_fatal_error(char *format,...);
-void	Print_to_console(char *format,...);	//Tony13Aug96
-void	Temp_print_to_console(char *format,...);	//Tony13Aug96
+void	Con_fatal_error(const char *format,...);
+void	Print_to_console(const char *format,...);	//Tony13Aug96
+void	Temp_print_to_console(const char *format,...);	//Tony13Aug96
 void	Scroll_console(void);	//Tony13Aug96
 void	Clear_console_line(void);	//Tony13Aug96
 
@@ -66,8 +66,8 @@
 //#define	Temp_print_to_console	NULL
 //#define	Clear_console_line		NULL
 //#define	Scroll_console			NULL
-void	Print_to_console(char *format,...);
-void	Temp_print_to_console(char *format,...);
+void	Print_to_console(const char *format,...);
+void	Temp_print_to_console(const char *format,...);
 void	Clear_console_line(void);
 void	Scroll_console(void);
 //#define	Var_check			NULL

Index: interpreter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/interpreter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- interpreter.h	28 Jul 2003 01:44:37 -0000	1.1
+++ interpreter.h	28 Jul 2003 02:23:04 -0000	1.2
@@ -61,9 +61,9 @@
 
 
 	// Get parameter fix so that the playstation version can handle words not on word boundaries
-#define Read16ip(var)			{var = *((int16 *)(code+ip));ip+=sizeof(int16);}
-#define Read32ip(var)			{var = *((int32 *)(code+ip));ip+=sizeof(int32);}
-#define Read32ipLeaveip(var)		{var = *((int32 *)(code+ip));}
+#define Read16ip(var)			{var = *((const int16 *)(code+ip));ip+=sizeof(int16);}
+#define Read32ip(var)			{var = *((const int32 *)(code+ip));ip+=sizeof(int32);}
+#define Read32ipLeaveip(var)		{var = *((const int32 *)(code+ip));}
 
 void SetGlobalInterpreterVariables(int32 *vars);
 

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/maketext.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maketext.cpp	28 Jul 2003 01:44:37 -0000	1.1
+++ maketext.cpp	28 Jul 2003 02:23:04 -0000	1.2
@@ -362,7 +362,8 @@
 	// then the offset table (an int32 offset for each sprite)
 	//  - each offset counting from the start of the file
 
-	if( (ch<FIRST_CHAR) || (ch>LAST_CHAR) )		// if 'ch' out of range
+	if( (ch<FIRST_CHAR) )		// if 'ch' out of range
+//	if( (ch<FIRST_CHAR) || (ch>LAST_CHAR) )		// if 'ch' out of range
 		ch = DUD;								// then print the 'dud' character (chequered flag)
 
 	// address of char = address of charSet + offset to char
@@ -422,7 +423,7 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-#if _DEBUG
+#ifdef _DEBUG
 #define	MAX_text_blocs	MAX_DEBUG_TEXT_BLOCKS+1	// allow enough for all the debug text blocks (see debug.cpp)
 #else
 #define	MAX_text_blocs	2	// only need one for speech, and possibly one for "PAUSED"

Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mem_view.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mem_view.cpp	28 Jul 2003 01:44:37 -0000	1.1
+++ mem_view.cpp	28 Jul 2003 02:23:04 -0000	1.2
@@ -167,7 +167,7 @@
 }
 //--------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------
-char	*Fetch_mem_owner(uint32	uid)	//Tony3June96
+const char	*Fetch_mem_owner(uint32	uid)	//Tony3June96
 {
 
 	switch(uid)

Index: mem_view.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mem_view.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mem_view.h	28 Jul 2003 01:44:38 -0000	1.1
+++ mem_view.h	28 Jul 2003 02:23:04 -0000	1.2
@@ -23,7 +23,7 @@
 //#include	"src\driver96.h"
 
 
-char	*Fetch_mem_owner(uint32	uid);
+const char	*Fetch_mem_owner(uint32	uid);
 void	Console_mem_display(void);					// Tony (13Aug96)
 void	Create_mem_string( char *string );			// James (21oct96 updated 4dec96)
 

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/mouse.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mouse.cpp	28 Jul 2003 01:44:38 -0000	1.1
+++ mouse.cpp	28 Jul 2003 02:23:04 -0000	1.2
@@ -104,10 +104,8 @@
 
 //uint8 Check_sprite_pixel( uint32 j );
 void CreatePointerText(uint32 TextId, uint32 pointerRes);	// James16jun97
-void ClearPointerText(void);		// James16jun97
 void Monitor_player_activity(void);	// James23july97
 
-int32 FN_no_human(int32 *params);
 void	No_human(void);
 
 //------------------------------------------------------------------------------------