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

Fix errors

Browse Source
This commit is contained in:
Ted John
2018-02-07 20:37:20 +00:00
committed by Gymnasiast
parent b207797ad2
commit 7ea5c1f099
3 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/object/ObjectJsonHelpers.cpp
View File

@@ -16,6 +16,8 @@
#pragma warning(disable : 4706) // assignment within conditional expression
#include <cstdlib>
#include <cstring>
#include <unordered_map>
#include "../Context.h"
#include "../core/Math.hpp"
@@ -217,9 +219,11 @@ namespace ObjectJsonHelpers
auto images = imgTable.GetImages();
for (uint32 i = start; i < Math::Min(numImages, end); i++)
{
auto g1 = images[i];
auto length = g1_calculate_data_size(&g1);
g1.offset = Memory::Duplicate(g1.offset, length);
auto &objg1 = images[i];
auto length = g1_calculate_data_size(&objg1);
auto g1 = objg1;
g1.offset = (uint8 *)std::malloc(length);
std::memcpy(g1.offset, objg1.offset, length);
result.push_back(g1);
}
delete obj;
@@ -260,9 +264,11 @@ namespace ObjectJsonHelpers
{
for (auto i : range)
{
auto g1 = *gfx_get_g1_element(SPR_CSG_BEGIN + i);
auto length = g1_calculate_data_size(&g1);
g1.offset = Memory::Duplicate(g1.offset, length);
auto &csg1 = *gfx_get_g1_element(SPR_CSG_BEGIN + i);
auto length = g1_calculate_data_size(&csg1);
auto g1 = csg1;
g1.offset = (uint8 *)std::malloc(length);
std::memcpy(g1.offset, csg1.offset, length);
result.push_back(g1);
}
}
@@ -336,7 +342,7 @@ namespace ObjectJsonHelpers
for (const auto &g1 : images)
{
imageTable.AddImage(&g1);
Memory::Free(g1.offset);
std::free(g1.offset);
}
}
}