Mercurial > hg > openttd
changeset 18679:f27b71b252dd draft
(svn r23527) -Codechange: unify colo(u)r as far as it goes
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Thu, 15 Dec 2011 22:02:00 +0000 |
| parents | 5604c42fa1ce |
| children | e87c7c30e606 |
| files | src/newgrf_callbacks.h src/spriteloader/png.cpp src/table/strgen_tables.h src/video/win32_v.cpp |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_callbacks.h +++ b/src/newgrf_callbacks.h @@ -311,7 +311,7 @@ CBM_HOUSE_ANIMATION_NEXT_FRAME = 1, ///< decides next animation frame CBM_HOUSE_ANIMATION_START_STOP = 2, ///< periodically start/stop the animation CBM_HOUSE_CONSTRUCTION_STATE_CHANGE = 3, ///< change animation when construction state changes - CBM_HOUSE_COLOUR = 4, ///< decide the color of the building + CBM_HOUSE_COLOUR = 4, ///< decide the colour of the building CBM_HOUSE_CARGO_ACCEPTANCE = 5, ///< decides amount of cargo acceptance CBM_HOUSE_ANIMATION_SPEED = 6, ///< decides animation speed CBM_HOUSE_DESTRUCTION = 7, ///< trigger destruction of building @@ -377,7 +377,7 @@ CBM_OBJ_SLOPE_CHECK = 0, ///< decides slope suitability CBM_OBJ_ANIMATION_NEXT_FRAME = 1, ///< decides next animation frame CBM_OBJ_ANIMATION_SPEED = 2, ///< decides animation speed - CBM_OBJ_COLOUR = 3, ///< decide the color of the building + CBM_OBJ_COLOUR = 3, ///< decide the colour of the building CBM_OBJ_FUND_MORE_TEXT = 4, ///< additional text in fund window CBM_OBJ_AUTOSLOPE = 5, ///< decides allowance of autosloping };
--- a/src/spriteloader/png.cpp +++ b/src/spriteloader/png.cpp @@ -191,8 +191,8 @@ dst[x].b = 0; /* Alpha channel is used from the original image (to allow transparency in remap colours) */ extern const byte _palmap_w2d[]; - byte color = row_pointer[x * sizeof(uint8)]; - dst[x].m = win_palette ? _palmap_w2d[color] : color; + byte colour = row_pointer[x * sizeof(uint8)]; + dst[x].m = win_palette ? _palmap_w2d[colour] : colour; } } else { dst[x].r = row_pointer[x * sizeof(uint32) + 0];
--- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -38,7 +38,7 @@ {"TINY_FONT", EmitSingleChar, SCC_TINYFONT, 0, C_NONE}, {"BIG_FONT", EmitSingleChar, SCC_BIGFONT, 0, C_NONE}, - /* Colors */ + /* Colours */ {"BLUE", EmitSingleChar, SCC_BLUE, 0, C_NONE}, {"SILVER", EmitSingleChar, SCC_SILVER, 0, C_NONE}, {"GOLD", EmitSingleChar, SCC_GOLD, 0, C_NONE},
--- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -176,7 +176,7 @@ { /* allocate new dib section of the new size */ if (AllocateDibSection(w, h)) { - /* mark all palette colors dirty */ + /* mark all palette colours dirty */ _cur_palette.first_dirty = 0; _cur_palette.count_dirty = 256; _local_palette = _cur_palette;