petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r24315) -Fix: Make the AI settings window behave more like the other settings window by closing the query window whenever selecting a different row.

Browse Source
This commit is contained in:
frosch
2012-06-01 15:13:34 +00:00
parent fde15bf393
commit 625ec041b9
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ai/ai_gui.cpp
View File

@@ -432,15 +432,21 @@ struct AISettingsWindow : public Window {
const ScriptConfigItem config_item = **it; const ScriptConfigItem config_item = **it;
if (_game_mode == GM_NORMAL && ((this->slot == OWNER_DEITY) || Company::IsValidID(this->slot)) && (config_item.flags & SCRIPTCONFIG_INGAME) == 0) return; if (_game_mode == GM_NORMAL && ((this->slot == OWNER_DEITY) || Company::IsValidID(this->slot)) && (config_item.flags & SCRIPTCONFIG_INGAME) == 0) return;
if (this->clicked_row != num) {
DeleteChildWindows(WC_QUERY_STRING);
this->clicked_row = num;
}
bool bool_item = (config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0; bool bool_item = (config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0;
int x = pt.x - wid->pos_x; int x = pt.x - wid->pos_x;
if (_current_text_dir == TD_RTL) x = wid->current_x - 1 - x; if (_current_text_dir == TD_RTL) x = wid->current_x - 1 - x;
x -= 4; x -= 4;
/* One of the arrows is clicked (or green/red rect in case of bool value) */ /* One of the arrows is clicked (or green/red rect in case of bool value) */
int old_val = this->ai_config->GetSetting(config_item.name);
if (IsInsideMM(x, 0, SETTING_BUTTON_WIDTH)) { if (IsInsideMM(x, 0, SETTING_BUTTON_WIDTH)) {
int new_val = this->ai_config->GetSetting(config_item.name); int new_val = old_val;
int old_val = new_val;
if (bool_item) { if (bool_item) {
new_val = !new_val; new_val = !new_val;
} else if (x >= SETTING_BUTTON_WIDTH / 2) { } else if (x >= SETTING_BUTTON_WIDTH / 2) {
@@ -464,8 +470,7 @@ struct AISettingsWindow : public Window {
} }
} else if (!bool_item) { } else if (!bool_item) {
/* Display a query box so users can enter a custom value. */ /* Display a query box so users can enter a custom value. */
this->clicked_row = num; SetDParam(0, old_val);
SetDParam(0, this->ai_config->GetSetting(config_item.name));
ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, this, CS_NUMERAL, QSF_NONE); ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, this, CS_NUMERAL, QSF_NONE);
} }
this->SetDirty(); this->SetDirty();