Mercurial > hg > openttd

changeset 3884:93353ba1c299 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r4940) Remove the dubious feature of remembering the last built depot. It serves no real purpose except causing confusion
author tron <tron@openttd.org>
date Sun, 21 May 2006 13:51:36 +0000
parents e7bb7c46999d
children cc9d02936160
files aircraft_gui.c airport_gui.c depot.h misc.c rail_cmd.c road_cmd.c roadveh_gui.c ship_gui.c station_cmd.c train_gui.c water_cmd.c
diffstat 11 files changed, 13 insertions(+), 102 deletions(-) [+]
line wrap: on
line diff
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@@ -1082,25 +1082,10 @@
 			}
 		} break;
 
-		case 9: { /* Build new Vehicle */
-			TileIndex tile;
-
-			if (!IsWindowOfPrototype(w, _player_aircraft_widgets))
-				break;
-
-			tile = _last_built_aircraft_depot_tile;
-			do {
-				if (IsHangarTile(tile) && IsTileOwner(tile, _local_player)) {
-					ShowAircraftDepotWindow(tile);
-					ShowBuildAircraftWindow(tile);
-					return;
-				}
-
-				tile = TILE_MASK(tile + 1);
-			} while (tile != _last_built_aircraft_depot_tile);
-
+		case 9: /* Build new Vehicle */
+			if (!IsWindowOfPrototype(w, _player_aircraft_widgets)) break;
 			ShowBuildAircraftWindow(0);
-		} break;
+			break;
 
 		case 10:
 			if (!IsWindowOfPrototype(w, _player_aircraft_widgets))
--- a/airport_gui.c
+++ b/airport_gui.c
@@ -249,5 +249,4 @@
 void InitializeAirportGui(void)
 {
 	_selected_airport_type = AT_SMALL;
-	_last_built_aircraft_depot_tile = 0;
 }
--- a/depot.h
+++ b/depot.h
@@ -60,10 +60,6 @@
 	return (_patches.servint_ispercent) ? clamp(index, MIN_SERVINT_PERCENT, MAX_SERVINT_PERCENT) : clamp(index, MIN_SERVINT_DAYS, MAX_SERVINT_DAYS);
 }
 
-VARDEF TileIndex _last_built_train_depot_tile;
-VARDEF TileIndex _last_built_road_depot_tile;
-VARDEF TileIndex _last_built_aircraft_depot_tile;
-VARDEF TileIndex _last_built_ship_depot_tile;
 
 /**
  * Check if a depot really exists.
--- a/misc.c
+++ b/misc.c
@@ -96,12 +96,9 @@
 void InitializeEngines(void);
 void InitializeOrders(void);
 void InitializeClearLand(void);
-void InitializeRail(void);
 void InitializeRailGui(void);
-void InitializeRoad(void);
 void InitializeRoadGui(void);
 void InitializeAirportGui(void);
-void InitializeDock(void);
 void InitializeDockGui(void);
 void InitializeIndustries(void);
 void InitializeMainGui(void);
@@ -157,12 +154,9 @@
 	InitNewsItemStructs();
 	InitializeLandscape();
 	InitializeClearLand();
-	InitializeRail();
 	InitializeRailGui();
-	InitializeRoad();
 	InitializeRoadGui();
 	InitializeAirportGui();
-	InitializeDock();
 	InitializeDockGui();
 	InitializeTowns();
 	InitializeTrees();
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -590,8 +590,6 @@
 	if (d == NULL) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
-		if (IsLocalPlayer()) _last_built_train_depot_tile = tile;
-
 		MakeRailDepot(tile, _current_player, p2, p1);
 		MarkTileDirtyByTile(tile);
 
@@ -2032,10 +2030,6 @@
 	return 0;
 }
 
-void InitializeRail(void)
-{
-	_last_built_train_depot_tile = 0;
-}
 
 const TileTypeProcs _tile_type_rail_procs = {
 	DrawTile_Track,						/* draw_tile_proc */
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -577,8 +577,6 @@
 	if (dep == NULL) return CMD_ERROR;
 
 	if (flags & DC_EXEC) {
-		if (IsLocalPlayer()) _last_built_road_depot_tile = tile;
-
 		dep->xy = tile;
 		dep->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 
@@ -1081,10 +1079,6 @@
 	}
 }
 
