(svn r24305) [1.2] -Backport from trunk:

- Fix: [Script] ScriptTown::GetGrowthRate() returned wrong values after usage of SetGrowthRate() (r24302)
[1.2] -Update: documentation

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)

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

os/debian/changelog

@@ -1,3 +1,9 @@
+openttd (1.2.1) unstable; urgency=low
+
+  * New upstream release 1.2.1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 01 Jun 2012 00:00:00 +0200
+
 openttd (1.2.1~RC1) unstable; urgency=low
 
   * New upstream release 1.2.1-RC1

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

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

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
 ------------------------------------------------------------------------
 
 

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)