dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r12617) -Codechange: add type safety to the Order's load and unload types.

Browse Source
This commit is contained in:
rubidium
2008-04-07 20:03:46 +00:00
parent 42a66ef990
commit d74c6ffb62
9 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry_cmd.cpp
View File

@@ -1968,13 +1968,13 @@ int WhoCanServiceIndustry(Industry* ind)
*/
const Order *o;
FOR_VEHICLE_ORDERS(v, o) {
if (o->IsType(OT_GOTO_STATION) && !HasBit(o->GetUnloadType(), OF_TRANSFER)) {
if (o->IsType(OT_GOTO_STATION) && !(o->GetUnloadType() & OUFB_TRANSFER)) {
/* Vehicle visits a station to load or unload */
Station *st = GetStation(o->GetDestination());
if (!st->IsValid()) continue;
/* Same cargo produced by industry is dropped here => not serviced by vehicle v */
if (HasBit(o->GetUnloadType(), OF_UNLOAD) && !c_accepts) break;
if ((o->GetUnloadType() & OUFB_UNLOAD) && !c_accepts) break;
if (stations.find(st) != stations.end()) {
if (v->owner == _local_player) return 2; // Player services industry