mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-11 11:02:37 -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 0ee3b2b197 7b7b9dd287
commit 942be208d2
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_e_hm.cpp
+5 -5
View File
@@ -94,7 +94,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
void daE_HM_c::initCcCylinder() {
static const dCcD_SrcSph ccShpSrc = {
{
{0x0, {{0x2, 0x1, 0xd}, {(s32)0xD8FBFDFF, 0x43}, 0x75}}, // mObj
{0x0, {{0x2, 0x1, 0xd}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj
{dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg
{0x0}, // mGObjCo
@@ -395,7 +395,7 @@ int daE_HM_c::W_MoveCheckWall() {
dComIfG_Bgsp().GetTriPla(linChk, &plane1);
if (!dComIfG_Bgsp().GetMagnetCode(linChk)) {
field_0x5b4 += (s16)0x200;
ANGLE_ADD(field_0x5b4, 0x200);
return 1;
}
@@ -438,7 +438,7 @@ int daE_HM_c::W_WallCheck() {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(linChk, &plane);
if (!dComIfG_Bgsp().GetMagnetCode(linChk)) {
field_0x5b4 += (s16)0x200;
ANGLE_ADD(field_0x5b4, 0x200);
return 1;
}
}
@@ -841,7 +841,7 @@ void daE_HM_c::DeathMotion() {
f32 frame = mAnm_p->getFrame();
if (mAcch.ChkGroundHit() && (field_0x5da++, field_0x5da) == 1) {
speed.y = yREG_F(11) + 35.0f;
current.angle.y -= (s16)0x1000;
ANGLE_SUB(current.angle.y, 0x1000);
SetAnm(8, 0, nREG_F(9) + 1.0f, nREG_F(12) + 1.0f);
mAnm_p->setPlaySpeed(yREG_F(12) + 2.0f);
}
@@ -1075,7 +1075,7 @@ void daE_HM_c::At_Check() {
}
if ((s16)mAtInfo.mAttackPower > 0) {
health -= (s16)mAtInfo.mAttackPower;
S16_SUB(health, mAtInfo.mAttackPower);
}
s8 unkByte1 = 0;