--- a/engine.h Tue Aug 15 16:49:48 2006 +0000
+++ b/engine.h Tue Aug 15 16:55:40 2006 +0000
@@ -74,7 +74,7 @@
* @see table/engines.h
*/
typedef struct EngineInfo {
- uint16 base_intro;
+ Date base_intro;
byte unk2; ///< Carriages have the highest bit set in this one
byte lifelength;
byte base_life;
@@ -87,8 +87,8 @@
} EngineInfo;
typedef struct Engine {
- uint16 intro_date;
- uint16 age;
+ Date intro_date;
+ Date age;
uint16 reliability;
uint16 reliability_spd_dec;
uint16 reliability_start, reliability_max, reliability_final;
--- a/network.h Tue Aug 15 16:49:48 2006 +0000
+++ b/network.h Tue Aug 15 16:55:40 2006 +0000
@@ -76,8 +76,8 @@
byte companies_on; // How many started companies do we have (XXX - disabled for server atm, use ActivePlayerCount())
byte spectators_max; // Max spectators allowed on server
byte spectators_on; // How many spectators do we have? (XXX - disabled for server atm, use NetworkSpectatorCount())
- uint16 game_date; // Current date
- uint16 start_date; // When the game started
+ Date game_date; // Current date
+ Date start_date; // When the game started
char map_name[NETWORK_NAME_LENGTH]; // Map which is played ["random" for a randomized map]
uint16 map_width; // Map width
uint16 map_height; // Map height
@@ -107,7 +107,7 @@
byte client_lang; /// The language of the client
byte client_playas; /// As which player is this client playing (PlayerID)
uint32 client_ip; /// IP-address of the client (so he can be banned)
- uint16 join_date; /// Gamedate the player has joined
+ Date join_date; /// Gamedate the player has joined
char unique_id[NETWORK_NAME_LENGTH]; /// Every play sends an unique id so we can indentify him
} NetworkClientInfo;
--- a/news.h Tue Aug 15 16:49:48 2006 +0000
+++ b/news.h Tue Aug 15 16:55:40 2006 +0000
@@ -6,7 +6,7 @@
struct NewsItem {
StringID string_id;
uint16 duration;
- uint16 date;
+ Date date;
byte flags;
byte display_mode;
byte type;
--- a/player.h Tue Aug 15 16:49:48 2006 +0000
+++ b/player.h Tue Aug 15 16:55:40 2006 +0000
@@ -118,7 +118,7 @@
byte action;
int last_id; // here is stored the last id of the searched city/industry
- uint last_vehiclecheck_date; // Used in CheckVehicle
+ Date last_vehiclecheck_date; // Used in CheckVehicle
Ai_SpecialVehicle special_vehicles[AI_MAX_SPECIAL_VEHICLES]; // Some vehicles have some special flags
TileIndex from_tile;
--- a/station.h Tue Aug 15 16:49:48 2006 +0000
+++ b/station.h Tue Aug 15 16:55:40 2006 +0000
@@ -76,7 +76,7 @@
uint8 num_specs;
StationSpecList *speclist;
- uint16 build_date;
+ Date build_date;
//uint16 airport_flags;
uint32 airport_flags;
--- a/strings.c Tue Aug 15 16:49:48 2006 +0000
+++ b/strings.c Tue Aug 15 16:55:40 2006 +0000
@@ -326,12 +326,12 @@
}
-static char *FormatYmdString(char *buff, uint16 number)
+static char *FormatYmdString(char *buff, Date date)
{
const char *src;
YearMonthDay ymd;
- ConvertDateToYMD(number, &ymd);
+ ConvertDateToYMD(date, &ymd);
for (src = GetStringPtr(ymd.day + STR_01AC_1ST - 1); (*buff++ = *src++) != '\0';) {}
buff[-1] = ' ';
@@ -342,12 +342,12 @@
return FormatNoCommaNumber(buff, BASE_YEAR + ymd.year);
}
-static char *FormatMonthAndYear(char *buff, uint16 number)
+static char *FormatMonthAndYear(char *buff, Date date)
{
const char *src;
YearMonthDay ymd;
- ConvertDateToYMD(number, &ymd);
+ ConvertDateToYMD(date, &ymd);
for (src = GetStringPtr(STR_MONTH_JAN + ymd.month); (*buff++ = *src++) != '\0';) {}
buff[-1] = ' ';
@@ -355,11 +355,11 @@
return FormatNoCommaNumber(buff, BASE_YEAR + ymd.year);
}
-static char *FormatTinyDate(char *buff, uint16 number)
+static char *FormatTinyDate(char *buff, Date date)
{
YearMonthDay ymd;
- ConvertDateToYMD(number, &ymd);
+ ConvertDateToYMD(date, &ymd);
buff += sprintf(buff, " %02i-%02i-%04i", ymd.day, ymd.month + 1, BASE_YEAR + ymd.year);
return buff;
--- a/vehicle.h Tue Aug 15 16:49:48 2006 +0000
+++ b/vehicle.h Tue Aug 15 16:55:40 2006 +0000
@@ -210,8 +210,8 @@
// Related to age and service time
uint16 age; // Age in days
uint16 max_age; // Maximum age
- uint16 date_of_last_service;
- uint16 service_interval;
+ Date date_of_last_service;
+ Date service_interval;
uint16 reliability;
uint16 reliability_spd_dec;
byte breakdown_ctr;
--- a/waypoint.h Tue Aug 15 16:49:48 2006 +0000
+++ b/waypoint.h Tue Aug 15 16:55:40 2006 +0000
@@ -15,7 +15,7 @@
StringID string; ///< If this is zero (i.e. no custom name), town + town_cn is used for naming
ViewportSign sign; ///< Dimensions of sign (not saved)
- uint16 build_date; ///< Date of construction
+ Date build_date; ///< Date of construction
byte stat_id; ///< ID of waypoint within the waypoint class (not saved)
uint32 grfid; ///< ID of GRF file