Mercurial > hg > openttd

changeset 18330:8663ea9a0fe0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23166) -Change: [NewGRF v8] Don't override rail type prop 1B with prop 09.
author michi_cc <michi_cc@openttd.org>
date Tue, 08 Nov 2011 19:23:56 +0000
parents d6e5938a5caf
children 91df70e03ed5
files src/newgrf.cpp
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -3797,10 +3797,13 @@
 				buf->ReadDWord();
 				break;
 
-			case 0x09: // Toolbar caption of railtype (sets name as well for backwards compatibility)
-				rti->strings.name = rti->strings.toolbar_caption = buf->ReadWord();
+			case 0x09: // Toolbar caption of railtype (sets name as well for backwards compatibility for grf ver < 8)
+				rti->strings.toolbar_caption = buf->ReadWord();
 				_string_to_grf_mapping[&rti->strings.toolbar_caption] = _cur.grffile->grfid;
-				_string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid;
+				if (_cur.grffile->grf_version < 8) {
+					rti->strings.name = rti->strings.toolbar_caption;
+					_string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid;
+				}
 				break;
 
 			case 0x0A: // Menu text of railtype
@@ -3883,7 +3886,7 @@
 				rti->sorting_order = buf->ReadByte();
 				break;
 
-			case 0x1B: // Name of railtype (overridden by prop 09)
+			case 0x1B: // Name of railtype (overridden by prop 09 for grf ver < 8)
 				rti->strings.name = buf->ReadWord();
 				_string_to_grf_mapping[&rti->strings.name] = _cur.grffile->grfid;
 				break;