mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r11921) -Cleanup: correct indenting and switch case line spacing.
This commit is contained in:
parent
600046f3d7
commit
14416791af
|
@ -336,33 +336,43 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
SetDParamStr(0, WP(w, generate_d).name);
|
||||
DrawStringTruncated(114, 91, STR_ORANGE, TC_BLACK, 326 - 114 - GetStringBoundingBox(buffer).width - 5);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case WE_CLICK:
|
||||
switch (e->we.click.widget) {
|
||||
case 0: DeleteWindow(w); break;
|
||||
case GLAND_TEMPERATE: case GLAND_ARCTIC: case GLAND_TROPICAL: case GLAND_TOYLAND:
|
||||
|
||||
case GLAND_TEMPERATE:
|
||||
case GLAND_ARCTIC:
|
||||
case GLAND_TROPICAL:
|
||||
case GLAND_TOYLAND:
|
||||
w->RaiseWidget(_opt_newgame.landscape + GLAND_TEMPERATE);
|
||||
SetNewLandscapeType(e->we.click.widget - GLAND_TEMPERATE);
|
||||
break;
|
||||
|
||||
case GLAND_MAPSIZE_X_PULLDOWN: // Mapsize X
|
||||
ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_x, GLAND_MAPSIZE_X_PULLDOWN);
|
||||
break;
|
||||
|
||||
case GLAND_MAPSIZE_Y_PULLDOWN: // Mapsize Y
|
||||
ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_y, GLAND_MAPSIZE_Y_PULLDOWN);
|
||||
break;
|
||||
|
||||
case GLAND_TOWN_PULLDOWN: // Number of towns
|
||||
ShowDropDownMenu(w, num_towns, _opt_newgame.diff.number_towns, GLAND_TOWN_PULLDOWN, 0, 0);
|
||||
break;
|
||||
|
||||
case GLAND_INDUSTRY_PULLDOWN: // Number of industries
|
||||
ShowDropDownMenu(w, num_inds, _opt_newgame.diff.number_industries, GLAND_INDUSTRY_PULLDOWN, 0, 0);
|
||||
break;
|
||||
|
||||
case GLAND_RANDOM_BUTTON: // Random seed
|
||||
_patches_newgame.generation_seed = InteractiveRandom();
|
||||
snprintf(_genseed_buffer, lengthof(_genseed_buffer), "%u", _patches_newgame.generation_seed);
|
||||
UpdateTextBufferSize(&_genseed_query.text);
|
||||
SetWindowDirty(w);
|
||||
break;
|
||||
|
||||
case GLAND_GENERATE_BUTTON: // Generate
|
||||
|
||||
UpdatePatches();
|
||||
|
@ -383,12 +393,13 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
STR_HEIGHTMAP_SCALE_WARNING_MESSAGE,
|
||||
w,
|
||||
LandscapeGenerationCallback);
|
||||
|
||||
} else {
|
||||
StartGeneratingLandscape(mode);
|
||||
}
|
||||
break;
|
||||
case GLAND_START_DATE_DOWN: case GLAND_START_DATE_UP: // Year buttons
|
||||
|
||||
case GLAND_START_DATE_DOWN:
|
||||
case GLAND_START_DATE_UP: // Year buttons
|
||||
/* Don't allow too fast scrolling */
|
||||
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
|
||||
w->HandleButtonClick(e->we.click.widget);
|
||||
|
@ -398,12 +409,15 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
}
|
||||
_left_button_clicked = false;
|
||||
break;
|
||||
|
||||
case GLAND_START_DATE_TEXT: // Year text
|
||||
WP(w, generate_d).widget_id = GLAND_START_DATE_TEXT;
|
||||
SetDParam(0, _patches_newgame.starting_year);
|
||||
ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL);
|
||||
break;
|
||||
case GLAND_SNOW_LEVEL_DOWN: case GLAND_SNOW_LEVEL_UP: // Snow line buttons
|
||||
|
||||
case GLAND_SNOW_LEVEL_DOWN:
|
||||
case GLAND_SNOW_LEVEL_UP: // Snow line buttons
|
||||
/* Don't allow too fast scrolling */
|
||||
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
|
||||
w->HandleButtonClick(e->we.click.widget);
|
||||
|
@ -413,14 +427,17 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
}
|
||||
_left_button_clicked = false;
|
||||
break;
|
||||
|
||||
case GLAND_SNOW_LEVEL_TEXT: // Snow line text
|
||||
WP(w, generate_d).widget_id = GLAND_SNOW_LEVEL_TEXT;
|
||||
SetDParam(0, _patches_newgame.snow_line_height);
|
||||
ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_SNOW_LINE_QUERY_CAPT, 3, 100, w, CS_NUMERAL);
|
||||
break;
|
||||
|
||||
case GLAND_TREE_PULLDOWN: // Tree placer
|
||||
ShowDropDownMenu(w, tree_placer, _patches_newgame.tree_placer, GLAND_TREE_PULLDOWN, 0, 0);
|
||||
break;
|
||||
|
||||
case GLAND_LANDSCAPE_PULLDOWN: // Landscape generator OR Heightmap rotation
|
||||
/* case GLAND_HEIGHTMAP_ROTATION_TEXT: case GLAND_HEIGHTMAP_ROTATION_PULLDOWN:*/
|
||||
if (mode == GLWP_HEIGHTMAP) {
|
||||
|
@ -429,12 +446,15 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
ShowDropDownMenu(w, landscape, _patches_newgame.land_generator, GLAND_LANDSCAPE_PULLDOWN, 0, 0);
|
||||
}
|
||||
break;
|
||||
|
||||
case GLAND_TERRAIN_PULLDOWN: // Terrain type
|
||||
ShowDropDownMenu(w, elevations, _opt_newgame.diff.terrain_type, GLAND_TERRAIN_PULLDOWN, 0, 0);
|
||||
break;
|
||||
|
||||
case GLAND_WATER_PULLDOWN: // Water quantity
|
||||
ShowDropDownMenu(w, sea_lakes, _opt_newgame.diff.quantity_sea_lakes, GLAND_WATER_PULLDOWN, 0, 0);
|
||||
break;
|
||||
|
||||
case GLAND_SMOOTHNESS_PULLDOWN: // Map smoothness
|
||||
ShowDropDownMenu(w, smoothness, _patches_newgame.tgen_smoothness, GLAND_SMOOTHNESS_PULLDOWN, 0, 0);
|
||||
break;
|
||||
|
@ -467,11 +487,13 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
|
||||
DoCommandP(0, 2, _opt_newgame.diff.number_towns, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
|
||||
break;
|
||||
|
||||
case GLAND_INDUSTRY_PULLDOWN:
|
||||
_opt_newgame.diff.number_industries = e->we.dropdown.index;
|
||||
if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
|
||||
DoCommandP(0, 3, _opt_newgame.diff.number_industries, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
|
||||
break;
|
||||
|
||||
case GLAND_LANDSCAPE_PULLDOWN:
|
||||
/* case GLAND_HEIGHTMAP_PULLDOWN: */
|
||||
if (mode == GLWP_HEIGHTMAP) {
|
||||
|
@ -480,11 +502,13 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
_patches_newgame.land_generator = e->we.dropdown.index;
|
||||
}
|
||||
break;
|
||||
|
||||
case GLAND_TERRAIN_PULLDOWN:
|
||||
_opt_newgame.diff.terrain_type = e->we.dropdown.index;
|
||||
if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
|
||||
DoCommandP(0, 12, _opt_newgame.diff.terrain_type, NULL, CMD_CHANGE_DIFFICULTY_LEVEL);
|
||||
break;
|
||||
|
||||
case GLAND_WATER_PULLDOWN:
|
||||
_opt_newgame.diff.quantity_sea_lakes = e->we.dropdown.index;
|
||||
if (_opt_newgame.diff_level != 3) ShowErrorMessage(INVALID_STRING_ID, STR_DIFFICULTY_TO_CUSTOM, 0, 0);
|
||||
|
@ -494,7 +518,7 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
SetWindowDirty(w);
|
||||
break;
|
||||
|
||||
case WE_ON_EDIT_TEXT: {
|
||||
case WE_ON_EDIT_TEXT:
|
||||
if (e->we.edittext.str != NULL) {
|
||||
int32 value = atoi(e->we.edittext.str);
|
||||
|
||||
|
@ -503,6 +527,7 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
w->InvalidateWidget(GLAND_START_DATE_TEXT);
|
||||
_patches_newgame.starting_year = Clamp(value, MIN_YEAR, MAX_YEAR);
|
||||
break;
|
||||
|
||||
case GLAND_SNOW_LEVEL_TEXT:
|
||||
w->InvalidateWidget(GLAND_SNOW_LEVEL_TEXT);
|
||||
_patches_newgame.snow_line_height = Clamp(value, 2, MAX_SNOWLINE_HEIGHT);
|
||||
|
@ -514,7 +539,6 @@ static void GenerateLandscapeWndProc(Window *w, WindowEvent *e)
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const WindowDesc _generate_landscape_desc = {
|
||||
WDP_CENTER, WDP_CENTER, 338, 268, 338, 268,
|
||||
|
@ -612,7 +636,9 @@ enum CreateScenarioWindowWidgets {
|
|||
static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
||||
{
|
||||
switch (e->event) {
|
||||
case WE_CREATE: w->LowerWidget(_opt_newgame.landscape + CSCEN_TEMPERATE); break;
|
||||
case WE_CREATE:
|
||||
w->LowerWidget(_opt_newgame.landscape + CSCEN_TEMPERATE);
|
||||
break;
|
||||
|
||||
case WE_PAINT:
|
||||
w->SetWidgetDisabledState(CSCEN_START_DATE_DOWN, _patches_newgame.starting_year <= MIN_YEAR);
|
||||
|
@ -634,25 +660,35 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
|||
DrawWindowWidgets(w);
|
||||
|
||||
break;
|
||||
|
||||
case WE_CLICK:
|
||||
switch (e->we.click.widget) {
|
||||
case CSCEN_TEMPERATE: case CSCEN_ARCTIC: case CSCEN_TROPICAL: case CSCEN_TOYLAND:
|
||||
case CSCEN_TEMPERATE:
|
||||
case CSCEN_ARCTIC:
|
||||
case CSCEN_TROPICAL:
|
||||
case CSCEN_TOYLAND:
|
||||
w->RaiseWidget(_opt_newgame.landscape + CSCEN_TEMPERATE);
|
||||
SetNewLandscapeType(e->we.click.widget - CSCEN_TEMPERATE);
|
||||
break;
|
||||
|
||||
case CSCEN_MAPSIZE_X_PULLDOWN: // Mapsize X
|
||||
ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_x, CSCEN_MAPSIZE_X_PULLDOWN);
|
||||
break;
|
||||
|
||||
case CSCEN_MAPSIZE_Y_PULLDOWN: // Mapsize Y
|
||||
ShowDropDownList(w, BuildMapsizeDropDown(), _patches_newgame.map_y, CSCEN_MAPSIZE_Y_PULLDOWN);
|
||||
break;
|
||||
|
||||
case CSCEN_EMPTY_WORLD: // Empty world / flat world
|
||||
StartGeneratingLandscape(GLWP_SCENARIO);
|
||||
break;
|
||||
|
||||
case CSCEN_RANDOM_WORLD: // Generate
|
||||
ShowGenerateLandscape();
|
||||
break;
|
||||
case CSCEN_START_DATE_DOWN: case CSCEN_START_DATE_UP: // Year buttons
|
||||
|
||||
case CSCEN_START_DATE_DOWN:
|
||||
case CSCEN_START_DATE_UP: // Year buttons
|
||||
/* Don't allow too fast scrolling */
|
||||
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
|
||||
w->HandleButtonClick(e->we.click.widget);
|
||||
|
@ -662,12 +698,15 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
|||
}
|
||||
_left_button_clicked = false;
|
||||
break;
|
||||
|
||||
case CSCEN_START_DATE_TEXT: // Year text
|
||||
WP(w, generate_d).widget_id = CSCEN_START_DATE_TEXT;
|
||||
SetDParam(0, _patches_newgame.starting_year);
|
||||
ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_START_DATE_QUERY_CAPT, 8, 100, w, CS_NUMERAL);
|
||||
break;
|
||||
case CSCEN_FLAT_LAND_HEIGHT_DOWN: case CSCEN_FLAT_LAND_HEIGHT_UP: // Height level buttons
|
||||
|
||||
case CSCEN_FLAT_LAND_HEIGHT_DOWN:
|
||||
case CSCEN_FLAT_LAND_HEIGHT_UP: // Height level buttons
|
||||
/* Don't allow too fast scrolling */
|
||||
if ((w->flags4 & WF_TIMEOUT_MASK) <= 2 << WF_TIMEOUT_SHL) {
|
||||
w->HandleButtonClick(e->we.click.widget);
|
||||
|
@ -677,6 +716,7 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
|||
}
|
||||
_left_button_clicked = false;
|
||||
break;
|
||||
|
||||
case CSCEN_FLAT_LAND_HEIGHT_TEXT: // Height level text
|
||||
WP(w, generate_d).widget_id = CSCEN_FLAT_LAND_HEIGHT_TEXT;
|
||||
SetDParam(0, _patches_newgame.se_flat_world_height);
|
||||
|
@ -693,7 +733,7 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
|||
SetWindowDirty(w);
|
||||
break;
|
||||
|
||||
case WE_ON_EDIT_TEXT: {
|
||||
case WE_ON_EDIT_TEXT:
|
||||
if (e->we.edittext.str != NULL) {
|
||||
int32 value = atoi(e->we.edittext.str);
|
||||
|
||||
|
@ -702,6 +742,7 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
|||
w->InvalidateWidget(CSCEN_START_DATE_TEXT);
|
||||
_patches_newgame.starting_year = Clamp(value, MIN_YEAR, MAX_YEAR);
|
||||
break;
|
||||
|
||||
case CSCEN_FLAT_LAND_HEIGHT_TEXT:
|
||||
w->InvalidateWidget(CSCEN_FLAT_LAND_HEIGHT_TEXT);
|
||||
_patches_newgame.se_flat_world_height = Clamp(value, 0, MAX_TILE_HEIGHT);
|
||||
|
@ -713,7 +754,6 @@ static void CreateScenarioWndProc(Window *w, WindowEvent *e)
|
|||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const Widget _create_scenario_widgets[] = {
|
||||
{ WWT_CLOSEBOX, RESIZE_NONE, 13, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW},
|
||||
|
|
Loading…
Reference in New Issue