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/function.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/function.cpp')
| -rw-r--r-- | sword2/function.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sword2/function.cpp b/sword2/function.cpp index d0668c57d5..2d602627e1 100644 --- a/sword2/function.cpp +++ b/sword2/function.cpp @@ -291,19 +291,19 @@ int32 FN_flash(int32 *params) // (James14feb97) switch (params[0]) // what colour? { case WHITE: - SetPalette(0, 1, white, RDPAL_INSTANT); + BS2_SetPalette(0, 1, white, RDPAL_INSTANT); break; case RED: - SetPalette(0, 1, red, RDPAL_INSTANT); + BS2_SetPalette(0, 1, red, RDPAL_INSTANT); break; case GREEN: - SetPalette(0, 1, green, RDPAL_INSTANT); + BS2_SetPalette(0, 1, green, RDPAL_INSTANT); break; case BLUE: - SetPalette(0, 1, blue, RDPAL_INSTANT); + BS2_SetPalette(0, 1, blue, RDPAL_INSTANT); break; } @@ -313,7 +313,7 @@ int32 FN_flash(int32 *params) // (James14feb97) count--; } - SetPalette(0, 1, black, RDPAL_INSTANT); + BS2_SetPalette(0, 1, black, RDPAL_INSTANT); #endif // _SWORD2_DEBUG @@ -332,23 +332,23 @@ int32 FN_colour(int32 *params) // (James14feb97) switch (params[0]) // what colour? { case BLACK: - SetPalette(0, 1, black, RDPAL_INSTANT); + BS2_SetPalette(0, 1, black, RDPAL_INSTANT); break; case WHITE: - SetPalette(0, 1, white, RDPAL_INSTANT); + BS2_SetPalette(0, 1, white, RDPAL_INSTANT); break; case RED: - SetPalette(0, 1, red, RDPAL_INSTANT); + BS2_SetPalette(0, 1, red, RDPAL_INSTANT); break; case GREEN: - SetPalette(0, 1, green, RDPAL_INSTANT); + BS2_SetPalette(0, 1, green, RDPAL_INSTANT); break; case BLUE: - SetPalette(0, 1, blue, RDPAL_INSTANT); + BS2_SetPalette(0, 1, blue, RDPAL_INSTANT); break; } |