mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r15506) -Codechange: rename ScenarioEditorTownGenerationWindow to FoundTownWindow

This commit is contained in:
smatz 2009-02-17 00:21:08 +00:00
parent 0878541cf2
commit 42747e222c
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lang/english.txt
View File

@ -644,8 +644,8 @@ STR_02A1_SMALL :{BLACK}Small
STR_02A2_MEDIUM :{BLACK}Medium STR_02A2_MEDIUM :{BLACK}Medium
STR_02A3_LARGE :{BLACK}Large STR_02A3_LARGE :{BLACK}Large
STR_SELECT_TOWN_SIZE_RANDOM :{BLACK}Random STR_SELECT_TOWN_SIZE_RANDOM :{BLACK}Random
STR_SCENARIO_EDITOR_CITY :{BLACK}City STR_FOUND_TOWN_CITY :{BLACK}City
STR_SCENARIO_EDITOR_CITY_TOOLTIP :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded STR_FOUND_TOWN_CITY_TOOLTIP :{BLACK}Cities grow faster than regular towns{}Depending on settings, they are bigger when founded
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Select town size STR_02A4_SELECT_TOWN_SIZE :{BLACK}Select town size
STR_02A5_TOWN_SIZE :{YELLOW}Town size: STR_02A5_TOWN_SIZE :{YELLOW}Town size:

2
src/settings.cpp
View File

