mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-27 01:55:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mark obj_hat equivalent

Browse Source
This commit is contained in:
LagoLunatic
2025-03-02 16:29:54 -05:00
parent 47c101e1e1
commit a80f464ab7
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1656,7 +1656,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_obj_hami2"),
ActorRel(NonMatching, "d_a_obj_hami3"),
ActorRel(NonMatching, "d_a_obj_hami4"),
ActorRel(NonMatching, "d_a_obj_hat"),
ActorRel(Equivalent, "d_a_obj_hat"), # weak func order
ActorRel(Matching, "d_a_obj_hbrf1"),
ActorRel(NonMatching, "d_a_obj_hcbh"),
ActorRel(Equivalent, "d_a_obj_hha"), # weak func order
include/d/actor/d_a_obj_hat.h
-1
View File
@@ -43,7 +43,6 @@ public:
/* 0x640 */ cXyz mMoveNorm;
/* 0x64c */ u8 mState;
/* 0x64d */ u8 mHatNo;
/* Place member variables here */
}; /* size: 0x650 */
#endif /* D_A_OBJ_HAT_H */
src/d/actor/d_a_obj_hat.cpp
+5 -8
View File
@@ -39,9 +39,7 @@ static dCcD_SrcCyl l_cyl_src = {
},
// cM3dGCylS
{
/* Center */ 0.0f,
0.0f,
0.0f,
/* Center */ 0.0f, 0.0f, 0.0f,
/* Radius */ 70.0f,
/* Height */ 80.0f,
},
@@ -150,14 +148,13 @@ BOOL daObjHat_c::_execute() {
(this->*moveProc[mState])();
f32 xspeed = mMoveNorm.x * speedF;
f32 ymove = speed.y + gravity;
f32 yspeed = speed.y + gravity;
f32 zspeed = mMoveNorm.z * speedF;
// because downwards vector quantity has negative value
if (ymove < fopAcM_GetMaxFallSpeed(this)) {
ymove = fopAcM_GetMaxFallSpeed(this);
if (yspeed < fopAcM_GetMaxFallSpeed(this)) {
yspeed = fopAcM_GetMaxFallSpeed(this);
}
fopAcM_SetSpeed(this, xspeed, ymove, zspeed);
fopAcM_SetSpeed(this, xspeed, yspeed, zspeed);
fopAcM_posMove(this, mStts.GetCCMoveP());
mAcch.CrrPos(g_dComIfG_gameInfo.play.mBgS);
src/d/actor/d_a_obj_shelf.cpp
+13 -13
View File
@@ -34,20 +34,20 @@ namespace daObjShelf {
};
static const Attr_c L_attr = {
/* mVibDuration */ 4,
/* mVibYSpeed */ 30000,
/* mVibYMagnitude */ 4.0f,
/* mVibXSpeed */ 0x7724,
/* mVibZSpeed */ 0x7148,
/* mVibXMagnitude */ 200.0f,
/* mVibZMagnitude */ 200.0f,
/* mRotAccel */ 600.0f,
/* mRotDecay */ 0.02f,
/* mBounceFactor */ 0.5f,
/* mBounceNum */ 5,
/* mVibDuration */ 4,
/* mVibYSpeed */ 30000,
/* mVibYMagnitude */ 4.0f,
/* mVibXSpeed */ 30500,
/* mVibZSpeed */ 29000,
/* mVibXMagnitude */ 200.0f,
/* mVibZMagnitude */ 200.0f,
/* mRotAccel */ 600.0f,
/* mRotDecay */ 0.02f,
/* mBounceFactor */ 0.5f,
/* mBounceNum */ 5,
/* mRotWaitDuration */ 0,
/* mInitSpeed2 */ -3500.0f,
/* mInitSpeed3 */ -2500.0f
/* mInitSpeed2 */ -3500.0f,
/* mInitSpeed3 */ -2500.0f,
};
inline const Attr_c & attr() { return L_attr; }