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_Wood02/z_en_wood02.c
View file

@ -191,9 +191,11 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) {
case WOOD_BUSH_GREEN_LARGE_SPAWNER:
case WOOD_BUSH_BLACK_LARGE_SPAWNER:
spawnType = 1;
FALLTHROUGH;
case WOOD_BUSH_GREEN_LARGE_SPAWNED:
case WOOD_BUSH_BLACK_LARGE_SPAWNED:
spawnType++;
FALLTHROUGH;
case WOOD_TREE_CONICAL_LARGE:
case WOOD_BUSH_GREEN_LARGE:
case WOOD_BUSH_BLACK_LARGE:
@ -208,12 +210,14 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) {
case WOOD_BUSH_GREEN_SMALL_SPAWNER:
case WOOD_BUSH_BLACK_SMALL_SPAWNER:
spawnType = 1;
FALLTHROUGH;
case WOOD_TREE_CONICAL_SPAWNED:
case WOOD_TREE_OVAL_YELLOW_SPAWNED:
case WOOD_TREE_OVAL_GREEN_SPAWNED:
case WOOD_BUSH_GREEN_SMALL_SPAWNED:
case WOOD_BUSH_BLACK_SMALL_SPAWNED:
spawnType++;
FALLTHROUGH;
case WOOD_TREE_CONICAL_MEDIUM:
case WOOD_TREE_OVAL_GREEN:
case WOOD_TREE_KAKARIKO_ADULT:
@ -236,6 +240,7 @@ void EnWood02_Init(Actor* thisx, PlayState* play2) {
this->actor.velocity.x = Rand_CenteredFloat(6.0f);
this->actor.velocity.z = Rand_CenteredFloat(6.0f);
this->actor.velocity.y = (Rand_ZeroOne() * 1.25f) + -3.1f;
break;
}
if (this->actor.params <= WOOD_TREE_CONICAL_SPAWNED) {