Mercurial > hg > openttd
changeset 15932:be191a471e19 draft
(svn r20620) -Codechange: rename airporttile's callback_flags to callback_mask, so it's the same for all NewGRF features with callbacks
author | rubidium <rubidium@openttd.org> |
---|---|
date | Thu, 26 Aug 2010 11:18:32 +0000 |
parents | 9f6b79adc58d |
children | 8ac5258d7680 |
files | src/newgrf.cpp src/newgrf_airporttiles.cpp src/newgrf_airporttiles.h src/table/newgrf_debug_data.h |
diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3114,8 +3114,8 @@ break; } - case 0x0E: // Callback flags - tsp->callback_flags = buf->ReadByte(); + case 0x0E: // Callback mask + tsp->callback_mask = buf->ReadByte(); break; case 0x0F: // Animation information
--- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -282,7 +282,7 @@ if (ti->tileh != SLOPE_FLAT) { bool draw_old_one = true; - if (HasBit(airts->callback_flags, CBM_AIRT_DRAW_FOUNDATIONS)) { + if (HasBit(airts->callback_mask, CBM_AIRT_DRAW_FOUNDATIONS)) { /* Called to determine the type (if any) of foundation to draw */ uint32 callback_res = GetAirportTileCallback(CBID_AIRPTILE_DRAW_FOUNDATIONS, 0, 0, gfx, st, ti->tile); draw_old_one = (callback_res != 0); @@ -310,7 +310,7 @@ const AirportTileSpec *ats = AirportTileSpec::Get(gfx); uint8 animation_speed = ats->animation_speed; - if (HasBit(ats->callback_flags, CBM_AIRT_ANIM_SPEED)) { + if (HasBit(ats->callback_mask, CBM_AIRT_ANIM_SPEED)) { uint16 callback_res = GetAirportTileCallback(CBID_AIRPTILE_ANIMATION_SPEED, 0, 0, gfx, st, tile); if (callback_res != CALLBACK_FAILED) animation_speed = Clamp(callback_res & 0xFF, 0, 16); } @@ -325,7 +325,7 @@ uint8 frame = GetStationAnimationFrame(tile); uint16 num_frames = GB(ats->animation_info, 0, 8); - if (HasBit(ats->callback_flags, CBM_AIRT_ANIM_NEXT_FRAME)) { + if (HasBit(ats->callback_mask, CBM_AIRT_ANIM_NEXT_FRAME)) { uint16 callback_res = GetAirportTileCallback(CBID_AIRPTILE_ANIM_NEXT_FRAME, HasBit(ats->animation_special_flags, 0) ? Random() : 0, 0, gfx, st, tile); if (callback_res != CALLBACK_FAILED) {
--- a/src/newgrf_airporttiles.h +++ b/src/newgrf_airporttiles.h @@ -33,7 +33,7 @@ uint8 animation_speed; ///< The speed of the animation StringID name; ///< Tile Subname string, land information on this tile will give you "AirportName (TileSubname)" - uint8 callback_flags; ///< Flags telling which grf callback is set + uint8 callback_mask; ///< Bitmask telling which grf callback is set uint8 animation_triggers; ///< When to start the animation uint8 animation_special_flags; ///< Extra flags to influence the animation bool enabled; ///< entity still available (by default true). newgrf can disable it, though
--- a/src/table/newgrf_debug_data.h +++ b/src/table/newgrf_debug_data.h @@ -341,7 +341,7 @@ /*** NewGRF airport tiles ***/ -#define NICAT(cb_id, bit) NIC(cb_id, AirportTileSpec, callback_flags, bit) +#define NICAT(cb_id, bit) NIC(cb_id, AirportTileSpec, callback_mask, bit) static const NICallback _nic_airporttiles[] = { NICAT(CBID_AIRPTILE_DRAW_FOUNDATIONS, CBM_AIRT_DRAW_FOUNDATIONS), NICAT(CBID_AIRPTILE_ANIM_START_STOP, CBM_NO_BIT),