-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Use ui_adaptor in new character menu, debug message popup, and loading ui #38916
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ZhilkinSerg
added
[C++]
Changes (can be) made in C++. Previously named `Code`
Info / User Interface
Game - player communication, menus, etc.
labels
Mar 21, 2020
ZhilkinSerg
pushed a commit
that referenced
this pull request
Apr 1, 2020
ZhilkinSerg
pushed a commit
that referenced
this pull request
Apr 1, 2020
ZhilkinSerg
pushed a commit
that referenced
this pull request
Apr 2, 2020
ZhilkinSerg
pushed a commit
that referenced
this pull request
Apr 2, 2020
ZhilkinSerg
reviewed
Apr 3, 2020
@@ -1561,6 +1592,7 @@ tab_direction set_profession( const catacurses::window &w, avatar &u, points_lef | |||
// Add traits for the new profession (and perhaps scenario, if, for example, | |||
// both the scenario and old profession require the same trait) | |||
u.add_traits( points ); | |||
const int netPointCost = sorted_profs[cur_id]->point_cost() - u.prof->point_cost(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess issue #39208 is from here - netPointCost
should contain difference between current and new profession, but character profession was already set to selected profession just 4 lines above, so it always returns 0.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
[C++]
Changes (can be) made in C++. Previously named `Code`
Info / User Interface
Game - player communication, menus, etc.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: None
Purpose of change
Migrate new character menu, debug message popup, and loading ui to
ui_adaptor
, which were missed in #38235. Also fixed the issue where world creation menu would erase its contents when querying whether to cancel.Describe the solution
Testing
Tested in game and everything works fine.