miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unused variable

Browse Source
This commit is contained in:
pelya
2014-03-23 15:39:18 +02:00
parent 386261656d
commit 982c84b3ee
4 changed files with 2 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/settings_type.h
View File

@@ -81,7 +81,6 @@ struct GUISettings {
TouchscreenModeByte touchscreen_mode; ///< touchscreen mode for toolbars TouchscreenModeByte touchscreen_mode; ///< touchscreen mode for toolbars
uint min_button; ///< min size of most button widgets uint min_button; ///< min size of most button widgets
uint min_step; ///< min size of scrollbar/dropdown elements uint min_step; ///< min size of scrollbar/dropdown elements
bool manage_min_sizing; ///< automatically set min_button and min_step
bool show_finances; ///< show finances at end of year bool show_finances; ///< show finances at end of year
bool sg_new_nonstop; ///< ttdpatch compatible nonstop handling read from pre v93 savegames bool sg_new_nonstop; ///< ttdpatch compatible nonstop handling read from pre v93 savegames
bool new_nonstop; ///< ttdpatch compatible nonstop handling bool new_nonstop; ///< ttdpatch compatible nonstop handling

5
src/table/misc_settings.ini
View File

@@ -228,11 +228,6 @@ min = 0
max = 100 max = 100
cat = SC_EXPERT cat = SC_EXPERT
[SDTG_BOOL]
name = ""manage_min_sizing""
var = _settings_client.gui.manage_min_sizing
def = false
[SDTG_VAR] [SDTG_VAR]
name = ""min_step_size"" name = ""min_step_size""
type = SLE_UINT type = SLE_UINT

4
src/vehicle_gui.cpp
View File

@@ -1474,11 +1474,11 @@ public:
switch (this->vli.vtype) { switch (this->vli.vtype) {
case VEH_TRAIN: case VEH_TRAIN:
case VEH_ROAD: case VEH_ROAD:
size->height = 6 * resize->height; size->height = 7 * resize->height;
break; break;
case VEH_SHIP: case VEH_SHIP:
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
size->height = 4 * resize->height; size->height = 3 * resize->height;
break; break;
default: NOT_REACHED(); default: NOT_REACHED();
} }

46
src/window.cpp
View File

@@ -1818,57 +1818,11 @@ int SETTING_BUTTON_HEIGHT = 10;
*/ */
void CheckWindowMinSizings() void CheckWindowMinSizings()
{ {
if (_settings_client.gui.manage_min_sizing) {
/* Fill the min sizing values for the current resolution. */
uint swap_x = 32; // in longest border, let main toolbar to have 30 buttons.
uint swap_y = 16; // if short border, let main toolbar have 16/18/20 buttons..)
if (_cur_resolution.width < _cur_resolution.height) Swap(swap_x, swap_y);
_settings_client.gui.min_button = min(_cur_resolution.width / swap_x, _cur_resolution.height / swap_y);
_settings_client.gui.min_step = _settings_client.gui.min_button * 3 / 4;
}
SETTING_BUTTON_HEIGHT = max<int>(GetMinSizing(NWST_STEP) - 10, 10); SETTING_BUTTON_HEIGHT = max<int>(GetMinSizing(NWST_STEP) - 10, 10);
SETTING_BUTTON_WIDTH = 2 * SETTING_BUTTON_HEIGHT; SETTING_BUTTON_WIDTH = 2 * SETTING_BUTTON_HEIGHT;
extern uint _tooltip_width; extern uint _tooltip_width;
_tooltip_width = max<uint>(194, 10 * _settings_client.gui.min_button); _tooltip_width = max<uint>(194, 10 * _settings_client.gui.min_button);
if (!_settings_client.gui.manage_min_sizing) return;
_freetype.large.size = _settings_client.gui.min_button;
_freetype.medium.size = max(_settings_client.gui.min_step * 2 / 3, 10U);
_freetype.mono.size = _freetype.medium.size;
_freetype.small.size = max(_freetype.medium.size * 2 / 3, 8U);
InitFreeType(true);
CheckForMissingGlyphs();
if (_z_front_window == NULL) return;
DeleteAllNonVitalWindows();
switch (_game_mode) {
default: break;
case GM_MENU:
DeleteWindowById(WC_SELECT_GAME, 0);
extern void ShowSelectGameWindow();
ShowSelectGameWindow();
break;
case GM_NORMAL:
case GM_EDITOR: {
Station *st;
FOR_ALL_STATIONS(st) { st->UpdateVirtCoord(); }
Waypoint *wp;
FOR_ALL_WAYPOINTS(wp) { wp->UpdateVirtCoord(); }
HideVitalWindows();
ShowVitalWindows();
break;
}
}
ShowErrorMessage(STR_ERROR_RESET_WINDOWS, STR_ERROR_AUTOMATIC_SIZING, WL_WARNING);
} }
/** /**