Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r13060) -Codechange: update build industry window when raw_industry_construction setting is modified

Browse Source
pull/155/head
glx 16 years ago
parent 9f11d3089a
commit eb70da38d0
2 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File

76
src/industry_gui.cpp
Unescape Escape View File

@ -103,45 +103,25 @@ class BuildIndustryWindow : public Window {
StringID text[NUM_INDUSTRYTYPES + 1]; ///< Text coming from CBM_IND_FUND_MORE_TEXT (if ever)
bool enabled[NUM_INDUSTRYTYPES + 1]; ///< availability state, coming from CBID_INDUSTRY_AVAILABLE (if ever)
public:
BuildIndustryWindow() : Window(&_build_industry_desc)
void SetupArrays()
{
IndustryType ind;
const IndustrySpec *indsp;
/* Shorten the window to the equivalant of the additionnal purchase
* info coming from the callback. SO it will only be available to tis full
* height when newindistries are loaded */
if (!_loaded_newgrf_features.has_newindustries) {
this->widget[DPIW_INFOPANEL].bottom -= 44;
this->widget[DPIW_FUND_WIDGET].bottom -= 44;
this->widget[DPIW_FUND_WIDGET].top -= 44;
this->widget[DPIW_RESIZE_WIDGET].bottom -= 44;
this->widget[DPIW_RESIZE_WIDGET].top -= 44;
this->resize.height = this->height -= 44;
}
this->timer_enabled = _loaded_newgrf_features.has_newindustries;
/* Initialize structures */
this->count = 0;
for (uint i = 0; i < lengthof(this->index); i++) {
this->index[i] = 0xFF;
this->index[i] = INVALID_INDUSTRYTYPE;
this->text[i] = STR_NULL;
this->enabled[i] = false;
}
this->vscroll.cap = 8; // rows in grid, same in scroller
this->resize.step_height = 13;
if (_game_mode == GM_EDITOR) { // give room for the Many Random "button"
this->index[this->count] = INVALID_INDUSTRYTYPE;
this->count++;
this->timer_enabled = false;
}
/* Fill the _fund_gui structure with industries.
/* Fill the arrays with industries.
* The tests performed after the enabled allow to load the industries
* In the same way they are inserted by grf (if any)
*/
@ -151,17 +131,53 @@ public:
/* Rule is that editor mode loads all industries.
* In game mode, all non raw industries are loaded too
* and raw ones are loaded only when setting allows it */
if (_game_mode != GM_EDITOR && indsp->IsRawIndustry() && _patches.raw_industry_construction == 0) continue;
if (_game_mode != GM_EDITOR && indsp->IsRawIndustry() && _patches.raw_industry_construction == 0) {
/* Unselect if the industry is no longer in the list */
if (this->selected_type == ind) this->selected_index = -1;
continue;
}
this->index[this->count] = ind;
this->enabled[this->count] = (_game_mode == GM_EDITOR) || CheckIfCallBackAllowsAvailability(ind, IACT_USERCREATION);
/* Keep the selection to the correct line */
if (this->selected_type == ind) this->selected_index = this->count;
this->count++;
}
}
/* first indutry type is selected.
/* first indutry type is selected if the current selection is invalid.
* I'll be damned if there are none available ;) */
this->selected_index = 0;
this->selected_type = this->index[0];
if (this->selected_index == -1) {
this->selected_index = 0;
this->selected_type = this->index[0];
}
}
public:
BuildIndustryWindow() : Window(&_build_industry_desc)
{
/* Shorten the window to the equivalant of the additionnal purchase
* info coming from the callback. SO it will only be available to its full
* height when newindistries are loaded */
if (!_loaded_newgrf_features.has_newindustries) {
this->widget[DPIW_INFOPANEL].bottom -= 44;
this->widget[DPIW_FUND_WIDGET].bottom -= 44;
this->widget[DPIW_FUND_WIDGET].top -= 44;
this->widget[DPIW_RESIZE_WIDGET].bottom -= 44;
this->widget[DPIW_RESIZE_WIDGET].top -= 44;
this->resize.height = this->height -= 44;
}
this->timer_enabled = _loaded_newgrf_features.has_newindustries;
this->vscroll.cap = 8; // rows in grid, same in scroller
this->resize.step_height = 13;
this->selected_index = -1;
this->selected_type = INVALID_INDUSTRYTYPE;
/* Initialize arrays */
this->SetupArrays();
this->callback_timer = DAY_TICKS;
this->FindWindowPlacementAndResize(&_build_industry_desc);
@ -392,6 +408,12 @@ public:
{
this->RaiseButtons();
}
virtual void OnInvalidateData(int data = 0)
{
this->SetupArrays();
this->SetDirty();
}
};
void ShowBuildIndustryWindow()

8
src/settings.cpp
Unescape Escape View File

@ -1147,6 +1147,12 @@ static int32 InvalidateStationBuildWindow(int32 p1)
return 0;
}
static int32 InvalidateBuildIndustryWindow(int32 p1)
{
InvalidateWindowData(WC_BUILD_INDUSTRY, 0);
return 0;
}
static int32 CloseSignalGUI(int32 p1)
{
if (p1 == 0) {
@ -1488,7 +1494,7 @@ const SettingDesc _patch_settings[] = {
/***************************************************************************/
/* Economy section of the GUI-configure patches window */
SDT_BOOL(Patches, inflation, 0, 0, true, STR_CONFIG_PATCHES_INFLATION, NULL),
SDT_VAR(Patches, raw_industry_construction,SLE_UINT8,0,MS,0,0, 2, 0, STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD, NULL),
SDT_VAR(Patches, raw_industry_construction,SLE_UINT8,0,MS,0,0, 2, 0, STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD, InvalidateBuildIndustryWindow),
SDT_BOOL(Patches, multiple_industry_per_town, 0, 0, false, STR_CONFIG_PATCHES_MULTIPINDTOWN, NULL),
SDT_BOOL(Patches, same_industry_close, 0, 0, false, STR_CONFIG_PATCHES_SAMEINDCLOSE, NULL),
SDT_BOOL(Patches, bribe, 0, 0, true, STR_CONFIG_PATCHES_BRIBE, NULL),

Write Preview
Loading…
Cancel
Save