mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Use MASS_IMMOVABLE/MASS_HEAVY everywhere (#2269)

Browse source
This commit is contained in:
cadmic 2024-10-10 20:48:26 -07:00 committed by GitHub
parent 53c57599a4
commit 746adfc727
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -381,7 +381,7 @@ void BossMo_Init(Actor* thisx, PlayState* play2) {
} else { } else {
Actor_SetScale(&this->actor, 0.01f); Actor_SetScale(&this->actor, 0.01f);
BossMo_SetupTentacle(this, play); BossMo_SetupTentacle(this, play);
this->actor.colChkInfo.mass = 0xFF; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
MO_WATER_LEVEL(play) = -50; MO_WATER_LEVEL(play) = -50;
this->waterTexAlpha = 90.0f; this->waterTexAlpha = 90.0f;
this->actor.world.pos.y = MO_WATER_LEVEL(play); this->actor.world.pos.y = MO_WATER_LEVEL(play);

2
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -484,7 +484,7 @@ void BossTw_Init(Actor* thisx, PlayState* play2) {
} }
Actor_SetScale(&this->actor, 2.5 * 0.01f); Actor_SetScale(&this->actor, 2.5 * 0.01f);
this->actor.colChkInfo.mass = 255; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.colChkInfo.health = 0; this->actor.colChkInfo.health = 0;
Collider_InitCylinder(play, &this->collider); Collider_InitCylinder(play, &this->collider);

4
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
View file

@ -178,7 +178,7 @@ void EnDekunuts_SetupBurrow(EnDekunuts* this) {
void EnDekunuts_SetupBeginRun(EnDekunuts* this) { void EnDekunuts_SetupBeginRun(EnDekunuts* this) {
Animation_MorphToPlayOnce(&this->skelAnime, &gDekuNutsUnburrowAnim, -3.0f); Animation_MorphToPlayOnce(&this->skelAnime, &gDekuNutsUnburrowAnim, -3.0f);
this->collider.dim.height = 37; this->collider.dim.height = 37;
this->actor.colChkInfo.mass = 0x32; this->actor.colChkInfo.mass = 50;
Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE); Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_DAMAGE);
this->collider.base.acFlags &= ~AC_ON; this->collider.base.acFlags &= ~AC_ON;
this->actionFunc = EnDekunuts_BeginRun; this->actionFunc = EnDekunuts_BeginRun;
@ -446,7 +446,7 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) {
if (this->collider.base.acFlags & AC_HIT) { if (this->collider.base.acFlags & AC_HIT) {
this->collider.base.acFlags &= ~AC_HIT; this->collider.base.acFlags &= ~AC_HIT;
Actor_SetDropFlag(&this->actor, &this->collider.elem, true); Actor_SetDropFlag(&this->actor, &this->collider.elem, true);
if (this->actor.colChkInfo.mass == 0x32) { if (this->actor.colChkInfo.mass == 50) {
if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) { if ((this->actor.colChkInfo.damageEffect != 0) || (this->actor.colChkInfo.damage != 0)) {
if (this->actor.colChkInfo.damageEffect != 1) { if (this->actor.colChkInfo.damageEffect != 1) {
if (this->actor.colChkInfo.damageEffect == 2) { if (this->actor.colChkInfo.damageEffect == 2) {

2
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -83,7 +83,7 @@ void EnDntJiji_Init(Actor* thisx, PlayState* play) {
// "Deku Scrub mask show elder" // "Deku Scrub mask show elder"
PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage); PRINTF(VT_FGCOL(YELLOW) "☆☆☆☆☆ デグナッツお面品評会長老 ☆☆☆☆☆ %x\n" VT_RST, this->stage);
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
this->actor.colChkInfo.mass = 0xFF; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.attentionRangeType = ATTENTION_RANGE_6; this->actor.attentionRangeType = ATTENTION_RANGE_6;
this->actionFunc = EnDntJiji_SetFlower; this->actionFunc = EnDntJiji_SetFlower;
this->actor.gravity = -2.0f; this->actor.gravity = -2.0f;

4
src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View file

@ -128,7 +128,7 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) {
this->type = ENDNTNOMAL_TARGET; this->type = ENDNTNOMAL_TARGET;
} }
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED; this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
this->actor.colChkInfo.mass = 0xFF; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->objectId = -1; this->objectId = -1;
if (this->type == ENDNTNOMAL_TARGET) { if (this->type == ENDNTNOMAL_TARGET) {
PRINTF("\n\n"); PRINTF("\n\n");
@ -676,7 +676,7 @@ void EnDntNomal_SetupStageAttack(EnDntNomal* this, PlayState* play) {
if (this->timer3 == 0) { if (this->timer3 == 0) {
this->endFrame = (f32)Animation_GetLastFrame(&gDntStageSpitAnim); this->endFrame = (f32)Animation_GetLastFrame(&gDntStageSpitAnim);
Animation_Change(&this->skelAnime, &gDntStageSpitAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f); Animation_Change(&this->skelAnime, &gDntStageSpitAnim, 1.0f, 0.0f, this->endFrame, ANIMMODE_ONCE, -10.0f);
this->actor.colChkInfo.mass = 0xFF; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->isSolid = true; this->isSolid = true;
this->timer2 = 0; this->timer2 = 0;
Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY); Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ENEMY);

2
src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c
View file

@ -63,7 +63,7 @@ static ColliderCylinderInit sCylinderInit = {
{ 18, 20, 0, { 0, 0, 0 } }, { 18, 20, 0, { 0, 0, 0 } },
}; };
static CollisionCheckInfoInit2 sColChkInit = { 1, 2, 25, 25, 0xFF }; static CollisionCheckInfoInit2 sColChkInit = { 1, 2, 25, 25, MASS_IMMOVABLE };
void EnDodojr_Init(Actor* thisx, PlayState* play) { void EnDodojr_Init(Actor* thisx, PlayState* play) {
EnDodojr* this = (EnDodojr*)thisx; EnDodojr* this = (EnDodojr*)thisx;

2
src/overlays/actors/ovl_En_Gb/z_en_gb.c
View file

@ -176,7 +176,7 @@ void EnGb_Init(Actor* thisx, PlayState* play) {
ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f); ActorShape_Init(&this->dyna.actor.shape, 0.0f, ActorShadow_DrawCircle, 35.0f);
Actor_SetScale(&this->dyna.actor, 0.01f); Actor_SetScale(&this->dyna.actor, 0.01f);
this->dyna.actor.colChkInfo.mass = 0xFF; this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE;
this->dyna.actor.speed = 0.0f; this->dyna.actor.speed = 0.0f;
this->dyna.actor.velocity.y = 0.0f; this->dyna.actor.velocity.y = 0.0f;
this->dyna.actor.gravity = -1.0f; this->dyna.actor.gravity = -1.0f;

4
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View file

@ -3608,9 +3608,9 @@ void EnHorse_Update(Actor* thisx, PlayState* play2) {
} }
if (thisx->speed == 0.0f && !(this->stateFlags & ENHORSE_FLAG_19)) { if (thisx->speed == 0.0f && !(this->stateFlags & ENHORSE_FLAG_19)) {
thisx->colChkInfo.mass = 0xFF; thisx->colChkInfo.mass = MASS_IMMOVABLE;
} else { } else {
thisx->colChkInfo.mass = 0xFE; thisx->colChkInfo.mass = MASS_HEAVY;
} }
if (thisx->speed >= 5.0f) { if (thisx->speed >= 5.0f) {

2
src/overlays/actors/ovl_En_Mk/z_en_mk.c
View file

@ -60,7 +60,7 @@ void EnMk_Init(Actor* thisx, PlayState* play) {
Animation_PlayLoop(&this->skelAnime, &object_mk_Anim_000D88); Animation_PlayLoop(&this->skelAnime, &object_mk_Anim_000D88);
Collider_InitCylinder(play, &this->collider); Collider_InitCylinder(play, &this->collider);
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
this->actor.colChkInfo.mass = 0xFF; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
Actor_SetScale(&this->actor, 0.01f); Actor_SetScale(&this->actor, 0.01f);
this->actionFunc = EnMk_Wait; this->actionFunc = EnMk_Wait;

2
src/overlays/actors/ovl_En_Ny/z_en_ny.c
View file

@ -138,7 +138,7 @@ void EnNy_Init(Actor* thisx, PlayState* play) {
// "Dummy new initials" // "Dummy new initials"
PRINTF("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params); PRINTF("ダミーニュウ イニシャル[ %d ] ！！\n", this->actor.params);
PRINTF("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused); PRINTF("En_Ny_actor_move2[ %x ] ！！\n", EnNy_UpdateUnused);
this->actor.colChkInfo.mass = 0xFF; this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->actor.update = EnNy_UpdateUnused; this->actor.update = EnNy_UpdateUnused;
this->collider.base.colMaterial = COL_MATERIAL_METAL; this->collider.base.colMaterial = COL_MATERIAL_METAL;
} }

2
src/overlays/actors/ovl_En_Skb/z_en_skb.c
View file

@ -160,7 +160,7 @@ void EnSkb_Init(Actor* thisx, PlayState* play) {
this->actor.colChkInfo.damageTable = &sDamageTable; this->actor.colChkInfo.damageTable = &sDamageTable;
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
this->actor.focus.pos = this->actor.world.pos; this->actor.focus.pos = this->actor.world.pos;
this->actor.colChkInfo.mass = 0xFE; this->actor.colChkInfo.mass = MASS_HEAVY;
this->actor.colChkInfo.health = 2; this->actor.colChkInfo.health = 2;
this->actor.shape.yOffset = -8000.0f; this->actor.shape.yOffset = -8000.0f;
SkelAnime_Init(play, &this->skelAnime, &gStalchildSkel, &gStalchildUncurlingAnim, this->jointTable, SkelAnime_Init(play, &this->skelAnime, &gStalchildSkel, &gStalchildUncurlingAnim, this->jointTable,

2
src/overlays/actors/ovl_En_Trap/z_en_trap.c
View file

@ -113,7 +113,7 @@ void EnTrap_Init(Actor* thisx, PlayState* play) {
Collider_SetCylinder(play, &this->collider, thisx, &sCylinderInit); Collider_SetCylinder(play, &this->collider, thisx, &sCylinderInit);
ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 0.0f); ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawCircle, 0.0f);
thisx->attentionRangeType = ATTENTION_RANGE_3; thisx->attentionRangeType = ATTENTION_RANGE_3;
thisx->colChkInfo.mass = 0xFF; thisx->colChkInfo.mass = MASS_IMMOVABLE;
} }
void EnTrap_Destroy(Actor* thisx, PlayState* play) { void EnTrap_Destroy(Actor* thisx, PlayState* play) {