mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12157) -Codechange: Remove a structure definition and replace it with another one closely matching 

-Codechange: Replace two magic numbers with according sprite names
release/0.6
belugas 2008-02-16 02:37:31 +00:00
parent b4f58ebae4
commit b8f8d0ca51
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/table/unmovable_land.h
View File

@ -1,18 +1,9 @@
/* $Id$ */ /* $Id$ */
struct DrawTileUnmovableStruct {
uint16 image;
byte subcoord_x;
byte subcoord_y;
byte width;
byte height;
byte z_size;
byte unused;
};
static const DrawTileUnmovableStruct _draw_tile_unmovable_data[] = { static const DrawTileSeqStruct _draw_tile_transmitterlighthouse_data[] = {
{0xA29, 7, 7, 2, 2, 70, 0}, { 7, 7, 0, 2, 2, 70, {SPR_UNMOVABLE_TRANSMITTER, PAL_NONE}},
{0xA2A, 4, 4, 7, 7, 61, 0}, { 4, 4, 0, 7, 7, 61, {SPR_UNMOVABLE_LIGHTHOUSE, PAL_NONE}},
}; };
#define TILE_SEQ_LINE(sz, img) { 0, 0, 0, 16, 16, sz, {img, PAL_NONE} }, #define TILE_SEQ_LINE(sz, img) { 0, 0, 0, 16, 16, sz, {img, PAL_NONE} },

8
src/unmovable_cmd.cpp
View File

@ -167,16 +167,14 @@ static void DrawTile_Unmovable(TileInfo *ti)
switch (GetUnmovableType(ti->tile)) { switch (GetUnmovableType(ti->tile)) {
case UNMOVABLE_TRANSMITTER: case UNMOVABLE_TRANSMITTER:
case UNMOVABLE_LIGHTHOUSE: { case UNMOVABLE_LIGHTHOUSE: {
const DrawTileUnmovableStruct* dtus; const DrawTileSeqStruct* dtu = &_draw_tile_transmitterlighthouse_data[GetUnmovableType(ti->tile)];
if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED); if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED);
DrawClearLandTile(ti, 2); DrawClearLandTile(ti, 2);
dtus = &_draw_tile_unmovable_data[GetUnmovableType(ti->tile)];
AddSortableSpriteToDraw( AddSortableSpriteToDraw(
dtus->image, PAL_NONE, ti->x | dtus->subcoord_x, ti->y | dtus->subcoord_y, dtu->image.sprite, PAL_NONE, ti->x | dtu->delta_x, ti->y | dtu->delta_y,
dtus->width, dtus->height, dtus->z_size, ti->z, dtu->size_x, dtu->size_y, dtu->size_z, ti->z,
IsTransparencySet(TO_STRUCTURES) IsTransparencySet(TO_STRUCTURES)
); );
break; break;