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

Made functions compatible with removed/renamed functions.

Browse Source
This commit is contained in:
Thomas Kooi 2015-01-17 12:07:41 +01:00
parent 45284c7855
commit a77082e4f7
10 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/common/XEH_preInit.sqf
View File

@ -199,11 +199,7 @@ PREP(sendHintTo);
PREP(sendMessageTo);
PREP(sendDisplayInformationTo);
PREP(sendDisplayMessageTo);
PREP(broadcastAnim);
PREP(getDeathAnim);
PREP(switchAnim);
PREP(playMoveNow);
PREP(localAnim);
PREP(insertionSort);
PREP(uniqueElementsOnly);
PREP(sortAlphabeticallyBy);
@ -223,6 +219,7 @@ PREP(setDead);
PREP(isAwake);
PREP(setProne);
PREP(raiseScriptedEvent_f);
PREP(disableUserInput_f);
PREP(dropWeapon_f);
@ -232,7 +229,6 @@ PREP(closeAllDialogs_f);
PREP(disableAI_f);
PREP(moduleBasicRevive);
PREP(switchToGroupSide_f);
PREP(hasItem_f);
PREP(getFirstObjectIntersection);
PREP(getFirstTerrainIntersection);
PREP(setHearingCapability);
@ -255,9 +251,7 @@ PREP(setCaptiveSwitch);
PREP(moveToTempGroup);
PREP(canGoUnconsciousState);
PREP(setWeaponsCorrectUnconscious);
PREP(effectPain);
PREP(effectBleeding);
PREP(effectBlackOut);
PREP(limitMovementSpeed);
PREP(limitSpeed);
PREP(setArrestState);

6
addons/common/functions/fnc_carryObj.sqf
View File

