Mercurial > hg > openttd

changeset 15527:87b3b2d2fdf1 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20186) -Codechange: remove VARDEF from _realtime_tick and _rightclick_emulate
author rubidium <rubidium@openttd.org>
date Mon, 19 Jul 2010 16:21:49 +0000
parents 5f8dc60f1939
children 8e6b5d370794
files src/debug.cpp src/debug.h src/driver.cpp src/misc.cpp src/variables.h src/video/video_driver.hpp
diffstat 6 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -40,6 +40,7 @@
 int _debug_desync_level;
 int _debug_console_level;
 
+uint32 _realtime_tick = 0;
 
 struct DebugLevel {
 	const char *name;
--- a/src/debug.h
+++ b/src/debug.h
@@ -97,4 +97,7 @@
 
 const char *GetLogPrefix();
 
+/** The real time in the game. */
+extern uint32 _realtime_tick;
+
 #endif /* DEBUG_H */
--- a/src/driver.cpp
+++ b/src/driver.cpp
@@ -21,6 +21,7 @@
 int _num_resolutions;
 Dimension _resolutions[32];
 Dimension _cur_resolution;
+bool _rightclick_emulate;
 
 SoundDriver *_sound_driver;
 char *_ini_sounddriver;
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -66,7 +66,6 @@
 	_pause_mode = PM_UNPAUSED;
 	_fast_forward = 0;
 	_tick_counter = 0;
-	_realtime_tick = 0;
 	_date_fract = 0;
 	_cur_tileloop_tile = 0;
 	_thd.redsq = INVALID_TILE;
--- a/src/variables.h
+++ b/src/variables.h
@@ -19,12 +19,8 @@
 /* Amount of game ticks */
 VARDEF uint16 _tick_counter;
 
-VARDEF uint32 _realtime_tick;
-
 VARDEF byte _display_opt;
 
-VARDEF bool _rightclick_emulate;
-
 /* IN/OUT parameters to commands */
 VARDEF bool _generating_world;
 
--- a/src/video/video_driver.hpp
+++ b/src/video/video_driver.hpp
@@ -45,5 +45,6 @@
 extern int _num_resolutions;
 extern Dimension _resolutions[32];
 extern Dimension _cur_resolution;
+extern bool _rightclick_emulate;
 
 #endif /* VIDEO_VIDEO_DRIVER_HPP */