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' of https://github.com/KoffeinFlummi/ACE3 into repair

Browse Source
This commit is contained in:
commy2 2015-03-11 20:29:03 +01:00
commit 1c90e2bb33
6 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/interact_menu/functions/fnc_addClassAction.sqf
View File

@ -27,6 +27,13 @@
EXPLODE_9_PVT(_this,_objectType,_typeNum,_fullPath,_displayName,_icon,_position,_statement,_condition,_distance); EXPLODE_9_PVT(_this,_objectType,_typeNum,_fullPath,_displayName,_icon,_position,_statement,_condition,_distance);
// Ensure the config menu was compiled first
if (_typeNum == 0) then {
[_objectType] call FUNC(compileMenu);
} else {
[_objectType] call FUNC(compileMenuSelfAction);
};
private ["_varName","_actions","_params","_entry", "_parentLevel", "_foundParentLevel", "_fnc_findFolder"]; private ["_varName","_actions","_params","_entry", "_parentLevel", "_foundParentLevel", "_fnc_findFolder"];
_varName = format [[QGVAR(Act_%1), QGVAR(SelfAct_%1)] select _typeNum, _objectType]; _varName = format [[QGVAR(Act_%1), QGVAR(SelfAct_%1)] select _typeNum, _objectType];

9
addons/interact_menu/functions/fnc_compileMenu.sqf
View File

@ -3,7 +3,7 @@
* Compile the action menu from config for an object's class * Compile the action menu from config for an object's class
* *
* Argument: * Argument:
* 0: Object <OBJECT> * 0: Object or class name <OBJECT> or <STRING>
* *
* Return value: * Return value:
* None * None
@ -12,10 +12,13 @@
*/ */
#include "script_component.hpp"; #include "script_component.hpp";
EXPLODE_1_PVT(_this,_object); EXPLODE_1_PVT(_this,_target);
private ["_objectType","_actionsVarName"]; private ["_objectType","_actionsVarName"];
_objectType = typeOf _object; _objectType = _target;
if (typeName _target == "OBJECT") then {
_objectType = typeOf _target;
};
_actionsVarName = format [QGVAR(Act_%1), _objectType]; _actionsVarName = format [QGVAR(Act_%1), _objectType];
// Exit if the action menu is already compiled for this class // Exit if the action menu is already compiled for this class

9
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
View File

@ -3,7 +3,7 @@
* Compile the self action menu from config for an object's class * Compile the self action menu from config for an object's class
* *
* Argument: * Argument:
* 0: Object <OBJECT> * 0: Object or class name <OBJECT> or <STRING>
* *
* Return value: * Return value:
* None * None
@ -12,10 +12,13 @@
*/ */
#include "script_component.hpp"; #include "script_component.hpp";
EXPLODE_1_PVT(_this,_object); EXPLODE_1_PVT(_this,_target);
private ["_objectType","_actionsVarName"]; private ["_objectType","_actionsVarName"];
_objectType = typeOf _object; _objectType = _target;
if (typeName _target == "OBJECT") then {
_objectType = typeOf _target;
};
_actionsVarName = format [QGVAR(SelfAct_%1), _objectType]; _actionsVarName = format [QGVAR(SelfAct_%1), _objectType];
// Exit if the action menu is already compiled for this class // Exit if the action menu is already compiled for this class

2
addons/interact_menu/functions/fnc_keyUp.sqf
View File

@ -21,7 +21,7 @@ if(GVAR(actionSelected)) then {
if (GVAR(keyDown)) then { if (GVAR(keyDown)) then {
GVAR(keyDown) = false; GVAR(keyDown) = false;
["interactMenuClosed", [0]] call FUNC(localEvent); ["interactMenuClosed", [0]] call EFUNC(common,localEvent);
}; };
GVAR(expanded) = false; GVAR(expanded) = false;

2
addons/interact_menu/functions/fnc_keyUpSelfAction.sqf
View File

@ -25,7 +25,7 @@ if(GVAR(actionSelected)) then {
if (GVAR(keyDownSelfAction)) then { if (GVAR(keyDownSelfAction)) then {
GVAR(keyDownSelfAction) = false; GVAR(keyDownSelfAction) = false;
["interactMenuClosed", [1]] call FUNC(localEvent); ["interactMenuClosed", [1]] call EFUNC(common,localEvent);
}; };
GVAR(expanded) = false; GVAR(expanded) = false;

2
addons/medical/ACE_Medical_Treatments.hpp
View File

@ -192,7 +192,7 @@ class ACE_Medical_Actions {
treatmentLocations[] = {"All"}; treatmentLocations[] = {"All"};
requiredMedic = 0; requiredMedic = 0;
treatmentTime = 7.5; treatmentTime = 7.5;
items[] = {QVAR(bodyBag)}; items[] = {QGVAR(bodyBag)};
condition = "!alive (_this select 1);"; condition = "!alive (_this select 1);";
callbackSuccess = QUOTE(DFUNC(actionPlaceInBodyBag)); callbackSuccess = QUOTE(DFUNC(actionPlaceInBodyBag));
callbackFailure = ""; callbackFailure = "";