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 TriggerOverrideProjectileInstance() #1179

Merged
merged 1 commit into from
May 21, 2023

Conversation

Iridar
Copy link
Contributor

@Iridar Iridar commented May 14, 2023

Fixes #1053

Decided to go with the "expansive" approach by making almost all of the stuff in Tuple inout.

@Iridar Iridar added bug-highlander ready-to-review A pull request is ready to be reviewed labels May 14, 2023
@Iridar Iridar added this to the 1.25.0 milestone May 14, 2023
@Iridar Iridar self-assigned this May 14, 2023
@github-actions
Copy link
Contributor

Pull request modifies event listener templates

Difference (click to expand)
diff --git a/target/CHL_Event_Compiletest.uc b/target/CHL_Event_Compiletest.uc
index c229218..d1d0a18 100644
--- a/target/CHL_Event_Compiletest.uc
+++ b/target/CHL_Event_Compiletest.uc
@@ -794,6 +794,9 @@ static function EventListenerReturn OnOverrideProjectileInstance(Object EventDat
 	// Your code here
 
 	Tuple.Data[0].b = bPreventProjectileSpawning;
+	Tuple.Data[1].o = ProjectileTemplate;
+	Tuple.Data[2].o = InVolleyNotify;
+	Tuple.Data[3].o = InSourceWeapon;
 	Tuple.Data[4].o = CurrentFireAction;
 
 	return ELR_NoInterrupt;
What? (click to expand)

The Highlander documentation tool generates event listener examples from event specifications.
This comment contains the modifications that would be made to the copy-pasteable event listeners in documentation, for PR authors and reviewers to inspect for correctness, and will automatically be kept up-to-date whenever this PR is updated.

@Iridar
Copy link
Contributor Author

Iridar commented May 14, 2023

Note that this is technically a BC break, but I don't think there are any mods that actually use this functionality, so I figured making a second, expanded override event for the same thing would be excessive.

@Iridar Iridar changed the title Implement Issue #1053 Fix TriggerOverrideProjectileInstance() May 15, 2023
@Iridar Iridar merged commit 72d0d09 into X2CommunityCore:master May 21, 2023
@Iridar Iridar deleted the 1053-fix-829 branch May 21, 2023 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug-highlander ready-to-review A pull request is ready to be reviewed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

XGUnitNativeBase::TriggerOverrideProjectileInstance is bugged
2 participants