diff options
| author | Kostas Nakos | 2009-03-01 19:46:07 +0000 |
|---|---|---|
| committer | Kostas Nakos | 2009-03-01 19:46:07 +0000 |
| commit | bf894deb06f7a26e3962031cd4e7e53c51e7d87b (patch) | |
| tree | 9656b875a0556dd35eedde37faa19cea869a1795 /engines/tinsel/palette.h | |
| parent | 097641f021d924721ad48c9efa0bb59fb52349a1 (diff) | |
| download | scummvm-rg350-bf894deb06f7a26e3962031cd4e7e53c51e7d87b.tar.gz scummvm-rg350-bf894deb06f7a26e3962031cd4e7e53c51e7d87b.tar.bz2 scummvm-rg350-bf894deb06f7a26e3962031cd4e7e53c51e7d87b.zip | |
silence compiler warnings: the names of some tinsel defines were shadowing standard winapi defines
svn-id: r39049
Diffstat (limited to 'engines/tinsel/palette.h')
| -rw-r--r-- | engines/tinsel/palette.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h index 1d43e6d31f..90edfbb19a 100644 --- a/engines/tinsel/palette.h +++ b/engines/tinsel/palette.h @@ -33,11 +33,11 @@ namespace Tinsel { typedef uint32 COLORREF; -#define RGB(r,g,b) ((COLORREF)TO_LE_32(((uint8)(r)|((uint16)(g)<<8))|(((uint32)(uint8)(b))<<16))) +#define TINSEL_RGB(r,g,b) ((COLORREF)TO_LE_32(((uint8)(r)|((uint16)(g)<<8))|(((uint32)(uint8)(b))<<16))) -#define GetRValue(rgb) ((uint8)(FROM_LE_32(rgb))) -#define GetGValue(rgb) ((uint8)(((uint16)(FROM_LE_32(rgb))) >> 8)) -#define GetBValue(rgb) ((uint8)((FROM_LE_32(rgb))>>16)) +#define TINSEL_GetRValue(rgb) ((uint8)(FROM_LE_32(rgb))) +#define TINSEL_GetGValue(rgb) ((uint8)(((uint16)(FROM_LE_32(rgb))) >> 8)) +#define TINSEL_GetBValue(rgb) ((uint8)((FROM_LE_32(rgb))>>16)) enum { MAX_COLOURS = 256, //!< maximum number of colours - for VGA 256 @@ -57,14 +57,14 @@ enum { // some common colours -#define BLACK (RGB(0, 0, 0)) -#define WHITE (RGB(MAX_INTENSITY, MAX_INTENSITY, MAX_INTENSITY)) -#define RED (RGB(MAX_INTENSITY, 0, 0)) -#define GREEN (RGB(0, MAX_INTENSITY, 0)) -#define BLUE (RGB(0, 0, MAX_INTENSITY)) -#define YELLOW (RGB(MAX_INTENSITY, MAX_INTENSITY, 0)) -#define MAGENTA (RGB(MAX_INTENSITY, 0, MAX_INTENSITY)) -#define CYAN (RGB(0, MAX_INTENSITY, MAX_INTENSITY)) +#define BLACK (TINSEL_RGB(0, 0, 0)) +#define WHITE (TINSEL_RGB(MAX_INTENSITY, MAX_INTENSITY, MAX_INTENSITY)) +#define RED (TINSEL_RGB(MAX_INTENSITY, 0, 0)) +#define GREEN (TINSEL_RGB(0, MAX_INTENSITY, 0)) +#define BLUE (TINSEL_RGB(0, 0, MAX_INTENSITY)) +#define YELLOW (TINSEL_RGB(MAX_INTENSITY, MAX_INTENSITY, 0)) +#define MAGENTA (TINSEL_RGB(MAX_INTENSITY, 0, MAX_INTENSITY)) +#define CYAN (TINSEL_RGB(0, MAX_INTENSITY, MAX_INTENSITY)) #include "common/pack-start.h" // START STRUCT PACKING |