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

port injury parse fnc to medical damage

Browse Source
This commit is contained in:
commy2 2016-09-26 20:25:14 +02:00
parent 8fd7e8335a
commit 9f6baca424
10 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/medical/XEH_PREP.hpp
View File

@ -15,7 +15,6 @@ PREP(isInMedicalVehicle);
PREP(isInStableCondition); PREP(isInStableCondition);
PREP(isMedic); PREP(isMedic);
PREP(isMedicalVehicle); PREP(isMedicalVehicle);
PREP(parseConfigForInjuries);
PREP(selectionNameToNumber); PREP(selectionNameToNumber);
PREP(setHitPointDamage); PREP(setHitPointDamage);
PREP(setStructuralDamage); PREP(setStructuralDamage);

1
addons/medical/XEH_preInit.sqf
View File

@ -7,7 +7,6 @@ ADDON = false;
GVAR(HITPOINTS) = ["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"]; GVAR(HITPOINTS) = ["HitHead", "HitBody", "HitLeftArm", "HitRightArm", "HitLeftLeg", "HitRightLeg"];
GVAR(SELECTIONS) = ["head", "body", "hand_l", "hand_r", "leg_l", "leg_r"]; GVAR(SELECTIONS) = ["head", "body", "hand_l", "hand_r", "leg_l", "leg_r"];
call FUNC(parseConfigForInjuries);
GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call FUNC(createStateMachine); GVAR(STATE_MACHINE) = (configFile >> "ACE_Medical_StateMachine") call FUNC(createStateMachine);
ADDON = true; ADDON = true;

1
addons/medical/config.cpp
View File

@ -15,7 +15,6 @@ class CfgPatches {
}; };
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
#include "ACE_Medical_Injuries.hpp"
#include "ACE_Medical_StateMachine.hpp" #include "ACE_Medical_StateMachine.hpp"
#include "CfgEden.hpp" #include "CfgEden.hpp"

0
addons/medical/ACE_Medical_Injuries.hpp → addons/medical_damage/ACE_Medical_Injuries.hpp
View File

2
addons/medical_damage/XEH_PREP.hpp
View File

@ -2,5 +2,7 @@ PREP(airwayHandler);
PREP(fracturesHandler); PREP(fracturesHandler);
PREP(getTypeOfDamage); PREP(getTypeOfDamage);
PREP(internalInjuriesHandler); PREP(internalInjuriesHandler);
PREP(parseConfigForInjuries);
PREP(woundsHandler); PREP(woundsHandler);
PREP(woundsHandlerSqf); PREP(woundsHandlerSqf);

2
addons/medical_damage/XEH_preInit.sqf
View File

@ -4,6 +4,8 @@ ADDON = false;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
call FUNC(parseConfigForInjuries);
[QEGVAR(medical_engine,woundReceived), { [QEGVAR(medical_engine,woundReceived), {
params ["_unit", "_woundedHitPoint", "_receivedDamage", "", "_ammo"]; params ["_unit", "_woundedHitPoint", "_receivedDamage", "", "_ammo"];

2
addons/medical_damage/config.cpp
View File

@ -14,4 +14,6 @@ class CfgPatches {
}; };
}; };
#include "ACE_Medical_Injuries.hpp"
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"

0
addons/medical/functions/fnc_parseConfigForInjuries.sqf → addons/medical_damage/functions/fnc_parseConfigForInjuries.sqf
View File

6
addons/medical_damage/script_component.hpp
View File

@ -2,9 +2,9 @@
#define COMPONENT_BEAUTIFIED Medical Damage #define COMPONENT_BEAUTIFIED Medical Damage
#include "\z\ace\addons\main\script_mod.hpp" #include "\z\ace\addons\main\script_mod.hpp"
//#define DEBUG_MODE_FULL #define DEBUG_MODE_FULL
//#define DISABLE_COMPILE_CACHE #define DISABLE_COMPILE_CACHE
//#define CBA_DEBUG_SYNCHRONOUS #define CBA_DEBUG_SYNCHRONOUS
#define ENABLE_PERFORMANCE_COUNTERS #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_MEDICAL_DAMAGE #ifdef DEBUG_ENABLED_MEDICAL_DAMAGE

6
addons/medical_engine/script_component.hpp
View File

@ -2,9 +2,9 @@
#define COMPONENT_BEAUTIFIED Medical (Engine) #define COMPONENT_BEAUTIFIED Medical (Engine)
#include "\z\ace\addons\main\script_mod.hpp" #include "\z\ace\addons\main\script_mod.hpp"
#define DEBUG_MODE_FULL //#define DEBUG_MODE_FULL
#define DISABLE_COMPILE_CACHE //#define DISABLE_COMPILE_CACHE
#define CBA_DEBUG_SYNCHRONOUS //#define CBA_DEBUG_SYNCHRONOUS
//#define ENABLE_PERFORMANCE_COUNTERS //#define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_MEDICAL_ENGINE #ifdef DEBUG_ENABLED_MEDICAL_ENGINE