(svn r1791) Remove the remnants of CMD_DESTROY_INDUSTRY, which was removed a long time ago

4 files changed, 0 insertions, 39 deletions

diff --git a/command.c b/command.c
index eab5c6f90..2bee18831 100644
--- a/command.c
+++ b/command.c
@@ -75,7 +75,6 @@ DEF_COMMAND(CmdChangeTrainServiceInt);
 DEF_COMMAND(CmdRestoreOrderIndex);
 
 DEF_COMMAND(CmdBuildIndustry);
-//DEF_COMMAND(CmdDestroyIndustry);
 
 DEF_COMMAND(CmdBuildCompanyHQ);
 DEF_COMMAND(CmdDestroyCompanyHQ);
@@ -309,8 +308,6 @@ static CommandProc * const _command_proc_table[] = {
 	CmdGiveMoney,									/* 113 */
 	CmdChangePatchSetting,				/* 114 */
 	CmdReplaceVehicle,						/* 115 */
-
-	//CmdDestroyIndustry,					/* 109 */
 };
 
 /* This function range-checks a cmd, and checks if the cmd is not NULL */
diff --git a/command.h b/command.h
index dc682db09..90a3283d2 100644
--- a/command.h
+++ b/command.h
@@ -149,7 +149,6 @@ enum {
 	CMD_CHANGE_PATCH_SETTING = 114,
 
 	CMD_REPLACE_VEHICLE = 115,
-	//CMD_DESTROY_INDUSTRY = 109,
 };
 
 enum {
diff --git a/industry_cmd.c b/industry_cmd.c
index 1e1c5e7f5..9e0b92f77 100644
--- a/industry_cmd.c
+++ b/industry_cmd.c
@@ -411,30 +411,6 @@ static int32 ClearTile_Industry(uint tile, byte flags)
 	return 0;
 }
 
-/* p1 index of industry to destroy */
-/* Destroy Industry button costing money removed per request of dominik
-int32 CmdDestroyIndustry(int x, int y, uint32 flags, uint32 p1, uint32 p2)
-{
-	uint tile = TILE_FROM_XY(x,y);
-	Industry *i = GetIndustry((uint16)p1);
-  Town *t = ClosestTownFromTile(tile, (uint)-1); // find closest town to penaltize (ALWAYS penaltize)
-
-	SET_EXPENSES_TYPE(EXPENSES_OTHER);
-
-	// check if you're allowed to remove the industry. Minimum amount
-	// of ratings to remove the industry depends on difficulty setting
-	if (!CheckforTownRating(tile, flags, t, INDUSTRY_REMOVE))
-		return CMD_ERROR;
-
-	if (flags & DC_EXEC) {
-		DeleteIndustry(i);
-		CreateEffectVehicleAbove(x + 8,y + 8, 2, EV_DEMOLISH);
-		ChangeTownRating(t, RATING_INDUSTRY_DOWN_STEP, RATING_INDUSTRY_MINIMUM);
-	}
-
-	return (_price.build_industry >> 5) * _industry_type_costs[i->type]*2;
-}
-*/
 
 static const byte _industry_min_cargo[] = {
 	5, 5, 5, 30, 5, 5, 5, 5,
diff --git a/industry_gui.c b/industry_gui.c
index 11854c501..1d5e73842 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -381,17 +381,6 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
 			i = GetIndustry(w->window_number);
 			ScrollMainWindowToTile(i->xy + TILE_XY(1,1));
 			break;
-		case 7:
-			// Destroy Industry button costing money removed per request of dominik
-			//i = GetIndustry(w->window_number);
-			/*	passing only i->xy is not safe if industry has a weird shape like:
-					_ X X
-					X X X
-					_ <--- grass, no industry, but i->xy points there (first top-left tile)!,
-					so passing i->xy to destroy industry will fail in called procedure
-			*/
-			//DoCommandP(i->xy, w->window_number, 0, CcPlaySound10,  CMD_DESTROY_INDUSTRY | CMD_MSG(STR_00B5_CAN_T_CLEAR_THIS_AREA));
-			break;
 		}
 		}
 		break;