mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r12018) -Fix(FS#1721,r9563): Restore initial intent on the invisible tree while transparent building patch setting

This commit is contained in:
belugas 2008-01-30 03:34:24 +00:00
parent 44f4ebffed
commit 94aa04948c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main_gui.cpp
View File

@ -176,10 +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_TREES);
ToggleTransparency(TO_HOUSES);
break;
case 12: ToggleTransparency(TO_HOUSES); break;
case 13: ToggleTransparency(TO_SIGNS); break;
}
MarkWholeScreenDirty();

6
src/transparency_gui.cpp
View File

@ -7,6 +7,7 @@
#include "variables.h"
#include "transparency.h"
#include "sound_func.h"
#include "settings_type.h"
#include "table/sprites.h"
#include "table/strings.h"
@ -37,6 +38,11 @@ static void TransparencyToolbWndProc(Window *w, WindowEvent *e)
for (uint i = TTW_WIDGET_SIGNS; i < TTW_WIDGET_END; i++) {
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;

3
src/tree_cmd.cpp
View File

@ -428,7 +428,8 @@ static void DrawTile_Trees(TileInfo *ti)
StartSpriteCombine();
if (!(IsTransparencySet(TO_TREES) && _patches.invisible_trees)) {
/* Do not draw trees when buildings are transparent and when the invisile trees patch is on */
if (!(_patches.invisible_trees && IsTransparencySet(TO_HOUSES))) {
TreeListEnt te[4];
uint i;