mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(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.

release/0.7
rubidium 2008-06-03 08:06:58 +00:00
parent abf2b0efc3
commit 1ddfdda02c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network_internal.h
View File

@ -93,8 +93,6 @@ enum NetworkLanguage {
NETLANG_COUNT NETLANG_COUNT
}; };
#define VARDEF extern
extern NetworkPlayerInfo _network_player_info[MAX_PLAYERS]; extern NetworkPlayerInfo _network_player_info[MAX_PLAYERS];
extern uint32 _frame_counter_server; // The frame_counter of the server, if in network-mode extern uint32 _frame_counter_server; // The frame_counter of the server, if in network-mode

4
src/openttd.h
View File

@ -5,10 +5,6 @@
#ifndef OPENTTD_H #ifndef OPENTTD_H
#define OPENTTD_H #define OPENTTD_H
#ifndef VARDEF
#define VARDEF extern
#endif
enum GameModes { enum GameModes {
GM_MENU, GM_MENU,
GM_NORMAL, GM_NORMAL,

4
src/variables.h
View File

@ -5,6 +5,10 @@
#ifndef VARIABLES_H #ifndef VARIABLES_H
#define VARIABLES_H #define VARIABLES_H
#ifndef VARDEF
#define VARDEF extern
#endif
/* Amount of game ticks */ /* Amount of game ticks */
VARDEF uint16 _tick_counter; VARDEF uint16 _tick_counter;