From 5562b2ef6f582c69e20b0d7c2a3f56bcc252a5d2 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Tue, 23 Mar 2021 20:45:42 -0300 Subject: [PATCH] Fix some fixable warnings (#728) * Fix setup warnings Signed-off-by: angie * Casting the problems away Signed-off-by: angie * I don't really like changing the type to void Signed-off-by: angie * We're out of EARLY hell Signed-off-by: angie * ./format.sh Signed-off-by: angie * Change skel type to "Normal" Signed-off-by: angie * Changes requested Signed-off-by: angie * suggestion of roman Signed-off-by: angie * early is back :c Signed-off-by: angie * This will be a fix in ZAPD Signed-off-by: angie --- assets/xml/objects/object_bg.xml | 20 +++++++++---------- assets/xml/objects/object_dekunuts.xml | 2 +- assets/xml/objects/object_dnk.xml | 2 +- assets/xml/objects/object_dns.xml | 2 +- assets/xml/objects/object_dodongo.xml | 2 +- assets/xml/objects/object_firefly.xml | 2 +- assets/xml/objects/object_hintnuts.xml | 2 +- assets/xml/objects/object_okuta.xml | 2 +- assets/xml/objects/object_sk2.xml | 10 +++++----- assets/xml/overlays/ovl_Magic_Dark.xml | 2 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 4 ++-- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 3 ++- src/overlays/gamestates/ovl_select/z_select.c | 2 +- src/overlays/gamestates/ovl_title/z_title.c | 2 +- tools/vtxdis.c | 2 +- tools/xmlcreate.py | 2 +- 16 files changed, 31 insertions(+), 30 deletions(-) diff --git a/assets/xml/objects/object_bg.xml b/assets/xml/objects/object_bg.xml index 067ed2e59d..9b78eed7fe 100644 --- a/assets/xml/objects/object_bg.xml +++ b/assets/xml/objects/object_bg.xml @@ -22,16 +22,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/assets/xml/objects/object_dekunuts.xml b/assets/xml/objects/object_dekunuts.xml index b4e5301d94..6dbc2b2413 100644 --- a/assets/xml/objects/object_dekunuts.xml +++ b/assets/xml/objects/object_dekunuts.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_dnk.xml b/assets/xml/objects/object_dnk.xml index 6b44b7a824..8d903af86d 100644 --- a/assets/xml/objects/object_dnk.xml +++ b/assets/xml/objects/object_dnk.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_dns.xml b/assets/xml/objects/object_dns.xml index 08150a4b43..b0d821e5af 100644 --- a/assets/xml/objects/object_dns.xml +++ b/assets/xml/objects/object_dns.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_dodongo.xml b/assets/xml/objects/object_dodongo.xml index 263441b9a1..e114e1a16d 100644 --- a/assets/xml/objects/object_dodongo.xml +++ b/assets/xml/objects/object_dodongo.xml @@ -27,7 +27,7 @@ - + diff --git a/assets/xml/objects/object_firefly.xml b/assets/xml/objects/object_firefly.xml index 0876ce0f5e..6785a5396b 100644 --- a/assets/xml/objects/object_firefly.xml +++ b/assets/xml/objects/object_firefly.xml @@ -2,7 +2,7 @@ - + diff --git a/assets/xml/objects/object_hintnuts.xml b/assets/xml/objects/object_hintnuts.xml index a3a0f28219..f419f7546a 100644 --- a/assets/xml/objects/object_hintnuts.xml +++ b/assets/xml/objects/object_hintnuts.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_okuta.xml b/assets/xml/objects/object_okuta.xml index c33f1cc9df..a292f4a124 100644 --- a/assets/xml/objects/object_okuta.xml +++ b/assets/xml/objects/object_okuta.xml @@ -20,7 +20,7 @@ - + diff --git a/assets/xml/objects/object_sk2.xml b/assets/xml/objects/object_sk2.xml index fd708a625d..ca79023238 100644 --- a/assets/xml/objects/object_sk2.xml +++ b/assets/xml/objects/object_sk2.xml @@ -24,11 +24,11 @@ - - - - - + + + + + diff --git a/assets/xml/overlays/ovl_Magic_Dark.xml b/assets/xml/overlays/ovl_Magic_Dark.xml index f1ab218433..342a4641bb 100644 --- a/assets/xml/overlays/ovl_Magic_Dark.xml +++ b/assets/xml/overlays/ovl_Magic_Dark.xml @@ -1,6 +1,6 @@ - + diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 4d98505b21..e4b575a900 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -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); diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 17d6262b0e..eb8146beef 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -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; diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 733360bdf5..5d32f28910 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -618,7 +618,7 @@ void Select_Init(GameState* thisx) { } SREG(30) = 1; - this->staticSegment = GameState_Alloc(this, size, "../z_select.c", 1114); + this->staticSegment = GameState_Alloc(&this->state, size, "../z_select.c", 1114); DmaMgr_SendRequest1(this->staticSegment, _z_select_staticSegmentRomStart, size, "../z_select.c", 1115); gSaveContext.cutsceneIndex = 0x8000; gSaveContext.linkAge = 1; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 7cf422cbed..486fe3b362 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -156,7 +156,7 @@ void Title_Main(GameState* thisx) { void Title_Destroy(GameState* thisx) { TitleContext* this = (TitleContext*)thisx; - Sram_InitSram(this, &this->sramCtx); + Sram_InitSram(&this->state, &this->sramCtx); } void Title_Init(GameState* thisx) { diff --git a/tools/vtxdis.c b/tools/vtxdis.c index 6650eec1d5..1ba6969635 100644 --- a/tools/vtxdis.c +++ b/tools/vtxdis.c @@ -36,7 +36,7 @@ const struct option cmdline_opts[] = { static uint32_t parse_int(const char *num){ uint32_t ret = 0; - char outnum[20]; + char outnum[21]; if(strlen(num) > 2 && num[0] == '0' && (num[1] == 'x' || num[1] == 'X')) { strncpy(outnum, &num[2], 20); sscanf(outnum, "%"SCNx32, &ret); diff --git a/tools/xmlcreate.py b/tools/xmlcreate.py index a23c9ac57e..cb916cd200 100644 --- a/tools/xmlcreate.py +++ b/tools/xmlcreate.py @@ -39,7 +39,7 @@ def animation_to_xml(var_name,offset): return animation_xml.format(var_name,offset.lstrip('0')) def skeleton_to_xml(var_name,offset, type): - skel_type = "Flex" if "Flex" in type else "Standard" + skel_type = "Flex" if "Flex" in type else "Normal" limb_type = "Standard" return skeleton_xml.format(var_name, offset.lstrip('0'), skel_type, limb_type)