mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-11 12:39:48 -04:00
Pjb dev 3 (#48)
* Undo array allocation changes from #43 Doesn't work * Expand dmeter heap sizes, give names * Fix manual operator delete call in resource.cpp * Disable map rendering for now Aurora can't handle lines * Re-enable assert heap on DVD thread Should be fine? * Some basic debug groups with the new Aurora API * Allow Aurora backend to be set via CLI * Give materials debug groups * More debug groups * JKRHeap separation: array edition Pain
This commit is contained in:
committed by
GitHub
parent
9e303b063f
commit
15732e241c
@@ -321,9 +321,9 @@ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32
|
||||
|
||||
char* buffer;
|
||||
if (param_1 & 0x1F0000) {
|
||||
buffer = JKR_NEW char[size1];
|
||||
buffer = JKR_NEW_ARRAY(char, size1);
|
||||
} else {
|
||||
buffer = JKR_NEW_ARGS (-4) char[size1];
|
||||
buffer = JKR_NEW_ARRAY_ARGS(char, size1, -4);
|
||||
}
|
||||
|
||||
if (buffer != NULL) {
|
||||
@@ -343,12 +343,12 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA
|
||||
p_stream->skip(2);
|
||||
|
||||
if (param_1 & 0x1F0000) {
|
||||
mMaterials = JKR_NEW J2DMaterial[mMaterialNum];
|
||||
mMaterials = JKR_NEW_ARRAY(J2DMaterial, mMaterialNum);
|
||||
} else {
|
||||
mMaterials = JKR_NEW_ARGS (-4) J2DMaterial[mMaterialNum];
|
||||
mMaterials = JKR_NEW_ARRAY_ARGS(J2DMaterial, mMaterialNum, -4);
|
||||
}
|
||||
|
||||
u8* buffer = JKR_NEW_ARGS (-4) u8[header.mSize];
|
||||
u8* buffer = JKR_NEW_ARRAY_ARGS(u8, header.mSize, -4);
|
||||
if (mMaterials != NULL && buffer != NULL) {
|
||||
J2DMaterialBlock* pBlock = (J2DMaterialBlock*)buffer;
|
||||
p_stream->seek(position, JSUStreamSeekFrom_SET);
|
||||
@@ -372,7 +372,7 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA
|
||||
}
|
||||
size++;
|
||||
|
||||
u8* nametab = JKR_NEW u8[size];
|
||||
u8* nametab = JKR_NEW_ARRAY(u8, size);
|
||||
if (nametab == NULL) {
|
||||
goto failure;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user