@ -1311,7 +1311,7 @@ const SettingDesc _settings[] = {
SDT_BOOL(GameSettings, construction.longbridges, 0,NN, true, STR_CONFIG_SETTING_LONGBRIDGES, NULL), SDT_BOOL(GameSettings, construction.longbridges, 0,NN, true, STR_CONFIG_SETTING_LONGBRIDGES, NULL),
SDT_BOOL(GameSettings, construction.signal_side, N,NN, true, STR_CONFIG_SETTING_SIGNALSIDE, RedrawScreen), SDT_BOOL(GameSettings, construction.signal_side, N,NN, true, STR_CONFIG_SETTING_SIGNALSIDE, RedrawScreen),
SDT_BOOL(GameSettings, station.always_small_airport, 0,NN, false, STR_CONFIG_SETTING_SMALL_AIRPORTS, NULL), SDT_BOOL(GameSettings, station.always_small_airport, 0,NN, false, STR_CONFIG_SETTING_SMALL_AIRPORTS, NULL),
SDT_CONDVAR(GameSettings, economy.town_layout, SLE_UINT8, 59, SL_MAX_VERSION, 0,MS,TL_ORIGINAL,TL_BEGIN,NUM_TLS-1,1, STR_CONFIG_SETTING_TOWN_LAYOUT, NULL), SDT_CONDVAR(GameSettings, economy.town_layout, SLE_UINT8, 59, SL_MAX_VERSION, 0,MS,TL_ORIGINAL,TL_BEGIN,NUM_TLS-1,1, STR_CONFIG_SETTING_TOWN_LAYOUT, NULL),
SDT_CONDBOOL(GameSettings, economy.allow_town_roads, 113, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_ALLOW_TOWN_ROADS, NULL), SDT_CONDBOOL(GameSettings, economy.allow_town_roads, 113, SL_MAX_VERSION, 0, 0, true, STR_CONFIG_SETTING_ALLOW_TOWN_ROADS, NULL),
SDT_VAR(GameSettings, vehicle.train_acceleration_model, SLE_UINT8, 0,MS, 0, 0, 1, 1, STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL, TrainAccelerationModelChanged), SDT_VAR(GameSettings, vehicle.train_acceleration_model, SLE_UINT8, 0,MS, 0, 0, 1, 1, STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL, TrainAccelerationModelChanged),

24
src/town_gui.cpp
View File

@ -598,7 +598,7 @@ void CcBuildTown(bool success, TileIndex tile, uint32 p1, uint32 p2)
} }
} }
static const Widget _scen_edit_town_gen_widgets[] = { static const Widget _found_town_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, { WWT_CLOSEBOX, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
{ WWT_CAPTION, RESIZE_NONE, COLOUR_DARK_GREEN, 11, 147, 0, 13, STR_0233_TOWN_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_CAPTION, RESIZE_NONE, COLOUR_DARK_GREEN, 11, 147, 0, 13, STR_0233_TOWN_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
{ WWT_STICKYBOX, RESIZE_NONE, COLOUR_DARK_GREEN, 148, 159, 0, 13, 0x0, STR_STICKY_BUTTON}, { WWT_STICKYBOX, RESIZE_NONE, COLOUR_DARK_GREEN, 148, 159, 0, 13, 0x0, STR_STICKY_BUTTON},
@ -613,7 +613,7 @@ static const Widget _scen_edit_town_gen_widgets[] = {
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 80, 157, 68, 79, STR_02A2_MEDIUM, STR_02A4_SELECT_TOWN_SIZE}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 80, 157, 68, 79, STR_02A2_MEDIUM, STR_02A4_SELECT_TOWN_SIZE},
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 79, 81, 92, STR_02A3_LARGE, STR_02A4_SELECT_TOWN_SIZE}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 79, 81, 92, STR_02A3_LARGE, STR_02A4_SELECT_TOWN_SIZE},
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 80, 157, 81, 92, STR_SELECT_TOWN_SIZE_RANDOM, STR_02A4_SELECT_TOWN_SIZE}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 80, 157, 81, 92, STR_SELECT_TOWN_SIZE_RANDOM, STR_02A4_SELECT_TOWN_SIZE},
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 157, 96, 107, STR_SCENARIO_EDITOR_CITY, STR_SCENARIO_EDITOR_CITY_TOOLTIP}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 157, 96, 107, STR_FOUND_TOWN_CITY, STR_FOUND_TOWN_CITY_TOOLTIP},
{ WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 108, 121, STR_TOWN_ROAD_LAYOUT, STR_NULL}, { WWT_LABEL, RESIZE_NONE, COLOUR_DARK_GREEN, 0, 147, 108, 121, STR_TOWN_ROAD_LAYOUT, STR_NULL},
{ WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 79, 122, 133, STR_SELECT_LAYOUT_ORIGINAL, STR_SELECT_TOWN_ROAD_LAYOUT}, { WWT_TEXTBTN, RESIZE_NONE, COLOUR_GREY, 2, 79, 122, 133, STR_SELECT_LAYOUT_ORIGINAL, STR_SELECT_TOWN_ROAD_LAYOUT},
@ -625,7 +625,7 @@ static const Widget _scen_edit_town_gen_widgets[] = {
{ WIDGETS_END}, { WIDGETS_END},
}; };
struct ScenarioEditorTownGenerationWindow : Window struct FoundTownWindow : Window
{ {
private: private:
enum TownScenarioEditorWidget { enum TownScenarioEditorWidget {
@ -651,7 +651,7 @@ private:
static TownLayout town_layout; static TownLayout town_layout;
public: public:
ScenarioEditorTownGenerationWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number) FoundTownWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
{ {
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);
town_layout = _settings_game.economy.town_layout; town_layout = _settings_game.economy.town_layout;
@ -762,19 +762,19 @@ public:
} }
}; };
TownSize ScenarioEditorTownGenerationWindow::town_size = TS_MEDIUM; // select medium-sized towns per default TownSize FoundTownWindow::town_size = TS_MEDIUM; // select medium-sized towns per default;
bool ScenarioEditorTownGenerationWindow::city; bool FoundTownWindow::city;
TownLayout ScenarioEditorTownGenerationWindow::town_layout; TownLayout FoundTownWindow::town_layout;
static const WindowDesc _scen_edit_town_gen_desc = { static const WindowDesc _found_town_desc = {
WDP_AUTO, WDP_AUTO, 160, 162, 160, 162, WDP_AUTO, WDP_AUTO, 160, 162, 160, 162,
WC_SCEN_TOWN_GEN, WC_NONE, WC_FOUND_TOWN, WC_NONE,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON | WDF_CONSTRUCTION,
_scen_edit_town_gen_widgets, _found_town_widgets,
}; };
void ShowBuildTownWindow() void ShowBuildTownWindow()
{ {
if (_game_mode != GM_EDITOR && !IsValidCompanyID(_local_company)) return; if (_game_mode != GM_EDITOR && !IsValidCompanyID(_local_company)) return;
AllocateWindowDescFront<ScenarioEditorTownGenerationWindow>(&_scen_edit_town_gen_desc, 0); AllocateWindowDescFront<FoundTownWindow>(&_found_town_desc, 0);
} }

2
src/window_type.h
View File

@ -20,6 +20,7 @@ enum WindowClass {
WC_TOWN_DIRECTORY, WC_TOWN_DIRECTORY,
WC_STATION_LIST, WC_STATION_LIST,
WC_TOWN_VIEW, WC_TOWN_VIEW,
WC_FOUND_TOWN,
WC_SMALLMAP, WC_SMALLMAP,
WC_TRAINS_LIST, WC_TRAINS_LIST,
WC_ROADVEH_LIST, WC_ROADVEH_LIST,
@ -64,7 +65,6 @@ enum WindowClass {
WC_MUSIC_WINDOW, WC_MUSIC_WINDOW,
WC_MUSIC_TRACK_SELECTION, WC_MUSIC_TRACK_SELECTION,
WC_SCEN_LAND_GEN, WC_SCEN_LAND_GEN,
WC_SCEN_TOWN_GEN,
WC_SCEN_INDUSTRY, WC_SCEN_INDUSTRY,
WC_SCEN_BUILD_TOOLBAR, WC_SCEN_BUILD_TOOLBAR,
WC_BUILD_TREES, WC_BUILD_TREES,