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

Fix symbol errors

Browse Source
This commit is contained in:
robojumper
2025-08-22 00:08:45 +02:00
parent cbe298e99a
commit f374acbae7
17 changed files with 286 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_salbage_obj.cpp
+5 -5
View File
@@ -68,7 +68,7 @@ int dAcSalbageObj_c::preExecute() {
int result = dAcObjBase_c::preExecute() == NOT_READY ? NOT_READY : SUCCEEDED;
if (dSalvageMgr_c::sInstance->checkDeliveredStoryflag(mSalbageRelated.getSalvageObjId())) {
s32 id = mSalbageRelated.getSalvageObjId();
if (id != 2 && id != 6) {
if (id != SALVAGE_OBJ_DIVINER_CRYSTAL && id != SALVAGE_OBJ_POT) {
if (!EventManager::isInEvent()) {
deleteRequest();
}
@@ -204,9 +204,9 @@ void dAcSalbageObj_c::doInteraction(s32 arg) {
void dAcSalbageObj_c::addAttentionTargetIfNeeded() {
switch (mSalbageRelated.getSalvageObjId()) {
case 5:
case 6: return;
default: addAttentionTarget(); break;
case SALVAGE_OBJ_WATER_JAR:
case SALVAGE_OBJ_POT: return;
default: addAttentionTarget(); break;
}
}
@@ -243,7 +243,7 @@ bool dAcSalbageObj_c::shouldBeActiveDowsingTarget() const {
if (dSalvageMgr_c::sInstance->hasDowsingForSalvageObj(this) == false) {
return false;
} else {
return mSalbageRelated.getSalvageObjId() != 6;
return mSalbageRelated.getSalvageObjId() != SALVAGE_OBJ_POT;
}
}