diff options
| author | belugas <belugas@openttd.org> | 2008-01-30 17:36:28 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2008-01-30 17:36:28 +0000 |
| commit | caf7e8655c4d26b62795817f50da01ce744d2973 (patch) | |
| tree | 9faeacbb5a9ce414828f7061dd7ad9e356f64e0e | |
| parent | 953c3cb6df0196aa5a908d6f2eaebd51584c4cf0 (diff) | |
| download | openttd-caf7e8655c4d26b62795817f50da01ce744d2973.tar.xz | |
(svn r12022) -Revert(r12018): Invisible trees are now separate from the building concept.
So when you want invisible trees, just select the option of the same name in the Patch Options and toggle transparency of trees.
More to come on the saga of Invisibility. So stay tuned.
| -rw-r--r-- | src/lang/english.txt | 2 | ||||
| -rw-r--r-- | src/main_gui.cpp | 2 | ||||
| -rw-r--r-- | src/transparency_gui.cpp | 5 | ||||
| -rw-r--r-- | src/tree_cmd.cpp | 4 |
4 files changed, 4 insertions, 9 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt index 31c9b552c..7e25bfd8d 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1068,7 +1068,7 @@ STR_CONFIG_PATCHES_AUTORENEW_MONTHS :{LTBLUE}Autoren STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Autorenew minimum needed money for renew: {ORANGE}{STRING1} STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Duration of error message: {ORANGE}{STRING1} STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Show town population in the town name label: {ORANGE}{STRING1} -STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Invisible trees (with transparent buildings): {ORANGE}{STRING1} +STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Invisible trees: {ORANGE}{STRING1} STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Land generator: {ORANGE}{STRING1} STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Original diff --git a/src/main_gui.cpp b/src/main_gui.cpp index c5a4ac5b6..100082285 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -176,7 +176,7 @@ static void MenuClickSettings(int index) case 9: ToggleBit(_display_opt, DO_WAYPOINTS); break; case 10: ToggleBit(_display_opt, DO_FULL_ANIMATION); break; case 11: ToggleBit(_display_opt, DO_FULL_DETAIL); break; - case 12: ToggleTransparency(TO_HOUSES); break; + case 12: ToggleTransparency(TO_HOUSES); break; case 13: ToggleTransparency(TO_SIGNS); break; } MarkWholeScreenDirty(); diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index df214e81d..33c21d078 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -7,7 +7,6 @@ #include "variables.h" #include "transparency.h" #include "sound_func.h" -#include "settings_type.h" #include "table/sprites.h" #include "table/strings.h" @@ -39,10 +38,6 @@ static void TransparencyToolbWndProc(Window *w, WindowEvent *e) w->SetWidgetLoweredState(i, IsTransparencySet((TransparencyOption)(i - TTW_WIDGET_SIGNS))); } - /* Disabling the trees button allows to make it very evident that it has no effect - * upon current situation */ - w->SetWidgetDisabledState(TTW_WIDGET_TREES, _patches.invisible_trees && IsTransparencySet(TO_HOUSES)); - DrawWindowWidgets(w); break; diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index 890243ed6..1adce1a9d 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -428,8 +428,8 @@ static void DrawTile_Trees(TileInfo *ti) StartSpriteCombine(); - /* Do not draw trees when buildings are transparent and when the invisile trees patch is on */ - if (!(_patches.invisible_trees && IsTransparencySet(TO_HOUSES))) { + /* Do not draw trees when the invisible trees patch and transparency tree are set */ + if (!(IsTransparencySet(TO_TREES) && _patches.invisible_trees)) { TreeListEnt te[4]; uint i; |