Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

scopes: partial fix

Browse Source
This commit is contained in:
Nicolás Badano 2015-01-18 18:34:45 -03:00
parent 63af6892eb
commit 112c9f319f
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/scopes/RscTitles.hpp
View File

@ -1,10 +1,10 @@
class RscTitles {
class ACE_Scope_Zeroing {
class ACE_Scopes_Zeroing {
idd = -1;
movingEnable = 0;
enableSimulation = 1;
enableDisplay = 1;
onLoad = QUOTE(_this spawn compile preprocessFileLineNumbers 'z\ace\scopes\scripts\zeroingOnLoad.sqf'; uiNamespace setVariable [ARR_2('ACE_Scopes_Debug', _this)];);
onLoad = QUOTE(_this spawn compile preprocessFileLineNumbers QUOTE(QUOTE(PATHTOF(scripts\zeroingOnLoad.sqf))); uiNamespace setVariable [ARR_2('ACE_Scopes_Debug', _this)];);
duration = 1e+011;
fadein = 0;
fadeout = 0;

2
addons/scopes/XEH_postInit.sqf
View File

@ -96,7 +96,7 @@ if !(hasInterface) exitWith {};
] call cba_fnc_registerKeybind;
["ACE3",
localize "adjustScopeRight",
localize "STR_ACE_Scopes_AdjustRight",
{
// Conditions: canInteract
_exceptions = [];

2
addons/scopes/functions/fnc_canAdjustScope.sqf
View File

@ -29,7 +29,7 @@ if (isNil QGVAR(Adjustment)) then {
GVAR(Adjustment) = [[0,0], [0,0], [0,0]];
};
if (isNil "AGM_Scopes_Optics") then {
if (isNil QGVAR(Optics)) then {
GVAR(Optics) = ["", "", ""];
};

1
addons/scopes/scripts/script_component.hpp Normal file
View File

@ -0,0 +1 @@
#include "\z\ace\addons\scopes\script_component.hpp"

8
addons/scopes/scripts/zeroingOnLoad.sqf
View File

@ -1,7 +1,9 @@
#include "script_component.hpp"
disableSerialization;
_display = _this select 0;
uiNamespace setVariable ["ACE_Scopes_ZeroingDisplay", _display];
uiNamespace setVariable [QGVAR(ZeroingDisplay, _display];
_vertical = _display displayCtrl 925002;
_horizontal = _display displayCtrl 925003;
@ -11,8 +13,8 @@ _weapons = [
handgunWeapon player
];
if ((currentWeapon player) in _weapons) then {
_zeroing = ACE_Scopes_Adjustment select (_weapons find (currentWeapon player));
if ((currentWeapon ACE_player) in _weapons) then {
_zeroing = GVAR(Adjustment) select (_weapons find (currentWeapon ACE_player));
_horizontal ctrlSetText (str (_zeroing select 0));
_vertical ctrlSetText (str (_zeroing select 1));
};

0
addons/scopes/sounds/agm_scopes_click.wav → addons/scopes/sounds/ace_scopes_click.wav
View File