mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-06 07:56:32 +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/code/z_parameter.c
View file

@ -2471,7 +2471,7 @@ void Magic_Update(PlayState* play) {
gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
sMagicBorderR = sMagicBorderG = sMagicBorderB = 255;
}
// fallthrough (flash border while magic is being consumed)
FALLTHROUGH; // Flash border while magic is being consumed
case MAGIC_STATE_METER_FLASH_1:
case MAGIC_STATE_METER_FLASH_2:
case MAGIC_STATE_METER_FLASH_3:
@ -3535,6 +3535,7 @@ void Interface_Draw(PlayState* play) {
gSaveContext.timer1State = 8;
}
}
FALLTHROUGH;
case 4:
case 8:
if ((gSaveContext.timer1State == 4) || (gSaveContext.timer1State == 8)) {
@ -3604,6 +3605,7 @@ void Interface_Draw(PlayState* play) {
gSaveContext.timer1State = 14;
}
FALLTHROUGH;
case 14:
if (gSaveContext.timer1State == 14) {
if (gSaveContext.healthCapacity > 0xA0) {
@ -3707,6 +3709,7 @@ void Interface_Draw(PlayState* play) {
gSaveContext.timer2State = 10;
}
}
FALLTHROUGH;
case 4:
case 10:
if ((gSaveContext.timer2State == 4) || (gSaveContext.timer2State == 10)) {