summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-12-16 16:57:26 +0000
committerrubidium <rubidium@openttd.org>2009-12-16 16:57:26 +0000
commit5afa990ccf681d0659c34a65601910f00658863f (patch)
treeede6e2c72fbb2fbbbef8d528de149a55440a9a94
parentfbfcbe06ec90777a514c42fd928cce2721718891 (diff)
downloadopenttd-5afa990ccf681d0659c34a65601910f00658863f.tar.xz
(svn r18516) -Feature [FS#3359]: moving of AIs in the AI configuration window. Based on a patch by Zuu.
-rw-r--r--src/ai/ai_gui.cpp26
-rw-r--r--src/lang/english.txt5
2 files changed, 30 insertions, 1 deletions
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index a46e81654..aa8ee1179 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -446,6 +446,8 @@ enum AIConfigWindowWidgets {
AIC_WIDGET_NUMBER, ///< Number of AIs
AIC_WIDGET_LIST, ///< List with currently selected AIs
AIC_WIDGET_SCROLLBAR, ///< Scrollbar to scroll through the selected AIs
+ AIC_WIDGET_MOVE_UP, ///< Move up button
+ AIC_WIDGET_MOVE_DOWN, ///< Move down button
AIC_WIDGET_CHANGE, ///< Select another AI button
AIC_WIDGET_CONFIGURE, ///< Change AI settings button
AIC_WIDGET_CLOSE, ///< Close window button
@@ -458,13 +460,17 @@ static const NWidgetPart _nested_ai_config_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_MAUVE), SetDataTip(STR_AI_CONFIG_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
EndContainer(),
NWidget(WWT_PANEL, COLOUR_MAUVE, AIC_WIDGET_BACKGROUND),
- NWidget(NWID_VERTICAL), SetPIP(4, 0, 4),
+ NWidget(NWID_VERTICAL), SetPIP(4, 4, 4),
NWidget(NWID_HORIZONTAL), SetPIP(10, 0, 10),
NWidget(NWID_BUTTON_ARROW, COLOUR_YELLOW, AIC_WIDGET_DECREASE), SetFill(0, 1), SetDataTip(AWV_DECREASE, STR_NULL),
NWidget(NWID_BUTTON_ARROW, COLOUR_YELLOW, AIC_WIDGET_INCREASE), SetFill(0, 1), SetDataTip(AWV_INCREASE, STR_NULL),
NWidget(NWID_SPACER), SetMinimalSize(6, 0),
NWidget(WWT_TEXT, COLOUR_MAUVE, AIC_WIDGET_NUMBER), SetDataTip(STR_DIFFICULTY_LEVEL_SETTING_MAXIMUM_NO_COMPETITORS, STR_NULL), SetFill(1, 0), SetPadding(1, 0, 0, 0),
EndContainer(),
+ NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(10, 0, 10),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_MOVE_UP), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_AI_CONFIG_MOVE_UP, STR_AI_CONFIG_MOVE_UP_TOOLTIP),
+ NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, AIC_WIDGET_MOVE_DOWN), SetResize(1, 0), SetFill(1, 0), SetDataTip(STR_AI_CONFIG_MOVE_DOWN, STR_AI_CONFIG_MOVE_DOWN_TOOLTIP),
+ EndContainer(),
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_MATRIX, COLOUR_MAUVE, AIC_WIDGET_LIST), SetMinimalSize(288, 112), SetFill(1, 0), SetDataTip(0x801, STR_AI_CONFIG_LIST_TOOLTIP),
@@ -588,6 +594,22 @@ struct AIConfigWindow : public Window {
break;
}
+ case AIC_WIDGET_MOVE_UP:
+ if (this->selected_slot > 1) {
+ Swap(_settings_newgame.ai_config[this->selected_slot], _settings_newgame.ai_config[this->selected_slot - 1]);
+ this->selected_slot--;
+ this->InvalidateData();
+ }
+ break;
+
+ case AIC_WIDGET_MOVE_DOWN:
+ if (this->selected_slot < _settings_newgame.difficulty.max_no_competitors) {
+ Swap(_settings_newgame.ai_config[this->selected_slot], _settings_newgame.ai_config[this->selected_slot + 1]);
+ this->selected_slot++;
+ this->InvalidateData();
+ }
+ break;
+
case AIC_WIDGET_CHANGE: // choose other AI
ShowAIListWindow((CompanyID)this->selected_slot);
break;
@@ -632,6 +654,8 @@ struct AIConfigWindow : public Window {
this->SetWidgetDisabledState(AIC_WIDGET_INCREASE, _settings_newgame.difficulty.max_no_competitors == MAX_COMPANIES - 1);
this->SetWidgetDisabledState(AIC_WIDGET_CHANGE, this->selected_slot == INVALID_COMPANY);
this->SetWidgetDisabledState(AIC_WIDGET_CONFIGURE, this->selected_slot == INVALID_COMPANY);
+ this->SetWidgetDisabledState(AIC_WIDGET_MOVE_UP, this->selected_slot == INVALID_COMPANY || this->selected_slot == 1);
+ this->SetWidgetDisabledState(AIC_WIDGET_MOVE_DOWN, this->selected_slot == INVALID_COMPANY || this->selected_slot == _settings_newgame.difficulty.max_no_competitors);
}
virtual void OnTick()
diff --git a/src/lang/english.txt b/src/lang/english.txt
index 25d5b8294..17b0032b1 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -3191,6 +3191,11 @@ STR_AI_CONFIG_LIST_TOOLTIP :{BLACK}All AIs
STR_AI_CONFIG_HUMAN_PLAYER :Human player
STR_AI_CONFIG_RANDOM_AI :Random AI
+STR_AI_CONFIG_MOVE_UP :{BLACK}Move Up
+STR_AI_CONFIG_MOVE_UP_TOOLTIP :{BLACK}Move selected AI up in the list
+STR_AI_CONFIG_MOVE_DOWN :{BLACK}Move Down
+STR_AI_CONFIG_MOVE_DOWN_TOOLTIP :{BLACK}Move selected AI down in the list
+
STR_AI_CONFIG_CHANGE :{BLACK}Select AI
STR_AI_CONFIG_CHANGE_TOOLTIP :{BLACK}Load another AI
STR_AI_CONFIG_CONFIGURE :{BLACK}Configure