mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r20191) -Codechange: unVARDEF _tick_counter and move it to a more logical location
This commit is contained in:
parent
73527b7b45
commit
644deff9d2
|
@ -26,7 +26,7 @@ Year _cur_year; ///< Current year, starting at 0
|
||||||
Month _cur_month; ///< Current month (0..11)
|
Month _cur_month; ///< Current month (0..11)
|
||||||
Date _date; ///< Current date in days (day counter)
|
Date _date; ///< Current date in days (day counter)
|
||||||
DateFract _date_fract;
|
DateFract _date_fract;
|
||||||
|
uint16 _tick_counter; ///< Ever incrementing (and sometimes wrapping) tick counter for setting off various events
|
||||||
|
|
||||||
void SetDate(Date date)
|
void SetDate(Date date)
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,6 +18,7 @@ extern Year _cur_year;
|
||||||
extern Month _cur_month;
|
extern Month _cur_month;
|
||||||
extern Date _date;
|
extern Date _date;
|
||||||
extern DateFract _date_fract;
|
extern DateFract _date_fract;
|
||||||
|
extern uint16 _tick_counter;
|
||||||
|
|
||||||
void SetDate(Date date);
|
void SetDate(Date date);
|
||||||
void ConvertDateToYMD(Date date, YearMonthDay *ymd);
|
void ConvertDateToYMD(Date date, YearMonthDay *ymd);
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "gamelog_internal.h"
|
#include "gamelog_internal.h"
|
||||||
#include "console_func.h"
|
#include "console_func.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
#include "date_func.h"
|
||||||
#include "rev.h"
|
#include "rev.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include "core/random_func.hpp"
|
#include "core/random_func.hpp"
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
#include "table/airporttiles.h"
|
#include "table/airporttiles.h"
|
||||||
|
#include "date_func.h"
|
||||||
|
|
||||||
|
|
||||||
AirportTileSpec AirportTileSpec::tiles[NUM_AIRPORTTILES];
|
AirportTileSpec AirportTileSpec::tiles[NUM_AIRPORTTILES];
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include "core/random_func.hpp"
|
#include "core/random_func.hpp"
|
||||||
#include "sprite.h"
|
#include "sprite.h"
|
||||||
#include "genworld.h"
|
#include "genworld.h"
|
||||||
|
#include "date_func.h"
|
||||||
|
|
||||||
static BuildingCounts<uint32> _building_counts;
|
static BuildingCounts<uint32> _building_counts;
|
||||||
static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
|
static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include "animated_tile_func.h"
|
#include "animated_tile_func.h"
|
||||||
#include "water.h"
|
#include "water.h"
|
||||||
#include "sprite.h"
|
#include "sprite.h"
|
||||||
|
#include "date_func.h"
|
||||||
|
|
||||||
#include "table/strings.h"
|
#include "table/strings.h"
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,4 @@
|
||||||
#define VARDEF extern
|
#define VARDEF extern
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Amount of game ticks */
|
|
||||||
VARDEF uint16 _tick_counter;
|
|
||||||
|
|
||||||
#endif /* VARIABLES_H */
|
#endif /* VARIABLES_H */
|
||||||
|
|
Loading…
Reference in New Issue