Update to 1.10.0-beta2

src/terraform_gui.cpp

@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /*
  * This file is part of OpenTTD.
  * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
@@ -502,8 +500,7 @@ static void ResetLandscapeConfirmationCallback(Window *w, bool confirmed)
 		_generating_world = true;
 
 		/* Delete all companies */
-		Company *c;
-		FOR_ALL_COMPANIES(c) {
+		for (Company *c : Company::Iterate()) {
 			ChangeOwnershipOfCompanyItems(c->index, INVALID_OWNER);
 			delete c;
 		}
@@ -511,8 +508,7 @@ static void ResetLandscapeConfirmationCallback(Window *w, bool confirmed)
 		_generating_world = false;
 
 		/* Delete all station signs */
-		BaseStation *st;
-		FOR_ALL_BASE_STATIONS(st) {
+		for (BaseStation *st : BaseStation::Iterate()) {
 			/* There can be buoys, remove them */
 			if (IsBuoyTile(st->xy)) DoCommand(st->xy, 0, 0, DC_EXEC | DC_BANKRUPT, CMD_LANDSCAPE_CLEAR);
 			if (!st->IsInUse()) delete st;