Mercurial > hg > openttd

changeset 7276:09ed8c0bd0ed draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r10606) -Fix (r8826): plural and single cargo names were mixed up.
author peter1138 <peter1138@openttd.org>
date Tue, 17 Jul 2007 20:32:27 +0000
parents 0657179a042c
children 6ed0f59b1fd7
files src/cargotype.h src/newgrf.cpp
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -33,8 +33,8 @@
 	uint16 multipliertowngrowth;
 	uint8 callback_mask;
 
+	StringID name_plural;
 	StringID name;
-	StringID name_plural;
 	StringID units_volume;
 	StringID quantifier;
 	StringID abbrev;
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1532,13 +1532,13 @@
 				break;
 
 			case 0x09: /* String ID for cargo type name */
+				cs->name_plural = grf_load_word(&buf);
+				break;
+
+			case 0x0A: /* String for 1 unit of cargo */
 				cs->name = grf_load_word(&buf);
 				break;
 
-			case 0x0A: /* String for cargo name, plural */
-				cs->name_plural = grf_load_word(&buf);
-				break;
-
 			case 0x0B:
 				/* String for units of cargo. This is different in OpenTTD to TTDPatch
 				 * (e.g. 10 tonnes of coal) */