mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-21 14:53:30 -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/actor/d_a_obj_pdwall.cpp
+9 -7
View File
@@ -7,7 +7,14 @@
#include "d/actor/d_a_obj_pdwall.h"
// these are arrays to force them to not be inlined, not sure if this is fake
static const int l_dzbidx = 7;
static const int l_bmdidx = 4;
static const cull_box l_cull_box = {
{-100.0f, -800.0f, -300.0f},
{750.0f, 500.0f, 300.0f},
};
static char* l_arcName = "P_Dwall";
@@ -15,7 +22,7 @@ int daObjPDwall_c::create1st() {
int phase_state = dComIfG_resLoad(this, l_arcName);
if (phase_state == cPhs_COMPLEATE_e) {
setMtx();
phase_state = MoveBGCreate(l_arcName, l_dzbidx, dBgS_MoveBGProc_TypicalRotY, 0xB1C0, &field_0x5a8);
if (phase_state == cPhs_ERROR_e) {
return phase_state;
@@ -31,11 +38,6 @@ int daObjPDwall_c::create1st() {
return phase_state;
}
static const cull_box l_cull_box = {
{-100.0f, -800.0f, -300.0f},
{750.0f, 500.0f, 300.0f},
};
void daObjPDwall_c::setMtx() {
for (int i = 0; i < 10; i++) {
mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x808[i], current.pos.z);
@@ -54,7 +56,7 @@ void daObjPDwall_c::setMtx() {
}
int daObjPDwall_c::CreateHeap() {
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx);
JUT_ASSERT(175, model_data != NULL);
for (int i = 0; i < 10; i++) {