(svn r3090) Remove long dead pieces of code

5 files changed, 1 insertions, 15 deletions

diff --git a/callback_table.c b/callback_table.c
index c5fc15354..25b9e713c 100644
--- a/callback_table.c
+++ b/callback_table.c
@@ -26,7 +26,6 @@ CommandCallback CcBuildCanal;
 CommandCallback CcPlaySound10;
 CommandCallback CcPlaceSign;
 CommandCallback CcTerraform;
-//CommandCallback CcDemolish;
 CommandCallback CcBuildTown;
 
 /* rail_gui.c */
diff --git a/industry_gui.c b/industry_gui.c
index 0402f8769..08346fd3a 100644
--- a/industry_gui.c
+++ b/industry_gui.c
@@ -281,9 +281,7 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
 	case WE_PAINT: {
 		const Industry *i;
 		StringID str;
-		// in editor, use bulldoze to destroy industry
-		// Destroy Industry button costing money removed per request of dominik
-		//w->disabled_state = (_patches.extra_dynamite && !_networking && _game_mode != GM_EDITOR) ? 0 : (1 << 6);
+
 		i = GetIndustry(w->window_number);
 		SetDParam(0, w->window_number);
 		DrawWindowWidgets(w);
@@ -429,8 +427,6 @@ static const Widget _industry_view_widgets[] = {
 {     WWT_IMGBTN,   RESIZE_NONE,     9,     0,   259,   106,   147, 0x0,				STR_NULL},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,     9,     0,   129,   148,   159, STR_00E4_LOCATION,	STR_482C_CENTER_THE_MAIN_VIEW_ON},
 {     WWT_IMGBTN,   RESIZE_NONE,     9,   130,   259,   148,   159, 0x0,				STR_NULL},
-// Destroy Industry button costing money removed per request of dominik
-//{ WWT_PUSHTXTBTN,   RESIZE_NONE,     9,   130,   259,   148,   159, STR_INDUSTRYDIR_DESTROY, STR_482C_DESTROY_INDUSTRY},
 {   WIDGETS_END},
 };
 
diff --git a/main_gui.c b/main_gui.c
index 8c64c3f77..ea0d59769 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -2439,8 +2439,6 @@ void SetupColorsAndInitialWindow(void)
 	case GM_MENU:
 		w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
 		AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
-//		w = AllocateWindowDesc(&_toolb_intro_desc);
-//		w->flags4 &= ~WF_WHITE_BORDER_MASK;
 		ShowSelectGameWindow();
 		break;
 	case GM_NORMAL:
diff --git a/rail_gui.c b/rail_gui.c
index e3f929ec2..98c9d46d2 100644
--- a/rail_gui.c
+++ b/rail_gui.c
@@ -738,8 +738,6 @@ static const Widget _station_builder_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,    97,   111,   112,   123, STR_0335_6,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,   112,   126,   112,   123, STR_0336_7,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 
-//{   WWT_CLOSEBOX,   RESIZE_NONE,    14,    14,    73,   137,   148, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
-//{   WWT_CLOSEBOX,   RESIZE_NONE,    14,    74,   133,   137,   148, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,    37,   111,   126,   137, STR_DRAG_DROP, STR_STATION_DRAG_DROP},
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,    14,    73,   152,   163, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,    74,   133,   152,   163, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
diff --git a/ship_cmd.c b/ship_cmd.c
index a0f4f8738..64f853d91 100644
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -467,17 +467,12 @@ typedef struct {
 	uint best_length;
 } PathFindShip;
 
-//extern void dbg_store_path();
-
 static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length, byte *state)
 {
 	// Found dest?
 	if (tile == pfs->dest_coords) {
 		pfs->best_bird_dist = 0;
 
-//		if (length < pfs->best_length)
-//			dbg_store_path();
-
 		pfs->best_length = minu(pfs->best_length, length);
 		return true;
 	}