mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-07 10:15:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor inline cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-03-11 18:12:15 -04:00
parent 44761305b9
commit 029ddf6bb9
19 changed files with 49 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_actor.cpp
+7 -7
View File
@@ -41,13 +41,13 @@ s32 fopAc_Draw(void* pProc) {
(
moveApproval == dEvtMove_FORCE_e
|| (
!fopAcM_checkStatus(actor, fopAc_ac_c::getStopStatus())
!fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus())
&& !(
fopAcM_checkStatus(actor, fopAcStts_CULL_e)
fopAcM_CheckStatus(actor, fopAcStts_CULL_e)
&& fopAcM_cullingCheck(actor)
)
)
) && !fopAcM_checkStatus(actor, fopAcStts_NODRAW_e)
) && !fopAcM_CheckStatus(actor, fopAcStts_NODRAW_e)
) {
fopAcM_OffCondition(actor, fopAcCnd_NODRAW_e);
ret = fpcLf_DrawMethod((leafdraw_method_class*)actor->sub_method, actor);
@@ -57,7 +57,7 @@ s32 fopAc_Draw(void* pProc) {
fopAcM_OffStatus(actor, fopAcStts_NODRAW_e);
if (dComIfGp_roomControl_getStayNo() >= 0 && fopAcM_checkStatus(actor, fopAcStts_SHOWMAP_e))
if (dComIfGp_roomControl_getStayNo() >= 0 && fopAcM_CheckStatus(actor, fopAcStts_SHOWMAP_e))
dMap_drawActorPointMiniMap(actor);
}
@@ -77,7 +77,7 @@ s32 fopAc_Execute(void* pProc) {
CHECK_FLOAT_CLASS(0x27f, actor->current.pos.z);
CHECK_VEC3_RANGE(0x286, actor->current.pos);
if (fopAcM_checkStatus(actor, fopAcStts_NOPAUSE_e) || (!dMenu_flag() && !dScnPly_ply_c::isPause())) {
if (fopAcM_CheckStatus(actor, fopAcStts_NOPAUSE_e) || (!dMenu_flag() && !dScnPly_ply_c::isPause())) {
actor->eventInfo.beforeProc();
s32 moveApproval = dComIfGp_event_moveApproval(actor);
@@ -88,10 +88,10 @@ s32 fopAc_Execute(void* pProc) {
|| (
(
moveApproval != dEvtMove_NOMOVE_e
&& !fopAcM_checkStatus(actor, fopAc_ac_c::getStopStatus())
&& !fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus())
)
&& (
!fopAcM_checkStatus(actor, fopAcStts_NOCULLEXEC_e)
!fopAcM_CheckStatus(actor, fopAcStts_NOCULLEXEC_e)
|| !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e)
)
)
src/f_op/f_op_actor_mng.cpp
+1 -1
View File
@@ -1326,7 +1326,7 @@ void fopAcM_setCarryNow(fopAc_ac_c* i_this, BOOL stageLayer) {
/* 80027E5C-80027ED8 .text fopAcM_cancelCarryNow__FP10fopAc_ac_c */
void fopAcM_cancelCarryNow(fopAc_ac_c* i_this) {
if (fopAcM_checkStatus(i_this, fopAcStts_CARRY_e)) {
if (fopAcM_CheckStatus(i_this, fopAcStts_CARRY_e)) {
fopAcM_OffStatus(i_this, fopAcStts_CARRY_e);
fopAcM_setRoomLayer(i_this, fopAcM_GetRoomNo(i_this));
i_this->shape_angle.z = 0;