mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-05-26 15:24:30 -04:00
Fix multiple classes being inappropriately zero-initialized via JKR_NEW* (#70)
This might also fix #71 and #72.
This commit is contained in:
@@ -43,27 +43,27 @@ void Z2DebugSys::initJAW() {
|
||||
JKRSetCurrentHeap(heap);
|
||||
u32 local_50 = heap->getFreeSize();
|
||||
soundPlayer = JKR_NEW_ARGS (heap, 0) Z2SoundPlayer("GC-Zelda2");
|
||||
sysMemView = JKR_NEW_ARGS (heap, 0) JAWSysMemView();
|
||||
bankView = JKR_NEW_ARGS (heap, 0) JAWBankView();
|
||||
chView = JKR_NEW_ARGS (heap, 0) JAWChView();
|
||||
sysMemView = JKR_NEW_ARGS (heap, 0) JAWSysMemView;
|
||||
bankView = JKR_NEW_ARGS (heap, 0) JAWBankView;
|
||||
chView = JKR_NEW_ARGS (heap, 0) JAWChView;
|
||||
trackView = JKR_NEW_ARGS (heap, 0) Z2TrackView(0, Z2TrackView::DISPMODE0);
|
||||
reportView = JKR_NEW_ARGS (heap, 0) JAWReportView();
|
||||
reportView = JKR_NEW_ARGS (heap, 0) JAWReportView;
|
||||
JASReportInit(heap, 500);
|
||||
hioBankEdit = JKR_NEW_ARGS (heap, 0) JAWHioBankEdit();
|
||||
waveArcLoader = JKR_NEW_ARGS (heap, 0) Z2WaveArcLoader();
|
||||
hioBankEdit = JKR_NEW_ARGS (heap, 0) JAWHioBankEdit;
|
||||
waveArcLoader = JKR_NEW_ARGS (heap, 0) Z2WaveArcLoader;
|
||||
volume = JKR_NEW_ARGS (heap, 0) JAWVolume(90, 480);
|
||||
playSeView = JKR_NEW_ARGS (heap, 0) Z2PlaySeView();
|
||||
audSettingView = JKR_NEW_ARGS (heap, 0) Z2AudSettingView();
|
||||
dspCheck = JKR_NEW_ARGS (heap, 0) Z2DSPCheck();
|
||||
playSeView = JKR_NEW_ARGS (heap, 0) Z2PlaySeView;
|
||||
audSettingView = JKR_NEW_ARGS (heap, 0) Z2AudSettingView;
|
||||
dspCheck = JKR_NEW_ARGS (heap, 0) Z2DSPCheck;
|
||||
JAWExtSystem::registWindow(1, soundPlayer, 10, 22);
|
||||
entrySeView = JKR_NEW_ARGS (heap, 0) Z2EntrySeView();
|
||||
entrySeView = JKR_NEW_ARGS (heap, 0) Z2EntrySeView;
|
||||
JAWExtSystem::registWindow(2, entrySeView, 10, 22);
|
||||
JAWExtSystem::registWindow(3, playSeView, 10, 22);
|
||||
JAWExtSystem::registWindow(4, sysMemView, 10, 22);
|
||||
JAWExtSystem::registWindow(5, bankView, 10, 22);
|
||||
JAWExtSystem::registWindow(6, chView, 10, 22);
|
||||
JAWExtSystem::registWindow(7, trackView, 10, 22);
|
||||
playerChView = JKR_NEW_ARGS (heap, 0) JAWPlayerChView();
|
||||
playerChView = JKR_NEW_ARGS (heap, 0) JAWPlayerChView;
|
||||
JAWExtSystem::registWindow(8, playerChView, 10, 22);
|
||||
JAWExtSystem::registWindow(11, reportView, 330, 0);
|
||||
JAWExtSystem::registWindow(12, hioBankEdit, 10, 0);
|
||||
@@ -85,16 +85,16 @@ void Z2DebugSys::initSoundHioNode() {
|
||||
JAHSingletonBase<JAHioMgr>::getIns()->init_OnGame();
|
||||
JAHSingletonBase<JAHioMgr>::getIns()->appendRootNode(&mDoHIO_root, soundRoot);
|
||||
mDoHIO_createChild("サウンド", soundRoot);
|
||||
JAHSoundPlayerNode* soundPlayerNode = JKR_NEW_ARGS (heap, 0) JAHSoundPlayerNode();
|
||||
JAHSoundPlayerNode* soundPlayerNode = JKR_NEW_ARGS (heap, 0) JAHSoundPlayerNode;
|
||||
JUT_ASSERT(258, soundPlayerNode);
|
||||
soundRoot->appendNode(soundPlayerNode, NULL);
|
||||
Z2ParamNode* paramNode = JKR_NEW_ARGS (heap, 0) Z2ParamNode();
|
||||
Z2ParamNode* paramNode = JKR_NEW_ARGS (heap, 0) Z2ParamNode;
|
||||
JUT_ASSERT(262, paramNode);
|
||||
soundRoot->appendNode(paramNode, NULL);
|
||||
Z2FxLineEditNode* fxNode = JKR_NEW_ARGS (heap, 0) Z2FxLineEditNode(heap);
|
||||
JUT_ASSERT(267, fxNode);
|
||||
soundRoot->appendNode(fxNode, NULL);
|
||||
Z2F1SwingTestNode* f1TestWin = JKR_NEW_ARGS (heap, 0) Z2F1SwingTestNode();
|
||||
Z2F1SwingTestNode* f1TestWin = JKR_NEW_ARGS (heap, 0) Z2F1SwingTestNode;
|
||||
JUT_ASSERT(284, f1TestWin);
|
||||
soundRoot->appendNode(f1TestWin, NULL);
|
||||
JAWExtSystem::registWindow(10, f1TestWin, 10, 22);
|
||||
@@ -111,7 +111,7 @@ JAISeqDataMgr* Z2DebugSys::initSeSeqDataMgr(const void* param_1) {
|
||||
JKRExpHeap* heap = mDoExt_getGameHeap();
|
||||
JKRSetCurrentHeap(heap);
|
||||
s32 freeSize = heap->getFreeSize();
|
||||
JAWHioReceiver* receiver = JKR_NEW_ARGS (heap, 0) JAWHioReceiver();
|
||||
JAWHioReceiver* receiver = JKR_NEW_ARGS (heap, 0) JAWHioReceiver;
|
||||
JAWExtSystem::registWindow(0, receiver, 10, 22);
|
||||
seqDataMgr = JKR_NEW_ARGS (heap, 0) Z2HioSeSeqDataMgr(param_1, receiver);
|
||||
JKRSetCurrentHeap(oldHeap);
|
||||
|
||||
Reference in New Issue
Block a user