mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-04 10:48:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
robojumper
2025-09-15 22:18:03 +02:00
parent 1d17513502
commit f41e566a22
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_salbage.h → include/d/a/d_a_salbage_if.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef D_A_SALBAGE_H
#define D_A_SALBAGE_H
#ifndef D_A_SALBAGE_IF_H
#define D_A_SALBAGE_IF_H
#include "common.h"
include/d/a/d_a_salbage_obj.h
+1 -1
View File
@@ -2,11 +2,11 @@
#define D_A_SALBAGE_OBJ_H
#include "common.h"
#include "d/a/d_a_salbage_if.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/bg/d_bg_s_acch.h"
#include "d/col/cc/d_cc_d.h"
#include "d/d_shadow.h"
#include "d/a/d_a_salbage.h"
#include "m/m3d/m_smdl.h"
#include "m/m_mtx.h"
#include "m/m_quat.h"
include/d/a/obj/d_a_obj_base.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "c/c_math.h"
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/d_a_salbage.h"
#include "d/a/d_a_salbage_if.h"
#include "d/col/c/c_cc_d.h"
#include "d/col/c/c_m3d_g_aab.h"
#include "d/d_jnt_col.h"
src/d/a/d_a_salbage_obj.cpp
+6 -6
View File
@@ -64,8 +64,8 @@ int dAcSalbageObj_c::actorExecute() {
}
int dAcSalbageObj_c::preExecute() {
// TODO - this matches, but so does `bool` conversion...
int result = dAcObjBase_c::preExecute() == NOT_READY ? NOT_READY : SUCCEEDED;
// @bug bool conversion
bool result = dAcObjBase_c::preExecute();
if (dSalvageMgr_c::sInstance->checkDeliveredStoryflag(mSalvageIf.getSalvageObjId())) {
s32 id = mSalvageIf.getSalvageObjId();
if (id != SALVAGE_OBJ_DIVINER_CRYSTAL && id != SALVAGE_OBJ_POT) {
@@ -107,8 +107,10 @@ int dAcSalbageObj_c::preExecute() {
int dAcSalbageObj_c::preDraw() {
if (dAcObjBase_c::preDraw() == NOT_READY) {
return NOT_READY;
} else if (mSalvageIf.isHidden()) {
return NOT_READY;
} else {
return mSalvageIf.isHidden() ? NOT_READY : SUCCEEDED;
return SUCCEEDED;
}
}
@@ -211,9 +213,7 @@ void dAcSalbageObj_c::addAttentionTargetIfNeeded() {
}
void dAcSalbageObj_c::addAttentionTarget() {
AttentionManager::sInstance->addTarget(
*this, sInteractionTargetDefs[mSalvageIf.getSalvageObjId()], 0, nullptr
);
AttentionManager::sInstance->addTarget(*this, sInteractionTargetDefs[mSalvageIf.getSalvageObjId()], 0, nullptr);
InteractionTargetDef copy = sInteractionTargetDefs[mSalvageIf.getSalvageObjId()];
copy.field_0x00 = 1;