diff options
| author | rubidium <rubidium@openttd.org> | 2009-09-14 12:22:57 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-09-14 12:22:57 +0000 |
| commit | 64bafcbe182ef539a31ffed9bd1f19ca0f7ae62a (patch) | |
| tree | 9684bfe8873532713641d2c70fb5315f60104565 /src/rail_gui.cpp | |
| parent | d96333b7c3ad8a1cb940f51f5ce510393158a479 (diff) | |
| download | openttd-64bafcbe182ef539a31ffed9bd1f19ca0f7ae62a.tar.xz | |
(svn r17534) -Codechange: unify the naming of callback masks/flags
Diffstat (limited to 'src/rail_gui.cpp')
| -rw-r--r-- | src/rail_gui.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 9574683bb..c1bbad7e7 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -1155,7 +1155,7 @@ public: StringID str = STR_STATION_CLASS_DFLT; if (statspec != NULL && statspec->name != 0) { - if (HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) { + if (HasBit(statspec->callback_mask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) { GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->line_height - 2, 0, FILLRECT_CHECKER); } str = statspec->name; @@ -1315,7 +1315,7 @@ public: /* Check station availability callback */ statspec = GetCustomStationSpec(_railstation.station_class, y); if (statspec != NULL && - HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && + HasBit(statspec->callback_mask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) return; _railstation.station_type = y; @@ -1795,7 +1795,7 @@ struct BuildRailWaypointWindow : PickerWindowBase { DrawWaypointSprite(this->nested_array[BRWW_WAYPOINT_1 + i]->pos_x + TILE_PIXELS, bottom - TILE_PIXELS, this->hscroll.GetPosition() + i, _cur_railtype); if (statspec != NULL && - HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && + HasBit(statspec->callback_mask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) { GfxFillRect(4 + i * 68, 18, 67 + i * 68, 75, 0, FILLRECT_CHECKER); } @@ -1816,7 +1816,7 @@ struct BuildRailWaypointWindow : PickerWindowBase { /* Check station availability callback */ const StationSpec *statspec = GetCustomStationSpec(STAT_CLASS_WAYP, type); if (statspec != NULL && - HasBit(statspec->callbackmask, CBM_STATION_AVAIL) && + HasBit(statspec->callback_mask, CBM_STATION_AVAIL) && GB(GetStationCallback(CBID_STATION_AVAILABILITY, 0, 0, statspec, NULL, INVALID_TILE), 0, 8) == 0) return; _cur_waypoint_type = type; |