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

Build fixies #78385

Merged
merged 2 commits into from
Dec 8, 2024
Merged

Build fixies #78385

merged 2 commits into from
Dec 8, 2024

Conversation

kevingranade
Copy link
Member

@kevingranade kevingranade commented Dec 6, 2024

Summary

None

Purpose of change

The merge of #78357 broke the build, not quite sure how, but pretty sure a merge queue would have prevented it.
I'm trying to turn clang-tidy (src) on and warnings keep sneaking in.

Describe the solution

Remove a conflicting set_pos(tripoint) method that seems to be dead code anyway and replace with set_pos( tripoint_bub_ms ).
Un-auto some variables, do a UTF8 path translation on a raw string, remove an unneeded tuple constructor from the arguments to an emplace invocation.

Describe alternatives you've considered

LEaVe it bRokEn?

Testing

It builds, it runs, the infernal racket of the tooling overlords is silenced.

@github-actions github-actions bot added Info / User Interface Game - player communication, menus, etc. [C++] Changes (can be) made in C++. Previously named `Code` Character / World Generation Issues and enhancements concerning stages of creating a character or a world Game: Achievements / Conducts / Scores Player goals and how they are tracked. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Dec 6, 2024
@Maleclypse
Copy link
Member

../tests/vehicle_fake_part_test.cpp:363: FAILED:
(~[slow] ~[.],starting_items)=>   CHECK( !you.sees( you.pos_bub() + point( 10, 10 ) ) )
(~[slow] ~[.],starting_items)=> with expansion:
Error: (~[slow] ~[.],starting_items)=>   false

Looks like it's still failing for reasons.

@kevingranade
Copy link
Member Author

Pre-existing failure I think, unfortunately I haven't been able to reproduce it locally.

@Night-Pryanik Night-Pryanik merged commit 44180c3 into master Dec 8, 2024
23 of 27 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 8, 2024
@kevingranade kevingranade deleted the build-fixies branch December 8, 2024 19:36
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` Character / World Generation Issues and enhancements concerning stages of creating a character or a world Game: Achievements / Conducts / Scores Player goals and how they are tracked. Info / User Interface Game - player communication, menus, etc. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants