mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-14 13:34:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_mg_fish.cpp
+6 -5
View File
@@ -22,6 +22,7 @@
#include "d/d_s_play.h"
#include "d/d_vibration.h"
#include "f_op/f_op_kankyo_mng.h"
#include <cstring>
#define ANM_MG_FISH_MOUTH_CLOSE 4
#define ANM_MG_FISH_MOUTH_OPEN 5
@@ -119,7 +120,7 @@ static void* s_hitfish_sub(void* a, void* b) {
if (fopAc_IsActor(a)) {
mg_fish_class* fish = (mg_fish_class*)a;
if (fopAcM_GetName(fish) == PROC_MG_FISH && fish->mCurAction == ACTION_MG_FISH_MF_HIT) {
return &fish->actor.base;
return &LEAFDRAW_BASE(&fish->actor);
}
}
return NULL;
@@ -677,7 +678,7 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) {
&i_this->actor.tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj);
}
if (i_this->mKind2 == 3) {
_GXColor color;
GXColor color;
color.r = 0x32;
color.g = 0x2d;
color.b = 0x14;
@@ -2308,7 +2309,7 @@ static void mf_esa_search(mg_fish_class* i_this) {
i_this->field_0x5ec > 10000.0f) {
i_this->mActionPhase = 3;
i_this->mMovementPitch = i_this->mMovementPitch + 0x2000;
i_this->mMovementYaw += (s16)cM_rndFX(32768.0f);
ANGLE_ADD(i_this->mMovementYaw, cM_rndFX(32768.0f));
rod->field_0x10a5 = fVar10 * (cM_rndF(20.0f) + 15.0f);
i_this->field_0x659 = rod->field_0x10a5;
} else {
@@ -3007,7 +3008,7 @@ static void action(mg_fish_class* i_this) {
}
} else {
f32 unkFloat0 = -1000.0f * i_this->field_0x5d4 * i_this->field_0x660;
i_this->jointYaws2[1] += (s16)(i_this->field_0x5d4 * 2500.0f / i_this->mJointScale);
ANGLE_ADD(i_this->jointYaws2[1], i_this->field_0x5d4 * 2500.0f / i_this->mJointScale);
if (i_this->mGedouKind >= GEDOU_KIND_BG) {
i_this->jointYaws2[1] += 2000;
}
@@ -4060,7 +4061,7 @@ static actor_method_class l_daMg_Fish_Method = {
};
actor_process_profile_definition g_profile_MG_FISH = {
(uint)fpcLy_CURRENT_e, // mLayerID
(u32)fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_MG_FISH, // mProcName