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

Update CNetGamePlayer accessors to support b3095 in FiveM #2335

Merged
merged 2 commits into from
Jan 11, 2024

Conversation

Disquse
Copy link
Contributor

@Disquse Disquse commented Jan 11, 2024

Goal of this PR

Fixed a regression introduced in b3095 + minor code tweaks & cleanup.
...

How is this PR achieving the goal

By adding b3095 check in DECLARE_ACCESSOR and replacing raw accessor with a proper method call.
...

This PR applies to the following area(s)

FiveM, Natives

...

Successfully tested on

Game builds: 3095, 2944, 2372, 2060, 1604

Platforms: Windows

Checklist

  • Code compiles and has been tested successfully.
  • Code explains itself well and/or is documented.
  • My commit message explains what the changes do and what they are for.
  • No extra compilation warnings are added by these changes.

Fixes issues

Issue #2 from this report https://forum.cfx.re/t/a-couple-of-problems-since-the-last-updates/5200554

This was forgotten during the initial work on 3095 support for FiveM. Also did some minor code cleanup.
- Use `GetPlayerInfo` method instead of raw `playerInfo` accessor.
- Remove unnecessary float checks + other minor code cleanups.
@nihonium-cfx nihonium-cfx added the ready-to-merge This PR is enqueued for merging label Jan 11, 2024
@nihonium-cfx nihonium-cfx merged commit f1f99da into citizenfx:master Jan 11, 2024
4 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge This PR is enqueued for merging
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants