mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge pull request #2441 from LinusU/track_manage-fixes
use RCT2_ADDRESS in track_manage.c
This commit is contained in:
commit
1a46b8b6b6
|
@ -847,9 +847,9 @@ static int get_num_track_designs(ride_list_item item)
|
||||||
{
|
{
|
||||||
track_load_list(item);
|
track_load_list(item);
|
||||||
|
|
||||||
uint8 *trackDesignList = (uint8*)0x00F441EC;
|
char *trackDesignList = RCT2_ADDRESS(RCT2_ADDRESS_TRACK_LIST, char);
|
||||||
int count = 0;
|
int count = 0;
|
||||||
while (*trackDesignList != 0 && trackDesignList < (uint8*)0x00F635EC) {
|
while (*trackDesignList != 0 && trackDesignList < (char*)0x00F635EC) {
|
||||||
trackDesignList += 128;
|
trackDesignList += 128;
|
||||||
count++;
|
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)) {
|
if (ride_type_has_flag(item.type, RIDE_TYPE_FLAG_HAS_TRACK)) {
|
||||||
track_load_list(item);
|
track_load_list(item);
|
||||||
|
|
||||||
uint8 *trackDesignList = (uint8*)0x00F441EC;
|
char *trackDesignList = RCT2_ADDRESS(RCT2_ADDRESS_TRACK_LIST, char);
|
||||||
if (*trackDesignList != 0) {
|
if (*trackDesignList != 0) {
|
||||||
window_track_list_open(item);
|
window_track_list_open(item);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -185,7 +185,7 @@ static void window_track_manage_close(rct_window *w)
|
||||||
*/
|
*/
|
||||||
static void window_track_manage_mouseup(rct_window *w, int widgetIndex)
|
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;
|
rct_window *trackDesignListWindow;
|
||||||
char *dst, *src;
|
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(
|
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
|
dpi, &stringId, w->x + 125, w->y + 28, 246, STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK, 0
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue