diff options
| author | rubidium <rubidium@openttd.org> | 2010-01-21 01:38:13 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-01-21 01:38:13 +0000 |
| commit | f94c83a3874c292ae0d90a7819c971e4bc7aebad (patch) | |
| tree | a952b3b5ff3a44ae3b028ee995ee32f968cc2ba0 /src/tree_cmd.cpp | |
| parent | 02edae54542cf619cb8d0157d476be45df898119 (diff) | |
| download | openttd-f94c83a3874c292ae0d90a7819c971e4bc7aebad.tar.xz | |
(svn r18872) -Codechange: introduce PaletteID and use it
Diffstat (limited to 'src/tree_cmd.cpp')
| -rw-r--r-- | src/tree_cmd.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index 94eb3f067..3c127e0ae 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -433,9 +433,7 @@ CommandCost CmdPlantTree(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 } } -struct TreeListEnt { - SpriteID image; - SpriteID pal; +struct TreeListEnt : PalSpriteID { byte x, y; }; @@ -477,11 +475,11 @@ static void DrawTile_Trees(TileInfo *ti) uint trees = GetTreeCount(ti->tile); for (uint i = 0; i < trees; i++) { - SpriteID image = s[0].sprite + (i == trees - 1 ? GetTreeGrowth(ti->tile) : 3); - SpriteID pal = s[0].pal; + SpriteID sprite = s[0].sprite + (i == trees - 1 ? GetTreeGrowth(ti->tile) : 3); + PaletteID pal = s[0].pal; - te[i].image = image; - te[i].pal = pal; + te[i].sprite = sprite; + te[i].pal = pal; te[i].x = d->x; te[i].y = d->y; s++; @@ -502,7 +500,7 @@ static void DrawTile_Trees(TileInfo *ti) } } - AddSortableSpriteToDraw(te[mi].image, te[mi].pal, ti->x + te[mi].x, ti->y + te[mi].y, 16 - te[mi].x, 16 - te[mi].y, 0x30, z, IsTransparencySet(TO_TREES), -te[mi].x, -te[mi].y); + AddSortableSpriteToDraw(te[mi].sprite, te[mi].pal, ti->x + te[mi].x, ti->y + te[mi].y, 16 - te[mi].x, 16 - te[mi].y, 0x30, z, IsTransparencySet(TO_TREES), -te[mi].x, -te[mi].y); /* replace the removed one with the last one */ te[mi] = te[trees - 1]; |