From 6289bb92afb7eb752b26249f2159b7378f149db8 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Fri, 31 May 2013 20:49:00 +0000
Subject: [PATCH] (svn r25308) [1.3] -Backport from trunk: - Fix: When
 overbuilding a reserved track with a non-track station tile, that tile would
 remain reserved and eventually trigger a crash upon removal [FS#5540]
 (r25251) - Doc: Update some small parts of the readme (r25278)

---
 readme.txt          | 25 ++++++++++++-------------
 src/station_cmd.cpp |  3 +++
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/readme.txt b/readme.txt
index 5a7d3e65e4..789bb8d1bf 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,4 @@
-OpenTTD readme
-Last updated:    2013-05-18
+Last updated:    2013-05-23
 Release version: 1.3.1-RC1
 ------------------------------------------------------------------------
 
@@ -219,9 +218,9 @@ The Windows installer can optionally download and install these packages.
 4.1.2) Original Transport Tycoon Deluxe graphics and sound files
 ------ ---------------------------------------------------------
 If you want to play with the original Transport Tycoon Deluxe data files you
-have to copy the data files from the CD-ROM into the data/ directory. It does
-not matter whether you copy them from the DOS or Windows version of Transport
-Tycoon Deluxe. The Windows install can optionally copy these files.
+have to copy the data files from the CD-ROM into the baseset/ directory. It
+does not matter whether you copy them from the DOS or Windows version of
+Transport Tycoon Deluxe. The Windows install can optionally copy these files.
 You need to copy the following files:
  - sample.cat
  - trg1r.grf or TRG1.GRF
@@ -410,7 +409,6 @@ Information logged:
   original Transport Tycoon version
 * Running a modified OpenTTD build
 * Changing settings affecting NewGRF behaviour (non-network-safe settings)
-* Changing landscape (by cheat)
 * Triggering NewGRF bugs
 
 No personal information is stored.
@@ -507,10 +505,10 @@ no graphical user interface; you would be building a dedicated server.
 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.7.
+  - GNU Compiler Collection (GCC) 3.3 - 4.4, 4.6 - 4.8.
     Versions 4.1 and earlier give bogus warnings about uninitialised variables.
-    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
-    Versions 4.5 and later give invalid warnings when lto is enabled.
+    Versions 4.4, 4.6 give bogus warnings about freeing non-heap objects.
+    Versions 4.6 and later give invalid warnings when lto is enabled.
   - Intel C++ Compiler (ICC) 12.0.
   - Clang/LLVM 2.9 - 3.0
     Version 2.9 gives bogus warnings about code nonconformity.
@@ -519,6 +517,8 @@ The following compilers are known not to compile OpenTTD:
   - Microsoft Visual C++ (MSVC) 2003 and earlier.
   - GNU Compiler Collection (GCC) 3.2 and earlier.
     These old versions fail due to OpenTTD's template usage.
+  - GNU Compiler Collection (GCC) 4.5. It optimizes enums too aggressively.
+    See http://bugs.openttd.org/task/5513 and references therein.
   - Intel C++ Compiler (ICC) 11.1 and earlier.
     Version 10.0 and earlier fail a configure check and fail with recent system
         headers.
@@ -582,10 +582,9 @@ Note: Do not alter the following parts of the file:
 8.2) Previewing
 ---- ----------
 In order to view the translation in the game, you need to compile your language
-file with the strgen utility. You can download the precompiled strgen from:
-http://www.openttd.org/download-strgen
-To compile it yourself just take the normal OpenTTD sources and build that.
-During the build process the strgen utility will be made.
+file with the strgen utility. As this utility is tailored to a specific OpenTTD
+version, you need to compile it yourself. Just take the normal OpenTTD sources
+and build that. During the build process the strgen utility will be made.
 
 strgen is a command-line utility. It takes the language filename as parameter.
 Example:
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 3289f2723e..ef4567afbc 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1317,6 +1317,9 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32
 		}
 
 		TILE_AREA_LOOP(tile, update_reservation_area) {
+			/* Don't even try to make eye candy parts reserved. */
+			if (IsStationTileBlocked(tile)) continue;
+
 			DiagDirection dir = AxisToDiagDir(axis);
 			TileIndexDiff tile_offset = TileOffsByDiagDir(dir);
 			TileIndex platform_begin = tile;