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.

Sign up for GitHub

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

Jump to bottom

decomp: hud-classes #819

Merged
merged 16 commits into from
Oct 2, 2021
Merged

decomp: hud-classes #819

merged 16 commits into from
Oct 2, 2021

Conversation

xTVaser
Copy link
Member

@xTVaser xTVaser commented Sep 2, 2021

  • hud-classes only has a single function remaining
  • collectables is less close, currently has some issues with defstates

@xTVaser xTVaser changed the title decomp: hud-classes and collectables decomp: hud-classes Sep 29, 2021
@xTVaser xTVaser marked this pull request as ready for review September 29, 2021 23:56
@coveralls
Copy link

Pull Request Test Coverage Report for Build 1289023143

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 60.228%
Totals Coverage Status
Change from base Build 1285100319: 0.0%
Covered Lines: 40221
Relevant Lines: 66781
💛 - Coveralls

water111
water111 requested changes Sep 30, 2021
View reviewed changes
Copy link
Collaborator

@water111 water111 left a comment

Choose a reason for hiding this comment

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

very close, just a few comments on types. Also I think the gtest submodule got changed by accident here.

goal_src/engine/ui/hud-classes.gc Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated Show resolved Hide resolved
goal_src/engine/ui/hud-classes.gc Outdated
(set! (-> arg0 draw dma-add-func) dma-add-process-drawable-hud)
enter-state
(process->handle arg1)
(go hud-collecting)
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think the hud-collecting state should take a single argument (handle)

Copy link
Member Author

@xTVaser xTVaser Oct 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

you're right, it does. However, doing so causes the handler in hud to crash the decompiler. Probably something that needs to be looked into (file isn't added yet so no harm in adding the arg now)

@water111 water111 merged commit fdd8615 into open-goal:master Oct 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@water111 water111 water111 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xTVaser @coveralls @water111