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

Show alliances in statistic view #1640

Merged
merged 2 commits into from Nov 17, 2023

Conversation

ottml
Copy link
Contributor

@ottml ottml commented Nov 15, 2023

Original:
alliance
Rttr:
grafik

Copy link
Member

@Flamefire Flamefire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After reviewing the code I noticed that you you just copied parts of DrawPlayerBoxes which already does the "dirty stuff" I mentioned.
Maybe it makes sense to refactor the former a bit and possibly combine them a bit, like having DrawPlayerAlliances(player, drawPt) called from the existing loop where drawPt is changed to be the top-left corner of the picture and the playerboxRect and the alliance get drawn relative to that.

libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
Copy link
Member

@Flamefire Flamefire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it! Some minor things then it's good to go!

libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
libs/s25main/ingameWindows/iwStatistics.cpp Outdated Show resolved Hide resolved
Flamefire
Flamefire previously approved these changes Nov 15, 2023
Copy link
Member

@Flamefire Flamefire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thank you!

auto-merge was automatically disabled November 15, 2023 22:51

Head branch was pushed to by a user without write access

@ottml ottml force-pushed the alliance_in_statistics_view branch from b4ccdb7 to 53df0f0 Compare November 15, 2023 22:51
@ottml ottml force-pushed the alliance_in_statistics_view branch from ef3633a to ca0d0b9 Compare November 16, 2023 21:48
@Flow86 Flow86 merged commit 36523b8 into Return-To-The-Roots:master Nov 17, 2023
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants