diff options
| author | rubidium <rubidium@openttd.org> | 2010-07-19 17:13:46 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-07-19 17:13:46 +0000 |
| commit | 51ca546a9dda04ba3b43a35fc0e751d31204244a (patch) | |
| tree | e5728159956ecf9f42b4dcc885f2c149a8d0b21e | |
| parent | eb30ebe1a4b5b6b5fef98331ec91c1d23b4a00cc (diff) | |
| download | openttd-51ca546a9dda04ba3b43a35fc0e751d31204244a.tar.xz | |
(svn r20189) -Codechange: unVARDEF _display_opt and move it to a more logical location
| -rw-r--r-- | src/gui.h | 1 | ||||
| -rw-r--r-- | src/transparency.h | 1 | ||||
| -rw-r--r-- | src/transparency_gui.cpp | 1 | ||||
| -rw-r--r-- | src/variables.h | 2 |
4 files changed, 2 insertions, 3 deletions
@@ -74,5 +74,4 @@ void ShowBuildIndustryWindow(); void ShowFoundTownWindow(); void ShowMusicWindow(); - #endif /* GUI_H */ diff --git a/src/transparency.h b/src/transparency.h index a6a33eaf0..ead80c731 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 038782678..18d11593d 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 f6aceaf5a..762c0a53e 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; |