summaryrefslogtreecommitdiff
path: root/src/table/sprites.h
diff options
context:
space:
mode:
authormaedhros <maedhros@openttd.org>2007-03-19 11:27:30 +0000
committermaedhros <maedhros@openttd.org>2007-03-19 11:27:30 +0000
commit209101391abfaf901bfc68c83c79bf8c9865b0bb (patch)
tree8ccaccab74c6399452d6ff3f09d5c94335516a62 /src/table/sprites.h
parent3d3d8d7c47f3fb98abeefe943f7c94f4485f3dec (diff)
downloadopenttd-209101391abfaf901bfc68c83c79bf8c9865b0bb.tar.xz
(svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for
the newhouses grf specs, so all newhouses grfs will be playable in the game. Many thanks to everyone who contributed code and ideas, and all the testers who found things we missed.
Diffstat (limited to 'src/table/sprites.h')
-rw-r--r--src/table/sprites.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/table/sprites.h b/src/table/sprites.h
index e9b9c9b69..0301d9f20 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -35,7 +35,6 @@
* @todo Split the "Sprites" enum into smaller chunks and document them
*/
-
enum Sprites {
SPR_SELECT_TILE = 752,
SPR_DOT = 774, // corner marker for lower/raise land
@@ -1324,6 +1323,7 @@ enum SpriteSetup {
*/
enum Modifiers {
SPRITE_MODIFIER_USE_OFFSET = OFFSET_BIT,
+ SPRITE_MODIFIER_OPAQUE = OFFSET_BIT,
///when a sprite is to be displayed transparently, this bit needs to be set.
PALETTE_MODIFIER_TRANSPARENT = TRANSPARENT_BIT,
///this bit is set when a recoloring process is in action
@@ -1418,6 +1418,5 @@ enum PaletteSprites {
PALETTE_59E = 0x59E,
PALETTE_59F = 0x59F,
};
-#undef PALETTE_RECOLOR_SPRITE
#endif /* SPRITES_H */