-void InitializeRoad(void)
-{
-	_last_built_road_depot_tile = 0;
-}
 
 const TileTypeProcs _tile_type_road_procs = {
 	DrawTile_Road,						/* draw_tile_proc */
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -968,25 +968,11 @@
 			}
 		} break;
 
-		case 9: { /* Build new Vehicle */
-			TileIndex tile;
-
-			if (!IsWindowOfPrototype(w, _player_roadveh_widgets))
-				break;
+		case 9: /* Build new Vehicle */
+			if (!IsWindowOfPrototype(w, _player_roadveh_widgets)) break;
+			ShowBuildRoadVehWindow(0);
+			break;
 
-			tile = _last_built_road_depot_tile;
-			do {
-				if (IsTileDepotType(tile, TRANSPORT_ROAD) && IsTileOwner(tile, _local_player)) {
-					ShowRoadDepotWindow(tile);
-					ShowBuildRoadVehWindow(tile);
-					return;
-				}
-
-				tile = TILE_MASK(tile + 1);
-			} while (tile != _last_built_road_depot_tile);
-
-			ShowBuildRoadVehWindow(0);
-		} break;
 		case 10: {
 			if (!IsWindowOfPrototype(w, _player_roadveh_widgets))
 				break;
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -1065,24 +1065,10 @@
 			}
 		} break;
 
-		case 9: { /* Build new Vehicle */
-			TileIndex tile;
-
+		case 9: /* Build new Vehicle */
 			if (!IsWindowOfPrototype(w, _player_ships_widgets)) break;
-
-			tile = _last_built_ship_depot_tile;
-			do {
-				if (IsTileDepotType(tile, TRANSPORT_WATER) && IsTileOwner(tile, _local_player)) {
-					ShowShipDepotWindow(tile);
-					ShowBuildShipWindow(tile);
-					return;
-				}
-
-				tile = TILE_MASK(tile + 1);
-			} while (tile != _last_built_ship_depot_tile);
-
 			ShowBuildShipWindow(0);
-		} break;
+			break;
 
 		case 10: {
 			if (!IsWindowOfPrototype(w, _player_ships_widgets)) break;
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -1669,9 +1669,6 @@
 
 	if (flags & DC_EXEC) {
 		st->owner = _current_player;
-		if (IsLocalPlayer() && afc->nof_depots != 0)
-			_last_built_aircraft_depot_tile = tile + ToTileIndexDiff(afc->airport_depots[0]);
-
 		st->airport_tile = tile;
 		if (!st->facilities) st->xy = tile;
 		st->facilities |= FACIL_AIRPORT;
--- a/train_gui.c
+++ b/train_gui.c
@@ -1494,26 +1494,11 @@
 			}
 		} break;
 
-		case 9: { /* Build new Vehicle */
-			TileIndex tile;
-
-			if (!IsWindowOfPrototype(w, _player_trains_widgets))
-				break;
+		case 9: /* Build new Vehicle */
+			if (!IsWindowOfPrototype(w, _player_trains_widgets)) break;
+			ShowBuildTrainWindow(0);
+			break;
 
-			tile = _last_built_train_depot_tile;
-			do {
-				if (IsTileDepotType(tile, TRANSPORT_RAIL) &&
-						IsTileOwner(tile, _local_player)) {
-					ShowTrainDepotWindow(tile);
-					ShowBuildTrainWindow(tile);
-					return;
-				}
-
-				tile = TILE_MASK(tile + 1);
-			} while (tile != _last_built_train_depot_tile);
-
-			ShowBuildTrainWindow(0);
-		} break;
 		case 10: {
 			if (!IsWindowOfPrototype(w, _player_trains_widgets))
 				break;
--- a/water_cmd.c
+++ b/water_cmd.c
@@ -78,7 +78,6 @@
 
 	if (flags & DC_EXEC) {
 		depot->xy = tile;
-		_last_built_ship_depot_tile = tile;
 		depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index;
 
 		MakeShipDepot(tile,_current_player, DEPOT_NORTH, p1);
@@ -698,10 +697,6 @@
 	return 0;
 }
 
-void InitializeDock(void)
-{
-	_last_built_ship_depot_tile = 0;
-}
 
 const TileTypeProcs _tile_type_water_procs = {
 	DrawTile_Water,						/* draw_tile_proc */