mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
fix Function Names
fix Input
This commit is contained in:
parent
317706cf46
commit
4e6f289493
@ -17,7 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
|
|
||||||
params ["_weapon", "_magazine", "_ammo"];
|
params ["_weapon", "_ammo", "_magazine"];
|
||||||
TRACE_3("Parameter",_weapon,_magazine,_ammo);
|
TRACE_3("Parameter",_weapon,_magazine,_ammo);
|
||||||
|
|
||||||
private ["_array", "_type", "_return", "_config"];
|
private ["_array", "_type", "_return", "_config"];
|
||||||
@ -58,7 +58,7 @@ _return = [
|
|||||||
(getNumber (_config >> QGVAR(damage)))
|
(getNumber (_config >> QGVAR(damage)))
|
||||||
];
|
];
|
||||||
TRACE_1("Return",_return);
|
TRACE_1("Return",_return);
|
||||||
|
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
||||||
missionNameSpace setVariable [format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine], _return];
|
missionNameSpace setVariable [format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine], _return];
|
||||||
|
|
||||||
_return
|
_return
|
||||||
|
@ -31,7 +31,7 @@ _direction = [0, 0, 0] vectorDiff (vectorDir _projectile);
|
|||||||
private ["_var","_varName","_backblastAngle", "_backblastRange", "_backblastDamage"];
|
private ["_var","_varName","_backblastAngle", "_backblastRange", "_backblastDamage"];
|
||||||
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
||||||
_var = if (isNil _varName) then {
|
_var = if (isNil _varName) then {
|
||||||
[_weapon,_magazine] call FUNC(cacheOverPressureVales);
|
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues);
|
||||||
} else {
|
} else {
|
||||||
missionNameSpace getVariable _varName;
|
missionNameSpace getVariable _varName;
|
||||||
};
|
};
|
||||||
|
@ -32,7 +32,7 @@ private ["_var", "_varName", "_dangerZoneAngle", "_dangerZoneRange", "_dangerZon
|
|||||||
// Bake Variablen Name and Check if the Variable Exist else call the Cache Function
|
// Bake Variablen Name and Check if the Variable Exist else call the Cache Function
|
||||||
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
||||||
_var = if (isNil _varName) then {
|
_var = if (isNil _varName) then {
|
||||||
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureVales);
|
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues);
|
||||||
} else {
|
} else {
|
||||||
missionNameSpace getVariable _varName;
|
missionNameSpace getVariable _varName;
|
||||||
};
|
};
|
||||||
|
@ -16,17 +16,17 @@
|
|||||||
* None
|
* None
|
||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
private ["_var","_varName"];
|
private ["_damage","_varName"];
|
||||||
params ["", "_weapon", "", "", "_ammo", "_magazine", ""];
|
params ["", "_weapon", "", "", "_ammo", "_magazine", ""];
|
||||||
|
|
||||||
// Bake Variable Name and Check if the Variable Exist else call the Cache Function
|
// Bake Variable Name and Check if the Variable Exist else call the Cache Function
|
||||||
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
||||||
_var = if (isNil _varName) then {
|
_damage = if (isNil _varName) then {
|
||||||
([_weapon, _ammo, _magazine] call FUNC(cacheOverPressureVales)) select 2;
|
([_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues)) select 2;
|
||||||
} else {
|
} else {
|
||||||
(missionNameSpace getVariable _varName) select 2;
|
(missionNameSpace getVariable _varName) select 2;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_var > 0) then {
|
if (_damage > 0) then {
|
||||||
_this call DFUNC(fireLauncherBackblast)
|
_this call DFUNC(fireLauncherBackblast)
|
||||||
};
|
};
|
||||||
|
@ -16,17 +16,17 @@
|
|||||||
* None
|
* None
|
||||||
*/
|
*/
|
||||||
#include "script_component.hpp"
|
#include "script_component.hpp"
|
||||||
private ["_var","_varName"];
|
private ["_damage","_varName"];
|
||||||
params ["", "_weapon", "", "", "_ammo", "_magazine", ""];
|
params ["", "_weapon", "", "", "_ammo", "_magazine", ""];
|
||||||
|
|
||||||
// Bake Variable Name and Check if the Variable Exist else call the Cache Function
|
// Bake Variable Name and Check if the Variable Exist else call the Cache Function
|
||||||
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
||||||
_var = if (isNil _varName) then {
|
_damage = if (isNil _varName) then {
|
||||||
([_weapon, _ammo, _magazine] call FUNC(cacheOverPressureVales)) select 2;
|
([_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues)) select 2;
|
||||||
} else {
|
} else {
|
||||||
(missionNameSpace getVariable _varName) select 2;
|
(missionNameSpace getVariable _varName) select 2;
|
||||||
};
|
};
|
||||||
|
|
||||||
if (_var > 0) then {
|
if (_damage > 0) then {
|
||||||
_this call DFUNC(fireOverpressureZone)
|
_this call DFUNC(fireOverpressureZone)
|
||||||
};
|
};
|
||||||
|
@ -22,7 +22,7 @@ params ["_firer", "_posASL", "_direction", "_weapon", "_magazine", "_ammo"];
|
|||||||
// Bake Variablen Name and Check if the Variable Exist else call the Cache Function
|
// Bake Variablen Name and Check if the Variable Exist else call the Cache Function
|
||||||
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
_varName = format [QGVAR(values%1%2%3), _weapon, _ammo, _magazine];
|
||||||
_var = if (isNil _varName) then {
|
_var = if (isNil _varName) then {
|
||||||
[_weapon,_magazine] call FUNC(cacheOverPressureVales);
|
[_weapon, _ammo, _magazine] call FUNC(cacheOverPressureValues);
|
||||||
} else {
|
} else {
|
||||||
missionNameSpace getVariable _varName;
|
missionNameSpace getVariable _varName;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user