From bafea078f2747fc994c05998386932a50dab28a1 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 16 Jul 2008 16:05:52 +0000 Subject: [PATCH] (svn r13710) [0.6] -Prepare: for 0.6.2-RC1. --- changelog.txt | 3 +-- known-bugs.txt | 1 + os/debian/changelog | 6 ++++++ os/win32/installer/install.nsi | 4 ++-- readme.txt | 4 ++-- src/tunnelbridge_cmd.cpp | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/changelog.txt b/changelog.txt index 344ecf28ed..529d0bfdf5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,4 @@ -0.6.2-RC1 (2008-??-??) +0.6.2-RC1 (2008-07-16) ------------------------------------------------------------------------ - Fix: Possible buffer overflow in string truncation code (r13700) - Fix: Handle SETX(Y) properly when truncating a string instead of ignoring it and returning a too long string (r13699) @@ -14,7 +14,6 @@ - Fix: Server crashing when banning the rconning client (r13661) - Fix: Signals were not updated correctly when a player removed a non-existing track piece (r13626) - Fix: Crash when one tries to raise the nothern corner of MP_VOID tiles (i.e. the southern corner of the tiles on the southern map edge) in the scenario editor [FS#2106] (r13624) -X 13623 make things look nicer - Fix: Only the front of a RV would be considered when determining to what cargos a vehicle can be refitted instead of all cargos [FS#2109] (r13622) - Fix: If the first bridge can not be build for a given length, then none of the other bridges can. Effectively meaning that if someone replaces the first bridge with a bridge that can be only 3 tiles longs then only other bridges that can be 3 tiles long will be buildable, but only if they are 3 tiles long [FS#2100] (r13611) - Fix: Signal states could be propagated through waypoints built in orthogonal axis (r13589) diff --git a/known-bugs.txt b/known-bugs.txt index 852a73b50a..903bd1c208 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -15,6 +15,7 @@ Bugs for 0.6.1 ------------------------------------------------------------------------ URL: http://bugs.openttd.org +- 2129 Strings from message boxes could sometimes change (e.g. the screenshot filename) - 2085 Vehicle list of shared vehicles without orders not possible - 1944 Road vehicles not picking empty drivethrough platform - 1923 Unique names not always enforced diff --git a/os/debian/changelog b/os/debian/changelog index 2ae9359557..4a8f4651c1 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (0.6.2~RC1-1) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Wed, 16 Jul 2008 19:45:00 +0200 + openttd (0.6.1-1) unstable; urgency=low * New upstream release. diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index a31b8a9cf1..989fc61a56 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -1,6 +1,6 @@ !define APPNAME "OpenTTD" ; Define application name -!define APPVERSION "0.6.1" ; Define application version -!define INSTALLERVERSION 48 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! +!define APPVERSION "0.6.2" ; Define application version +!define INSTALLERVERSION 49 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!! !define APPURLLINK "http://www.openttd.org" !define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}" diff --git a/readme.txt b/readme.txt index 49e314c7a3..afe668ea26 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD README -Last updated: 2008-06-01 -Release version: 0.6.1 +Last updated: 2008-07-16 +Release version: 0.6.2-RC1 ------------------------------------------------------------------------ diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 1080fe6a25..e3f9361cee 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -155,7 +155,7 @@ static CommandCost CheckBridgeSlopeSouth(Axis axis, Slope *tileh, uint *z) bool CheckBridge_Stuff(BridgeType bridge_type, uint bridge_len, uint32 flags) { if (flags & DC_QUERY_COST) { - return bridge_len <= (_patches.longbridges ? 100 : 16); + return bridge_len <= (_patches.longbridges ? 100U : 16U); } if (bridge_type >= MAX_BRIDGES) return false;