summaryrefslogtreecommitdiff
path: root/src/station_cmd.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-26 09:25:00 +0000
committerrubidium <rubidium@openttd.org>2009-07-26 09:25:00 +0000
commit5b576e6e7a200eda8f1ef05254133591d32f2e27 (patch)
treef7ce5b0957e629b9d3359069164a0e3e2f0139ee /src/station_cmd.cpp
parent83b61a75c379d64a0bc856a4fa312fc9f0608c67 (diff)
downloadopenttd-5b576e6e7a200eda8f1ef05254133591d32f2e27.tar.xz
(svn r16959) -Codechange: make the station joiner a bit more aware of the difference between waypoints and stations.
Diffstat (limited to 'src/station_cmd.cpp')
-rw-r--r--src/station_cmd.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index e5d021597..6c783780a 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -551,8 +551,8 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
/* Make sure the station can accept the goods type. */
bool is_passengers = IsCargoInClass(i, CC_PASSENGERS);
- if ((!is_passengers && !(st->facilities & (byte)~FACIL_BUS_STOP)) ||
- (is_passengers && !(st->facilities & (byte)~FACIL_TRUCK_STOP))) {
+ if ((!is_passengers && !(st->facilities & ~FACIL_BUS_STOP)) ||
+ (is_passengers && !(st->facilities & ~FACIL_TRUCK_STOP))) {
amt = 0;
}
@@ -564,7 +564,7 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
if (old_acc == new_acc) return;
/* show a message to report that the acceptance was changed? */
- if (show_msg && st->owner == _local_company && st->facilities) {
+ if (show_msg && st->owner == _local_company && st->IsInUse()) {
/* List of accept and reject strings for different number of
* cargo types */
static const StringID accept_msg[] = {