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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2025-06-14 17:01:17 +05:00
parent 94b65d0562 f388ddce1f
commit f0f93c68ca
1132 changed files with 59430 additions and 52889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/misc.cpp
View File

@@ -97,11 +97,11 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
Map::Allocate(size_x, size_y);
_pause_mode = PM_UNPAUSED;
_pause_mode = {};
_game_speed = 100;
citymania::_pause_countdown = 0;
TimerGameTick::counter = 0;
_cur_tileloop_tile = 1;
_cur_tileloop_tile = TileIndex{1};
_thd.redsq = INVALID_TILE;
if (reset_settings) MakeNewgameSettingsLive();
@@ -113,16 +113,16 @@ void InitializeGame(uint size_x, uint size_y, bool reset_date, bool reset_settin
if (TimerGameEconomy::UsingWallclockUnits()) {
/* If using wallclock units, start at year 1. */
TimerGameEconomy::SetDate(TimerGameEconomy::ConvertYMDToDate(1, 0, 1), 0);
TimerGameEconomy::SetDate(TimerGameEconomy::ConvertYMDToDate(TimerGameEconomy::Year{1}, 0, 1), 0);
} else {
/* Otherwise, we always keep the economy date synced with the calendar date. */
TimerGameEconomy::SetDate(new_date.base(), 0);
TimerGameEconomy::SetDate(TimerGameEconomy::Date{new_date.base()}, 0);
}
InitializeOldNames();
}
LinkGraphSchedule::Clear();
PoolBase::Clean(PT_NORMAL);
PoolBase::Clean(PoolType::Normal);
RebuildStationKdtree();
RebuildTownKdtree();