mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-23 06:02:08 -05:00
Code Issues Projects Releases Wiki Activity

Simplify mudwall collision check

Browse Source 
There was no need to have a second collider specifically for Ice Arrow hits
This commit is contained in:
Sarge-117 2022-09-03 11:24:17 -07:00
parent a397b07ec4
commit 0151294648
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@ -59,20 +59,20 @@ static ColliderQuadInit sQuadInit = {
{ { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } },
}; };
// This quad only used for "Blue Fire Arrows" enhancement // Replacement quad used for "Blue Fire Arrows" enhancement
static ColliderQuadInit sIceArrowQuadInit = { static ColliderQuadInit sIceArrowQuadInit = {
{ {
COLTYPE_NONE, COLTYPE_NONE,
AT_NONE, AT_NONE,
AC_ON | AC_TYPE_PLAYER, AC_ON | AC_TYPE_PLAYER | AC_TYPE_OTHER,
OC1_NONE, OC1_NONE,
OC2_TYPE_2, OC2_TYPE_2,
COLSHAPE_QUAD, COLSHAPE_QUAD,
}, },
{ {
ELEMTYPE_UNK0, ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 }, { 0x00000048, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 }, { 0x00001048, 0x00, 0x00 },
TOUCH_NONE, TOUCH_NONE,
BUMP_ON, BUMP_ON,
OCELEM_NONE, OCELEM_NONE,
@ -123,12 +123,14 @@ void BgBreakwall_Init(Actor* thisx, GlobalContext* globalCtx) {
} }
ActorShape_Init(&this->dyna.actor.shape, 0.0f, NULL, 0.0f); ActorShape_Init(&this->dyna.actor.shape, 0.0f, NULL, 0.0f);
Collider_InitQuad(globalCtx, &this->collider);
Collider_SetQuad(globalCtx, &this->collider, &this->dyna.actor, &sQuadInit);
// If "Blue Fire Arrows" are enabled, set up this collider for them // If "Blue Fire Arrows" are enabled, set up this collider for them
if (blueFireArrowsDC) { if (blueFireArrowsDC) {
Collider_InitQuad(globalCtx, &this->colliderIceArrow); Collider_InitQuad(globalCtx, &this->collider);
Collider_SetQuad(globalCtx, &this->colliderIceArrow, &this->dyna.actor, &sIceArrowQuadInit); Collider_SetQuad(globalCtx, &this->collider, &this->dyna.actor, &sIceArrowQuadInit);
} else {
Collider_InitQuad(globalCtx, &this->collider);
Collider_SetQuad(globalCtx, &this->collider, &this->dyna.actor, &sQuadInit);
} }
} else { } else {
this->dyna.actor.world.pos.y -= 40.0f; this->dyna.actor.world.pos.y -= 40.0f;
@ -260,12 +262,11 @@ void BgBreakwall_Wait(BgBreakwall* this, GlobalContext* globalCtx) {
bool blueFireArrowHit = false; bool blueFireArrowHit = false;
// If "Blue Fire Arrows" enabled, check this collider for a hit // If "Blue Fire Arrows" enabled, check this collider for a hit
if (blueFireArrowsDC) { if (blueFireArrowsDC) {
if (this->colliderIceArrow.base.acFlags & AC_HIT) { if (this->collider.base.acFlags & AC_HIT) {
this->colliderIceArrow.base.acFlags &= ~AC_HIT; if ((this->collider.base.ac != NULL) && (this->collider.base.ac->id == ACTOR_EN_ARROW)) {
if ((this->colliderIceArrow.base.ac != NULL) && (this->colliderIceArrow.base.ac->id == ACTOR_EN_ARROW)) {
if (this->colliderIceArrow.base.ac->child != NULL && if (this->collider.base.ac->child != NULL &&
this->colliderIceArrow.base.ac->child->id == ACTOR_ARROW_ICE) { this->collider.base.ac->child->id == ACTOR_ARROW_ICE) {
blueFireArrowHit = true; blueFireArrowHit = true;
} }
} }
@ -358,10 +359,6 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
Collider_SetQuadVertices(&this->collider, &colQuad[0], &colQuad[1], &colQuad[2], &colQuad[3]); Collider_SetQuadVertices(&this->collider, &colQuad[0], &colQuad[1], &colQuad[2], &colQuad[3]);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
if (blueFireArrowsDC) {
Collider_SetQuadVertices(&this->colliderIceArrow, &colQuad[0], &colQuad[1], &colQuad[2], &colQuad[3]);
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->colliderIceArrow.base);
}
} }
CLOSE_DISPS(globalCtx->state.gfxCtx); CLOSE_DISPS(globalCtx->state.gfxCtx);

1
soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
View File

@ -14,7 +14,6 @@ typedef struct BgBreakwall {
/* 0x0168 */ s8 colType; /* 0x0168 */ s8 colType;
/* 0x0169 */ s8 bankIndex; /* 0x0169 */ s8 bankIndex;
/* 0x016C */ ColliderQuad collider; /* 0x016C */ ColliderQuad collider;
ColliderQuad colliderIceArrow; // For "Blue Fire Arrows" enhancement
/* 0x01EC */ BgBreakwallActionFunc actionFunc; /* 0x01EC */ BgBreakwallActionFunc actionFunc;
} BgBreakwall; // size = 0x01F0 } BgBreakwall; // size = 0x01F0