1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 04:14:34 +00:00

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

* 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

View file

@ -233,11 +233,11 @@ f32 Audio_AdsrUpdate(AdsrState* adsr) {
adsr->action.s.state = ADSR_STATE_HANG;
break;
}
// fallthrough
FALLTHROUGH;
case ADSR_STATE_START_LOOP:
adsr->envIndex = 0;
adsr->action.s.state = ADSR_STATE_LOOP;
// fallthrough
FALLTHROUGH;
retry:
case ADSR_STATE_LOOP:
adsr->delay = adsr->envelope[adsr->envIndex].delay;
@ -273,14 +273,14 @@ f32 Audio_AdsrUpdate(AdsrState* adsr) {
if (adsr->action.s.state != ADSR_STATE_FADE) {
break;
}
// fallthrough
FALLTHROUGH;
case ADSR_STATE_FADE:
adsr->current += adsr->velocity;
adsr->delay--;
if (adsr->delay <= 0) {
adsr->action.s.state = ADSR_STATE_LOOP;
}
// fallthrough
FALLTHROUGH;
case ADSR_STATE_HANG:
break;