From ad37641fee350f2aa629690f053434419c786e4f Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 31 Mar 2011 21:16:12 +0000 Subject: [PATCH] (svn r22281) [1.1] -Backport from trunk: - Fix: In the scenario editor you could build a ship depot using the appropriate hotkey. Removing that depot causes an assertion to trigger [FS#4558] (r22266) [1.1] -Prepare: 1.1.0 --- changelog.txt | 21 +++++++++++++-------- known-bugs.txt | 4 ++-- os/debian/changelog | 6 ++++++ os/os2/installer/make_installer.cmd | 2 +- os/windows/installer/install.nsi | 4 ++-- readme.txt | 8 ++++---- src/dock_gui.cpp | 4 ++-- 7 files changed, 30 insertions(+), 19 deletions(-) diff --git a/changelog.txt b/changelog.txt index 07836fd9cb..9d7ac29f79 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,11 @@ +1.1.0 (2011-04-01) +------------------------------------------------------------------------ +- Fix: In the scenario editor you could build a ship depot using the appropriate hotkey. Removing that depot causes an assertion to trigger [FS#4558] (r22266) + + 1.1.0-RC3 (2011-03-18) ------------------------------------------------------------------------ -- Fix: New game settings were applied to early when starting a game via a heightmap. [FS#4557] (r22259) +- Fix: New game settings were applied too early when starting a game via a heightmap [FS#4557] (r22259) - Fix: Do not resort town, industry and signs list directly in OnInvalidateData(). There might be a scheduled rebuild which needs execution first. So, only set a trigger for resorting [FS#4546] (r22249, r22248, r22247, r22246, r22245, r22244, r22243, r22242, r22241, r22236, r22228, r22227, r22226) - Fix: [NewGRF] Object variable 0x48 was not available in callback 0x15C (r22231) - Fix: Compilation when compiling with --disable-ai (r22222) @@ -319,7 +324,7 @@ - Change: Limit the number of exceptions in the refittable cargo list to 7 (r21083) - Change: Reduce the chances to accidentally break savegames with NewGRFs by limiting loading of savegames that miss NewGRFs or change NewGRF settings in-game [FS#3012] (r21116) - Change: Tuned realistic acceleration to be a bit more realistic in order to make acceleration 'slower', which highlights the differences between vehicle types more (r21106) -- Change: Do not make client reconnect waiting time depend on the company; in coop games that does not spread clients at all, and most companies have a low number causing it not to be spread out either. Use the ClientID instead. (r21008) +- Change: Do not make client reconnect waiting time depend on the company; in coop games that does not spread clients at all, and most companies have a low number causing it not to be spread out either. Use the ClientID instead (r21008) - Change: Add installing options or rather options to not install certain documentation, in a similar way to GRFCodec/catcodec (r20999) - Change: Only display liveries in the livery window if they are used by some vehicle somewhen (r20849) - Change: [NoAI] Rename AIAbstractList to AIList (r20563) @@ -753,7 +758,7 @@ - Fix: Report a more useful error when failing to build a bubble generator (r19137) - Fix: Resize station cargo widget when needed to display all accepted cargo types [FS#3617] (r19123) - Fix: [NewGRF] Industry property 0x17 was interpreted incorrectly and in some cases circumvented the density difficulty setting (r19120) -- Fix: removing towns (in the scenario editor) that had stations/depots refer to them or vehicles were on the town's road could cause a crash [FS#3616] (r19119) +- Fix: Removing towns (in the scenario editor) that had stations/depots refer to them or vehicles were on the town's road could cause a crash [FS#3616] (r19119) - Fix: In the order window the Non-stop dropdown was not enabled for depot and waypoint orders and some buttons were raised too soon [FS#3593] (r19118, r19117) - Fix: Do not crash on broken lng file and prevent it from happening again [FS#3611] (r19113, r19112) - Fix: Not all news data was properly freed when starting a new game [FS#3614] (r19105) @@ -2909,7 +2914,7 @@ - Fix: Certain resolutions caused a crash when minimap was partly dragged outside the game window (r2424) - Fix: Deleting canals under bridges removed bridges first in certain configurations (r2436) - Fix: [NPF] Vehicles try to drive into a tunnel entrance from above (r2471) -- Fix: [NewGRF] Some road vehicle action 0 properties were loaded as the wrong type (int8,int16,int32) causing undefined results. (like cargo types being wrong) (r2474) +- Fix: [NewGRF] Some road vehicle action 0 properties were loaded as the wrong type (int8, int16, int32) causing undefined results, like cargo types being wrong (r2474) - Fix: The console variable autoclean_unprotected was linked to the variable _network_autoclean_protected (r2498) - Fix: Old bug in the PCX writer: The first pixel column contained garbage, the picture was shifted one to the right, and the last column was dropped (r2512) - Fix: Using the mouse wheel could lead to a crash if mouse was not over a widget (r2530) @@ -2975,9 +2980,9 @@ - Fix: Disallow building an oil rig above sea level (r3416) - Fix: When removing a town-owned tunnel the player's rating was not reduced (r3418) - Fix: (Possible) game crash on removing track/road under bridge if a vehicle was on the track/road under the bridge and the track/road sloped (r3419) -- Fix: [NewGRF] Only power should decide whether a rail vehicle is an engine or a wagon. (fixes SHIKI 810 in jpsetw.grf) (r3424) +- Fix: [NewGRF] Only power should decide whether a rail vehicle is an engine or a wagon (r3424) - Fix: Incorrect validating of tree-planting command which can allow a buffer-overflow (r3446) -- Fix: [NewGRF] When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index. (fixes tropicstw.grf) (r3449) +- Fix: [NewGRF] When changing the sprite ID of a vehicle, if it is not FD (custom graphics), the value needs to changed from a 16bit array offset to an array index (r3449) - Fix: You could not remove an item from a list-type of config ingame from the configuration file (r3475) - Fix: [NewGRF] Always reinitialize the TTDPatch flags as patch settings may have changed (r3486) - Fix: Price for demolishing a bridge was dependent on orientation and map size (r3487) @@ -3161,7 +3166,7 @@ - Fix: Destroyed train locks crossings [SF#1105112] - Fix: Upgrade rail fails when train under bridge [SF#1105281] - Fix: Trains do not think they're on a slope any more while they drive around in a tunnel [SF#1105959] -- Fix: Buoys can now only be removed if no ship has it in their schedule. (This makes buoys more useable in multiplayer games again, as buoys cannot be deleted by other players if they are used.) [SF#1105963] +- Fix: Buoys can now only be removed if no ship has it in their schedule. This makes buoys more useable in multiplayer games again, as buoys cannot be deleted by other players if they are used [SF#1105963] - Fix: Graph's keys get confused [SF#1106354] - Fix: Placing signals with 2x1 drags is treated as placing a single signal [SF#1106930] - Fix: Console ignoring return character occasionally [SF#1107350] @@ -3261,7 +3266,7 @@ - Fix: Vehicles slow down under bridge if the track is on a foundation - Fix: You can no longer change name of waypoints whom are owned by somebody else - Fix: Shares are now also sold when a company goes bankrupt [SF#1090313] -- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station. (even more: trains do no longer enter tiles that do not belong to his owner) [SF#1087701] +- Fix: It is no longer possible to crash trains of other companies by building a depot close to a station; trains do no longer enter tiles that do not belong to his owner [SF#1087701] - Fix: Crashed trains are not reported to have too few orders any more [SF#1087403] - Fix: Backup-order-list was not closed with an OT_NOTHING, [SF#1086375] - Fix: Docks now have a button to display the catchment area [SF#1085255] diff --git a/known-bugs.txt b/known-bugs.txt index 546911f777..499801c256 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2011-03-18 -Release version: 1.1.0-RC3 +Last updated: 2011-04-01 +Release version: 1.1.0 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 8e2cd6e16d..977c716048 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.1.0) unstable; urgency=low + + * New upstream release 1.1.0 + + -- Matthijs Kooijman Fri, 01 Apr 2011 00:00:00 +0100 + openttd (1.1.0~RC3) unstable; urgency=low * New upstream release 1.1.0-RC3 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index 93decd5a60..d1e7810b2a 100644 --- a/os/os2/installer/make_installer.cmd +++ b/os/os2/installer/make_installer.cmd @@ -1,6 +1,6 @@ @echo off -set OPENTTD_VERSION=1.1.0-RC3 +set OPENTTD_VERSION=1.1.0 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 5dce8985f9..a913938a1a 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 1 !define APPV_MAINT 0 -!define APPV_BUILD 7 -!define APPV_EXTRA "-RC3" +!define APPV_BUILD 8 +!define APPV_EXTRA "" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/readme.txt b/readme.txt index bdcf39fef8..d666b5d69e 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD readme -Last updated: 2011-03-18 -Release version: 1.1.0-RC3 +Last updated: 2011-04-01 +Release version: 1.1.0 ------------------------------------------------------------------------ @@ -445,9 +445,9 @@ you remove the graphics file using "make maintainer-clean". The following compilers are known to compile OpenTTD: - Microsoft Visual C++ (MSVC) 2005, 2008 and 2010. Version 2005 gives bogus warnings about scoping issues. - - GNU Compiler Collection (GCC) 3.3 - 4.6. + - GNU Compiler Collection (GCC) 3.3 - 4.7. Versions 4.1 and earlier give bogus warnings about uninitialised variables. - Versions 4.4 and later give bogus warnings about freeing heap objects. + Versions 4.4 and later give bogus warnings about freeing non-heap objects. - Intel C++ Compiler (ICC) 12.0. The following compilers are known not to compile OpenTTD: diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp index f7c50fc6af..a098a267ac 100644 --- a/src/dock_gui.cpp +++ b/src/dock_gui.cpp @@ -136,7 +136,6 @@ struct BuildDocksToolbarWindow : Window { virtual void OnClick(Point pt, int widget, int click_count) { - this->last_clicked_widget = (DockToolbarWidgets)widget; switch (widget) { case DTW_CANAL: // Build canal button HandlePlacePushButton(this, DTW_CANAL, SPR_CURSOR_CANAL, HT_RECT); @@ -174,8 +173,9 @@ struct BuildDocksToolbarWindow : Window { HandlePlacePushButton(this, DTW_BUILD_AQUEDUCT, SPR_CURSOR_AQUEDUCT, HT_SPECIAL); break; - default: break; + default: return; } + this->last_clicked_widget = (DockToolbarWidgets)widget; } virtual EventState OnKeyPress(uint16 key, uint16 keycode)