Mercurial > hg > openttd

changeset 3955:c91e5bc727c6 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r5104) - When refitting a vehicle to its existing cargo type, don't lose the cargo onboard (useful when adding wagons to a train)
author peter1138 <peter1138@openttd.org>
date Sun, 04 Jun 2006 17:49:16 +0000
parents f497c1dc3266
children 0cfc02cf7402
files aircraft_cmd.c ship_cmd.c train_cmd.c
diffstat 3 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -538,7 +538,13 @@
 		u = v->next;
 		mail = (new_cid != CT_PASSENGERS) ? 0 : avi->mail_capacity;
 		u->cargo_cap = mail;
-		v->cargo_count = u->cargo_count = 0;
+		if (v->cargo_type == new_cid) {
+			v->cargo_count = min(pass, v->cargo_count);
+			u->cargo_count = min(mail, u->cargo_count);
+		} else {
+			v->cargo_count = 0;
+			u->cargo_count = 0;
+		}
 		v->cargo_type = new_cid;
 		v->cargo_subtype = new_subtype;
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -1061,7 +1061,7 @@
 	}
 
 	if (flags & DC_EXEC) {
-		v->cargo_count = 0;
+		v->cargo_count = (v->cargo_type == new_cid) ? min(v->cargo_cap, v->cargo_count) : 0;
 		v->cargo_type = new_cid;
 		v->cargo_subtype = new_subtype;
 		InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -1789,7 +1789,7 @@
 				if (new_cid != v->cargo_type) cost += _price.build_railvehicle >> 8;
 				num += amount;
 				if (flags & DC_EXEC) {
-					v->cargo_count = 0;
+					v->cargo_count = (v->cargo_type == new_cid) ? min(amount, v->cargo_count) : 0;
 					v->cargo_type = new_cid;
 					v->cargo_cap = amount;
 					v->cargo_subtype = new_subtype;