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

overlay: fix FPS, healthbar, and arrows from overlapping #797

Merged
merged 2 commits into from
Apr 3, 2023

Conversation

lahm86
Copy link
Collaborator

@lahm86 lahm86 commented Apr 3, 2023

Resolves #787.

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

This builds on @walkawayy's commit in #796 to fix:

  • the healthbar sitting behind the INVENTORY or Small/Large Medi Pack text if it's set to be centre-top or centre-bottom;
  • the inventory ring up/down arrow not re-appearing if FPS is toggled off while a medipack is highlighted;
  • the FPS Y position in normal game being off-screen when no bars are set to be top-left.

This also changes the g_GameInfo.status behaviour to allow flag combinations, so we can define specifics within overall statuses, so in this instance when we are in the inventory and have a medipack highlighted.

@lahm86 lahm86 added the TR1X bug A bug with TR1X label Apr 3, 2023
@lahm86 lahm86 added this to the 2.14 milestone Apr 3, 2023
@lahm86 lahm86 merged commit ffcaef5 into LostArtefacts:develop Apr 3, 2023
@lahm86 lahm86 deleted the issue-787-fps-overlap branch April 3, 2023 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TR1X bug A bug with TR1X
Projects
None yet
Development

Successfully merging this pull request may close these issues.

T1M bug: FPS counter overlaps with health bar and inventory arrow
2 participants