mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-21 05:58:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve compiler compatibility (#743)

Browse Source 
* fix returns

* use standard C headers

* struct/class mismatch

* explicit this in template

* switch variable scope

* C standard compliance

* & l-value
This commit is contained in:
Jcw87
2025-04-29 09:49:09 -07:00
committed by GitHub
parent eef20535ac
commit 5e7b59f2fe
57 changed files with 113 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_boomerang.inc
+4 -4
View File
@@ -91,10 +91,10 @@ BOOL daPy_lk_c::checkNextActionBoomerangReady() {
/* 8014984C-801498D8 .text checkNextActionBoomerangFly__9daPy_lk_cFv */
BOOL daPy_lk_c::checkNextActionBoomerangFly() {
if (checkBoomerangReadyAnime()) {
checkNextActionBoomerangReady();
return checkNextActionBoomerangReady();
} else {
if (itemTrigger() && mEquipItem == getReadyItem()) {
setActAnimeUpper(
return setActAnimeUpper(
LKANM_BCK_BOOMWAIT,
UPPER_MOVE2_e,
daPy_HIO_boom_c0::m.field_0x18,
@@ -112,9 +112,9 @@ BOOL daPy_lk_c::checkNextBoomerangMode() {
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
}
if (mpAttention->Lockon()) {
procBoomerangMove_init();
return procBoomerangMove_init();
} else {
procBoomerangSubject_init();
return procBoomerangSubject_init();
}
}
src/d/actor/d_a_player_bottle.inc
+1 -1
View File
@@ -87,7 +87,7 @@ void daPy_lk_c::setBottleModel(u16 param_0) {
fopAc_ac_c* daPy_lk_c::makeFairy(cXyz* param_0, u32 param_1) {
onResetFlg0(daPyRFlg0_FAIRY_USE);
resetCurse();
fopAcM_fastCreate(PROC_NPC_FA1, param_1, param_0, fopAcM_GetRoomNo(this), &shape_angle);
return (fopAc_ac_c*)fopAcM_fastCreate(PROC_NPC_FA1, param_1, param_0, fopAcM_GetRoomNo(this), &shape_angle);
}
/* 801521A0-80152300 .text procBottleDrink_init__9daPy_lk_cFUs */
src/d/actor/d_a_player_hook.inc
+2 -2
View File
@@ -187,9 +187,9 @@ BOOL daPy_lk_c::checkNextHookshotMode() {
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
}
if (mpAttention->Lockon()) {
procHookshotMove_init();
return procHookshotMove_init();
} else {
procHookshotSubject_init();
return procHookshotSubject_init();
}
}
src/d/actor/d_a_player_rope.inc
+3 -3
View File
@@ -50,7 +50,7 @@ f32 daPy_lk_c::checkRopeRoofHit(s16 param_0) {
local_c.set(current.pos.x - 15.0f * cM_ssin(param_0), current.pos.y, current.pos.z - 15.0f * cM_scos(param_0));
mRoofChk.SetPos(local_c);
dComIfG_Bgsp()->RoofChk(&mRoofChk);
return dComIfG_Bgsp()->RoofChk(&mRoofChk);
}
/* 80142E98-80142FC8 .text changeRopeSwingProc__9daPy_lk_cFv */
@@ -317,9 +317,9 @@ BOOL daPy_lk_c::checkNextRopeMode() {
seStartOnlyReverb(JA_SE_LK_ITEM_TAKEOUT);
}
if (mpAttention->Lockon()) {
procRopeMove_init();
return procRopeMove_init();
} else {
procRopeSubject_init();
return procRopeSubject_init();
}
}