Update to 14.0-beta1

src/script/api/script_date.hpp

@@ -11,7 +11,7 @@
 #define SCRIPT_DATE_HPP
 
 #include "script_object.hpp"
-#include "../../date_type.h"
+#include "../../timer/timer_game_calendar.h"
 
 /**
  * Class that handles all date related (calculation) functions.
@@ -31,7 +31,7 @@ public:
 	 * compose valid date values for a known year, month and day.
 	 */
 	enum Date {
-		DATE_INVALID = ::INVALID_DATE, ///< A value representing an invalid date.
+		DATE_INVALID = ::CalendarTime::INVALID_DATE.base(), ///< A value representing an invalid date.
 	};
 
 	/**
@@ -55,21 +55,21 @@ public:
 	 * @param date The date to get the year of.
 	 * @return The year.
 	 */
-	static int32 GetYear(Date date);
+	static SQInteger GetYear(Date date);
 
 	/**
 	 * Get the month of the given date.
 	 * @param date The date to get the month of.
 	 * @return The month.
 	 */
-	static int32 GetMonth(Date date);
+	static SQInteger GetMonth(Date date);
 
 	/**
 	 * Get the day (of the month) of the given date.
 	 * @param date The date to get the day of.
 	 * @return The day.
 	 */
-	static int32 GetDayOfMonth(Date date);
+	static SQInteger GetDayOfMonth(Date date);
 
 	/**
 	 * Get the date given a year, month and day of month.
@@ -78,7 +78,7 @@ public:
 	 * @param day_of_month The day of month of the to-be determined date.
 	 * @return The date.
 	 */
-	static Date GetDate(int32 year, int32 month, int32 day_of_month);
+	static Date GetDate(SQInteger year, SQInteger month, SQInteger day_of_month);
 
 	/**
 	 * Get the time of the host system.
@@ -86,7 +86,7 @@ public:
 	 * @api -ai
 	 * @note This uses the clock of the host system, which can skew or be set back. Use with caution.
 	 */
-	static int32 GetSystemTime();
+	static SQInteger GetSystemTime();
 };
 
 #endif /* SCRIPT_DATE_HPP */