mirror of
https://github.com/zeldaret/ss
synced 2026-07-26 22:41:43 -04:00
Fix symbol errors
This commit is contained in:
@@ -1,3 +1,14 @@
|
||||
#include "d/a/obj/d_a_obj_diviner_crystal.h"
|
||||
|
||||
SPECIAL_ACTOR_PROFILE(OBJ_DIVINER_CRYSTAL, dAcODivinerCrystal_c, fProfile::OBJ_DIVINER_CRYSTAL, 0x157, 0, 3);
|
||||
|
||||
STATE_VIRTUAL_DEFINE(dAcODivinerCrystal_c, DemoThrow);
|
||||
STATE_DEFINE(dAcODivinerCrystal_c, Stay);
|
||||
|
||||
void dAcODivinerCrystal_c::initializeState_DemoThrow() {}
|
||||
void dAcODivinerCrystal_c::executeState_DemoThrow() {}
|
||||
void dAcODivinerCrystal_c::finalizeState_DemoThrow() {}
|
||||
|
||||
void dAcODivinerCrystal_c::initializeState_Stay() {}
|
||||
void dAcODivinerCrystal_c::executeState_Stay() {}
|
||||
void dAcODivinerCrystal_c::finalizeState_Stay() {}
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
#include "d/a/obj/d_a_obj_pot_sal.h"
|
||||
|
||||
SPECIAL_ACTOR_PROFILE(OBJ_POT_SAL, dAcOpotSal_c, fProfile::OBJ_POT_SAL, 0x86, 0, 2);
|
||||
|
||||
STATE_VIRTUAL_DEFINE(dAcOpotSal_c, DemoThrow);
|
||||
STATE_VIRTUAL_DEFINE(dAcOpotSal_c, After);
|
||||
|
||||
void dAcOpotSal_c::initializeState_DemoThrow() {}
|
||||
void dAcOpotSal_c::executeState_DemoThrow() {}
|
||||
void dAcOpotSal_c::finalizeState_DemoThrow() {}
|
||||
|
||||
void dAcOpotSal_c::initializeState_After() {}
|
||||
void dAcOpotSal_c::executeState_After() {}
|
||||
void dAcOpotSal_c::finalizeState_After() {}
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
#include "d/a/obj/d_a_obj_propera.h"
|
||||
|
||||
SPECIAL_ACTOR_PROFILE(OBJ_PROPERA, dAcObjPropera_c, fProfile::OBJ_PROPERA, 0x96, 0, 386);
|
||||
|
||||
STATE_VIRTUAL_DEFINE(dAcObjPropera_c, DemoThrow);
|
||||
|
||||
void dAcObjPropera_c::initializeState_DemoThrow() {}
|
||||
void dAcObjPropera_c::executeState_DemoThrow() {}
|
||||
void dAcObjPropera_c::finalizeState_DemoThrow() {}
|
||||
|
||||
@@ -1,3 +1,14 @@
|
||||
#include "d/a/obj/d_a_obj_roulette.h"
|
||||
|
||||
SPECIAL_ACTOR_PROFILE(OBJ_ROULETTE, dAcObjRoulette_c, fProfile::OBJ_ROULETTE, 0x97, 0, 384);
|
||||
|
||||
STATE_VIRTUAL_DEFINE(dAcObjRoulette_c, DemoThrow);
|
||||
STATE_VIRTUAL_DEFINE(dAcObjRoulette_c, Wait);
|
||||
|
||||
void dAcObjRoulette_c::initializeState_DemoThrow() {}
|
||||
void dAcObjRoulette_c::executeState_DemoThrow() {}
|
||||
void dAcObjRoulette_c::finalizeState_DemoThrow() {}
|
||||
|
||||
void dAcObjRoulette_c::initializeState_Wait() {}
|
||||
void dAcObjRoulette_c::executeState_Wait() {}
|
||||
void dAcObjRoulette_c::finalizeState_Wait() {}
|
||||
|
||||
@@ -1,3 +1,9 @@
|
||||
#include "d/a/obj/d_a_obj_water_jar.h"
|
||||
|
||||
SPECIAL_ACTOR_PROFILE(OBJ_WATER_JAR, dAcOWaterJar_c, fProfile::OBJ_WATER_JAR, 0x1AE, 0, 3);
|
||||
|
||||
STATE_VIRTUAL_DEFINE(dAcOWaterJar_c, DemoThrow);
|
||||
|
||||
void dAcOWaterJar_c::initializeState_DemoThrow() {}
|
||||
void dAcOWaterJar_c::executeState_DemoThrow() {}
|
||||
void dAcOWaterJar_c::finalizeState_DemoThrow() {}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user