mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-31 07:45:48 -04:00
Isolate JKRHeap operator overloads
Fixes #25 This isolates the JKRHeap operator new/delete overloads. Every single new/delete site in the code has been replaced with a macro. Sadly for new[] and delete[] we have to keep global operators. The global new[] just allocates into malloc() however, and delete[] goes into free() if it's not in a JKRHeap. So that's fine.
This commit is contained in:
@@ -943,14 +943,14 @@ static int daBd_Delete(bd_class* i_this) {
|
||||
static int useHeapInit(fopAc_ac_c* i_this) {
|
||||
bd_class* a_this = (bd_class*)i_this;
|
||||
|
||||
a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Bd", 0xE), NULL, NULL,
|
||||
a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Bd", 0xE), NULL, NULL,
|
||||
(J3DAnmTransform*)dComIfG_getObjectRes("Bd", 8), 0, 1.0f, 0,
|
||||
-1, 1, NULL, 0x80000, 0x11000284);
|
||||
if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
a_this->mpBtk = new mDoExt_btkAnm();
|
||||
a_this->mpBtk = JKR_NEW mDoExt_btkAnm();
|
||||
if (a_this->mpBtk == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user