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

(svn r20339) -Codechange: reorder the HQ drawing data so it's in a slightly more logical order from the map array's point of view.

release/1.1
rubidium 2010-08-03 11:39:17 +00:00
parent fbde46c028
commit d687b49a4e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/table/unmovable_land.h
View File

@ -96,28 +96,28 @@ static const DrawTileSeqStruct _unmovable_hq_huge_west[] = {
static const DrawTileSprites _unmovable_hq[] = { static const DrawTileSprites _unmovable_hq[] = {
TILE_SPRITE_LINE(SPR_TINYHQ_NORTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_TINYHQ_NORTH, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_TINYHQ_EAST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_TINYHQ_WEST, _unmovable_nothing) TILE_SPRITE_LINE(SPR_TINYHQ_WEST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_TINYHQ_EAST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_TINYHQ_SOUTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_TINYHQ_SOUTH, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_SMALLHQ_NORTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_SMALLHQ_NORTH, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_SMALLHQ_EAST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_SMALLHQ_WEST, _unmovable_nothing) TILE_SPRITE_LINE(SPR_SMALLHQ_WEST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_SMALLHQ_EAST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_SMALLHQ_SOUTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_SMALLHQ_SOUTH, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_MEDIUMHQ_NORTH, _unmovable_hq_medium_north) TILE_SPRITE_LINE(SPR_MEDIUMHQ_NORTH, _unmovable_hq_medium_north)
TILE_SPRITE_LINE(SPR_MEDIUMHQ_EAST, _unmovable_hq_medium_east)
TILE_SPRITE_LINE(SPR_MEDIUMHQ_WEST, _unmovable_hq_medium_west) TILE_SPRITE_LINE(SPR_MEDIUMHQ_WEST, _unmovable_hq_medium_west)
TILE_SPRITE_LINE(SPR_MEDIUMHQ_EAST, _unmovable_hq_medium_east)
TILE_SPRITE_LINE(SPR_MEDIUMHQ_SOUTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_MEDIUMHQ_SOUTH, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_LARGEHQ_NORTH_GROUND, _unmovable_hq_large_north) TILE_SPRITE_LINE(SPR_LARGEHQ_NORTH_GROUND, _unmovable_hq_large_north)
TILE_SPRITE_LINE(SPR_LARGEHQ_EAST_GROUND, _unmovable_hq_large_east)
TILE_SPRITE_LINE(SPR_LARGEHQ_WEST_GROUND, _unmovable_hq_large_west) TILE_SPRITE_LINE(SPR_LARGEHQ_WEST_GROUND, _unmovable_hq_large_west)
TILE_SPRITE_LINE(SPR_LARGEHQ_EAST_GROUND, _unmovable_hq_large_east)
TILE_SPRITE_LINE(SPR_LARGEHQ_SOUTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_LARGEHQ_SOUTH, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_HUGEHQ_NORTH_GROUND, _unmovable_hq_huge_north) TILE_SPRITE_LINE(SPR_HUGEHQ_NORTH_GROUND, _unmovable_hq_huge_north)
TILE_SPRITE_LINE(SPR_HUGEHQ_EAST_GROUND, _unmovable_hq_huge_east)
TILE_SPRITE_LINE(SPR_HUGEHQ_WEST_GROUND, _unmovable_hq_huge_west) TILE_SPRITE_LINE(SPR_HUGEHQ_WEST_GROUND, _unmovable_hq_huge_west)
TILE_SPRITE_LINE(SPR_HUGEHQ_EAST_GROUND, _unmovable_hq_huge_east)
TILE_SPRITE_LINE(SPR_HUGEHQ_SOUTH, _unmovable_nothing) TILE_SPRITE_LINE(SPR_HUGEHQ_SOUTH, _unmovable_nothing)
}; };

2
src/unmovable_cmd.cpp
View File

@ -253,7 +253,7 @@ static void DrawTile_Unmovable(TileInfo *ti)
if (type == UNMOVABLE_HQ) { if (type == UNMOVABLE_HQ) {
uint8 offset = GetUnmovableOffset(ti->tile); uint8 offset = GetUnmovableOffset(ti->tile);
dts = &_unmovable_hq[GetCompanyHQSize(ti->tile) << 2 | GB(offset, 4, 1) | GB(offset, 0, 1) << 1]; dts = &_unmovable_hq[GetCompanyHQSize(ti->tile) << 2 | GB(offset, 4, 1) << 1 | GB(offset, 0, 1)];
} else { } else {
dts = &_unmovables[type]; dts = &_unmovables[type];
} }