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

Appease clang #75271

Merged
merged 4 commits into from
Jul 29, 2024
Merged

Appease clang #75271

merged 4 commits into from
Jul 29, 2024

Conversation

ehughsbaird
Copy link
Contributor

Summary

None

Purpose of change

Fix clang-tidy issues reported on my PR that aren't generated by my PR: https://github.com/CleverRaven/Cataclysm-DDA/actions/runs/10120858531/job/27991135010?pr=75236

Describe the solution

Save/load a variable.
Move the two trailing spaces after a period in some strings to be added when the strings are used, so clang-tidy doesn't complain about them. Remove an unused variable.

Testing

Take a picture of someone being boomered.
image
Change withdrawal distractions in the distraction manager to false, see it is preserved after closing and restarting the game.

All of these seem to be breaking the same clang-tidy rule, but they're
only sporadically detected. Make them not break the rule by changing how
they're used to add the two spaces on use.
@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jul 27, 2024
src/iuse.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions and removed astyled astyled PR, label is assigned by github actions labels Jul 28, 2024
Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 28, 2024
@dseguin dseguin merged commit b6c708d into CleverRaven:master Jul 29, 2024
26 checks passed
@ehughsbaird ehughsbaird deleted the appease-clang branch July 30, 2024 15:15
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 [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 Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants