mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 01:10:33 +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

4
src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
View file

@ -25,7 +25,7 @@ u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void
this->update = EffectSsSolderSrchBall_Update;
this->life = 100;
this->rUnused = initParams->unused;
this->actor = initParams->linkDetected; // actor field was incorrectly used as a pointer to something else
this->actor = (Actor*)initParams->linkDetected; // actor field was incorrectly used as a pointer to something else
return 1;
}
@ -37,7 +37,7 @@ void EffectSsSolderSrchBall_Update(PlayState* play, u32 index, EffectSs* this) {
s16* linkDetected;
Player* player = GET_PLAYER(play);
linkDetected = this->actor;
linkDetected = (s16*)this->actor;
playerPosDiffX = player->actor.world.pos.x - this->pos.x;
playerPosDiffY = player->actor.world.pos.y - this->pos.y;