diff --git a/changelog.txt b/changelog.txt index 7ebbc67c06..e390bc3bf9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.2.1 (2012-06-01) +------------------------------------------------------------------------ +- Fix: [Script] ScriptTown::GetGrowthRate() returned wrong values after usage of SetGrowthRate() (r24302) + + 1.2.1-RC1 (2012-05-16) ------------------------------------------------------------------------ - Fix: Change the unit of the sprite-cache size setting from megabytes to megapixels, so it depends on the blitter being used. Also increase it from 64 to 128, and change the name in the cfg file, so everyone gets the new default [FS#5162] (r24252) diff --git a/known-bugs.txt b/known-bugs.txt index 4a33dd6d5a..ea76ecb951 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2012-05-16 -Release version: 1.2.1-RC1 +Last updated: 2012-06-01 +Release version: 1.2.1 ------------------------------------------------------------------------ @@ -39,7 +39,6 @@ officially supporting Mac OS X again. For now it remains unsupported and we only apply bug fixes provided by the community but we are unable to fix these bugs ourselves. -- 5154 Crash about old language when there is an error in misc settings - 4857 [OSX] No support for detecting mono space font - 4847 [OSX] No support for bootstrap downloading of base graphics - 4744 [OSX] Crash when switching to full screen with OS X Lion diff --git a/os/debian/changelog b/os/debian/changelog index 4c9ab6622a..b5efe4759c 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.2.1) unstable; urgency=low + + * New upstream release 1.2.1 + + -- Matthijs Kooijman Fri, 01 Jun 2012 00:00:00 +0200 + openttd (1.2.1~RC1) unstable; urgency=low * New upstream release 1.2.1-RC1 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index 8d65470394..c64c3f1fb9 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.2.1-RC1 +set OPENTTD_VERSION=1.2.1 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=1.2.0 diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 8722d7e9c3..58d2518705 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 2 !define APPV_MAINT 1 -!define APPV_BUILD 0 -!define APPV_EXTRA "-RC1" +!define APPV_BUILD 1 +!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 97086b5e8b..fe0cb2925f 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD readme -Last updated: 2012-05-16 -Release version: 1.2.1-RC1 +Last updated: 2012-06-01 +Release version: 1.2.1 ------------------------------------------------------------------------ diff --git a/src/script/api/script_town.cpp b/src/script/api/script_town.cpp index 0e16e905f1..31b9ed0b1c 100644 --- a/src/script/api/script_town.cpp +++ b/src/script/api/script_town.cpp @@ -152,7 +152,7 @@ const Town *t = ::Town::Get(town_id); - return (t->growth_rate * TOWN_GROWTH_TICKS + DAY_TICKS) / DAY_TICKS; + return ((t->growth_rate & ~TOWN_GROW_RATE_CUSTOM) * TOWN_GROWTH_TICKS + DAY_TICKS) / DAY_TICKS; } /* static */ int32 ScriptTown::GetDistanceManhattanToTile(TownID town_id, TileIndex tile)