gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23527) -Codechange: unify colo(u)r as far as it goes

Browse Source
This commit is contained in:
rubidium 2011-12-15 22:02:00 +00:00
parent 3d88c74389
commit fd559171b4
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_callbacks.h
View File

@ -311,7 +311,7 @@ enum HouseCallbackMask {
CBM_HOUSE_ANIMATION_NEXT_FRAME = 1, ///< decides next animation frame CBM_HOUSE_ANIMATION_NEXT_FRAME = 1, ///< decides next animation frame
CBM_HOUSE_ANIMATION_START_STOP = 2, ///< periodically start/stop the animation 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_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_CARGO_ACCEPTANCE = 5, ///< decides amount of cargo acceptance
CBM_HOUSE_ANIMATION_SPEED = 6, ///< decides animation speed CBM_HOUSE_ANIMATION_SPEED = 6, ///< decides animation speed
CBM_HOUSE_DESTRUCTION = 7, ///< trigger destruction of building CBM_HOUSE_DESTRUCTION = 7, ///< trigger destruction of building
@ -377,7 +377,7 @@ enum ObjectCallbackMask {
CBM_OBJ_SLOPE_CHECK = 0, ///< decides slope suitability CBM_OBJ_SLOPE_CHECK = 0, ///< decides slope suitability
CBM_OBJ_ANIMATION_NEXT_FRAME = 1, ///< decides next animation frame CBM_OBJ_ANIMATION_NEXT_FRAME = 1, ///< decides next animation frame
CBM_OBJ_ANIMATION_SPEED = 2, ///< decides animation speed 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_FUND_MORE_TEXT = 4, ///< additional text in fund window
CBM_OBJ_AUTOSLOPE = 5, ///< decides allowance of autosloping CBM_OBJ_AUTOSLOPE = 5, ///< decides allowance of autosloping
}; };

4
src/spriteloader/png.cpp
View File

@ -191,8 +191,8 @@ static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 i
dst[x].b = 0; dst[x].b = 0;
/* Alpha channel is used from the original image (to allow transparency in remap colours) */ /* Alpha channel is used from the original image (to allow transparency in remap colours) */
extern const byte _palmap_w2d[]; extern const byte _palmap_w2d[];
byte color = row_pointer[x * sizeof(uint8)]; byte colour = row_pointer[x * sizeof(uint8)];
dst[x].m = win_palette ? _palmap_w2d[color] : color; dst[x].m = win_palette ? _palmap_w2d[colour] : colour;
} }
} else { } else {
dst[x].r = row_pointer[x * sizeof(uint32) + 0]; dst[x].r = row_pointer[x * sizeof(uint32) + 0];

2
src/table/strgen_tables.h
View File

@ -38,7 +38,7 @@ static const CmdStruct _cmd_structs[] = {
{"TINY_FONT", EmitSingleChar, SCC_TINYFONT, 0, C_NONE}, {"TINY_FONT", EmitSingleChar, SCC_TINYFONT, 0, C_NONE},
{"BIG_FONT", EmitSingleChar, SCC_BIGFONT, 0, C_NONE}, {"BIG_FONT", EmitSingleChar, SCC_BIGFONT, 0, C_NONE},
/* Colors */ /* Colours */
{"BLUE", EmitSingleChar, SCC_BLUE, 0, C_NONE}, {"BLUE", EmitSingleChar, SCC_BLUE, 0, C_NONE},
{"SILVER", EmitSingleChar, SCC_SILVER, 0, C_NONE}, {"SILVER", EmitSingleChar, SCC_SILVER, 0, C_NONE},
{"GOLD", EmitSingleChar, SCC_GOLD, 0, C_NONE}, {"GOLD", EmitSingleChar, SCC_GOLD, 0, C_NONE},

2
src/video/win32_v.cpp
View File

@ -176,7 +176,7 @@ static void ClientSizeChanged(int w, int h)
{ {
/* allocate new dib section of the new size */ /* allocate new dib section of the new size */
if (AllocateDibSection(w, h)) { if (AllocateDibSection(w, h)) {
/* mark all palette colors dirty */ /* mark all palette colours dirty */
_cur_palette.first_dirty = 0; _cur_palette.first_dirty = 0;
_cur_palette.count_dirty = 256; _cur_palette.count_dirty = 256;
_local_palette = _cur_palette; _local_palette = _cur_palette;