Merge branch 'master' into jgrpp
# Conflicts: # cmake/CompileFlags.cmake # src/cargomonitor.cpp # src/core/CMakeLists.txt # src/economy.cpp # src/landscape.cpp # src/linkgraph/flowmapper.cpp # src/linkgraph/linkgraph_gui.cpp # src/linkgraph/linkgraphschedule.cpp # src/misc_gui.cpp # src/newgrf_generic.cpp # src/newgrf_storage.cpp # src/rail_gui.cpp # src/saveload/afterload.cpp # src/saveload/station_sl.cpp # src/script/script_gui.cpp # src/station_cmd.cpp # src/station_gui.cpp # src/string_func.h # src/terraform_cmd.cpp
This commit is contained in:
@@ -300,9 +300,9 @@ static void InitializeWindowsAndCaches()
|
||||
}
|
||||
}
|
||||
for (Town *t : Town::Iterate()) {
|
||||
for (std::list<PersistentStorage *>::iterator it = t->psa_list.begin(); it != t->psa_list.end(); ++it) {
|
||||
(*it)->feature = GSF_FAKE_TOWNS;
|
||||
(*it)->tile = t->xy;
|
||||
for (auto &it : t->psa_list) {
|
||||
it->feature = GSF_FAKE_TOWNS;
|
||||
it->tile = t->xy;
|
||||
}
|
||||
}
|
||||
for (RoadVehicle *rv : RoadVehicle::Iterate()) {
|
||||
|
Reference in New Issue
Block a user