miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert bbdbf9a: ScriptTimeMode was not the best solution for economy/calendar support

Browse Source
This commit is contained in:
glx22
2024-03-23 17:41:13 +01:00
committed by Loïc Guilloux
parent 603154899a
commit 704e871a0e
9 changed files with 5 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/script/api/script_date.cpp
View File

@@ -9,9 +9,7 @@
#include "../../stdafx.h"
#include "script_date.hpp"
#include "script_timemode.hpp"
#include "../../timer/timer_game_calendar.h"
#include "../../timer/timer_game_economy.h"
#include <time.h>
@@ -24,21 +22,14 @@
/* static */ ScriptDate::Date ScriptDate::GetCurrentDate()
{
if (ScriptTimeMode::IsCalendarMode()) return (ScriptDate::Date)TimerGameCalendar::date.base();
return (ScriptDate::Date)TimerGameEconomy::date.base();
return (ScriptDate::Date)TimerGameCalendar::date.base();
}
/* static */ SQInteger ScriptDate::GetYear(ScriptDate::Date date)
{
if (date < 0) return DATE_INVALID;
if (ScriptTimeMode::IsCalendarMode()) {
::TimerGameCalendar::YearMonthDay ymd = ::TimerGameCalendar::ConvertDateToYMD(date);
return ymd.year.base();
}
::TimerGameEconomy::YearMonthDay ymd = ::TimerGameEconomy::ConvertDateToYMD(date);
::TimerGameCalendar::YearMonthDay ymd = ::TimerGameCalendar::ConvertDateToYMD(date);
return ymd.year.base();
}
@@ -46,12 +37,7 @@
{
if (date < 0) return DATE_INVALID;
if (ScriptTimeMode::IsCalendarMode()) {
::TimerGameCalendar::YearMonthDay ymd = ::TimerGameCalendar::ConvertDateToYMD(date);
return ymd.month + 1;
}
::TimerGameEconomy::YearMonthDay ymd = ::TimerGameEconomy::ConvertDateToYMD(date);
::TimerGameCalendar::YearMonthDay ymd = ::TimerGameCalendar::ConvertDateToYMD(date);
return ymd.month + 1;
}
@@ -59,12 +45,7 @@
{
if (date < 0) return DATE_INVALID;
if (ScriptTimeMode::IsCalendarMode()) {
::TimerGameCalendar::YearMonthDay ymd = ::TimerGameCalendar::ConvertDateToYMD(date);
return ymd.day;
}
::TimerGameEconomy::YearMonthDay ymd = ::TimerGameEconomy::ConvertDateToYMD(date);
::TimerGameCalendar::YearMonthDay ymd = ::TimerGameCalendar::ConvertDateToYMD(date);
return ymd.day;
}
@@ -74,9 +55,7 @@
if (day_of_month < 1 || day_of_month > 31) return DATE_INVALID;
if (year < 0 || year > CalendarTime::MAX_YEAR) return DATE_INVALID;
if (ScriptTimeMode::IsCalendarMode()) return (ScriptDate::Date)::TimerGameCalendar::ConvertYMDToDate(year, month - 1, day_of_month).base();
return (ScriptDate::Date)::TimerGameEconomy::ConvertYMDToDate(year, month - 1, day_of_month).base();
return (ScriptDate::Date)::TimerGameCalendar::ConvertYMDToDate(year, month - 1, day_of_month).base();
}
/* static */ SQInteger ScriptDate::GetSystemTime()