summaryrefslogtreecommitdiff
path: root/src/road_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-02-09 02:57:15 +0000
committerrubidium <rubidium@openttd.org>2009-02-09 02:57:15 +0000
commit89e1afdaa0bfea874d86a8dc2590d49c257ec611 (patch)
tree211b57e3a81eed5791f5b6b9709252af6f7d8503 /src/road_cmd.cpp
parentc7f3daacbf57e8213550f5bca3226565cbafe5e3 (diff)
downloadopenttd-89e1afdaa0bfea874d86a8dc2590d49c257ec611.tar.xz
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
Diffstat (limited to 'src/road_cmd.cpp')
-rw-r--r--src/road_cmd.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index 447bb708b..17f9f8f78 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -1178,7 +1178,7 @@ static void DrawTile_Road(TileInfo *ti)
case ROAD_TILE_DEPOT: {
if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, FOUNDATION_LEVELED);
- SpriteID palette = COMPANY_SPRITE_COLOR(GetTileOwner(ti->tile));
+ SpriteID palette = COMPANY_SPRITE_COLOUR(GetTileOwner(ti->tile));
const DrawTileSprites *dts;
if (HasTileRoadType(ti->tile, ROADTYPE_TRAM)) {
@@ -1196,7 +1196,7 @@ static void DrawTile_Road(TileInfo *ti)
SpriteID image = dtss->image.sprite;
SpriteID pal;
- if (!IsTransparencySet(TO_BUILDINGS) && HasBit(image, PALETTE_MODIFIER_COLOR)) {
+ if (!IsTransparencySet(TO_BUILDINGS) && HasBit(image, PALETTE_MODIFIER_COLOUR)) {
pal = palette;
} else {
pal = PAL_NONE;
@@ -1218,7 +1218,7 @@ static void DrawTile_Road(TileInfo *ti)
void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt)
{
- SpriteID palette = COMPANY_SPRITE_COLOR(_local_company);
+ SpriteID palette = COMPANY_SPRITE_COLOUR(_local_company);
const DrawTileSprites *dts = (rt == ROADTYPE_TRAM) ? &_tram_depot[dir] : &_road_depot[dir];
x += 33;
@@ -1230,7 +1230,7 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt)
Point pt = RemapCoords(dtss->delta_x, dtss->delta_y, dtss->delta_z);
SpriteID image = dtss->image.sprite;
- DrawSprite(image, HasBit(image, PALETTE_MODIFIER_COLOR) ? palette : PAL_NONE, x + pt.x, y + pt.y);
+ DrawSprite(image, HasBit(image, PALETTE_MODIFIER_COLOUR) ? palette : PAL_NONE, x + pt.x, y + pt.y);
}
}