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

Jump to bottom

fix scripted optics in pause menu in MP #1160

Merged
merged 2 commits into from
Jun 13, 2019
Merged

fix scripted optics in pause menu in MP #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e375d00
draw scripted optic in pause menu in MP
commy2 Jun 13, 2019
32fe4c5
draw scripted optic in pause menu in MP
commy2 Jun 13, 2019
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
3 changes: 3 additions & 0 deletions addons/optics/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ class Extended_DisplayLoad_EventHandlers {
class RscDisplayInterrupt {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
};
class RscDisplayMPInterrupt {
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
};
};
2 changes: 1 addition & 1 deletion addons/optics/fnc_initDisplayInterrupt.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ _script ctrlSetPosition [0,0,0,0];
_script ctrlCommit 0;

_script ctrlAddEventHandler ["Draw", {
if (isNull (uiNamespace getVariable ["RscDisplayInterrupt", displayNull])) then {
if (isNull (uiNamespace getVariable [["RscDisplayInterrupt", "RscDisplayMPInterrupt"] select isMultiplayer, displayNull])) then {
{
QGVAR(pauseOpticLayer) cutText ["", "PLAIN"];
} call CBA_fnc_execNextFrame;
Expand Down