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

Codechange: move all date-related variables inside the timer (#10706)

Browse Source
This commit is contained in:
Patric Stout
2023-04-24 17:56:01 +02:00
committed by GitHub
parent f5f6306af3
commit 7aa2b9ab0a
76 changed files with 308 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/api/script_bridge.cpp
View File

@@ -13,17 +13,17 @@
#include "../script_instance.hpp"
#include "../../bridge_map.h"
#include "../../strings_func.h"
#include "../../date_func.h"
#include "../../landscape_cmd.h"
#include "../../road_cmd.h"
#include "../../tunnelbridge_cmd.h"
#include "../../timer/timer_game_calendar.h"
#include "table/strings.h"
#include "../../safeguards.h"
/* static */ bool ScriptBridge::IsValidBridge(BridgeID bridge_id)
{
return bridge_id < MAX_BRIDGES && ::GetBridgeSpec(bridge_id)->avail_year <= _cur_year;
return bridge_id < MAX_BRIDGES && ::GetBridgeSpec(bridge_id)->avail_year <= TimerGameCalendar::year;
}
/* static */ bool ScriptBridge::IsBridgeTile(TileIndex tile)

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

@@ -10,6 +10,7 @@
#include "../../stdafx.h"
#include "script_date.hpp"
#include "../../date_func.h"
#include "../../timer/timer_game_calendar.h"
#include <time.h>
@@ -22,7 +23,7 @@
/* static */ ScriptDate::Date ScriptDate::GetCurrentDate()
{
return (ScriptDate::Date)_date;
return (ScriptDate::Date)TimerGameCalendar::date;
}
/* static */ SQInteger ScriptDate::GetYear(ScriptDate::Date date)