dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/script/api/script_company.cpp
#	src/script/api/script_date.cpp
#	src/script/api/script_date.hpp
#	src/script/api/script_gamesettings.cpp
#	src/script/api/script_order.hpp
#	src/script/api/script_town.cpp
#	src/script/api/script_window.cpp
This commit is contained in:
Jonathan G Rennison
2023-03-06 01:05:43 +00:00
parent 983790ec7a ca149447d7
commit faa77e2605
78 changed files with 609 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/script/api/script_date.hpp
View File

@@ -50,28 +50,28 @@ public:
*/
static Date GetCurrentDate();
static int32 GetDayLengthFactor();
static SQInteger GetDayLengthFactor();
/**
* Get the year of the given date.
* @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.
@@ -80,7 +80,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.
@@ -88,17 +88,17 @@ 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();
static bool IsTimeShownInMinutes();
static int32 GetTicksPerMinute();
static SQInteger GetTicksPerMinute();
static DateTicksScaled GetCurrentScaledDateTicks();
static SQInteger GetCurrentScaledDateTicks();
static int32 GetHour(DateTicksScaled ticks);
static SQInteger GetHour(DateTicksScaled ticks);
static int32 GetMinute(DateTicksScaled ticks);
static SQInteger GetMinute(DateTicksScaled ticks);
};
#endif /* SCRIPT_DATE_HPP */