mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-30 23:44:28 -04:00
Revert "Isolate JKRHeap operator overloads" (#39)
This commit is contained in:
@@ -26,7 +26,7 @@ JUTResFont::~JUTResFont() {
|
||||
}
|
||||
|
||||
void JUTResFont::deleteMemBlocks_ResFont() {
|
||||
JKR_DELETE_ARRAY(mMemBlocks);
|
||||
delete[] mMemBlocks;
|
||||
}
|
||||
|
||||
void JUTResFont::initialize_state() {
|
||||
@@ -62,22 +62,22 @@ bool JUTResFont::protected_initiate(const ResFONT* pFont, JKRHeap* pHeap) {
|
||||
mValid = true;
|
||||
|
||||
countBlock();
|
||||
mMemBlocks = JKR_NEW_ARGS (pHeap, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum];
|
||||
mMemBlocks = new (pHeap, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum];
|
||||
|
||||
if (!mMemBlocks) {
|
||||
return false;
|
||||
}
|
||||
p = mMemBlocks;
|
||||
if (mWid1BlockNum != 0) {
|
||||
mpWidthBlocks = JKR_NEW_ARGS (p) ResFONT::WID1*[mWid1BlockNum];
|
||||
mpWidthBlocks = new (p) ResFONT::WID1*[mWid1BlockNum];
|
||||
p += mWid1BlockNum;
|
||||
}
|
||||
if (mGly1BlockNum != 0) {
|
||||
mpGlyphBlocks = JKR_NEW_ARGS (p) ResFONT::GLY1*[mGly1BlockNum];
|
||||
mpGlyphBlocks = new (p) ResFONT::GLY1*[mGly1BlockNum];
|
||||
p += mGly1BlockNum;
|
||||
}
|
||||
if (mMap1BlockNum != 0) {
|
||||
mpMapBlocks = JKR_NEW_ARGS (p) ResFONT::MAP1*[mMap1BlockNum];
|
||||
mpMapBlocks = new (p) ResFONT::MAP1*[mMap1BlockNum];
|
||||
}
|
||||
setBlock();
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user