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

Arsenal - Fix main menu mission #7594

Merged
merged 3 commits into from
Mar 11, 2020
Merged

Arsenal - Fix main menu mission #7594

merged 3 commits into from
Mar 11, 2020

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Mar 11, 2020

Fix #7584

  • Macros broke loading the mission's XEH_preInit
  • With double killed XEH, 2nd time it's now objNull and threw script error because of a
    missionNamespace setvariable [_varName

edit: I still think setting objNull is the best solution to the double killed xeh, just need to watch out for odd uses like this one

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Mar 11, 2020
@PabstMirror PabstMirror added this to the 3.13.2 milestone Mar 11, 2020
@commy2
Copy link
Contributor

commy2 commented Mar 11, 2020

Why is COMPILE_FILE() broken?

@jonpas
Copy link
Member

jonpas commented Mar 11, 2020

It's a mission and doesn't include it?

@PabstMirror
Copy link
Contributor Author

file path is addons/arsenal/missions/Arsenal.VR/CfgEventHandlers.hpp
it's a mission inside of a addon
we just want the mission files, not the base addon

@commy2
Copy link
Contributor

commy2 commented Mar 11, 2020

Ah, I see. One is a folder from addon space, while the PR is from mission space (no leading slash + no file that matches the path in addon space).

Maybe could use a comment.

@commy2 commy2 merged commit e89c172 into master Mar 11, 2020
@commy2 commy2 deleted the arseFixMacroAndKilled branch March 11, 2020 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ACE3 Arsenal acts as SP mission
3 participants