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

More cleanup + a bug fix.

Browse Source
This commit is contained in:
voiper 2016-06-13 19:23:14 -07:00
parent 69c3dd5cfb
commit 01c335d13a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/flashlights/CfgWeapons.hpp
View File

@ -29,7 +29,7 @@ class CfgWeapons {
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 1; mass = 1;
class ACE_Map_Flashlight { class ACE_Map_Flashlight {
ACE_Map_Flashlight_Colour = "red"; ACE_Map_Flashlight_Color = "red";
ACE_Map_Flashlight_Beam = QUOTE(PATHTOF(UI\Flashlight_beam_red_ca.paa)); ACE_Map_Flashlight_Beam = QUOTE(PATHTOF(UI\Flashlight_beam_red_ca.paa));
ACE_Map_Flashlight_Size = 1.5; ACE_Map_Flashlight_Size = 1.5;
ACE_Map_Flashlight_Sound = 1; ACE_Map_Flashlight_Sound = 1;
@ -46,7 +46,7 @@ class CfgWeapons {
class ItemInfo: InventoryItem_Base_F { class ItemInfo: InventoryItem_Base_F {
mass = 1; mass = 1;
class ACE_Map_Flashlight { class ACE_Map_Flashlight {
ACE_Map_Flashlight_Colour = "white"; ACE_Map_Flashlight_Color = "white";
ACE_Map_Flashlight_Beam = QUOTE(PATHTOF(UI\Flashlight_beam_white_ca.paa)); ACE_Map_Flashlight_Beam = QUOTE(PATHTOF(UI\Flashlight_beam_white_ca.paa));
ACE_Map_Flashlight_Size = 2.15; ACE_Map_Flashlight_Size = 2.15;
ACE_Map_Flashlight_Sound = 1; ACE_Map_Flashlight_Sound = 1;

3
addons/map/functions/fnc_simulateMapLight.sqf
View File

@ -57,8 +57,9 @@ if (_flashlight == "") then {
//flashlight settings //flashlight settings
_cfg = (configFile >> "CfgWeapons" >> _flashlight >> "ItemInfo" >> QGVAR(Flashlight)); _cfg = (configFile >> "CfgWeapons" >> _flashlight >> "ItemInfo" >> QGVAR(Flashlight));
_flashTex = getText (_cfg >> QGVAR(Flashlight_Beam));
_size = getNumber (_cfg >> QGVAR(Flashlight_Size)); _size = getNumber (_cfg >> QGVAR(Flashlight_Size));
_flashTex = getText (_cfg >> QGVAR(Flashlight_Beam));
_beamSize = (safeZoneW/safeZoneWAbs) * _screenSize / _size;
//after 5x zoom, it's simulated to be fixed (it actually gets bigger relative to zoom) //after 5x zoom, it's simulated to be fixed (it actually gets bigger relative to zoom)
if (_mapScale < 0.2) then {_beamSize = _beamSize / (_mapScale * (1 / 0.2))}; if (_mapScale < 0.2) then {_beamSize = _beamSize / (_mapScale * (1 / 0.2))};