From f39f14aceb73c4a328acab871555b38410bcbcf4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 31 Jul 2009 22:23:19 +0000 Subject: [PATCH] (svn r17009) [0.7] -Backport from trunk/prepare for release: - Fix: Vehicles would wait "very long" when they had nothing to unload and gradual loading was disabled [FS#3054] (r16933) --- changelog.txt | 5 +++++ known-bugs.txt | 3 ++- os/debian/changelog | 24 +++++++++++++++--------- os/rpm/openttd.spec | 2 +- os/win32/installer/install.nsi | 4 ++-- readme.txt | 7 +++++-- src/economy.cpp | 3 ++- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/changelog.txt b/changelog.txt index e9929ac9b0..b7d9e95bd5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +0.7.2 (2009-08-01) +------------------------------------------------------------------------ +- Fix: Vehicles would wait "very long" when they had nothing to unload and gradual loading was disabled [FS#3054] (r16933) + + 0.7.2-RC2 (2009-07-21) ------------------------------------------------------------------------ - Fix: When marking trains stuck do not reset the unload/stuck counter when the vehicle is unloading. It will be automatically reset once the vehicle wants to leave the station [FS#3038] (r16901) diff --git a/known-bugs.txt b/known-bugs.txt index 9cb5354050..76119f9690 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -11,10 +11,11 @@ by the number below on http://bugs.openttd.org. If the bug report is closed, it has been fixed, which then can be verified in the latest SVN version of /trunk. -Bugs for 0.7.1 +Bugs for 0.7.2 ------------------------------------------------------------------------ URL: http://bugs.openttd.org +- 3057 Road vehicle sometimes 'forget' the need for servicing - 3040 Not all alternatives are always shown in the "Join station" list - 2955 With path signals depots are less likely to be visited - 2891 Ignore signal does not keep the train running when in path signalled block till the next signal diff --git a/os/debian/changelog b/os/debian/changelog index 0dde30e4ec..a9cd86b6af 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,56 +1,62 @@ +openttd (0.7.2) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Sat, 01 Aug 2009 00:19:43 +0200 + openttd (0.7.2~RC2) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Tue, 21 Jul 2008 20:25:56 +0200 + -- Matthijs Kooijman Tue, 21 Jul 2009 20:25:56 +0200 openttd (0.7.2~RC1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Wed, 15 Jul 2008 22:25:56 +0200 + -- Matthijs Kooijman Wed, 15 Jul 2009 22:25:56 +0200 openttd (0.7.1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Tue, 09 Jun 2008 01:34:56 +0200 + -- Matthijs Kooijman Tue, 09 Jun 2009 01:34:56 +0200 openttd (0.7.1~RC3) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Wed, 03 Jun 2008 15:34:56 +0200 + -- Matthijs Kooijman Wed, 03 Jun 2009 15:34:56 +0200 openttd (0.7.1~RC2) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Thu, 21 Mar 2008 14:34:56 +0200 + -- Matthijs Kooijman Thu, 21 Mar 2009 14:34:56 +0200 openttd (0.7.1~RC1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Mon, 11 Mar 2008 17:34:56 +0200 + -- Matthijs Kooijman Mon, 11 Mar 2009 17:34:56 +0200 openttd (0.7.0) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Wed, 01 Apr 2008 13:37:42 +0000 + -- Matthijs Kooijman Wed, 01 Apr 2009 13:37:42 +0000 openttd (0.7.0~RC2) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Mon, 23 Mar 2008 00:42:00 +0200 + -- Matthijs Kooijman Mon, 23 Mar 2009 00:42:00 +0200 openttd (0.7.0~RC1) unstable; urgency=low * New upstream release. - -- Matthijs Kooijman Mon, 16 Mar 2008 00:07:00 +0200 + -- Matthijs Kooijman Mon, 16 Mar 2009 00:07:00 +0200 openttd (0.7.0~beta2) unstable; urgency=low diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index 93ded63443..c937c4fdf0 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -10,7 +10,7 @@ #------------------------------------------------------------------------------- Name: openttd -Version: 0.7.2-RC2 +Version: 0.7.2 Release: 1%{?dist} Group: Amusements/Games diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index ff43db47cc..d0b2c9833b 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -1,7 +1,7 @@ !define APPNAME "OpenTTD" ; Define application name -!define APPVERSION "0.7.2-RC2" ; Define application version +!define APPVERSION "0.7.2" ; Define application version !define APPVERSIONINTERNAL "0.7.2.0" ; Define application version in X.X.X.X -!define INSTALLERVERSION 64 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! +!define INSTALLERVERSION 65 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! !include ${VERSION_INCLUDE} !define APPURLLINK "http://www.openttd.org" diff --git a/readme.txt b/readme.txt index befefb41d6..a4103bdd24 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD README -Last updated: 2009-06-09 -Release version: 0.7.1 +Last updated: 2009-08-01 +Release version: 0.7.2 ------------------------------------------------------------------------ @@ -191,6 +191,9 @@ Do NOT copy files included with OpenTTD into "shared" directories (explained in the following sections) as sooner or later you will run into graphical glitches when using other versions of the game. +If you want AIs use the in-game content downloader to download some or download +some from the internet and place them in the ai/ directory. + 4.2) OpenTTD directories ---- ------------------------------- diff --git a/src/economy.cpp b/src/economy.cpp index 38b2976129..f7b01399ac 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -1800,7 +1800,8 @@ static void LoadUnloadVehicle(Vehicle *v, int *cargo_left) } } - v->load_unload_time_rem = unloading_time; + /* Always wait at least 1, otherwise we'll wait 'infinitively' long. */ + v->load_unload_time_rem = max(1, unloading_time); if (completely_emptied) { TriggerVehicle(v, VEHICLE_TRIGGER_EMPTY);