From 5931faeff6afd9c9a76410aa756f3dc4effed29d Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 12 May 2013 11:53:53 +0000 Subject: [PATCH] (svn r25235) -Fix [FS#5543]: keep all cargo whenever cancelling reservations (fonsinchen) --- bin/baseset/orig_dos.obg | 1 + bin/baseset/orig_dos_de.obg | 1 + bin/baseset/orig_win.obg | 1 + src/vehicle.cpp | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/baseset/orig_dos.obg b/bin/baseset/orig_dos.obg index 895561adb5..887e2dd2f9 100644 --- a/bin/baseset/orig_dos.obg +++ b/bin/baseset/orig_dos.obg @@ -25,6 +25,7 @@ description.et_EE = Algse Transport Tycoon Deluxe DOSi versiooni graafika. 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. diff --git a/bin/baseset/orig_dos_de.obg b/bin/baseset/orig_dos_de.obg index c5c04047fb..c3d4748520 100644 --- a/bin/baseset/orig_dos_de.obg +++ b/bin/baseset/orig_dos_de.obg @@ -25,6 +25,7 @@ description.et_EE = Algse Transport Tycoon Deluxe DOSi (Saksa) versiooni graafik 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). diff --git a/bin/baseset/orig_win.obg b/bin/baseset/orig_win.obg index 1f125fbd3c..6cf7ccad79 100644 --- a/bin/baseset/orig_win.obg +++ b/bin/baseset/orig_win.obg @@ -25,6 +25,7 @@ description.et_EE = Algse Transport Tycoon Deluxe Windowsi versiooni graafika. 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. diff --git a/src/vehicle.cpp b/src/vehicle.cpp index b6545e2ca2..b209092fbd 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2025,8 +2025,8 @@ void Vehicle::CancelReservation(Station *st) 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(); } }