mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Introduce constant for ticks per month (#13253)

Browse Source
This commit is contained in:
Hielke Morsink
2020-10-21 02:05:27 +02:00
committed by GitHub
parent 9dcbf6d4e6
commit 257ada4617
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/interface/InteractiveConsole.cpp
View File

@@ -1299,7 +1299,7 @@ static int32_t cc_for_date([[maybe_unused]] InteractiveConsole& console, [[maybe
if (argv.size() <= 2)
{
day = std::clamp(
gDateMonthTicks / (0x10000 / days_in_month[month - 1]) + 1, 1, static_cast<int>(days_in_month[month - 1]));
gDateMonthTicks / (TICKS_PER_MONTH / days_in_month[month - 1]) + 1, 1, static_cast<int>(days_in_month[month - 1]));
}
// YYYY MM DD (year, month, and day provided)

1
src/openrct2/localisation/Date.h
View File

@@ -13,6 +13,7 @@
#include "../common.h"
constexpr int32_t MAX_YEAR = 8192;
constexpr int32_t TICKS_PER_MONTH = 0x10000;
enum
{

4
src/openrct2/localisation/Localisation.Date.cpp
View File

@@ -71,13 +71,13 @@ void date_set(int32_t year, int32_t month, int32_t day)
month = std::clamp(month, 1, static_cast<int>(MONTH_COUNT));
day = std::clamp(day, 1, static_cast<int>(days_in_month[month - 1]));
gDateMonthsElapsed = (year - 1) * MONTH_COUNT + month - 1;
gDateMonthTicks = 0x10000 / days_in_month[month - 1] * (day - 1) + 4;
gDateMonthTicks = TICKS_PER_MONTH / days_in_month[month - 1] * (day - 1) + 4;
}
void date_update()
{
int32_t monthTicks = gDateMonthTicks + 4;
if (monthTicks >= 0x10000)
if (monthTicks >= TICKS_PER_MONTH)
{
gDateMonthTicks = 0;
gDateMonthsElapsed++;

2
src/openrct2/scenario/Scenario.cpp
View File

@@ -356,7 +356,7 @@ static void scenario_update_daynight_cycle()
if (gScreenFlags == SCREEN_FLAGS_PLAYING && gConfigGeneral.day_night_cycle)
{
float monthFraction = gDateMonthTicks / static_cast<float>(0x10000);
float monthFraction = gDateMonthTicks / static_cast<float>(TICKS_PER_MONTH);
if (monthFraction < (1 / 8.0f))
{
gDayNightCycle = 0.0f;