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 compile error #79172

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Conversation

Procyonae
Copy link
Contributor

…nslation, don't write required mutation string if we're about to overwrite it with incompatible bionics

Summary

None

Purpose of change

#79128 is preventing me compiling

In file included from src/units.h:19,
                 from src/game_constants.h:8,
                 from src/activity_type.h:9,
                 from src/activity_actor_definitions.h:13,
                 from src/iexamine.cpp:14:
src/iexamine.cpp: In function 'void iexamine::genemill(Character&, const tripoint_bub_ms&)':
src/iexamine.cpp:500:39: error: left operand of comma operator has no effect [-Werror=unused-value]
  500 |                 context_string = ( _( " %s" ), string_join( thresholds, ", " ) );
src/translations.h:89:20: note: in definition of macro '_'
   89 | #define _(STRING) (STRING)
      | 

Describe the solution

Fixes a couple of other bits with it while I were at it

Describe alternatives you've considered

Testing

Game compiles

Additional context

@github-actions github-actions bot added the [C++] Changes (can be) made in C++. Previously named `Code` label Jan 15, 2025
…nslation, don't write required mutation string if we're about to overwrite it with incompatible bionics
@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jan 15, 2025
@akrieger
Copy link
Member

I feel like that was supposed to originally be a string_format() call. But if you say so~

@akrieger
Copy link
Member

But also like retitle the PR next time because you're fixing way more than a compile error here.

@akrieger akrieger merged commit b050729 into CleverRaven:master Jan 15, 2025
28 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jan 15, 2025
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` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants