Loading

Revision differences

Return to paste
Old revision #pmbdhv4ftNew revision #pvg5ftb8r
1Index: src/ai/ai_gui.cpp  1Index: src/ai/ai_gui.cpp  
2===================================================================  2===================================================================  
3--- src/ai/ai_gui.cpp    (revision 27548)  3--- src/ai/ai_gui.cpp    (revision 27549)
4+++ src/ai/ai_gui.cpp    (working copy)  4+++ src/ai/ai_gui.cpp    (working copy)  
5@@ -751,6 +751,23 @@  5@@ -685,7 +685,7 @@
   6         EndContainer(),
   7         NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7),
   8             NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CHANGE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CHANGE, STR_AI_CONFIG_CHANGE_TOOLTIP),
   9-            NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP),
   10+            NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CONFIGURE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_DEBUG_SETTINGS_TOOLTIP),
   11             NWidget(WWT_PUSHTXTBTN, COLOUR_YELLOW, WID_AIC_CLOSE), SetFill(1, 0), SetMinimalSize(93, 12), SetDataTip(STR_AI_SETTINGS_CLOSE, STR_NULL),
   12             EndContainer(),
   13         NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(7, 0, 7),
   14@@ -751,6 +751,29 @@
6                         break;  15                         break;  
7                 }  16                 }  
8                 break;  17                 break;  
9+            case WID_AIC_CONFIGURE:  18+//            case WID_AIC_CONFIGURE:
10+                switch (selected_slot) {  19+//                switch (selected_slot) {
11+                    case OWNER_DEITY:  20+//                    case OWNER_DEITY:
12+                        SetDParam(0, _game_mode == GM_NORMAL ? IsEditable(this->selected_slot) ? STR_AI_CONFIG_CONFIGURE_SETTINGS : STR_AI_CONFIG_CONFIGURE_CONFIGURE : STR_AI_CONFIG_CONFIGURE_CONFIGURE);  21+//                        if (_game_mode == GM_NORMAL && IsEditable(selected_slot)) {
13+                        SetDParam(1, _game_mode == GM_NORMAL ? IsEditable(this->selected_slot) ? STR_AI_CONFIG_CONFIGURE_SETTINGS_TOOLTIP : STR_AI_CONFIG_CONFIGURE_CONFIGURE_TOOLTIP : STR_AI_CONFIG_CONFIGURE_CONFIGURE_TOOLTIP);  22+//                            SetDParam(0, STR_AI_DEBUG_SETTINGS);
14+                        break;  23+//                        } else {
   24+//                            SetDParam(0, STR_AI_CONFIG_CONFIGURE);
   25+//                        }
   26+//                        break;
15+  27+  
16+                    case INVALID_COMPANY:  16+//                    case INVALID_COMPANY:
17+                        SetDParam(0, STR_AI_CONFIG_CONFIGURE_CONFIGURE);  17+//                        SetDParam(0, STR_AI_CONFIG_CONFIGURE);
18+                        SetDParam(1, STR_AI_CONFIG_CONFIGURE_CONFIGURE_TOOLTIP);  18+//                        break;
19+                        break;    
20+  31+  
21+                    default:  32+//                    default:
22+                        SetDParam(0, (_game_mode == GM_NORMAL && IsEditable((CompanyID)(this->selected_slot)) && Company::IsValidID(this->selected_slot) && Company::IsValidAiID(this->selected_slot) && !Company::Get(this->selected_slot)->ai_instance->IsDead()) ? STR_AI_CONFIG_CONFIGURE_SETTINGS : STR_AI_CONFIG_CONFIGURE_CONFIGURE);  33+//                        if (_game_mode != GM_NORMAL || (_game_mode == GM_NORMAL && IsEditable((CompanyID)selected_slot) && (!Company::IsValidID(selected_slot) || Company::IsValidAiID(selected_slot) && Company::Get(selected_slot)->ai_instance->IsDead()))) {
23+                        SetDParam(1, (_game_mode == GM_NORMAL && IsEditable((CompanyID)(this->selected_slot)) && Company::IsValidID(this->selected_slot) && Company::IsValidAiID(this->selected_slot) && !Company::Get(this->selected_slot)->ai_instance->IsDead()) ? STR_AI_CONFIG_CONFIGURE_SETTINGS_TOOLTIP : STR_AI_CONFIG_CONFIGURE_CONFIGURE_TOOLTIP);  34+//                            SetDParam(0, STR_AI_CONFIG_CONFIGURE);
24+                    break;  35+//                        } else {
25+                }  36+//                            SetDParam(0, STR_AI_DEBUG_SETTINGS);
   37+//                        }
   38+//                        break;
   39+//                }
   40+//                break;
