Mercurial > hg > openttd
diff src/economy.cpp @ 7166:bf9443176c10 draft
(svn r10440) -Fix: CBM_IND defines bits to be set, not bitsets.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 04 Jul 2007 22:18:33 +0000 (2007-07-04) |
| parents | c3b231638b80 |
| children | 8cb30c91ffd4 |
line wrap: on
line diff
--- a/src/economy.cpp +++ b/src/economy.cpp @@ -1237,11 +1237,9 @@ uint16 callback = indspec->callback_flags; best->was_cargo_delivered = true; - if (callback & (CBM_IND_PRODUCTION_CARGO_ARRIVAL | CBM_IND_PRODUCTION_256_TICKS)) { + if (HASBIT(callback, CBM_IND_PRODUCTION_CARGO_ARRIVAL) || HASBIT(callback, CBM_IND_PRODUCTION_256_TICKS)) { best->incoming_cargo_waiting[accepted_cargo_index] = min(num_pieces + best->incoming_cargo_waiting[accepted_cargo_index], 0xFFFF); - if (callback & CBM_IND_PRODUCTION_CARGO_ARRIVAL) { - /** @todo Perform some magic */ - } + if (HASBIT(callback, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) ///< @todo Perform some magic } else { best->produced_cargo_waiting[0] = min(best->produced_cargo_waiting[0] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][0] / 256), 0xFFFF); best->produced_cargo_waiting[1] = min(best->produced_cargo_waiting[1] + (num_pieces * indspec->input_cargo_multiplier[accepted_cargo_index][1] / 256), 0xFFFF);