cpp/openttd-patchpack/source Changeset - r9452:c935ddee336d

Changeset - r9452:c935ddee336d

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-06-03 08:06:58
rubidium@openttd.org

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

3 files changed with 4 insertions and 6 deletions:

src/network/network_internal.h

src/openttd.h

src/variables.h

0 comments (0 inline, 0 general)

src/network/network_internal.h

➞

Show inline comments

@@ @@ -90,14 +90,12 @@ enum NetworkLanguage { @@
 	NETLANG_GALICIAN,
 	NETLANG_GREEK,
 	NETLANG_LATVIAN,
 	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
 extern uint32 _frame_counter_max; // To where we may go with our clients
 extern uint32 _last_sync_frame; // Used in the server to store the last time a sync packet was sent to clients.

src/openttd.h

➞

Show inline comments

@@ @@ -2,16 +2,12 @@ @@
 /** @file openttd.h Some generic types. */
 #ifndef OPENTTD_H
 #define OPENTTD_H
 #ifndef VARDEF
 #define VARDEF extern
 #endif
 enum GameModes {
 	GM_MENU,
 	GM_NORMAL,
 	GM_EDITOR
 };

src/variables.h

➞

Show inline comments

@@ @@ -2,12 +2,16 @@ @@
 /** @file variables.h Messing file that will cease to exist some time in the future. */
 #ifndef VARIABLES_H
 #define VARIABLES_H
 #ifndef VARDEF
 #define VARDEF extern
 #endif
 /* Amount of game ticks */
 VARDEF uint16 _tick_counter;
 /* Skip aging of cargo? */
 VARDEF byte _age_cargo_skip_counter;

0 comments (0 inline, 0 general)