mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-07 11:57:48 -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
include/d/a/d_a_base.h
+22 -7
View File
@@ -58,6 +58,20 @@ public:
// size: 0xFC
// non-official name
class dAcBase_c : public dBase_c {
public:
enum AcProperties_e {
AC_PROP_0x1 = (1 << 0),
AC_PROP_0x4 = (1 << 2),
AC_PROP_0x100 = (1 << 8),
AC_PROP_0x400 = (1 << 10),
AC_PROP_0x800 = (1 << 11),
AC_PROP_0x2000000 = (1 << 25),
AC_PROP_0x4000000 = (1 << 26),
AC_PROP_0x8000000 = (1 << 27),
AC_PROP_0x10000000 = (1 << 28),
AC_PROP_0x40000000 = (1 << 30),
};
public:
typedef TList<SoundInfo, 12> SoundInfoList;
@@ -83,7 +97,7 @@ public:
/* 0xED */ u8 mActorSubtype;
/* 0xEE */ u8 mPolyAttr0;
/* 0xEF */ u8 mPolyAttr1;
/* 0xF0 */ u32 JStudio_actor;
/* 0xF0 */ u32 mJStudioActor;
/* 0xF4 */ char someStr[4];
/* 0xF8 */ char field_0xf8[0xfc - 0xf8];
@@ -96,6 +110,7 @@ public:
/* vt 0x28 */ virtual void postExecute(MAIN_STATE_e state);
/* vt 0x44 */ virtual bool createHeap();
/* vt 0x48 */ virtual ~dAcBase_c();
/* vt 0x4C */ virtual int actorCreate();
/* vt 0x50 */ virtual int actorPostCreate();
/* vt 0x54 */ virtual int actorExecute();
@@ -116,7 +131,7 @@ public:
void setScale(const mVec3_c &r) {
mScale = r;
}
void SetRotation(const mAng3_c &r) {
void setRotation(const mAng3_c &r) {
mRotation = r;
}
@@ -127,14 +142,14 @@ public:
mRotationCopy = mRotation;
}
mVec3_c &GetPosition() {
mVec3_c &getPosition() {
return mPosition;
}
mAng3_c &GetRotation() {
mAng3_c &getRotation() {
return mRotation;
}
mVec3_c GetPostionDifference(const dAcBase_c &other) {
mVec3_c getPostionDifference(const dAcBase_c &other) {
return mPosition - other.mPosition;
}
@@ -147,7 +162,7 @@ public:
return mPosition.distance(to);
}
bool IsOutOfRange(const mVec3_c &point, f32 radius) {
bool checkBeyondRadius(const mVec3_c &point, f32 radius) {
return getSquareDistanceTo(point) > radius;
}
@@ -155,7 +170,7 @@ public:
return mRoomID;
}
void clearActorProperty(u32 property) {
void unsetActorProperty(u32 property) {
mActorProperties &= ~property;
}
void setActorProperty(u32 property) {
include/d/a/obj/d_a_obj_vortex.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
STATE_FUNC_DECLARE(dAcOVortex_c, Appear);
void triggerActivation() {
setActorProperty(0x4);
setActorProperty(AC_PROP_0x4);
field_0x870 = 1;
}
include/d/col/bg/d_bg_s.h
+9 -3
View File
@@ -32,7 +32,7 @@ public:
return false;
}
const dAcObjBase_c *pObj = mObj.get();
return !(pObj && pObj->checkActorProperty(0x40000000));
return !(pObj && pObj->checkActorProperty(dAcBase_c::AC_PROP_0x40000000));
}
// ??? Template seems bad
@@ -104,8 +104,14 @@ u8 dKy_pol_sound_get(cBgS_PolyInfo const *param_0);
struct dMapGradation {
dMapGradation()
: mHasDifferingGrad(false), mGradHigh(0.0f), mGradLow(0.0f), mHasGradation(false), mColorR(0), mColorG(0),
mColorB(0), mColorA(0) {}
: mHasDifferingGrad(false),
mGradHigh(0.0f),
mGradLow(0.0f),
mHasGradation(false),
mColorR(0),
mColorG(0),
mColorB(0),
mColorA(0) {}
/* 0x00 */ bool mHasDifferingGrad;
/* 0x04 */ f32 mGradHigh;
/* 0x08 */ f32 mGradLow;
src/REL/d/a/d_a_bombf.cpp
+7 -7
View File
@@ -42,8 +42,8 @@ int dAcBombf_c::actorCreate() {
boundingBox.Set(mVec3_c(-80.0, -50.0f, -80.0f), mVec3_c(80.0, 60.0f, 80.0f));
angle = mRotation;
if (mDespawnSceneFlag < 0xFF) {
clearActorProperty(0x1);
setActorProperty(0x4);
unsetActorProperty(AC_PROP_0x1);
setActorProperty(AC_PROP_0x4);
}
return SUCCEEDED;
@@ -69,8 +69,8 @@ int dAcBombf_c::actorPostCreate() {
if (dBgS::GetInstance()->ChkMoveBG(dBgS_ObjLinChk::GetInstance(), false)) {
field_0x398.SetPolyInfo(dBgS_ObjLinChk::GetInstance());
clearActorProperty(0x1);
setActorProperty(0x4);
unsetActorProperty(AC_PROP_0x1);
setActorProperty(AC_PROP_0x4);
}
mLightingInfo.mLightingCode = dBgS::GetInstance()->GetLightingCode(dBgS_ObjLinChk::GetInstance());
}
@@ -142,7 +142,7 @@ int dAcBombf_c::draw() {
void dAcBombf_c::regrowBomb() {
// These params are hell
s8 viewclip_idx = checkActorProperty(0x1) ? mViewClipIdx : -1;
s8 viewclip_idx = checkActorProperty(dAcBase_c::AC_PROP_0x1) ? mViewClipIdx : -1;
u32 actorParams1;
actorParams1 = 1;
if (field_0x3D0) {
@@ -156,8 +156,8 @@ void dAcBombf_c::regrowBomb() {
if (bomb != nullptr) {
field_0x394 = 0x3C;
bomb->setTransformFromFlower(mWorldMtx);
if (checkActorProperty(0x1)) {
bomb->setActorProperty(0x1);
if (checkActorProperty(dAcBase_c::AC_PROP_0x1)) {
bomb->setActorProperty(AC_PROP_0x1);
}
if (field_0x3D4 == 0) {
bomb->mField_0xA44 *= 1.5f;
src/REL/d/a/e/d_a_e_hb_leaf.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ int dAcEhb_leaf_c::create() {
}
if (mType != 0) {
clearActorProperty(0x1);
unsetActorProperty(AC_PROP_0x1);
}
mStartingPos = mPosition;
src/REL/d/a/e/d_a_e_sm.cpp
+14 -14
View File
@@ -133,7 +133,7 @@ int dAcEsm_c::actorCreate() {
mBombRef.unlink();
setActorProperty(0x1);
setActorProperty(AC_PROP_0x1);
// Ignore these bounding box sets. `fixBoundBox` completely overwrites them with the scale
switch ((int)mScale.x) {
default:
@@ -278,7 +278,7 @@ int dAcEsm_c::actorPostCreate() {
switch ((u32)field_0xBC6) {
case 1: {
mTimeArea.setField0x08(0);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(getRoomId(), GetPosition())) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(getRoomId(), getPosition())) {
mTimeArea.setField0x00(1.f);
field_0xB8C = 1.f;
fn_80030700();
@@ -290,7 +290,7 @@ int dAcEsm_c::actorPostCreate() {
} break;
case 2: {
mTimeArea.setField0x08(1);
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(getRoomId(), GetPosition())) {
if (dTimeAreaMgr_c::GetInstance()->fn_800B9B60(getRoomId(), getPosition())) {
field_0xB8C = 0.f;
mTimeArea.setField0x00(0.f);
fn_800306d0();
@@ -308,7 +308,7 @@ int dAcEsm_c::actorPostCreate() {
}
if (field_0xBBF == 1 || field_0xBBF == 3) {
clearActorProperty(1);
unsetActorProperty(AC_PROP_0x1);
fn_800306d0();
setBattleBgmRelated(0);
}
@@ -334,12 +334,12 @@ int dAcEsm_c::actorExecute() {
dAcBomb_c *bomb = mBombRef.get();
if (mBombRef.isLinked() && bomb) {
mVec3_c target;
GetPosition().CopyTo(target);
getPosition().CopyTo(target);
if (!checkSize(SM_MASSIVE) && !checkSize(SM_LARGE)) {
target.y += mScaleTarget.y * 60.f;
}
cLib::addCalcPos2(&bomb->GetPosition(), target, 0.8f, 20.f + GetSpeed() * 1.5f);
cLib::addCalcPos2(&bomb->getPosition(), target, 0.8f, 20.f + GetSpeed() * 1.5f);
field_0xB6C = 0.5f;
@@ -363,7 +363,7 @@ int dAcEsm_c::actorExecute() {
if (mHealth != 0) {
if (field_0xBBF == 3 || field_0xBBF == 1 || mStateMgr.isState(StateID_Absorption) ||
mObjAcch.ChkGndHit()) {
timeCheck = mTimeArea.check(getRoomId(), GetPosition(), 0, 10.f, 0.2f);
timeCheck = mTimeArea.check(getRoomId(), getPosition(), 0, 10.f, 0.2f);
}
}
@@ -481,9 +481,9 @@ int dAcEsm_c::actorExecute() {
}
if (!mStateMgr.isState(StateID_Dead)) {
if (field_0xBBF != 6 && dBgS_WtrChk::CheckPos(&GetPosition(), true, 500.0f, -500.0f) &&
if (field_0xBBF != 6 && dBgS_WtrChk::CheckPos(&getPosition(), true, 500.0f, -500.0f) &&
std::abs(mObjAcch.GetGroundH() - dBgS_WtrChk::GetWaterHeight()) > 200.0f &&
(GetPosition().y < dBgS_WtrChk::GetWaterHeight() - 100.0f)) {
(getPosition().y < dBgS_WtrChk::GetWaterHeight() - 100.0f)) {
mHealth = 0;
fn_187_4540(2);
}
@@ -603,8 +603,8 @@ int dAcEsm_c::actorExecute() {
mScaleTarget.CopyTo(mScaleCopy2);
mScaleCopy2 += pOther->mScaleTarget;
GetPosition().CopyTo(mPosCopy1);
GetPosition().CopyTo(pOther->mPosCopy1);
getPosition().CopyTo(mPosCopy1);
getPosition().CopyTo(pOther->mPosCopy1);
if (mScaleCopy2.x > 1.2f) {
mScaleCopy2.set(1.2f, 1.2f, 1.2f);
@@ -631,11 +631,11 @@ int dAcEsm_c::actorExecute() {
dAcBomb_c *bomb = getBombWithinRadius(lookRadius);
if (bomb != nullptr && std::abs(bomb->GetPosition().y - mHomePos1.y) < 0.7f * lookRadius) {
if (bomb != nullptr && std::abs(bomb->getPosition().y - mHomePos1.y) < 0.7f * lookRadius) {
if (bomb->GetLinkage().tryAttach(bomb, this, &mBombRef, dLinkage_c::CONNECTION_1, false)) {
mTimer_0xBAE = 160;
startSound(SE_ESm_BRING_IN);
clearActorProperty(1);
unsetActorProperty(AC_PROP_0x1);
}
}
}
@@ -792,7 +792,7 @@ void dAcEsm_c::executeState_Walk() {
void dAcEsm_c::finalizeState_Walk() {}
void dAcEsm_c::initializeState_BirthJump() {
clearActorProperty(1);
unsetActorProperty(AC_PROP_0x1);
field_0xBA6 = 0;
field_0xB54 = 0.1f;
field_0xB68 = 0.f;
src/REL/d/a/obj/d_a_obj_chair.cpp
+6 -6
View File
@@ -136,7 +136,7 @@ int dAcOChair_c::actorExecute() {
// Calculate the HealCooldown (Heal link if needed)
if (!checkObjectProperty(0x8000)) {
if (!isBench()) {
mCyl.SetC(GetPosition());
mCyl.SetC(getPosition());
dCcS::GetInstance()->Set(&mCyl);
}
mHealTimer = FIRST_HEAL_COOLDOWN;
@@ -160,22 +160,22 @@ int dAcOChair_c::actorExecute() {
if (!isBench()) {
if (isChairTypeIdk0() && !checkObjectProperty(0x8000)) {
if (sLib::absDiff(GetRotation().y, getXZAngleToPlayer()) > 910) {
GetRotation().y = getXZAngleToPlayer();
if (sLib::absDiff(getRotation().y, getXZAngleToPlayer()) > 910) {
getRotation().y = getXZAngleToPlayer();
}
}
updateMatrix();
if (isChairTypeIdk0()) {
mWorldMtx.YrotM(mChairRot - GetRotation().y);
mWorldMtx.YrotM(mChairRot - getRotation().y);
}
mMdl.setLocalMtx(mWorldMtx);
mMdl.calc(false);
} else {
if (isChairTypeIdk0() && !checkObjectProperty(0x8000)) {
if (sLib::absDiff(GetRotation().y, getXZAngleToPlayer()) > 910) {
GetRotation().y = getXZAngleToPlayer();
if (sLib::absDiff(getRotation().y, getXZAngleToPlayer()) > 910) {
getRotation().y = getXZAngleToPlayer();
}
}
}
src/REL/d/a/obj/d_a_obj_dungeon_ship.cpp
+1 -1
View File
@@ -152,7 +152,7 @@ int dAcODungeonShip_c::create() {
}
mCullingDistance = 200000.0f;
clearActorProperty(0x1);
unsetActorProperty(AC_PROP_0x1);
mAppearEventFromParam = (mParams >> 0x18);
field_0x849 = mRotation.x;
mRotation.x = 0;
src/REL/d/a/obj/d_a_obj_tubo.cpp
+6 -6
View File
@@ -122,7 +122,7 @@ int dAcOtubo_c::actorPostCreate() {
return FAILED;
}
setActorProperty(0x4);
setActorProperty(AC_PROP_0x4);
if (dBgS_ObjGndChk ::CheckPos(mPosition + mVec3_c::Ey * 50.f)) {
mPosition.y = dBgS_ObjGndChk::GetGroundHeight();
@@ -257,9 +257,9 @@ void dAcOtubo_c::executeState_Wait() {
playRollSound();
if (!mbField_0x9EF) {
if (dBgS::GetInstance()->ChkMoveBG(mObjAcch.GetGnd(), true)) {
clearActorProperty(0x1);
unsetActorProperty(AC_PROP_0x1);
} else {
setActorProperty(0x1);
setActorProperty(AC_PROP_0x1);
}
}
mField_0x9DC = 0.f;
@@ -273,7 +273,7 @@ void dAcOtubo_c::initializeState_Grab() {
angle = mAng3_c::Zero;
mbMovingForward = 0;
mSph.SetCo_0x400();
clearActorProperty(0x1);
unsetActorProperty(AC_PROP_0x1);
if (mbField_0x9ED) {
mTimer_0x9F7 = 5;
mbField_0x9EE = true;
@@ -415,7 +415,7 @@ void dAcOtubo_c::initializeState_Rebirth() {
case SPECIAL_ITEM_13: mField_0x9FC = 1; break;
}
mTimer_0x9E8 = 150;
clearActorProperty(0x1);
unsetActorProperty(AC_PROP_0x1);
}
void dAcOtubo_c::executeState_Rebirth() {
setPosition(mPositionCopy);
@@ -439,7 +439,7 @@ void dAcOtubo_c::finalizeState_Rebirth() {
mSph.OnTgSet();
mpPosition = &mPosition;
clearObjectProperty(0x200);
setActorProperty(0x1);
setActorProperty(AC_PROP_0x1);
}
extern "C" void fn_80022BE0(void *, const mVec3_c &);
src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ void dAcOTumbleWeed_c::tumbleBounceMaybe() {
}
void dAcOTumbleWeed_c::adjustTimeScale() {
mTimeArea.check(getRoomId(), GetPosition(), 0, 30.f, 0.1f);
mTimeArea.check(getRoomId(), getPosition(), 0, 30.f, 0.1f);
if (0.f < mTimeArea.getDistMaybe()) {
sLib::chase(&mScale.y, 0.f, 0.07f);
mScale.z = mScale.y;
src/REL/d/t/d_t_action.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ int dTgAction_c::actorExecute() {
break;
}
if (pObj->profile_name == fProfile::BOMB) {
if (checkIfVec3fInMatrix(mActiveMtx, pObj->GetPosition())) {
if (checkIfVec3fInMatrix(mActiveMtx, pObj->getPosition())) {
reinterpret_cast<dAcBomb_c *>(pObj)->On_0xA3C(0x20000000);
}
}
@@ -59,7 +59,7 @@ int dTgAction_c::actorExecute() {
}
// Check For Player Within Area
if (enabled && checkIfVec3fInMatrix(mActiveMtx, player->GetPosition())) {
if (enabled && checkIfVec3fInMatrix(mActiveMtx, player->getPosition())) {
if (mType == FORCE_FADE_RESTART) {
player->onFlags_0x358(0x10000000);
setActiveArea(50.f);
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) {
src/d/col/bg/d_bg_s.cpp
+1 -1
View File
@@ -1185,7 +1185,7 @@ void dBgS::SetLightingCode(dAcObjBase_c *pObj, const cBgS_PolyInfo &info) {
f32 dBgS::SetLightingCode(dAcObjBase_c *pObj, f32 height) {
dBgS_ObjGndChk objGndChk;
mVec3_c pos = pObj->GetPosition();
mVec3_c pos = pObj->getPosition();
pos.y += height;
objGndChk.SetPos(&pos);
f32 gndCross = GroundCross(&objGndChk);
src/d/col/bg/d_bg_s_acch.cpp
+2 -2
View File
@@ -109,7 +109,7 @@ void dBgS_Acch::Set(dAcObjBase_c *pObj, int tblSize, dBgS_AcchCir *pAcchCir) {
mpAcchCir = pAcchCir;
mpMyObj = pObj;
mActorId = pObj->getID();
mpPos = &pObj->GetPosition();
mpPos = &pObj->getPosition();
mpOldPos = &pObj->GetOldPosition();
mpSpeed = &pObj->GetVelocity();
if (mpSpeed) {
@@ -118,7 +118,7 @@ void dBgS_Acch::Set(dAcObjBase_c *pObj, int tblSize, dBgS_AcchCir *pAcchCir) {
mSpeed.set(0.0f, 0.0f, 0.0f);
}
mpAngle = &pObj->GetAngle();
mpShapeAngle = &pObj->GetRotation();
mpShapeAngle = &pObj->getRotation();
}
bool dBgS_Acch::fn_8033f5b0(mVec3_c *pPos, mVec3_c *pOldPos, f32 height) {
src/d/col/cc/d_cc_mass_s.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ u32 dCcMassS_Mng::Chk(mVec3_c *p_xyz, dAcObjBase_c **p_actor, dCcMassS_HitInf *p
if (field_0x3A8 & 0x10) {
mVec3_c vec;
PSVECSubtract((*p_actor)->GetPosition(), *p_xyz, vec);
PSVECSubtract((*p_actor)->getPosition(), *p_xyz, vec);
vec.y = 0;
f32 vecMag = PSVECMag(vec);
if (cM3d_IsZero(vecMag)) {
src/d/d_linkage.cpp
+3 -3
View File
@@ -91,10 +91,10 @@ bool dLinkage_c::tryAttach(
pActor->getConnectParent()->profile_name == fProfile::ROOM) {
pActor->addActorToRoom(-1);
onFlag(0x20000000);
pActor->setActorProperty(0x2000000);
pActor->setActorProperty(dAcBase_c::AC_PROP_0x2000000);
pActor->changeLoadedEntitiesWithSet();
}
pActor->clearActorProperty(0x1);
pActor->unsetActorProperty(dAcBase_c::AC_PROP_0x1);
return true;
}
@@ -223,7 +223,7 @@ void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) {
}
mMtx_c &mtx = pActor->mWorldMtx;
f32 y = field_0x1C * pActor->mScale.y;
mtx.transS(pActor->GetPosition().x, pActor->GetPosition().y + pActor->GetYOffset(), pActor->GetPosition().z);
mtx.transS(pActor->getPosition().x, pActor->getPosition().y + pActor->GetYOffset(), pActor->getPosition().z);
if (mType == CONNECTION_1) {
MTXConcat(mtx, carryTransMtx, mtx);
}
src/d/d_room.cpp
+3 -3
View File
@@ -183,7 +183,7 @@ const EVNT *dRoom_c::getEventForIndex(u32 idx) const {
}
void deactivateUpdatesCb(dAcBase_c *ac) {
if (!ac->checkActorProperty(0x400)) {
if (!ac->checkActorProperty(dAcBase_c::AC_PROP_0x400)) {
return;
}
ac->unkVirtFunc_0x60();
@@ -198,7 +198,7 @@ void dRoom_c::deactivateUpdates() {
}
void activateUpdatesCb(dAcBase_c *ac) {
if (!ac->checkActorProperty(0x400)) {
if (!ac->checkActorProperty(dAcBase_c::AC_PROP_0x400)) {
return;
}
ac->restorePosRotFromCopy();
@@ -381,7 +381,7 @@ void dRoom_c::executeState_Active() {
void dRoom_c::finalizeState_Active() {}
void deleteActor(dAcBase_c *ac) {
ac->setActorProperty(0x800);
ac->setActorProperty(dAcBase_c::AC_PROP_0x800);
ac->deleteRequest();
}
src/d/lyt/meter/d_lyt_meter_plus_btn.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
#include "d/lyt/meter/d_lyt_meter_plus_btn.h"
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/d_stage_mgr.h"
#include "d/flag/dungeonflag_manager.h"
#include "d/flag/sceneflag_manager.h"
@@ -245,7 +246,7 @@ void dLytMeterPlusBtn_c::setCall(bool shouldCall) {
bool dLytMeterPlusBtn_c::hasSpecificMapMark() {
dTgMapMark_c *mark = nullptr;
while ((mark = static_cast<dTgMapMark_c *>(fManager_c::searchBaseByGroupType(fBase_c::STAGE, mark))) != nullptr) {
if (mark->checkActorProperty(0x100) || mark->profile_name != fProfile::T_MAP_MARK ||
if (mark->checkActorProperty(dAcBase_c::AC_PROP_0x100) || mark->profile_name != fProfile::T_MAP_MARK ||
mark->rotz_shift0_0xf == 1) {
continue;
}