summaryrefslogtreecommitdiff
path: root/src/table
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2011-11-11 19:47:28 +0000
committerrubidium <rubidium@openttd.org>2011-11-11 19:47:28 +0000
commit39263445b07e10256a1f232fc7f58a341bec3cbf (patch)
treec76c3ac38032ae89afda5ca12ecdf2e0559f5d68 /src/table
parent624c8a6173357758c2e6d66b04cc0ac77407349b (diff)
downloadopenttd-39263445b07e10256a1f232fc7f58a341bec3cbf.tar.xz
(svn r23191) -Fix: GCC 4.7 compilation warnings related to narrowing in palettes
Diffstat (limited to 'src/table')
-rw-r--r--src/table/palettes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/table/palettes.h b/src/table/palettes.h
index 5998bc9dc..6f246ba68 100644
--- a/src/table/palettes.h
+++ b/src/table/palettes.h
@@ -11,7 +11,7 @@
#include "../core/endian_type.hpp"
-#define M(r, g, b) { 0xff << 24 | (r) << 16 | (g) << 8 | (b) }
+#define M(r, g, b) { 0xFF000000U | (r) << 16 | (g) << 8 | (b) }
/** Colour palette (DOS) */
static const Colour _palette[256] = {