From 7de26e9931cb71cbc4a36ad2e390d166b4cf1cf9 Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Thu, 1 May 2014 15:07:51 +0100 Subject: [PATCH] rename current day to current month ticks --- src/addresses.h | 2 +- src/date.c | 2 +- src/window_game_bottom_toolbar.c | 2 +- src/window_park.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index 347adaccfd..403ec3f966 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -121,7 +121,7 @@ #define RCT2_ADDRESS_G1_ELEMENTS 0x009EBD28 #define RCT2_ADDRESS_CURRENT_MONTH_YEAR 0x00F663A8 -#define RCT2_ADDRESS_CURRENT_DAY 0x00F663AA +#define RCT2_ADDRESS_CURRENT_MONTH_TICKS 0x00F663AA #define RCT2_ADDRESS_MAP_ELEMENTS 0x00F663B8 diff --git a/src/date.c b/src/date.c index 012e556327..335aac73f4 100644 --- a/src/date.c +++ b/src/date.c @@ -44,6 +44,6 @@ int date_get_total_months(int month, int year) void date_reset() { RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, sint16) = MONTH_MARCH; - RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_DAY, sint16) = 0; + RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_TICKS, sint16) = 0; RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, sint32) = 0; } diff --git a/src/window_game_bottom_toolbar.c b/src/window_game_bottom_toolbar.c index 2df493d1da..389a36e6bc 100644 --- a/src/window_game_bottom_toolbar.c +++ b/src/window_game_bottom_toolbar.c @@ -221,7 +221,7 @@ static void window_game_bottom_toolbar_tooltip() break; case WIDX_DATE: month = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, sint16) & 7; - day = ((RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_DAY, sint16) * ((short*)0x00993988)[month]) >> 16) & 0xFF; + day = ((RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_TICKS, sint16) * ((short*)0x00993988)[month]) >> 16) & 0xFF; *((short*)0x013CE952) = STR_DATE_DAY_1 + day; *((short*)0x013CE954) = STR_MONTH_MARCH + month; widgetIndex = 0; diff --git a/src/window_park.c b/src/window_park.c index 5decd55290..7474a6f3d2 100644 --- a/src/window_park.c +++ b/src/window_park.c @@ -2029,7 +2029,7 @@ static void window_park_graph_draw_months(rct_drawpixelinfo *dpi, uint8 *history int i, x, y, yearOver32, currentMonth, currentDay; currentMonth = date_get_month(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint16)); - currentDay = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_DAY, uint16); + currentDay = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_TICKS, uint16); yearOver32 = (currentMonth * 4) + (currentDay >> 14) - 31; x = baseX; y = baseY;