mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-20 13:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Realmatch dComIfGp_event_runCheck inline

Browse Source 
dComIfGp_event_runCheck's return type being different from the inner inline runCheck's return type apparently causes the compiler to double up the g_dComIfG_gameInfo load in certain functions.

And also fix dComIfGp_event_chkEventFlag which had the same issue.
This commit is contained in:
LagoLunatic
2024-02-02 20:34:16 -05:00
parent b6c878a652
commit b46e897826
7 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_main.cpp
+3 -9
View File
@@ -3141,13 +3141,9 @@ BOOL daPy_lk_c::execute() {
offNoResetFlg1(daPyFlg1_EQUIP_DRAGON_SHIELD);
}
// Using the dComIfGp_event_runCheck inline breaks the match
// if (dComIfGp_event_runCheck()) {
if (g_dComIfG_gameInfo.play.getEvent().runCheck()) {
if (dComIfGp_event_runCheck()) {
mStaffIdx = dComIfGp_evmng_getMyStaffId("Link", this);
// Using the dComIfGp_event_chkEventFlag inline breaks the match
// if (mEvtInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(0x4) && mHeldItemType == 0x101) {
if (mEvtInfo.checkCommandDoor() && !g_dComIfG_gameInfo.play.getEvent().chkEventFlag(0x4) && mHeldItemType == 0x101) {
if (mEvtInfo.checkCommandDoor() && !dComIfGp_event_chkEventFlag(0x4) && mHeldItemType == 0x101) {
fopAc_ac_c* equipActor = mActorKeepEquip.getActor();
if (equipActor) {
s16 angle = shape_angle.y + 0x8000;
@@ -3573,9 +3569,7 @@ BOOL daPy_lk_c::execute() {
offNoResetFlg1((daPy_FLG1)(daPyFlg1_NPC_CALL_COMMAND | daPyFlg1_VINE_CATCH));
// Using the dComIfGp_event_runCheck inline breaks the match
// if (dComIfGp_event_runCheck() || checkNoControll()) {
if (g_dComIfG_gameInfo.play.getEvent().runCheck() || checkNoControll()) {
if (dComIfGp_event_runCheck() || checkNoControll()) {
dComIfGp_setDoStatus(0);
dComIfGp_setRStatus(0);
} else {