izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

implement suggestions

Browse Source
This commit is contained in:
mzxrules
2023-10-25 05:27:36 -04:00
parent 60d953cac4
commit 6e37057cbd
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+9 -11
View File
@@ -47,8 +47,8 @@ void EnHonotrap_SetupEyeAttack2(EnHonotrap* this);
void EnHonotrap_EyeAttack2(EnHonotrap* this, PlayState* play);
void EnHonotrap_SetupEyeClose2(EnHonotrap* this);
void EnHonotrap_EyeClose2(EnHonotrap* this, PlayState* play);
void EnHonotrap_SetupFlame(EnHonotrap* this);
void EnHonotrap_Flame(EnHonotrap* this, PlayState* play);
void EnHonotrap_SetupFlameGrow(EnHonotrap* this);
void EnHonotrap_FlameGrow(EnHonotrap* this, PlayState* play);
void EnHonotrap_SetupFlameDrop(EnHonotrap* this);
void EnHonotrap_FlameDrop(EnHonotrap* this, PlayState* play);
void EnHonotrap_SetupFlameMove(EnHonotrap* this);
@@ -241,7 +241,7 @@ void EnHonotrap_InitFlame(EnHonotrap* this, PlayState* play) {
this->collider.cyl.dim.height = 30;
this->actor.shape.yOffset = -1000.0f;
}
EnHonotrap_SetupFlame(this);
EnHonotrap_SetupFlameGrow(this);
}
void EnHonotrap_InitFlameGroup(EnHonotrap* this, PlayState* play) {
@@ -422,11 +422,11 @@ void EnHonotrap_EyeClose2(EnHonotrap* this, PlayState* play) {
}
}
void EnHonotrap_SetupFlame(EnHonotrap* this) {
this->actionFunc = EnHonotrap_Flame;
void EnHonotrap_SetupFlameGrow(EnHonotrap* this) {
this->actionFunc = EnHonotrap_FlameGrow;
}
void EnHonotrap_Flame(EnHonotrap* this, PlayState* play) {
void EnHonotrap_FlameGrow(EnHonotrap* this, PlayState* play) {
f32 targetScale = (this->actor.params == HONOTRAP_TYPE_FLAME_MOVE) ? 0.004f : 0.0048f;
s32 targetReached = Math_StepToF(&this->actor.scale.x, targetScale, 0.0006f);
@@ -776,9 +776,9 @@ void EnHonotrap_DrawFlame(Actor* thisx, PlayState* play) {
void EnHonotrap_DrawFlameGroup(Actor* thisx, PlayState* play) {
s32 pad;
EnHonotrap* this;
EnHonotrap* this = ((EnHonotrap*)thisx);
EnHonotrapFlameElement* flameElem;
EnHonotrapFlameGroup* flameGroup;
EnHonotrapFlameGroup* flameGroup = &this->flameGroup;
s32 i;
s32 pad2;
Vec3s camDir;
@@ -790,9 +790,7 @@ void EnHonotrap_DrawFlameGroup(Actor* thisx, PlayState* play) {
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
Camera_GetCamDir(&camDir, GET_ACTIVE_CAM(play));
camDir.y += 0x8000;
//! FAKE:
this = ((EnHonotrap*)thisx);
flameGroup = &this->flameGroup;
for (i = 0; i < ARRAY_COUNT(flameGroup->flameList); i++) {
flameElem = &flameGroup->flameList[i];
if (flameElem->isDrawn) {