Mercurial > hg > openttd

comparison src/economy.cpp @ 12384:d4b73a406cf3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r16814) -Codechange: make IsNormalAircraft() member of Aircraft
author smatz <smatz@openttd.org>
date Mon, 13 Jul 2009 16:37:27 +0000
parents 3c7e93b91c73
children 6a77d1df56e2
comparison
equal deleted inserted replaced
12383:3c7e93b91c73 12384:d4b73a406cf3
121 FOR_ALL_VEHICLES(v) { 121 FOR_ALL_VEHICLES(v) {
122 if (v->owner != owner) continue; 122 if (v->owner != owner) continue;
123 123
124 if (v->type == VEH_TRAIN || 124 if (v->type == VEH_TRAIN ||
125 v->type == VEH_ROAD || 125 v->type == VEH_ROAD ||
126 (v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) || 126 (v->type == VEH_AIRCRAFT && Aircraft::From(v)->IsNormalAircraft()) ||
127 v->type == VEH_SHIP) { 127 v->type == VEH_SHIP) {
128 value += v->value * 3 >> 1; 128 value += v->value * 3 >> 1;
129 } 129 }
130 } 130 }
131 131
1298 if (v->cargo_cap == 0) continue; 1298 if (v->cargo_cap == 0) continue;
1299 1299
1300 byte load_amount = EngInfo(v->engine_type)->load_amount; 1300 byte load_amount = EngInfo(v->engine_type)->load_amount;
1301 1301
1302 /* The default loadamount for mail is 1/4 of the load amount for passengers */ 1302 /* The default loadamount for mail is 1/4 of the load amount for passengers */
1303 if (v->type == VEH_AIRCRAFT && !IsNormalAircraft(v)) load_amount = (load_amount + 3) / 4; 1303 if (v->type == VEH_AIRCRAFT && !Aircraft::From(v)->IsNormalAircraft()) load_amount = (load_amount + 3) / 4;
1304 1304
1305 if (_settings_game.order.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) { 1305 if (_settings_game.order.gradual_loading && HasBit(EngInfo(v->engine_type)->callbackmask, CBM_VEHICLE_LOAD_AMOUNT)) {
1306 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v); 1306 uint16 cb_load_amount = GetVehicleCallback(CBID_VEHICLE_LOAD_AMOUNT, 0, 0, v->engine_type, v);
1307 if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8); 1307 if (cb_load_amount != CALLBACK_FAILED && GB(cb_load_amount, 0, 8) != 0) load_amount = GB(cb_load_amount, 0, 8);
1308 } 1308 }