From 087cae82fcffa55c606c10fb0601e1ad566119fc Mon Sep 17 00:00:00 2001 From: Yourself Date: Fri, 10 Jul 2020 15:18:05 -0700 Subject: [PATCH] Add: zero tree growth setting --- src/lang/english.txt | 1 + src/lang/german.txt | 1 + src/lang/korean.txt | 1 + src/table/settings.ini | 2 +- src/tree_cmd.cpp | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lang/english.txt b/src/lang/english.txt index 313a61bdf0..893a11f9c2 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1785,6 +1785,7 @@ STR_CONFIG_SETTING_TREE_GROWTH_NORMAL :Normal STR_CONFIG_SETTING_TREE_GROWTH_SLOW :Slow STR_CONFIG_SETTING_TREE_GROWTH_VERY_SLOW :Very slow STR_CONFIG_SETTING_TREE_GROWTH_EXTREMLY_SLOW :Extremly slow +STR_CONFIG_SETTING_TREE_GROWTH_STATIC :None STR_CONFIG_SETTING_TOOLBAR_POS :Position of main toolbar: {STRING2} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontal position of the main toolbar at the top of the screen diff --git a/src/lang/german.txt b/src/lang/german.txt index 7231d685af..1f857feaba 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1710,6 +1710,7 @@ STR_CONFIG_SETTING_TREE_GROWTH_NORMAL :Normal STR_CONFIG_SETTING_TREE_GROWTH_SLOW :Langsam STR_CONFIG_SETTING_TREE_GROWTH_VERY_SLOW :Sehr langsam STR_CONFIG_SETTING_TREE_GROWTH_EXTREMLY_SLOW :Extrem langsam +STR_CONFIG_SETTING_TREE_GROWTH_STATIC :Keiner STR_CONFIG_SETTING_TOOLBAR_POS :Position der Werkzeugleiste: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :Horizontale Position der Bauleiste am oberen Bildschirmrand diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 141cbfb7da..a28895a748 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1777,6 +1777,7 @@ STR_CONFIG_SETTING_TREE_GROWTH_NORMAL :보통 STR_CONFIG_SETTING_TREE_GROWTH_SLOW :느림 STR_CONFIG_SETTING_TREE_GROWTH_VERY_SLOW :다소 느림 STR_CONFIG_SETTING_TREE_GROWTH_EXTREMLY_SLOW :매우 느림 +STR_CONFIG_SETTING_TREE_GROWTH_STATIC :없음 STR_CONFIG_SETTING_TOOLBAR_POS :주메뉴의 위치: {STRING} STR_CONFIG_SETTING_TOOLBAR_POS_HELPTEXT :주 메뉴가 화면 상단의 어느 위치에 표시될지를 선택합니다. diff --git a/src/table/settings.ini b/src/table/settings.ini index 8bed03078b..ad67c67994 100644 --- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -3558,7 +3558,7 @@ type = SLE_UINT8 guiflags = SGF_MULTISTRING def = 0 min = 0 -max = 3 +max = 4 str = STR_CONFIG_SETTING_TREE_GROWTH strhelp = STR_CONFIG_SETTING_TREE_GROWTH_HELPTEXT strval = STR_CONFIG_SETTING_TREE_GROWTH_NORMAL diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index a691603452..00e5c41b66 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -762,7 +762,7 @@ static void TileLoop_Trees(TileIndex tile) if (GetTreeCounter(tile) < 15) { if (_settings_game.construction.tree_growth_rate > 0) { /* slow, very slow, extremely slow */ - uint16 grow_slowing_values[3] = { 0x10000 / 5, 0x10000 / 20, 0x10000 / 120 }; + uint16 grow_slowing_values[4] = { 0x10000 / 5, 0x10000 / 20, 0x10000 / 120, 0 }; if (GB(Random(), 0, 16) < grow_slowing_values[_settings_game.construction.tree_growth_rate - 1]) { AddTreeCounter(tile, 1);