From bcc93b45bc7a2a6e01047cc30101e2528868065d Mon Sep 17 00:00:00 2001
From: peter1138 <peter1138@openttd.org>
Date: Tue, 17 Jul 2007 20:32:27 +0000
Subject: [PATCH] (svn r10606) -Fix (r8826): plural and single cargo names were
 mixed up.

---
 src/cargotype.h | 2 +-
 src/newgrf.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cargotype.h b/src/cargotype.h
index 347f09427d..b7a18c8b4f 100644
--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -33,8 +33,8 @@ struct CargoSpec {
 	uint16 multipliertowngrowth;
 	uint8 callback_mask;
 
-	StringID name;
 	StringID name_plural;
+	StringID name;
 	StringID units_volume;
 	StringID quantifier;
 	StringID abbrev;
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 6c74edc0a3..1c53d34a11 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1532,11 +1532,11 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
 				break;
 
 			case 0x09: /* String ID for cargo type name */
-				cs->name = grf_load_word(&buf);
+				cs->name_plural = grf_load_word(&buf);
 				break;
 
-			case 0x0A: /* String for cargo name, plural */
-				cs->name_plural = grf_load_word(&buf);
+			case 0x0A: /* String for 1 unit of cargo */
+				cs->name = grf_load_word(&buf);
 				break;
 
 			case 0x0B: