mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-27 14:39:20 -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:
@@ -122,11 +122,11 @@ void dShopSystem_c::initShopSystem() {
|
||||
dShopSystem_camera_count = 0;
|
||||
|
||||
if (mpStick == NULL) {
|
||||
mpStick = new STControl();
|
||||
mpStick = JKR_NEW STControl();
|
||||
}
|
||||
|
||||
if (mpDrawCursor == NULL) {
|
||||
mpDrawCursor = new dSelect_cursor_c(1, 1.0f, NULL);
|
||||
mpDrawCursor = JKR_NEW dSelect_cursor_c(1, 1.0f, NULL);
|
||||
mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.7f, 0.7f);
|
||||
}
|
||||
|
||||
@@ -1387,12 +1387,12 @@ void dShopSystem_c::setSoldOutItemHide() {
|
||||
|
||||
void dShopSystem_c::deleteObject() {
|
||||
if (mpStick != NULL) {
|
||||
delete mpStick;
|
||||
JKR_DELETE(mpStick);
|
||||
mpStick = NULL;
|
||||
}
|
||||
|
||||
if (mpDrawCursor != NULL) {
|
||||
delete mpDrawCursor;
|
||||
JKR_DELETE(mpDrawCursor);
|
||||
mpDrawCursor = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user