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

MapObj: Implement CoinCollectHintObj #267

Merged
merged 2 commits into from
Jan 17, 2025

Conversation

german77
Copy link
Contributor

@german77 german77 commented Jan 14, 2025

This one required more code in the header than the implementation. Is used in CoinCollectHolder.


This change is Reviewable

@german77 german77 force-pushed the coinCollectHintObj branch 2 times, most recently from e3648db to e037454 Compare January 14, 2025 02:11
@MonsterDruide1 MonsterDruide1 changed the title mapObj: Implement CoinCollectHintObj MapObj: Implement CoinCollectHintObj Jan 14, 2025
Copy link
Owner

@MonsterDruide1 MonsterDruide1 left a comment

Choose a reason for hiding this comment

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

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: all files reviewed, 5 unresolved discussions (waiting on @german77)


src/Item/CoinCollectHolder.h line 26 at r1 (raw file):

    void registerHintObj(CoinCollectHintObj*);

    bool tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;

Suggestion:

CoinCollect* tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;

src/Item/CoinCollectHolder.h line 27 at r1 (raw file):

    bool tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect(const sead::Vector3f&, f32, f32, bool) const;

Suggestion:

CoinCollect* tryFindAliveCoinCollect(const sead::Vector3f&, f32, f32, bool) const;

src/Item/CoinCollectHolder.h line 28 at r1 (raw file):

    bool tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect(const sead::Vector3f&, f32, f32, bool) const;
    bool tryFindDeadButHintEnableCoinCollect() const;

Suggestion:

CoinCollect* tryFindDeadButHintEnableCoinCollect() const;

src/Item/CoinCollectHolder.h line 30 at r1 (raw file):

    bool tryFindDeadButHintEnableCoinCollect() const;
    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, f32, f32, bool) const;

Suggestion:

    CoinCollect2D* tryFindAliveCoinCollect2D(const sead::Vector3f&, bool) const;
    CoinCollect2D* tryFindAliveCoinCollect2D(const sead::Vector3f&, f32, f32, bool) const;

src/Item/CoinCollectHolder.h line 31 at r1 (raw file):

    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, f32, f32, bool) const;
    bool tryFindExStageHintObjTrans(sead::Vector3f*, const char*);

Suggestion:

CoinCollectHintObj* tryFindExStageHintObjTrans(sead::Vector3f*, const char*);

Copy link
Contributor Author

@german77 german77 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 2 of 4 files reviewed, 5 unresolved discussions (waiting on @MonsterDruide1)


src/Item/CoinCollectHolder.h line 26 at r1 (raw file):

    void registerHintObj(CoinCollectHintObj*);

    bool tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;

Done.


src/Item/CoinCollectHolder.h line 27 at r1 (raw file):

    bool tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect(const sead::Vector3f&, f32, f32, bool) const;

Done.


src/Item/CoinCollectHolder.h line 28 at r1 (raw file):

    bool tryFindAliveCoinCollect(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect(const sead::Vector3f&, f32, f32, bool) const;
    bool tryFindDeadButHintEnableCoinCollect() const;

Done.


src/Item/CoinCollectHolder.h line 31 at r1 (raw file):

    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, f32, f32, bool) const;
    bool tryFindExStageHintObjTrans(sead::Vector3f*, const char*);

Done.

Copy link
Contributor Author

@german77 german77 left a comment

Choose a reason for hiding this comment

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

Reviewable status: 2 of 4 files reviewed, 5 unresolved discussions (waiting on @MonsterDruide1)


src/Item/CoinCollectHolder.h line 30 at r1 (raw file):

    bool tryFindDeadButHintEnableCoinCollect() const;
    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, bool) const;
    bool tryFindAliveCoinCollect2D(const sead::Vector3f&, f32, f32, bool) const;

Done.

Copy link
Owner

@MonsterDruide1 MonsterDruide1 left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @german77)

@MonsterDruide1 MonsterDruide1 merged commit d0f4c6a into MonsterDruide1:master Jan 17, 2025
6 checks passed
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