From bd82b7a297b497e3143eb2bc2a5b42f76426948e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Sun, 6 Dec 2015 18:22:33 +0100 Subject: [PATCH 1/2] use RCT2_ADDRESS in track_manage.c --- src/windows/track_manage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/windows/track_manage.c b/src/windows/track_manage.c index 4b1ac29344..84f30566f8 100644 --- a/src/windows/track_manage.c +++ b/src/windows/track_manage.c @@ -185,7 +185,7 @@ static void window_track_manage_close(rct_window *w) */ static void window_track_manage_mouseup(rct_window *w, int widgetIndex) { - uint8 *trackDesignList = (uint8*)0x00F441EC; + char *trackDesignList = RCT2_ADDRESS(RCT2_ADDRESS_TRACK_LIST, char); rct_window *trackDesignListWindow; char *dst, *src; @@ -309,4 +309,4 @@ static void window_track_delete_prompt_paint(rct_window *w, rct_drawpixelinfo *d gfx_draw_string_centred_wrapped( dpi, &stringId, w->x + 125, w->y + 28, 246, STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK, 0 ); -} \ No newline at end of file +} From 16e5ace672c894ce45b06ea0fb4e10a9f718237b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Linus=20Unneb=C3=A4ck?= Date: Sun, 6 Dec 2015 18:49:35 +0100 Subject: [PATCH 2/2] use RCT2_ADDRESS_TRACK_LIST --- src/windows/new_ride.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/windows/new_ride.c b/src/windows/new_ride.c index fc9d702cc6..8a7d7e8b18 100644 --- a/src/windows/new_ride.c +++ b/src/windows/new_ride.c @@ -847,9 +847,9 @@ static int get_num_track_designs(ride_list_item item) { track_load_list(item); - uint8 *trackDesignList = (uint8*)0x00F441EC; + char *trackDesignList = RCT2_ADDRESS(RCT2_ADDRESS_TRACK_LIST, char); int count = 0; - while (*trackDesignList != 0 && trackDesignList < (uint8*)0x00F635EC) { + while (*trackDesignList != 0 && trackDesignList < (char*)0x00F635EC) { trackDesignList += 128; count++; } @@ -936,7 +936,7 @@ static void window_new_ride_select(rct_window *w) if (ride_type_has_flag(item.type, RIDE_TYPE_FLAG_HAS_TRACK)) { track_load_list(item); - uint8 *trackDesignList = (uint8*)0x00F441EC; + char *trackDesignList = RCT2_ADDRESS(RCT2_ADDRESS_TRACK_LIST, char); if (*trackDesignList != 0) { window_track_list_open(item); return;