summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-08-03 11:39:17 +0000
committerrubidium <rubidium@openttd.org>2010-08-03 11:39:17 +0000
commitd687b49a4e45590c4adf24367d3be45c2b091943 (patch)
treead48c69bb312d184b294fcd03e915a4c4554b470
parentfbde46c028bb8c7f35b24d803f0d1bfae5039a67 (diff)
downloadopenttd-d687b49a4e45590c4adf24367d3be45c2b091943.tar.xz
(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.
-rw-r--r--src/table/unmovable_land.h10
-rw-r--r--src/unmovable_cmd.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/table/unmovable_land.h b/src/table/unmovable_land.h
index 8896613d0..780b96ec2 100644
--- a/src/table/unmovable_land.h
+++ b/src/table/unmovable_land.h
@@ -96,28 +96,28 @@ static const DrawTileSeqStruct _unmovable_hq_huge_west[] = {
static const DrawTileSprites _unmovable_hq[] = {
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_EAST, _unmovable_nothing)
TILE_SPRITE_LINE(SPR_TINYHQ_SOUTH, _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_EAST, _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_EAST, _unmovable_hq_medium_east)
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_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_EAST_GROUND, _unmovable_hq_large_east)
TILE_SPRITE_LINE(SPR_LARGEHQ_SOUTH, _unmovable_nothing)
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_EAST_GROUND, _unmovable_hq_huge_east)
TILE_SPRITE_LINE(SPR_HUGEHQ_SOUTH, _unmovable_nothing)
};
diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp
index f5083fa1f..b2868fe0b 100644
--- a/src/unmovable_cmd.cpp
+++ b/src/unmovable_cmd.cpp
@@ -253,7 +253,7 @@ static void DrawTile_Unmovable(TileInfo *ti)
if (type == UNMOVABLE_HQ) {
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 {
dts = &_unmovables[type];
}