cpp/openttd-patchpack/source File Diff

File diff r12404:d58b2d050240 → r12405:ba094e765533

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -237,16 +237,16 @@ public: @@
+				}
 				found = true;
 				/* If the accepted value is less than 8, show it in 1/8:ths */
 				if (acceptance[i] < 8) {
 					SetDParam(0, acceptance[i]);
-					SetDParam(1, GetCargo(i)->name);
+					SetDParam(1, CargoSpec::Get(i)->name);
 					strp = GetString(strp, STR_LAND_AREA_INFORMATION_CARGO_EIGHTS, lastof(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]));
 				} else {
-					strp = GetString(strp, GetCargo(i)->name, lastof(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]));
+					strp = GetString(strp, CargoSpec::Get(i)->name, lastof(this->landinfo_data[LAND_INFO_MULTICENTER_LINE]));
+				}
+			}
+		}
 		if (!found) this->landinfo_data[LAND_INFO_MULTICENTER_LINE][0] = '\0';
 		if (found) line_nr += 2;
@@ @@ -831,13 +831,13 @@ static int DrawStationCoverageText(const @@
 				first = false;
 			} else {
 				/* Add a comma if this is not the first item */
 				*b++ = ',';
 				*b++ = ' ';
+			}
-			b = InlineString(b, GetCargo(i)->name);
+			b = InlineString(b, CargoSpec::Get(i)->name);
+		}
+	}
 	/* If first is still true then no cargo is accepted */
 	if (first) b = InlineString(b, STR_JUST_NOTHING);