mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes to track design manager 

Fix errorneous sizeof() argument, skip unneeded memset
This commit is contained in:
Michał Janiszewski 2016-05-06 10:22:39 +02:00 committed by Ted John
parent db7f5cff81
commit 227c772099
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ride/track_design.c
View File

@ -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);

3
src/ride/track_design_save.c
View File

@ -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