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

Misc fixes #43987

Merged
merged 1 commit into from
Sep 7, 2020
Merged

Misc fixes #43987

merged 1 commit into from
Sep 7, 2020

Conversation

Qrox
Copy link
Contributor

@Qrox Qrox commented Sep 6, 2020

Summary

SUMMARY: Bugfixes "Fix incorrectly resuming interrupted vehicle activity when a different vehicle activity is initiated"

Purpose of change

  1. Fix incorrectly resuming interrupted vehicle activity when a different vehicle activity is initiated, causing the wrong part to be manipulated. This also fixes "vehicle not found" debug message by disallowing resuming a previous activity when the vehicle location has changed, which is not supported by the code.
  2. Use wnoutrefresh instead of wrefresh in pocket_favorite_callback::refresh.
  3. Fix incorrect om terrain id in More Locations.

Describe the solution

  1. Compare values and str_values of ACT_VEHICLE activities.

Testing

  1. Tried to remove a different part after interrupting a previous removing activity, and the previous activity was not resumed and the correct part was removed.
  2. Item pocket settings menu displayed correctly.
  3. Incorrect ID debug message was no longer displayed.

1. Fix incorrectly resuming interrupted vehicle activity when a different vehicle activity is initiated
2. Use wnoutrefresh instead of wrefresh
3. Fix incorrect om terrain id
@anothersimulacrum anothersimulacrum added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` labels Sep 6, 2020
@ZhilkinSerg ZhilkinSerg merged commit 7a999a8 into CleverRaven:master Sep 7, 2020
@Qrox Qrox deleted the misc-fixes branch September 8, 2020 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code`
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants