--- a/src/newgrf_fsmports.cpp Mon Aug 27 16:28:33 2007 +0000
+++ b/src/newgrf_fsmports.cpp Sun Sep 02 11:58:58 2007 +0000
@@ -315,7 +315,7 @@
uint32 value = 0;
for (cargo_type = 0; cargo_type < NUM_CARGO; cargo_type++) {
- if (st->goods[cargo_type].acceptance) SETBIT(value, cargo_type);
+ if (HASBIT(st->goods[cargo_type].acceptance_pickup, GoodsEntry::ACCEPTANCE)) SETBIT(value, cargo_type);
}
return value;
}
@@ -350,7 +350,7 @@
case 0x62: return ge->rating;
case 0x63: return ge->cargo.DaysInTransit();
case 0x64: return ge->last_speed | (ge->last_age << 8);
- case 0x65: return ge->acceptance << 3;
+ case 0x65: return GB(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE, 1) << 3;
}
}
@@ -359,7 +359,7 @@
const GoodsEntry *g = &st->goods[GB(variable - 0x8C, 3, 4)];
switch (GB(variable - 0x8C, 0, 3)) {
case 0: return g->cargo.Count();
- case 1: return GB(min(g->cargo.Count(), 4095), 0, 4) | (g->acceptance << 7);
+ case 1: return GB(min(g->cargo.Count(), 4095), 0, 4) | (GB(g->acceptance_pickup, GoodsEntry::ACCEPTANCE, 1) << 7);
case 2: return g->days_since_pickup;
case 3: return g->rating;
case 4: return g->cargo.Source();