diff options
| author | rubidium <rubidium@openttd.org> | 2010-07-19 16:21:49 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-07-19 16:21:49 +0000 |
| commit | 34764feac226f4a962cfa7957db79feb617c900c (patch) | |
| tree | f74f88b30c7f66b30ac4151abef40aeb2590d86c /src | |
| parent | e38f503ec03f1bdd6f81ece65c6dca56ded2d935 (diff) | |
| download | openttd-34764feac226f4a962cfa7957db79feb617c900c.tar.xz | |
(svn r20186) -Codechange: remove VARDEF from _realtime_tick and _rightclick_emulate
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug.cpp | 1 | ||||
| -rw-r--r-- | src/debug.h | 3 | ||||
| -rw-r--r-- | src/driver.cpp | 1 | ||||
| -rw-r--r-- | src/misc.cpp | 1 | ||||
| -rw-r--r-- | src/variables.h | 4 | ||||
| -rw-r--r-- | src/video/video_driver.hpp | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/src/debug.cpp b/src/debug.cpp index 8ef91bed0..85c42bdaf 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -40,6 +40,7 @@ int _debug_gamelog_level; int _debug_desync_level; int _debug_console_level; +uint32 _realtime_tick = 0; struct DebugLevel { const char *name; diff --git a/src/debug.h b/src/debug.h index 019f5d58d..de4c0c571 100644 --- a/src/debug.h +++ b/src/debug.h @@ -97,4 +97,7 @@ void CDECL ShowInfoF(const char *str, ...) WARN_FORMAT(1, 2); const char *GetLogPrefix(); +/** The real time in the game. */ +extern uint32 _realtime_tick; + #endif /* DEBUG_H */ diff --git a/src/driver.cpp b/src/driver.cpp index f0e5d70db..931913bf0 100644 --- a/src/driver.cpp +++ b/src/driver.cpp @@ -21,6 +21,7 @@ char *_ini_videodriver; int _num_resolutions; Dimension _resolutions[32]; Dimension _cur_resolution; +bool _rightclick_emulate; SoundDriver *_sound_driver; char *_ini_sounddriver; diff --git a/src/misc.cpp b/src/misc.cpp index 2d8c6b06f..b27966ec0 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -66,7 +66,6 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin _pause_mode = PM_UNPAUSED; _fast_forward = 0; _tick_counter = 0; - _realtime_tick = 0; _date_fract = 0; _cur_tileloop_tile = 0; _thd.redsq = INVALID_TILE; diff --git a/src/variables.h b/src/variables.h index 28181d094..9c7a0712c 100644 --- 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; diff --git a/src/video/video_driver.hpp b/src/video/video_driver.hpp index e9508bbae..f8defcca2 100644 --- a/src/video/video_driver.hpp +++ b/src/video/video_driver.hpp @@ -45,5 +45,6 @@ extern char *_ini_videodriver; extern int _num_resolutions; extern Dimension _resolutions[32]; extern Dimension _cur_resolution; +extern bool _rightclick_emulate; #endif /* VIDEO_VIDEO_DRIVER_HPP */ |