summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-10-30 15:50:08 +0000
committerbjarni <bjarni@openttd.org>2005-10-30 15:50:08 +0000
commit1ef02f8cca326961fb5ca2ca462844bffdca9a96 (patch)
treeb3b54df1ff64a71d4130acde4defc156143f4f5b
parentc406487b141a604e73184bf42d8533f740d27014 (diff)
downloadopenttd-1ef02f8cca326961fb5ca2ca462844bffdca9a96.tar.xz
(svn r3105) readded 2 line that should not have been removed in last commit(3104). Now cargo are removed when refitting (like it should)
-rw-r--r--aircraft_cmd.c1
-rw-r--r--ship_cmd.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c
index 9fb0d3cda..545a9f92e 100644
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -550,6 +550,7 @@ int32 CmdRefitAircraft(int x, int y, uint32 flags, uint32 p1, uint32 p2)
u = v->next;
mail = (new_cid != CT_PASSENGERS) ? 0 : avi->mail_capacity;
u->cargo_cap = mail;
+ v->cargo_count = u->cargo_count = 0;
v->cargo_type = new_cid;
InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
}
diff --git a/ship_cmd.c b/ship_cmd.c
index a75394e74..30f68c014 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -1092,6 +1092,7 @@ int32 CmdRefitShip(int x, int y, uint32 flags, uint32 p1, uint32 p2)
}
if (flags & DC_EXEC) {
+ v->cargo_count = 0;
v->cargo_type = new_cid;
InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
}