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 branch 'master' into nametagsToggle

Browse Source 
Conflicts:
	addons/nametags/ACE_Settings.hpp
This commit is contained in:
jonpas 2015-05-15 15:37:18 +02:00
commit 58ad012433
184 changed files with 344 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -36,6 +36,7 @@ Anthariel <Contact@storm-simulation.com>
BlackQwar
Brakoviejo
Brisse <brisse@outlook.com>
BullHorn <bullhorn7@gmail.com>
Clon1998 <ps.patti1998@gmail.com>
Codingboy
Crusty

8
addons/common/XEH_postInit.sqf
View File

@ -1,6 +1,8 @@
// ACE - Common
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleNetEvent", "_handleRequestAllSyncedEvents", "_handleRequestSyncedEvent", "_handleSyncedEvent");
// Load settings from profile
if (hasInterface) then {
call FUNC(loadSettingsFromProfile);
@ -9,10 +11,9 @@ if (hasInterface) then {
// Listens for global "SettingChanged" events, to update the force status locally
["SettingChanged", {
PARAMS_2(_name,_value);
if !(count _this > 2) exitWith {};
private ["_force", "_settingData"];
_force = _this select 2;
if (_force) then {
_settingData = [_name] call FUNC(getSettingData);
@ -54,6 +55,7 @@ QGVAR(remoteFnc) addPublicVariableEventHandler {
[missionNamespace] call FUNC(executePersistent);
private ["_currentVersion", "_previousVersion"];
// check previous version number from profile
_currentVersion = getText (configFile >> "CfgPatches" >> QUOTE(ADDON) >> "version");
_previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""];
@ -131,6 +133,7 @@ GVAR(OldPlayerWeapon) = currentWeapon ACE_player;
// PFH to raise varios events
[{
private ["_newCameraView", "_newInventoryDisplayIsOpen", "_newPlayerInventory", "_newPlayerTurret", "_newPlayerVehicle", "_newPlayerVisionMode", "_newPlayerWeapon", "_newZeusDisplayIsOpen"];
// "playerInventoryChanged" event
_newPlayerInventory = [ACE_player] call FUNC(getAllGear);
if !(_newPlayerInventory isEqualTo GVAR(OldPlayerInventory)) then {
@ -212,6 +215,7 @@ GVAR(OldIsCamera) = false;
[{
// "activeCameraChanged" event
private ["_isCamera"];
_isCamera = {!isNull _x} count ALL_CAMERAS > 0;
if !(_isCamera isEqualTo GVAR(OldIsCamera)) then {
// Raise ACE event locally

4
addons/common/XEH_preInit.sqf
View File

@ -1,6 +1,8 @@
// by commy2
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleNetEvent", "_handleRequestAllSyncedEvents", "_handleRequestSyncedEvent", "_handleSyncedEvent");
ADDON = false;
// ACE Common Function
@ -170,7 +172,6 @@ PREP(sortAlphabeticallyBy);
PREP(stringCompare);
PREP(stringToColoredText);
PREP(stringRemoveWhiteSpace);
PREP(subString);
PREP(switchToGroupSide);
PREP(throttledPublicVariable);
PREP(toBin);
@ -302,6 +303,7 @@ if (hasInterface) then {
// PFH to update the ACE_player variable
[{
if !(ACE_player isEqualTo (call FUNC(player))) then {
private ["_oldPlayer"];
_oldPlayer = ACE_player;
ACE_player = call FUNC(player);

4
addons/common/functions/fnc__handleNetEvent.sqf
View File

@ -2,7 +2,9 @@
// internal handler for net events
#include "script_component.hpp"
private ["_eventName", "_eventArgs", "_eventNames", "_eventIndex", "_eventTargets", "_sentEvents", "_owner", "_serverFlagged"];
private ["_eventName", "_eventArgs", "_eventNames", "_eventIndex", "_eventTargets", "_sentEvents", "_owner", "_serverFlagged", "_events"];
//IGNORE_PRIVATE_WARNING("_handleNetEvent");
PARAMS_2(_eventType,_event);

3
addons/common/functions/fnc__handleRequestSyncedEvent.sqf
View File

@ -17,6 +17,8 @@
//#define DEBUG_MODE_FULL
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleSyncedEvent");
//SEH_s
if(isServer) then {
// Find the event name, and shovel out the events to the client
@ -33,6 +35,7 @@ if(isServer) then {
["SEH_s", _client, [_eventName, _eventLog] ] call FUNC(targetEvent);
} else {
PARAMS_2(_eventName,_eventLog);
private ["_eventArgs"];
// This is the client handling the response from the server
// Start running the events
{

1
addons/common/functions/fnc_addActionEventHandler.sqf
View File

@ -15,6 +15,7 @@
#include "script_component.hpp"
private ["_unit", "_action", "_condition", "_statement", "_name", "_actionsVar", "_actionID", "_actions", "_id", "_actionIDs"];
//IGNORE_PRIVATE_WARNING("_count", "_index", "_return", "_target");
_unit = _this select 0;
_action = _this select 1;

1
addons/common/functions/fnc_addActionMenuEventHandler.sqf
View File

@ -19,6 +19,7 @@
#include "script_component.hpp"
private ["_name", "_actionsVar", "_id", "_actionIDs", "_actions", "_nameVar", "_addAction", "_actionID"];
//IGNORE_PRIVATE_WARNING("_target");
PARAMS_8(_unit,_displayName,_action,_condition,_statement,_condition2,_statement2,_priority);

2
addons/common/functions/fnc_addCanInteractWithCondition.sqf
View File

@ -14,6 +14,8 @@
#include "script_component.hpp"
private ["_conditionName", "_conditionFunc"];
//IGNORE_PRIVATE_WARNING("_player", "_target");
_conditionName = toLower (_this select 0);
_conditionFunc = _this select 1;

18
addons/common/functions/fnc_addSetting.sqf
View File

@ -4,14 +4,14 @@
* If has only local effects.
*
* Arguments:
* 0: _name (String)
* 1: _typeName (String)
* 2: _isClientSetable (Bool)
* 3: _localizedName (String)
* 4: _localizedDescription (String)
* 5: _possibleValues (Array)
* 6: _isForced (Bool)
* 7: _defaultValue (Any)
* 0: name <STRING>
* 1: typeName <STRING>
* 2: isClientSetable <BOOL>
* 3: localizedName <STRING>
* 4: localizedDescription <STRING>
* 5: possibleValues <ARRAY>
* 6: isForced <BOOL>
* 7: defaultValue (Any)
*
* Return Value:
* None
@ -22,6 +22,8 @@
PARAMS_8(_name,_typeName,_isClientSetable,_localizedName,_localizedDescription,_possibleValues,_isForced,_value);
private ["_settingData"];
_settingData = [_name] call FUNC(getSettingData);
// Exit if the setting already exists

2
addons/common/functions/fnc_addSyncedEventHandler.sqf
View File

@ -13,6 +13,8 @@
*/
//#define DEBUG_MODE_FULL
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleSyncedEvent");
PARAMS_2(_name,_handler);
private["_ttl", "_eventId", "_data"];

4
addons/common/functions/fnc_addToInventory.sqf
View File

@ -23,9 +23,7 @@ PARAMS_2(_unit,_classname);
DEFAULT_PARAM(2,_container,"");
DEFAULT_PARAM(3,_ammoCount,-1);
private "_addedToPlayer";
private "_canAdd";
private "_type";
private ["_addedToPlayer", "_canAdd", "_type", "_pos"];
_canAdd = false;
_addedToPlayer = true;

2
addons/common/functions/fnc_cachedCall.sqf
View File

@ -19,6 +19,8 @@
PARAMS_5(_params,_function,_namespace,_uid,_duration);
//IGNORE_PRIVATE_WARNING("_eventName");
if (((_namespace getVariable [_uid, [-99999]]) select 0) < diag_tickTime) then {
_namespace setVariable [_uid, [diag_tickTime + _duration, _params call _function]];

2
addons/common/functions/fnc_canInteract.sqf
View File

@ -9,8 +9,6 @@
*/
#include "script_component.hpp"
private ["_return"];
PARAMS_1(_unit);
(((_unit getvariable [QGVAR(canInteract),0]) < 1) && ([_unit] call FUNC(isAwake)) && !([_unit] call FUNC(isArrested)))

2
addons/common/functions/fnc_changeProjectileDirection.sqf
View File

@ -14,7 +14,7 @@
*/
#include "script_component.hpp"
private ["_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel"];
private ["_adjustSpeed", "_vdir", "_dir", "_up", "_vup", "_vel", "_vlat"];
PARAMS_3(_projectile,_adjustDir,_adjustUp);

2
addons/common/functions/fnc_closeDialogIfTargetMoves.sqf
View File

@ -14,6 +14,8 @@
_this spawn {
PARAMS_2(_target,_ignoreDead);
private["_inVehicle", "_position", "_vehiclePlayer", "_vehicleTarget"];
if (isNil "_ignoreDead") then {_ignoreDead = false};
_vehicleTarget = vehicle _target;

2
addons/common/functions/fnc_debug.sqf
View File

@ -12,7 +12,7 @@
#define DEFAULT_LOGGING_LEVEL -1
#define DEFAULT_TEXT_DISPLAY -1
private ["_level", "_prefix", "_defaultLoglevel","_defaultLogDisplayLevel", "_message", "_from"];
private ["_level", "_prefix", "_defaultLoglevel","_defaultLogDisplayLevel", "_message"];
PARAMS_1(_msg);
_level = if (count _this > 1) then {_this select 1} else { 2 };

1
addons/common/functions/fnc_disableUserInput.sqf
View File

@ -37,6 +37,7 @@ if (_state) then {
_dlg = uiNamespace getVariable QGVAR(dlgDisableMouse);
_dlg displayAddEventHandler ["KeyDown", {
private ["_key", "_dlg", "_ctrl", "_config", "_acc", "_index"];
_key = _this select 1;
if (_key == 1 && {alive player}) then {

4
addons/common/functions/fnc_displayIcon.sqf
View File

@ -2,7 +2,7 @@
* Author: Glowbal
*
* Draw progress bar and execute given function if succesful.
* Finish/Failure/Conditional are all passed [_args, _elapsedTime, _totalTime, _errorCode]
* Finish/Failure/Conditional are all passed [args, elapsedTime, totalTime, errorCode]
*
* Argument:
* 0: icon ID <STRING>
@ -61,7 +61,7 @@ _refresh = {
_allControls = [];
private ["_ctrl", "_setting"];
private ["_ctrl", "_setting", "_position"];
_setting = missionNamespace getvariable[QGVAR(settingFeedbackIcons), 0];
if (_setting > 0) then {
{

2
addons/common/functions/fnc_exportConfig.sqf
View File

@ -9,7 +9,7 @@
private "_fnc_logEntries";
_fnc_logEntries = {
private ["_p", "_t", "_e"];
private ["_p", "_t", "_e", "_a", "_i"];
PARAMS_2(_c,_d);

2
addons/common/functions/fnc_fixLoweredRifleAnimation.sqf
View File

@ -9,7 +9,7 @@
* Nothing
*
* Example:
* [_player] call ace_common_fnc_fixLoweredRifleAnimation
* [ACE_player] call ace_common_fnc_fixLoweredRifleAnimation
*
* Public: No
*/

2
addons/common/functions/fnc_getDisplayConfigName.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
private ["_configName", "_index"];
private ["_configName", "_index", "_config"];
_configName = "";

2
addons/common/functions/fnc_getFirstObjectIntersection.sqf
View File

@ -9,7 +9,7 @@
*/
#include "script_component.hpp"
private ["_distance", "_lower", "_upper", "_mid", "_intersections", "_result"];
private ["_distance", "_lower", "_upper", "_mid", "_intersections", "_result", "_dir"];
PARAMS_3(_source,_destination,_accuracy);

2
addons/common/functions/fnc_getFirstTerrainIntersection.sqf
View File

@ -9,7 +9,7 @@
*/
#include "script_component.hpp"
private ["_distance", "_lower", "_upper", "_mid", "_intersection", "_result"];
private ["_distance", "_lower", "_upper", "_mid", "_intersection", "_result", "_dir"];
PARAMS_3(_source,_destination,_accuracy);

2
addons/common/functions/fnc_getHitPoints.sqf
View File

@ -11,7 +11,7 @@
*/
#include "script_component.hpp"
private ["_config", "_hitpoints"];
private ["_config", "_hitpoints", "_i"];
PARAMS_1(_vehicle);

2
addons/common/functions/fnc_getHitPointsWithSelections.sqf
View File

@ -11,7 +11,7 @@
*/
#include "script_component.hpp"
private ["_config", "_hitpoints", "_selections"];
private ["_config", "_hitpoints", "_selections", "_i"];
PARAMS_1(_vehicle);

2
addons/common/functions/fnc_getItemType.sqf
View File

@ -16,6 +16,8 @@
PARAMS_1(_item);
private ["_cfgType"];
_cfgType = [_item] call FUNC(getConfigType);
if (_cfgType == "") exitWith {["",""]};

4
addons/common/functions/fnc_getNumberMagazinesIn.sqf
View File

@ -12,6 +12,8 @@
PARAMS_2(_unit,_magazine);
private ["_return"];
_return = 0;
if (_unit isKindOf "CAManBase") then {
_return = {_x == _magazine} count magazines _unit;
@ -23,4 +25,4 @@ if (_unit isKindOf "CAManBase") then {
_return = _return + ({_x == _magazine} count getMagazineCargo _unit);
};
_return
_return

2
addons/common/functions/fnc_getReflectorsWithSelections.sqf
View File

@ -13,7 +13,7 @@
*/
#include "script_component.hpp"
private ["_config", "_hitpoints", "_selections"];
private ["_config", "_hitpoints", "_selections", "_i"];
PARAMS_1(_vehicle);

2
addons/common/functions/fnc_getTurretConfigPath.sqf
View File

@ -12,7 +12,7 @@
*/
#include "script_component.hpp"
private ["_index", "_offset", "_config2", "_foundClasses"];
private ["_index", "_offset", "_config2", "_foundClasses", "_a"];
PARAMS_2(_config,_turretIndex);

2
addons/common/functions/fnc_getTurretDirection.sqf
View File

@ -13,7 +13,7 @@
#include "script_component.hpp"
PARAMS_2(_vehicle,_position);
private ["_turrets", "_turret", "_config", "_turret", "_povPos", "_povDir", "_gunBeginPos", "_gunEndPos", "_pov"];
private ["_turret", "_povPos", "_povDir", "_gunBeginPos", "_gunEndPos", "_pov", "_gunBeg", "_gunEnd", "_pipDir"];
_turret = [_vehicle, _position] call CBA_fnc_getTurret;
_pov = getText (_turret >> "memoryPointGunnerOptics");

2
addons/common/functions/fnc_getTurrets.sqf
View File

@ -11,7 +11,7 @@
*/
#include "script_component.hpp"
private ["_config", "_turrets", "_fnc_addTurret"];
private ["_config", "_turrets", "_fnc_addTurret", "_varName"];
PARAMS_1(_type);

2
addons/common/functions/fnc_getVehicleCargo.sqf
View File

@ -11,7 +11,7 @@
*/
#include "script_component.hpp"
private ["_config", "_cargo", "_codrivers"];
private ["_config", "_cargo", "_codrivers", "_index"];
PARAMS_1(_vehicle);

2
addons/common/functions/fnc_getVehicleCodriver.sqf
View File

@ -11,7 +11,7 @@
*/
#include "script_component.hpp"
private ["_config", "_cargo", "_codrivers"];
private ["_config", "_cargo", "_codrivers", "_index"];
PARAMS_1(_vehicle);

1
addons/common/functions/fnc_globalEvent.sqf
View File

@ -11,6 +11,7 @@
* Nothing
*/
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleNetEvent");
PARAMS_2(_eventName,_eventArgs);

2
addons/common/functions/fnc_goKneeling.sqf
View File

@ -13,6 +13,8 @@
PARAMS_1(_unit);
//IGNORE_PRIVATE_WARNING("_exception");
try {
if (_unit == vehicle _unit) then {
switch (currentWeapon _unit) do {

2
addons/common/functions/fnc_hadamardProduct.sqf
View File

@ -15,6 +15,8 @@
PARAMS_2(_vector1,_vector2);
private ["_newVector", "_i"];
_newVector = [];
for "_i" from 0 to (((count _vector1) min (count _vector2)) - 1) do {

1
addons/common/functions/fnc_isAwake.sqf
View File

@ -10,7 +10,6 @@
#include "script_component.hpp"
private ["_return"];
PARAMS_1(_unit);
(!(_unit getvariable ["ACE_isUnconscious",false]) && alive _unit && !(_unit getvariable ["ACE_isDead",false]));

2
addons/common/functions/fnc_isEOD.sqf
View File

@ -16,7 +16,7 @@
BOOLEAN
Example:
_isSpecialist = [player] call FUNC(isEOD);
isSpecialist = [player] call FUNC(isEOD);
*/
#include "script_component.hpp"

2
addons/common/functions/fnc_localEvent.sqf
View File

@ -14,6 +14,8 @@
PARAMS_2(_eventName,_eventArgs);
private["_eventIndex", "_eventNames", "_events"];
_eventNames = GVAR(events) select 0;
_eventIndex = _eventNames find _eventName;
if(_eventIndex != -1) then {

3
addons/common/functions/fnc_logModEntries.sqf
View File

@ -1,6 +1,7 @@
// by commy2
#include "script_component.hpp"
private ["_configs", "_entries"];
private ["_configs", "_entries", "_name"];
_configs = "true" configClasses (configFile >> _this);

3
addons/common/functions/fnc_moduleCheckPBOs.sqf
View File

@ -13,6 +13,8 @@
PARAMS_3(_logic,_units,_activated);
private ["_mode", "_checkAll", "_whitelist"];
if !(_activated) exitWith {};
_mode = parseNumber (_logic getVariable "Action");
@ -30,6 +32,7 @@ ACE_Version_Whitelist = _whitelist;
if (!isServer) then {
[_mode, _checkAll, _whitelist] spawn {
private ["_mode", "_checkAll", "_whitelist", "_missingAddon", "_missingAddonServer", "_oldVersionClient", "_oldVersionServer", "_text", "_error", "_rscLayer", "_ctrlHint"];
_mode = _this select 0;
_checkAll = _this select 1;
_whitelist = _this select 2;

2
addons/common/functions/fnc_moduleLSDVehicles.sqf
View File

@ -13,6 +13,8 @@
PARAMS_3(_logic,_units,_activated);
private["_colors", "_hSCount", "_hiddenSelections", "_i", "_index", "_vehicle"];
if !(_activated) exitWith {};
{

2
addons/common/functions/fnc_moveToTempGroup.sqf
View File

@ -10,7 +10,7 @@
#include "script_component.hpp"
private ["_unit","_moveTo","_previousGroup","_newGroup", "_currentGroup", "_switchToGroup"];
private ["_unit","_moveTo","_previousGroup","_newGroup", "_currentGroup"];
_unit = [_this, 0,ObjNull,[ObjNull]] call BIS_fnc_Param;
_moveTo = [_this, 1,false,[false]] call BIS_fnc_Param;

1
addons/common/functions/fnc_receiveRequest.sqf
View File

@ -42,6 +42,7 @@ GVAR(RECIEVE_REQUEST_ADD_ACTION_DECLINE) = _target addAction ["Decline", compile
GVAR(RECIEVE_REQUEST_ID_KEY_BINDING) = _requestID;
GVAR(RECIEVE_REQUEST_TIME_OUT_SCRIPT) = [time, _target, _requestID] spawn {
private["_id", "_t", "_requestID", "_target"];
_t = (_this select 0) + 40;
_target = _this select 1;
_requestID = _this select 2;

2
addons/common/functions/fnc_removeActionEventHandler.sqf
View File

@ -13,7 +13,7 @@
*/
#include "script_component.hpp"
private ["_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs", "_count"];
private ["_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs"];
PARAMS_3(_unit,_action,_id);

3
addons/common/functions/fnc_removeSyncedEventHandler.sqf
View File

@ -10,8 +10,11 @@
* Boolean of success
*/
#include "script_component.hpp"
PARAMS_1(_name);
private ["_data", "_eventId"];
if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith {
diag_log text format["[ACE] Error, synced event key not found."];
false

4
addons/common/functions/fnc_resetAllDefaults.sqf
View File

@ -10,8 +10,6 @@
#include "script_component.hpp"
private ["_oldUnit","_sets"];
PARAMS_1(_unit);
_unit setvariable ["ACE_isDead",nil,true];
@ -27,7 +25,7 @@ if (isPlayer _unit) then {
if !(isnil QGVAR(DISABLE_USER_INPUT_COLLECTION)) then {
// clear all disable user input
{
[_X, false] call FUNC(setDisableUserInputStatus);
[_x, false] call FUNC(setDisableUserInputStatus);
}foreach GVAR(DISABLE_USER_INPUT_COLLECTION);
};
};

2
addons/common/functions/fnc_revertKeyCodeLocalized.sqf
View File

@ -11,7 +11,7 @@
*/
#include "script_component.hpp"
private ["_key", "_alt", "_ctrl", "_shft"];
private ["_key", "_alt", "_ctrl", "_shift"];
PARAMS_1(_keyCode);

1
addons/common/functions/fnc_serverEvent.sqf
View File

@ -11,6 +11,7 @@
* Nothing
*/
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleNetEvent");
PARAMS_2(_eventName,_eventArgs);

2
addons/common/functions/fnc_setDefinedVariable.sqf
View File

@ -10,7 +10,7 @@
#include "script_component.hpp"
private ["_update","_global","_definedVariable","_defaultGlobal","_currentValue"];
private ["_global","_definedVariable"];
PARAMS_3(_unit,_variable,_value);

18
addons/common/functions/fnc_setSettingFromConfig.sqf
View File

@ -14,7 +14,7 @@
PARAMS_1(_optionEntry);
private ["_fnc_getValueWithType", "_value","_name", "_typeName", "_settingData"];
private ["_fnc_getValueWithType", "_value","_name", "_typeName", "_settingData", "_valueConfig", "_text"];
_fnc_getValueWithType = {
EXPLODE_2_PVT(_this,_optionEntry,_typeName);
@ -58,14 +58,14 @@ if (isNil _name) then {
// Add the setting to a list on the server
// Set the variable to not forced
/*_settingData = [
_name,
_typeName,
_isClientSettable,
_localizedName,
_localizedDescription,
_possibleValues,
_isForced,
_defaultValue
name,
typeName,
isClientSettable,
localizedName,
localizedDescription,
possibleValues,
isForced,
defaultValue
];*/
_settingData = [
_name,

26
addons/common/functions/fnc_subString.sqf
View File

@ -1,26 +0,0 @@
/*
* Author: KoffeinFlummi
*
* Returns a fraction of the given string, starting at a given index, with a given length.
*
* Arguments:
* 0: Source string
* 1: Starting index of new string
* 2: Length of the new string
*
* Return Value:
* String when successfull / False when not
*/
#include "script_component.hpp"
PARAMS_3(_string,_index,_length);
_array = toArray _string;
if (_index < 0 or _length < 0 or _index + _length > (count _array) + 1) exitWith {false};
_arrayNew = [];
for "_i" from _index to (_index + _length - 1) do {
_arrayNew = _arrayNew + [(_array select _i)];
};
toString _arrayNew

2
addons/common/functions/fnc_syncedEvent.sqf
View File

@ -16,7 +16,7 @@
PARAMS_2(_name,_args);
private["_ttl", "_eventData", "_internalData", "_eventLog"];
private["_ttl", "_eventData"];
if( (count _this) > 2) then {
_ttl = _this select 2;

2
addons/common/functions/fnc_syncedEventPFH.sqf
View File

@ -7,7 +7,7 @@ if(!isServer) exitWith { false };
// @TODO: This should be iteration limited to prevent FPS lag
private["_data"];
{
private["_data", "_ttl", "_eventLog", "_newEventLog", "_name"];
private["_data", "_eventLog", "_newEventLog", "_name", "_globalEventTTL"];
_name = _x;
_data = HASH_GET(GVAR(syncedEvents),_name);

2
addons/common/functions/fnc_targetEvent.sqf
View File

@ -16,6 +16,8 @@
*/
#include "script_component.hpp"
//IGNORE_PRIVATE_WARNING("_handleNetEvent");
PARAMS_3(_eventName,_eventTargets,_eventArgs);
#ifdef DEBUG_EVENTS

2
addons/common/functions/fnc_timePFH.sqf
View File

@ -1,7 +1,7 @@
//#define DEBUG_MODE_FULL
#include "script_component.hpp"
private["_lastTime", "_lastRealTime", "_lastVirtualTime", "_lastGameTime", "_delta"];
private["_lastRealTime", "_lastGameTime", "_delta"];
_lastRealTime = ACE_realTime;
_lastGameTime = ACE_gameTime;

2
addons/common/functions/fnc_toNumber.sqf
View File

@ -14,7 +14,7 @@
NUMBER
Example:
_number = ["102"] call FUNC(toNumber);
number = ["102"] call FUNC(toNumber);
*/
#include "script_component.hpp"

4
addons/common/functions/fnc_translateToModelSpace.sqf
View File

@ -1,3 +1,7 @@
#include "script_component.hpp"
private["_matrix", "_object", "_offset", "_origin", "_out", "_xVec", "_y", "_yVec", "_z", "_zVec"];
_object = _this select 0;
_origin = getPosASL _object;
_matrix = _this select 1;

4
addons/common/functions/fnc_translateToWeaponSpace.sqf
View File

@ -1,3 +1,7 @@
#include "script_component.hpp"
private["_matrix", "_object", "_offset", "_origin", "_out", "_xVec", "_y", "_yVec", "_z", "_zVec"];
_object = _this select 0;
_origin = getPosASL _object;
_matrix = _this select 1;

4
addons/common/functions/fnc_useItem.sqf
View File

@ -10,8 +10,10 @@
#include "script_component.hpp"
private ["_return"];
PARAMS_2(_unit,_item);
private ["_return", "_vehicleUsage"];
_vehicleUsage = [_this, 2, false, [false]] call BIS_fnc_Param;
_return = false;

2
addons/common/functions/fnc_useMagazine.sqf
View File

@ -10,7 +10,7 @@
#include "script_component.hpp"
private ["_return"];
private ["_return", "_vehicleUsage"];
PARAMS_2(_unit,_magazine);
_vehicleUsage = [_this, 2, false, [false]] call BIS_fnc_Param;

2
addons/common/functions/fnc_worldToScreenBounds.sqf
View File

@ -5,7 +5,7 @@
#include "script_component.hpp"
private ["_minX","_minY","_maxX","_maxY"];
private ["_minX","_minY","_maxX","_maxY", "_bounds", "_boundsCorners", "_boundsMax", "_boundsMaxX", "_boundsMaxY", "_boundsMaxZ", "_boundsMin", "_boundsMinX", "_boundsMinY", "_boundsMinZ"];
PARAMS_3(_object,_margins,_offsets);

2
addons/common/scripts/Version/checkVersionNumber.sqf
View File

@ -1,6 +1,8 @@
// by commy2
#include "script_component.hpp"
private["_client", "_clientVersion", "_count", "_error", "_files", "_index", "_missingAddon", "_missingAddonServer", "_missingAddons", "_missingAddonsServer", "_oldVersionClient", "_oldVersionServer", "_oldVersionsClient", "_oldVersionsServer", "_serverFiles", "_serverVersion", "_serverVersions", "_string", "_version", "_versions"];
_files = [];
{

2
addons/common/scripts/assignedItemFix.sqf
View File

@ -1,6 +1,8 @@
// by commy2
#include "script_component.hpp"
private ["_config"];
ACE_isMapEnabled = call {_config = missionConfigFile >> "showMap"; !isNumber _config || {getNumber _config == 1}}; // default value is 1, so do isNumber check first
ACE_isCompassEnabled = call {_config = missionConfigFile >> "showCompass"; !isNumber _config || {getNumber _config == 1}};
ACE_isWatchEnabled = call {_config = missionConfigFile >> "showWatch"; !isNumber _config || {getNumber _config == 1}};

13
addons/common/scripts/initScrollWheel.sqf
View File

@ -4,12 +4,13 @@
GVAR(ScrollWheelFrame) = diag_frameno;
GVAR(onScrollWheel) = {
_scroll = _this select 1;
private ["_scroll"];
_scroll = _this select 1;
if (GVAR(ScrollWheelFrame) == diag_frameno) exitWith {};
GVAR(ScrollWheelFrame) = diag_frameno;
if (GVAR(ScrollWheelFrame) == diag_frameno) exitWith {};
GVAR(ScrollWheelFrame) = diag_frameno;
{
[_scroll] call _x;
} count ((missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]]) select 2);
{
[_scroll] call _x;
} count ((missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]]) select 2);
};

2
addons/explosives/XEH_preInit.sqf
View File

@ -40,6 +40,8 @@ PREP(getDetonators);
PREP(getPlacedExplosives);
PREP(getSpeedDialExplosive);
PREP(module);
PREP(onLanded);
PREP(openTimerSetUI);

2
addons/safemode/functions/fnc_firstMode.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
EXPLODE_1_PVT(_this,_weapon);
PARAMS_1(_weapon);
private ["_mode"];
_mode = getArray (configFile >> "CfgWeapons" >> _weapon >> "modes") select 0;

2
addons/safemode/functions/fnc_lockSafety.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
EXPLODE_3_PVT(_this,_unit,_weapon,_muzzle);
PARAMS_3(_unit,_weapon,_muzzle);
// don't immediately switch back
if (inputAction "nextWeapon" > 0) exitWith {};

2
addons/safemode/functions/fnc_playChangeFiremodeSound.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
EXPLODE_2_PVT(_this,_unit,_weapon);
PARAMS_2(_unit,_weapon);
private ["_sound"];
_sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound");

2
addons/safemode/functions/fnc_setSafeModeVisual.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
EXPLODE_1_PVT(_this,_show);
PARAMS_1(_show);
disableSerialization;

2
addons/safemode/functions/fnc_unlockSafety.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
EXPLODE_3_PVT(_this,_unit,_weapon,_muzzle);
PARAMS_3(_unit,_weapon,_muzzle);
private ["_safedWeapons"];
_safedWeapons = _unit getVariable [QGVAR(safedWeapons), []];

6
addons/viewdistance/ACE_Settings.hpp
View File

@ -1,4 +1,10 @@
class ACE_Settings {
class GVAR(enabled) {
typeName = "BOOL";
value = 1;
displayName = "Enable ACE viewdistance";
description = "Enables ACE viewdistance module.";
};
class GVAR(viewDistanceOnFoot) {
typeName = "SCALAR";
isClientSettable = 1;

6
addons/viewdistance/CfgVehicles.hpp
View File

@ -9,6 +9,12 @@ class CfgVehicles {
isGlobal = 1;
//icon = ""; // needs an icon
class Arguments {
class moduleViewDistanceEnabled {
displayName = "Enable ACE viewdistance";
description = "Enables ACE viewdistance";
typeName = "BOOL";
defaultValue = 1;
};
class moduleViewDistanceLimit {
displayName = "View Distance Limit";
description = "Sets the limit for how high clients can raise their view distance (<= 10000)";

10
addons/viewdistance/XEH_postInit.sqf
View File

@ -3,21 +3,21 @@
if (!hasInterface) exitWith {};
// Force the view distance down to the limit.
if (viewDistance > GVAR(limitViewDistance)) then {
if (GVAR(enabled) && {viewDistance > GVAR(limitViewDistance)}) then {
setViewDistance GVAR(limitViewDistance);
};
// Adapt view distance when the player is created or changed according to whether client is on foot or vehicle.
["playerChanged",{
[true] call FUNC(adaptViewDistance);
[false] call FUNC(adaptViewDistance);
}] call ace_common_fnc_addEventHandler;
// Set the EH which waits for any of the view distance settings to be changed, so that the effect is show immediately
["SettingChanged",{
if ((_this select 0 == QGVAR(viewDistanceOnFoot)) ||
{_this select 0 == QGVAR(viewDistanceLandVehicle)} ||
{_this select 0 == QGVAR(viewDistanceAirVehicle)} ||
{_this select 0 == QGVAR(objectViewDistanceCoeff)}) then {
(_this select 0 == QGVAR(viewDistanceLandVehicle)) ||
(_this select 0 == QGVAR(viewDistanceAirVehicle)) ||
(_this select 0 == QGVAR(objectViewDistanceCoeff))) then {
[true] call FUNC(adaptViewDistance);
};

4
addons/viewdistance/functions/fnc_adaptViewDistance.sqf
View File

@ -1,7 +1,7 @@
/*
* Author: Winter
* Sets the player's current view distance according to whether s/he is on foot, in a land vehicle or in an air vehicle.
*
*
*
* Arguments:
* 0: Show Prompt <BOOL>
@ -21,6 +21,8 @@ PARAMS_1(_show_prompt);
private["_land_vehicle","_air_vehicle"];
if (!GVAR(enabled) || isNull ACE_player) exitWith {};
_land_vehicle = (vehicle ACE_player) isKindOf "LandVehicle";
_air_vehicle = (vehicle ACE_player) isKindOf "Air";

38
addons/viewdistance/functions/fnc_changeViewDistance.sqf
View File

@ -1,7 +1,7 @@
/*
* Author: Winter
* Sets the player's current view distance according to allowed values.
*
*
*
* Arguments:
* 0: View Distance setting INDEX <SCALAR>
@ -26,23 +26,21 @@ _new_view_distance = [_index_requested] call FUNC(returnValue); // changes the s
_object_view_distance_coeff = [GVAR(objectViewDistanceCoeff)] call FUNC(returnObjectCoeff); // changes the setting index into a coefficient.
_view_distance_limit = GVAR(limitViewDistance); // Grab the limit
if (_new_view_distance <= _view_distance_limit) then {
if (_show_prompt) then {
_text = parseText format ["<t align='center'>View Distance: %1<br />Object View Distance Coefficient: %2</t>",str(_new_view_distance),str(_object_view_distance_coeff)];
[_text,2] call EFUNC(common,displayTextStructured);
if (_show_prompt) then {
_text = if (_new_view_distance <= _view_distance_limit) then {
format ["<t align='center'>View Distance: %1m",str(_new_view_distance)];
} else {
format ["<t align='center'>That option is invalid! The limit is %1m",str(_view_distance_limit)];
};
if (GVAR(objectViewDistanceCoeff) > 0) then {
_text = _text + format ["<br/><t align='center'>Object View Distance is %1%2</t>",str(_object_view_distance_coeff * 100),"%"];
};
setViewDistance _new_view_distance;
if (_object_view_distance_coeff > 0) then {
setObjectViewDistance (_object_view_distance_coeff * _new_view_distance);
};
}
else {
if (_show_prompt) then {
_text = parseText format ["<t align='center'>That option is invalid! The limit is: %1<br />Object View Distance Coefficient: %2</t>",str(_view_distance_limit),str(_object_view_distance_coeff)];
[_text,2] call EFUNC(common,displayTextStructured);
};
setViewDistance _view_distance_limit;
if (_object_view_distance_coeff > 0) then {
setObjectViewDistance (_object_view_distance_coeff * _view_distance_limit);
};
};
[parseText _text,2] call EFUNC(common,displayTextStructured);
};
setViewDistance (_new_view_distance min _view_distance_limit);
if (_object_view_distance_coeff > 0) then {
setObjectViewDistance (_object_view_distance_coeff * _new_view_distance);
};

5
addons/viewdistance/functions/fnc_initModule.sqf
View File

@ -1,7 +1,7 @@
/*
* Author: Winter
* Initialises the view distance limiter module
*
*
*
* Arguments:
* 0: logic <OBJECT>
@ -10,7 +10,7 @@
*
* Return Value:
* None
*
*
*/
#include "script_component.hpp"
@ -23,6 +23,7 @@ if (!_activated) exitWith {
diag_log text "[ACE]: View Distance Limit Module is placed but NOT active.";
};
[_logic, QGVAR(enabled),"moduleViewDistanceEnabled"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(limitViewDistance),"moduleViewDistanceLimit"] call EFUNC(common,readSettingFromModule);
diag_log format ["[ACE]: View Distance Limit Module Initialized. Limit set by module: %1",GVAR(limitViewDistance)];

5
addons/weaponselect/functions/fnc_displayGrenadeTypeAndNumber.sqf
View File

@ -12,12 +12,9 @@
*/
#include "script_component.hpp"
private ["_magazine", "_numberofMagazines"];
if !(GVAR(DisplayText)) exitwith {};
_magazine = _this select 0;
_numberofMagazines = _this select 1;
PARAMS_2(_magazine,_numberofMagazines);
private ["_color", "_name", "_text", "_picture"];

4
addons/weaponselect/functions/fnc_findNextGrenadeMagazine.sqf
View File

@ -1,9 +1,9 @@
// by commy2
#include "script_component.hpp"
private ["_type", "_allMags", "_allMuzzles", "_magazines"];
private ["_allMags", "_allMuzzles", "_magazines"];
_type = _this select 0; //"All", "Frag" or "NonFrag"
PARAMS_1(_type); //"All", "Frag" or "NonFrag"
_allMags = missionNamespace getVariable [format [QGVAR(%1Magazines), _type], []];
_allMuzzles = missionNamespace getVariable [format [QGVAR(%1Muzzles), _type], []];

4
addons/weaponselect/functions/fnc_findNextGrenadeMuzzle.sqf
View File

@ -1,9 +1,9 @@
// by commy2
#include "script_component.hpp"
private ["_type", "_allMags", "_allMuzzles", "_magazines"];
private ["_allMags", "_allMuzzles", "_magazines"];
_type = _this select 0; //"All", "Frag" or "NonFrag"
PARAMS_1(_type); //"All", "Frag" or "NonFrag"
_allMags = missionNamespace getVariable [format [QGVAR(%1Magazines), _type], []];
_allMuzzles = missionNamespace getVariable [format [QGVAR(%1Muzzles), _type], []];

4
addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
View File

@ -1,9 +1,9 @@
// by commy2
#include "script_component.hpp"
private ["_vehicle", "_turret", "_weapons"];
private ["_turret", "_weapons"];
_vehicle = _this select 0;
PARAMS_1(_vehicle);
_turret = [_vehicle] call EFUNC(common,getTurretCommander);

5
addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
View File

@ -1,10 +1,9 @@
// by commy2
#include "script_component.hpp"
private ["_unit", "_weapon", "_sound"];
private ["_sound"];
_unit = _this select 0;
_weapon = _this select 1;
PARAMS_2(_unit,_weapon);
_sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound");

4
addons/weaponselect/functions/fnc_putWeaponAway.sqf
View File

@ -11,9 +11,7 @@
*/
#include "script_component.hpp"
private "_unit";
_unit = _this select 0;
PARAMS_1(_unit);
[_unit] call EFUNC(common,fixLoweredRifleAnimation);

6
addons/weaponselect/functions/fnc_selectWeaponMode.sqf
View File

@ -11,10 +11,7 @@
*/
#include "script_component.hpp"
private ["_unit", "_weapon"];
_unit = _this select 0;
_weapon = _this select 1;
PARAMS_2(_unit,_weapon);
if (_weapon == "") exitWith {};
@ -32,7 +29,6 @@ private ["_muzzles", "_modes"];
_muzzles = [_weapon] call EFUNC(common,getWeaponMuzzles);
_modes = [_weapon] call EFUNC(common,getWeaponModes);
private ["_index", "_muzzle", "_mode"];
_index = (_modes find currentWeaponMode _unit) + 1;

6
addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
View File

@ -11,10 +11,7 @@
*/
#include "script_component.hpp"
private ["_unit", "_weapon"];
_unit = _this select 0;
_weapon = _this select 1;
PARAMS_2(_unit,_weapon);
if (_weapon == "") exitWith {};
@ -40,7 +37,6 @@ if (_index > count _muzzles - 1) then {_index = 1};
_muzzle = _muzzles select _index;
_index = 0;
while {
_index < 100 && {currentMuzzle _unit != _muzzle}

6
addons/weaponselect/functions/fnc_selectWeaponVehicle.sqf
View File

@ -1,11 +1,7 @@
// by commy2
#include "script_component.hpp"
private ["_unit", "_vehicle", "_index"];
_unit = _this select 0;
_vehicle = _this select 1;
_index = _this select 2;
PARAMS_3(_unit,_vehicle,_index);
private "_turret";
_turret = [_unit] call EFUNC(common,getTurretIndex);

5
addons/weaponselect/functions/fnc_setNextGrenadeMuzzle.sqf
View File

@ -12,10 +12,7 @@
*/
#include "script_component.hpp"
private ["_unit", "_muzzle"];
_unit = _this select 0;
_muzzle = _this select 1;
PARAMS_2(_unit,_muzzle);
private ["_uniformMags", "_vestMags", "_backpackMags", "_i", "_uniformMagsToRemove", "_vestMagsToRemove", "_backpackMagsToRemove", "_firstMagazine", "_throwMuzzleNames"];

2
addons/weaponselect/functions/fnc_throwGrenade.sqf
View File

@ -1,7 +1,7 @@
// by commy2
#include "script_component.hpp"
private ["_unit", "_weapon", "_magazine"];
private ["_unit","_weapon","_magazine"];
_unit = _this select 0;
_weapon = _this select 1;

7
addons/weather/functions/fnc_calculateAirDensity.sqf
View File

@ -16,12 +16,9 @@
*/
#include "script_component.hpp"
private ["_temperature", "_pressure", "_relativeHumidity"];
_temperature = _this select 0; // in C
_pressure = _this select 1; // in hPa
_relativeHumidity = _this select 2; // as ratio 0-1
PARAMS_3(_temperature, _pressure, _relativeHumidity);
_pressure = _pressure * 100;
_pressure = _pressure * 100; // hPa to Pa
if (_relativeHumidity > 0) then {
private ["_pSat", "_vaporPressure", "_partialPressure"];

2
addons/weather/functions/fnc_calculateWindSpeed.sqf
View File

@ -18,7 +18,7 @@
private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"];
EXPLODE_4_PVT(_this,_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled);
PARAMS_4(_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled);
fnc_polar2vect = {
private ["_mag2D"];

1
documentation/development/ace3-config-entries.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: ACE3 Config Entries
description: A list of all ACE3 config entries.
group: development
parent: wiki
order: 2

1
documentation/development/ace3-events-system.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: ACE3 Events System
description: Event handlers in ACE3 are implemented through our event system. They should be used to trigger or allow triggering of specific functionality.
group: development
parent: wiki
order: 3

1
documentation/development/arma-3-issues.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Arma 3 Issues
description: Keeping track of Arma 3 issues that need to be fixed. If you want to support us and help raise Bohemia's awareness of those issues, please upvote them.
group: development
parent: wiki
order: 6

1
documentation/development/arma-3-scheduler-and-our-practices.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Arma 3 Scheduler And Our Practices
description:
group: development
parent: wiki
order: 8

1
documentation/development/coding-guidelines.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Coding Guidelines
description:
group: development
parent: wiki
order: 1

1
documentation/development/extension-guidelines.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Extension Guidelines
description:
group: development
parent: wiki
order: 9

1
documentation/development/how-to-translate-ace3.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: How to translate ACE3
description: This page describes in short how you can help translating ACE3 into your language.
group: development
parent: wiki
order: 20

1
documentation/development/merging-pull-requests.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Merging Pull Requests
description:
group: development
parent: wiki
order: 5

1
documentation/development/modularity-and-pbo-structure.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Modularity And PBO Structure
description:
group: development
parent: wiki
order: 4

1
documentation/development/setting-up-the-development-environment.md
View File

@ -1,6 +1,7 @@
---
layout: wiki
title: Setting Up The Development Environment
description: This page describes how you can setup your development environment for ACE3, allowing you to properly build ACE and utilize file patching.
group: development
parent: wiki
order: 0

Some files were not shown because too many files have changed in this diff Show More