mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-31 15:47:17 -04:00
Revert "Isolate JKRHeap operator overloads" (#39)
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
#include "JSystem/J2DGraph/J2DGrafContext.h"
|
||||
#include "JSystem/J2DGraph/J2DScreen.h"
|
||||
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
|
||||
#include "JSystem/JKernel/JKRHeap.h"
|
||||
#include "SSystem/SComponent/c_bg_s_shdw_draw.h"
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
@@ -884,7 +883,7 @@ void dDlst_blo_c::draw() {
|
||||
|
||||
// stand-in for a function that pulls in a bunch of inline functions but was presumably stripped
|
||||
static void dummy_misc(J2DAnmBase* anmBase, J2DPicture* picture, J2DPane* pane, J2DScreen* screen) {
|
||||
JKR_DELETE(anmBase);
|
||||
delete anmBase;
|
||||
picture->setBlack(JUtility::TColor(0, 0, 0, 0));
|
||||
picture->setWhite(JUtility::TColor(0, 0, 0, 0));
|
||||
pane->getTypeID();
|
||||
@@ -1031,14 +1030,14 @@ void dDlst_shadowPoly_c::draw() {
|
||||
}
|
||||
|
||||
static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) {
|
||||
J3DDrawBuffer* buffer = JKR_NEW J3DDrawBuffer();
|
||||
J3DDrawBuffer* buffer = new J3DDrawBuffer();
|
||||
|
||||
if (buffer) {
|
||||
int error = buffer->allocBuffer(size);
|
||||
if (error == kJ3DError_Success) {
|
||||
return buffer;
|
||||
}
|
||||
JKR_DELETE(buffer);
|
||||
delete buffer;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
@@ -1397,7 +1396,7 @@ void dDlst_shadowControl_c::init() {
|
||||
u16 size = l_realImageSize[i];
|
||||
|
||||
u32 buffer_size = GXGetTexBufferSize(size, size, 5, GX_DISABLE, 0);
|
||||
field_0x15ef0[i] = JKR_NEW_ARGS (0x20) u8[buffer_size];
|
||||
field_0x15ef0[i] = new (0x20) u8[buffer_size];
|
||||
GXInitTexObj(&field_0x15eb0[i], field_0x15ef0[i], size, size, GX_TF_RGB5A3, GX_CLAMP,
|
||||
GX_CLAMP, GX_DISABLE);
|
||||
GXInitTexObjLOD(&field_0x15eb0[i], GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE,
|
||||
@@ -1763,7 +1762,7 @@ dDlst_list_c::~dDlst_list_c() {
|
||||
J3DDrawBuffer* tmp = *buffer;
|
||||
buffer++;
|
||||
|
||||
JKR_DELETE(tmp);
|
||||
delete tmp;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user