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

fix/feat(progressbar): Better animation cancelling #208

Merged
merged 1 commit into from
Feb 3, 2023

Conversation

JnKTechstuff
Copy link
Contributor

Changes:

  • Stops setting the data.anim to a boolean value because we aren't using the same if statement for cancelling the tasks
  • If animation then it will cancel only the animation played by the progress bar
  • If scenario then it will clear ped tasks like before

This should make it so people can do things like eat sitting down and after a progress bar animation it won't make you stand up.

Changes:
- Stops setting the data.anim to a boolean value because we aren't using the same if statement for cancelling the tasks
- If animation then it will cancel only the animation played by the progress bar
- If scenario then it will clear ped tasks like before

This should make it so people can do things like eat sitting down and after a progress bar animation it won't make you stand up.
@@ -143,6 +135,13 @@ local function startProgress(data)
end
end
end

if data.anim then
Copy link

@mahanmoulaei mahanmoulaei Jan 24, 2023

Choose a reason for hiding this comment

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

The if should check for data.anim?.dict and possibly for data.anim?.clip instead
The elseif also should check for data.anim?.scenario

@thelindat thelindat merged commit bd91dd8 into overextended:master Feb 3, 2023
thelindat added a commit that referenced this pull request Feb 3, 2023
Correct behaviour from pull request #208.
Include some refactoring to reduce repetitive  table indexing.
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.

3 participants