mirror of https://github.com/OpenTTD/OpenTTD
(svn r3090) Remove long dead pieces of code
parent
b97473e874
commit
203726ed34
|
@ -26,7 +26,6 @@ CommandCallback CcBuildCanal;
|
||||||
CommandCallback CcPlaySound10;
|
CommandCallback CcPlaySound10;
|
||||||
CommandCallback CcPlaceSign;
|
CommandCallback CcPlaceSign;
|
||||||
CommandCallback CcTerraform;
|
CommandCallback CcTerraform;
|
||||||
//CommandCallback CcDemolish;
|
|
||||||
CommandCallback CcBuildTown;
|
CommandCallback CcBuildTown;
|
||||||
|
|
||||||
/* rail_gui.c */
|
/* rail_gui.c */
|
||||||
|
|
|
@ -281,9 +281,7 @@ static void IndustryViewWndProc(Window *w, WindowEvent *e)
|
||||||
case WE_PAINT: {
|
case WE_PAINT: {
|
||||||
const Industry *i;
|
const Industry *i;
|
||||||
StringID str;
|
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);
|
i = GetIndustry(w->window_number);
|
||||||
SetDParam(0, w->window_number);
|
SetDParam(0, w->window_number);
|
||||||
DrawWindowWidgets(w);
|
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_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_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},
|
{ 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},
|
{ WIDGETS_END},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2439,8 +2439,6 @@ void SetupColorsAndInitialWindow(void)
|
||||||
case GM_MENU:
|
case GM_MENU:
|
||||||
w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
|
w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
|
||||||
AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
|
AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
|
||||||
// w = AllocateWindowDesc(&_toolb_intro_desc);
|
|
||||||
// w->flags4 &= ~WF_WHITE_BORDER_MASK;
|
|
||||||
ShowSelectGameWindow();
|
ShowSelectGameWindow();
|
||||||
break;
|
break;
|
||||||
case GM_NORMAL:
|
case GM_NORMAL:
|
||||||
|
|
|
@ -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, 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, 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, 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, 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},
|
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 74, 133, 152, 163, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
|
||||||
|
|
|
@ -467,17 +467,12 @@ typedef struct {
|
||||||
uint best_length;
|
uint best_length;
|
||||||
} PathFindShip;
|
} PathFindShip;
|
||||||
|
|
||||||
//extern void dbg_store_path();
|
|
||||||
|
|
||||||
static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length, byte *state)
|
static bool ShipTrackFollower(TileIndex tile, PathFindShip *pfs, int track, uint length, byte *state)
|
||||||
{
|
{
|
||||||
// Found dest?
|
// Found dest?
|
||||||
if (tile == pfs->dest_coords) {
|
if (tile == pfs->dest_coords) {
|
||||||
pfs->best_bird_dist = 0;
|
pfs->best_bird_dist = 0;
|
||||||
|
|
||||||
// if (length < pfs->best_length)
|
|
||||||
// dbg_store_path();
|
|
||||||
|
|
||||||
pfs->best_length = minu(pfs->best_length, length);
|
pfs->best_length = minu(pfs->best_length, length);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue