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

Merge pull request #1485 from acemod/abFixes

Browse Source 
Ab fixes
This commit is contained in:
ulteq 2015-06-02 23:13:05 +02:00
commit 1777719f20
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/advanced_ballistics/RscTitles.hpp
View File

@ -1,17 +1,13 @@
class RscTitles class RscTitles {
{ class RscTurretDial {
class RscTurretDial
{
idd=-1; idd=-1;
onLoad="with uiNameSpace do { RscTurretDial = _this select 0 };"; onLoad="with uiNameSpace do { RscTurretDial = _this select 0 };";
movingEnable=0; movingEnable=0;
duration=5; duration=5;
fadeIn="false"; fadeIn="false";
fadeOut="false"; fadeOut="false";
class controls class controls {
{ class RscTurretDial {
class RscTurretDial
{
idc=132949; idc=132949;
type=0; type=0;
style=128; style=128;
@ -28,18 +24,15 @@ class RscTitles
}; };
}; };
class RscProtractor class RscProtractor {
{
idd=-1; idd=-1;
onLoad="with uiNameSpace do { RscProtractor = _this select 0 };"; onLoad="with uiNameSpace do { RscProtractor = _this select 0 };";
movingEnable=0; movingEnable=0;
duration=60; duration=60;
fadeIn="false"; fadeIn="false";
fadeOut="false"; fadeOut="false";
class controls class controls {
{ class RscProtractorBase {
class RscProtractorBase
{
idc=132950; idc=132950;
type=0; type=0;
style=48; style=48;
@ -54,8 +47,7 @@ class RscTitles
sizeEx=0.027; sizeEx=0.027;
text=""; text="";
}; };
class RscProtractorMarker : RscProtractorBase class RscProtractorMarker : RscProtractorBase {
{
idc=132951; idc=132951;
}; };
}; };

4
addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
View File

@ -45,12 +45,12 @@ GVAR(Protractor) = true;
1 cutRsc ["RscProtractor", "PLAIN", 1, false]; 1 cutRsc ["RscProtractor", "PLAIN", 1, false];
__ctrl1 ctrlSetScale 0.75; __ctrl1 ctrlSetScale 1;
__ctrl1 ctrlCommit 0; __ctrl1 ctrlCommit 0;
__ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa)); __ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa));
__ctrl1 ctrlSetTextColor [1, 1, 1, 1]; __ctrl1 ctrlSetTextColor [1, 1, 1, 1];
__ctrl2 ctrlSetScale 0.75; __ctrl2 ctrlSetScale 1;
__ctrl2 ctrlSetPosition [(_refPosition select 0), (_refPosition select 1) - 0.0012 * _inclinationAngle, (_refPosition select 2), (_refPosition select 3)]; __ctrl2 ctrlSetPosition [(_refPosition select 0), (_refPosition select 1) - 0.0012 * _inclinationAngle, (_refPosition select 2), (_refPosition select 3)];
__ctrl2 ctrlCommit 0; __ctrl2 ctrlCommit 0;
__ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa)); __ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));

4
addons/advanced_ballistics/functions/fnc_handleFired.sqf
View File

@ -133,8 +133,8 @@ GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000;
[_this select 1] call cba_fnc_removePerFrameHandler; [_this select 1] call cba_fnc_removePerFrameHandler;
}; };
if (_bulletTraceVisible && _bulletSpeed > 600) then { if (_bulletTraceVisible && _bulletSpeed > 500) then {
drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.6],[0,0,0,0.4]],[1,0],0,0,"","",""]; drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
}; };
call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, floor(ACE_time), ACE_time - floor(ACE_time)]); call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, floor(ACE_time), ACE_time - floor(ACE_time)]);