diff options
| author | Fabio Battaglia | 2009-12-30 22:56:19 +0000 |
|---|---|---|
| committer | Fabio Battaglia | 2009-12-30 22:56:19 +0000 |
| commit | 3a418c13a7ab9790bb9b43bfc435056827a79e64 (patch) | |
| tree | 14fbf03424597cd89b98b10f189e0b54c97f3326 /graphics/colormasks.h | |
| parent | dc5524bda56007c4ea2006bf5f970f35392beb82 (diff) | |
| download | scummvm-rg350-3a418c13a7ab9790bb9b43bfc435056827a79e64.tar.gz scummvm-rg350-3a418c13a7ab9790bb9b43bfc435056827a79e64.tar.bz2 scummvm-rg350-3a418c13a7ab9790bb9b43bfc435056827a79e64.zip | |
remove bad hackery caused by n64 port and avoid polluting StdioStream using a custom Stream subclass
svn-id: r46777
Diffstat (limited to 'graphics/colormasks.h')
| -rw-r--r-- | graphics/colormasks.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/graphics/colormasks.h b/graphics/colormasks.h index b6cd9dcee4..1ab78fccc5 100644 --- a/graphics/colormasks.h +++ b/graphics/colormasks.h @@ -118,11 +118,12 @@ struct ColorMasks<555> { kBlueBits = 5, #ifdef __N64__ + /* Nintendo 64 uses a BGR555 color format for 16bit display */ kAlphaShift = 0, kRedShift = kBlueBits+kGreenBits+1, kGreenShift = kBlueBits + 1, kBlueShift = 1, -#else +#else /* RGB555 */ kAlphaShift = 0, kRedShift = kGreenBits+kBlueBits, kGreenShift = kBlueBits, |