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

d/jak2: finish scene #1971

Merged
merged 4 commits into from
Oct 15, 2022
Merged

d/jak2: finish scene #1971

merged 4 commits into from
Oct 15, 2022

Conversation

xTVaser
Copy link
Member

@xTVaser xTVaser commented Oct 15, 2022

scene-player-init has some weird rtype-of usage (mostly in the pair clause)

ManDude
ManDude requested changes Oct 15, 2022
View reviewed changes
decompiler/config/jak2/all-types.gc Outdated Show resolved Hide resolved
water111
water111 approved these changes Oct 15, 2022
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.

Looks good. The rtype stuff is a bit ugly, but I think it's fine. The normal type functions don't work if the object is a pair, so it makes sense that they use rtype here.

game/graphics/display.cpp
@@ -75,6 +75,7 @@ void GfxDisplay::save_display_settings() {
json["window_ypos"] = m_last_windowed_ypos;
std::string file_path =
(file_util::get_user_settings_dir(g_game_version) / "display-settings.json").string();
file_util::create_dir_if_needed_for_file(file_path);
Copy link
Collaborator

Choose a reason for hiding this comment

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

thanks, I've been meaning to fix this forever

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

@ManDude ManDude ManDude requested changes

@water111 water111 water111 approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@xTVaser @ManDude @water111