mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-18 13:42:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

mActorProperty Enum

Browse Source
This commit is contained in:
elijah-thomas774
2025-09-16 21:20:51 -04:00
parent 690d0d5799
commit c44a5426ba
21 changed files with 108 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_base.cpp
+9 -9
View File
@@ -56,7 +56,7 @@ dAcBase_c::dAcBase_c()
mActorNode(nullptr),
mRoomID(s_Create_RoomId),
mActorSubtype(s_Create_Subtype) {
JStudio_actor = 0;
mJStudioActor = 0;
someStr[0] = 0;
if (s_Create_Position) {
@@ -164,13 +164,13 @@ int dAcBase_c::actorPostCreate() {
}
int dAcBase_c::create() {
if (checkActorProperty(0x8000000)) {
if (checkActorProperty(AC_PROP_0x8000000)) {
return actorPostCreate();
}
int success = actorCreate();
if (success == SUCCEEDED) {
success = NOT_READY;
setActorProperty(0x8000000);
setActorProperty(AC_PROP_0x8000000);
}
return success;
}
@@ -193,7 +193,7 @@ int dAcBase_c::preDelete() {
ret = NOT_READY;
}
if (!checkActorProperty(0x800) && checkActorProperty(0x10000000) &&
if (!checkActorProperty(AC_PROP_0x800) && checkActorProperty(AC_PROP_0x10000000) &&
fBase_c::getConnectParent()->lifecycle_state != TO_BE_DELETED) {
if (itemDroppingAndGivingRelated(nullptr, 0) != 0) {
setEnemyDefeatFlag();
@@ -227,7 +227,7 @@ int dAcBase_c::preDelete() {
}
}
if (checkActorProperty(0x02000000)) {
if (checkActorProperty(AC_PROP_0x2000000)) {
changeLoadedEntitiesNoSet();
}
@@ -239,13 +239,13 @@ int dAcBase_c::preExecute() {
if (dBase_c::preExecute() == NOT_READY) {
return NOT_READY;
}
if (checkActorProperty(0x10000000)) {
if (checkActorProperty(0x40000000)) {
if (checkActorProperty(AC_PROP_0x10000000)) {
if (checkActorProperty(AC_PROP_0x40000000)) {
return NOT_READY;
}
if (EventManager::isInEvent() && JStudio_actor == nullptr && !EventManager::isInEvent0Or7() &&
!EventManager::FUN_800a0ba0() && !EventManager::FUN_800a0570(this) && !checkActorProperty(0x4)) {
if (EventManager::isInEvent() && mJStudioActor == nullptr && !EventManager::isInEvent0Or7() &&
!EventManager::FUN_800a0ba0() && !EventManager::FUN_800a0570(this) && !checkActorProperty(AC_PROP_0x4)) {
return NOT_READY;
}
}
src/d/a/obj/d_a_obj_boomerang.cpp
+1 -1
View File
@@ -545,7 +545,7 @@ int dAcBoomerang_c::actorExecute() {
if (field_0x8B1 == 0 && (mStateMgr.isState(StateID_Move) || mStateMgr.isState(StateID_MoveCancelWait))) {
mEff2.createContinuousEffect(
PARTICLE_RESOURCE_ID_MAPPING_5_, player->GetPosition(), nullptr, nullptr, nullptr, nullptr
PARTICLE_RESOURCE_ID_MAPPING_5_, player->getPosition(), nullptr, nullptr, nullptr, nullptr
);
} else {
mEff2.remove(true);
src/d/a/obj/d_a_obj_fairy.cpp
+2 -2
View File
@@ -67,13 +67,13 @@ void dAcObjFairy_c::finalizeState_Wait() {}
void dAcObjFairy_c::initializeState_Avoid() {}
void dAcObjFairy_c::executeState_Avoid() {}
void dAcObjFairy_c::finalizeState_Avoid() {
setActorProperty(0x1);
setActorProperty(AC_PROP_0x1);
}
void dAcObjFairy_c::initializeState_PlayerAvoid() {}
void dAcObjFairy_c::executeState_PlayerAvoid() {}
void dAcObjFairy_c::finalizeState_PlayerAvoid() {
setActorProperty(0x1);
setActorProperty(AC_PROP_0x1);
}
void dAcObjFairy_c::initializeState_CureStart() {}
src/d/a/obj/d_a_obj_tbox.cpp
+14 -14
View File
@@ -944,7 +944,7 @@ bool dAcTbox_c::createHeap() {
fn_8026B380(fxPos);
mMtx_c fxTransform;
fxTransform.transS(fxPos);
fxTransform.ZXYrotM(GetRotation());
fxTransform.ZXYrotM(getRotation());
mOpenFxMdl.setLocalMtx(fxTransform);
mOpenFxMdl.setScale(fn_8026B3C0());
}
@@ -1623,7 +1623,7 @@ void dAcTbox_c::initializeState_DugOut() {
} else {
field_0x120C = 0;
}
setActorProperty(0x100);
setActorProperty(AC_PROP_0x100);
if (mVariant == NORMAL) {
mMdl1.setAnm(sAnmNames[0], m3d::PLAY_MODE_4);
}
@@ -1712,7 +1712,7 @@ void dAcTbox_c::finalizeState_DugOut() {}
void dAcTbox_c::initializeState_WaitAppear() {
mScale.set(0.0f, 0.0f, 0.0f);
setActorProperty(0x100);
setActorProperty(AC_PROP_0x100);
fn_8026D140();
field_0x11E8 = 0.0f;
field_0x11F4 &= ~0x2;
@@ -1739,7 +1739,7 @@ void dAcTbox_c::initializeState_DemoAppear() {
field_0x11F8 = 0;
mScale.set(0.0f, 0.0f, 0.0f);
field_0x11E8 = 0.0f;
setActorProperty(0x100);
setActorProperty(AC_PROP_0x100);
mMdl1.setAnm(sAppearAnmName, m3d::PLAY_MODE_4);
mMdl1.setFrame(mMdl1.getAnm().getStartFrame());
mAnmMatClr1.setFrame(0.0f, 0);
@@ -1808,7 +1808,7 @@ void dAcTbox_c::initializeState_WaitOpen() {
// WaitOpen not used for Goddess Chests
}
field_0x120C = 0;
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
if (mVariant == NORMAL) {
mMdl1.setAnm(sAnmNames[0], m3d::PLAY_MODE_4);
}
@@ -1831,7 +1831,7 @@ void dAcTbox_c::finalizeState_WaitOpen() {
}
void dAcTbox_c::initializeState_GoddessWaitOff() {
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
fn_8026D130();
field_0x11C0.set(-62.0f, 0.0f, -47.0f);
field_0x11CC.set(62.0f, 100.0f, 47.0f);
@@ -1843,7 +1843,7 @@ void dAcTbox_c::executeState_GoddessWaitOff() {}
void dAcTbox_c::finalizeState_GoddessWaitOff() {}
void dAcTbox_c::initializeState_GoddessWaitOn() {
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
fn_8026D130();
field_0x11C0.set(-62.0f, 0.0f, -47.0f);
field_0x11CC.set(62.0f, 100.0f, 47.0f);
@@ -1864,7 +1864,7 @@ void dAcTbox_c::finalizeState_GoddessWaitOn() {
void dAcTbox_c::initializeState_DeleteArchive() {
mScale.set(1.0f, 1.0f, 1.0f);
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
if (mVariant == NORMAL) {
mMdl1.setAnm(sAnmNames[0], m3d::PLAY_MODE_4);
}
@@ -1902,7 +1902,7 @@ void dAcTbox_c::finalizeState_DeleteArchive() {}
void dAcTbox_c::initializeState_LoadArchive() {
mScale.set(1.0f, 1.0f, 1.0f);
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
if (mVariant == NORMAL) {
mMdl1.setAnm(sAnmNames[0], m3d::PLAY_MODE_4);
}
@@ -1934,7 +1934,7 @@ extern "C" dAcItem_c *giveItem3(u16 item, s32);
void dAcTbox_c::initializeState_Open() {
mScale.set(1.0f, 1.0f, 1.0f);
startSound(SE_TBox_OPEN_A);
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
if (mVariant == NORMAL) {
mAnmMatClr1.setFrame(mAnmMatClr1.getFrameMax(0), 0);
}
@@ -2127,7 +2127,7 @@ void dAcTbox_c::initializeState_Wait() {
break;
}
field_0x120C = 1;
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
if (mVariant == 0) {
mMdl1.setAnm(sAnmNames[0], m3d::PLAY_MODE_4);
mAnmMatClr1.setFrame(mAnmMatClr1.getFrameMax(0), 0);
@@ -2158,7 +2158,7 @@ void dAcTbox_c::initializeState_GoddessWait() {
field_0x11E8 = 1.0f;
field_0x11F4 |= 2;
field_0x120C = 1;
clearActorProperty(0x100);
unsetActorProperty(AC_PROP_0x100);
field_0x11FC = 0x2D;
fn_8026D130();
}
@@ -2185,11 +2185,11 @@ bool dAcTbox_c::fn_8026D120() const {
}
void dAcTbox_c::fn_8026D130() {
setActorProperty(0x1);
setActorProperty(AC_PROP_0x1);
}
void dAcTbox_c::fn_8026D140() {
clearActorProperty(0x1);
unsetActorProperty(AC_PROP_0x1);
}
void dAcTbox_c::doInteraction(s32 _unused) {