Skip to content

Commit 25ae370

Browse files
committed
name some fields
1 parent 81abbf0 commit 25ae370

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

include/d/a/obj/d_a_obj_paint.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ class dAcOpaint_c : public dAcObjBase_c {
3838
/* 0x350 */ dShadowCircle_c mShadow;
3939
/* 0x358 */ dBgW mBgW;
4040
/* 0x568 */ STATE_MGR_DECLARE(dAcOpaint_c);
41-
/* 0x5A4 */ mAng mRotationZRelated;
42-
/* 0x5A6 */ mAng mRotationZOffset;
41+
/* 0x5A4 */ mAng mPaintingTilt;
42+
/* 0x5A6 */ mAng mTilt;
4343
/* 0x5A8 */ s8 mPaintingOffsetTimer;
4444
/* 0x5A9 */ u8 mSubtype;
4545
/* 0x5AA */ bool mPaintingSwayed;
4646

47-
static mAng rotationZRelatedBatreaux;
48-
static mAng rotationZRelatedGroose;
47+
static mAng paintingTiltBatreaux;
48+
static mAng paintingTiltGroose;
4949
static const f32 lbl_613_rodata_2C;
5050
};
5151

src/REL/d/a/obj/d_a_obj_paint.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ SPECIAL_ACTOR_PROFILE(OBJ_PAINT, dAcOpaint_c, fProfile::OBJ_PAINT, 0x163, 0, 0);
1616

1717
STATE_DEFINE(dAcOpaint_c, Wait);
1818

19-
mAng dAcOpaint_c::rotationZRelatedBatreaux = mAng::d2s(35.0025f);
20-
mAng dAcOpaint_c::rotationZRelatedGroose = mAng::d2s(40.0015f);
19+
mAng dAcOpaint_c::paintingTiltBatreaux = mAng::d2s(35.0025f);
20+
mAng dAcOpaint_c::paintingTiltGroose = mAng::d2s(40.0015f);
2121

2222
bool dAcOpaint_c::createHeap() {
2323
const char *oarcName = getOarcName();
@@ -76,9 +76,9 @@ void dAcOpaint_c::executeState_Wait() {
7676
if (1000.f - distance > 0.f) {
7777
if (distance < _a + 700.f && !mPaintingSwayed) {
7878
if (mSubtype == Batreaux) {
79-
mRotationZRelated = rotationZRelatedBatreaux;
79+
mPaintingTilt = paintingTiltBatreaux;
8080
} else {
81-
mRotationZRelated = rotationZRelatedGroose;
81+
mPaintingTilt = paintingTiltGroose;
8282
}
8383
mPaintingSwayed = true;
8484
startSound(SE_Paint_LOOSE);
@@ -87,15 +87,15 @@ void dAcOpaint_c::executeState_Wait() {
8787
mPosition.y += 10.f;
8888

8989
if (mPaintingSwayed) {
90-
mRotationZOffset = mAng(0x100);
90+
mTilt = mAng(0x100);
9191
}
9292
}
9393
}
9494

95-
mRotationZOffset -= mAng((mRotation.z - mRotationZRelated) * (0.03f + (0.01f * _a)));
96-
mRotationZOffset *= 0.89f + (0.01f * _a);
95+
mTilt -= mAng((mRotation.z - mPaintingTilt) * (0.03f + (0.01f * _a)));
96+
mTilt *= 0.89f + (0.01f * _a);
9797

98-
mRotation.z = mRotation.z + mRotationZOffset;
98+
mRotation.z = mRotation.z + mTilt;
9999

100100
if (mPaintingOffsetTimer > 0) {
101101
mPaintingOffsetTimer--;

0 commit comments

Comments
 (0)