Add serverside isPedReloadingWeapon #3295
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TracerDS
reviewed
Jan 17, 2024
TracerDS
reviewed
Jan 17, 2024
tederis
reviewed
Jan 25, 2024
| @@ -68,6 +68,7 @@ CPed::CPed(CPedManager* pPedManager, CElement* pParent, unsigned short usModel) | |||
| m_fGravity = 0.008f; | |||
| m_bDoingGangDriveby = false; | |||
| m_bStealthAiming = false; | |||
| m_bReloadingWeapon = false; | |||
There was a problem hiding this comment.
It's better to move it into the member initializer list.
| // Add new ones in separate structs | ||
| struct | ||
| { | ||
| bool bIsReloadingWeapon : 1; |
There was a problem hiding this comment.
Why not just put it into the existing data struct?
There was a problem hiding this comment.
I want to maintain compatibility with older BitStream version on the server/client.
There was a problem hiding this comment.
For this it's enough to permute BITCOUNT depending on a bitstream version.
There was a problem hiding this comment.
Earlier, I tried to apply it like this, but there were issues with comparing the bitstream versions with different client <-> server versions.
TracerDS
suggested changes
Jul 14, 2024
Comment on lines
+272
to
+273
| bool IsReloadingWeapon() const { return m_bReloadingWeapon; } | ||
| void SetReloadingWeapon(bool bState) { m_bReloadingWeapon = bState; } |
| @@ -1617,3 +1620,8 @@ int CLuaPedDefs::TakeAllWeapons(lua_State* luaVM) | |||
| lua_pushboolean(luaVM, false); | |||
| return 1; | |||
| } | |||
|
|
|||
| bool CLuaPedDefs::IsPedReloadingWeapon(CPed* const ped) | |||
| @@ -79,4 +79,6 @@ class CLuaPedDefs : public CLuaDefs | |||
| LUA_DECLARE(SetPedHeadless); | |||
| LUA_DECLARE(SetPedFrozen); | |||
| LUA_DECLARE(reloadPedWeapon); | |||
|
|
|||
| static bool IsPedReloadingWeapon(CPed* const ped); | |||
| @@ -316,6 +319,7 @@ class CPed : public CElement | |||
| bool m_bFrozen; | |||
| bool m_bStealthAiming; | |||
| CVehicle* m_pJackingVehicle; | |||
| bool m_bReloadingWeapon; | |||
There was a problem hiding this comment.
If you could, please don't use hungarian notation: bool m_reloadingWeapon;
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a new function:
Related to #1525 and #1529 due to lack of compatibility with BitStream.