diff options
| author | rubidium <rubidium@openttd.org> | 2010-08-26 11:18:32 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-08-26 11:18:32 +0000 |
| commit | 193800e0faef9711b48cedcf37feb896d9e0c448 (patch) | |
| tree | 87a4aea07bcd17482ecb0f9d7c89bb1baed02c37 | |
| parent | 134712ec646d02fcc8e99a8bffe7eee02d251e96 (diff) | |
| download | openttd-193800e0faef9711b48cedcf37feb896d9e0c448.tar.xz | |
(svn r20620) -Codechange: rename airporttile's callback_flags to callback_mask, so it's the same for all NewGRF features with callbacks
| -rw-r--r-- | src/newgrf.cpp | 4 | ||||
| -rw-r--r-- | src/newgrf_airporttiles.cpp | 6 | ||||
| -rw-r--r-- | src/newgrf_airporttiles.h | 2 | ||||
| -rw-r--r-- | src/table/newgrf_debug_data.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index ff881e539..c10e40638 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3114,8 +3114,8 @@ static ChangeInfoResult AirportTilesChangeInfo(uint airtid, int numinfo, int pro break; } - case 0x0E: // Callback flags - tsp->callback_flags = buf->ReadByte(); + case 0x0E: // Callback mask + tsp->callback_mask = buf->ReadByte(); break; case 0x0F: // Animation information diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp index 4b3988bb6..896f0f55f 100644 --- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -282,7 +282,7 @@ bool DrawNewAirportTile(TileInfo *ti, Station *st, StationGfx gfx, const Airport 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 @@ void AnimateAirportTile(TileIndex tile) 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 @@ void AnimateAirportTile(TileIndex tile) 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) { diff --git a/src/newgrf_airporttiles.h b/src/newgrf_airporttiles.h index 3e7979297..054451f25 100644 --- a/src/newgrf_airporttiles.h +++ b/src/newgrf_airporttiles.h @@ -33,7 +33,7 @@ struct AirportTileSpec { 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 diff --git a/src/table/newgrf_debug_data.h b/src/table/newgrf_debug_data.h index 028854891..8e3177f5d 100644 --- a/src/table/newgrf_debug_data.h +++ b/src/table/newgrf_debug_data.h @@ -341,7 +341,7 @@ static const NIFeature _nif_railtype = { /*** 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), |