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 optics camera restart handling for Zeus #1254

Merged
merged 3 commits into from
Nov 16, 2019
Merged

Fix optics camera restart handling for Zeus #1254

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
31e1f37
Fix optics camera restart handling for Zeus
mharis001 Nov 16, 2019
9c0b943
Switch to checking curatorCamera on arsenal close
mharis001 Nov 16, 2019
83e276c
Revert back to display check
mharis001 Nov 16, 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
9 changes: 6 additions & 3 deletions addons/optics/fnc_restartCamera.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,12 @@ Author:
commy2
---------------------------------------------------------------------------- */

if (!GVAR(usePipOptics)) exitWith {};
if (configProperties [configFile >> "CBA_PIPItems"] isEqualTo []) exitWith {};
if (isNull (uiNamespace getVariable ["RscDisplayMission", displayNull])) exitWith {};
if (
!GVAR(usePipOptics)
|| {configProperties [configFile >> "CBA_PIPItems"] isEqualTo []}
|| {isNull (uiNamespace getVariable ["RscDisplayMission", displayNull])}
|| {!isNull (uiNamespace getVariable ["RscDisplayCurator", displayNull])}
) exitWith {};

params ["_unit", ["_reset", true]];

Expand Down
8 changes: 4 additions & 4 deletions addons/optics/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#define COMPONENT optics
#define COMPONENT optics
commy2 marked this conversation as resolved.
Show resolved Hide resolved
#include "\x\cba\addons\main\script_mod.hpp"

//#define DEBUG_MODE_FULL
//#define DISABLE_COMPILE_CACHE
//#define DEBUG_ENABLED_OPTICS
// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
// #define DEBUG_ENABLED_OPTICS

#ifdef DEBUG_ENABLED_OPTICS
#define DEBUG_MODE_FULL
Expand Down