Mercurial > hg > openttd

changeset 20290:fd9fdb275c47 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r25235) -Fix [FS#5543]: keep all cargo whenever cancelling reservations (fonsinchen)
author rubidium <rubidium@openttd.org>
date Sun, 12 May 2013 11:53:53 +0000 (2013-05-12)
parents 1700cda17bee
children 59d8f6944c2e
files bin/baseset/orig_dos.obg bin/baseset/orig_dos_de.obg bin/baseset/orig_win.obg src/vehicle.cpp
diffstat 4 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/bin/baseset/orig_dos.obg
+++ b/bin/baseset/orig_dos.obg
@@ -25,6 +25,7 @@
 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.
--- a/bin/baseset/orig_dos_de.obg
+++ b/bin/baseset/orig_dos_de.obg
@@ -25,6 +25,7 @@
 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).
--- a/bin/baseset/orig_win.obg
+++ b/bin/baseset/orig_win.obg
@@ -25,6 +25,7 @@
 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.
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2025,8 +2025,8 @@
 		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();
 	}
 }