diff options
| author | rubidium <rubidium@openttd.org> | 2008-06-03 08:06:58 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-06-03 08:06:58 +0000 |
| commit | a3150544430e78d35d847a7bf9e38e5833bbfcd2 (patch) | |
| tree | 61aa470715ee535a0744b1421979ab51a573ec9d | |
| parent | 994779e9e288f9400b57f05340c422cd11455bc6 (diff) | |
| download | openttd-a3150544430e78d35d847a7bf9e38e5833bbfcd2.tar.xz | |
(svn r13370) -Codechange: move the VARDEF stuff from openttd.h to variables.h so one doesn't need to include openttd.h before variables.h.
| -rw-r--r-- | src/network/network_internal.h | 2 | ||||
| -rw-r--r-- | src/openttd.h | 4 | ||||
| -rw-r--r-- | src/variables.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/network/network_internal.h b/src/network/network_internal.h index 4ed6141e0..dd6b401c3 100644 --- a/src/network/network_internal.h +++ b/src/network/network_internal.h @@ -93,8 +93,6 @@ enum NetworkLanguage { NETLANG_COUNT }; -#define VARDEF extern - extern NetworkPlayerInfo _network_player_info[MAX_PLAYERS]; extern uint32 _frame_counter_server; // The frame_counter of the server, if in network-mode diff --git a/src/openttd.h b/src/openttd.h index 7f61ca62e..44a39893d 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -5,10 +5,6 @@ #ifndef OPENTTD_H #define OPENTTD_H -#ifndef VARDEF -#define VARDEF extern -#endif - enum GameModes { GM_MENU, GM_NORMAL, diff --git a/src/variables.h b/src/variables.h index 3091fefc2..0304195f2 100644 --- a/src/variables.h +++ b/src/variables.h @@ -5,6 +5,10 @@ #ifndef VARIABLES_H #define VARIABLES_H +#ifndef VARDEF +#define VARDEF extern +#endif + /* Amount of game ticks */ VARDEF uint16 _tick_counter; |