equal
deleted
inserted
replaced
1228 } |
1228 } |
1229 } |
1229 } |
1230 return false; |
1230 return false; |
1231 } |
1231 } |
1232 |
1232 |
1233 static int32 DeliverGoods(int num_pieces, CargoID cargo_type, uint16 source, uint16 dest, byte days_in_transit) |
1233 static int32 DeliverGoods(int num_pieces, CargoID cargo_type, StationID source, StationID dest, byte days_in_transit) |
1234 { |
1234 { |
1235 bool subsidised; |
1235 bool subsidised; |
1236 Station *s_from, *s_to; |
1236 Station *s_from, *s_to; |
1237 int32 profit; |
1237 int32 profit; |
1238 |
1238 |
1338 int v_profit; //virtual profit for feeder systems |
1338 int v_profit; //virtual profit for feeder systems |
1339 int v_profit_total = 0; |
1339 int v_profit_total = 0; |
1340 int unloading_time = 20; |
1340 int unloading_time = 20; |
1341 Vehicle *u = v; |
1341 Vehicle *u = v; |
1342 int result = 0; |
1342 int result = 0; |
1343 uint16 last_visited; |
1343 StationID last_visited; |
1344 Station *st; |
1344 Station *st; |
1345 int t; |
1345 int t; |
1346 uint count, cap; |
1346 uint count, cap; |
1347 PlayerID old_player; |
1347 PlayerID old_player; |
1348 bool completely_empty = true; |
1348 bool completely_empty = true; |