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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7561011
Arsenal - Fix main menu mission
PabstMirror Mar 11, 2020
6e4ec09
fix double space
PabstMirror Mar 11, 2020
0e383dd
Add note
PabstMirror Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions addons/arsenal/missions/Arsenal.VR/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// These files are from the VR mission, not the base addon folder
class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
init = QUOTE(call compile preprocessFileLineNumbers 'XEH_preInit.sqf');
};
};

class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
init = QUOTE(call compile preprocessFileLineNumbers 'XEH_postInit.sqf');
};
};
2 changes: 2 additions & 0 deletions addons/arsenal/missions/Arsenal.VR/XEH_preInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "script_component.hpp"

INFO("Loading VR Mission");

PREP(onPause);
PREP(createTarget);
4 changes: 4 additions & 0 deletions addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ _target setVariable ["origin", _position];

_target addEventHandler ["killed", {
params ["_target"];

// Killed may fire twice, 2nd will be null - https://github.com/acemod/ACE3/pull/7561
if (isNull _target) exitWith { TRACE_1("Ignoring null death",_target); };

private _position = _target getVariable ["origin", position _target];
private _varName = vehicleVarName _target;

Expand Down