Merge branch 'master' into jgrpp

# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.cpp
#	src/economy.cpp
#	src/engine_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraph_gui.h
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/newgrf.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/order_base.h
#	src/order_cmd.cpp
#	src/order_func.h
#	src/order_gui.cpp
#	src/pathfinder/pathfinder_type.h
#	src/saveload/afterload.cpp
#	src/subsidy_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h

src/industry.h

@@ -118,7 +118,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
 
 	inline int GetCargoProducedIndex(CargoID cargo) const
 	{
-		if (cargo == CT_INVALID) return -1;
+		if (cargo == INVALID_CARGO) return -1;
 		auto pos = std::find(this->produced_cargo.begin(), this->produced_cargo.end(), cargo);
 		if (pos == this->produced_cargo.end()) return -1;
 		return pos - this->produced_cargo.begin();
@@ -126,7 +126,7 @@ struct Industry : IndustryPool::PoolItem<&_industry_pool> {
 
 	inline int GetCargoAcceptedIndex(CargoID cargo) const
 	{
-		if (cargo == CT_INVALID) return -1;
+		if (cargo == INVALID_CARGO) return -1;
 		auto pos = std::find(this->accepts_cargo.begin(), this->accepts_cargo.end(), cargo);
 		if (pos == this->accepts_cargo.end()) return -1;
 		return pos - this->accepts_cargo.begin();