mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-05 22:00:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix some fixable warnings (#728)

Browse source 
* Fix setup warnings

Signed-off-by: angie <angheloalf95@gmail.com>

* Casting the problems away

Signed-off-by: angie <angheloalf95@gmail.com>

* I don't really like changing the type to void

Signed-off-by: angie <angheloalf95@gmail.com>

* We're out of EARLY hell

Signed-off-by: angie <angheloalf95@gmail.com>

* ./format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Change skel type to "Normal"

Signed-off-by: angie <angheloalf95@gmail.com>

* Changes requested

Signed-off-by: angie <angheloalf95@gmail.com>

* suggestion of roman

Signed-off-by: angie <angheloalf95@gmail.com>

* early is back :c

Signed-off-by: angie <angheloalf95@gmail.com>

* This will be a fix in ZAPD

Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
Anghelo Carvajal 2021-03-23 20:45:42 -03:00 • committed by GitHub
parent 9b9a983860
commit 5562b2ef6f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -329,9 +329,9 @@ void EnArrow_Fly(EnArrow* this, GlobalContext* globalCtx) {
Math_Vec3f_Copy(&this->unk_210, &this->actor.world.pos);
Actor_MoveForward(&this->actor);
if (this->touchedPoly =
if ((this->touchedPoly =
BgCheck_ProjectileLineTest(&globalCtx->colCtx, &this->actor.prevPos, &this->actor.world.pos, &hitPoint,
&this->actor.wallPoly, true, true, true, true, &bgId)) {
&this->actor.wallPoly, true, true, true, true, &bgId))) {
func_8002F9EC(globalCtx, &this->actor, this->actor.wallPoly, bgId, &hitPoint);
Math_Vec3f_Copy(&posCopy, &this->actor.world.pos);
Math_Vec3f_Copy(&this->actor.world.pos, &hitPoint);

3
src/overlays/actors/ovl_En_Fr/z_en_fr.c
View file

@ -233,7 +233,8 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.destroy = NULL;
this->actor.draw = NULL;
this->actor.update = EnFr_UpdateIdle;
this->actor.flags = this->actor.flags &= ~0x11;
this->actor.flags &= ~0x11;
this->actor.flags &= ~0;
Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORCAT_PROP);
this->actor.textId = 0x40AC;
this->actionFunc = EnFr_Idle;