Changeset - r8448:0e0005049cd7
[Not reviewed]
master
0 3 0
belugas - 16 years ago 2008-01-30 03:34:24
belugas@openttd.org
(svn r12018) -Fix(FS#1721,r9563): Restore initial intent on the invisible tree while transparent building patch setting
3 files changed with 9 insertions and 5 deletions:
0 comments (0 inline, 0 general)
src/main_gui.cpp
Show inline comments
 
@@ -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();
src/transparency_gui.cpp
Show inline comments
 
@@ -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(Win
 
			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;
 

	
src/tree_cmd.cpp
Show inline comments
 
@@ -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;
 

	
0 comments (0 inline, 0 general)