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

Fix medical UI / addictions compile error #56910

Merged

Conversation

dseguin
Copy link
Member

@dseguin dseguin commented Apr 19, 2022

Summary

None

Purpose of change

#54763 and #56786 were merged together, but they made conflicting changes involving addictions. This prevents builds from compiling.

Describe the solution

Use the new add_type::get_name() and add_type::get_description() functions to display addiction info in the medical UI.

Describe alternatives you've considered

Testing

The game compiles and runs, and the medical UI displays the addictions like before:

add_med

Additional context

@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Apr 19, 2022
@Maleclypse Maleclypse added the <Bugfix> This is a fix for a bug (or closes open issue) label Apr 19, 2022
@BrettDong BrettDong added the (P2 - High) High priority (for ex. important bugfixes) label Apr 19, 2022
@kevingranade kevingranade merged commit 0999815 into CleverRaven:master Apr 19, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 19, 2022
@dseguin dseguin deleted the fix_med_addict_compile_error branch April 19, 2022 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions (P2 - High) High priority (for ex. important bugfixes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants