diff options
| author | rubidium <rubidium@openttd.org> | 2009-02-09 02:57:15 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-02-09 02:57:15 +0000 |
| commit | c0a8d09ca72873bbbef14dd317cbd29319e54640 (patch) | |
| tree | 211b57e3a81eed5791f5b6b9709252af6f7d8503 /src/industry_cmd.cpp | |
| parent | 90e2465d7d2c770707feeaebfebbe56bd76383f1 (diff) | |
| download | openttd-c0a8d09ca72873bbbef14dd317cbd29319e54640.tar.xz | |
(svn r15428) -Codechange: consistently use colour instead of having both color and colour.
Diffstat (limited to 'src/industry_cmd.cpp')
| -rw-r--r-- | src/industry_cmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/industry_cmd.cpp b/src/industry_cmd.cpp index 6c4df35f1..1eee2f936 100644 --- a/src/industry_cmd.cpp +++ b/src/industry_cmd.cpp @@ -288,8 +288,8 @@ static void DrawTile_Industry(TileInfo *ti) GetIndustryConstructionStage(ti->tile))]; image = dits->ground.sprite; - if (HasBit(image, PALETTE_MODIFIER_COLOR) && dits->ground.pal == PAL_NONE) { - pal = GENERAL_SPRITE_COLOR(ind->random_color); + if (HasBit(image, PALETTE_MODIFIER_COLOUR) && dits->ground.pal == PAL_NONE) { + pal = GENERAL_SPRITE_COLOUR(ind->random_colour); } else { pal = dits->ground.pal; } @@ -312,7 +312,7 @@ static void DrawTile_Industry(TileInfo *ti) image = dits->building.sprite; if (image != 0) { AddSortableSpriteToDraw(image, - (HasBit(image, PALETTE_MODIFIER_COLOR) && dits->building.pal == PAL_NONE) ? GENERAL_SPRITE_COLOR(ind->random_color) : dits->building.pal, + (HasBit(image, PALETTE_MODIFIER_COLOUR) && dits->building.pal == PAL_NONE) ? GENERAL_SPRITE_COLOUR(ind->random_colour) : dits->building.pal, ti->x + dits->subtile_x, ti->y + dits->subtile_y, dits->width, @@ -1488,7 +1488,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const Ind i->owner = owner; r = Random(); - i->random_color = GB(r, 0, 4); + i->random_colour = GB(r, 0, 4); i->counter = GB(r, 4, 12); i->random = GB(r, 16, 16); i->produced_cargo_waiting[0] = 0; @@ -1512,7 +1512,7 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const Ind if (HasBit(indspec->callback_flags, CBM_IND_DECIDE_COLOUR)) { uint16 res = GetIndustryCallback(CBID_INDUSTRY_DECIDE_COLOUR, 0, 0, i, type, INVALID_TILE); - if (res != CALLBACK_FAILED) i->random_color = GB(res, 0, 4); + if (res != CALLBACK_FAILED) i->random_colour = GB(res, 0, 4); } if (HasBit(indspec->callback_flags, CBM_IND_INPUT_CARGO_TYPES)) { |