--- a/src/town.h	Thu May 29 12:52:24 2008 +0000
+++ b/src/town.h	Thu May 29 15:56:32 2008 +0000
@@ -197,7 +197,7 @@
 	inline uint16 MaxTownNoise() const {
 		if (this->population == 0) return 0; // no population? no noise
 
-		return ((this->population / _settings.economy.town_noise_population[_settings.difficulty.town_council_tolerance]) + 3);
+		return ((this->population / _settings_game.economy.town_noise_population[_settings_game.difficulty.town_council_tolerance]) + 3);
 	}
 };
 
@@ -207,7 +207,7 @@
  */
 inline TownLayout Town::GetActiveLayout() const
 {
-	return (_settings.economy.town_layout == TL_RANDOM) ? this->layout : _settings.economy.town_layout;
+	return (_settings_game.economy.town_layout == TL_RANDOM) ? this->layout : _settings_game.economy.town_layout;
 }
 
 struct HouseSpec {
@@ -345,10 +345,6 @@
 #define FOR_ALL_TOWNS_FROM(t, start) for (t = GetTown(start); t != NULL; t = (t->index + 1U < GetTownPoolSize()) ? GetTown(t->index + 1U) : NULL) if (t->IsValid())
 #define FOR_ALL_TOWNS(t) FOR_ALL_TOWNS_FROM(t, 0)
 
-extern bool _town_sort_dirty;
-extern byte _town_sort_order;
-extern const Town **_town_sort;
-
 extern Town *_cleared_town;
 extern int _cleared_town_rating;