Make getPedControlState and setPedControlState functions backward compatible
#4008
+79
−19
Conversation
This file contains hidden or 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
This was referenced Feb 7, 2025
TheNormalnij
reviewed
Feb 7, 2025
| @@ -1710,38 +1710,38 @@ bool CStaticFunctionDefinitions::GetPedClothes(CClientPed& Ped, unsigned char uc | |||
| return false; | |||
| } | |||
|
|
|||
| bool CStaticFunctionDefinitions::GetPedControlState(CClientPed& const ped, const std::string control, bool& state) noexcept | |||
| bool CStaticFunctionDefinitions::GetPedControlState(CClientPed& ped, const std::string_view& control, bool& state) noexcept | |||
There was a problem hiding this comment.
Don't use references for small types. string_view and bool are small types
TheNormalnij
reviewed
Feb 7, 2025
Comment on lines
+1826
to
+1865
| bool CLuaPedDefs::SetPedControlState(const std::variant<CClientPed*, std::string_view> first, const std::variant<std::string_view, bool> second, const std::optional<bool> third) noexcept | ||
| { | ||
| CClientPed* ped; | ||
| std::string_view control; | ||
| bool state; | ||
|
|
||
| if (std::holds_alternative<CClientPed*>(first)) | ||
| { | ||
| ped = std::get<CClientPed*>(first); | ||
|
|
||
| if (std::holds_alternative<std::string_view>(second)) | ||
| { | ||
| control = std::get<std::string_view>(second); | ||
|
|
||
| if (third) | ||
| state = *third; | ||
| else | ||
| return false; | ||
| } | ||
| else if (std::holds_alternative<bool>(second)) | ||
| state = std::get<bool>(second); | ||
| else | ||
| return false; | ||
| } | ||
| else if (std::holds_alternative<std::string_view>(first)) | ||
| { | ||
| ped = CStaticFunctionDefinitions::GetLocalPlayer(); | ||
| control = std::get<std::string_view>(first); | ||
|
|
||
| if (std::holds_alternative<bool>(second)) | ||
| state = std::get<bool>(second); | ||
| else if (third) | ||
| state = *third; | ||
| else | ||
| return false; | ||
| } | ||
|
|
||
| if (!ped) | ||
| return false; | ||
|
|
There was a problem hiding this comment.
It's a mess. And has no error messages for bad usage. I can write setPedControlState("string1", "fire", false) and get silent false. Maybe it's better to keep the old parser here. What do you think?
|
This PR is overengineered, you could've just edited the Lua function defs + throwing for wrong usage. |
|
Issue was fixed in 0102dd2 |
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.
Makes
getPedControlStateandsetPedControlStatefunctions backward compatible again after #3964 broke them, and fixes #3992