From 227c772099d5563d924ea38471028a4a1a32c2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 6 May 2016 10:22:39 +0200 Subject: [PATCH] Fixes to track design manager Fix errorneous sizeof() argument, skip unneeded memset --- src/ride/track_design.c | 3 --- src/ride/track_design_save.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ride/track_design.c b/src/ride/track_design.c index c67e8ff8c8..37f78d69f2 100644 --- a/src/ride/track_design.c +++ b/src/ride/track_design.c @@ -123,9 +123,6 @@ static rct_track_td6 *track_design_open_from_buffer(uint8 *src, size_t srcLength rct_track_td6 *td6 = calloc(1, sizeof(rct_track_td6)); uint8 *readPtr = src; - // Clear top of track_design as this is not loaded from the td4 files - memset(&td6->track_spine_colour, 0, 67); - // Read start of track_design copy(td6, &readPtr, 32); diff --git a/src/ride/track_design_save.c b/src/ride/track_design_save.c index d3721bcf52..5268f5283f 100644 --- a/src/ride/track_design_save.c +++ b/src/ride/track_design_save.c @@ -472,7 +472,7 @@ static void track_design_save_pop_map_element_desc(rct_object_entry *entry, int memmove( &_trackSavedMapElementsDesc[removeIndex], &_trackSavedMapElementsDesc[removeIndex + 1], - remainingNumItems * sizeof(rct_td6_scenery_element*) + remainingNumItems * sizeof(rct_td6_scenery_element) ); } _trackSavedMapElementsDescCount--; @@ -1288,6 +1288,7 @@ static bool track_design_save_to_file(rct_track_td6 *td6, utf8 *path) // Encode TD6 data uint8 *encodedData = malloc(0x8000); + assert(td6Buffer.ptr != NULL); int encodedDataLength = sawyercoding_encode_td6((uint8*)td6Buffer.ptr, encodedData, td6Buffer.length); // Save encoded TD6 data to file