cpp/openttd-patchpack/source Changeset - r24234:a6aa4b6a9c2b

Changeset - r24234:a6aa4b6a9c2b

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Yexo - 4 years ago 2020-05-31 22:43:47
yexo@openttd.org

Codechange: replace custom timer and OnGameTick() with OnHundrethTick()

1 file changed with 2 insertions and 15 deletions:

src/industry_gui.cpp

0 comments (0 inline, 0 general)

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -270,8 +270,6 @@ static WindowDesc _build_industry_desc( @@
 class BuildIndustryWindow : public Window {
 	int selected_index;                         ///< index of the element in the matrix
 	IndustryType selected_type;                 ///< industry corresponding to the above index
 	uint16 callback_timer;                      ///< timer counter for callback eventual verification
 	bool timer_enabled;                         ///< timer can be used
 	uint16 count;                               ///< How many industries are loaded
 	IndustryType index[NUM_INDUSTRYTYPES + 1];  ///< Type of industry, in the order it was loaded
 	bool enabled[NUM_INDUSTRYTYPES + 1];        ///< availability state, coming from CBID_INDUSTRY_PROBABILITY (if ever)
@@ @@ -295,7 +293,6 @@ class BuildIndustryWindow : public Windo @@
 			this->index[this->count] = INVALID_INDUSTRYTYPE;
 			this->enabled[this->count] = true;
 			this->count++;
 			this->timer_enabled = false;
+		}
 		/* Fill the arrays with industries.
 		 * The tests performed after the enabled allow to load the industries
@@ @@ -387,13 +384,9 @@ class BuildIndustryWindow : public Windo @@
 public:
 	BuildIndustryWindow() : Window(&_build_industry_desc)
+	{
 		this->timer_enabled = _loaded_newgrf_features.has_newindustries;
 		this->selected_index = -1;
 		this->selected_type = INVALID_INDUSTRYTYPE;
 		this->callback_timer = DAY_TICKS;
 		this->CreateNestedTree();
 		this->vscroll = this->GetScrollbar(WID_DPI_SCROLLBAR);
 		this->FinishInitNested(0);
@@ @@ -673,14 +666,9 @@ public: @@
 		if (success && !_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
+	}
-	void OnGameTick() override
+	void OnHundredthTick() override
+	{
 		if (!this->timer_enabled) return;
 		if (--this->callback_timer == 0) {
 			/* We have just passed another day.
 			 * See if we need to update availability of currently selected industry */
 			this->callback_timer = DAY_TICKS; // restart counter
 		if (_game_mode == GM_EDITOR) return;
 			const IndustrySpec *indsp = GetIndustrySpec(this->selected_type);
 			if (indsp->enabled) {
@@ @@ -694,7 +682,6 @@ public: @@
+				}
+			}
+		}
+	}
 	void OnTimeout() override
+	{

0 comments (0 inline, 0 general)