Skip to content

Conversation

@that-edward
Copy link
Contributor

@that-edward that-edward commented Jun 1, 2020

Resolves #690

Changes proposed in this pull request:

  • Checks whether the bomb gets defused on each frame, and if the bomb gets defused it exits the waitUntil loop and thus checks whether the bomb is placed (which it is not), so it exits the function.

  • I have tested my changes and corrected any errors found

EDIT: Typo

Fixes AsYetUntitled#690 by checking whether the bomb gets defused each frame
blackfisch
blackfisch previously approved these changes Jun 1, 2020
Copy link
Member

@DomT602 DomT602 left a comment

Choose a reason for hiding this comment

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

Some thoughts

@that-edward that-edward requested a review from DomT602 June 2, 2020 21:16
DomT602
DomT602 previously approved these changes Jun 2, 2020
Copy link
Member

@DomT602 DomT602 left a comment

Choose a reason for hiding this comment

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

Happy with the changes

@ghost ghost mentioned this pull request Jun 4, 2020
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

to use LIFE_SETTINGS in fn_handleBlastingCharge.sqf it requires include of script_macros.hpp

@DomT602
Copy link
Member

DomT602 commented Jun 6, 2020

@shazoo-o good spot - have you by chance tested it with macros in the file?

@ghost
Copy link

ghost commented Jun 6, 2020

@shazoo-o good spot - have you by chance tested it with macros in the file?

I noticed this problem as I had merged this in my repo and tried to start the server - which failed with an error message around the LIFE_SETTINGS macro. I then just added the include line and it worked.
I then also tested the base issue if the timer really is stopped when the bomb gets defused which, at least in my test, also worked as intended.

DomT602
DomT602 previously approved these changes Jun 6, 2020
Copy link
Member

@DomT602 DomT602 left a comment

Choose a reason for hiding this comment

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

Just made a couple of formatting changes for better information and readability.

@DomT602 DomT602 merged commit 2ed6f18 into AsYetUntitled:master Jun 6, 2020
@that-edward that-edward deleted the blastingChargeFix branch June 7, 2020 21:30
@that-edward that-edward restored the blastingChargeFix branch June 7, 2020 21:30
@that-edward that-edward deleted the blastingChargeFix branch June 7, 2020 21:30
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