thunderbrewhq/thunderbrew
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/thunderbrew synced 2025-12-12 11:12:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(style): normalize memory allocations

Browse source
This commit is contained in:
fallenoak 2023-01-04 21:00:29 -06:00 • committed by GitHub
parent 90403bfd29
commit 97a6a8dd91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 147 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ui/LoadXML.cpp
View file

@ -245,17 +245,10 @@ int32_t LoadXML_Insets(XMLNode* node, float& left, float& right, float& top, flo
CSimpleFontString* LoadXML_String(XMLNode* node, CSimpleFrame* frame, CStatus* status) {
// TODO
// v3 = CDataAllocator::GetData(CSimpleFontString::s_allocator, 0, a__avcsimplefon, -2);
// auto m = CDataAllocator::GetData(CSimpleFontString::s_allocator, 0, a__avcsimplefon, -2);
void* m = SMemAlloc(sizeof(CSimpleFontString), __FILE__, __LINE__, 0);
CSimpleFontString* fontString;
if (m) {
fontString = new (m) CSimpleFontString(frame, 2, 1);
} else {
fontString = nullptr;
}
auto m = SMemAlloc(sizeof(CSimpleFontString), __FILE__, __LINE__, 0x0);
auto fontString = new (m) CSimpleFontString(frame, 2, 1);
fontString->PreLoadXML(node, status);
fontString->LoadXML(node, status);
@ -266,17 +259,10 @@ CSimpleFontString* LoadXML_String(XMLNode* node, CSimpleFrame* frame, CStatus* s
CSimpleTexture* LoadXML_Texture(XMLNode* node, CSimpleFrame* frame, CStatus* status) {
// TODO
// v3 = (CSimpleTexture *)CDataAllocator::GetData((int)CSimpleTexture::s_allocator, 0, a__avcsimpletex, -2);
// auto m = (CSimpleTexture *)CDataAllocator::GetData((int)CSimpleTexture::s_allocator, 0, a__avcsimpletex, -2);
void* m = SMemAlloc(sizeof(CSimpleTexture), __FILE__, __LINE__, 0);
CSimpleTexture* texture;
if (m) {
texture = new (m) CSimpleTexture(frame, 2, 1);
} else {
texture = nullptr;
}
auto m = SMemAlloc(sizeof(CSimpleTexture), __FILE__, __LINE__, 0x0);
auto texture = new (m) CSimpleTexture(frame, 2, 1);
texture->PreLoadXML(node, status);
texture->LoadXML(node, status);