mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 07:21:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_s_room.cpp
+2 -5
View File
@@ -12,6 +12,7 @@
#include "d/d_bg_parts.h"
#include "m_Do/m_Do_Reset.h"
#include <cstdio>
#include <cstring>
#ifndef __MWERKS__
#include "dusk/extras.h"
#endif
@@ -328,7 +329,7 @@ static int phase_1(room_of_scene_class* i_this) {
} else {
stage_stag_info_class* stagInfo = dComIfGp_getStage()->getStagInfo();
if (dStage_staginfo_GetArchiveHeap(stagInfo) != NULL) {
if (dStage_staginfo_GetArchiveHeap(stagInfo) != FALSE) {
heap = mDoExt_getArchiveHeap();
}
}
@@ -409,10 +410,6 @@ static int phase_2(room_of_scene_class* i_this) {
return cPhs_NEXT_e;
}
void dStage_roomControl_c::setZoneNo(int i_roomNo, int i_zoneNo) {
mStatus[i_roomNo].mZoneNo = i_zoneNo;
}
static int phase_3(room_of_scene_class* i_this) {
if (objectSetCheck(i_this)) {
return cPhs_NEXT_e;