Merge remote-tracking branch 'upstream/master'

2024-02-07 15:20:07 +05:30
parent 36001f85d1 13e20ba192
commit ee0718e08a
176 changed files with 3476 additions and 2711 deletions
@@ -116,7 +116,11 @@ struct Town : TownPool::PoolItem<&_town_pool> {

 	std::string text; ///< General text with additional information.

-	inline byte GetPercentTransported(CargoID cid) const { return this->supplied[cid].old_act * 256 / (this->supplied[cid].old_max + 1); }
+	inline byte GetPercentTransported(CargoID cid) const
+	{
+		if (!IsValidCargoID(cid)) return 0;
+		return this->supplied[cid].old_act * 256 / (this->supplied[cid].old_max + 1);
+	}

 	StationList stations_near;       ///< NOSAVE: List of nearby stations.