mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 06:21:16 +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

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

@ -1520,7 +1520,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
this->workf[UNK_F11] = 600.0f;
Audio_QueueSeqCmd(0x1 << 28 | SEQ_PLAYER_BGM_MAIN << 24 | 0xC800FF);
this->work[CS_TIMER_2] = 0;
// fallthrough
FALLTHROUGH;
case 1:
if (this->work[CS_TIMER_2] == 20) {
Message_StartTextbox(play, 0x6059, NULL);
@ -1663,7 +1663,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
sEnvType = -1;
play->envCtx.lightSetting = 4;
Math_ApproachF(&play->envCtx.lightBlend, 1, 1, 0.1f);
// fallthrough
FALLTHROUGH;
case 2:
SkelAnime_Update(&this->skelAnime);
Math_ApproachF(&this->actor.scale.x, 0.0069999993f, 1, 0.0006999999f);
@ -3934,7 +3934,7 @@ void BossTw_BlastFire(BossTw* this, PlayState* play) {
this->blastTailPos[i] = this->actor.world.pos;
}
this->workf[TAIL_ALPHA] = 255.0f;
// fallthrough
FALLTHROUGH;
case 1:
case 10:
this->blastActive = true;
@ -4122,7 +4122,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) {
}
this->workf[TAIL_ALPHA] = 255.0f;
// fallthrough
FALLTHROUGH;
case 1:
case 10:
this->blastActive = true;