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.

Sign up for GitHub

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

Jump to bottom

Cleanup MP2 format and Maps::Tiles class #6940

Merged

ihhub merged 7 commits into master from mp2_format_cleanup

Apr 6, 2023

Owner

ihhub commented Apr 4, 2023 •

edited

Loading

remove the remaining unused structures in mp2.h file
move several methods out of Maps::Tiles class as they don't belong there being too specific to certain object types. Not all methods were moved to keep this pull request relatively small.

relates to #6845


          Cleanup MP2 format and Maps::Tiles class

49402b9

ihhub added this to the 1.0.3 milestone

ihhub self-assigned this

ihhub marked this pull request as draft

April 4, 2023 08:18

ihhub added 2 commits

April 4, 2023 16:19


          Code style fixes

9b5a80a


          Remove extra namespace usage

e820cc4

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

⚠️ clang-tidy found issue(s) with the introduced code (1/3)

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

⚠️ clang-tidy found issue(s) with the introduced code (2/3)

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.cpp Outdated Show resolved Hide resolved

src/fheroes2/world/world.h Outdated Show resolved Hide resolved

src/fheroes2/world/world.h Outdated Show resolved Hide resolved

src/fheroes2/world/world.h Outdated Show resolved Hide resolved

src/fheroes2/world/world.h Outdated Show resolved Hide resolved

src/fheroes2/world/world.h Outdated Show resolved Hide resolved

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

⚠️ clang-tidy found issue(s) with the introduced code (3/3)

src/fheroes2/world/world.h Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_objects.cpp Outdated Show resolved Hide resolved

ihhub added 2 commits

April 4, 2023 16:28


          Make clang-tidy happy

0c356ba


          Code style fix

2bf4deb

ihhub added improvement logic labels

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

src/fheroes2/maps/maps_tiles_quantity.cpp Outdated Show resolved Hide resolved

ihhub added 2 commits

April 4, 2023 16:38


          Make clang-tidy happier

a143a28


          Make IWUY happy

3d239de

ihhub marked this pull request as ready for review

April 4, 2023 08:56

ihhub requested review from oleg-derevenetz and Branikolog

April 4, 2023 08:57

Owner Author

ihhub commented Apr 4, 2023

Hi @Branikolog , could you please test general map gameplay for new games and from saves since this pull request touching important parts of the code responsible for retrieving information from objects regarding monster types, gold, artifacts and spells.

sonarqubecloud bot commented Apr 4, 2023

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

0.0% Coverage
8.1% Duplication

oleg-derevenetz approved these changes

View reviewed changes

ihhub merged commit 9d55909 into master

ihhub deleted the mp2_format_cleanup branch

April 6, 2023 00:43

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

improvement logic