Mercurial > hg > openttd

changeset 15530:d2f5d90e6265 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20189) -Codechange: unVARDEF _display_opt and move it to a more logical location
author rubidium <rubidium@openttd.org>
date Mon, 19 Jul 2010 17:13:46 +0000
parents 152dcc71db0d
children 93093fe9137c
files src/gui.h src/transparency.h src/transparency_gui.cpp src/variables.h
diffstat 4 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui.h
+++ b/src/gui.h
@@ -74,5 +74,4 @@
 void ShowFoundTownWindow();
 void ShowMusicWindow();
 
-
 #endif /* GUI_H */
--- a/src/transparency.h
+++ b/src/transparency.h
@@ -38,6 +38,7 @@
 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
--- 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 {
--- 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;