--- a/src/road_cmd.cpp	Sat Mar 10 11:07:13 2007 +0000
+++ b/src/road_cmd.cpp	Sun Mar 11 16:31:18 2007 +0000
@@ -70,7 +70,7 @@
 		// you can remove all kind of roads with extra dynamite
 		if (_patches.extra_dynamite) return true;
 
-		t = ClosestTownFromTile(tile, _patches.dist_local_authority);
+		t = ClosestTownFromTile(tile, (uint)-1);
 
 		SetDParam(0, t->index);
 		_error_message = STR_2009_LOCAL_AUTHORITY_REFUSES;
@@ -599,11 +599,11 @@
 }
 
 
-typedef struct DrawRoadTileStruct {
+struct DrawRoadTileStruct {
 	uint16 image;
 	byte subcoord_x;
 	byte subcoord_y;
-} DrawRoadTileStruct;
+};
 
 #include "table/road_land.h"
 
@@ -935,7 +935,7 @@
 
 static void ClickTile_Road(TileIndex tile)
 {
-	if (GetRoadTileType(tile) == ROAD_TILE_DEPOT) ShowDepotWindow(tile, VEH_Road);
+	if (GetRoadTileType(tile) == ROAD_TILE_DEPOT) ShowDepotWindow(tile, VEH_ROAD);
 }
 
 static const byte _road_trackbits[16] = {
@@ -1001,7 +1001,7 @@
 {
 	switch (GetRoadTileType(tile)) {
 		case ROAD_TILE_CROSSING:
-			if (v->type == VEH_Train && !IsCrossingBarred(tile)) {
+			if (v->type == VEH_TRAIN && !IsCrossingBarred(tile)) {
 				/* train crossing a road */
 				SndPlayVehicleFx(SND_0E_LEVEL_CROSSING, v);
 				BarCrossing(tile);
@@ -1010,7 +1010,7 @@
 			break;
 
 		case ROAD_TILE_DEPOT:
-			if (v->type == VEH_Road &&
+			if (v->type == VEH_ROAD &&
 					v->u.road.frame == 11 &&
 					_roadveh_enter_depot_unk0[GetRoadDepotDirection(tile)] == v->u.road.state) {
 				VehicleEnterDepot(v);