mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-07 20:01:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

name some fields

Browse Source
This commit is contained in:
swekka
2025-12-06 22:26:53 +01:00
parent 81abbf0bc7
commit 25ae37016f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/obj/d_a_obj_paint.h
+4 -4
View File
@@ -38,14 +38,14 @@ private:
/* 0x350 */ dShadowCircle_c mShadow;
/* 0x358 */ dBgW mBgW;
/* 0x568 */ STATE_MGR_DECLARE(dAcOpaint_c);
/* 0x5A4 */ mAng mRotationZRelated;
/* 0x5A6 */ mAng mRotationZOffset;
/* 0x5A4 */ mAng mPaintingTilt;
/* 0x5A6 */ mAng mTilt;
/* 0x5A8 */ s8 mPaintingOffsetTimer;
/* 0x5A9 */ u8 mSubtype;
/* 0x5AA */ bool mPaintingSwayed;
static mAng rotationZRelatedBatreaux;
static mAng rotationZRelatedGroose;
static mAng paintingTiltBatreaux;
static mAng paintingTiltGroose;
static const f32 lbl_613_rodata_2C;
};
src/REL/d/a/obj/d_a_obj_paint.cpp
+8 -8
View File
@@ -16,8 +16,8 @@ SPECIAL_ACTOR_PROFILE(OBJ_PAINT, dAcOpaint_c, fProfile::OBJ_PAINT, 0x163, 0, 0);
STATE_DEFINE(dAcOpaint_c, Wait);
mAng dAcOpaint_c::rotationZRelatedBatreaux = mAng::d2s(35.0025f);
mAng dAcOpaint_c::rotationZRelatedGroose = mAng::d2s(40.0015f);
mAng dAcOpaint_c::paintingTiltBatreaux = mAng::d2s(35.0025f);
mAng dAcOpaint_c::paintingTiltGroose = mAng::d2s(40.0015f);
bool dAcOpaint_c::createHeap() {
const char *oarcName = getOarcName();
@@ -76,9 +76,9 @@ void dAcOpaint_c::executeState_Wait() {
if (1000.f - distance > 0.f) {
if (distance < _a + 700.f && !mPaintingSwayed) {
if (mSubtype == Batreaux) {
mRotationZRelated = rotationZRelatedBatreaux;
mPaintingTilt = paintingTiltBatreaux;
} else {
mRotationZRelated = rotationZRelatedGroose;
mPaintingTilt = paintingTiltGroose;
}
mPaintingSwayed = true;
startSound(SE_Paint_LOOSE);
@@ -87,15 +87,15 @@ void dAcOpaint_c::executeState_Wait() {
mPosition.y += 10.f;
if (mPaintingSwayed) {
mRotationZOffset = mAng(0x100);
mTilt = mAng(0x100);
}
}
}
mRotationZOffset -= mAng((mRotation.z - mRotationZRelated) * (0.03f + (0.01f * _a)));
mRotationZOffset *= 0.89f + (0.01f * _a);
mTilt -= mAng((mRotation.z - mPaintingTilt) * (0.03f + (0.01f * _a)));
mTilt *= 0.89f + (0.01f * _a);
mRotation.z = mRotation.z + mRotationZOffset;
mRotation.z = mRotation.z + mTilt;
if (mPaintingOffsetTimer > 0) {
mPaintingOffsetTimer--;