(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.
This commit is contained in:
belugas 2008-01-30 17:36:28 +00:00
parent 953c3cb6df
commit caf7e8655c
4 changed files with 4 additions and 9 deletions

View File

@ -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

View File

@ -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();

View File

@ -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;

View File

@ -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;