diff options
| -rw-r--r-- | sword2/console.h | 10 | ||||
| -rw-r--r-- | sword2/interpreter.h | 6 | ||||
| -rw-r--r-- | sword2/maketext.cpp | 5 | ||||
| -rw-r--r-- | sword2/mem_view.cpp | 2 | ||||
| -rw-r--r-- | sword2/mem_view.h | 2 | ||||
| -rw-r--r-- | sword2/mouse.cpp | 2 |
6 files changed, 13 insertions, 14 deletions
diff --git a/sword2/console.h b/sword2/console.h index 1dd5014044..f0d8dfeffd 100644 --- a/sword2/console.h +++ b/sword2/console.h @@ -30,9 +30,9 @@ uint32 One_console(void); //Tony12Aug96 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 @@ void EndConsole(void); //#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 diff --git a/sword2/interpreter.h b/sword2/interpreter.h index 2f28ca83f9..f43a196fae 100644 --- a/sword2/interpreter.h +++ b/sword2/interpreter.h @@ -61,9 +61,9 @@ extern int g_debugFlag; // 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); diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp index eb90d7d7cc..d3bc036975 100644 --- a/sword2/maketext.cpp +++ b/sword2/maketext.cpp @@ -362,7 +362,8 @@ _frameHeader* FindChar( uint8 ch, uint8 *charSet ) // 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 @@ void CopyChar( _frameHeader *charPtr, uint8 *spritePtr, uint16 spriteWidth, uint //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -#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" diff --git a/sword2/mem_view.cpp b/sword2/mem_view.cpp index 11542ce576..ee5b888e29 100644 --- a/sword2/mem_view.cpp +++ b/sword2/mem_view.cpp @@ -167,7 +167,7 @@ void Console_mem_display(void) //Tony13Aug96 } //-------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------- -char *Fetch_mem_owner(uint32 uid) //Tony3June96 +const char *Fetch_mem_owner(uint32 uid) //Tony3June96 { switch(uid) diff --git a/sword2/mem_view.h b/sword2/mem_view.h index 725c55ff5c..84fa5667d4 100644 --- a/sword2/mem_view.h +++ b/sword2/mem_view.h @@ -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) diff --git a/sword2/mouse.cpp b/sword2/mouse.cpp index 7332b5b39b..1ff9dff25c 100644 --- a/sword2/mouse.cpp +++ b/sword2/mouse.cpp @@ -104,10 +104,8 @@ uint32 real_luggage_item=0; //last minute for pause mode //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); //------------------------------------------------------------------------------------ |