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/vehicle_gui.cpp | |
parent | d96333b7c3ad8a1cb940f51f5ce510393158a479 (diff) | |
download | openttd-64bafcbe182ef539a31ffed9bd1f19ca0f7ae62a.tar.xz |
(svn r17534) -Codechange: unify the naming of callback masks/flags
Diffstat (limited to 'src/vehicle_gui.cpp')
-rw-r--r-- | src/vehicle_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index efb13681d..b25e02400 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -163,7 +163,7 @@ static RefitList *BuildRefitList(const Vehicle *v) do { uint32 cmask = EngInfo(u->engine_type)->refit_mask; - byte callbackmask = EngInfo(u->engine_type)->callbackmask; + byte callback_mask = EngInfo(u->engine_type)->callback_mask; /* Skip this engine if it has no capacity */ if (u->cargo_cap == 0) continue; @@ -174,7 +174,7 @@ static RefitList *BuildRefitList(const Vehicle *v) if (!HasBit(cmask, cid)) continue; /* Check the vehicle's callback mask for cargo suffixes */ - if (HasBit(callbackmask, CBM_VEHICLE_CARGO_SUFFIX)) { + if (HasBit(callback_mask, CBM_VEHICLE_CARGO_SUFFIX)) { /* Make a note of the original cargo type. It has to be * changed to test the cargo & subtype... */ CargoID temp_cargo = u->cargo_type; @@ -495,7 +495,7 @@ uint ShowRefitOptionsList(int left, int right, int y, EngineID engine) /** Get the cargo subtype text from NewGRF for the vehicle details window. */ StringID GetCargoSubtypeText(const Vehicle *v) { - if (HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_CARGO_SUFFIX)) { + if (HasBit(EngInfo(v->engine_type)->callback_mask, CBM_VEHICLE_CARGO_SUFFIX)) { uint16 cb = GetVehicleCallback(CBID_VEHICLE_CARGO_SUFFIX, 0, 0, v->engine_type, v); if (cb != CALLBACK_FAILED) { return GetGRFStringID(GetEngineGRFID(v->engine_type), 0xD000 + cb); |