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

fix memory issue and add variable for scenery toggle

Browse Source
This commit is contained in:
Ted John
2016-05-01 22:46:08 +01:00
parent feb34660e3
commit f4f8801f2b
8 changed files with 57 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/windows/install_track.c
View File

@@ -116,7 +116,7 @@ void window_install_track_open(const char* path)
return;
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_CACHE, void*) = mem;
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) = 0;
gTrackDesignSceneryToggle = false;
_currentTrackPieceDirection = 2;
// reset_track_list_cache();
@@ -161,8 +161,9 @@ static void window_install_track_select(rct_window *w, int index)
return;
}
if (RCT2_GLOBAL(0x00F44153, uint8) != 0)
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) = 1;
if (RCT2_GLOBAL(0x00F44153, uint8) != 0) {
gTrackDesignSceneryToggle = true;
}
if (!(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER))
index--;
@@ -229,7 +230,7 @@ static void window_install_track_mouseup(rct_window *w, int widgetIndex)
window_invalidate(w);
break;
case WIDX_TOGGLE_SCENERY:
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) ^= 1;
gTrackDesignSceneryToggle = !gTrackDesignSceneryToggle;
// reset_track_list_cache();
window_invalidate(w);
break;
@@ -261,15 +262,15 @@ static void window_install_track_invalidate(rct_window *w)
colour_scheme_update(w);
w->pressed_widgets |= 1 << WIDX_TRACK_PREVIEW;
if (RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) == 0)
if (!gTrackDesignSceneryToggle) {
w->pressed_widgets |= (1 << WIDX_TOGGLE_SCENERY);
else
} else {
w->pressed_widgets &= ~(1 << WIDX_TOGGLE_SCENERY);
}
if (w->track_list.var_482 != 0xFFFF) {
w->disabled_widgets &= ~(1 << WIDX_TRACK_PREVIEW);
}
else {
} else {
w->disabled_widgets |= (1 << WIDX_TRACK_PREVIEW);
}
}
@@ -326,7 +327,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Warnings
if (track_td6->track_flags & 1) {
RCT2_GLOBAL(0x00F44153, uint8) = 1;
if (RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) == 0) {
if (!gTrackDesignSceneryToggle) {
// Scenery not available
gfx_draw_string_centred_clipped(dpi, STR_DESIGN_INCLUDES_SCENERY_WHICH_IS_UNAVAILABLE, NULL, 0, x, y, 368);
y -= 10;

25
src/windows/track_list.c
View File

@@ -140,7 +140,7 @@ void window_track_list_open(ride_list_item item)
w->track_list.var_480 = 0xFFFF;
w->track_list.var_482 = gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER ? 0 : 1;
w->track_list.var_484 = 0;
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) = 0;
gTrackDesignSceneryToggle = false;
window_push_others_right(w);
_currentTrackPieceDirection = 2;
}
@@ -182,7 +182,7 @@ static void window_track_list_select(rct_window *w, int index)
}
if (RCT2_GLOBAL(0x00F44153, uint8) != 0) {
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) = 1;
gTrackDesignSceneryToggle = true;
}
track_design_file_ref *tdRef = &_trackDesigns[index];
@@ -193,8 +193,7 @@ static void window_track_list_select(rct_window *w, int index)
window_error_open(STR_THIS_DESIGN_WILL_BE_BUILT_WITH_AN_ALTERNATIVE_VEHICLE_TYPE, STR_NONE);
}
window_close(w);
window_track_place_open(tdRef->path);
window_track_place_open(tdRef);
}
}
@@ -234,7 +233,7 @@ static void window_track_list_mouseup(rct_window *w, int widgetIndex)
window_invalidate(w);
break;
case WIDX_TOGGLE_SCENERY:
RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) ^= 1;
gTrackDesignSceneryToggle = !gTrackDesignSceneryToggle;
_loadedTrackDesignIndex = -1;
window_invalidate(w);
break;
@@ -335,10 +334,11 @@ static void window_track_list_invalidate(rct_window *w)
w->disabled_widgets &= ~(1 << WIDX_TRACK_PREVIEW);
window_track_list_widgets[WIDX_ROTATE].type = WWT_FLATBTN;
window_track_list_widgets[WIDX_TOGGLE_SCENERY].type = WWT_FLATBTN;
if (RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) == 0)
w->pressed_widgets |= (1 << WIDX_TOGGLE_SCENERY);
else
if (gTrackDesignSceneryToggle) {
w->pressed_widgets &= ~(1 << WIDX_TOGGLE_SCENERY);
} else {
w->pressed_widgets |= (1 << WIDX_TOGGLE_SCENERY);
}
} else {
w->pressed_widgets &= ~(1 << WIDX_TRACK_PREVIEW);
w->disabled_widgets |= (1 << WIDX_TRACK_PREVIEW);
@@ -413,7 +413,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (td6->track_flags & 1) {
RCT2_GLOBAL(0x00F44153, uint8) = 1;
if (RCT2_GLOBAL(RCT2_ADDRESS_TRACK_DESIGN_SCENERY_TOGGLE, uint8) == 0) {
if (!gTrackDesignSceneryToggle) {
// Scenery not available
gfx_draw_string_centred_clipped(dpi, STR_DESIGN_INCLUDES_SCENERY_WHICH_IS_UNAVAILABLE, NULL, 0, x, y, 368);
y -= 10;
@@ -605,17 +605,14 @@ static bool track_list_load_design_for_preview(utf8 *path)
track_design_dispose(_loadedTrackDesign);
_loadedTrackDesign = NULL;
_loadedTrackDesign = calloc(sizeof(rct_track_td6), 1);
if (track_design_open(_loadedTrackDesign, path)) {
_loadedTrackDesign = track_design_open(path);
if (_loadedTrackDesign != NULL) {
// Load in a new preview image, calculate cost variable, calculate var_06
draw_track_preview(_loadedTrackDesign, (uint8**)_loadedTrackDesignPreview);
_loadedTrackDesign->cost = gTrackDesignCost;
_loadedTrackDesign->track_flags = RCT2_GLOBAL(0x00F44151, uint8) & 7;
return true;
} else {
track_design_dispose(_loadedTrackDesign);
_loadedTrackDesign = NULL;
}
return false;
}

22
src/windows/track_place.c
View File

@@ -135,23 +135,19 @@ static void window_track_place_clear_mini_preview()
*
* rct2: 0x006CFCA0
*/
void window_track_place_open(utf8 *tdPath)
void window_track_place_open(const track_design_file_ref *tdFileRef)
{
rct_window *w;
window_close_construction_windows();
_trackDesign = malloc(sizeof(rct_track_td6));
if (!track_design_open(_trackDesign, tdPath)) {
track_design_dispose(_trackDesign);
_trackDesign = NULL;
rct_track_td6 *td6 = track_design_open(tdFileRef->path);
if (td6 == NULL) {
return;
}
window_close_construction_windows();
_window_track_place_mini_preview = malloc(TRACK_MINI_PREVIEW_SIZE);
window_track_place_clear_mini_preview();
w = window_create(
rct_window *w = window_create(
0,
29,
200,
@@ -170,10 +166,12 @@ void window_track_place_open(utf8 *tdPath)
_window_track_place_last_cost = MONEY32_UNDEFINED;
_window_track_place_last_x = 0xFFFF;
_currentTrackPieceDirection = (2 - get_current_rotation()) & 3;
window_track_place_draw_mini_preview(_trackDesign);
window_track_place_draw_mini_preview(td6);
char *title = (char*)language_get_string(3155);
format_string(title, STR_TRACK_LIST_NAME_FORMAT, &_trackDesign->name);
format_string(title, STR_TRACK_LIST_NAME_FORMAT, &td6->name);
_trackDesign = td6;
}
/**