26         }  41         }  
27     }  42     }  
28   43   
29Index: src/lang/english.txt  29@@ -925,6 +948,16 @@
30===================================================================  30         this->SetWidgetDisabledState(WID_AIC_INCREASE, GetGameSettings().difficulty.max_no_competitors == MAX_COMPANIES - 1);
31--- src/lang/english.txt    (revision 27548)  31         this->SetWidgetDisabledState(WID_AIC_CHANGE, (this->selected_slot == OWNER_DEITY && _game_mode == GM_NORMAL) || this->selected_slot == INVALID_COMPANY);
32+++ src/lang/english.txt    (working copy)  32         this->SetWidgetDisabledState(WID_AIC_CONFIGURE, this->selected_slot == INVALID_COMPANY || GetConfig(this->selected_slot)->GetConfigList()->size() == 0);
33@@ -3999,8 +3999,12 @@  33+
34 STR_AI_CONFIG_CHANGE_AI                                         :AI  34+        NWidgetCore *configure_button = this->GetWidget<NWidgetCore>(WID_AIC_CONFIGURE);
35 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Game Script  35+        /* Display Configure button*/
36 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Load another script  36+        if (this->selected_slot == INVALID_OWNER || (this->selected_slot == OWNER_DEITY && _game_mode != GM_NORMAL && IsEditable(this->selected_slot)) || ((this->selected_slot != OWNER_DEITY && this->selected_slot != INVALID_OWNER) && (_game_mode != GM_NORMAL || (_game_mode == GM_NORMAL && IsEditable((CompanyID)selected_slot) && (!Company::IsValidID(selected_slot) || Company::IsValidAiID(selected_slot) && Company::Get(selected_slot)->ai_instance->IsDead()))))) {
37-STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configure  37+            configure_button->SetDataTip(STR_AI_CONFIG_CONFIGURE, STR_AI_CONFIG_CONFIGURE_TOOLTIP);
38-STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configure the parameters of the Script  38+        } else {
39+STR_AI_CONFIG_CONFIGURE                                         :{STRING}  39+            /* Display Settings button */
40+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{STRING}  40+            configure_button->SetDataTip(STR_AI_DEBUG_SETTINGS, STR_AI_DEBUG_SETTINGS_TOOLTIP);
41+STR_AI_CONFIG_CONFIGURE_CONFIGURE                               :{BLACK}Configure  41+        }
42+STR_AI_CONFIG_CONFIGURE_CONFIGURE_TOOLTIP                       :{BLACK}Configure the parameters of the Script  42+       
43+STR_AI_CONFIG_CONFIGURE_SETTINGS                                :{BLACK}Settings  43         this->SetWidgetDisabledState(WID_AIC_MOVE_UP, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot - 1)));
44+STR_AI_CONFIG_CONFIGURE_SETTINGS_TOOLTIP                        :{BLACK}Change the settings of the script  44         this->SetWidgetDisabledState(WID_AIC_MOVE_DOWN, this->selected_slot == OWNER_DEITY || this->selected_slot == INVALID_COMPANY || !IsEditable((CompanyID)(this->selected_slot + 1)));
45     
46 # Available AIs window    
47 STR_AI_LIST_CAPTION                                             :{WHITE}Available {STRING}