summaryrefslogtreecommitdiff
path: root/src/REL
diff options
context:
space:
mode:
authorSwekka <swekka@proton.me>2025-06-04 15:10:48 +0200
committerSwekka <swekka@proton.me>2025-06-04 15:10:48 +0200
commiteb97bbfbc75ba61bf7af465a41eaed992ceebdb3 (patch)
tree60ab4f72d5360d436e0047b26674c258ac180b01 /src/REL
parent5d1e2ef75906021810307e52c7220262cbce5118 (diff)
variable naming and formatting
Diffstat (limited to 'src/REL')
-rw-r--r--src/REL/d/a/obj/d_a_obj_chest.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/REL/d/a/obj/d_a_obj_chest.cpp b/src/REL/d/a/obj/d_a_obj_chest.cpp
index f22d22b5..5bc9d6c1 100644
--- a/src/REL/d/a/obj/d_a_obj_chest.cpp
+++ b/src/REL/d/a/obj/d_a_obj_chest.cpp
@@ -84,20 +84,20 @@ bool dAcOChest_c::createHeap() {
void *mdlData = getOarcResFile(name);
void *anmData = getOarcResFile(modelName);
-
TRY_CREATE(mAnmMdl.create3(*this, mdlData, anmData, subtype, openOrClose, 0x120));
+
if (!getFromParams(0x1C, 0xFF)) {
mAnmMdl.getModel().setPriorityDraw(0x1C, 0xFFFFFFFF);
}
if ((s32)getFromParams(0x10, 0xFF) != 0xFF) {
- void *data2 = getOarcResFile("TansuInside");
- mResFile = nw4r::g3d::ResFile(data2);
-
+ void *insideMdlData = getOarcResFile("TansuInside");
+ mResFile = nw4r::g3d::ResFile(insideMdlData);
nw4r::g3d::ResMdl mdl = mResFile.GetResMdl(INSIDE_MODEL_NAMES[getFromParams(0x10, 0xFF)]);
if (!mMdl.create(mdl, &heap_allocator, 0x120, 1, nullptr)) {
return NOT_READY;
}
}
+
char *dzbPlcName = getDzbPlcName();
void *dzb = getOarcDZB(name, dzbPlcName);
void *plc = getOarcPLC(name, dzbPlcName);
@@ -132,7 +132,6 @@ int dAcOChest_c::create() {
if ((s32)getFromParams(0x10, 0xFF) != 0xFF) {
mMdl.setLocalMtx(mWorldMtx);
}
-
if (dScGame_c::isCurrentStage("F001r") && roomid == 1 && 900.0f < position.x && position.x < 1000.0f &&
-50.0f < position.y && position.y < 50.0f && -2730.0f < position.z && position.z < -2630.0f) {
mIsLinksCloset = true;
@@ -146,7 +145,6 @@ int dAcOChest_c::create() {
} else if (dAcItem_c::isRupee(itemId)) {
mDowsingTarget.initialize(DowsingTarget::SLOT_RUPEE, 0, &dowsingPos, 0.0f);
}
-
return SUCCEEDED;
}