Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

d_t_mole_prohibit OK #31

Merged
merged 1 commit into from
Sep 15, 2024
Merged

Conversation

robojumper
Copy link
Collaborator

🚫

Yes, for some reason this matches if I include the weak __dt__5dTg_cFv and __vt__5dTg_c symbols. I don't know why these would be included here (since they're unreferenced), and this might break if a similar pattern is observed in other RELs (though easily fixable by giving up on the common dTg_c ancestor. Who knows...)

Copy link
Collaborator

@elijah-thomas774 elijah-thomas774 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This applies to most pre/do functions. This is due to being passed into commonPack:

/* 802e1500 */
int fBase_c::commonPack(int (fBase_c::*doFunc)(), int (fBase_c::*preFunc)(), void (fBase_c::*postFunc)(MAIN_STATE_e)) {
    MAIN_STATE_e state;

    // Pre Function to setup
    int result = (this->*preFunc)();
    if (result) {
        // Do function to handle current
        result = (this->*doFunc)();
        if (result == NOT_READY) {
            state = WAITING;
        } else if (result == SUCCEEDED) {
            state = SUCCESS;
        } else {
            state = ERROR;
        }
    } else {
        state = CANCELED;
    }

    // Post Function to handle after effects (Allows for retry after waiting)
    (this->*postFunc)(state);
    return result;
}

Similarly actorCreate(), actorPostCreate(), actorExecute() and actorExecuteInEvent() all return the same kind of status

}

int dTgMoleProhibit_c::doDelete() {
return 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return 1;
return SUCCEEDED;


int dTgMoleProhibit_c::actorExecute() {
mStateMgr.executeState();
return 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return 1;
return SUCCEEDED;

}

int dTgMoleProhibit_c::draw() {
return 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return 1;
return SUCCEEDED;

@elijah-thomas774 elijah-thomas774 merged commit 24e10d2 into zeldaret:main Sep 15, 2024
1 check passed
@robojumper robojumper deleted the d_t_mole_prohibit branch September 15, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants