ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

SetPalette conflicts with an OS symbol on OS X

Browse Source 
svn-id: r9829
This commit is contained in:
Max Horn
2003-08-23 14:42:37 +00:00
parent 4df7dd406f
commit 01f020da2b
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sword2/function.cpp
+10 -10
View File
@@ -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;
}