From 51ca546a9dda04ba3b43a35fc0e751d31204244a Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 19 Jul 2010 17:13:46 +0000 Subject: [PATCH] (svn r20189) -Codechange: unVARDEF _display_opt and move it to a more logical location --- src/gui.h | 1 - src/transparency.h | 1 + src/transparency_gui.cpp | 1 + src/variables.h | 2 -- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui.h b/src/gui.h index 30867d830f..f896a290c5 100644 --- a/src/gui.h +++ b/src/gui.h @@ -74,5 +74,4 @@ void ShowBuildIndustryWindow(); void ShowFoundTownWindow(); void ShowMusicWindow(); - #endif /* GUI_H */ diff --git a/src/transparency.h b/src/transparency.h index a6a33eaf0e..ead80c7319 100644 --- a/src/transparency.h +++ b/src/transparency.h @@ -38,6 +38,7 @@ typedef uint TransparencyOptionBits; ///< transparency option bits extern TransparencyOptionBits _transparency_opt; extern TransparencyOptionBits _transparency_lock; extern TransparencyOptionBits _invisibility_opt; +extern byte _display_opt; ///< What do we want to draw/do? /** * Check if the transparency option bit is set diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp index 038782678a..18d11593de 100644 --- a/src/transparency_gui.cpp +++ b/src/transparency_gui.cpp @@ -20,6 +20,7 @@ TransparencyOptionBits _transparency_opt; TransparencyOptionBits _transparency_lock; TransparencyOptionBits _invisibility_opt; +byte _display_opt; /** Widget numbers of the transparency window. */ enum TransparencyToolbarWidgets { diff --git a/src/variables.h b/src/variables.h index f6aceaf5ab..762c0a53e9 100644 --- a/src/variables.h +++ b/src/variables.h @@ -19,8 +19,6 @@ /* Amount of game ticks */ VARDEF uint16 _tick_counter; -VARDEF byte _display_opt; - /* IN/OUT parameters to commands */ VARDEF bool _generating_world;