@ -40,7 +40,7 @@ if (((typeName _to) == "OBJECT" && (isNull ([_unit] call FUNC(getCarriedObj))))
[format["fnc_carryObj - UNIT: %1 TO %2 - Script expects external handling of attachTo Command. Exiting",_unit,_to],2] call FUNC(debug);
};
[[_unit, _to, _fallDown],"carryObject"] call FUNC(customEventHandler_F);
[[_unit, _to, _fallDown],"carryObject"] call FUNC(raiseScriptedEvent_f);
};
} else {
@ -59,13 +59,13 @@ if (((typeName _to) == "OBJECT" && (isNull ([_unit] call FUNC(getCarriedObj))))
_positionUnit set [2, ((getPosASL _unit) select 2) + 0.1];
_carriedObj setPosASL _positionUnit;
};
[[_unit, _carriedObj],"carryObjectDropped"] call FUNC(customEventHandler_F);
[[_unit, _carriedObj],"carryObjectDropped"] call FUNC(raiseScriptedEvent_f);
[[_unit] call FUNC(getCarriedObj), objNull] call FUNC(setCarriedBy);
_unit setvariable [QGVAR(carriedObj),_to,true];
_return = true;
[[_unit, _to, _fallDown],"carryObject"] call FUNC(customEventHandler_F);
[[_unit, _to, _fallDown],"carryObject"] call FUNC(raiseScriptedEvent_f);
};
};
} else {

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

@ -37,4 +37,4 @@ GVAR(OBJECT_VARIABLES_STORAGE) pushback [_name,_value,_defaultGlobal,_catagory,_
missionNamespace setvariable ["GVAR(OBJECT_VARIABLES_STORAGE)_" + _name, [_name,_value,_defaultGlobal,_catagory,_code, _persistent]];
[[_name,_value,_defaultGlobal,_catagory,_code, _persistent],"variableDefined"] call FUNC(customEventHandler_F);
[[_name,_value,_defaultGlobal,_catagory,_code, _persistent],"variableDefined"] call FUNC(raiseScriptedEvent_f);

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

@ -30,7 +30,7 @@ if (!([_unit] call FUNC(isAwake))) then {
_vehicle = _this select 1;
waituntil {vehicle _unit == _vehicle};
sleep 0.5;
[_unit,([_unit] call FUNC(getDeathAnim))] call FUNC(broadcastAnim);
[_unit,([_unit] call FUNC(getDeathAnim)), 1] call FUNC(doAnimation);
};
} else {
if ([_unit] call FUNC(isArrested)) then {

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

@ -29,7 +29,7 @@ _unit setvariable [QGVAR(stateUnconscious), nil, true];
if (isPlayer _unit) then {
[true] call FUNC(setVolume_f);
[false] call FUNC(disableKeyInput_f);
[false] call FUNC(effectBlackOut);
[false] call EFUNC(GUI,effectBlackOut);
[player, -1] call FUNC(limitSpeed);
if (isnil QGVAR(DISABLE_USER_INPUT_COLLECTION_F)) then {
GVAR(DISABLE_USER_INPUT_COLLECTION_F) = [];
@ -50,4 +50,4 @@ if ((count _sets) > 0) then {
} else {
["No defaults have been set"] call FUNC(debug);
};
[[_unit],"resetToDefaults"] call FUNC(customEventHandler_F);
[[_unit],"resetToDefaults"] call FUNC(raiseScriptedEvent_f);

6
addons/common/functions/fnc_setArrestState.sqf
View File

@ -19,7 +19,7 @@ if (_setArrest) then {
if ([_unit] call FUNC(isAwake)) then {
if (vehicle _unit == _unit) then {
[_unit,"UnaErcPoslechVelitele2",true] call FUNC(broadcastAnim);
[_unit,"UnaErcPoslechVelitele2",1] call FUNC(doAnimation);
};
};
if (IsPlayer _unit) then {
@ -32,7 +32,7 @@ if (_setArrest) then {
if ([_unit] call FUNC(isAwake)) then {
if (vehicle _unit == _unit) then {
[_unit,"",true] call FUNC(broadcastAnim);
[_unit,"",1] call FUNC(doAnimation);
};
_unit enableAI "Move";
_unit enableAI "ANIM";
@ -42,4 +42,4 @@ if (_setArrest) then {
};
};
[[_unit, _setArrest],"setArrestState"] call FUNC(customEventHandler_F);
[[_unit, _setArrest],"setArrestState"] call FUNC(raiseScriptedEvent_f);

6
addons/common/functions/fnc_setDead.sqf
View File

@ -70,7 +70,7 @@ if (((GVAR(ENABLE_REVIVE_F) == 1 && isPlayer _unit) || (GVAR(ENABLE_REVIVE_F) ==
[_unit,QGVAR(isDeadPlayer),true,true] call FUNC(setDefinedVariable);
};
_unit setdamage 1;
[[_unit, true],"killed"] call FUNC(customEventHandler_F);
[[_unit, true],"killed"] call FUNC(raiseScriptedEvent_f);
};
sleep 1;
_unit setvariable [QGVAR(ENABLE_REVIVE_COUNTER),_counter + 1];
@ -84,7 +84,7 @@ if (((GVAR(ENABLE_REVIVE_F) == 1 && isPlayer _unit) || (GVAR(ENABLE_REVIVE_F) ==
};
[_unit,QGVAR(isDead),true,true] call FUNC(setDefinedVariable);
_unit setdamage 1;
[[_unit, false],"killed"] call FUNC(customEventHandler_F);
[[_unit, false],"killed"] call FUNC(raiseScriptedEvent_f);
};
};
} else {
@ -98,5 +98,5 @@ if (((GVAR(ENABLE_REVIVE_F) == 1 && isPlayer _unit) || (GVAR(ENABLE_REVIVE_F) ==
_unit setdamage 1;
[_unit,QGVAR(isDead),true,true] call FUNC(setDefinedVariable);
[[_unit, false],"killed"] call FUNC(customEventHandler_F);
[[_unit, false],"killed"] call FUNC(raiseScriptedEvent_f);
};

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

@ -45,4 +45,4 @@ if (_setVolume) then {
};
[[_setVolume],"setVolume"] call FUNC(customEventHandler_F);
[[_setVolume],"setVolume"] call FUNC(raiseScriptedEvent_f);

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

@ -63,4 +63,4 @@ if (_switch) then {
_unit setvariable [QGVAR(previousGroupSwitchTo_F), _previousGroupsList, true];
};
[[_unit, _switch, _id, _side],"switchToGroupSide"] call FUNC(customEventHandler_F);
[[_unit, _switch, _id, _side],"switchToGroupSide"] call FUNC(raiseScriptedEvent_f);

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

@ -39,7 +39,7 @@ if (!([_unit] call FUNC(isAwake))) then {
_unit = _this select 0;
_vehicle = _this select 1;
waituntil {vehicle _unit != _vehicle};
[_unit,([_unit] call FUNC(getDeathAnim))] call FUNC(broadcastAnim);
[_unit,([_unit] call FUNC(getDeathAnim)), 1, true] call FUNC(doAnimation);
[format["Unit should move into death anim: %1", _unit]] call FUNC(debug);
};
} else {
@ -48,7 +48,7 @@ if (!([_unit] call FUNC(isAwake))) then {
_unit = _this select 0;
_vehicle = _this select 1;
waituntil {vehicle _unit != _vehicle};
[_unit,"UnaErcPoslechVelitele2",true] call FUNC(broadcastAnim);
[_unit,"UnaErcPoslechVelitele2", 1] call FUNC(doAnimation);
[format["Unit should move into arrested anim: %1", _unit]] call FUNC(debug);
};
} else {