mirror of
https://github.com/zeldaret/oot
synced 2026-07-27 06:45:26 -04:00
Fix some fixable warnings (#728)
* 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:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user