diff options
| author | Max Horn | 2003-08-23 14:42:37 +0000 |
|---|---|---|
| committer | Max Horn | 2003-08-23 14:42:37 +0000 |
| commit | 01f020da2b82fcc781f4654aefb90fb3033e2196 (patch) | |
| tree | 555c2a6f4071b5a5f3a360d8717c2fbd8d604057 /sword2/console.cpp | |
| parent | 4df7dd406f13454944fb62e99343708d44e1dffc (diff) | |
| download | scummvm-rg350-01f020da2b82fcc781f4654aefb90fb3033e2196.tar.gz scummvm-rg350-01f020da2b82fcc781f4654aefb90fb3033e2196.tar.bz2 scummvm-rg350-01f020da2b82fcc781f4654aefb90fb3033e2196.zip | |
SetPalette conflicts with an OS symbol on OS X
svn-id: r9829
Diffstat (limited to 'sword2/console.cpp')
| -rw-r--r-- | sword2/console.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sword2/console.cpp b/sword2/console.cpp index bfcbdea369..5fe5034535 100644 --- a/sword2/console.cpp +++ b/sword2/console.cpp @@ -182,7 +182,7 @@ void Init_console(void) //Tony9Sept96 con_chr_height=12; con_width=screenWide; //max across - SetPalette(CON_PEN, 1, white, RDPAL_INSTANT); // Force a palatte for the console. Chris 11Apr97 + BS2_SetPalette(CON_PEN, 1, white, RDPAL_INSTANT); // Force a palatte for the console. Chris 11Apr97 console_sprite = Twalloc(con_width*(CON_lines*con_chr_height), MEM_float, UID_con_sprite); @@ -545,7 +545,7 @@ uint32 Parse_user_input(void) //Tony13Aug96 //--------------------------------- case 8: // START Con_start(&input[1][0]); - SetPalette(187, 1, pal, RDPAL_INSTANT); //force the palette + BS2_SetPalette(187, 1, pal, RDPAL_INSTANT); //force the palette return(0); break; //--------------------------------- @@ -613,7 +613,7 @@ uint32 Parse_user_input(void) //Tony13Aug96 //--------------------------------- case 18: // S (same as START) Con_start(&input[1][0]); - SetPalette(187, 1, pal, RDPAL_INSTANT); //force the palette + BS2_SetPalette(187, 1, pal, RDPAL_INSTANT); //force the palette return(0); break; //--------------------------------- @@ -1012,7 +1012,7 @@ void Con_fatal_error(const char *format,...) //Tony17Oct96 uint8 white[4] = {255,255,255,0}; // (James 05mar97) - SetPalette(CON_PEN, 1, white, RDPAL_INSTANT); // set text colour in case screen is faded down! (James 05mar97) + BS2_SetPalette(CON_PEN, 1, white, RDPAL_INSTANT); // set text colour in case screen is faded down! (James 05mar97) va_start(arg_ptr,format); _vsnprintf( buf, 150, format, arg_ptr); |