cpp/openttd-patchpack/source Changeset - r20235:0987a67d114d

Changeset - r20235:0987a67d114d

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 11 years ago 2013-05-12 11:53:53
rubidium@openttd.org

(svn r25235) -Fix [FS#5543]: keep all cargo whenever cancelling reservations (fonsinchen)

4 files changed with 4 insertions and 1 deletions:

bin/baseset/orig_dos.obg

bin/baseset/orig_dos_de.obg

bin/baseset/orig_win.obg

src/vehicle.cpp

0 comments (0 inline, 0 general)

bin/baseset/orig_dos.obg

➞

Show inline comments

@@ @@ -25,6 +25,7 @@ description.et_EE = Algse Transport Tyco @@
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen DOS-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS).
 description.gd_GB = Grafaigeachd aig an deasachadh DOS tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para DOS.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS.

bin/baseset/orig_dos_de.obg

➞

Show inline comments

@@ @@ -25,6 +25,7 @@ description.et_EE = Algse Transport Tyco @@
 description.fi_FI = Alkuperäiset Saksassa julkaistun Transport Tycoon Deluxen DOS-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version DOS allemande).
 description.gd_GB = Grafaigeachd aig an deasachadh DOS (Germailteach) tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Graficos da edición orixinal (alemá) de Transport Tycoon Deluxe para DOS.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe DOS (Njemački) izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe DOS (német) verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi DOS (Jerman).

bin/baseset/orig_win.obg

➞

Show inline comments

@@ @@ -25,6 +25,7 @@ description.et_EE = Algse Transport Tyco @@
 description.fi_FI = Alkuperäiset Transport Tycoon Deluxen Windows-version grafiikat.
 description.fr_FR = Graphiques originaux de Transport Tycoon Deluxe (version Windows).
 description.gd_GB = Grafaigeachd aig an deasachadh Windows tùsail aig Transport Tycoon Deluxe.
 description.gl_ES = Graficos da edición orixinal de Transport Tycoon Deluxe para Windows.
 description.hr_HR = Originalna grafika za Transport Tycoon Deluxe Windows izdanje.
 description.hu_HU = Az eredeti Transport Tycoon Deluxe Windows verziójának grafikája.
 description.id_ID = Grafik orisinil Transport Tycoon Deluxe versi Windows.

src/vehicle.cpp

➞

Show inline comments

@@ @@ -2025,8 +2025,8 @@ void Vehicle::CancelReservation(Station @@
 		if (cargo.ActionCount(VehicleCargoList::MTA_LOAD) > 0) {
 			DEBUG(misc, 1, "cancelling cargo reservation");
 			cargo.Return(UINT_MAX, &st->goods[v->cargo_type].cargo);
 			cargo.KeepAll();
+		}
 		cargo.KeepAll();
+	}
+}

0 comments (0 inline, 0 general)