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

Fix patient information display

Browse Source
This commit is contained in:
SilentSpike 2018-05-08 14:45:24 +01:00
parent 4303a340de
commit 33a5fb46f5
8 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/medical/XEH_PREP.hpp
View File

@ -5,7 +5,6 @@ PREP(bodyCleanupLoop);
PREP(conditionCardiacArrestTimer);
PREP(conditionExecutionDeath);
PREP(dev_watchMedicalStats);
PREP(displayPatientInformation);
PREP(displayTriageCard);
PREP(getUnitState);
PREP(handleIncapacitation);
@ -14,8 +13,8 @@ PREP(handleKilled);
PREP(handleLocal);
PREP(handleRespawn);
PREP(install);
PREP(moduleAssignMedicRoles);
PREP(moduleAssignMedicalVehicle);
PREP(moduleAssignMedicRoles);
PREP(moduleMedicalSettings);
PREP(serverRemoveBody);
PREP(setUnconsciousStatemachine);

2
addons/medical/XEH_postInit.sqf
View File

@ -1,8 +1,6 @@
#define DEBUG_MODE_FULL
#include "script_component.hpp"
["ace_interactMenuClosed", {[objNull, 0] call FUNC(displayPatientInformation);}] call CBA_fnc_addEventHandler;
//Handle Deleting Bodies and creating litter on Server:
if (isServer) then {
["ace_placedInBodyBag", FUNC(serverRemoveBody)] call CBA_fnc_addEventHandler;

2
addons/medical/functions/fnc_dev_watchMedicalStats.sqf
View File

@ -18,7 +18,7 @@
["medical", {
// Hide when patient display is up because they might overlap
if (!isNull EGVAR(medical,displayPatientInformationTarget)) exitWith {""};
if (!isNull EGVAR(medical_gui,displayPatientInformationTarget)) exitWith {""};
private _unit = cursorTarget;
if (!(_unit isKindOf "CAManBase")) then {_unit = cursorObject};

4
addons/medical_gui/CfgVehicles.hpp
View File

@ -48,7 +48,7 @@ class CfgVehicles {
displayName = ECSTRING(medical,Actions_Medical);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target,1,0)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,0)] call FUNC(displayPatientInformation));
condition = "true";
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
#define ACTION_CONDITION condition = "true";
@ -83,7 +83,7 @@ class CfgVehicles {
displayName = ECSTRING(medical,Actions_Medical);
runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target,1,0)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,0)] call FUNC(displayPatientInformation));
condition = QUOTE(((vehicle _target != _target && vehicle _target == vehicle _player) || {EGVAR(medical,menuTypeStyle) == 1}));
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
#define ACTION_CONDITION condition = "true";

12
addons/medical_gui/InteractionBodyParts.hpp
View File

@ -4,7 +4,7 @@ class ACE_Head {
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
ACTION_CONDITION
statement = QUOTE([ARR_3(_target,1,0)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,0)] call FUNC(displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,0,_this select 3)] call FUNC(modifyAction));
runOnHover = 1;
};
@ -14,7 +14,7 @@ class ACE_Torso {
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
ACTION_CONDITION
statement = QUOTE([ARR_3(_target,1,1)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,1)] call FUNC(displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,1,_this select 3)] call FUNC(modifyAction));
runOnHover = 1;
};
@ -24,7 +24,7 @@ class ACE_ArmLeft {
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
ACTION_CONDITION
statement = QUOTE([ARR_3(_target,1,2)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,2)] call FUNC(displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,2,_this select 3)] call FUNC(modifyAction));
runOnHover = 1;
};
@ -34,7 +34,7 @@ class ACE_ArmRight {
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
ACTION_CONDITION
statement = QUOTE([ARR_3(_target,1,3)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,3)] call FUNC(displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,3,_this select 3)] call FUNC(modifyAction));
runOnHover = 1;
};
@ -44,7 +44,7 @@ class ACE_LegLeft {
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
ACTION_CONDITION
statement = QUOTE([ARR_3(_target,1,4)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,4)] call FUNC(displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,4,_this select 3)] call FUNC(modifyAction));
runOnHover = 1;
};
@ -54,7 +54,7 @@ class ACE_LegRight {
icon = QPATHTOF(ui\ui\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"};
ACTION_CONDITION
statement = QUOTE([ARR_3(_target,1,5)] call EFUNC(medical,displayPatientInformation));
statement = QUOTE([ARR_3(_target,1,5)] call FUNC(displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,5,_this select 3)] call FUNC(modifyAction));
runOnHover = 1;
};

9
addons/medical_gui/XEH_PREP.hpp
View File

@ -1,14 +1,15 @@
PREP(canOpenMenu);
PREP(openMenu);
PREP(onMenuOpen);
PREP(onMenuClose);
PREP(collectActions);
PREP(collectActions3D);
PREP(modifyAction);
PREP(displayPatientInformation);
PREP(getTreatmentOptions);
PREP(handleUI_DisplayOptions);
PREP(handleUI_dropDownTriageCard);
PREP(modifyAction);
PREP(module);
PREP(onMenuClose);
PREP(onMenuOpen);
PREP(openMenu);
PREP(setTriageStatus);
PREP(updateActivityLog);
PREP(updateBodyImage);

4
addons/medical_gui/XEH_postInit.sqf
View File

@ -34,3 +34,7 @@ GVAR(pendingReopen) = false;
};
false
}, [35, [false, false, false]], false, 0] call CBA_fnc_addKeybind;
// Close patient information when interact menu is closed
["ace_interactMenuClosed", {[objNull, 0] call FUNC(displayPatientInformation);}] call CBA_fnc_addEventHandler;

0
addons/medical/functions/fnc_displayPatientInformation.sqf → addons/medical_gui/functions/fnc_displayPatientInformation.sqf
View File