Merge pull request #450 from Tenga/master

Count the commander camera as a 3rd person camera
This commit is contained in:
commy2 2015-04-10 21:54:52 +02:00
commit 2a72e183b1
4 changed files with 35 additions and 1 deletions

View File

@ -62,6 +62,7 @@ Raspu86
Riccardo Petricca <petriccarcc@gmail.com>
Robert Boklahánics <bokirobi@gmail.com>
simon84
Sniperwolf572 <tenga6@gmail.com>
Tonic
Tourorist <tourorist@gmail.com>
Valentin Torikian <valentin.torikian@gmail.com>

View File

@ -107,6 +107,7 @@ PREP(isAutoWind);
PREP(isAwake);
PREP(isEngineer);
PREP(isEOD);
PREP(isFeatureCameraActive);
PREP(isInBuilding);
PREP(isModLoaded);
PREP(isPlayer);

View File

@ -0,0 +1,31 @@
/*
* Author: Sniperwolf572
*
* Checks if one of the following BI feature cameras are active:
*
* - Classic camera (BIS_fnc_cameraOld)
* - Splendid camera (BIS_fnc_camera)
* - Arsenal camera (BIS_fnc_arsenal)
* - Animation viewer (BIS_fnc_animViewer)
* - Establishing shot (BIS_fnc_establishingShot)
*
* Arguments:
* None
*
* Return value:
* Is BI feature camera active (bool)
*
* Example:
* call ace_common_fnc_isFeatureCameraActive;
*
*/
#include "script_component.hpp"
(
!isNull (missionNamespace getVariable ["BIS_DEBUG_CAM", objNull]) || // Classic camera
{!isNull (missionNamespace getVariable ["BIS_fnc_camera_cam", objNull])} || // Splendid camera
{!isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])} || // Arsenal camera
{!isNull (uiNamespace getVariable ["BIS_fnc_animViewer_cam", objNull])} || // Animation viewer camera
{!isNull (missionNamespace getVariable ["BIS_fnc_establishingShot_fakeUAV", objNull])} // Establishing shot camera
)

View File

@ -16,4 +16,5 @@
#include "script_component.hpp"
if (GVAR(showInThirdPerson)) exitWith { false };
(cameraView == "External")
(cameraView in ["EXTERNAL", "GROUP"] || {call EFUNC(common,isFeatureCameraActive)})