mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix a number of warnings when compiling with GCC (#1239)

Browse source 
* Silence a number of GCC warnings

* Remove

* Suggested changes

* Format

* Fix comment in en_go2
This commit is contained in:
Tharo 2022-06-03 17:51:23 +01:00 • committed by GitHub
parent 5015af4c57
commit 451b24f79b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
71 changed files with 298 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -379,7 +379,7 @@ void EnBb_Init(Actor* thisx, PlayState* play) {
this->path = this->actionState >> 4;
this->collider.elements[0].dim.modelSphere.radius = 0x16;
Actor_SetScale(thisx, 0.03f);
// fallthrough
FALLTHROUGH;
case ENBB_GREEN:
thisx->naviEnemyId = NAVI_ENEMY_GREEN_BUBBLE;
this->bobSize = (this->actionState & 0xF) * 20.0f;
@ -1087,6 +1087,7 @@ void EnBb_SetupStunned(EnBb* this) {
break;
case 9:
this->fireIceTimer = 0x30;
FALLTHROUGH;
case 15:
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Actor_SetColorFilter(&this->actor, 0, 0xB4, 0, 0x50);
@ -1154,6 +1155,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) {
switch (this->dmgEffect) {
case 7:
this->actor.freezeTimer = this->collider.elements[0].info.acHitInfo->toucher.damage;
FALLTHROUGH;
case 5:
this->fireIceTimer = 0x30;
//! @bug
@ -1212,6 +1214,7 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) {
((this->actor.params != ENBB_WHITE) && (this->flameScaleX < 20.0f))) {
EnBb_SetupDamage(this);
}
FALLTHROUGH;
case 13:
break;
}