From dc680d692b8871a8d825360531683fc7215ffc6d Mon Sep 17 00:00:00 2001 From: MiszczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com> Date: Wed, 15 Nov 2023 22:33:02 +0100 Subject: [PATCH] HEMTT - Fix warnings regarding macro redefinition (#434) **When merged this pull request will:** - Title ### IMPORTANT - [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`. --------- Co-authored-by: Blue --- .../airway/ACE_Medical_Treatment_Actions.hpp | 14 +- addons/airway/CfgEventHandlers.hpp | 2 +- addons/airway/functions/fnc_checkAirway.sqf | 2 +- addons/airway/functions/fnc_checkRecovery.sqf | 2 +- addons/airway/functions/fnc_handleAirway.sqf | 2 +- addons/airway/functions/fnc_handlePuking.sqf | 4 +- addons/airway/functions/fnc_init.sqf | 4 +- .../airway/functions/fnc_startHeadTurning.sqf | 10 +- .../fnc_treatmentAdvanced_Accuvac.sqf | 2 +- .../fnc_treatmentAdvanced_AccuvacLocal.sqf | 2 +- .../fnc_treatmentAdvanced_AccuvacStart.sqf | 6 +- ...eatmentAdvanced_CancelRecoveryPosition.sqf | 4 +- ...ntAdvanced_CancelRecoveryPositionLocal.sqf | 2 +- ...fnc_treatmentAdvanced_RecoveryPosition.sqf | 4 +- ...reatmentAdvanced_RecoveryPositionLocal.sqf | 8 +- ...fnc_treatmentAdvanced_RemoveAirwayItem.sqf | 2 +- ...reatmentAdvanced_RemoveAirwayItemLocal.sqf | 6 +- .../fnc_treatmentAdvanced_airway.sqf | 2 +- .../fnc_treatmentAdvanced_airwayLocal.sqf | 2 +- .../fnc_treatmentAdvanced_overstretchHead.sqf | 2 +- addons/airway/functions/script_component.hpp | 1 - addons/airway/script_component.hpp | 59 --- .../ACE_Medical_Treatment_Actions.hpp | 30 +- addons/breathing/CfgEventHandlers.hpp | 2 +- addons/breathing/CfgVehicles.hpp | 30 +- addons/breathing/functions/fnc_canUseBVM.sqf | 6 +- .../functions/fnc_checkBreathing.sqf | 4 +- .../functions/fnc_checkPulseOximeter.sqf | 4 +- .../functions/fnc_handleBreathing.sqf | 10 +- .../functions/fnc_handlePulmoHit.sqf | 12 +- addons/breathing/functions/fnc_hasBVM.sqf | 6 +- .../breathing/functions/fnc_hasOxygenTank.sqf | 6 +- addons/breathing/functions/fnc_init.sqf | 2 +- .../breathing/functions/fnc_inspectChest.sqf | 4 +- .../breathing/functions/fnc_listenLungs.sqf | 10 +- addons/breathing/functions/fnc_lowSpO2pp.sqf | 20 +- .../functions/fnc_refillOxygenTank.sqf | 12 +- .../fnc_treatmentAdvanced_chestSeal.sqf | 2 +- .../fnc_treatmentAdvanced_chestSealLocal.sqf | 4 +- ...fnc_treatmentAdvanced_hemopneumothorax.sqf | 2 +- ...reatmentAdvanced_hemopneumothoraxLocal.sqf | 4 +- .../fnc_treatmentAdvanced_pulseoximeter.sqf | 4 +- ...c_treatmentAdvanced_pulseoximeterLocal.sqf | 2 +- ..._treatmentAdvanced_removePulseoximeter.sqf | 2 +- ..._treatmentAdvanced_tensionpneumothorax.sqf | 2 +- ...tmentAdvanced_tensionpneumothoraxLocal.sqf | 4 +- addons/breathing/functions/fnc_useBVM.sqf | 12 +- .../breathing/functions/script_component.hpp | 1 - addons/breathing/script_component.hpp | 3 +- .../ACE_Medical_Treatment_Actions.hpp | 6 +- addons/chemical/CfgEventHandlers.hpp | 2 +- addons/chemical/CfgVehicles.hpp | 18 +- .../functions/fnc_AttributeRadius.sqf | 8 +- .../chemical/functions/fnc_CASCreateGas.sqf | 4 +- .../chemical/functions/fnc_GasTripEffect.sqf | 4 +- .../chemical/functions/fnc_addLoadAction.sqf | 4 +- addons/chemical/functions/fnc_afterWait.sqf | 6 +- addons/chemical/functions/fnc_breathing.sqf | 4 +- .../chemical/functions/fnc_canPutGasMask.sqf | 6 +- .../functions/fnc_canReplaceFilter.sqf | 6 +- .../functions/fnc_changeGasMaskFilter.sqf | 4 +- .../functions/fnc_checkGasMaskDur.sqf | 6 +- .../chemical/functions/fnc_chemDetector.sqf | 14 +- .../fnc_clearChemicalInjuriesLocal.sqf | 4 +- addons/chemical/functions/fnc_coughing.sqf | 6 +- .../functions/fnc_createSealAction.sqf | 6 +- addons/chemical/functions/fnc_createZone.sqf | 8 +- .../functions/fnc_csGrenadeThrownFuze.sqf | 6 +- .../functions/fnc_displayGasMaskDur.sqf | 6 +- addons/chemical/functions/fnc_gasAI.sqf | 6 +- addons/chemical/functions/fnc_gasCheck.sqf | 10 +- .../chemical/functions/fnc_gasCheckLocal.sqf | 16 +- addons/chemical/functions/fnc_gasmodule.sqf | 4 +- .../functions/fnc_getChemDetectorState.sqf | 6 +- addons/chemical/functions/fnc_getList.sqf | 4 +- .../functions/fnc_giveUnitGasMask.sqf | 2 +- addons/chemical/functions/fnc_handleCSGas.sqf | 18 +- addons/chemical/functions/fnc_handleFired.sqf | 8 +- .../functions/fnc_handleGasMaskDur.sqf | 10 +- .../chemical/functions/fnc_hasGasMaskON.sqf | 4 +- addons/chemical/functions/fnc_hasGasmask.sqf | 6 +- addons/chemical/functions/fnc_init.sqf | 2 +- addons/chemical/functions/fnc_initModule.sqf | 6 +- addons/chemical/functions/fnc_spawnSmoke.sqf | 8 +- .../chemical/functions/fnc_throwGrenade.sqf | 2 +- .../chemical/functions/fnc_ui_gasModule.sqf | 12 +- .../chemical/functions/script_component.hpp | 1 - addons/chemical/script_component.hpp | 143 +------ addons/chemical/ui/RscAttributes.hpp | 4 +- .../ACE_Medical_Treatment_Actions.hpp | 76 ++-- addons/circulation/CfgEventHandlers.hpp | 2 +- addons/circulation/CfgVehicles.hpp | 86 ++--- addons/circulation/defines.hpp | 18 +- .../fnc_AEDXPlaced_CheckCondition.sqf | 4 +- ...fnc_AEDXPlaced_VitalsMonitor_SetVolume.sqf | 4 +- .../fnc_AEDX_ConnectVitalsMonitor.sqf | 10 +- .../fnc_AEDX_DisconnectVitalsMonitor.sqf | 2 +- .../functions/fnc_AEDX_ViewMonitor.sqf | 32 +- .../fnc_AEDX_ViewMonitor_AnalyzeFeedback.sqf | 6 +- .../fnc_AEDX_ViewMonitor_Charging.sqf | 28 +- .../fnc_AEDX_ViewMonitor_Condition.sqf | 4 +- .../functions/fnc_AEDX_VitalsMonitor.sqf | 12 +- .../fnc_AEDX_VitalsMonitor_CheckCondition.sqf | 2 +- .../circulation/functions/fnc_AED_Analyze.sqf | 8 +- .../circulation/functions/fnc_AED_Charge.sqf | 8 +- .../circulation/functions/fnc_AED_Shock.sqf | 2 +- addons/circulation/functions/fnc_CPRStart.sqf | 18 +- .../fnc_Defibrillator_AttachPads.sqf | 8 +- .../fnc_Defibrillator_CheckCondition.sqf | 4 +- .../fnc_Defibrillator_ManualCharge.sqf | 6 +- .../fnc_Defibrillator_Pads_CheckCondition.sqf | 4 +- .../fnc_Defibrillator_RemovePads.sqf | 4 +- .../functions/fnc_addDefibrillatorActions.sqf | 4 +- .../circulation/functions/fnc_bloodType.sqf | 2 +- addons/circulation/functions/fnc_canDraw.sqf | 4 +- .../circulation/functions/fnc_compatible.sqf | 4 +- addons/circulation/functions/fnc_cprLocal.sqf | 8 +- .../circulation/functions/fnc_cprSuccess.sqf | 4 +- .../circulation/functions/fnc_drawBlood.sqf | 2 +- .../functions/fnc_generateBloodType.sqf | 12 +- .../functions/fnc_getBloodPressure.sqf | 4 +- .../fnc_getCardiacArrestHeartRate.sqf | 6 +- .../functions/fnc_handleCardiacArrest.sqf | 6 +- .../functions/fnc_handleTreatment.sqf | 2 +- addons/circulation/functions/fnc_init.sqf | 4 +- .../functions/fnc_measureBloodPressure.sqf | 4 +- .../functions/fnc_onCloseDialog.sqf | 2 +- addons/circulation/functions/fnc_placeAED.sqf | 20 +- .../circulation/functions/fnc_removeLog.sqf | 2 +- .../functions/fnc_treatmentAdvanced_IV.sqf | 2 +- .../fnc_updateBloodPressureChange.sqf | 4 +- .../functions/fnc_updateHeartRate.sqf | 2 +- .../functions/fnc_updateInternalBleeding.sqf | 4 +- .../functions/fnc_wrongBloodTreatment.sqf | 2 +- .../functions/script_component.hpp | 1 - addons/circulation/script_component.hpp | 22 -- addons/circulation/ui/AEDX_Monitor_Dialog.hpp | 348 +++++++++--------- addons/circulation/ui/CrossPanel_Dialog.hpp | 2 +- .../fnc_displayPatientInformation.sqf | 2 +- addons/gui/functions/fnc_menuPFH.sqf | 2 +- addons/gui/functions/fnc_onMenuClose.sqf | 4 +- addons/gui/functions/fnc_onMenuOpen.sqf | 4 +- addons/gui/functions/fnc_updateActions.sqf | 4 +- addons/gui/functions/fnc_updateBodyImage.sqf | 4 +- addons/gui/functions/fnc_updateCategories.sqf | 2 +- addons/gui/functions/fnc_updateInjuryList.sqf | 8 +- addons/gui/functions/fnc_updateLogList.sqf | 4 +- addons/gui/functions/script_component.hpp | 1 - addons/gui/gui.hpp | 1 - addons/gui/script_component.hpp | 9 +- addons/main/script_macros.hpp | 52 ++- addons/misc/ACE_Medical_Treatment_Actions.hpp | 12 +- addons/misc/CfgEventHandlers.hpp | 10 +- addons/misc/CfgMoves.hpp | 2 +- addons/misc/CfgVehicles.hpp | 106 +++--- addons/misc/functions/fnc_BubbleWrap.sqf | 4 +- addons/misc/functions/fnc_actionLowerBy10.sqf | 2 +- addons/misc/functions/fnc_addActionRaise.sqf | 2 +- addons/misc/functions/fnc_addIVbag.sqf | 2 +- .../functions/fnc_addPassengersActions.sqf | 2 +- .../fnc_addVehicleCarryLoadActions.sqf | 10 +- ...nc_addVehicleUnloadCarryPatientActions.sqf | 4 +- addons/misc/functions/fnc_attachStretcher.sqf | 2 +- addons/misc/functions/fnc_canCheckDogtag.sqf | 2 +- addons/misc/functions/fnc_canTreat.sqf | 2 +- addons/misc/functions/fnc_carryObject.sqf | 4 +- .../functions/fnc_checkArmbandCondition.sqf | 16 +- .../functions/fnc_conditionExecutionDeath.sqf | 4 +- addons/misc/functions/fnc_conditionIV.sqf | 2 +- .../misc/functions/fnc_conditionIVstand.sqf | 2 +- .../functions/fnc_conditionSecondChance.sqf | 4 +- addons/misc/functions/fnc_fullHealLocal.sqf | 8 +- addons/misc/functions/fnc_getDogtagData.sqf | 2 +- addons/misc/functions/fnc_getUniqueItems.sqf | 4 +- addons/misc/functions/fnc_groupID.sqf | 2 +- addons/misc/functions/fnc_handleRespawn.sqf | 8 +- .../misc/functions/fnc_handleUnconscious.sqf | 2 +- addons/misc/functions/fnc_hasItem.sqf | 4 +- addons/misc/functions/fnc_hasStableVitals.sqf | 2 +- addons/misc/functions/fnc_headTourniquet.sqf | 2 +- .../functions/fnc_headTourniquetLocal.sqf | 2 +- .../functions/fnc_heliAddActionDeploy.sqf | 2 +- .../functions/fnc_heliStretcherAttach.sqf | 2 +- .../functions/fnc_incompatibilityWarning.sqf | 4 +- addons/misc/functions/fnc_init.sqf | 4 +- addons/misc/functions/fnc_removeIVbag.sqf | 2 +- .../functions/fnc_removeItemFromVehicle.sqf | 4 +- addons/misc/functions/fnc_setUnconscious.sqf | 2 +- addons/misc/functions/fnc_slingArmband.sqf | 38 +- .../misc/functions/fnc_stopCarryingPrompt.sqf | 6 +- addons/misc/functions/fnc_stretcher.sqf | 2 +- addons/misc/functions/fnc_stringToArray.sqf | 4 +- addons/misc/functions/fnc_treatment.sqf | 4 +- addons/misc/functions/fnc_treatmentIV.sqf | 2 +- .../misc/functions/fnc_treatmentSuccess.sqf | 2 +- addons/misc/functions/fnc_unSlingArmband.sqf | 8 +- .../functions/fnc_unloadAndCarryPatient.sqf | 4 +- addons/misc/functions/fnc_useItem.sqf | 4 +- addons/misc/functions/script_component.hpp | 1 - addons/misc/script_component.hpp | 3 +- .../pharma/ACE_Medical_Treatment_Actions.hpp | 15 +- addons/pharma/CfgEventHandlers.hpp | 2 +- addons/pharma/functions/fnc_alphaAction.sqf | 2 +- addons/pharma/functions/fnc_applyIV.sqf | 4 +- addons/pharma/functions/fnc_checkIV.sqf | 2 +- addons/pharma/functions/fnc_fluid.sqf | 4 +- addons/pharma/functions/fnc_fluidLocal.sqf | 4 +- addons/pharma/functions/fnc_getBloodLoss.sqf | 4 +- .../functions/fnc_getBloodVolumeChange.sqf | 4 +- addons/pharma/functions/fnc_init.sqf | 2 +- .../pharma/functions/fnc_inspectCatheter.sqf | 2 +- addons/pharma/functions/fnc_medication.sqf | 4 +- .../pharma/functions/fnc_medicationLocal.sqf | 6 +- addons/pharma/functions/fnc_pervitinPP.sqf | 16 +- addons/pharma/functions/fnc_removeIV.sqf | 2 +- .../functions/fnc_removeItemfromMag.sqf | 2 +- addons/pharma/functions/fnc_retrieveIV.sqf | 2 +- addons/pharma/functions/fnc_salineCheck.sqf | 2 +- .../pharma/functions/fnc_tourniquetRemove.sqf | 4 +- .../fnc_treatmentAdvanced_AmiodaroneLocal.sqf | 4 +- .../fnc_treatmentAdvanced_AtropineLocal.sqf | 6 +- .../fnc_treatmentAdvanced_Caffeine.sqf | 4 +- .../fnc_treatmentAdvanced_CaffeineLocal.sqf | 8 +- .../fnc_treatmentAdvanced_Carbonate.sqf | 4 +- .../fnc_treatmentAdvanced_CarbonateLocal.sqf | 4 +- .../fnc_treatmentAdvanced_Dialysis.sqf | 2 +- .../fnc_treatmentAdvanced_DialysisLocal.sqf | 4 +- .../fnc_treatmentAdvanced_EACALocal.sqf | 2 +- .../fnc_treatmentAdvanced_FentanylLocal.sqf | 2 +- .../fnc_treatmentAdvanced_FlumazenilLocal.sqf | 4 +- .../functions/fnc_treatmentAdvanced_Flush.sqf | 2 +- .../fnc_treatmentAdvanced_FlushLocal.sqf | 4 +- .../fnc_treatmentAdvanced_KetamineLocal.sqf | 2 +- .../fnc_treatmentAdvanced_LorazepamLocal.sqf | 4 +- .../fnc_treatmentAdvanced_Naloxone.sqf | 4 +- .../fnc_treatmentAdvanced_NaloxoneLocal.sqf | 4 +- .../fnc_treatmentAdvanced_Painkillers.sqf | 4 +- .../fnc_treatmentAdvanced_Penthrox.sqf | 4 +- .../fnc_treatmentAdvanced_Pervitin.sqf | 4 +- .../fnc_treatmentAdvanced_PervitinLocal.sqf | 14 +- .../fnc_treatmentAdvanced_Reorientation.sqf | 4 +- ...c_treatmentAdvanced_ReorientationLocal.sqf | 4 +- .../fnc_treatmentAdvanced_TXALocal.sqf | 2 +- .../functions/fnc_vehicleCheckDialysis.sqf | 2 +- addons/pharma/functions/script_component.hpp | 1 - addons/pharma/script_component.hpp | 1 - addons/pharma/ui/CrossPanel_Dialog.hpp | 2 +- .../surgery/ACE_Medical_Treatment_Actions.hpp | 20 +- addons/surgery/CfgEventHandlers.hpp | 2 +- addons/surgery/functions/fnc_canNPWT.sqf | 2 +- .../surgery/functions/fnc_closedReduction.sqf | 2 +- .../functions/fnc_closedReductionLocal.sqf | 2 +- .../surgery/functions/fnc_fractureCheck.sqf | 2 +- .../surgery/functions/fnc_fractureSelect.sqf | 2 +- .../functions/fnc_fractureSelectLocal.sqf | 4 +- addons/surgery/functions/fnc_getNPWTTime.sqf | 2 +- addons/surgery/functions/fnc_incision.sqf | 4 +- .../surgery/functions/fnc_incisionLocal.sqf | 12 +- addons/surgery/functions/fnc_init.sqf | 2 +- .../functions/fnc_npwtTreatmentProgress.sqf | 2 +- .../surgery/functions/fnc_openReduction.sqf | 2 +- .../functions/fnc_openReductionCheck.sqf | 2 +- .../functions/fnc_openReductionLocal.sqf | 4 +- .../functions/fnc_openReductionProgress.sqf | 2 +- .../fnc_openReductionProgressLocal.sqf | 2 +- addons/surgery/functions/script_component.hpp | 3 - addons/surgery/script_component.hpp | 1 - addons/zeus/XEH_preInit.sqf | 2 - addons/zeus/functions/fnc_openMedicalMenu.sqf | 4 +- addons/zeus/functions/fnc_showMessage.sqf | 2 +- .../functions/fnc_toggleAIDeathModule.sqf | 4 +- .../zeus/functions/fnc_ui_changeBloodType.sqf | 6 +- .../functions/fnc_ui_changeCardiacState.sqf | 4 +- addons/zeus/functions/fnc_ui_manageAirway.sqf | 8 +- addons/zeus/functions/fnc_zeusAttributes.sqf | 2 +- addons/zeus/functions/script_component.hpp | 1 - addons/zeus/script_component.hpp | 49 --- addons/zeus/ui/RscAttributes.hpp | 12 +- .../UI/Displays/RscDisplayAttributes.sqf | 2 +- .../z/ace/addons/medical_engine/$PBOPREFIX$ | 1 + 280 files changed, 1039 insertions(+), 1313 deletions(-) delete mode 100644 addons/airway/functions/script_component.hpp delete mode 100644 addons/breathing/functions/script_component.hpp delete mode 100644 addons/chemical/functions/script_component.hpp delete mode 100644 addons/circulation/functions/script_component.hpp delete mode 100644 addons/gui/functions/script_component.hpp delete mode 100644 addons/misc/functions/script_component.hpp delete mode 100644 addons/pharma/functions/script_component.hpp delete mode 100644 addons/surgery/functions/script_component.hpp delete mode 100644 addons/zeus/functions/script_component.hpp create mode 100644 include/z/ace/addons/medical_engine/$PBOPREFIX$ diff --git a/addons/airway/ACE_Medical_Treatment_Actions.hpp b/addons/airway/ACE_Medical_Treatment_Actions.hpp index a5cee1d9f..2a9229aa5 100644 --- a/addons/airway/ACE_Medical_Treatment_Actions.hpp +++ b/addons/airway/ACE_Medical_Treatment_Actions.hpp @@ -9,7 +9,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(medLvl_Larynxtubus); treatmentTime = QGVAR(Larynxtubus_time); items[] = {"kat_larynx"}; - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Larynxtubus') && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Guedeltubus')); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Larynxtubus') && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Guedeltubus')); callbackSuccess = QFUNC(treatmentAdvanced_airway); callbackFailure = ""; callbackProgress = ""; @@ -30,14 +30,14 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(medLvl_Larynxtubus); treatmentTime = QGVAR(Larynxtubus_time); items[] = {}; - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && (_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Larynxtubus')); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && (_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Larynxtubus')); callbackSuccess = QFUNC(treatmentAdvanced_RemoveAirwayItem); }; class Guedeltubus: Larynxtubus { displayName = CSTRING(Guedeltubus_Display); medicRequired = QGVAR(medLvl_Guedeltubus); treatmentTime = QGVAR(Guedeltubus_time); - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && missionNamespace getVariable [ARR_2(QQGVAR(enable),true)] && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Guedeltubus') && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Larynxtubus')); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && missionNamespace getVariable [ARR_2(QQGVAR(enable),true)] && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Guedeltubus') && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Larynxtubus')); items[] = {"kat_guedel"}; icon = QPATHTOF(ui\guedel.paa); callbackSuccess = QFUNC(treatmentAdvanced_airway); @@ -49,14 +49,14 @@ class ACE_Medical_Treatment_Actions { treatmentTime = QGVAR(Guedeltubus_time); items[] = {}; icon = QPATHTOF(ui\guedel.paa); - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && (_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Guedeltubus')); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && (_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Guedeltubus')); callbackSuccess = QFUNC(treatmentAdvanced_RemoveAirwayItem); }; class Accuvac: Larynxtubus { displayName = "Accuvac"; treatmentTime = QGVAR(Accuvac_time); items[] = {"kat_accuvac"}; - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Larynxtubus')); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Larynxtubus')); icon = QPATHTOF(ui\accuvac.paa); consumeItem = 0; medicRequired = QGVAR(medLvl_Accuvac); @@ -71,7 +71,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = 0; items[] = {}; icon = ""; - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && !(_patient getVariable [ARR_2(QQGVAR(overstretch), false)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Guedeltubus') && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Larynxtubus')); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && !(_patient getVariable [ARR_2(QQGVAR(overstretch),false)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Guedeltubus') && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Larynxtubus')); callbackSuccess = QFUNC(treatmentAdvanced_overstretchHead); }; class BeginHeadTurning: Larynxtubus { @@ -81,7 +81,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = 0; items[] = {}; icon = ""; - condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Larynxtubus') && (!(_patient getVariable [ARR_2(QQGVAR(airway_item), '')] == 'Guedeltubus') || !(missionNamespace getVariable [ARR_2(QQGVAR(block_headTurning_ifAirwayItem),true)]))); + condition = QUOTE(!([_patient] call ACEFUNC(common,isAwake)) && (missionNamespace getVariable [ARR_2(QQGVAR(enable),true)]) && !(_patient getVariable [ARR_2(QQGVAR(recovery),false)]) && !(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Larynxtubus') && (!(_patient getVariable [ARR_2(QQGVAR(airway_item),'')] == 'Guedeltubus') || !(missionNamespace getVariable [ARR_2(QQGVAR(block_headTurning_ifAirwayItem),true)]))); callbackSuccess = QFUNC(startHeadTurning); sounds[] = {}; }; diff --git a/addons/airway/CfgEventHandlers.hpp b/addons/airway/CfgEventHandlers.hpp index c26ebc2ff..4551ce282 100644 --- a/addons/airway/CfgEventHandlers.hpp +++ b/addons/airway/CfgEventHandlers.hpp @@ -8,7 +8,7 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; }; diff --git a/addons/airway/functions/fnc_checkAirway.sqf b/addons/airway/functions/fnc_checkAirway.sqf index 4d9847a2c..15974cbc9 100644 --- a/addons/airway/functions/fnc_checkAirway.sqf +++ b/addons/airway/functions/fnc_checkAirway.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Checks need of airway management diff --git a/addons/airway/functions/fnc_checkRecovery.sqf b/addons/airway/functions/fnc_checkRecovery.sqf index c98a976b4..d15843995 100644 --- a/addons/airway/functions/fnc_checkRecovery.sqf +++ b/addons/airway/functions/fnc_checkRecovery.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Checks if guedel or larynx was placed before diff --git a/addons/airway/functions/fnc_handleAirway.sqf b/addons/airway/functions/fnc_handleAirway.sqf index 77a60cb3f..cfb133828 100644 --- a/addons/airway/functions/fnc_handleAirway.sqf +++ b/addons/airway/functions/fnc_handleAirway.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Handler for airway damage. diff --git a/addons/airway/functions/fnc_handlePuking.sqf b/addons/airway/functions/fnc_handlePuking.sqf index e6dde7561..7e4f1269a 100644 --- a/addons/airway/functions/fnc_handlePuking.sqf +++ b/addons/airway/functions/fnc_handlePuking.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam, edited by MiszczuZPolski * Called when a unit enters the unconscious state. Will add a FrameHandler for puking while unconscious. @@ -34,7 +34,7 @@ _unit setVariable ["kat_pukeActive_PFH", true]; }; if (GVAR(occlusion_cooldownPeriod) > 0 && {(_unit getVariable [QGVAR(clearedTime), 0] > 0) && ((_unit getVariable [QGVAR(clearedTime), 0]) + GVAR(occlusion_cooldownPeriod)) > CBA_missionTime}) exitWith {}; - + if (random(100) <= GVAR(probability_occluded)) then { if !(_unit getVariable [QGVAR(occluded), false]) then { _unit setVariable [QGVAR(occluded), true, true]; diff --git a/addons/airway/functions/fnc_init.sqf b/addons/airway/functions/fnc_init.sqf index 57f909701..4a031bd0b 100644 --- a/addons/airway/functions/fnc_init.sqf +++ b/addons/airway/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Initializes unit variables. @@ -27,4 +27,4 @@ _unit setVariable [QGVAR(overstretch), false, true]; _unit setVariable [QGVAR(recovery), false, true]; _unit setVariable [QGVAR(airway_item), "", true]; _unit setVariable [QGVAR(clearedTime), 0, true]; -KAT_forceWakeup = false; \ No newline at end of file +KAT_forceWakeup = false; diff --git a/addons/airway/functions/fnc_startHeadTurning.sqf b/addons/airway/functions/fnc_startHeadTurning.sqf index ff658d057..887edd4ee 100644 --- a/addons/airway/functions/fnc_startHeadTurning.sqf +++ b/addons/airway/functions/fnc_startHeadTurning.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Begin head turning @@ -31,7 +31,7 @@ GVAR(HeadTurnCancel_MouseID) = [0xF0, [false, false, false], { }, "keydown", "", false, 0] call CBA_fnc_addKeyHandler; ACEGVAR(medical_gui,pendingReopen) = false; // Prevent medical menu from reopening - + if (dialog) then { // If another dialog is open (medical menu) close it closeDialog 0; }; @@ -83,7 +83,7 @@ GVAR(headTurn_timeOut) = true; params ["_patient"]; !(_patient getVariable [QGVAR(headTurningActive), false]); - }, {}, [_patient, _medic], GVAR(HeadTurn_Interval), + }, {}, [_patient, _medic], GVAR(HeadTurn_Interval), { params ["_patient", "_medic"]; @@ -106,7 +106,7 @@ GVAR(headTurn_timeOut) = true; }] call CBA_fnc_waitUntilAndExecute; }; - + if (GVAR(loopHeadturning)) then { [QACEGVAR(common,switchMove), [_medic, "kat_headTurn"]] call CBA_fnc_globalEvent; GVAR(loopHeadturning) = false; @@ -121,4 +121,4 @@ GVAR(headTurn_timeOut) = true; }, 0, [_medic, _patient, _notInVehicle]] call CBA_fnc_addPerFrameHandler; [{GVAR(headTurn_timeOut) = false;}, [], 1] call CBA_fnc_waitAndExecute; -}, [_medic, _patient, _notInVehicle], 2] call CBA_fnc_waitAndExecute; \ No newline at end of file +}, [_medic, _patient, _notInVehicle], 2] call CBA_fnc_waitAndExecute; diff --git a/addons/airway/functions/fnc_treatmentAdvanced_Accuvac.sqf b/addons/airway/functions/fnc_treatmentAdvanced_Accuvac.sqf index d8b7ef523..bb62c4f69 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_Accuvac.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_Accuvac.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Airway Management for occluding diff --git a/addons/airway/functions/fnc_treatmentAdvanced_AccuvacLocal.sqf b/addons/airway/functions/fnc_treatmentAdvanced_AccuvacLocal.sqf index ec057c6b9..c8cfb55c6 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_AccuvacLocal.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_AccuvacLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Airway Management for occluding local diff --git a/addons/airway/functions/fnc_treatmentAdvanced_AccuvacStart.sqf b/addons/airway/functions/fnc_treatmentAdvanced_AccuvacStart.sqf index 49fe31c41..b792d63d3 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_AccuvacStart.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_AccuvacStart.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Play Accuvac suction sound @@ -30,6 +30,6 @@ private _accuvacSuction = playSound3D [QPATHTOF_SOUND(sounds\suction.wav), _pati !dialog; }, { params ["_accuvacSuction"]; - + stopSound _accuvacSuction; -}, [_accuvacSuction], 5.7] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +}, [_accuvacSuction], 5.7] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPosition.sqf b/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPosition.sqf index e85efe4a5..adccfe339 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPosition.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPosition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Set patient into recovery position preventing further airway occlusion. @@ -19,4 +19,4 @@ params ["_medic", "_patient"]; [QGVAR(cancelRecoveryPositionLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent; -[_patient, "ainjppnemstpsnonwrfldnon", 2] call ACEFUNC(common,doAnimation); \ No newline at end of file +[_patient, "ainjppnemstpsnonwrfldnon", 2] call ACEFUNC(common,doAnimation); diff --git a/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPositionLocal.sqf b/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPositionLocal.sqf index c77374210..eea7978a2 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPositionLocal.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_CancelRecoveryPositionLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Local callback for set patient from recovery position. diff --git a/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPosition.sqf b/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPosition.sqf index 25f2a30c9..b2741c484 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPosition.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPosition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Set patient into recovery position preventing further airway occlusion. @@ -21,4 +21,4 @@ params ["_medic", "_patient"]; [_patient, "activity", LSTRING(RecoveryPosition_Log), [[_medic] call ACEFUNC(common,getName)]] call ACEFUNC(medical_treatment,addToLog); [QGVAR(recoveryPositionLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent; -[_patient, "kat_recoveryPosition", 2] call ACEFUNC(common,doAnimation); \ No newline at end of file +[_patient, "kat_recoveryPosition", 2] call ACEFUNC(common,doAnimation); diff --git a/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPositionLocal.sqf b/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPositionLocal.sqf index d42c260b4..a14802a16 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPositionLocal.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_RecoveryPositionLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Local callback for set patient into recovery position. @@ -27,7 +27,7 @@ private _output = LLSTRING(Recovery_Info); [{ params ["_medic", "_patient"]; - (_patient call ACEFUNC(medical_status,isBeingDragged)) || (_patient call ACEFUNC(medical_status,isBeingCarried)) || !(isNull objectParent _patient); + _patient call ACEFUNC(medical_status,isBeingDragged) || _patient call ACEFUNC(medical_status,isBeingCarried) || !(isNull objectParent _patient); }, { params ["_medic", "_patient"]; _patient setVariable [QGVAR(recovery), false, true]; @@ -36,10 +36,10 @@ private _output = LLSTRING(Recovery_Info); _output = LLSTRING(Recovery_Cancel); [_output, 1.5, _medic] call ACEFUNC(common,displayTextStructured); }, [_medic, _patient], 3600, { - params ["_medic","patient"]; + params ["_medic", "_patient"]; _patient setVariable [QGVAR(recovery), false, true]; _patient setVariable [QGVAR(overstretch), false, true]; - + _output = LLSTRING(Recovery_Cancel); [_output, 1.5, _medic] call ACEFUNC(common,displayTextStructured); }] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItem.sqf b/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItem.sqf index 1100eb947..b7c7a14f8 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItem.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItem.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Removing Guedeltubus or KingLT diff --git a/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItemLocal.sqf b/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItemLocal.sqf index 3be5cb850..473e30f52 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItemLocal.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_RemoveAirwayItemLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Removing Guedeltubus & KingLT @@ -28,9 +28,9 @@ if (_item isEqualTo "Larynxtubus") then { }; if !(GVAR(ReusableAirwayItems)) exitwith {}; - + if (_item isEqualTo "Larynxtubus") then { [_medic, "kat_larynx"] call ACEFUNC(common,addToInventory); } else { [_medic, "kat_guedel"] call ACEFUNC(common,addToInventory); -}; \ No newline at end of file +}; diff --git a/addons/airway/functions/fnc_treatmentAdvanced_airway.sqf b/addons/airway/functions/fnc_treatmentAdvanced_airway.sqf index f28f3ab52..120590c68 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_airway.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_airway.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Airway Management for collapsing diff --git a/addons/airway/functions/fnc_treatmentAdvanced_airwayLocal.sqf b/addons/airway/functions/fnc_treatmentAdvanced_airwayLocal.sqf index b1c919cb8..fd606c8f7 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_airwayLocal.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_airwayLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam, edited by MiszczuZPolski & Miss Heda * Airway Management for collapsing local diff --git a/addons/airway/functions/fnc_treatmentAdvanced_overstretchHead.sqf b/addons/airway/functions/fnc_treatmentAdvanced_overstretchHead.sqf index 2072033f6..4215aca79 100644 --- a/addons/airway/functions/fnc_treatmentAdvanced_overstretchHead.sqf +++ b/addons/airway/functions/fnc_treatmentAdvanced_overstretchHead.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Overstretch the head of the patient for airway management without items diff --git a/addons/airway/functions/script_component.hpp b/addons/airway/functions/script_component.hpp deleted file mode 100644 index d6d439a87..000000000 --- a/addons/airway/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\airway\script_component.hpp" \ No newline at end of file diff --git a/addons/airway/script_component.hpp b/addons/airway/script_component.hpp index 576d677b9..bf9ac232d 100644 --- a/addons/airway/script_component.hpp +++ b/addons/airway/script_component.hpp @@ -15,62 +15,3 @@ #endif #include "\x\kat\addons\main\script_macros.hpp" -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" - -#include "\a3\ui_f\hpp\defineResincl.inc" -#include "\a3\ui_f\hpp\defineDIKCodes.inc" -#include "\a3\ui_f\hpp\defineCommonGrids.inc" -#include "\a3\ui_f\hpp\defineCommonColors.inc" - -#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) -#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) -#define POS_W(N) ((N) * GUI_GRID_W) -#define POS_H(N) ((N) * GUI_GRID_H) - -#define IDD_MEDICAL_MENU 38580 - -#define IDC_TITLE 1200 -#define IDC_TRIAGE 1300 -#define IDC_EXAMINE 1310 -#define IDC_BANDAGE 1320 -#define IDC_MEDICATION 1330 -#define IDC_AIRWAY 1340 -#define IDC_ADVANCED 1350 -#define IDC_DRAG 1360 -#define IDC_TOGGLE 1370 - -#define IDC_TRIAGE_CARD 1400 -#define IDC_INJURIES 1410 -#define IDC_ACTIVITY 1420 -#define IDC_QUICKVIEW 1430 - -#define IDC_ACTION_1 1500 -#define IDC_ACTION_2 1510 -#define IDC_ACTION_3 1520 -#define IDC_ACTION_4 1530 -#define IDC_ACTION_5 1540 -#define IDC_ACTION_6 1550 -#define IDC_ACTION_7 1560 -#define IDC_ACTION_8 1570 -#define IDC_ACTION_9 1580 - -#define IDCS_ACTION_BUTTONS [IDC_ACTION_1, IDC_ACTION_2, IDC_ACTION_3, IDC_ACTION_4, IDC_ACTION_5, IDC_ACTION_6, IDC_ACTION_7, IDC_ACTION_8, IDC_ACTION_9] - -#define IDC_BODY_GROUP 6000 -#define IDC_BODY_HEAD 6005 -#define IDC_BODY_TORSO 6010 -#define IDC_BODY_ARMLEFT 6015 -#define IDC_BODY_ARMRIGHT 6020 -#define IDC_BODY_LEGLEFT 6025 -#define IDC_BODY_LEGRIGHT 6030 -#define IDC_BODY_ARMLEFT_T 6035 -#define IDC_BODY_ARMRIGHT_T 6040 -#define IDC_BODY_LEGLEFT_T 6045 -#define IDC_BODY_LEGRIGHT_T 6050 -#define IDC_BODY_ARMLEFT_B 6055 -#define IDC_BODY_ARMRIGHT_B 6060 -#define IDC_BODY_LEGLEFT_B 6065 -#define IDC_BODY_LEGRIGHT_B 6070 - -#define IDC_TRIAGE_STATUS 7000 -#define IDC_TRIAGE_SELECT 7100 \ No newline at end of file diff --git a/addons/breathing/ACE_Medical_Treatment_Actions.hpp b/addons/breathing/ACE_Medical_Treatment_Actions.hpp index 43e448fd6..10594bbbf 100644 --- a/addons/breathing/ACE_Medical_Treatment_Actions.hpp +++ b/addons/breathing/ACE_Medical_Treatment_Actions.hpp @@ -9,10 +9,10 @@ class ACE_Medical_Treatment_Actions { category = "airway"; medicRequired = 0; consumeItem = 0; - callbackStart = QUOTE(_medic setVariable [ARR_3(QQGVAR(usingStethoscope), true, true)]; [ARR_2(_medic, _patient)] spawn FUNC(listenLungs)); - callbackSuccess = QUOTE(_medic setVariable [ARR_3(QQGVAR(usingStethoscope), false, true)]); + callbackStart = QUOTE(_medic setVariable [ARR_3(QQGVAR(usingStethoscope),true,true)]; [ARR_2(_medic,_patient)] spawn FUNC(listenLungs)); + callbackSuccess = QUOTE(_medic setVariable [ARR_3(QQGVAR(usingStethoscope),false,true)]); callbackProgress = ""; - callbackFailure = QUOTE(_medic setVariable [ARR_3(QQGVAR(usingStethoscope), false, true)]); + callbackFailure = QUOTE(_medic setVariable [ARR_3(QQGVAR(usingStethoscope),false,true)]); condition = "true"; items[] = {"kat_stethoscope"}; animationPatient = ""; @@ -60,7 +60,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(medLvl_Pulseoximeter); treatmentTime = 2; items[] = {"kat_Pulseoximeter"}; - condition = QUOTE(missionNamespace getVariable [ARR_2(QQGVAR(enable),true)] && !(_patient getVariable [ARR_2(QQGVAR(pulseoximeter), false)]) && !([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter))); + condition = QUOTE(missionNamespace getVariable [ARR_2(QQGVAR(enable),true)] && !(_patient getVariable [ARR_2(QQGVAR(pulseoximeter),false)]) && !([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter))); callbackSuccess = QFUNC(treatmentAdvanced_pulseoximeter); callbackFailure = ""; callbackProgress = ""; @@ -204,19 +204,19 @@ class ACE_Medical_Treatment_Actions { allowSelfTreatment = 1; allowedSelections[] = {"LeftArm", "RightArm"}; treatmentTime = 0.01; - condition = QUOTE([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter) && _patient getVariable [ARR_2(QQGVAR(PulseOximeter_VolumePatient), false)]); + condition = QUOTE([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter) && _patient getVariable [ARR_2(QQGVAR(PulseOximeter_VolumePatient),false)]); callbackProgress = ""; callbackStart = ""; callbackFailure = ""; - callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(PulseOximeter_VolumePatient), false, true)]); + callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(PulseOximeter_VolumePatient),false,true)]); animationPatient = ""; animationMedic = ""; litter[] = {}; }; class EnablePulseOximeterAudio: DisablePulseOximeterAudio { displayName = CSTRING(PulseOximeter_Action_addSound); - condition = QUOTE([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter) && !(_patient getVariable [ARR_2(QQGVAR(PulseOximeter_VolumePatient), false)])); - callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(PulseOximeter_VolumePatient), true, true)]); + condition = QUOTE([ARR_2(_patient,_bodyPart)] call FUNC(checkPulseOximeter) && !(_patient getVariable [ARR_2(QQGVAR(PulseOximeter_VolumePatient),false)])); + callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(PulseOximeter_VolumePatient),true,true)]); }; class UseBVM { displayName = CSTRING(UseBVM); @@ -230,8 +230,8 @@ class ACE_Medical_Treatment_Actions { consumeItem = 0; items[] = {"kat_BVM"}; condition = QUOTE(_patient call FUNC(canUseBVM)); - callbackStart = ""; - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(useBVM)); + callbackStart = ""; + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(useBVM)); callbackFailure = ""; callbackProgress = ""; animationPatient = ""; @@ -247,27 +247,27 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(medLvl_PocketBVM); items[] = {"kat_pocketBVM"}; condition = QUOTE(_patient call FUNC(canUseBVM)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, true, false)] call FUNC(useBVM)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,true,false)] call FUNC(useBVM)); }; class UseBVMPortableOxygen: UseBVM { displayName = CSTRING(UseBVM_PortableOxygen); medicRequired = QGVAR(medLvl_BVM_Oxygen); items[] = {"kat_BVM"}; condition = QUOTE(_patient call FUNC(canUseBVM) && _medic call FUNC(hasOxygenTank) && (GVAR(locationProvideOxygen) isEqualTo 0 || !((GVAR(locationProvideOxygen) in [ARR_2(2,3)] && _patient call ACEFUNC(medical_treatment,isInMedicalFacility)) || ((GVAR(locationProvideOxygen) in [ARR_2(1,3)] && _patient call ACEFUNC(medical_treatment,isInMedicalVehicle)))))); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, false, true, 1)] call FUNC(useBVM)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,false,true,1)] call FUNC(useBVM)); }; class UseBVMPortableOxygenVehicle: UseBVM { displayName = CSTRING(UseBVM_PortableOxygen_Vehicle); medicRequired = QGVAR(medLvl_BVM_Oxygen); items[] = {"kat_BVM"}; condition = QUOTE(_patient call FUNC(canUseBVM) && [ARR_2((vehicle _medic),true)] call FUNC(hasOxygenTank) && ((vehicle _medic) != _medic) && (vehicle _medic) isEqualTo (vehicle _patient)); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, false, true, 2)] call FUNC(useBVM)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,false,true,2)] call FUNC(useBVM)); }; class UseBVMOxygen: UseBVM { displayName = CSTRING(UseBVM_Oxygen); medicRequired = QGVAR(medLvl_BVM_Oxygen); items[] = {"kat_BVM"}; condition = QUOTE(_patient call FUNC(canUseBVM) && ((GVAR(locationProvideOxygen) in [ARR_2(2,3)] && _patient call ACEFUNC(medical_treatment,isInMedicalFacility)) || (GVAR(locationProvideOxygen) in [ARR_2(1,3)] && _patient call ACEFUNC(medical_treatment,isInMedicalVehicle)))); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, false, true)] call FUNC(useBVM)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,false,true)] call FUNC(useBVM)); }; -}; \ No newline at end of file +}; diff --git a/addons/breathing/CfgEventHandlers.hpp b/addons/breathing/CfgEventHandlers.hpp index c26ebc2ff..4551ce282 100644 --- a/addons/breathing/CfgEventHandlers.hpp +++ b/addons/breathing/CfgEventHandlers.hpp @@ -8,7 +8,7 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; }; diff --git a/addons/breathing/CfgVehicles.hpp b/addons/breathing/CfgVehicles.hpp index c0d291e6d..d8dd0f40a 100644 --- a/addons/breathing/CfgVehicles.hpp +++ b/addons/breathing/CfgVehicles.hpp @@ -64,23 +64,23 @@ class CfgVehicles { class ACE_Equipment { class PulseOximeter_removeSound { displayName = CSTRING(PulseOximeter_Action_removeSound); - condition = QUOTE('kat_Pulseoximeter' in (items _player) && (_player getVariable [ARR_2(QQGVAR(PulseOximeter_Volume), false]))); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(PulseOximeter_Volume), false, true)]); + condition = QUOTE('kat_Pulseoximeter' in (items _player) && (_player getVariable [ARR_2(QQGVAR(PulseOximeter_Volume),false]))); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(PulseOximeter_Volume),false,true)]); showDisabled = 0; exceptions[] = {"isNotInside", "isNotSitting"}; icon = ""; }; class PulseOximeter_addSound : PulseOximeter_removeSound { displayName = CSTRING(PulseOximeter_Action_addSound); - condition = QUOTE('kat_Pulseoximeter' in (items _player) && !(_player getVariable [ARR_2(QQGVAR(PulseOximeter_Volume), false]))); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(PulseOximeter_Volume), true, true)]); + condition = QUOTE('kat_Pulseoximeter' in (items _player) && !(_player getVariable [ARR_2(QQGVAR(PulseOximeter_Volume),false]))); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(PulseOximeter_Volume),true,true)]); }; class SetPreferred_OxygenTank_150 { displayName = CSTRING(SetPreferredOxygenTank_150); - condition = QUOTE([ARR_2(_player, 'kat_oxygenTank_150')] call ACEFUNC(common,hasMagazine)); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(oxygenTankPreferred),'kat_oxygenTank_150', true)]); + condition = QUOTE([ARR_2(_player,'kat_oxygenTank_150')] call ACEFUNC(common,hasMagazine)); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(oxygenTankPreferred),'kat_oxygenTank_150',true)]); showDisabled = 0; - exceptions[] = + exceptions[] = { "notOnMap", "isNotInside", @@ -93,15 +93,15 @@ class CfgVehicles { }; class SetPreferred_OxygenTank_300: SetPreferred_OxygenTank_150 { displayName = CSTRING(SetPreferredOxygenTank_300); - condition = QUOTE([ARR_2(_player, 'kat_oxygenTank_300')] call ACEFUNC(common,hasMagazine)); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(oxygenTankPreferred),'kat_oxygenTank_300', true)]); + condition = QUOTE([ARR_2(_player,'kat_oxygenTank_300')] call ACEFUNC(common,hasMagazine)); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(oxygenTankPreferred),'kat_oxygenTank_300',true)]); }; class Refill_OxygenTank_150_Facility { displayName = CSTRING(RefillPortableOxygenTank_150); condition = QUOTE((GVAR(locationProvideOxygen) in [ARR_2(2,3)]) && 'kat_oxygenTank_150_Empty' in (items _player) && _player call ACEFUNC(medical_treatment,isInMedicalFacility)); - statement = QUOTE([ARR_3(_player,'kat_oxygenTank_150', GVAR(PortableOxygenTank_RefillTime))] call FUNC(refillOxygenTank)); + statement = QUOTE([ARR_3(_player,'kat_oxygenTank_150',GVAR(PortableOxygenTank_RefillTime))] call FUNC(refillOxygenTank)); showDisabled = 0; - exceptions[] = + exceptions[] = { "notOnMap", "isNotInside", @@ -115,7 +115,7 @@ class CfgVehicles { class Refill_OxygenTank_300_Facility: Refill_OxygenTank_150_Facility { displayName = CSTRING(RefillPortableOxygenTank_300); condition = QUOTE((GVAR(locationProvideOxygen) in [ARR_2(2,3)]) && 'kat_oxygenTank_300_Empty' in (items _player) && _player call ACEFUNC(medical_treatment,isInMedicalFacility)); - statement = QUOTE([ARR_3(_player,'kat_oxygenTank_300', GVAR(PortableOxygenTank_RefillTime)*2)] call FUNC(refillOxygenTank)); + statement = QUOTE([ARR_3(_player,'kat_oxygenTank_300',GVAR(PortableOxygenTank_RefillTime)*2)] call FUNC(refillOxygenTank)); }; }; }; @@ -132,15 +132,15 @@ class CfgVehicles { class Refill_OxygenTank_150_Vehicle { displayName = CSTRING(RefillPortableOxygenTank_150); condition = QUOTE('kat_oxygenTank_150_Empty' in (items _player) && _target call ACEFUNC(medical_treatment,isMedicalVehicle)); - statement = QUOTE([ARR_3(_player,'kat_oxygenTank_150', GVAR(PortableOxygenTank_RefillTime))] call FUNC(refillOxygenTank)); + statement = QUOTE([ARR_3(_player,'kat_oxygenTank_150',GVAR(PortableOxygenTank_RefillTime))] call FUNC(refillOxygenTank)); }; class Refill_OxygenTank_300_Vehicle: Refill_OxygenTank_150_Vehicle { displayName = CSTRING(RefillPortableOxygenTank_300); condition = QUOTE('kat_oxygenTank_300_Empty' in (items _player) && _target call ACEFUNC(medical_treatment,isMedicalVehicle)); - statement = QUOTE([ARR_3(_player,'kat_oxygenTank_300', GVAR(PortableOxygenTank_RefillTime)*2)] call FUNC(refillOxygenTank)); + statement = QUOTE([ARR_3(_player,'kat_oxygenTank_300',GVAR(PortableOxygenTank_RefillTime)*2)] call FUNC(refillOxygenTank)); }; }; }; }; }; -}; \ No newline at end of file +}; diff --git a/addons/breathing/functions/fnc_canUseBVM.sqf b/addons/breathing/functions/fnc_canUseBVM.sqf index f11490be2..abc23d25f 100644 --- a/addons/breathing/functions/fnc_canUseBVM.sqf +++ b/addons/breathing/functions/fnc_canUseBVM.sqf @@ -1,11 +1,11 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Check if patient can have BVM used on them * * Arguments: * 0: Patient - * + * * Return Value: * Can use BVM * @@ -17,4 +17,4 @@ params ["_patient"]; -!(_patient call ACEFUNC(common,isAwake)) && !(_patient getVariable [QGVAR(BVMInUse), false] && !(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}); \ No newline at end of file +!(_patient call ACEFUNC(common,isAwake)) && !(_patient getVariable [QGVAR(BVMInUse), false] && !(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}); diff --git a/addons/breathing/functions/fnc_checkBreathing.sqf b/addons/breathing/functions/fnc_checkBreathing.sqf index a92c6afde..c577f86dc 100644 --- a/addons/breathing/functions/fnc_checkBreathing.sqf +++ b/addons/breathing/functions/fnc_checkBreathing.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Modified: Blue @@ -51,4 +51,4 @@ if (_hr == 0 || !(alive _patient) || (_patient getVariable [QEGVAR(airway,obstru [_output, 1.5, _medic] call ACEFUNC(common,displayTextStructured); -[_patient, "quick_view", LSTRING(CheckBreathing_Log), [[_medic] call ACEFUNC(common,getName), _output_log]] call ACEFUNC(medical_treatment,addToLog); \ No newline at end of file +[_patient, "quick_view", LSTRING(CheckBreathing_Log), [[_medic] call ACEFUNC(common,getName), _output_log]] call ACEFUNC(medical_treatment,addToLog); diff --git a/addons/breathing/functions/fnc_checkPulseOximeter.sqf b/addons/breathing/functions/fnc_checkPulseOximeter.sqf index 66e0ded04..03e92a99e 100644 --- a/addons/breathing/functions/fnc_checkPulseOximeter.sqf +++ b/addons/breathing/functions/fnc_checkPulseOximeter.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Checks if target arm has pulse oximeter. @@ -20,4 +20,4 @@ params ["_patient", "_bodyPart"]; if(_patient getVariable [QGVAR(PulseOximeter_Attached), [0,0]] select (ALL_BODY_PARTS find toLower _bodyPart)-2 > 0) exitWith {true}; -false \ No newline at end of file +false diff --git a/addons/breathing/functions/fnc_handleBreathing.sqf b/addons/breathing/functions/fnc_handleBreathing.sqf index 673a98293..b11956ade 100644 --- a/addons/breathing/functions/fnc_handleBreathing.sqf +++ b/addons/breathing/functions/fnc_handleBreathing.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam, edited by Tomcat, Kygan, YetheSamartaka and MJSTIC * Handling oxygen saturation for breathing @@ -77,7 +77,7 @@ if (!local _unit) then { [_idPFH] call CBA_fnc_removePerFrameHandler; _unit setVariable ["kat_O2Breathing_PFH", nil]; }; - + // Unconscious if !([_unit] call ACEFUNC(common,isAwake)) exitWith { _output = -0.2; // Not breathing/blocked airway @@ -95,7 +95,7 @@ if (!local _unit) then { }; }; }; - + // Normal(-ish) heart rate if (_heartRate >= 25) exitWith { if (_BVMInUse) then { @@ -138,7 +138,7 @@ if (!local _unit) then { _output = _output * _multiplierNegative; }; }; - + _finalOutput = _status + _output; if (_finalOutput > 100) then { @@ -210,4 +210,4 @@ if (!local _unit) then { }; }; }; -}, 3, [_unit]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file +}, 3, [_unit]] call CBA_fnc_addPerFrameHandler; diff --git a/addons/breathing/functions/fnc_handlePulmoHit.sqf b/addons/breathing/functions/fnc_handlePulmoHit.sqf index ad2da2638..eb85597ee 100644 --- a/addons/breathing/functions/fnc_handlePulmoHit.sqf +++ b/addons/breathing/functions/fnc_handlePulmoHit.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Called when a unit is damaged. @@ -29,7 +29,7 @@ private _fnc_inflictAdvancedPneumothorax = { // Prevent the patient from getting both hemothorax and tension pneumothorax at the same time private _hemo = _unit getVariable [QGVAR(hemopneumothorax), false]; private _tension = _unit getVariable [QGVAR(tensionpneumothorax), false]; - + // Roll chance to get advanced pneumothorax or skip chance if deteriorated if ((floor (random 100) <= (GVAR(advPtxChance) + _chanceIncrease) || _deteriorated) && !(_hemo || _tension)) then { [_unit, 0.7] call ACEFUNC(medical_status,adjustPainLevel); @@ -72,7 +72,7 @@ if (floor (random 100) <= (GVAR(pneumothoraxChance) + _chanceIncrease)) then { [{ params ["_args", "_idPFH"]; _args params ["_unit", "_chanceIncrease", "_fnc_inflictAdvancedPneumothorax"]; - + // If patient is dead, already treated or has already deteriorated into advanced pneumothorax, kill the PFH if(_unit getVariable [QGVAR(hemopneumothorax), false] || _unit getVariable [QGVAR(tensionpneumothorax), false] || !(alive _unit) || _unit getVariable [QGVAR(pneumothorax), 0] isEqualTo 0) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; @@ -80,11 +80,11 @@ if (floor (random 100) <= (GVAR(pneumothoraxChance) + _chanceIncrease)) then { if (floor (random 100) <= GVAR(deterioratingPneumothorax_chance)) then { private _ptxTarget = (_unit getVariable [QGVAR(pneumothorax), 0]) + 1; - + // Once deteriorated far enough try to inflict advanced pneumothorax or if disabled kill the PFH if (_ptxTarget > 4) exitWith { if(GVAR(advPtxEnable)) then { - + [_unit, _chanceIncrease, true] call _fnc_inflictAdvancedPneumothorax; }; [_idPFH] call CBA_fnc_removePerFrameHandler; @@ -114,4 +114,4 @@ if (floor (random 100) <= (GVAR(pneumothoraxChance) + _chanceIncrease)) then { _unit setVariable [QGVAR(deepPenetratingInjury), true, true]; _unit setVariable [QGVAR(activeChestSeal), false, true]; }; -}; \ No newline at end of file +}; diff --git a/addons/breathing/functions/fnc_hasBVM.sqf b/addons/breathing/functions/fnc_hasBVM.sqf index 018cbada9..6393921ba 100644 --- a/addons/breathing/functions/fnc_hasBVM.sqf +++ b/addons/breathing/functions/fnc_hasBVM.sqf @@ -1,11 +1,11 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Check if patient has any kind of BVM * * Arguments: * 0: Patient - * + * * Return Value: * Has BVM * @@ -17,4 +17,4 @@ params ["_patient"]; -_patient getVariable [QGVAR(BVM), false] || _patient getVariable [QGVAR(pocketBVM), false]; \ No newline at end of file +_patient getVariable [QGVAR(BVM), false] || _patient getVariable [QGVAR(pocketBVM), false]; diff --git a/addons/breathing/functions/fnc_hasOxygenTank.sqf b/addons/breathing/functions/fnc_hasOxygenTank.sqf index 9dd96239a..051f8f67a 100644 --- a/addons/breathing/functions/fnc_hasOxygenTank.sqf +++ b/addons/breathing/functions/fnc_hasOxygenTank.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Check if target has any kind of oxygen tank @@ -6,7 +6,7 @@ * Arguments: * 0: Target * 1: Target is vehicle - * + * * Return Value: * Has oxygen tank * @@ -22,4 +22,4 @@ if !(_isVehicle) exitWith { [_target, "kat_oxygenTank_150"] call ACEFUNC(common,hasMagazine) || [_target, "kat_oxygenTank_300"] call ACEFUNC(common,hasMagazine); }; -"kat_oxygenTank_150" in (magazineCargo _target) || "kat_oxygenTank_300" in (magazineCargo _target); \ No newline at end of file +"kat_oxygenTank_150" in (magazineCargo _target) || "kat_oxygenTank_300" in (magazineCargo _target); diff --git a/addons/breathing/functions/fnc_init.sqf b/addons/breathing/functions/fnc_init.sqf index f8ee00670..fbde1f9cc 100644 --- a/addons/breathing/functions/fnc_init.sqf +++ b/addons/breathing/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Initializes unit variables. diff --git a/addons/breathing/functions/fnc_inspectChest.sqf b/addons/breathing/functions/fnc_inspectChest.sqf index ce90a5019..27cf5ae22 100644 --- a/addons/breathing/functions/fnc_inspectChest.sqf +++ b/addons/breathing/functions/fnc_inspectChest.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Inspect chest for injuries @@ -93,4 +93,4 @@ if (_patient getVariable [QGVAR(hemopneumothorax), false] && {!_simpleSetting}) [_patient, "quick_view", LSTRING(inspectChest_log), [[_medic] call ACEFUNC(common,getName), LLSTRING(inspectChest_internalBleeding)]] call ACEFUNC(medical_treatment,addToLog); }; -[_message, _hintSize, _medic, _hintWidth] call ACEFUNC(common,displayTextStructured); \ No newline at end of file +[_message, _hintSize, _medic, _hintWidth] call ACEFUNC(common,displayTextStructured); diff --git a/addons/breathing/functions/fnc_listenLungs.sqf b/addons/breathing/functions/fnc_listenLungs.sqf index e23c575d5..9e1284284 100644 --- a/addons/breathing/functions/fnc_listenLungs.sqf +++ b/addons/breathing/functions/fnc_listenLungs.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka, Tomcat and Blue * Handles listening to lungs. @@ -33,14 +33,14 @@ variantDelay = 0; if (!(_medic getVariable [QGVAR(usingStethoscope), false]) || !(alive _patient) || _HR isEqualTo 0) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; }; - + private _tension = (_patient getVariable [QGVAR(tensionpneumothorax), false] || (_patient getVariable [QGVAR(pneumothorax), 0] > 0)); private _hemo = _patient getVariable [QGVAR(hemopneumothorax), false]; _breathDelay = 20/_HR; _random = round random 1; - + private _type = 3; if(_hemo && _random >= 0.5) then {_type = 1}; @@ -67,7 +67,7 @@ variantDelay = 0; } else { playSoundUI [QPATHTOF(audio\hemo_exhale2.ogg), _volume, 1]; variantDelay = 0.8; - }; + }; [{ soundPlaying = false; }, [], variantDelay + _breathDelay] call CBA_fnc_waitAndExecute; @@ -125,4 +125,4 @@ variantDelay = 0; }; }; }; -}, 0, [_medic,_patient,_volume]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file +}, 0, [_medic,_patient,_volume]] call CBA_fnc_addPerFrameHandler; diff --git a/addons/breathing/functions/fnc_lowSpO2pp.sqf b/addons/breathing/functions/fnc_lowSpO2pp.sqf index 43dd8b89d..e1e6d3ba0 100644 --- a/addons/breathing/functions/fnc_lowSpO2pp.sqf +++ b/addons/breathing/functions/fnc_lowSpO2pp.sqf @@ -1,11 +1,11 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda, Digii * Triggers the low SPO2 visual effect. * * Arguments: * 0: Target - * + * * * Return Value: * None @@ -37,22 +37,22 @@ if (!(alive _target) || !([_target] call ACEFUNC(common,isAwake)) || _currentSpO [{ params["_handle"]; ppEffectCommitted _handle - }, - { params["_handle"]; + }, + { params["_handle"]; _handle ppEffectAdjust [1, 1, 0, [0, 0, 0, 0.9], [0, 0, 0, 1], [0.33, 0.33, 0.33, 0], [0.55, 0.5, 0, 0, 0, 0, 4]]; _handle ppEffectCommit 0.7; [{ params["_handle"]; ppEffectCommitted _handle - }, + }, { params["_handle"]; _handle ppEffectAdjust [1, 1, 0, [0, 0, 0, 0.1], [0, 0, 0, 1], [0.33, 0.33, 0.33, 0], [0.55, 0.5, 0, 0, 0, 0, 4]]; - _handle ppEffectCommit 1.6; - + _handle ppEffectCommit 1.6; + [{ params["_handle"]; ppEffectCommitted _handle - }, - { params["_handle"]; + }, + { params["_handle"]; _handle ppEffectEnable false; ppEffectDestroy _handle; }, [_handle]] call CBA_fnc_waitUntilAndExecute; @@ -60,4 +60,4 @@ if (!(alive _target) || !([_target] call ACEFUNC(common,isAwake)) || _currentSpO }, [_handle]] call CBA_fnc_waitUntilAndExecute; }, [_handle]] call CBA_fnc_waitUntilAndExecute; -}; \ No newline at end of file +}; diff --git a/addons/breathing/functions/fnc_refillOxygenTank.sqf b/addons/breathing/functions/fnc_refillOxygenTank.sqf index 6b968b752..bc75776c8 100644 --- a/addons/breathing/functions/fnc_refillOxygenTank.sqf +++ b/addons/breathing/functions/fnc_refillOxygenTank.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Refill unit's portable oxygen tank @@ -7,7 +7,7 @@ * 0: Unit * 1: Oxygen Tank * 2: Time to refill - * + * * Return Value: * None * @@ -23,19 +23,19 @@ private _emptyTank = [_tank,"Empty"] joinString "_"; _unit removeItem _emptyTank; -[_refillTime, [_unit,_tank,_emptyTank], +[_refillTime, [_unit,_tank,_emptyTank], { params["_args"]; _args params ["_unit","_tank"]; _unit addMagazine _tank; [LLSTRING(RefillPortableOxygenTank_Complete), 1.5, _unit] call ACEFUNC(common,displayTextStructured); -}, +}, { params["_args"]; _args params ["_unit","_emptyTank"]; _unit addItem _emptyTank; [LLSTRING(RefillPortableOxygenTank_Cancel), 1.5, _unit] call ACEFUNC(common,displayTextStructured); -}, -LLSTRING(RefillPortableOxygenTank_Progress)] call ACEFUNC(common,progressBar); \ No newline at end of file +}, +LLSTRING(RefillPortableOxygenTank_Progress)] call ACEFUNC(common,progressBar); diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_chestSeal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_chestSeal.sqf index ab0ee5358..e093b62ee 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_chestSeal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_chestSeal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Treatment for a pulmo injury diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_chestSealLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_chestSealLocal.sqf index 55414846e..5cde0d273 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_chestSealLocal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_chestSealLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam, modified by Kygan, YetheSamartaka and Tomcat. * handles chest seal treatment @@ -30,4 +30,4 @@ _patient setVariable [QGVAR(pneumothorax), 0, true]; if (!(_patient getVariable [QGVAR(hemopneumothorax), false]) && !(_patient getVariable [QGVAR(tensionpneumothorax), false])) then { [_patient, 0, 0, "ptx_tension", true] call EFUNC(circulation,updateBloodPressureChange); -}; \ No newline at end of file +}; diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothorax.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothorax.sqf index cb1ec2557..7bc0b13e1 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothorax.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothorax.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Kygan * Treatment for hemopneumothorax diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothoraxLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothoraxLocal.sqf index b9902a663..087b6a4ff 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothoraxLocal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_hemopneumothoraxLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Kygan, modified by YetheSamartaka and Tomcat. * Treatment for hemopneumothorax @@ -29,4 +29,4 @@ if (!(_patient getVariable [QGVAR(pneumothorax), 0] > 0) && !(_patient getVariab if (GVAR(clearChestSealAfterTreatment)) then { _patient setVariable [QGVAR(activeChestSeal), false, true]; }; -}; \ No newline at end of file +}; diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeter.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeter.sqf index eb831122e..75cb715e1 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeter.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeter.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * docks a pulseoximeter on the patient @@ -25,4 +25,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, _usedItem] call ACEFUNC(medical_treatment,addToTriageCard); -[QGVAR(pulseoxLocal), [_medic, _patient, _bodyPart], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(pulseoxLocal), [_medic, _patient, _bodyPart], _patient] call CBA_fnc_targetEvent; diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf index 8d0fa381b..1b369b761 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_pulseoximeterLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Puts a pulseoximeter on the patient diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_removePulseoximeter.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_removePulseoximeter.sqf index 27673d9ed..c7dc09c8f 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_removePulseoximeter.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_removePulseoximeter.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Removes a pulseoximeter for a patient and adds Item to the caller diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothorax.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothorax.sqf index 7dfaeeea8..00f7d43ac 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothorax.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothorax.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Kygan * Treatment for hemopneumothorax diff --git a/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothoraxLocal.sqf b/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothoraxLocal.sqf index 3c8c8aca8..587a0bf5f 100644 --- a/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothoraxLocal.sqf +++ b/addons/breathing/functions/fnc_treatmentAdvanced_tensionpneumothoraxLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Kygan, modified by YetheSamartaka and Tomcat. * Treatment for tension pneumothorax @@ -28,4 +28,4 @@ if (!(_patient getVariable [QGVAR(pneumothorax), 0] > 0) && !(_patient getVariab if (GVAR(clearChestSealAfterTreatment)) then { _patient setVariable [QGVAR(activeChestSeal), false, true]; }; -}; \ No newline at end of file +}; diff --git a/addons/breathing/functions/fnc_useBVM.sqf b/addons/breathing/functions/fnc_useBVM.sqf index e0efda0a4..a4a993c70 100644 --- a/addons/breathing/functions/fnc_useBVM.sqf +++ b/addons/breathing/functions/fnc_useBVM.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Handles BVM usage. @@ -37,7 +37,7 @@ GVAR(CPRCancel_MouseID) = [0xF0, [false, false, false], { }, "keydown", "", false, 0] call CBA_fnc_addKeyHandler; ACEGVAR(medical_gui,pendingReopen) = false; // Prevent medical menu from reopening - + if (dialog) then { // If another dialog is open (medical menu) close it closeDialog 0; }; @@ -96,7 +96,7 @@ timeOut = true; if !(timeOut) then { timeOut = true; - + if (_useOxygen && !_pocket) then { switch (_oxygenOrigin) do { case 1: { // Medic provided oxygen with carried oxygen tank @@ -181,13 +181,13 @@ timeOut = true; params ["_patient"]; !(_patient getVariable [QGVAR(BVMInUse), false]); - }, {}, [_patient], 5, + }, {}, [_patient], 5, { timeOut = false; totalProvided = totalProvided + 1; }] call CBA_fnc_waitUntilAndExecute; }; - + if (loopBVM) then { [QACEGVAR(common,switchMove), [_medic, "kat_BVM"]] call CBA_fnc_globalEvent; loopBVM = false; @@ -202,4 +202,4 @@ timeOut = true; }, 0, [_medic, _patient, _pocket, _useOxygen, _oxygenOrigin, _notInVehicle]] call CBA_fnc_addPerFrameHandler; [{timeOut = false;}, [], 1] call CBA_fnc_waitAndExecute; -}, [_medic, _patient, _pocket, _useOxygen, _oxygenOrigin, _notInVehicle], 2] call CBA_fnc_waitAndExecute; \ No newline at end of file +}, [_medic, _patient, _pocket, _useOxygen, _oxygenOrigin, _notInVehicle], 2] call CBA_fnc_waitAndExecute; diff --git a/addons/breathing/functions/script_component.hpp b/addons/breathing/functions/script_component.hpp deleted file mode 100644 index 2e58f611f..000000000 --- a/addons/breathing/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\breathing\script_component.hpp" \ No newline at end of file diff --git a/addons/breathing/script_component.hpp b/addons/breathing/script_component.hpp index 5b34c60a8..97d07abb1 100644 --- a/addons/breathing/script_component.hpp +++ b/addons/breathing/script_component.hpp @@ -14,5 +14,4 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_BREATHING #endif -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" -#include "\x\kat\addons\main\script_macros.hpp" \ No newline at end of file +#include "\x\kat\addons\main\script_macros.hpp" diff --git a/addons/chemical/ACE_Medical_Treatment_Actions.hpp b/addons/chemical/ACE_Medical_Treatment_Actions.hpp index 234768b34..22a88188a 100644 --- a/addons/chemical/ACE_Medical_Treatment_Actions.hpp +++ b/addons/chemical/ACE_Medical_Treatment_Actions.hpp @@ -1,4 +1,4 @@ -class ACE_Medical_Treatment_Actions { +class ACE_Medical_Treatment_Actions { class Diagnose; class putonGasMask: Diagnose { displayName = CSTRING(giveGasMask_action); @@ -6,7 +6,7 @@ class ACE_Medical_Treatment_Actions { allowedSelections[] = {"Head"}; allowSelfTreatment = 0; callbackSuccess = QFUNC(giveUnitGasMask); - condition = QUOTE([ARR_2(_player, _patient)] call FUNC(canPutGasMask)); + condition = QUOTE([ARR_2(_player,_patient)] call FUNC(canPutGasMask)); icon = QPATHTOF(ui\Gasmask_icon.paa); }; -}; \ No newline at end of file +}; diff --git a/addons/chemical/CfgEventHandlers.hpp b/addons/chemical/CfgEventHandlers.hpp index 2b46b6110..e5090d55b 100644 --- a/addons/chemical/CfgEventHandlers.hpp +++ b/addons/chemical/CfgEventHandlers.hpp @@ -8,7 +8,7 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; }; diff --git a/addons/chemical/CfgVehicles.hpp b/addons/chemical/CfgVehicles.hpp index 8f18b396e..36cd18cde 100644 --- a/addons/chemical/CfgVehicles.hpp +++ b/addons/chemical/CfgVehicles.hpp @@ -12,7 +12,7 @@ class CfgVehicles { icon = QPATHTOF(ui\Gasmask_icon.paa); }; class KAT_ChangeGasMaskFilter { - displayName = CSTRING(ChangeGasMaskFilter); + displayName = CSTRING(ChangeGasMaskFilter); condition = QUOTE([_player] call FUNC(canReplaceFilter)); exceptions[] = {"isNotSwimming", "isNotInside", "isNotSitting"}; statement = QUOTE(_this call FUNC(changeGasMaskFilter)); @@ -21,19 +21,19 @@ class CfgVehicles { }; class KAT_MuteChemDetector { displayName = CSTRING(ChemDetector_Mute); - condition = QUOTE([ARR_2(_player, true)] call FUNC(getChemDetectorState)); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(chemDetectorState), false , true)]); + condition = QUOTE([ARR_2(_player,true)] call FUNC(getChemDetectorState)); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(chemDetectorState),false,true)]); showDisabled = 0; icon = QPATHTOF(ui\ChemDetectorIcon.paa); }; class KAT_UnmuteChemDetector { displayName = CSTRING(ChemDetector_Unmute); - condition = QUOTE([ARR_2(_player, false)] call FUNC(getChemDetectorState)); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(chemDetectorState), true , true)]); + condition = QUOTE([ARR_2(_player,false)] call FUNC(getChemDetectorState)); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(chemDetectorState),true,true)]); showDisabled = 0; icon = QPATHTOF(ui\ChemDetectorIcon.paa); }; - }; + }; }; }; @@ -82,7 +82,7 @@ class CfgVehicles { class Checkbox; // Default checkbox (returned value is Boolean) class CheckboxNumber; // Default checkbox (returned value is Number) class ModuleDescription; // Module description - class Units; + class Units; }; class ModuleDescription; }; @@ -100,7 +100,7 @@ class CfgVehicles { class Arguments: AttributesBase { - class Radius_Max + class Radius_Max { displayName = CSTRING(UI_max_range); tooltip = CSTRING(GasModule_min_radius_dcs); @@ -212,4 +212,4 @@ class CfgVehicles { ammo = "KAT_Gas_TripWireMine_Ammo"; displayName = CSTRING(TriWire_Gas_Name); }; -}; \ No newline at end of file +}; diff --git a/addons/chemical/functions/fnc_AttributeRadius.sqf b/addons/chemical/functions/fnc_AttributeRadius.sqf index 34569a0e4..86b8d1505 100644 --- a/addons/chemical/functions/fnc_AttributeRadius.sqf +++ b/addons/chemical/functions/fnc_AttributeRadius.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * * Return Value: * NONE @@ -93,5 +93,5 @@ private _fnc_onLBSelChange = { [_sealCheckBox] call _fnc_onCheckChange; [_gasTypeCombo] call _fnc_onCheckChange; _display displayAddEventHandler ["KeyUp", _fnc_onKeyUp]; -_sealCheckBox ctrlAddEventHandler ["CheckedChanged", _fnc_onCheckChange]; -_gasTypeCombo ctrlAddEventHandler ["LBSelChanged", _fnc_onLBSelChange]; +_sealCheckBox ctrlAddEventHandler ["CheckedChanged", _fnc_onCheckChange]; +_gasTypeCombo ctrlAddEventHandler ["LBSelChanged", _fnc_onLBSelChange]; diff --git a/addons/chemical/functions/fnc_CASCreateGas.sqf b/addons/chemical/functions/fnc_CASCreateGas.sqf index 64fbb5ab7..5e447d236 100644 --- a/addons/chemical/functions/fnc_CASCreateGas.sqf +++ b/addons/chemical/functions/fnc_CASCreateGas.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * @@ -17,4 +17,4 @@ */ params ["_posX", "_posY", "_posZ"]; -[[_posX, _posY, _posZ], 240, 15, 0] call FUNC(createZone); \ No newline at end of file +[[_posX, _posY, _posZ], 240, 15, 0] call FUNC(createZone); diff --git a/addons/chemical/functions/fnc_GasTripEffect.sqf b/addons/chemical/functions/fnc_GasTripEffect.sqf index eb5dce0ff..8ad1f4f3c 100644 --- a/addons/chemical/functions/fnc_GasTripEffect.sqf +++ b/addons/chemical/functions/fnc_GasTripEffect.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * @@ -16,4 +16,4 @@ * Creates effects when Trip wire explodes. * Cant be called manualy! */ -[FUNC(spawnSmoke), _this] call CBA_fnc_directcall; \ No newline at end of file +[FUNC(spawnSmoke), _this] call CBA_fnc_directcall; diff --git a/addons/chemical/functions/fnc_addLoadAction.sqf b/addons/chemical/functions/fnc_addLoadAction.sqf index ea0604fa3..f81b4e0b4 100644 --- a/addons/chemical/functions/fnc_addLoadAction.sqf +++ b/addons/chemical/functions/fnc_addLoadAction.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * NONE * diff --git a/addons/chemical/functions/fnc_afterWait.sqf b/addons/chemical/functions/fnc_afterWait.sqf index 87b8d3b7b..12304f36f 100644 --- a/addons/chemical/functions/fnc_afterWait.sqf +++ b/addons/chemical/functions/fnc_afterWait.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * This cant be called manualy! @@ -22,7 +22,7 @@ params ["_unit", "_logic", "_gastype", "_radius_max"]; if (!isDamageAllowed _unit) exitWith { - [_unit] call FUNC(clearChemicalInjuriesLocal); + [_unit] call FUNC(clearChemicalInjuriesLocal); }; if ((goggles _unit) in (missionNamespace getVariable [QGVAR(availGasmaskList), []])) then { @@ -95,4 +95,4 @@ if ((goggles _unit) in (missionNamespace getVariable [QGVAR(availGasmaskList), [ }; [_unit] call EFUNC(breathing,handleBreathing); }; -}; \ No newline at end of file +}; diff --git a/addons/chemical/functions/fnc_breathing.sqf b/addons/chemical/functions/fnc_breathing.sqf index 61de05b84..f98f37013 100644 --- a/addons/chemical/functions/fnc_breathing.sqf +++ b/addons/chemical/functions/fnc_breathing.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * @@ -45,4 +45,4 @@ params ["_unit"]; ] call CBA_fnc_addPerFrameHandler; }, [_unit] -] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/chemical/functions/fnc_canPutGasMask.sqf b/addons/chemical/functions/fnc_canPutGasMask.sqf index 21ce83b8d..fb9ae2937 100644 --- a/addons/chemical/functions/fnc_canPutGasMask.sqf +++ b/addons/chemical/functions/fnc_canPutGasMask.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Caller * 1: Target @@ -19,4 +19,4 @@ params ["_medic", "_patient"]; if(missionNamespace getVariable [QGVAR(availGasmaskList), []] isEqualTo []) exitWith {false}; -!(_patient call ACE_common_fnc_isAwake) && ([_medic,_patient] call FUNC(hasGasmask)) && !((goggles _patient) in (missionNamespace getVariable [QGVAR(availGasmaskList), []])) \ No newline at end of file +!(_patient call ACE_common_fnc_isAwake) && ([_medic,_patient] call FUNC(hasGasmask)) && !((goggles _patient) in (missionNamespace getVariable [QGVAR(availGasmaskList), []])) diff --git a/addons/chemical/functions/fnc_canReplaceFilter.sqf b/addons/chemical/functions/fnc_canReplaceFilter.sqf index 128305204..9bcc0fcd5 100644 --- a/addons/chemical/functions/fnc_canReplaceFilter.sqf +++ b/addons/chemical/functions/fnc_canReplaceFilter.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Target * @@ -18,4 +18,4 @@ params ["_unit"]; if (missionNamespace getVariable [QGVAR(availGasmaskList), []] isEqualTo []) exitWith {false}; -(goggles _unit) in (missionNamespace getVariable [QGVAR(availGasmaskList), []]) && 'kat_gasmaskFilter' in (items _unit); \ No newline at end of file +(goggles _unit) in (missionNamespace getVariable [QGVAR(availGasmaskList), []]) && 'kat_gasmaskFilter' in (items _unit); diff --git a/addons/chemical/functions/fnc_changeGasMaskFilter.sqf b/addons/chemical/functions/fnc_changeGasMaskFilter.sqf index cf89752fe..40e73a42c 100644 --- a/addons/chemical/functions/fnc_changeGasMaskFilter.sqf +++ b/addons/chemical/functions/fnc_changeGasMaskFilter.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Target * diff --git a/addons/chemical/functions/fnc_checkGasMaskDur.sqf b/addons/chemical/functions/fnc_checkGasMaskDur.sqf index 7f669df62..2431d9d44 100644 --- a/addons/chemical/functions/fnc_checkGasMaskDur.sqf +++ b/addons/chemical/functions/fnc_checkGasMaskDur.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Patient * 1: Medic @@ -20,5 +20,5 @@ params ["_patient","_medic"]; if (_medic isEqualTo _patient) then { [_medic, "Gear", 1] call ACEFUNC(common,doGesture); }; - + [{_this call FUNC(displayGasMaskDur)}, [_patient], 1] call CBA_fnc_waitAndExecute; diff --git a/addons/chemical/functions/fnc_chemDetector.sqf b/addons/chemical/functions/fnc_chemDetector.sqf index bc48dbb78..4ca1f69a9 100644 --- a/addons/chemical/functions/fnc_chemDetector.sqf +++ b/addons/chemical/functions/fnc_chemDetector.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Unit * @@ -20,7 +20,7 @@ params ["_unit"]; { params["_args", "_pfhHandler"]; _args params ["_unit"]; - + "KAT_CHEM_DETECTOR" cutRsc ["RscWeaponChemicalDetector", "PLAIN", 1, false]; private _ui = GETUVAR(RscWeaponChemicalDetector,displayNull); private _obj = _ui displayCtrl 101; @@ -35,12 +35,12 @@ params ["_unit"]; }; if (!(_unit getVariable[QGVAR(enteredPoison),false])) exitWith { - + _obj ctrlAnimateModel ["Threat_Level_Source", 0, true]; - + [_pfhHandler] call CBA_fnc_removePerFrameHandler; }; -}, +}, 1, [_unit]] call CBA_fnc_addPerFramehandler; [ @@ -57,4 +57,4 @@ params ["_unit"]; }; }, -6, [_unit]] call CBA_fnc_addPerFramehandler; \ No newline at end of file +6, [_unit]] call CBA_fnc_addPerFramehandler; diff --git a/addons/chemical/functions/fnc_clearChemicalInjuriesLocal.sqf b/addons/chemical/functions/fnc_clearChemicalInjuriesLocal.sqf index 407017ef3..c238c6f80 100644 --- a/addons/chemical/functions/fnc_clearChemicalInjuriesLocal.sqf +++ b/addons/chemical/functions/fnc_clearChemicalInjuriesLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: YetheSamartaka * Clears Chemical injuries for target unit @@ -27,4 +27,4 @@ _unit setVariable [QEGVAR(chemical,timeleft), missionNamespace getVariable [QEGV if (_unit getVariable [QEGVAR(chemical, painEffect), 0] != 0) then { KAT_PAIN_EFFECT ppEffectEnable false; -}; \ No newline at end of file +}; diff --git a/addons/chemical/functions/fnc_coughing.sqf b/addons/chemical/functions/fnc_coughing.sqf index a1fbd0a8f..a841b8a36 100644 --- a/addons/chemical/functions/fnc_coughing.sqf +++ b/addons/chemical/functions/fnc_coughing.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Unit * @@ -16,7 +16,7 @@ params ["_unit"]; [ - { + { params["_unit"]; _unit getVariable [QGVAR(airPoisoning), false] }, diff --git a/addons/chemical/functions/fnc_createSealAction.sqf b/addons/chemical/functions/fnc_createSealAction.sqf index 470219ba2..d45095333 100644 --- a/addons/chemical/functions/fnc_createSealAction.sqf +++ b/addons/chemical/functions/fnc_createSealAction.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Target * @@ -21,7 +21,7 @@ private _action = [ "", { params["_target", "_player"]; - + [_player, "Acts_carFixingWheel"] call ACEFUNC(common,doAnimation); //add time to addon options diff --git a/addons/chemical/functions/fnc_createZone.sqf b/addons/chemical/functions/fnc_createZone.sqf index 1493e86e9..55451a392 100644 --- a/addons/chemical/functions/fnc_createZone.sqf +++ b/addons/chemical/functions/fnc_createZone.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Position (position) * 1: Lifetime (number) @@ -25,14 +25,14 @@ private _gastype = ""; switch (_gasLvL) do { case 1: { //CS _gastype = "CS"; - }; + }; default { //toxic gas (standard) _gastype = "Toxic"; }; }; if (_gastype isEqualTo "CS") then {[getPosASL _logic, _radius, _lifetime] call FUNC(spawnGasSmoke);}; - + [_logic, _pos, _radius, 0, _gastype] call FUNC(gasCheck); private _currentTime = CBA_missionTime; diff --git a/addons/chemical/functions/fnc_csGrenadeThrownFuze.sqf b/addons/chemical/functions/fnc_csGrenadeThrownFuze.sqf index a801d1fb3..2ab8b9e90 100644 --- a/addons/chemical/functions/fnc_csGrenadeThrownFuze.sqf +++ b/addons/chemical/functions/fnc_csGrenadeThrownFuze.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Projectile * @@ -21,4 +21,4 @@ if (alive _projectile) then { private _lifetime = 60 + random[-5,0,9]; [getPosASL _projectile,_lifetime,6,1] call FUNC(createZone); -}; \ No newline at end of file +}; diff --git a/addons/chemical/functions/fnc_displayGasMaskDur.sqf b/addons/chemical/functions/fnc_displayGasMaskDur.sqf index cb93f3c26..5ad4d171f 100644 --- a/addons/chemical/functions/fnc_displayGasMaskDur.sqf +++ b/addons/chemical/functions/fnc_displayGasMaskDur.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Target * @@ -18,7 +18,7 @@ params ["_target"]; private _durability = _target getVariable [QGVAR(gasmask_durability), 10]; private _durabilityStructuredText = if (_durability >= 0) then { - + private _color = [((2 * (1 - _durability / 10)) min 1), ((2 * _durability / 10) min 1), 0]; private _string = ""; diff --git a/addons/chemical/functions/fnc_gasAI.sqf b/addons/chemical/functions/fnc_gasAI.sqf index 76e95d855..dd2b70e7e 100644 --- a/addons/chemical/functions/fnc_gasAI.sqf +++ b/addons/chemical/functions/fnc_gasAI.sqf @@ -1,9 +1,9 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * This cant be called manualy! * Handles the Gas effect for the AI - * + * * Arguments: * 0: Target * 1: Module @@ -23,7 +23,7 @@ params ["_unit", "_logic", "_pos", "_radius_max", "_gastype"]; if (!isDamageAllowed _unit) exitWith { - [_unit] call FUNC(clearChemicalInjuriesLocal); + [_unit] call FUNC(clearChemicalInjuriesLocal); }; [ diff --git a/addons/chemical/functions/fnc_gasCheck.sqf b/addons/chemical/functions/fnc_gasCheck.sqf index 28b1dc0f3..76b9b224c 100644 --- a/addons/chemical/functions/fnc_gasCheck.sqf +++ b/addons/chemical/functions/fnc_gasCheck.sqf @@ -1,9 +1,9 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * This cant be called manualy! * - * + * * Arguments: * 0: Module * 1: Position @@ -60,14 +60,14 @@ private _checkplayers = [{ }; if (!(_x in _playerARR) && _distance < _radius_max) then { - _playerARR pushBack _x; + _playerARR pushBack _x; _logic setVariable [QGVAR(gas_playerArr), _playerARR, true]; [QGVAR(gasCheck_local), [_x, _logic, _pos, _radius_max, _radius_min, _gastype], _x] call CBA_fnc_targetEvent; }; } else { if (_distance < _radius_max && alive _x && !(_x getVariable [QGVAR(enteredPoison), false])) then { - [QGVAR(gasCheck_ai), [_x, _logic, _pos, _radius_max, _gastype], _x] call CBA_fnc_targetEvent; + [QGVAR(gasCheck_ai), [_x, _logic, _pos, _radius_max, _gastype], _x] call CBA_fnc_targetEvent; }; }; } forEach _allUnits; @@ -84,4 +84,4 @@ private _checkplayers = [{ [_checkplayers] call CBA_fnc_removePerFrameHandler; [_pfhHandle] call CBA_fnc_removePerFrameHandler; }; -}, 0, [_logic,_checkplayers]]call CBA_fnc_addPerFrameHandler; \ No newline at end of file +}, 0, [_logic,_checkplayers]]call CBA_fnc_addPerFrameHandler; diff --git a/addons/chemical/functions/fnc_gasCheckLocal.sqf b/addons/chemical/functions/fnc_gasCheckLocal.sqf index 128c22464..fd871dd9c 100644 --- a/addons/chemical/functions/fnc_gasCheckLocal.sqf +++ b/addons/chemical/functions/fnc_gasCheckLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * This cant be called manualy! @@ -76,17 +76,17 @@ if (!isDamageAllowed _unit) exitWith { { params["_args", "_pfhandler"]; _args params ["_unit", "_logic", "_pos", "_radius_max", "_radius_min", "_gastype"]; - + if (!(_logic getVariable [QGVAR(gas_active), false]) || isNull _logic || !(_unit in (_logic getVariable [QGVAR(gas_playerArr), []])) || !(_unit getVariable[QGVAR(enteredPoison), false])) then { [_pfhandler] call CBA_fnc_removePerFrameHandler; }; - + _pos = _logic getVariable [QGVAR(gas_pos), [0, 0, 0]]; if (_unit distance _pos <= _radius_max && !(_unit getVariable [QGVAR(enteredPoison), false]) && !(_unit getVariable ["ACE_isUnconscious", false])) then { _unit setVariable [QGVAR(enteredPoison), true, true]; [QGVAR(enteredPoisonEvent), [_unit], _unit] call CBA_fnc_targetEvent; _unit setVariable [QGVAR(Poisen_logic), _logic, true]; - private _timeEntered = CBA_missiontime; + private _timeEntered = CBA_missiontime; [ { @@ -103,12 +103,12 @@ if (!isDamageAllowed _unit) exitWith { _unit setVariable [QGVAR(timeleft), 0]; [_pfhandler] call CBA_fnc_removePerFrameHandler; }; - + if (_unit distance _pos > _radius_max || !(_logic getVariable[QGVAR(gas_active), false]) || isNull _logic) exitwith { _unit setVariable[QGVAR(enteredPoison), false, true]; [_pfhandler] call CBA_fnc_removePerFrameHandler; }; - + if (_gastype isEqualto "CS") exitwith { [_pfhandler] call CBA_fnc_removePerFrameHandler; [QGVAR(afterWait), [_unit, _logic, _gastype, _radius_max], _unit] call CBA_fnc_targetEvent; @@ -117,9 +117,9 @@ if (!isDamageAllowed _unit) exitWith { 1, [ _radius_max, _radius_min, _unit, _logic, _gastype] ] call CBA_fnc_addPerFrameHandler; - + }; }, 2, [_unit, _logic, _pos, _radius_max, _radius_min, _gastype] -] call CBA_fnc_addPerFrameHandler; \ No newline at end of file +] call CBA_fnc_addPerFrameHandler; diff --git a/addons/chemical/functions/fnc_gasmodule.sqf b/addons/chemical/functions/fnc_gasmodule.sqf index 7946150b9..112eb53f8 100644 --- a/addons/chemical/functions/fnc_gasmodule.sqf +++ b/addons/chemical/functions/fnc_gasmodule.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * This cant be called manualy! @@ -31,7 +31,7 @@ if (_activated) then { if (_isSealable) then { [_object] call FUNC(createSealaction); }; - + [_object, _pos, _radius_max, _radius_min, _gastype] spawn FUNC(gasCheck); } else { private _pos = getPos _logic; diff --git a/addons/chemical/functions/fnc_getChemDetectorState.sqf b/addons/chemical/functions/fnc_getChemDetectorState.sqf index ca8f3bd4a..1330abc7c 100644 --- a/addons/chemical/functions/fnc_getChemDetectorState.sqf +++ b/addons/chemical/functions/fnc_getChemDetectorState.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Unit * 1: Is On/Off @@ -21,4 +21,4 @@ if ("ChemicalDetector_01_watch_F" in (assigneditems _unit) && _currentState == _ true } else { false -}; \ No newline at end of file +}; diff --git a/addons/chemical/functions/fnc_getList.sqf b/addons/chemical/functions/fnc_getList.sqf index 5a1761c6b..8d241ac40 100644 --- a/addons/chemical/functions/fnc_getList.sqf +++ b/addons/chemical/functions/fnc_getList.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * This cant be called manualy! @@ -27,4 +27,4 @@ private _array = []; nil } count _clipstring; -_array \ No newline at end of file +_array diff --git a/addons/chemical/functions/fnc_giveUnitGasMask.sqf b/addons/chemical/functions/fnc_giveUnitGasMask.sqf index 96b971f52..fc0f0656f 100644 --- a/addons/chemical/functions/fnc_giveUnitGasMask.sqf +++ b/addons/chemical/functions/fnc_giveUnitGasMask.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * diff --git a/addons/chemical/functions/fnc_handleCSGas.sqf b/addons/chemical/functions/fnc_handleCSGas.sqf index b44af0a52..c714728d4 100644 --- a/addons/chemical/functions/fnc_handleCSGas.sqf +++ b/addons/chemical/functions/fnc_handleCSGas.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Logic * 1: Radius @@ -20,7 +20,7 @@ params ["_unit", "_logic", "_radius"]; _params params["_unit"]; if (!isDamageAllowed _unit) exitWith { - [_unit] call FUNC(clearChemicalInjuriesLocal); + [_unit] call FUNC(clearChemicalInjuriesLocal); }; if (_unit getVariable[QGVAR(enteredPoison),false]) then { @@ -30,19 +30,19 @@ params ["_unit", "_logic", "_radius"]; _unit say3D QGVAR(cough_1); if (hasInterface) then { private _rndBlur = selectRandom [5, 6, 7, 8]; - ppBlur ppEffectAdjust [_rndBlur]; - ppBlur ppEffectEnable true; + ppBlur ppEffectAdjust [_rndBlur]; + ppBlur ppEffectEnable true; ppBlur ppEffectCommit 5; }; } else { if (hasInterface) then { - ppBlur ppEffectAdjust [0]; - ppBlur ppEffectEnable true; + ppBlur ppEffectAdjust [0]; + ppBlur ppEffectEnable true; ppBlur ppEffectCommit 20; }; _unit setVariable [QGVAR(CS), false, true]; [_handler] call CBA_fnc_removePerFrameHandler; - + }; }, 5, [player]] call CBA_fnc_addPerFrameHandler; @@ -60,4 +60,4 @@ params ["_unit", "_logic", "_radius"]; _unit setVariable[QGVAR(enteredPoison), false, true]; [_handler] call CBA_fnc_removePerFrameHandler; }; -},2,[_logic, _radius, player]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file +},2,[_logic, _radius, player]] call CBA_fnc_addPerFrameHandler; diff --git a/addons/chemical/functions/fnc_handleFired.sqf b/addons/chemical/functions/fnc_handleFired.sqf index e4a5680eb..804561cf5 100644 --- a/addons/chemical/functions/fnc_handleFired.sqf +++ b/addons/chemical/functions/fnc_handleFired.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * @@ -44,8 +44,8 @@ private _gasLvL = [_configClass, "KAT_toxicLvL", 1] call BIS_fnc_returnConfigEnt if (!isNull _projectile) exitwith { _args set [1, getPos _projectile]; }; - + [_posarr, _lifetime, _radius, _gasLvL] call FUNC(createZone); - + [_handler] call CBA_fnc_removePerFrameHandler; -}, 0, [_projectile, [0, 0, 0], [_lifetime, _radius, _gasLvL]]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file +}, 0, [_projectile, [0, 0, 0], [_lifetime, _radius, _gasLvL]]] call CBA_fnc_addPerFrameHandler; diff --git a/addons/chemical/functions/fnc_handleGasMaskDur.sqf b/addons/chemical/functions/fnc_handleGasMaskDur.sqf index 5fc9d9c7b..36fc0d830 100644 --- a/addons/chemical/functions/fnc_handleGasMaskDur.sqf +++ b/addons/chemical/functions/fnc_handleGasMaskDur.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Unit * @@ -40,11 +40,11 @@ params ["_unit"]; private _timeLeft = _maxTime - (CBA_missionTime - _timeEntered); private _percent = round ((10/_maxTime)*_timeLeft); - + if(_currentDurability != _percent) then { _unit setVariable [QGVAR(gasmask_durability),_percent]; }; - + if(_currentDurability <= 0 || _percent <= 0 || !(alive _unit)) exitWith { [_handler] call CBA_fnc_removePerFrameHandler; _unit setVariable [QGVAR(gasmask_durability),0]; @@ -71,4 +71,4 @@ params ["_unit"]; }; }, [_unit] -] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/chemical/functions/fnc_hasGasMaskON.sqf b/addons/chemical/functions/fnc_hasGasMaskON.sqf index a8debc003..c63c11566 100644 --- a/addons/chemical/functions/fnc_hasGasMaskON.sqf +++ b/addons/chemical/functions/fnc_hasGasMaskON.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * @@ -18,4 +18,4 @@ params ["_target"]; if(missionNamespace getVariable [QGVAR(availGasmaskList), []] isEqualTo []) exitWith {false}; -goggles _target in (missionNamespace getVariable [QGVAR(availGasmaskList), []]); \ No newline at end of file +goggles _target in (missionNamespace getVariable [QGVAR(availGasmaskList), []]); diff --git a/addons/chemical/functions/fnc_hasGasmask.sqf b/addons/chemical/functions/fnc_hasGasmask.sqf index 94dafe5b0..f363bf8e7 100644 --- a/addons/chemical/functions/fnc_hasGasmask.sqf +++ b/addons/chemical/functions/fnc_hasGasmask.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: Player * 1: Target @@ -26,4 +26,4 @@ private _patientarr = _patient call ACEFUNC(common,uniqueItems); private _patienthasGasmask = false; { if(_x in (missionNamespace getVariable [QGVAR(availGasmaskList), []])) then {_patienthasGasmask = true} } forEach _patientarr; -if (!_playerhasGasmask && !_patienthasGasmask) then { false } else { true } \ No newline at end of file +if (!_playerhasGasmask && !_patienthasGasmask) then { false } else { true } diff --git a/addons/chemical/functions/fnc_init.sqf b/addons/chemical/functions/fnc_init.sqf index 4fef2c372..086535afd 100644 --- a/addons/chemical/functions/fnc_init.sqf +++ b/addons/chemical/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * diff --git a/addons/chemical/functions/fnc_initModule.sqf b/addons/chemical/functions/fnc_initModule.sqf index 2870768db..611b8a16f 100644 --- a/addons/chemical/functions/fnc_initModule.sqf +++ b/addons/chemical/functions/fnc_initModule.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * Initializes placed Module + * Initializes placed Module * * Arguments: * 0: Logic @@ -38,4 +38,4 @@ if (isNil _function) then { _function = missionNamespace getVariable _function; }; -[_function, _logic] call CBA_fnc_execNextFrame; \ No newline at end of file +[_function, _logic] call CBA_fnc_execNextFrame; diff --git a/addons/chemical/functions/fnc_spawnSmoke.sqf b/addons/chemical/functions/fnc_spawnSmoke.sqf index 6c056dcc1..822c5099d 100644 --- a/addons/chemical/functions/fnc_spawnSmoke.sqf +++ b/addons/chemical/functions/fnc_spawnSmoke.sqf @@ -1,7 +1,7 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii - * + * * Arguments: * 0: PosX * 1: PosY @@ -17,7 +17,7 @@ * * */ -params ["_posX","_posY","_posZ"]; +params ["_posX","_posY","_posZ"]; private _smoke = "KAT_GASTrip_SmokeEffect" createVehicle [_posX,_posY,_posZ]; hideObjectGlobal _smoke; @@ -27,4 +27,4 @@ private _pos = [_posX,_posY,_posZ]; [_pos,240,5,0] call FUNC(createZone); -["KAT_tripGasTriggered", [_smoke, [_posX,_posY,_posZ]]] call CBA_fnc_globalEvent; \ No newline at end of file +["KAT_tripGasTriggered", [_smoke, [_posX,_posY,_posZ]]] call CBA_fnc_globalEvent; diff --git a/addons/chemical/functions/fnc_throwGrenade.sqf b/addons/chemical/functions/fnc_throwGrenade.sqf index 34bfcc34e..d7b857e1b 100644 --- a/addons/chemical/functions/fnc_throwGrenade.sqf +++ b/addons/chemical/functions/fnc_throwGrenade.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * diff --git a/addons/chemical/functions/fnc_ui_gasModule.sqf b/addons/chemical/functions/fnc_ui_gasModule.sqf index a64cd88e6..97efcb739 100644 --- a/addons/chemical/functions/fnc_ui_gasModule.sqf +++ b/addons/chemical/functions/fnc_ui_gasModule.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGii * Creates the UI for the Zeus Module @@ -31,7 +31,7 @@ private _fnc_onUnload = { if (isNull _logic) exitWith {}; if !(_display getVariable [QGVAR(Confirmed), false]) then { - if !(isNull attachedTo _logic) then + if !(isNull attachedTo _logic) then { deleteVehicle _logic; } else @@ -65,7 +65,7 @@ if !(isNull attachedTo _logic) then { }; default {}; }; - + }; private _fnc_onConfirm = { @@ -89,17 +89,17 @@ private _fnc_onConfirm = { }; private _radius_max = _display getVariable [QGVAR(ui_radiusMax), 20]; - private _radius_min = _display getVariable [QGVAR(ui_radiusMin), 10]; + private _radius_min = _display getVariable [QGVAR(ui_radiusMin), 10]; if(_radius_min > _radius_max) then { [CSTRING(GasModule_Needbigger)] call ACEFUNC(zeus,showMessage); } else { private _logic = missionNamespace getVariable ["BIS_fnc_initCuratorAttributes_target",objNull]; if (isNull _logic) exitWith {}; - + if !(isNull attachedTo _logic) then { private _object = attachedto _logic; private _position = getPos _object; - + [_logic,_position,_radius_max,_radius_min,_gastype] call FUNC(gasCheck); if (_display getVariable[QGVAR(ui_sealable),false]) then { diff --git a/addons/chemical/functions/script_component.hpp b/addons/chemical/functions/script_component.hpp deleted file mode 100644 index 7c607001e..000000000 --- a/addons/chemical/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\chemical\script_component.hpp" diff --git a/addons/chemical/script_component.hpp b/addons/chemical/script_component.hpp index b5dd16eac..6661c6c66 100644 --- a/addons/chemical/script_component.hpp +++ b/addons/chemical/script_component.hpp @@ -14,145 +14,4 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_CHEMICAL #endif -#include "\x\kat\addons\main\script_macros.hpp" -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" - -#include "\a3\ui_f\hpp\defineResincl.inc" -#include "\a3\ui_f\hpp\defineDIKCodes.inc" -#include "\a3\ui_f\hpp\defineCommonGrids.inc" -#include "\a3\ui_f\hpp\defineCommonColors.inc" - -// Default versioning level -#define DEFAULT_VERSIONING_LEVEL 2 - - -#define IDC_INJURIES 1410 - -#define IDD_MEDICAL_MENU 38580 - -#define IDC_BODY_GROUP 6000 -#define IDC_BODY_HEAD 6005 -#define IDC_BODY_TORSO 6010 -#define IDC_BODY_ARMLEFT 6015 -#define IDC_BODY_ARMRIGHT 6020 -#define IDC_BODY_LEGLEFT 6025 -#define IDC_BODY_LEGRIGHT 6030 -#define IDC_BODY_ARMLEFT_T 6035 -#define IDC_BODY_ARMRIGHT_T 6040 -#define IDC_BODY_LEGLEFT_T 6045 -#define IDC_BODY_LEGRIGHT_T 6050 -#define IDC_BODY_ARMLEFT_B 6055 -#define IDC_BODY_ARMRIGHT_B 6060 -#define IDC_BODY_LEGLEFT_B 6065 -#define IDC_BODY_LEGRIGHT_B 6070 - -#define IDC_TRIAGE_STATUS 7000 -#define IDC_TRIAGE_SELECT 7100 - -#define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) -#define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) -#define POS_W(N) ((N) * GUI_GRID_W) -#define POS_H(N) ((N) * GUI_GRID_H) -#define PATIENT_INFO_IGUI_BASE_X (safeZoneX + POS_W(2)) -#define PATIENT_INFO_IGUI_BASE_Y (safeZoneY + POS_H(1)) - - - -#define SIZEX ((safeZoneW / safeZoneH) min 1.2) -#define SIZEY (SIZEX / 1.2) -#define W_PART(num) (num * (SIZEX / 40)) -#define H_PART(num) (num * (SIZEY / 25)) -#define X_PART(num) (W_PART(num) + (safeZoneX + (safeZoneW - SIZEX) / 2)) -#define Y_PART(num) (H_PART(num) + (safeZoneY + (safeZoneH - SIZEY) / 2)) - -#define CAN_CREATE_NONE -1 -#define CAN_CREATE_ADMIN 0 -#define CAN_CREATE_CONSOLE 1 -#define CAN_CREATE_ALL 2 - -// weapon types -#define TYPE_WEAPON_PRIMARY 1 -#define TYPE_WEAPON_HANDGUN 2 -#define TYPE_WEAPON_SECONDARY 4 -// magazine types -#define TYPE_MAGAZINE_HANDGUN_AND_GL 16 // mainly -#define TYPE_MAGAZINE_PRIMARY_AND_THROW 256 -#define TYPE_MAGAZINE_SECONDARY_AND_PUT 512 // mainly -#define TYPE_MAGAZINE_MISSILE 768 -// more types -#define TYPE_BINOCULAR_AND_NVG 4096 -#define TYPE_WEAPON_VEHICLE 65536 -#define TYPE_ITEM 131072 -// item types -#define TYPE_DEFAULT 0 -#define TYPE_MUZZLE 101 -#define TYPE_OPTICS 201 -#define TYPE_FLASHLIGHT 301 -#define TYPE_BIPOD 302 -#define TYPE_FIRST_AID_KIT 401 -#define TYPE_FINS 501 // not implemented -#define TYPE_BREATHING_BOMB 601 // not implemented -#define TYPE_NVG 602 -#define TYPE_GOGGLE 603 -#define TYPE_SCUBA 604 // not implemented -#define TYPE_HEADGEAR 605 -#define TYPE_FACTOR 607 -#define TYPE_RADIO 611 -#define TYPE_HMD 616 -#define TYPE_BINOCULAR 617 -#define TYPE_MEDIKIT 619 -#define TYPE_TOOLKIT 620 -#define TYPE_UAV_TERMINAL 621 -#define TYPE_VEST 701 -#define TYPE_UNIFORM 801 -#define TYPE_BACKPACK 901 - -#ifdef DISABLE_COMPILE_CACHE - #undef PREP - #define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QPATHTOF(functions\DOUBLES(fnc,fncName).sqf) -#else - #undef PREP - #define PREP(fncName) [QPATHTOF(functions\DOUBLES(fnc,fncName).sqf), QFUNC(fncName)] call CBA_fnc_compileFunction -#endif - -#define PREP_MODULE(folder) [] call compile preprocessFileLineNumbers QPATHTOF(folder\__PREP__.sqf) - -#define ACE_isHC (!hasInterface && !isDedicated) - -#define IDC_STAMINA_BAR 193 - -#define ACE_DEPRECATED(arg1,arg2,arg3) WARNING_3("%1 is deprecated. Support will be dropped in version %2. Replaced by: %3",arg1,arg2,arg3) - -#define PFORMAT_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) \ - format ['%1: A=%2, B=%3, C=%4, D=%5, E=%6, F=%7, G=%8, H=%9, I=%10 J=%11', MESSAGE, RETNIL(A), RETNIL(B), RETNIL(C), RETNIL(D), RETNIL(E), RETNIL(F), RETNIL(G), RETNIL(H), RETNIL(I), RETNIL(J)] -#ifdef DEBUG_MODE_FULL -#define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) LOG_SYS_FILELINENUMBERS('TRACE',PFORMAT_10(str diag_frameNo + ' ' + (MESSAGE),A,B,C,D,E,F,G,H,I,J)) -#else - #define TRACE_10(MESSAGE,A,B,C,D,E,F,G,H,I,J) /* disabled */ -#endif - -#define GRAVITY 9.8066 - -#define SD_TO_MIN_MAX(d) ((d) * 3.371) // Standard deviation -> min / max of random [min, mid, max] - -// Angular unit conversion -#define MRAD_TO_MOA(d) ((d) * 3.43774677) // Conversion factor: 54 / (5 * PI) -#define MOA_TO_MRAD(d) ((d) * 0.29088821) // Conversion factor: (5 * PI) / 54 -#define DEG_TO_MOA(d) ((d) * 60) // Conversion factor: 60 -#define MOA_TO_DEG(d) ((d) / 60) // Conversion factor: 1 / 60 -#define DEG_TO_MRAD(d) ((d) * 17.45329252) // Conversion factor: (50 * PI) / 9 -#define MRAD_TO_DEG(d) ((d) / 17.45329252) // Conversion factor: 9 / (50 * PI) -#define MOA_TO_RAD(d) ((d) * 0.00029088) // Conversion factor: PI / 10800 - -#define ZEUS_ACTION_CONDITION ([_target, {QUOTE(QUOTE(ADDON)) in curatorAddons _this}, missionNamespace, QUOTE(QGVAR(zeusCheck)), 1E11, 'ace_interactMenuClosed'] call EFUNC(common,cachedCall)) - - - - -#define GET_POISONING(unit) (unit getVariable [VAR_poisoning, 0]) - - -#define ANIMATION_SPEED_MIN_COEFFICIENT 0.5 - -// Animations that would be played faster than this are instead skipped. (= Progress bar too quick for animation). -#define ANIMATION_SPEED_MAX_COEFFICIENT 2.5 +#include "\x\kat\addons\main\script_macros.hpp" \ No newline at end of file diff --git a/addons/chemical/ui/RscAttributes.hpp b/addons/chemical/ui/RscAttributes.hpp index 58a4d578e..969ac852f 100644 --- a/addons/chemical/ui/RscAttributes.hpp +++ b/addons/chemical/ui/RscAttributes.hpp @@ -114,8 +114,8 @@ class GVAR(kat_RscAtributeRadius): RscControlsGroupNoScrollbars { class GVAR(kat_RscGasModul): RscDisplayAttributes { - onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(kat_RscGasModul))] call EFUNC(zeus,zeusAttributes)); - onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(kat_RscGasModul))] call EFUNC(zeus,zeusAttributes)); + onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(kat_RscGasModul))] call EFUNC(zeus,zeusAttributes)); + onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(kat_RscGasModul))] call EFUNC(zeus,zeusAttributes)); class Controls: Controls { class Background: Background {}; diff --git a/addons/circulation/ACE_Medical_Treatment_Actions.hpp b/addons/circulation/ACE_Medical_Treatment_Actions.hpp index 9dab763d3..8e647e790 100644 --- a/addons/circulation/ACE_Medical_Treatment_Actions.hpp +++ b/addons/circulation/ACE_Medical_Treatment_Actions.hpp @@ -40,8 +40,8 @@ class ACE_Medical_Treatment_Actions { category = "advanced"; medicRequired = 0; consumeItem = 1; - callbackSuccess = QUOTE([ARR_3(_medic, _patient,500)] call FUNC(drawBlood)); - condition = QUOTE([ARR_3(_medic, _patient,500)] call FUNC(canDraw)); + callbackSuccess = QUOTE([ARR_3(_medic,_patient,500)] call FUNC(drawBlood)); + condition = QUOTE([ARR_3(_medic,_patient,500)] call FUNC(canDraw)); items[] = {"KAT_Empty_bloodIV_500"}; animationPatient = ""; animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback"; @@ -56,8 +56,8 @@ class ACE_Medical_Treatment_Actions { category = "advanced"; medicRequired = 0; consumeItem = 1; - callbackSuccess = QUOTE([ARR_3(_medic, _patient,250)] call FUNC(drawBlood)); - condition = QUOTE([ARR_3(_medic, _patient,250)] call FUNC(canDraw)); + callbackSuccess = QUOTE([ARR_3(_medic,_patient,250)] call FUNC(drawBlood)); + condition = QUOTE([ARR_3(_medic,_patient,250)] call FUNC(canDraw)); items[] = {"KAT_Empty_bloodIV_250"}; animationPatient = ""; animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback"; @@ -74,9 +74,9 @@ class ACE_Medical_Treatment_Actions { treatmentTime = 0.01; items[] = {}; consumeItem = 0; - condition = QUOTE([ARR_2(_medic, _patient)] call FUNC(Defibrillator_CheckCondition)); + condition = QUOTE([ARR_2(_medic,_patient)] call FUNC(Defibrillator_CheckCondition)); callbackStart = ""; - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(AED_Analyze)); + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(AED_Analyze)); medicRequired = QGVAR(medLvl_AED); animationPatient = ""; animationPatientUnconscious = "AinjPpneMstpSnonWrflDnon_rolltoback"; @@ -94,7 +94,7 @@ class ACE_Medical_Treatment_Actions { consumeItem = 0; callbackStart = ""; callbackProgress = ""; - callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]); + callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]); callbackFailure = ""; animationMedic = ""; treatmentLocations = QGVAR(useLocation_AED); @@ -109,11 +109,11 @@ class ACE_Medical_Treatment_Actions { icon = QPATHTOF(ui\icon_aed_pads.paa); items[] = {"kat_AED"}; treatmentTime = QGVAR(DefibrillatorPads_AttachTime); - condition = QUOTE([ARR_3(_medic, _patient, 0)] call FUNC(Defibrillator_Pads_CheckCondition)); + condition = QUOTE([ARR_3(_medic,_patient,0)] call FUNC(Defibrillator_Pads_CheckCondition)); consumeItem = 0; callbackStart = ""; callbackProgress = ""; - callbackSuccess = QUOTE([ARR_4(_medic, _patient, 0, 'kat_AED')] call FUNC(Defibrillator_AttachPads)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,0,'kat_AED')] call FUNC(Defibrillator_AttachPads)); callbackFailure = ""; animationMedic = "AinvPknlMstpSnonWnonDr_medic0"; treatmentLocations = QGVAR(useLocation_AED); @@ -125,47 +125,47 @@ class ACE_Medical_Treatment_Actions { class AEDStationPlacePads: AEDPlacePads { displayName = CSTRING(AEDStation_Action_PlacePads); items[] = {}; - condition = QUOTE([ARR_5(_medic, _patient, 1, 'kat_AED', _extraArgs)] call FUNC(Defibrillator_Pads_CheckCondition)); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, 1, 'kat_AED', _extraArgs)] call FUNC(Defibrillator_AttachPads)); + condition = QUOTE([ARR_5(_medic,_patient,1,'kat_AED',_extraArgs)] call FUNC(Defibrillator_Pads_CheckCondition)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,1,'kat_AED',_extraArgs)] call FUNC(Defibrillator_AttachPads)); }; class AEDVehiclePlacePads: AEDPlacePads { displayName = CSTRING(AEDVehicle_Action_PlacePads); items[] = {}; - condition = QUOTE([ARR_3(_medic, _patient, 2)] call FUNC(Defibrillator_Pads_CheckCondition)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, 2, 'kat_AED')] call FUNC(Defibrillator_AttachPads)); + condition = QUOTE([ARR_3(_medic,_patient,2)] call FUNC(Defibrillator_Pads_CheckCondition)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,2,'kat_AED')] call FUNC(Defibrillator_AttachPads)); }; class AEDXCharge: AEDShock { displayName = CSTRING(Defibrillator_Action_Charge); - condition = QUOTE(([ARR_2(_medic,_patient)] call ACEFUNC(medical_treatment,canCPR)) && !(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)]) && _patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && !(_patient getVariable [ARR_2(QQGVAR(Defibrillator_Charged),false)]) && !(_patient getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)]) && {((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [])]) select 2) isEqualTo 'kat_X_AED'}); - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(Defibrillator_ManualCharge)); + condition = QUOTE(([ARR_2(_medic,_patient)] call ACEFUNC(medical_treatment,canCPR)) && !(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)]) && _patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && !(_patient getVariable [ARR_2(QQGVAR(Defibrillator_Charged),false)]) && !(_patient getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)]) && {((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[])]) select 2) isEqualTo 'kat_X_AED'}); + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(Defibrillator_ManualCharge)); medicRequired = QGVAR(medLvl_AED_X); }; class AEDCancelCharge: AEDShock { displayName = CSTRING(Defibrillator_Action_CancelCharge); condition = QUOTE(_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && _patient getVariable [ARR_2(QQGVAR(Defibrillator_Charged),false)] && _patient getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)]); - callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(DefibrillatorInUse), false, true)]; _patient setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]); + callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(DefibrillatorInUse),false,true)]; _patient setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]); medicRequired = QGVAR(medLvl_AED); }; class AEDXPlacePads: AEDPlacePads { displayName = CSTRING(AEDX_Action_PlacePads); displayNameProgress = CSTRING(Defibrillator_Action_PlacePads_Progress); items[] = {"kat_X_AED"}; - condition = QUOTE([ARR_4(_medic, _patient, 0, 'kat_X_AED')] call FUNC(Defibrillator_Pads_CheckCondition)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, 0, 'kat_X_AED')] call FUNC(Defibrillator_AttachPads)); + condition = QUOTE([ARR_4(_medic,_patient,0,'kat_X_AED')] call FUNC(Defibrillator_Pads_CheckCondition)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,0,'kat_X_AED')] call FUNC(Defibrillator_AttachPads)); medicRequired = QGVAR(medLvl_AED_X); icon = QPATHTOF(ui\icon_aedx.paa); }; class AEDXStationPlacePads: AEDXPlacePads { displayName = CSTRING(AEDXStation_Action_PlacePads); items[] = {}; - condition = QUOTE([ARR_5(_medic, _patient, 1, 'kat_X_AED', _extraArgs)] call FUNC(Defibrillator_Pads_CheckCondition)); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, 1, 'kat_X_AED', _extraArgs)] call FUNC(Defibrillator_AttachPads)); + condition = QUOTE([ARR_5(_medic,_patient,1,'kat_X_AED',_extraArgs)] call FUNC(Defibrillator_Pads_CheckCondition)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,1,'kat_X_AED',_extraArgs)] call FUNC(Defibrillator_AttachPads)); }; class AEDXVehiclePlacePads: AEDXPlacePads { displayName = CSTRING(AEDXVehicle_Action_PlacePads); items[] = {}; - condition = QUOTE([ARR_4(_medic, _patient, 2, 'kat_X_AED')] call FUNC(Defibrillator_Pads_CheckCondition)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, 2, 'kat_X_AED')] call FUNC(Defibrillator_AttachPads)); + condition = QUOTE([ARR_4(_medic,_patient,2,'kat_X_AED')] call FUNC(Defibrillator_Pads_CheckCondition)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,2,'kat_X_AED')] call FUNC(Defibrillator_AttachPads)); }; class DefibrillatorRemovePads: AEDPlacePads { displayName = CSTRING(Defibrillator_Action_RemovePads); @@ -173,7 +173,7 @@ class ACE_Medical_Treatment_Actions { items[] = {}; treatmentTime = QGVAR(DefibrillatorPads_DetachTime); condition = QUOTE(_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)]); - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(Defibrillator_RemovePads)); + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(Defibrillator_RemovePads)); animationMedic = "AinvPknlMstpSnonWnonDr_medic0"; medicRequired = QGVAR(medLvl_AED); animationPatient = ""; @@ -187,28 +187,28 @@ class ACE_Medical_Treatment_Actions { category = "examine"; items[] = {"kat_X_AED"}; treatmentTime = QGVAR(AEDX_VitalsMonitor_AttachTime); - condition = QUOTE([ARR_2(_medic, _patient)] call FUNC(AEDX_VitalsMonitor_CheckCondition)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, _bodyPart, 0)] call FUNC(AEDX_ConnectVitalsMonitor)); + condition = QUOTE([ARR_2(_medic,_patient)] call FUNC(AEDX_VitalsMonitor_CheckCondition)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,_bodyPart,0)] call FUNC(AEDX_ConnectVitalsMonitor)); }; class AEDXStationConnectVitalsMonitor: AEDXConnectVitalsMonitor { displayName = CSTRING(AEDXStation_Action_ConnectMonitor); items[] = {}; - condition = QUOTE([ARR_4(_medic, _patient, 1, _extraArgs)] call FUNC(AEDX_VitalsMonitor_CheckCondition)); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, _bodyPart, 1, _extraArgs)] call FUNC(AEDX_ConnectVitalsMonitor)); + condition = QUOTE([ARR_4(_medic,_patient,1,_extraArgs)] call FUNC(AEDX_VitalsMonitor_CheckCondition)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,_bodyPart,1,_extraArgs)] call FUNC(AEDX_ConnectVitalsMonitor)); }; class AEDXVehicleConnectVitalsMonitor: AEDXConnectVitalsMonitor { displayName = CSTRING(AEDXVehicle_Action_ConnectMonitor); items[] = {}; - condition = QUOTE([ARR_3(_medic, _patient, 2)] call FUNC(AEDX_VitalsMonitor_CheckCondition)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, _bodyPart, 2)] call FUNC(AEDX_ConnectVitalsMonitor)); + condition = QUOTE([ARR_3(_medic,_patient,2)] call FUNC(AEDX_VitalsMonitor_CheckCondition)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,_bodyPart,2)] call FUNC(AEDX_ConnectVitalsMonitor)); }; class AEDXDisconnectVitalsMonitor: AEDXConnectVitalsMonitor { displayName = CSTRING(AEDX_Action_DisconnectMonitor); displayNameProgress = CSTRING(AEDX_Action_Disconnecting_Progress); items[] = {}; treatmentTime = QGVAR(AEDX_VitalsMonitor_DetachTime); - condition = QUOTE(_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected), false)]); - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(AEDX_DisconnectVitalsMonitor)); + condition = QUOTE(_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected),false)]); + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(AEDX_DisconnectVitalsMonitor)); }; class DisableAEDXAudio { displayName = CSTRING(AEDX_Action_DisableAudio); @@ -220,25 +220,25 @@ class ACE_Medical_Treatment_Actions { allowedSelections[] = {"Head","LeftArm","RightArm","Body","LeftLeg","RightLeg"}; treatmentTime = 0.01; allowSelfTreatment = 0; - condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected), false)] || _patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected), false)]) && ((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [ARR_3(-1,-1,-1)])]) select 2 isEqualTo 'kat_X_AED') && (_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_VolumePatient), false)])); + condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] || _patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected),false)]) && ((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[ARR_3(-1,-1,-1)])]) select 2 isEqualTo 'kat_X_AED') && (_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_VolumePatient),false)])); callbackProgress = ""; callbackStart = ""; callbackFailure = ""; - callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient), false, true)]; if((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [ARR_3(-1,-1,-1)])]) select 1 isEqualTo 1) then {[ARR_2(((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), nil)]) select 0), false)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)}); + callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient),false,true)]; if((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[ARR_3(-1,-1,-1)])]) select 1 isEqualTo 1) then {[ARR_2(((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),nil)]) select 0),false)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)}); animationPatient = ""; animationMedic = ""; }; class EnableAEDXAudio: DisableAEDXAudio { displayName = CSTRING(AEDX_Action_EnableAudio); icon = QPATHTOF(ui\icon_aedx_volume_on.paa); - condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected), false)] || _patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected), false)]) && {((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [ARR_3(-1,-1,-1)])]) select 2 isEqualTo 'kat_X_AED') && !(_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_VolumePatient), false)])}); - callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient), true, true)]; if((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [ARR_3(-1,-1,-1)])]) select 1 isEqualTo 1) then {[ARR_2(((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [ARR_3(-1,-1,-1)])]) select 0), true)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)}); + condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] || _patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected),false)]) && {((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[ARR_3(-1,-1,-1)])]) select 2 isEqualTo 'kat_X_AED') && !(_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_VolumePatient),false)])}); + callbackSuccess = QUOTE(_patient setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient),true,true)]; if((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[ARR_3(-1,-1,-1)])]) select 1 isEqualTo 1) then {[ARR_2(((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[ARR_3(-1,-1,-1)])]) select 0),true)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)}); }; class AEDXMeasureBloodPressure: AnalyzeRhythm { displayName = CSTRING(AEDX_Monitor_MeasureBloodPressure); allowedSelections[] = {"Head","LeftArm","RightArm","Body","LeftLeg","RightLeg"}; icon = QPATHTOF(ui\icon_aed_pads.paa); - condition = QUOTE(_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected), false)] && (missionNamespace getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_BloodPressureInterval), 0)] > 0)); + condition = QUOTE(_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected),false)] && (missionNamespace getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_BloodPressureInterval),0)] > 0)); callbackSuccess = QUOTE(_patient call FUNC(measureBloodPressure)); medicRequired = QGVAR(medLvl_AED_X); }; @@ -252,9 +252,9 @@ class ACE_Medical_Treatment_Actions { treatmentTime = 0.01; items[] = {}; consumeItem = 0; - condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && {((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider), [ARR_3(-1,-1,-1)])] select 2) isEqualTo 'kat_X_AED')}) || (_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected),false)])); + condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && {((_patient getVariable [ARR_2(QQGVAR(Defibrillator_Provider),[ARR_3(-1,-1,-1)])] select 2) isEqualTo 'kat_X_AED')}) || (_patient getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Connected),false)])); callbackStart = ""; - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(AEDX_ViewMonitor)); + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(AEDX_ViewMonitor)); animationPatient = ""; animationPatientUnconscious = ""; animationPatientUnconsciousExcludeOn[] = {"ainjppnemstpsnonwrfldnon"}; diff --git a/addons/circulation/CfgEventHandlers.hpp b/addons/circulation/CfgEventHandlers.hpp index c26ebc2ff..4551ce282 100644 --- a/addons/circulation/CfgEventHandlers.hpp +++ b/addons/circulation/CfgEventHandlers.hpp @@ -8,7 +8,7 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; }; diff --git a/addons/circulation/CfgVehicles.hpp b/addons/circulation/CfgVehicles.hpp index a3f7f2e16..13e04a345 100644 --- a/addons/circulation/CfgVehicles.hpp +++ b/addons/circulation/CfgVehicles.hpp @@ -42,30 +42,30 @@ class CfgVehicles { condition = "true"; class KAT_AED_AnalyzeRhythm { displayName = CSTRING(AnalyzeRhythm); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_3(_player, _target, 2)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_2(_player, (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]))] call FUNC(AED_Analyze)); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_3(_player,_target,2)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_2(_player,(_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]))] call FUNC(AED_Analyze)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_shock.paa); }; class KAT_AED_Shock { displayName = CSTRING(Defibrillator_Action_Shock); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_3(_player, _target, 3)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE((_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]) setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_3(_player,_target,3)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE((_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]) setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_shock.paa); }; class KAT_AED_PlacePads { displayName = CSTRING(AED_Action_PlacePads); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_2(_player, _target)] call FUNC(AEDXPlaced_CheckCondition)); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_2(_player,_target)] call FUNC(AEDXPlaced_CheckCondition)); statement = ""; - insertChildren = QUOTE([ARR_2(_player, _target)] call FUNC(addDefibrillatorActions)); + insertChildren = QUOTE([ARR_2(_player,_target)] call FUNC(addDefibrillatorActions)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_pads.paa); }; class KAT_AED_RemovePads: KAT_AED_PlacePads { displayName = CSTRING(Defibrillator_Action_RemovePads); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_3(_player, _target, 4)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_4(_player, (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]), 'body', 'DefibrillatorRemovePads')] call ace_medical_treatment_fnc_treatment); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED))] call ACEFUNC(medical_treatment,isMedic) && [ARR_3(_player,_target,4)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_4(_player,(_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]),'body','DefibrillatorRemovePads')] call ace_medical_treatment_fnc_treatment); insertChildren = ""; }; }; @@ -87,96 +87,96 @@ class CfgVehicles { condition = "true"; class KAT_AED_X_ViewMonitor { displayName = CSTRING(ViewMonitor); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED_X))] call ACEFUNC(medical_treatment,isMedic)); - statement = QUOTE([ARR_3(_player, _target, 1)] call FUNC(AEDX_ViewMonitor)); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED_X))] call ACEFUNC(medical_treatment,isMedic)); + statement = QUOTE([ARR_3(_player,_target,1)] call FUNC(AEDX_ViewMonitor)); showDisabled = 0; icon = QPATHTOF(ui\icon_aedx_monitor.paa); }; class KAT_AED_X_ManualCharge { displayName = CSTRING(Defibrillator_Action_Charge); - condition = QUOTE([ARR_3(_player, _target, 7)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_2(_player, (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]))] call FUNC(Defibrillator_ManualCharge)); + condition = QUOTE([ARR_3(_player,_target,7)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_2(_player,(_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]))] call FUNC(Defibrillator_ManualCharge)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_shock.paa); }; class KAT_AED_X_CancelCharge { displayName = CSTRING(Defibrillator_Action_CancelCharge); - condition = QUOTE([ARR_3(_player, _target, 8)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE((_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]) setVariable [ARR_3(QQGVAR(DefibrillatorInUse), false, true)]; (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]) setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]); + condition = QUOTE([ARR_3(_player,_target,8)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE((_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]) setVariable [ARR_3(QQGVAR(DefibrillatorInUse),false,true)]; (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]) setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_shock.paa); }; class KAT_AED_X_Shock { displayName = CSTRING(Defibrillator_Action_Shock); - condition = QUOTE([ARR_3(_player, _target, 3)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE((_target getVariable QQGVAR(Defibrillator_Patient)) setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]); + condition = QUOTE([ARR_3(_player,_target,3)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE((_target getVariable QQGVAR(Defibrillator_Patient)) setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_shock.paa); }; class KAT_AED_X_AnalyzeRhythm { displayName = CSTRING(AnalyzeRhythm); - condition = QUOTE([ARR_3(_player, _target, 2)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_3(_player, (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]), 'AEDX')] call FUNC(AED_Analyze)); + condition = QUOTE([ARR_3(_player,_target,2)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_3(_player,(_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]),'AEDX')] call FUNC(AED_Analyze)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_shock.paa); }; class KAT_AED_X_PlacePads { displayName = CSTRING(AEDX_Action_PlacePads); - condition = QUOTE([ARR_3(_player, _target, 1)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_5(_player, (_target getVariable QQGVAR(AED_X_VitalsMonitor_Patient)), 'body', 'AEDXStationPlacePads', [_target])] call EFUNC(misc,treatment)); + condition = QUOTE([ARR_3(_player,_target,1)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_5(_player,(_target getVariable QQGVAR(AED_X_VitalsMonitor_Patient)),'body','AEDXStationPlacePads',[_target])] call EFUNC(misc,treatment)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_pads.paa); }; class KAT_AED_X_PlacePadsTo: KAT_AED_X_PlacePads { displayName = CSTRING(AEDX_Action_PlacePads); - condition = QUOTE([ARR_2(_player, _target)] call FUNC(AEDXPlaced_CheckCondition)); + condition = QUOTE([ARR_2(_player,_target)] call FUNC(AEDXPlaced_CheckCondition)); statement = ""; - insertChildren = QUOTE([ARR_3(_player, _target, 1)] call FUNC(addDefibrillatorActions)); + insertChildren = QUOTE([ARR_3(_player,_target,1)] call FUNC(addDefibrillatorActions)); }; class KAT_AED_X_RemovePads: KAT_AED_X_PlacePads { displayName = CSTRING(Defibrillator_Action_RemovePads); - condition = QUOTE([ARR_3(_player, _target, 4)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_4(_player, (_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient), nil)]), 'body', 'DefibrillatorRemovePads')] call EFUNC(misc,treatment)); + condition = QUOTE([ARR_3(_player,_target,4)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_4(_player,(_target getVariable [ARR_2(QQGVAR(Defibrillator_Patient),nil)]),'body','DefibrillatorRemovePads')] call EFUNC(misc,treatment)); insertChildren = ""; icon = QPATHTOF(ui\icon_aed_pads.paa); }; class KAT_AED_X_ConnectMonitor { displayName = CSTRING(AEDX_Action_ConnectMonitor); - condition = QUOTE([ARR_3(_player, _target, 5)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_5(_player, (_target getVariable QQGVAR(Defibrillator_Patient)), 'rightarm', 'AEDXStationConnectVitalsMonitor', [_target])] call EFUNC(misc,treatment)); - insertChildren = QUOTE([ARR_3(_player, _target, 3)] call FUNC(addDefibrillatorActions)); + condition = QUOTE([ARR_3(_player,_target,5)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_5(_player,(_target getVariable QQGVAR(Defibrillator_Patient)),'rightarm','AEDXStationConnectVitalsMonitor',[_target])] call EFUNC(misc,treatment)); + insertChildren = QUOTE([ARR_3(_player,_target,3)] call FUNC(addDefibrillatorActions)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_pads.paa); }; class KAT_AED_X_ConnectMonitorTo: KAT_AED_X_ConnectMonitor { displayName = CSTRING(AEDX_Action_ConnectMonitor); - condition = QUOTE([ARR_2(_player, _target)] call FUNC(AEDXPlaced_CheckCondition)); + condition = QUOTE([ARR_2(_player,_target)] call FUNC(AEDXPlaced_CheckCondition)); statement = ""; - insertChildren = QUOTE([ARR_3(_player, _target, 2)] call FUNC(addDefibrillatorActions)); + insertChildren = QUOTE([ARR_3(_player,_target,2)] call FUNC(addDefibrillatorActions)); }; class KAT_AED_X_DisconnectMonitor { displayName = CSTRING(AEDX_Action_DisconnectMonitor); - condition = QUOTE([ARR_3(_player, _target, 6)] call FUNC(AEDXPlaced_CheckCondition)); - statement = QUOTE([ARR_4(_player, (_target getVariable QQGVAR(AED_X_VitalsMonitor_Patient)), 'rightarm', 'AEDXDisconnectVitalsMonitor')] call EFUNC(misc,treatment)); + condition = QUOTE([ARR_3(_player,_target,6)] call FUNC(AEDXPlaced_CheckCondition)); + statement = QUOTE([ARR_4(_player,(_target getVariable QQGVAR(AED_X_VitalsMonitor_Patient)),'rightarm','AEDXDisconnectVitalsMonitor')] call EFUNC(misc,treatment)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_pads.paa); }; class KAT_AED_X_EnableAudio { displayName = CSTRING(AEDX_Action_EnableAudio); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED_X))] call ACEFUNC(medical_treatment,isMedic) && !(_target getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume), false)])); - statement = QUOTE(_target setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume), true, true)]; [ARR_2(_target, true)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED_X))] call ACEFUNC(medical_treatment,isMedic) && !(_target getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume),false)])); + statement = QUOTE(_target setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume),true,true)]; [ARR_2(_target,true)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)); showDisabled = 0; icon = QPATHTOF(ui\icon_aedx_volume_on.paa); }; class KAT_AED_X_DisableAudio: KAT_AED_X_EnableAudio { displayName = CSTRING(AEDX_Action_DisableAudio); - condition = QUOTE([ARR_2(_player, GVAR(medLvl_AED_X))] call ACEFUNC(medical_treatment,isMedic) && _target getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume), false)]); - statement = QUOTE(_target setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume), false, true)]; [ARR_2(_target, false)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)); + condition = QUOTE([ARR_2(_player,GVAR(medLvl_AED_X))] call ACEFUNC(medical_treatment,isMedic) && _target getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume),false)]); + statement = QUOTE(_target setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume),false,true)]; [ARR_2(_target,false)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)); icon = QPATHTOF(ui\icon_aedx_volume_off.paa); }; class KAT_AED_X_MeasureBloodPressure { displayName = CSTRING(AEDX_Monitor_MeasureBloodPressure); - condition = QUOTE(!(_target getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Patient), objNull)] isEqualTo objNull) && {(missionNamespace getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_BloodPressureInterval), 0)] > 0)}); + condition = QUOTE(!(_target getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Patient),objNull)] isEqualTo objNull) && {(missionNamespace getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_BloodPressureInterval),0)] > 0)}); statement = QUOTE(_target getVariable QQGVAR(AED_X_VitalsMonitor_Patient) call FUNC(measureBloodPressure)); showDisabled = 0; icon = QPATHTOF(ui\icon_aed_pads.paa); @@ -256,7 +256,7 @@ class CfgVehicles { }; class KAT_placeAED { displayName = CSTRING(place_AED); - condition = QUOTE('kat_AED' in (items _player) && !((_player getVariable [ARR_2(QQGVAR(MedicDefibrillator_Patient), objNull)]) getVariable [ARR_2(QQGVAR(DefibrillatorInUse), false)])); + condition = QUOTE('kat_AED' in (items _player) && !((_player getVariable [ARR_2(QQGVAR(MedicDefibrillator_Patient),objNull)]) getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)])); exceptions[] = { "notOnMap", @@ -272,7 +272,7 @@ class CfgVehicles { }; class KAT_placeAEDX: KAT_placeAED { displayName = CSTRING(place_AEDX); - condition = QUOTE('kat_X_AED' in (items _player) && !((_player getVariable [ARR_2(QQGVAR(MedicDefibrillator_Patient), objNull)]) getVariable [ARR_2(QQGVAR(DefibrillatorInUse), false)])); + condition = QUOTE('kat_X_AED' in (items _player) && !((_player getVariable [ARR_2(QQGVAR(MedicDefibrillator_Patient),objNull)]) getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)])); statement = QUOTE([ARR_2(_player,'kat_X_AED')] call FUNC(placeAED)); icon = QPATHTOF(ui\icon_aedx.paa); }; @@ -292,21 +292,21 @@ class CfgVehicles { class KAT_AED_X_ViewMonitor { displayName = CSTRING(ViewMonitor); condition = "true"; - statement = QUOTE([ARR_3(_player, objNull, 2)] call FUNC(AEDX_ViewMonitor)); + statement = QUOTE([ARR_3(_player,objNull,2)] call FUNC(AEDX_ViewMonitor)); showDisabled = 0; icon = QPATHTOF(ui\icon_aedx_monitor.paa); }; class KAT_AED_X_removeSound { displayName = CSTRING(AEDX_Action_DisableAudio); - condition = QUOTE(_player getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume), false])); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume), false, true)]); + condition = QUOTE(_player getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume),false)]); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume),false,true)]); showDisabled = 0; icon = QPATHTOF(ui\icon_aedx_volume_off.paa); }; class KAT_AED_X_addSound : KAT_AED_X_removeSound { displayName = CSTRING(AEDX_Action_EnableAudio); - condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume), false]))); - statement = QUOTE(_player setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume), true, true)]); + condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_Volume),false)])); + statement = QUOTE(_player setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_Volume),true,true)]); icon = QPATHTOF(ui\icon_aedx_volume_on.paa); }; }; diff --git a/addons/circulation/defines.hpp b/addons/circulation/defines.hpp index 72f6ac9c6..4e454f1d4 100644 --- a/addons/circulation/defines.hpp +++ b/addons/circulation/defines.hpp @@ -1,15 +1,15 @@ // UI stuff -#define GUI_GRID_W (safezoneW * 0.55) -#define GUI_GRID_H (GUI_GRID_W * 4/3) -#define GUI_GRID_X (safezoneX + (safezoneW - GUI_GRID_W) / 2) -#define GUI_GRID_Y (safezoneY + (safezoneH - GUI_GRID_H) / 2) +#define KAT_GUI_GRID_W (safezoneW * 0.55) +#define KAT_GUI_GRID_H (KAT_GUI_GRID_W * 4/3) +#define KAT_GUI_GRID_X (safezoneX + (safezoneW - KAT_GUI_GRID_W) / 2) +#define KAT_GUI_GRID_Y (safezoneY + (safezoneH - KAT_GUI_GRID_H) / 2) -#define pxToScreen_X(X) (X / 2048 * GUI_GRID_W + GUI_GRID_X) -#define pxToScreen_Y(X) (X / 2048 * GUI_GRID_H + GUI_GRID_Y) -#define pxToScreen_W(X) (X / 2048 * GUI_GRID_W) -#define pxToScreen_H(X) (X / 2048 * GUI_GRID_H) +#define KAT_pxToScreen_X(X) (X / 2048 * KAT_GUI_GRID_W + KAT_GUI_GRID_X) +#define KAT_pxToScreen_Y(X) (X / 2048 * KAT_GUI_GRID_H + KAT_GUI_GRID_Y) +#define KAT_pxToScreen_W(X) (X / 2048 * KAT_GUI_GRID_W) +#define KAT_pxToScreen_H(X) (X / 2048 * KAT_GUI_GRID_H) -#define GRID_H ((((safezoneW / safezoneH) min 1.2) / 1.2) / 22) +#define KAT_GRID_H ((((safezoneW / safezoneH) min 1.2) / 1.2) / 22) #define IDC_AEDX_MONITOR 70000 #define IDC_EKG_SLIDER 70010 diff --git a/addons/circulation/functions/fnc_AEDXPlaced_CheckCondition.sqf b/addons/circulation/functions/fnc_AEDXPlaced_CheckCondition.sqf index 22ef8b25e..68469d92c 100644 --- a/addons/circulation/functions/fnc_AEDXPlaced_CheckCondition.sqf +++ b/addons/circulation/functions/fnc_AEDXPlaced_CheckCondition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Checks if placed AED-X can be used (ace actions). @@ -55,4 +55,4 @@ switch (_check) do { }; }; -_condition && [_medic, GVAR(medLvl_AED_X)] call ACEFUNC(medical_treatment,isMedic) && {!(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}}; \ No newline at end of file +_condition && [_medic, GVAR(medLvl_AED_X)] call ACEFUNC(medical_treatment,isMedic) && {!(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}}; diff --git a/addons/circulation/functions/fnc_AEDXPlaced_VitalsMonitor_SetVolume.sqf b/addons/circulation/functions/fnc_AEDXPlaced_VitalsMonitor_SetVolume.sqf index 1b282cfe7..0322c3143 100644 --- a/addons/circulation/functions/fnc_AEDXPlaced_VitalsMonitor_SetVolume.sqf +++ b/addons/circulation/functions/fnc_AEDXPlaced_VitalsMonitor_SetVolume.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Handle setting vitals monitor volume for placed AED-X. @@ -26,4 +26,4 @@ if (isNull _patient) then { if (isNull _patient) exitWith {}; -_patient setVariable [QGVAR(AED_X_VitalsMonitor_VolumePatient), _volume, true]; \ No newline at end of file +_patient setVariable [QGVAR(AED_X_VitalsMonitor_VolumePatient), _volume, true]; diff --git a/addons/circulation/functions/fnc_AEDX_ConnectVitalsMonitor.sqf b/addons/circulation/functions/fnc_AEDX_ConnectVitalsMonitor.sqf index 8ba666a05..c8e51de9c 100644 --- a/addons/circulation/functions/fnc_AEDX_ConnectVitalsMonitor.sqf +++ b/addons/circulation/functions/fnc_AEDX_ConnectVitalsMonitor.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Connect vitals monitoring to patient. @@ -51,7 +51,7 @@ switch (_source) do { [{ // Disconnect monitoring if patient gets too far params ["_medic", "_patient", "_provider"]; - + (_patient distance _provider) > GVAR(Defibrillator_DistanceLimit) || !((objectParent _medic) isEqualTo (objectParent _patient)); }, { params ["_medic", "_patient", "_provider"]; @@ -75,7 +75,7 @@ switch (_source) do { [{ // Disconnect monitoring if patient exits vehicle params ["_medic", "_patient", "_provider"]; - + !((objectParent _patient) isEqualTo _provider); }, { params ["_medic", "_patient", "_provider"]; @@ -96,7 +96,7 @@ switch (_source) do { [{ // Disconnect monitoring if patient gets too far params ["_medic", "_patient"]; - + (_patient distance _medic) > GVAR(Defibrillator_DistanceLimit) || !((objectParent _medic) isEqualTo (objectParent _patient)); }, { params ["_medic", "_patient"]; @@ -125,7 +125,7 @@ if ((_patient getVariable ["kat_AEDXPatient_PFH", -1]) isEqualTo -1) then { [{ params ["_medic", "_patient", "_provider"]; - + [_medic, _patient, _provider] call FUNC(AEDX_VitalsMonitor); }, [_medic, _patient, _provider], 0.5] call CBA_fnc_waitAndExecute; diff --git a/addons/circulation/functions/fnc_AEDX_DisconnectVitalsMonitor.sqf b/addons/circulation/functions/fnc_AEDX_DisconnectVitalsMonitor.sqf index 24f82bc47..2e6ce0bb1 100644 --- a/addons/circulation/functions/fnc_AEDX_DisconnectVitalsMonitor.sqf +++ b/addons/circulation/functions/fnc_AEDX_DisconnectVitalsMonitor.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Disconnect vitals monitoring from patient. diff --git a/addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf b/addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf index d075d583a..3f29c82e1 100644 --- a/addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf +++ b/addons/circulation/functions/fnc_AEDX_ViewMonitor.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" #include "..\defines.hpp" /* * Author: Blue @@ -21,7 +21,7 @@ params ["_medic", "_target", ["_source", 0]]; ACEGVAR(medical_gui,pendingReopen) = false; // Prevent medical menu from reopening - + if (dialog) then { // If another dialog is open (medical menu) close it closeDialog 0; }; @@ -61,11 +61,11 @@ GVAR(PulseRateReady) = true; }; private _slider = _dlg displayCtrl IDC_EKG_SLIDER; - - _slider ctrlSetPosition [pxToScreen_X(250), (ctrlPosition _slider) select 1, (ctrlPosition _slider) select 2, (ctrlPosition _slider) select 3]; + + _slider ctrlSetPosition [KAT_pxToScreen_X(250), (ctrlPosition _slider) select 1, (ctrlPosition _slider) select 2, (ctrlPosition _slider) select 3]; _slider ctrlCommit 0; - _slider ctrlSetPosition [pxToScreen_X(1460), (ctrlPosition _slider) select 1, (ctrlPosition _slider) select 2, (ctrlPosition _slider) select 3]; + _slider ctrlSetPosition [KAT_pxToScreen_X(1460), (ctrlPosition _slider) select 1, (ctrlPosition _slider) select 2, (ctrlPosition _slider) select 3]; _slider ctrlCommit 4; }, 4, [_dlg]] call CBA_fnc_addPerFrameHandler; @@ -130,7 +130,7 @@ GVAR(PulseRateReady) = true; }; ctrlSetText [IDC_EKG_DISPLAY, _ekgDisplay]; - + if (GVAR(AEDX_MonitorTarget) getVariable [QGVAR(Defibrillator_Charged), false]) then { ctrlShow [IDC_SHOCKBUTTON, true]; } else { @@ -142,7 +142,7 @@ GVAR(PulseRateReady) = true; ctrlSetText [IDC_DISPLAY_DATEANDTIME, format ["%1/%2/%3 %4:%5", (if (date select 2 < 10) then { "0" } else { "" }) + str (date select 2), (if (date select 1 < 10) then { "0" } else { "" }) + str (date select 1), date select 0, (if (date select 3 < 10) then { "0" } else { "" }) + str (date select 3), (if (date select 4 < 10) then { "0" } else { "" }) + str (date select 4)]]; ctrlSetText [IDC_DISPLAY_ELAPSEDTIME, format ["%1:%2:%3", (if ((floor(time/3600)) < 10) then { "0" } else { "" }) + str (floor(time/3600)), (if ((floor(((time/3600) - floor(time/3600)) * 60)) < 10) then { "0" } else { "" }) + str (floor(((time/3600) - floor(time/3600)) * 60)), (if ((floor(((time/60) - floor(time/60)) * 60)) < 10) then { "0" } else { "" }) + str (floor(((time/60) - floor(time/60)) * 60))]]; - + if (GVAR(AEDX_MonitorTarget) getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false]) then { private _partIndex = ((GVAR(AEDX_MonitorTarget) getVariable [QGVAR(AED_X_VitalsMonitor_Provider), [-1, -1, -1]]) select 2); @@ -157,12 +157,12 @@ GVAR(PulseRateReady) = true; if (GVAR(PulseRateReady)) then { GVAR(PulseRateReady) = false; private _pr = GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,heartRate), 0]; - + if (_pr > 0) then { private _delay = 60/_pr; private _randomHigh = round(random [2, 2, 3]); - _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, pxToScreen_H(_randomHigh)]; + _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, KAT_pxToScreen_H(_randomHigh)]; _PRBar ctrlCommit (0.2 max (_delay/4)); [{ @@ -170,14 +170,14 @@ GVAR(PulseRateReady) = true; private _randomMid = round(random [24, 25, 29]); - _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, pxToScreen_H(_randomMid)]; + _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, KAT_pxToScreen_H(_randomMid)]; _PRBar ctrlCommit 0.1; [{ params ["_PRBar", "_delay"]; private _randomLow = round(random [67, 68, 70]); - _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, pxToScreen_H(_randomLow)]; + _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, KAT_pxToScreen_H(_randomLow)]; _PRBar ctrlCommit (0.2 max (_delay/2)); }, [_PRBar, _delay], 0.1] call CBA_fnc_waitAndExecute; }, [_PRBar, _delay], (0.2 max (_delay/3))] call CBA_fnc_waitAndExecute; @@ -186,12 +186,12 @@ GVAR(PulseRateReady) = true; GVAR(PulseRateReady) = true; }, [], _delay] call CBA_fnc_waitAndExecute; } else { - _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, pxToScreen_H(71)]; + _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, KAT_pxToScreen_H(71)]; _PRBar ctrlCommit 0.1; }; }; } else { - _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, pxToScreen_H(71)]; + _PRBar ctrlSetPosition [(ctrlPosition _PRBar) select 0, (ctrlPosition _PRBar) select 1, (ctrlPosition _PRBar) select 2, KAT_pxToScreen_H(71)]; _PRBar ctrlCommit 0; }; } else { @@ -232,7 +232,7 @@ GVAR(PulseRateReady) = true; }; if !(GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then { - + private _rhythmHR = 0; if(GVAR(AEDX_MonitorTarget) getVariable [QGVAR(cardiacArrestType), 0] > 0) then { @@ -240,7 +240,7 @@ GVAR(PulseRateReady) = true; } else { _rhythmHR = GVAR(AEDX_MonitorTarget) getVariable [QACEGVAR(medical,heartRate), 0]; }; - + _hr = random [100, 100 + _rhythmHR / 2, _rhythmHR]; if (GVAR(AED_X_VitalsMonitor_BloodPressureInterval) > 0) then { @@ -308,4 +308,4 @@ GVAR(PulseRateReady) = true; if !(isNull _dlg) then { [true] call FUNC(AEDX_ViewMonitor_Charging); }; -}, [_dlg, _chargeBar], 4, {}] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +}, [_dlg, _chargeBar], 4, {}] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/circulation/functions/fnc_AEDX_ViewMonitor_AnalyzeFeedback.sqf b/addons/circulation/functions/fnc_AEDX_ViewMonitor_AnalyzeFeedback.sqf index f8773c425..dfc17fd65 100644 --- a/addons/circulation/functions/fnc_AEDX_ViewMonitor_AnalyzeFeedback.sqf +++ b/addons/circulation/functions/fnc_AEDX_ViewMonitor_AnalyzeFeedback.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" #include "..\defines.hpp" /* * Author: Blue @@ -134,7 +134,7 @@ private _fnc_displayMsg = { isNull _dlg; },{ params ["_dlg", "_fnc_displayMsg"]; - + [_dlg, -1] call _fnc_displayMsg; [false] call _fnc_showDialog; -}, [_dlg, _fnc_displayMsg], 3600] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +}, [_dlg, _fnc_displayMsg], 3600] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/circulation/functions/fnc_AEDX_ViewMonitor_Charging.sqf b/addons/circulation/functions/fnc_AEDX_ViewMonitor_Charging.sqf index aae92a6d4..1f4f00b67 100644 --- a/addons/circulation/functions/fnc_AEDX_ViewMonitor_Charging.sqf +++ b/addons/circulation/functions/fnc_AEDX_ViewMonitor_Charging.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" #include "..\defines.hpp" /* * Author: Blue @@ -66,7 +66,7 @@ private _chargeBar = (_dlg displayCtrl IDC_CHARGE_BAR_BACKGROUND); ctrlSetText [IDC_CHARGE_SHOCKTOTAL, format ["%1", GVAR(AEDX_MonitorTarget) getVariable [QGVAR(Defibrillator_ShockAmount), 0]]]; if (_skip) then { // Skip visual charging process - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(681), (ctrlPosition _chargeBar) select 2, pxToScreen_H(679)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(681), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(679)]; _chargeBar ctrlCommit 0; (_dlg displayCtrl IDC_CHARGE_BAR_1) ctrlSetTextColor [0, 0, 0, 1]; @@ -135,7 +135,7 @@ if (_skip) then { // Skip visual charging process [{ params ["_dlg"]; - + isNull _dlg || !(GVAR(AEDX_MonitorCharging)); }, { params ["_dlg"]; @@ -149,7 +149,7 @@ if (_skip) then { // Skip visual charging process ctrlSetText [IDC_CHARGE_STATUS, LLSTRING(AEDX_Monitor_CHARGED)]; }; - + }, [_dlg], 60, {}] call CBA_fnc_waitUntilAndExecute; [{ @@ -176,7 +176,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_7) ctrlSetTextColor [0, 0, 0, 1]; (_dlg displayCtrl IDC_CHARGE_BAR_8) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(1089), (ctrlPosition _chargeBar) select 2, pxToScreen_H(271)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(1089), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(271)]; _chargeBar ctrlCommit 0; [{ @@ -187,7 +187,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_15) ctrlSetTextColor [0, 0, 0, 1]; (_dlg displayCtrl IDC_CHARGE_BAR_20) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(953), (ctrlPosition _chargeBar) select 2, pxToScreen_H(407)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(953), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(407)]; _chargeBar ctrlCommit 0; [{ @@ -195,7 +195,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_30) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(918), (ctrlPosition _chargeBar) select 2, pxToScreen_H(442)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(918), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(442)]; _chargeBar ctrlCommit 0; [{ @@ -203,7 +203,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_50) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(884), (ctrlPosition _chargeBar) select 2, pxToScreen_H(476)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(884), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(476)]; _chargeBar ctrlCommit 0; [{ @@ -212,7 +212,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_70) ctrlSetTextColor [0, 0, 0, 1]; (_dlg displayCtrl IDC_CHARGE_BAR_85) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(817), (ctrlPosition _chargeBar) select 2, pxToScreen_H(543)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(817), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(543)]; _chargeBar ctrlCommit 0; [{ @@ -220,7 +220,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_100) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(782), (ctrlPosition _chargeBar) select 2, pxToScreen_H(578)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(782), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(578)]; _chargeBar ctrlCommit 0; [{ @@ -228,7 +228,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_120) ctrlSetTextColor [0, 0, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(748), (ctrlPosition _chargeBar) select 2, pxToScreen_H(612)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(748), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(612)]; _chargeBar ctrlCommit 0; [{ @@ -237,7 +237,7 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_150) ctrlSetTextColor [0, 0, 0, 1]; (_dlg displayCtrl IDC_CHARGE_BAR_150) ctrlSetBackgroundColor [1, 0.35, 0, 1]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(680), (ctrlPosition _chargeBar) select 2, pxToScreen_H(680)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(680), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(680)]; _chargeBar ctrlCommit 0; }, [_dlg, _chargeBar], 0.5] call CBA_fnc_waitAndExecute; }, [_dlg, _chargeBar], 0.6] call CBA_fnc_waitAndExecute; @@ -307,8 +307,8 @@ if (_skip) then { // Skip visual charging process (_dlg displayCtrl IDC_CHARGE_BAR_150) ctrlSetTextColor [1, 1, 1, 1]; (_dlg displayCtrl IDC_CHARGE_BAR_150) ctrlSetBackgroundColor [0, 0, 0, 0]; - _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, pxToScreen_Y(1360), (ctrlPosition _chargeBar) select 2, pxToScreen_H(1)]; + _chargeBar ctrlSetPosition [(ctrlPosition _chargeBar) select 0, KAT_pxToScreen_Y(1360), (ctrlPosition _chargeBar) select 2, KAT_pxToScreen_H(1)]; _chargeBar ctrlCommit 0; }, [_dlg, _chargeBar, _fnc_showDialog], 1] call CBA_fnc_waitAndExecute; }; -}, [_dlg, _chargeBar, _fnc_showDialog], 3600, {}] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +}, [_dlg, _chargeBar, _fnc_showDialog], 3600, {}] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/circulation/functions/fnc_AEDX_ViewMonitor_Condition.sqf b/addons/circulation/functions/fnc_AEDX_ViewMonitor_Condition.sqf index e448f889f..f81304f98 100644 --- a/addons/circulation/functions/fnc_AEDX_ViewMonitor_Condition.sqf +++ b/addons/circulation/functions/fnc_AEDX_ViewMonitor_Condition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Checks if monitor can be viewed on patient. @@ -18,4 +18,4 @@ params ["_medic", "_patient"]; -(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && (_patient getVariable [QGVAR(Defibrillator_Provider), nil]) select 2 isEqualTo "kat_X_AED"; \ No newline at end of file +(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && (_patient getVariable [QGVAR(Defibrillator_Provider), nil]) select 2 isEqualTo "kat_X_AED"; diff --git a/addons/circulation/functions/fnc_AEDX_VitalsMonitor.sqf b/addons/circulation/functions/fnc_AEDX_VitalsMonitor.sqf index 3f825b5a4..90e8b14cd 100644 --- a/addons/circulation/functions/fnc_AEDX_VitalsMonitor.sqf +++ b/addons/circulation/functions/fnc_AEDX_VitalsMonitor.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Modified: YetheSamartaka, Blue @@ -20,7 +20,7 @@ params ["_medic", "_patient", "_soundSource"]; -if (GVAR(AED_X_VitalsMonitor_BloodPressureInterval) isEqualTo 1) then { +if (GVAR(AED_X_VitalsMonitor_BloodPressureInterval) isEqualTo 1) then { GVAR(BPInterval) = true; } else { GVAR(BPInterval) = false; @@ -177,7 +177,7 @@ if (_patient getVariable [QGVAR(DefibrillatorPads_Connected), false] && {((_pati private _hr = _patient getVariable [QACEGVAR(medical,heartRate), 80]; if (GVAR(AdvRhythm)) then { - private _cardiacState = _patient getVariable [QGVAR(cardiacArrestType), 0]; + private _cardiacState = _patient getVariable [QGVAR(cardiacArrestType), 0]; if (_patient getVariable [QGVAR(cardiacArrestType), 0] in [2,4]) then { _hr = _patient call FUNC(getCardiacArrestHeartRate); @@ -263,7 +263,7 @@ if (_patient getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false] && {(_pat _args params ["_patient"]; private _soundSource = (_patient getVariable [QGVAR(Defibrillator_Provider), [objNull, -1, -1]]) select 0; - + if !(_patient getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false]) exitWith { _patient setVariable ["kat_AEDXPatient_PulseOx_PFH", nil, true]; [_idPFH] call CBA_fnc_removePerFrameHandler; @@ -281,6 +281,6 @@ if (_patient getVariable [QGVAR(AED_X_VitalsMonitor_Connected), false] && {(_pat }; }; }, 2, [_patient]] call CBA_fnc_addPerFrameHandler; - + _patient setVariable ["kat_AEDXPatient_PulseOx_PFH", _pulseOximeterPFH, true]; -}; \ No newline at end of file +}; diff --git a/addons/circulation/functions/fnc_AEDX_VitalsMonitor_CheckCondition.sqf b/addons/circulation/functions/fnc_AEDX_VitalsMonitor_CheckCondition.sqf index c5ffb6b2b..e43a3f693 100644 --- a/addons/circulation/functions/fnc_AEDX_VitalsMonitor_CheckCondition.sqf +++ b/addons/circulation/functions/fnc_AEDX_VitalsMonitor_CheckCondition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Checks if AED-X vitals monitor can be connected to the patient. diff --git a/addons/circulation/functions/fnc_AED_Analyze.sqf b/addons/circulation/functions/fnc_AED_Analyze.sqf index 7887a2f05..daeb3fb06 100644 --- a/addons/circulation/functions/fnc_AED_Analyze.sqf +++ b/addons/circulation/functions/fnc_AED_Analyze.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Analyzes the patient's heart rhythm @@ -48,7 +48,7 @@ playsound3D [QPATHTOF_SOUND(sounds\analyzingnow.wav), _soundSource, false, getPo [{ params ["_medic", "_patient", "_defibrillatorType", "_soundSource"]; if (!(isNull (_patient getVariable [QACEGVAR(medical,CPR_provider), objNull])) || _patient getVariable [QGVAR(BVMInUse), false] || _patient call ACEFUNC(common,isAwake)) exitWith { // Motion persists, analyzing cancelled - playsound3D [QPATHTOF_SOUND(sounds\3beep.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15]; + playsound3D [QPATHTOF_SOUND(sounds\3beep.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15]; _patient setVariable [QGVAR(DefibrillatorInUse), false, true]; }; [_medic, _patient, _defibrillatorType] call FUNC(AED_Analyze); @@ -56,7 +56,7 @@ playsound3D [QPATHTOF_SOUND(sounds\analyzingnow.wav), _soundSource, false, getPo }, [_medic, _patient, _defibrillatorType, _soundSource], 5 max (random 8), // Time to analyze -{ +{ params ["_medic", "_patient", "_defibrillatorType", "_soundSource"]; _patient setVariable [QGVAR(RhythmAnalyzed), true, true]; @@ -86,4 +86,4 @@ playsound3D [QPATHTOF_SOUND(sounds\analyzingnow.wav), _soundSource, false, getPo _patient setVariable [QGVAR(DefibrillatorInUse), false, true]; }; }; -}] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +}] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/circulation/functions/fnc_AED_Charge.sqf b/addons/circulation/functions/fnc_AED_Charge.sqf index d4db5864f..ef73ede01 100644 --- a/addons/circulation/functions/fnc_AED_Charge.sqf +++ b/addons/circulation/functions/fnc_AED_Charge.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Charge up Defibrillator in AED mode @@ -23,14 +23,14 @@ params ["_medic", "_patient", "_soundSource", "_defibType"]; playsound3D [QPATHTOF_SOUND(sounds\charging.wav), _soundSource, false, getPosASL _soundSource, 5, 1, 15]; [{ // Charged params ["_medic", "_patient", "_soundSource", "_defibType"]; - + playsound3D [QPATHTOF_SOUND(sounds\standclear_pushtoshock.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15]; [{ // Ready to shock params ["_medic", "_patient", "_soundSource", "_defibType"]; _patient setVariable [QGVAR(Defibrillator_Charged), true, true]; - [{ + [{ params ["_medic", "_patient", "_soundSource"]; !(_patient getVariable [QGVAR(Defibrillator_Charged), false]) @@ -78,4 +78,4 @@ playsound3D [QPATHTOF_SOUND(sounds\charging.wav), _soundSource, false, getPosASL }, 0.528, [_medic, _patient, _soundSource]] call CBA_fnc_addPerFrameHandler; }, [_medic, _patient, _soundSource, _defibType], 1.3] call CBA_fnc_waitAndExecute; -}, [_medic, _patient, _soundSource, _defibType], 4.1] call CBA_fnc_waitAndExecute; \ No newline at end of file +}, [_medic, _patient, _soundSource, _defibType], 4.1] call CBA_fnc_waitAndExecute; diff --git a/addons/circulation/functions/fnc_AED_Shock.sqf b/addons/circulation/functions/fnc_AED_Shock.sqf index a89976db5..d53d9c719 100644 --- a/addons/circulation/functions/fnc_AED_Shock.sqf +++ b/addons/circulation/functions/fnc_AED_Shock.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Handles finishing AED shock procedure. diff --git a/addons/circulation/functions/fnc_CPRStart.sqf b/addons/circulation/functions/fnc_CPRStart.sqf index 41073293a..414235c62 100644 --- a/addons/circulation/functions/fnc_CPRStart.sqf +++ b/addons/circulation/functions/fnc_CPRStart.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Begin CPR @@ -34,7 +34,7 @@ GVAR(CPRCancel_MouseID) = [0xF0, [false, false, false], { private _CPRStartTime = CBA_missionTime + 2.5; ACEGVAR(medical_gui,pendingReopen) = false; // Prevent medical menu from reopening - + if (dialog) then { // If another dialog is open (medical menu) close it closeDialog 0; }; @@ -57,7 +57,7 @@ if (_notInVehicle) then { if (_patient isEqualTo objNull || _medic isEqualTo objNull || !(alive _medic) || IS_UNCONSCIOUS(_medic) || !(IS_UNCONSCIOUS(_patient)) || (_patient getVariable [QACEGVAR(medical,CPR_provider), objNull]) isEqualTo objNull || !(_medic getVariable [QGVAR(isPerformingCPR), false]) || dialog || {!(objectParent _medic isEqualTo objectParent _patient) || {_patient distance _medic > ACEGVAR(medical_gui,maxDistance)}}) exitWith { // Stop CPR [_idPFH] call CBA_fnc_removePerFrameHandler; - + _medic setVariable [QGVAR(isPerformingCPR), false, true]; if !(_patient getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then { @@ -71,17 +71,17 @@ if (_notInVehicle) then { if (_notInVehicle) then { [_medic, "AinvPknlMstpSnonWnonDnon_medicEnd", 2] call ACEFUNC(common,doAnimation); }; - + // Format time to minutes:seconds private _CPRTime = CBA_missionTime - _CPRStartTime; private _time = format ["%1:%2",(if ((floor(((_CPRTime/3600) - floor(_CPRTime/3600)) * 60)) < 10) then { "0" } else { "" }) + str (floor(((_CPRTime/3600) - floor(_CPRTime/3600)) * 60)), (if ((floor(((_CPRTime/60) - floor(_CPRTime/60)) * 60)) < 10) then { "0" } else { "" }) + str (floor(((_CPRTime/60) - floor(_CPRTime/60)) * 60))]; - + [_patient, "activity", LSTRING(Activity_CPR), [[_medic, false, true] call ACEFUNC(common,getName), _time]] call ACEFUNC(medical_treatment,addToLog); - + if (CPRStartTime <= CBA_missionTime - 18) then { _patient setVariable [QGVAR(OxygenationPeriod), CBA_missionTime, true]; }; - + closeDialog 0; [LLSTRING(CancelCPR), 1.5, _medic] call ACEFUNC(common,displayTextStructured); @@ -123,7 +123,7 @@ if (_patient getVariable [QGVAR(RhythmAnalyzed), false]) then { if(!((_patient getVariable [QACEGVAR(medical,CPR_provider), objNull]) isEqualTo objNull) && _patient getVariable [QGVAR(DefibrillatorPads_Connected), false] && !(_patient getVariable [QGVAR(DefibrillatorInUse), false])) then { private _provider = _patient getVariable QGVAR(Defibrillator_Provider); private _source = _medic; - + switch (_provider select 1) do { case 1: { _source = _provider select 0; @@ -137,4 +137,4 @@ if (_patient getVariable [QGVAR(RhythmAnalyzed), false]) then { playSound3D [QPATHTOF_SOUND(sounds\checkpulse_nopulsepushanalyze.wav), _source, false, getPosASL _source, 6, 1, 15]; }; }, [_medic, _patient], 122.5] call CBA_fnc_waitAndExecute; -}; \ No newline at end of file +}; diff --git a/addons/circulation/functions/fnc_Defibrillator_AttachPads.sqf b/addons/circulation/functions/fnc_Defibrillator_AttachPads.sqf index f21744d71..48976f90c 100644 --- a/addons/circulation/functions/fnc_Defibrillator_AttachPads.sqf +++ b/addons/circulation/functions/fnc_Defibrillator_AttachPads.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Attach Defibrillator pads to patient. @@ -51,7 +51,7 @@ switch (_source) do { [{ // Remove pads if patient gets too far params ["_medic", "_patient", "_provider"]; - + (_patient distance _provider) > GVAR(Defibrillator_DistanceLimit) || !(isNull (objectParent _patient)); }, { params ["_medic", "_patient", "_provider"]; @@ -73,7 +73,7 @@ switch (_source) do { [{ // Remove pads if patient exits vehicle params ["_medic", "_patient", "_provider"]; - + !((objectParent _patient) isEqualTo _provider); }, { params ["_medic", "_patient", "_provider"]; @@ -94,7 +94,7 @@ switch (_source) do { [{ // Remove pads if patient gets too far params ["_medic", "_patient"]; - + (_patient distance _medic) > GVAR(Defibrillator_DistanceLimit) || !((objectParent _medic) isEqualTo (objectParent _patient)); }, { params ["_medic", "_patient"]; diff --git a/addons/circulation/functions/fnc_Defibrillator_CheckCondition.sqf b/addons/circulation/functions/fnc_Defibrillator_CheckCondition.sqf index f966c4c73..3c07286db 100644 --- a/addons/circulation/functions/fnc_Defibrillator_CheckCondition.sqf +++ b/addons/circulation/functions/fnc_Defibrillator_CheckCondition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Check if defibrillator can be used on patient. @@ -37,4 +37,4 @@ switch (_defibProvider select 1) do { }; }; -_condition && (_allowInUse || !(_patient getVariable [QGVAR(DefibrillatorInUse), false])) && _patient getVariable [QGVAR(DefibrillatorPads_Connected), false] && {!(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}}; \ No newline at end of file +_condition && (_allowInUse || !(_patient getVariable [QGVAR(DefibrillatorInUse), false])) && _patient getVariable [QGVAR(DefibrillatorPads_Connected), false] && {!(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}}; diff --git a/addons/circulation/functions/fnc_Defibrillator_ManualCharge.sqf b/addons/circulation/functions/fnc_Defibrillator_ManualCharge.sqf index 33855c36a..3fcd9b3d0 100644 --- a/addons/circulation/functions/fnc_Defibrillator_ManualCharge.sqf +++ b/addons/circulation/functions/fnc_Defibrillator_ManualCharge.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Charge up Defibrillator in manual mode @@ -36,7 +36,7 @@ playsound3D [QPATHTOF_SOUND(sounds\charging.wav), _soundSource, false, getPosASL _patient setVariable [QGVAR(Defibrillator_Charged), true, true]; - [{ + [{ params ["_medic", "_patient", "_soundSource"]; !(_patient getVariable [QGVAR(Defibrillator_Charged), false]) @@ -76,4 +76,4 @@ playsound3D [QPATHTOF_SOUND(sounds\charging.wav), _soundSource, false, getPosASL playsound3D [QPATHTOF_SOUND(sounds\alarm.wav), _soundSource, false, getPosASL _soundSource, 6, 1, 15]; }, 0.528, [_medic, _patient, _soundSource]] call CBA_fnc_addPerFrameHandler; -}, [_medic, _patient, _soundSource], 4.1] call CBA_fnc_waitAndExecute; \ No newline at end of file +}, [_medic, _patient, _soundSource], 4.1] call CBA_fnc_waitAndExecute; diff --git a/addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf b/addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf index c2e90d0f9..87381f6f4 100644 --- a/addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf +++ b/addons/circulation/functions/fnc_Defibrillator_Pads_CheckCondition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Checks if AED pads can be attached to the patient. @@ -50,4 +50,4 @@ switch (_AEDOrigin) do { }; if (_exit) exitWith {false}; -_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}; \ No newline at end of file +_condition && !(_patient getVariable [QGVAR(DefibrillatorPads_Connected), false]) && !(_patient getVariable [QEGVAR(airway,recovery), false]) && {["",_patient] call ACEFUNC(medical_treatment,canCPR)}; diff --git a/addons/circulation/functions/fnc_Defibrillator_RemovePads.sqf b/addons/circulation/functions/fnc_Defibrillator_RemovePads.sqf index 0a9dd9f3c..4a0c5ebc4 100644 --- a/addons/circulation/functions/fnc_Defibrillator_RemovePads.sqf +++ b/addons/circulation/functions/fnc_Defibrillator_RemovePads.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Remove Defibrillator pads from patient. @@ -53,4 +53,4 @@ _patient setVariable [QGVAR(Defibrillator_ShockAmount), 0, true]; if !(_noLog) then { [_patient, "activity", LSTRING(Activity_RemovePads), [[_medic, false, true] call ACEFUNC(common,getName)]] call ACEFUNC(medical_treatment,addToLog); -}; \ No newline at end of file +}; diff --git a/addons/circulation/functions/fnc_addDefibrillatorActions.sqf b/addons/circulation/functions/fnc_addDefibrillatorActions.sqf index 0fd391ea7..033e55df7 100644 --- a/addons/circulation/functions/fnc_addDefibrillatorActions.sqf +++ b/addons/circulation/functions/fnc_addDefibrillatorActions.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Gets ACE actions for units next to placed defibrillator @@ -173,4 +173,4 @@ switch (_type) do { // AED-X pads }; }; -_actions; \ No newline at end of file +_actions; diff --git a/addons/circulation/functions/fnc_bloodType.sqf b/addons/circulation/functions/fnc_bloodType.sqf index c93a851c0..4eb841f01 100644 --- a/addons/circulation/functions/fnc_bloodType.sqf +++ b/addons/circulation/functions/fnc_bloodType.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Modified: YetheSamartaka, Blue diff --git a/addons/circulation/functions/fnc_canDraw.sqf b/addons/circulation/functions/fnc_canDraw.sqf index 787d4cca3..34a29dd3b 100644 --- a/addons/circulation/functions/fnc_canDraw.sqf +++ b/addons/circulation/functions/fnc_canDraw.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka & Slatery * Condition function for the blood drawing @@ -24,4 +24,4 @@ private _bloodVolume = (_patient getVariable [QACEGVAR(medical,bloodVolume), 6.0 private _volumeChange = _volume/1000; private _canAddItem = ((_medic canAddItemToUniform _bagItem) || (_medic canAddItemToVest _bagItem) || (_medic canAddItemToBackpack _bagItem)); // make sure the blood can actually be added to the medic, so you don't just lose blood if (((_bloodVolume - _volumeChange) > GVAR(blood_draw_limit)) && _canAddItem) exitWith {true}; -false \ No newline at end of file +false diff --git a/addons/circulation/functions/fnc_compatible.sqf b/addons/circulation/functions/fnc_compatible.sqf index 52e97b254..625c8279a 100644 --- a/addons/circulation/functions/fnc_compatible.sqf +++ b/addons/circulation/functions/fnc_compatible.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Handle the compatibility for blood and patient. @@ -22,4 +22,4 @@ private _bloodType = [_unit] call FUNC(bloodType); private _compatibility = getArray (configFile >> "ACE_Medical_Treatment" >> "IV" >> _className >> "compatibility"); if (_bloodType in _compatibility) exitWith {true}; -false \ No newline at end of file +false diff --git a/addons/circulation/functions/fnc_cprLocal.sqf b/addons/circulation/functions/fnc_cprLocal.sqf index 01ac671fb..88ee94f33 100644 --- a/addons/circulation/functions/fnc_cprLocal.sqf +++ b/addons/circulation/functions/fnc_cprLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Modified: Tomcat, Blue @@ -32,7 +32,7 @@ private _fnc_advRhythm = { params ["_patient", ["_CPR",false]]; private _patientState = _patient getVariable [QGVAR(cardiacArrestType), 0]; - + if (_CPR) then { if (floor (random 100) <= GVAR(AdvRhythm_CPR_ROSC_Chance)) then { _patient setVariable [QGVAR(cardiacArrestType), 0, true]; @@ -71,11 +71,11 @@ private _fnc_advRhythm = { switch(_medication) do { - case "Epinephrine": + case "Epinephrine": { _epiBoost = 1.5; }; - case "Amiodarone": + case "Amiodarone": { _amiBoost = _amiBoost + (random [8,14,20]); }; diff --git a/addons/circulation/functions/fnc_cprSuccess.sqf b/addons/circulation/functions/fnc_cprSuccess.sqf index 51ffa7a97..66041a628 100644 --- a/addons/circulation/functions/fnc_cprSuccess.sqf +++ b/addons/circulation/functions/fnc_cprSuccess.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Modified: Blue @@ -25,4 +25,4 @@ if (alive _patient && {_patient getVariable [QACEGVAR(medical,inCardiacArrest), [QACEGVAR(medical_treatment,cprLocal), [_medic, _patient, "CPR"], _patient] call CBA_fnc_targetEvent; } else { TRACE_1("not alive or in cardiac arrest",_patient); -}; \ No newline at end of file +}; diff --git a/addons/circulation/functions/fnc_drawBlood.sqf b/addons/circulation/functions/fnc_drawBlood.sqf index 9a4177913..13b35b7d3 100644 --- a/addons/circulation/functions/fnc_drawBlood.sqf +++ b/addons/circulation/functions/fnc_drawBlood.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka * Refactored by Slatery diff --git a/addons/circulation/functions/fnc_generateBloodType.sqf b/addons/circulation/functions/fnc_generateBloodType.sqf index d071ecc8e..6aad54bbf 100644 --- a/addons/circulation/functions/fnc_generateBloodType.sqf +++ b/addons/circulation/functions/fnc_generateBloodType.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Generates blood type for player according to settings @@ -64,8 +64,8 @@ switch(GVAR(bloodTypeSetting)) do { }; } else { - _bloodType = _playerBloodType; - }; + _bloodType = _playerBloodType; + }; }; case 5: {// steamid custom list bloodtype if (isMultiplayer) then { @@ -73,10 +73,10 @@ switch(GVAR(bloodTypeSetting)) do { private _bloodTypeList = GVAR(bloodTypeCustomList) splitString ", "; _bloodType = _bloodTypeList select _id; } else { - _bloodType = _playerBloodType; - }; + _bloodType = _playerBloodType; + }; }; default { _bloodType = _playerBloodType; }; }; -_bloodType; \ No newline at end of file +_bloodType; diff --git a/addons/circulation/functions/fnc_getBloodPressure.sqf b/addons/circulation/functions/fnc_getBloodPressure.sqf index d0880ebd5..6b651ffdb 100644 --- a/addons/circulation/functions/fnc_getBloodPressure.sqf +++ b/addons/circulation/functions/fnc_getBloodPressure.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Modified: Blue @@ -44,4 +44,4 @@ if (count _BPChange > 0) then { private _systolic = _bloodPressure * MODIFIER_BP_LOW; private _diastolic = _bloodPressure * MODIFIER_BP_HIGH; -[(round(_systolic + _changeSystolic * (_systolic / 80)) max 0), (round(_diastolic + _changeDiastolic * (_diastolic / 120)) max 0)] \ No newline at end of file +[(round(_systolic + _changeSystolic * (_systolic / 80)) max 0), (round(_diastolic + _changeDiastolic * (_diastolic / 120)) max 0)] diff --git a/addons/circulation/functions/fnc_getCardiacArrestHeartRate.sqf b/addons/circulation/functions/fnc_getCardiacArrestHeartRate.sqf index 7b78d199b..03862822c 100644 --- a/addons/circulation/functions/fnc_getCardiacArrestHeartRate.sqf +++ b/addons/circulation/functions/fnc_getCardiacArrestHeartRate.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Generate heart rate for type of cardiac arrest @@ -17,7 +17,7 @@ params ["_unit"]; -/* type +/* type 0 normal 1 asystole, no pulse, no shock 2 pulseless electrical activity, AEDX fake pulse, no shock @@ -38,4 +38,4 @@ switch (_unit getVariable [QGVAR(cardiacArrestType), 0]) do { default { 0; }; -}; \ No newline at end of file +}; diff --git a/addons/circulation/functions/fnc_handleCardiacArrest.sqf b/addons/circulation/functions/fnc_handleCardiacArrest.sqf index c75022aa5..b8ec5b672 100644 --- a/addons/circulation/functions/fnc_handleCardiacArrest.sqf +++ b/addons/circulation/functions/fnc_handleCardiacArrest.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Assign cardiac arrest type for unit entering cardiac arrest @@ -19,7 +19,7 @@ params ["_unit", "_active", ["_initial",true]]; -/* type +/* type 0 normal 1 asystole, no pulse, no shock 2 pulseless electrical activity, AEDX fake pulse, no shock @@ -135,7 +135,7 @@ if (GVAR(AdvRhythm_canDeteriorate)) then { case 2: { [{ params ["_unit"]; - + if (_unit getVariable [QACEGVAR(medical,CPR_provider), objNull] isEqualTo objNull) then { // Don't deteriorate during CPR if (_unit getVariable [QGVAR(cardiacArrestType), 0] isEqualTo 2) then { _unit setVariable [QGVAR(cardiacArrestType), 1, true]; diff --git a/addons/circulation/functions/fnc_handleTreatment.sqf b/addons/circulation/functions/fnc_handleTreatment.sqf index 8d7d1b3db..635a57bd7 100644 --- a/addons/circulation/functions/fnc_handleTreatment.sqf +++ b/addons/circulation/functions/fnc_handleTreatment.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Handle the treatment for the patient cause calling two functions in one action isn't allowed. diff --git a/addons/circulation/functions/fnc_init.sqf b/addons/circulation/functions/fnc_init.sqf index 5829a7a65..6e57679de 100644 --- a/addons/circulation/functions/fnc_init.sqf +++ b/addons/circulation/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Initializes unit variables. @@ -17,4 +17,4 @@ params ["_unit"]; -_unit setVariable [QGVAR(cprCount), 2, true]; \ No newline at end of file +_unit setVariable [QGVAR(cprCount), 2, true]; diff --git a/addons/circulation/functions/fnc_measureBloodPressure.sqf b/addons/circulation/functions/fnc_measureBloodPressure.sqf index 8e46dcc2c..945dac0f7 100644 --- a/addons/circulation/functions/fnc_measureBloodPressure.sqf +++ b/addons/circulation/functions/fnc_measureBloodPressure.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Measure and store blood pressure for unit @@ -21,4 +21,4 @@ params ["_unit"]; params ["_unit"]; _unit setVariable [QGVAR(StoredBloodPressure), (_unit getVariable [QACEGVAR(medical,bloodPressure), [0,0]]), true]; -}, [_unit], 1] call CBA_fnc_waitAndExecute; \ No newline at end of file +}, [_unit], 1] call CBA_fnc_waitAndExecute; diff --git a/addons/circulation/functions/fnc_onCloseDialog.sqf b/addons/circulation/functions/fnc_onCloseDialog.sqf index 5acfc5047..ac888983e 100644 --- a/addons/circulation/functions/fnc_onCloseDialog.sqf +++ b/addons/circulation/functions/fnc_onCloseDialog.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Close the cross panel dialog. diff --git a/addons/circulation/functions/fnc_placeAED.sqf b/addons/circulation/functions/fnc_placeAED.sqf index cbb48e005..5ac3b0199 100644 --- a/addons/circulation/functions/fnc_placeAED.sqf +++ b/addons/circulation/functions/fnc_placeAED.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Tomcat, Blue * Place the AED/X in front of unit @@ -42,7 +42,7 @@ if !(_patient isEqualTo objNull) then { params ["_unit", "_patient", "_AEDClassName", "_AED"]; [_unit, _patient, 1, _AEDClassName, [_AED], true] call FUNC(Defibrillator_AttachPads); - }, [_unit, _patient, _AEDClassName, _AED], 0.1] call CBA_fnc_waitAndExecute; + }, [_unit, _patient, _AEDClassName, _AED], 0.1] call CBA_fnc_waitAndExecute; }; if (_AEDClassName == "kat_X_AED") then { @@ -55,12 +55,12 @@ if (_AEDClassName == "kat_X_AED") then { [_unit, _monitorPatient, true] call FUNC(AEDX_DisconnectVitalsMonitor); _AED setVariable [QGVAR(AED_X_VitalsMonitor_Volume), (_monitorPatient getVariable [QGVAR(AED_X_VitalsMonitor_VolumePatient), false]), true]; - + [{ params ["_unit", "_monitorPatient", "_AEDClassName", "_AED", "_monitorBodyPart"]; - + [_unit, _monitorPatient, _monitorBodyPart, 1, [_AED], true] call FUNC(AEDX_ConnectVitalsMonitor); - }, [_unit, _monitorPatient, _AEDClassName, _AED, _monitorBodyPart], 0.15] call CBA_fnc_waitAndExecute; + }, [_unit, _monitorPatient, _AEDClassName, _AED, _monitorBodyPart], 0.15] call CBA_fnc_waitAndExecute; } else { if !(_patient isEqualTo objNull) then { _AED setVariable [QGVAR(AED_X_VitalsMonitor_Volume), (_patient getVariable [QGVAR(AED_X_VitalsMonitor_VolumePatient), false]), true]; @@ -80,7 +80,7 @@ _pickUpText, _AED setVariable [QGVAR(DefibrillatorInUse), false, true]; private _patient = _AED getVariable [QGVAR(Defibrillator_Patient), objNull]; - + if !(_patient isEqualTo objNull) then { [_medic, _patient, true] call FUNC(Defibrillator_RemovePads); @@ -89,7 +89,7 @@ _pickUpText, params ["_medic", "_patient", "_AEDClassName"]; [_medic, _patient, 0, _AEDClassName, [], true] call FUNC(Defibrillator_AttachPads); - }, [_medic, _patient, _AEDClassName], 0.1] call CBA_fnc_waitAndExecute; + }, [_medic, _patient, _AEDClassName], 0.1] call CBA_fnc_waitAndExecute; }; if (_AEDClassName == "kat_X_AED") then { @@ -107,7 +107,7 @@ _pickUpText, params ["_medic", "_patientMonitor", "_monitorBodyPart"]; [_medic, _patientMonitor, _monitorBodyPart, 0, [], true] call FUNC(AEDX_ConnectVitalsMonitor); - }, [_medic, _patientMonitor, _monitorBodyPart], 0.15] call CBA_fnc_waitAndExecute; + }, [_medic, _patientMonitor, _monitorBodyPart], 0.15] call CBA_fnc_waitAndExecute; }; }; @@ -122,10 +122,10 @@ _pickUpText, }, { params ["_AED", "_unit"]; - + [_unit, GVAR(medLvl_AED_Station_Interact)] call ACEFUNC(medical_treatment,isMedic) && !((_AED getVariable [QGVAR(Defibrillator_Patient), objNull]) getVariable [QGVAR(DefibrillatorInUse), false]); }, {}, [_AEDClassName] ] call ACEFUNC(interact_menu,createAction); -[_AED, 0, ["ACE_MainActions"], _action] call ACEFUNC(interact_menu,addActionToObject); \ No newline at end of file +[_AED, 0, ["ACE_MainActions"], _action] call ACEFUNC(interact_menu,addActionToObject); diff --git a/addons/circulation/functions/fnc_removeLog.sqf b/addons/circulation/functions/fnc_removeLog.sqf index e34b5ccf2..8af529280 100644 --- a/addons/circulation/functions/fnc_removeLog.sqf +++ b/addons/circulation/functions/fnc_removeLog.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Remove a given log from the ace medical menu. diff --git a/addons/circulation/functions/fnc_treatmentAdvanced_IV.sqf b/addons/circulation/functions/fnc_treatmentAdvanced_IV.sqf index 6ca135e7f..0476ffde5 100644 --- a/addons/circulation/functions/fnc_treatmentAdvanced_IV.sqf +++ b/addons/circulation/functions/fnc_treatmentAdvanced_IV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Handle the IV for the patient with blood types. Have to be local to avoid effect on all clients. diff --git a/addons/circulation/functions/fnc_updateBloodPressureChange.sqf b/addons/circulation/functions/fnc_updateBloodPressureChange.sqf index b41948ade..dff0ade90 100644 --- a/addons/circulation/functions/fnc_updateBloodPressureChange.sqf +++ b/addons/circulation/functions/fnc_updateBloodPressureChange.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Updates blood pressure change. @@ -40,4 +40,4 @@ if (_arrRow != -1) exitWith { if (_systolicChange isEqualTo 0 && _diastolicChange isEqualTo 0) exitWith {}; _BPChange append [[_systolicChange, _diastolicChange, _id]]; -_unit setVariable [VAR_BLOODPRESSURE_CHANGE, _BPChange, true]; \ No newline at end of file +_unit setVariable [VAR_BLOODPRESSURE_CHANGE, _BPChange, true]; diff --git a/addons/circulation/functions/fnc_updateHeartRate.sqf b/addons/circulation/functions/fnc_updateHeartRate.sqf index 78d1ec5f3..d41f8399a 100644 --- a/addons/circulation/functions/fnc_updateHeartRate.sqf +++ b/addons/circulation/functions/fnc_updateHeartRate.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Update the heart rate diff --git a/addons/circulation/functions/fnc_updateInternalBleeding.sqf b/addons/circulation/functions/fnc_updateInternalBleeding.sqf index ffa32fcb2..1a5c72535 100644 --- a/addons/circulation/functions/fnc_updateInternalBleeding.sqf +++ b/addons/circulation/functions/fnc_updateInternalBleeding.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Updates internal bleeding rate. @@ -25,4 +25,4 @@ if (_unit getVariable [QEGVAR(breathing,hemopneumothorax), false]) then { _internalBleeding = _internalBleeding + EGVAR(breathing,HPTXBleedAmount); }; -_unit setVariable [VAR_INTERNAL_BLEEDING, _internalBleeding * (_cardiacOutput max 0.05) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction, true]; \ No newline at end of file +_unit setVariable [VAR_INTERNAL_BLEEDING, _internalBleeding * (_cardiacOutput max 0.05) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction, true]; diff --git a/addons/circulation/functions/fnc_wrongBloodTreatment.sqf b/addons/circulation/functions/fnc_wrongBloodTreatment.sqf index 2610ce61c..6c13f1dcf 100644 --- a/addons/circulation/functions/fnc_wrongBloodTreatment.sqf +++ b/addons/circulation/functions/fnc_wrongBloodTreatment.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Tomcat * Treats wrong given Blood with Painkillers diff --git a/addons/circulation/functions/script_component.hpp b/addons/circulation/functions/script_component.hpp deleted file mode 100644 index 8af828fcc..000000000 --- a/addons/circulation/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\circulation\script_component.hpp" diff --git a/addons/circulation/script_component.hpp b/addons/circulation/script_component.hpp index 88afabfb0..b12dc5557 100644 --- a/addons/circulation/script_component.hpp +++ b/addons/circulation/script_component.hpp @@ -14,26 +14,4 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_CIRCULATION #endif -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" #include "\x\kat\addons\main\script_macros.hpp" - -// Returns a text config entry as compiled code or variable from missionNamespace -#define GET_FUNCTION(var,cfg) \ - private var = getText (cfg); \ - if (isNil var) then { \ - var = compile var; \ - } else { \ - var = missionNamespace getVariable var; \ - } - -// Returns a number config entry with default value of 0 -// If entry is a string, will get the variable from missionNamespace -#define GET_NUMBER_ENTRY(cfg) \ - if (isText (cfg)) then { \ - missionNamespace getVariable [getText (cfg), 0]; \ - } else { \ - getNumber (cfg); \ - } - -#define VAR_INTERNAL_BLEEDING QGVAR(internalBleeding) -#define GET_INTERNAL_BLEEDING(unit) (unit getVariable [VAR_INTERNAL_BLEEDING, 0]) \ No newline at end of file diff --git a/addons/circulation/ui/AEDX_Monitor_Dialog.hpp b/addons/circulation/ui/AEDX_Monitor_Dialog.hpp index 84f0cb6af..3ca476206 100644 --- a/addons/circulation/ui/AEDX_Monitor_Dialog.hpp +++ b/addons/circulation/ui/AEDX_Monitor_Dialog.hpp @@ -10,17 +10,17 @@ class RscStructuredText; class GVAR(AEDX_Monitor_Dialog) { idd = IDC_AEDX_MONITOR; movingEnable = 0; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(AEDX_Monitor_Display), (_this select 0))]); - onUnload = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(AEDX_Monitor_Display), nil)]); + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(AEDX_Monitor_Display),(_this select 0))]); + onUnload = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(AEDX_Monitor_Display),nil)]); objects[] = {}; class ControlsBackground { class BlackBackground: RscText { idc = -1; - x = QUOTE(pxToScreen_X(450)); - y = QUOTE(pxToScreen_Y(590)); - w = QUOTE(pxToScreen_W(1062)); - h = QUOTE(pxToScreen_H(824)); + x = QUOTE(KAT_pxToScreen_X(450)); + y = QUOTE(KAT_pxToScreen_Y(590)); + w = QUOTE(KAT_pxToScreen_W(1062)); + h = QUOTE(KAT_pxToScreen_H(824)); type = 0; style = 80; colorBackground[] = {0,0,0,1}; @@ -30,10 +30,10 @@ class GVAR(AEDX_Monitor_Dialog) { class Background: BlackBackground {}; class EKG: RscPicture { idc = IDC_EKG_DISPLAY; - x = QUOTE(pxToScreen_X(475)); - y = QUOTE(pxToScreen_Y(534)); - w = QUOTE(pxToScreen_W(1024)); - h = QUOTE(pxToScreen_H(1024)); + x = QUOTE(KAT_pxToScreen_X(475)); + y = QUOTE(KAT_pxToScreen_Y(534)); + w = QUOTE(KAT_pxToScreen_W(1024)); + h = QUOTE(KAT_pxToScreen_H(1024)); type = 0; style = 48; size = 0; @@ -43,10 +43,10 @@ class GVAR(AEDX_Monitor_Dialog) { }; class EKGSlider: RscPicture { idc = IDC_EKG_SLIDER; - x = QUOTE(pxToScreen_X(250)); - y = QUOTE(pxToScreen_Y(726)); - w = QUOTE(pxToScreen_W(256)); - h = QUOTE(pxToScreen_H(256)); + x = QUOTE(KAT_pxToScreen_X(250)); + y = QUOTE(KAT_pxToScreen_Y(726)); + w = QUOTE(KAT_pxToScreen_W(256)); + h = QUOTE(KAT_pxToScreen_H(256)); type = 0; style = 48; colorBackground[] = {0,0,0,0}; @@ -55,14 +55,14 @@ class GVAR(AEDX_Monitor_Dialog) { }; class HeartRateVitalsDisplayBackground: RscText { idc = IDC_DISPLAY_HEARTRATE_TEXT; - x = QUOTE(pxToScreen_X(552)); - y = QUOTE(pxToScreen_Y(1166)); - w = QUOTE(pxToScreen_W(190)); - h = QUOTE(pxToScreen_H(30)); + x = QUOTE(KAT_pxToScreen_X(552)); + y = QUOTE(KAT_pxToScreen_Y(1166)); + w = QUOTE(KAT_pxToScreen_W(190)); + h = QUOTE(KAT_pxToScreen_H(30)); type = 0; style = 0; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 0.6); + sizeEx = QUOTE(KAT_GRID_H * 0.6); shadow = 0; colorBackground[] = {0.77,0.96,0.32,1}; colorText[] = {0,0,0,1}; @@ -77,8 +77,8 @@ class GVAR(AEDX_Monitor_Dialog) { }; class BloodPressureVitalsDisplayBackground: HeartRateVitalsDisplayBackground { idc = -1; - x = QUOTE(pxToScreen_X(746)); - w = QUOTE(pxToScreen_W(260)); + x = QUOTE(KAT_pxToScreen_X(746)); + w = QUOTE(KAT_pxToScreen_W(260)); colorBackground[] = {0.04,0.96,0.98,1}; colorText[] = {0,0,0,1}; text = "NIBP"; @@ -94,17 +94,17 @@ class GVAR(AEDX_Monitor_Dialog) { { idc = -1; style = 2; - x = QUOTE(pxToScreen_X(760)); - y = QUOTE(pxToScreen_Y(1279)); - w = QUOTE(pxToScreen_W(120)); - h = QUOTE(pxToScreen_H(3)); + x = QUOTE(KAT_pxToScreen_X(760)); + y = QUOTE(KAT_pxToScreen_Y(1279)); + w = QUOTE(KAT_pxToScreen_W(120)); + h = QUOTE(KAT_pxToScreen_H(3)); colorBackground[] = {0.04,0.96,0.98,1}; colorText[] = {1,1,1,1}; text = ""; }; class RespirationRateDisplayBackground: HeartRateVitalsDisplayBackground { idc = -1; - x = QUOTE(pxToScreen_X(1010)); + x = QUOTE(KAT_pxToScreen_X(1010)); colorBackground[] = {0.73,0.02,0.74,1}; colorText[] = {0,0,0,1}; text = "Resp"; @@ -118,7 +118,7 @@ class GVAR(AEDX_Monitor_Dialog) { }; class SpO2DisplayBackground: HeartRateVitalsDisplayBackground { idc = -1; - x = QUOTE(pxToScreen_X(1204)); + x = QUOTE(KAT_pxToScreen_X(1204)); colorBackground[] = {0.99,0.97,0.02,1}; colorText[] = {0,0,0,1}; text = "SpO2"; @@ -132,14 +132,14 @@ class GVAR(AEDX_Monitor_Dialog) { }; class SpO2PulseRateDisplayBorder: RscText { idc = IDC_DISPLAY_PULSERATEBORDER; - x = QUOTE(pxToScreen_X(1366)); - y = QUOTE(pxToScreen_Y(1207)); - w = QUOTE(pxToScreen_W(26)); - h = QUOTE(pxToScreen_H(80)); + x = QUOTE(KAT_pxToScreen_X(1366)); + y = QUOTE(KAT_pxToScreen_Y(1207)); + w = QUOTE(KAT_pxToScreen_W(26)); + h = QUOTE(KAT_pxToScreen_H(80)); type = 0; style = 0; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 0.6); + sizeEx = QUOTE(KAT_GRID_H * 0.6); shadow = 0; colorBackground[] = {0.99,0.97,0.02,1}; colorText[] = {0,0,0,0}; @@ -148,18 +148,18 @@ class GVAR(AEDX_Monitor_Dialog) { }; class SpO2PulseRateDisplayBackground: SpO2PulseRateDisplayBorder { idc = IDC_DISPLAY_PULSERATEBG; - x = QUOTE(pxToScreen_X(1368)); - y = QUOTE(pxToScreen_Y(1210)); - w = QUOTE(pxToScreen_W(20)); - h = QUOTE(pxToScreen_H(74)); + x = QUOTE(KAT_pxToScreen_X(1368)); + y = QUOTE(KAT_pxToScreen_Y(1210)); + w = QUOTE(KAT_pxToScreen_W(20)); + h = QUOTE(KAT_pxToScreen_H(74)); colorBackground[] = {0,0,0,1}; }; class SpO2PulseRateDisplayBar: SpO2PulseRateDisplayBorder { idc = IDC_DISPLAY_PULSERATEDSPBAR; - x = QUOTE(pxToScreen_X(1370)); - y = QUOTE(pxToScreen_Y(1211)); - w = QUOTE(pxToScreen_W(17)); - h = QUOTE(pxToScreen_H(71)); + x = QUOTE(KAT_pxToScreen_X(1370)); + y = QUOTE(KAT_pxToScreen_Y(1211)); + w = QUOTE(KAT_pxToScreen_W(17)); + h = QUOTE(KAT_pxToScreen_H(71)); }; class SpO2PulseRateDisplayBarB: SpO2PulseRateDisplayBar { idc = IDC_DISPLAY_PULSERATEBAR; @@ -167,14 +167,14 @@ class GVAR(AEDX_Monitor_Dialog) { }; class HeartRateDisplay: RscText { idc = IDC_DISPLAY_HEARTRATE; - x = QUOTE(pxToScreen_X(552)); - y = QUOTE(pxToScreen_Y(1196)); - w = QUOTE(pxToScreen_W(190)); - h = QUOTE(pxToScreen_H(80)); + x = QUOTE(KAT_pxToScreen_X(552)); + y = QUOTE(KAT_pxToScreen_Y(1196)); + w = QUOTE(KAT_pxToScreen_W(190)); + h = QUOTE(KAT_pxToScreen_H(80)); type = 0; style = 2; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 2.5); + sizeEx = QUOTE(KAT_GRID_H * 2.5); shadow = 0; colorBackground[] = {0,0,0,0}; colorText[] = {0.77,0.96,0.32,1}; @@ -183,53 +183,53 @@ class GVAR(AEDX_Monitor_Dialog) { class TopBloodPressureDisplay: HeartRateDisplay { idc = IDC_DISPLAY_BLOODPRESSURE_T; style = 1; - x = QUOTE(pxToScreen_X(760)); - w = QUOTE(pxToScreen_W(120)); - h = QUOTE(pxToScreen_H(70)); - sizeEx = QUOTE(GRID_H * 1.8); + x = QUOTE(KAT_pxToScreen_X(760)); + w = QUOTE(KAT_pxToScreen_W(120)); + h = QUOTE(KAT_pxToScreen_H(70)); + sizeEx = QUOTE(KAT_GRID_H * 1.8); colorText[] = {0.04,0.96,0.98,1}; text = "---"; }; class BottomBloodPressureDisplay: TopBloodPressureDisplay { idc = IDC_DISPLAY_BLOODPRESSURE_B; - y = QUOTE(pxToScreen_Y(1290)); + y = QUOTE(KAT_pxToScreen_Y(1290)); colorText[] = {0.04,0.96,0.98,1}; text = "---"; }; class MeanBloodPressureDisplay: TopBloodPressureDisplay { idc = IDC_DISPLAY_BLOODPRESSURE_M; - x = QUOTE(pxToScreen_X(910)); - w = QUOTE(pxToScreen_W(100)); - h = QUOTE(pxToScreen_H(60)); - sizeEx = QUOTE(GRID_H * 1.1); + x = QUOTE(KAT_pxToScreen_X(910)); + w = QUOTE(KAT_pxToScreen_W(100)); + h = QUOTE(KAT_pxToScreen_H(60)); + sizeEx = QUOTE(KAT_GRID_H * 1.1); colorText[] = {0.04,0.96,0.98,1}; text = ""; }; class RespirationRateDisplay: HeartRateDisplay { idc = IDC_DISPLAY_RESP; - x = QUOTE(pxToScreen_X(1010)); - h = QUOTE(pxToScreen_H(120)); - sizeEx = QUOTE(GRID_H * 0.7); + x = QUOTE(KAT_pxToScreen_X(1010)); + h = QUOTE(KAT_pxToScreen_H(120)); + sizeEx = QUOTE(KAT_GRID_H * 0.7); colorText[] = {0.73,0.02,0.74,1}; text = "Resp off"; }; class SpO2Display: HeartRateDisplay { idc = IDC_DISPLAY_SPO2; - x = QUOTE(pxToScreen_X(1200)); - w = QUOTE(pxToScreen_W(170)); + x = QUOTE(KAT_pxToScreen_X(1200)); + w = QUOTE(KAT_pxToScreen_W(170)); colorText[] = {0.99,0.97,0.02,1}; text = "---"; }; class DateAndTime: RscText { idc = IDC_DISPLAY_DATEANDTIME; - x = QUOTE(pxToScreen_X(505)); - y = QUOTE(pxToScreen_Y(618)); - w = QUOTE(pxToScreen_W(400)); - h = QUOTE(pxToScreen_H(40)); + x = QUOTE(KAT_pxToScreen_X(505)); + y = QUOTE(KAT_pxToScreen_Y(618)); + w = QUOTE(KAT_pxToScreen_W(400)); + h = QUOTE(KAT_pxToScreen_H(40)); type = 0; style = 0; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 0.8); + sizeEx = QUOTE(KAT_GRID_H * 0.8); shadow = 0; colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; @@ -237,10 +237,10 @@ class GVAR(AEDX_Monitor_Dialog) { }; class Battery: RscPicture { idc = -1; - x = QUOTE(pxToScreen_X(1256)); - y = QUOTE(pxToScreen_Y(622)); - w = QUOTE(pxToScreen_W(64)); - h = QUOTE(pxToScreen_H(64)); + x = QUOTE(KAT_pxToScreen_X(1256)); + y = QUOTE(KAT_pxToScreen_Y(622)); + w = QUOTE(KAT_pxToScreen_W(64)); + h = QUOTE(KAT_pxToScreen_H(64)); style = 48; colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; @@ -248,21 +248,21 @@ class GVAR(AEDX_Monitor_Dialog) { }; class ElapsedTime: DateAndTime { idc = IDC_DISPLAY_ELAPSEDTIME; - x = QUOTE(pxToScreen_X(1335)); - w = QUOTE(pxToScreen_W(130)); + x = QUOTE(KAT_pxToScreen_X(1335)); + w = QUOTE(KAT_pxToScreen_W(130)); style = 2; text = "00:00:00"; }; class topMiddleText: RscText { idc = IDC_EKG_DISPLAY_MIDTEXT; - x = QUOTE(pxToScreen_X(880)); - y = QUOTE(pxToScreen_Y(680)); - w = QUOTE(pxToScreen_W(200)); - h = QUOTE(pxToScreen_H(100)); + x = QUOTE(KAT_pxToScreen_X(880)); + y = QUOTE(KAT_pxToScreen_Y(680)); + w = QUOTE(KAT_pxToScreen_W(200)); + h = QUOTE(KAT_pxToScreen_H(100)); type = 0; style = 2; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 0.6); + sizeEx = QUOTE(KAT_GRID_H * 0.6); shadow = 0; colorBackground[] = {0,0,0,0}; colorText[] = {0,1,0,1}; @@ -270,30 +270,30 @@ class GVAR(AEDX_Monitor_Dialog) { }; class ChargingStatusBlackBackground: BlackBackground { idc = IDC_CHARGE_BBACKGROUND; - x = QUOTE(pxToScreen_X(478)); - y = QUOTE(pxToScreen_Y(1119)); - w = QUOTE(pxToScreen_W(1000)); - h = QUOTE(pxToScreen_H(250)); + x = QUOTE(KAT_pxToScreen_X(478)); + y = QUOTE(KAT_pxToScreen_Y(1119)); + w = QUOTE(KAT_pxToScreen_W(1000)); + h = QUOTE(KAT_pxToScreen_H(250)); show = 0; }; class ChargingStatusBlackBackground2: BlackBackground { idc = IDC_CHARGE_BBACKGROUND2; - x = QUOTE(pxToScreen_X(1336)); - y = QUOTE(pxToScreen_Y(601)); - w = QUOTE(pxToScreen_W(145)); - h = QUOTE(pxToScreen_H(768)); + x = QUOTE(KAT_pxToScreen_X(1336)); + y = QUOTE(KAT_pxToScreen_Y(601)); + w = QUOTE(KAT_pxToScreen_W(145)); + h = QUOTE(KAT_pxToScreen_H(768)); show = 0; }; class ChargingStatusDefibrillator: RscText { idc = IDC_CHARGE_STATUS_TITLE; - x = QUOTE(pxToScreen_X(579)); - y = QUOTE(pxToScreen_Y(1137)); - w = QUOTE(pxToScreen_W(400)); - h = QUOTE(pxToScreen_H(50)); + x = QUOTE(KAT_pxToScreen_X(579)); + y = QUOTE(KAT_pxToScreen_Y(1137)); + w = QUOTE(KAT_pxToScreen_W(400)); + h = QUOTE(KAT_pxToScreen_H(50)); type = 0; style = 2; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 0.8); + sizeEx = QUOTE(KAT_GRID_H * 0.8); shadow = 0; colorBackground[] = {0.05,0.85,0.36,1}; colorText[] = {0,0,0,1}; @@ -302,26 +302,26 @@ class GVAR(AEDX_Monitor_Dialog) { }; class ChargingStatus: ChargingStatusDefibrillator { idc = IDC_CHARGE_STATUS; - y = QUOTE(pxToScreen_Y(1189)); - w = QUOTE(pxToScreen_W(400)); - h = QUOTE(pxToScreen_H(172)); - sizeEx = QUOTE(GRID_H * 1.5); + y = QUOTE(KAT_pxToScreen_Y(1189)); + w = QUOTE(KAT_pxToScreen_W(400)); + h = QUOTE(KAT_pxToScreen_H(172)); + sizeEx = QUOTE(KAT_GRID_H * 1.5); colorBackground[] = {1,0.35,0,1}; colorText[] = {0,0,0,1}; text = "CHARGING"; }; class ChargingStatusEnergySelect: ChargingStatusDefibrillator { idc = IDC_CHARGE_ENERGY_SELECT; - x = QUOTE(pxToScreen_X(1065)); - w = QUOTE(pxToScreen_W(270)); + x = QUOTE(KAT_pxToScreen_X(1065)); + w = QUOTE(KAT_pxToScreen_W(270)); text = "Selected energy"; }; class ChargingStatusEnergySelectAmount: ChargingStatus { idc = IDC_CHARGE_ENERGY_AMOUNT; - x = QUOTE(pxToScreen_X(1065)); - w = QUOTE(pxToScreen_W(270)); + x = QUOTE(KAT_pxToScreen_X(1065)); + w = QUOTE(KAT_pxToScreen_W(270)); font = "RobotoCondensedBold"; - sizeEx = QUOTE(GRID_H * 2.5); + sizeEx = QUOTE(KAT_GRID_H * 2.5); colorBackground[] = {0,0,0,1}; colorText[] = {1,1,1,1}; text = "150 J"; @@ -329,10 +329,10 @@ class GVAR(AEDX_Monitor_Dialog) { class ChargingStatusBarCharged: RscText { idc = IDC_CHARGE_BAR_BACKGROUND; - x = QUOTE(pxToScreen_X(1344)); - y = QUOTE(pxToScreen_Y(1360)); - w = QUOTE(pxToScreen_W(126)); - h = QUOTE(pxToScreen_H(1)); + x = QUOTE(KAT_pxToScreen_X(1344)); + y = QUOTE(KAT_pxToScreen_Y(1360)); + w = QUOTE(KAT_pxToScreen_W(126)); + h = QUOTE(KAT_pxToScreen_H(1)); type = 0; style = 0; shadow = 0; @@ -343,14 +343,14 @@ class GVAR(AEDX_Monitor_Dialog) { class ChargingStatusBar1: RscText { idc = IDC_CHARGE_BAR_1; - x = QUOTE(pxToScreen_X(1345)); - y = QUOTE(pxToScreen_Y(1328)); - w = QUOTE(pxToScreen_W(123)); - h = QUOTE(pxToScreen_H(28)); + x = QUOTE(KAT_pxToScreen_X(1345)); + y = QUOTE(KAT_pxToScreen_Y(1328)); + w = QUOTE(KAT_pxToScreen_W(123)); + h = QUOTE(KAT_pxToScreen_H(28)); type = 0; style = 2; font = "RobotoCondensedBold"; - sizeEx = QUOTE(GRID_H * 0.6); + sizeEx = QUOTE(KAT_GRID_H * 0.6); shadow = 0; colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; @@ -359,99 +359,99 @@ class GVAR(AEDX_Monitor_Dialog) { }; class ChargingStatusBar2: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_2; - y = QUOTE(pxToScreen_Y(1294)); + y = QUOTE(KAT_pxToScreen_Y(1294)); text = "2"; }; class ChargingStatusBar3: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_3; - y = QUOTE(pxToScreen_Y(1260)); + y = QUOTE(KAT_pxToScreen_Y(1260)); text = "3"; }; class ChargingStatusBar4: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_4; - y = QUOTE(pxToScreen_Y(1226)); + y = QUOTE(KAT_pxToScreen_Y(1226)); text = "4"; }; class ChargingStatusBar5: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_5; - y = QUOTE(pxToScreen_Y(1192)); + y = QUOTE(KAT_pxToScreen_Y(1192)); text = "5"; }; class ChargingStatusBar6: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_6; - y = QUOTE(pxToScreen_Y(1158)); + y = QUOTE(KAT_pxToScreen_Y(1158)); text = "6"; }; class ChargingStatusBar7: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_7; - y = QUOTE(pxToScreen_Y(1124)); + y = QUOTE(KAT_pxToScreen_Y(1124)); text = "7"; }; class ChargingStatusBar8: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_8; - y = QUOTE(pxToScreen_Y(1090)); + y = QUOTE(KAT_pxToScreen_Y(1090)); text = "8"; }; class ChargingStatusBar9: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_9; - y = QUOTE(pxToScreen_Y(1056)); + y = QUOTE(KAT_pxToScreen_Y(1056)); text = "9"; }; class ChargingStatusBar10: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_10; - y = QUOTE(pxToScreen_Y(1022)); + y = QUOTE(KAT_pxToScreen_Y(1022)); text = "10"; }; class ChargingStatusBar15: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_15; - y = QUOTE(pxToScreen_Y(988)); + y = QUOTE(KAT_pxToScreen_Y(988)); text = "15"; }; class ChargingStatusBar20: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_20; - y = QUOTE(pxToScreen_Y(954)); + y = QUOTE(KAT_pxToScreen_Y(954)); text = "20"; }; class ChargingStatusBar30: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_30; - y = QUOTE(pxToScreen_Y(920)); + y = QUOTE(KAT_pxToScreen_Y(920)); text = "30"; }; class ChargingStatusBar50: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_50; - y = QUOTE(pxToScreen_Y(886)); + y = QUOTE(KAT_pxToScreen_Y(886)); text = "50"; }; class ChargingStatusBar70: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_70; - y = QUOTE(pxToScreen_Y(852)); + y = QUOTE(KAT_pxToScreen_Y(852)); text = "70"; }; class ChargingStatusBar85: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_85; - y = QUOTE(pxToScreen_Y(818)); + y = QUOTE(KAT_pxToScreen_Y(818)); text = "85"; }; class ChargingStatusBar100: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_100; - y = QUOTE(pxToScreen_Y(784)); + y = QUOTE(KAT_pxToScreen_Y(784)); text = "100"; }; class ChargingStatusBar120: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_120; - y = QUOTE(pxToScreen_Y(750)); + y = QUOTE(KAT_pxToScreen_Y(750)); text = "120"; }; class ChargingStatusBar150: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_150; - y = QUOTE(pxToScreen_Y(682)); - h = QUOTE(pxToScreen_H(66)); - sizeEx = QUOTE(GRID_H * 1.5); + y = QUOTE(KAT_pxToScreen_Y(682)); + h = QUOTE(KAT_pxToScreen_H(66)); + sizeEx = QUOTE(KAT_GRID_H * 1.5); text = "150"; }; class ChargingStatusBar200: ChargingStatusBar1 { idc = IDC_CHARGE_BAR_200; - y = QUOTE(pxToScreen_Y(648)); + y = QUOTE(KAT_pxToScreen_Y(648)); text = "200"; }; class ChargingStatusBackground: EKG { @@ -461,14 +461,14 @@ class GVAR(AEDX_Monitor_Dialog) { }; class ShockTally: RscText { idc = IDC_CHARGE_SHOCKTOTAL; - x = QUOTE(pxToScreen_X(980)); - y = QUOTE(pxToScreen_Y(1282)); - w = QUOTE(pxToScreen_W(84)); - h = QUOTE(pxToScreen_H(46)); + x = QUOTE(KAT_pxToScreen_X(980)); + y = QUOTE(KAT_pxToScreen_Y(1282)); + w = QUOTE(KAT_pxToScreen_W(84)); + h = QUOTE(KAT_pxToScreen_H(46)); type = 0; style = 2; font = "RobotoCondensedBold"; - sizeEx = QUOTE(GRID_H); + sizeEx = QUOTE(KAT_GRID_H); shadow = 0; colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; @@ -477,10 +477,10 @@ class GVAR(AEDX_Monitor_Dialog) { }; class AEDBackground: RscPicture { idc = -1; - x = QUOTE(GUI_GRID_X); - y = QUOTE(GUI_GRID_Y); - w = QUOTE(GUI_GRID_W); - h = QUOTE(GUI_GRID_H); + x = QUOTE(KAT_GUI_GRID_X); + y = QUOTE(KAT_GUI_GRID_Y); + w = QUOTE(KAT_GUI_GRID_W); + h = QUOTE(KAT_GUI_GRID_H); type = 0; style = 48; font = "TahomaB"; @@ -491,10 +491,10 @@ class GVAR(AEDX_Monitor_Dialog) { }; class ShockButton: RscPicture { idc = IDC_SHOCKBUTTON; - x = QUOTE(pxToScreen_X(1487)); - y = QUOTE(pxToScreen_Y(1380)); - w = QUOTE(pxToScreen_W(256)); - h = QUOTE(pxToScreen_H(256)); + x = QUOTE(KAT_pxToScreen_X(1487)); + y = QUOTE(KAT_pxToScreen_Y(1380)); + w = QUOTE(KAT_pxToScreen_W(256)); + h = QUOTE(KAT_pxToScreen_H(256)); style = 48; colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; @@ -503,14 +503,14 @@ class GVAR(AEDX_Monitor_Dialog) { }; class AutoModeFeedbackMessageTop: RscText { idc = IDC_AEDMODE_MSG_TOP; - x = QUOTE(pxToScreen_X(579)); - y = QUOTE(pxToScreen_Y(1137)); - w = QUOTE(pxToScreen_W(758)); - h = QUOTE(pxToScreen_H(61)); + x = QUOTE(KAT_pxToScreen_X(579)); + y = QUOTE(KAT_pxToScreen_Y(1137)); + w = QUOTE(KAT_pxToScreen_W(758)); + h = QUOTE(KAT_pxToScreen_H(61)); type = 0; style = 2; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H * 1); + sizeEx = QUOTE(KAT_GRID_H * 1); shadow = 0; colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; @@ -519,10 +519,10 @@ class GVAR(AEDX_Monitor_Dialog) { }; class AutoModeFeedbackMessage: AutoModeFeedbackMessageTop { idc = IDC_AEDMODE_MSG; - y = QUOTE(pxToScreen_Y(1198)); - h = QUOTE(pxToScreen_H(150)); + y = QUOTE(KAT_pxToScreen_Y(1198)); + h = QUOTE(KAT_pxToScreen_H(150)); font = "RobotoCondensedBold"; - sizeEx = QUOTE(GRID_H * 1.6); + sizeEx = QUOTE(KAT_GRID_H * 1.6); text = ""; }; class AEDModeFeedbackMessageBackground: EKG { @@ -547,54 +547,54 @@ class GVAR(AEDX_Monitor_Dialog) { soundEscape[] = {}; idc = -1; style = 0; - x = QUOTE(pxToScreen_X(1537)); - y = QUOTE(pxToScreen_Y(1430)); - w = QUOTE(pxToScreen_W(156)); - h = QUOTE(pxToScreen_H(156)); + x = QUOTE(KAT_pxToScreen_X(1537)); + y = QUOTE(KAT_pxToScreen_Y(1430)); + w = QUOTE(KAT_pxToScreen_W(156)); + h = QUOTE(KAT_pxToScreen_H(156)); shadow = 0; font = "RobotoCondensed"; - sizeEx = QUOTE(GRID_H); - onButtonClick = QUOTE(if !(GVAR(AEDX_MonitorTarget) isEqualTo objNull) then {if(GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(Defibrillator_Charged), false)]) then {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]; GVAR(AEDX_MonitorCharged) = false; GVAR(AEDX_MonitorShockAdministered) = true}}); + sizeEx = QUOTE(KAT_GRID_H); + onButtonClick = QUOTE(if !(GVAR(AEDX_MonitorTarget) isEqualTo objNull) then {if(GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(Defibrillator_Charged),false)]) then {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]; GVAR(AEDX_MonitorCharged) = false; GVAR(AEDX_MonitorShockAdministered) = true}}); tooltip = CSTRING(Defibrillator_Action_Shock); }; class AnalyzeButton: ShockButton { idc = -1; - x = QUOTE(pxToScreen_X(913)); - y = QUOTE(pxToScreen_Y(1487)); - w = QUOTE(pxToScreen_W(122)); - h = QUOTE(pxToScreen_H(89)); - onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected), false)] && !(GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorInUse), false)])) then {[ARR_3(player, GVAR(AEDX_MonitorTarget),'AEDX')] call FUNC(AED_Analyze); [] call FUNC(AEDX_ViewMonitor_AnalyzeFeedback)}); + x = QUOTE(KAT_pxToScreen_X(913)); + y = QUOTE(KAT_pxToScreen_Y(1487)); + w = QUOTE(KAT_pxToScreen_W(122)); + h = QUOTE(KAT_pxToScreen_H(89)); + onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && !(GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)])) then {[ARR_3(player,GVAR(AEDX_MonitorTarget),'AEDX')] call FUNC(AED_Analyze); [] call FUNC(AEDX_ViewMonitor_AnalyzeFeedback)}); tooltip = CSTRING(AnalyzeRhythm); }; class ChargeButton: AnalyzeButton { idc = -1; - x = QUOTE(pxToScreen_X(1316)); - onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected), false)] && !(GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorInUse), false)])) then {[ARR_2(player, GVAR(AEDX_MonitorTarget))] call FUNC(Defibrillator_ManualCharge); [true] call FUNC(AEDX_ViewMonitor_AnalyzeFeedback); [] call FUNC(AEDX_ViewMonitor_Charging)}); + x = QUOTE(KAT_pxToScreen_X(1316)); + onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorPads_Connected),false)] && !(GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(DefibrillatorInUse),false)])) then {[ARR_2(player,GVAR(AEDX_MonitorTarget))] call FUNC(Defibrillator_ManualCharge); [true] call FUNC(AEDX_ViewMonitor_AnalyzeFeedback); [] call FUNC(AEDX_ViewMonitor_Charging)}); tooltip = CSTRING(Defibrillator_Action_Charge); }; class CancelChargeButton: ShockButton { idc = -1; - x = QUOTE(pxToScreen_X(1116)); - y = QUOTE(pxToScreen_Y(1453)); - w = QUOTE(pxToScreen_W(119)); - h = QUOTE(pxToScreen_H(169)); - onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && (GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(Defibrillator_Charged), false)])) then {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(DefibrillatorInUse), false, true)]; GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(Defibrillator_Charged), false, true)]; GVAR(AEDX_MonitorCharged) = false; GVAR(AEDX_MonitorShockAdministered) = false}); + x = QUOTE(KAT_pxToScreen_X(1116)); + y = QUOTE(KAT_pxToScreen_Y(1453)); + w = QUOTE(KAT_pxToScreen_W(119)); + h = QUOTE(KAT_pxToScreen_H(169)); + onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && (GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(Defibrillator_Charged),false)])) then {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(DefibrillatorInUse),false,true)]; GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(Defibrillator_Charged),false,true)]; GVAR(AEDX_MonitorCharged) = false; GVAR(AEDX_MonitorShockAdministered) = false}); tooltip = CSTRING(Defibrillator_Action_CancelCharge); }; class ToggleVolumeButton: ShockButton { idc = -1; - x = QUOTE(pxToScreen_X(1678)); - y = QUOTE(pxToScreen_Y(802)); - w = QUOTE(pxToScreen_W(91)); - h = QUOTE(pxToScreen_H(73)); - onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull)) then {if (GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_VolumePatient), false)]) then {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient), false, true)]; [ARR_2((GVAR(AEDX_MonitorTarget) getVariable QQGVAR(Defibrillator_Provider)) select 0, false)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)} else {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient), true, true)]; [ARR_2((GVAR(AEDX_MonitorTarget) getVariable QQGVAR(Defibrillator_Provider)) select 0, true)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)}}); + x = QUOTE(KAT_pxToScreen_X(1678)); + y = QUOTE(KAT_pxToScreen_Y(802)); + w = QUOTE(KAT_pxToScreen_W(91)); + h = QUOTE(KAT_pxToScreen_H(73)); + onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull)) then {if (GVAR(AEDX_MonitorTarget) getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_VolumePatient),false)]) then {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient),false,true)]; [ARR_2((GVAR(AEDX_MonitorTarget) getVariable QQGVAR(Defibrillator_Provider)) select 0,false)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)} else {GVAR(AEDX_MonitorTarget) setVariable [ARR_3(QQGVAR(AED_X_VitalsMonitor_VolumePatient),true,true)]; [ARR_2((GVAR(AEDX_MonitorTarget) getVariable QQGVAR(Defibrillator_Provider)) select 0,true)] call FUNC(AEDXPlaced_VitalsMonitor_SetVolume)}}); tooltip = CSTRING(AEDX_Monitor_ToggleVolume); }; class ManualBloodPressureMeasurement: ToggleVolumeButton { idc = -1; - y = QUOTE(pxToScreen_Y(1251)); - onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && (missionNamespace getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_BloodPressureInterval), 0)] > 0)) then {GVAR(AEDX_MonitorTarget) call FUNC(measureBloodPressure)}); + y = QUOTE(KAT_pxToScreen_Y(1251)); + onButtonClick = QUOTE(if (!(GVAR(AEDX_MonitorTarget) isEqualTo objNull) && (missionNamespace getVariable [ARR_2(QQGVAR(AED_X_VitalsMonitor_BloodPressureInterval),0)] > 0)) then {GVAR(AEDX_MonitorTarget) call FUNC(measureBloodPressure)}); tooltip = CSTRING(AEDX_Monitor_MeasureBloodPressure); }; }; -}; \ No newline at end of file +}; diff --git a/addons/circulation/ui/CrossPanel_Dialog.hpp b/addons/circulation/ui/CrossPanel_Dialog.hpp index 06b3d6c6f..03fa0f99d 100644 --- a/addons/circulation/ui/CrossPanel_Dialog.hpp +++ b/addons/circulation/ui/CrossPanel_Dialog.hpp @@ -1,7 +1,7 @@ class GVAR(CrossPanel_Dialog) { idd = -1; movingEnable = 1; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(CrossPanel_Display), (_this select 0))]); + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(CrossPanel_Display),(_this select 0))]); onUnload = QUOTE(_this call FUNC(onCloseDialog)); objects[] = {}; diff --git a/addons/gui/functions/fnc_displayPatientInformation.sqf b/addons/gui/functions/fnc_displayPatientInformation.sqf index ac99b7ec3..e5a20324f 100644 --- a/addons/gui/functions/fnc_displayPatientInformation.sqf +++ b/addons/gui/functions/fnc_displayPatientInformation.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Opens the patient information display for given target. diff --git a/addons/gui/functions/fnc_menuPFH.sqf b/addons/gui/functions/fnc_menuPFH.sqf index 056b3a5a6..947dddd57 100644 --- a/addons/gui/functions/fnc_menuPFH.sqf +++ b/addons/gui/functions/fnc_menuPFH.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001 * Handles updating the Medical Menu UI for the current target. diff --git a/addons/gui/functions/fnc_onMenuClose.sqf b/addons/gui/functions/fnc_onMenuClose.sqf index 25635adda..0524d3beb 100644 --- a/addons/gui/functions/fnc_onMenuClose.sqf +++ b/addons/gui/functions/fnc_onMenuClose.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: joko // Jonas * Handles closing the Medical Menu. Called from onUnload event. @@ -21,4 +21,4 @@ if (ACEGVAR(interact_menu,menuBackground) == 2) then {(uiNamespace getVariable [ ACEGVAR(medical_gui,pendingReopen) = false; ACEGVAR(medical_gui,menuPFH) call CBA_fnc_removePerFrameHandler; ACEGVAR(medical_gui,menuPFH) = -1; -ACEGVAR(medical_gui,target) = objNull; \ No newline at end of file +ACEGVAR(medical_gui,target) = objNull; diff --git a/addons/gui/functions/fnc_onMenuOpen.sqf b/addons/gui/functions/fnc_onMenuOpen.sqf index 6291c95e6..f04f8f3f3 100644 --- a/addons/gui/functions/fnc_onMenuOpen.sqf +++ b/addons/gui/functions/fnc_onMenuOpen.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Handles opening the Medical Menu. Called from onLoad event. @@ -102,4 +102,4 @@ if (ACEGVAR(medical_gui,target) == ACE_player) then { } else { _ctrl ctrlSetText QACEPATHTOF(medical_gui,data\categories\toggle_to_self.paa); _ctrl ctrlSetTooltip ACELLSTRING(medical_gui,ToggleToSelf); -}; \ No newline at end of file +}; diff --git a/addons/gui/functions/fnc_updateActions.sqf b/addons/gui/functions/fnc_updateActions.sqf index b5119fe09..a49652d41 100644 --- a/addons/gui/functions/fnc_updateActions.sqf +++ b/addons/gui/functions/fnc_updateActions.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001 * Updates the action buttons based currently avaiable treatments. @@ -70,4 +70,4 @@ private _shownIndex = 0; }; } forEach ACEGVAR(medical_gui,actions); -{ ctrlDelete _x } forEach (_actionButtons select [_shownIndex, 9999]); \ No newline at end of file +{ ctrlDelete _x } forEach (_actionButtons select [_shownIndex, 9999]); diff --git a/addons/gui/functions/fnc_updateBodyImage.sqf b/addons/gui/functions/fnc_updateBodyImage.sqf index 4b588503c..2b1132252 100644 --- a/addons/gui/functions/fnc_updateBodyImage.sqf +++ b/addons/gui/functions/fnc_updateBodyImage.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, SilentSpike, mharis001 * Modified: Blue @@ -226,4 +226,4 @@ if ((_IVArray select 1) isEqualTo 1) then { _ctrlIO ctrlShow true; } else { _ctrlIO ctrlShow false; -}; \ No newline at end of file +}; diff --git a/addons/gui/functions/fnc_updateCategories.sqf b/addons/gui/functions/fnc_updateCategories.sqf index 46d96d070..a64521a16 100644 --- a/addons/gui/functions/fnc_updateCategories.sqf +++ b/addons/gui/functions/fnc_updateCategories.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001 * Updates the category buttons based currently avaiable treatments. diff --git a/addons/gui/functions/fnc_updateInjuryList.sqf b/addons/gui/functions/fnc_updateInjuryList.sqf index 705f2d4ee..132305ad5 100644 --- a/addons/gui/functions/fnc_updateInjuryList.sqf +++ b/addons/gui/functions/fnc_updateInjuryList.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001 * Updates injury list for given body part for the target. @@ -215,7 +215,7 @@ switch (GET_FRACTURES(_target) select _selectionN) do { // Display cyanosis in overview tab, only when head/arms are selected if (EGVAR(breathing,showCyanosis) && _selectionN in [0,2,3]) then { private _spO2 = 0; - + if (alive _target) then { _spO2 = GET_SPO2(_target); }; @@ -279,7 +279,7 @@ if (_selectionN isEqualTo 1) then { _entries pushBack [LELSTRING(breathing,DeepPenetratingInjury), [1,0,0,1]]; }; }; - + if (EGVAR(breathing,TensionHemothoraxAlwaysVisible)) then { if (_target getVariable [QEGVAR(breathing,hemopneumothorax), false]) then { _ptxEntry pushback [LELSTRING(breathing,hemopneumothorax_mm), [1,1,1,1]]; @@ -355,4 +355,4 @@ lbClear _ctrl; _ctrl lbSetColor [_ctrl lbAdd _text, _color]; } forEach _entries; -_ctrl lbSetCurSel -1; \ No newline at end of file +_ctrl lbSetCurSel -1; diff --git a/addons/gui/functions/fnc_updateLogList.sqf b/addons/gui/functions/fnc_updateLogList.sqf index 7954883b2..43e8d3f80 100644 --- a/addons/gui/functions/fnc_updateLogList.sqf +++ b/addons/gui/functions/fnc_updateLogList.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001 * Updates list control with given logs. @@ -76,5 +76,5 @@ lbClear _ctrl; }; }; }; - + } forEach _logs; diff --git a/addons/gui/functions/script_component.hpp b/addons/gui/functions/script_component.hpp deleted file mode 100644 index e2617755e..000000000 --- a/addons/gui/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\gui\script_component.hpp" diff --git a/addons/gui/gui.hpp b/addons/gui/gui.hpp index fb6a18d2a..3c1792387 100644 --- a/addons/gui/gui.hpp +++ b/addons/gui/gui.hpp @@ -1,4 +1,3 @@ -#include "script_component.hpp" class RscText; class RscButton; class RscPicture; diff --git a/addons/gui/script_component.hpp b/addons/gui/script_component.hpp index b790f78e8..7fa9b9c2e 100644 --- a/addons/gui/script_component.hpp +++ b/addons/gui/script_component.hpp @@ -14,14 +14,8 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_GUI #endif -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" #include "\x\kat\addons\main\script_macros.hpp" -#include "\a3\ui_f\hpp\defineResincl.inc" -#include "\a3\ui_f\hpp\defineDIKCodes.inc" -#include "\a3\ui_f\hpp\defineCommonGrids.inc" -#include "\a3\ui_f\hpp\defineCommonColors.inc" - #define POS_X(N) ((N) * GUI_GRID_W + GUI_GRID_CENTER_X) #define POS_Y(N) ((N) * GUI_GRID_H + GUI_GRID_CENTER_Y) #define POS_W(N) ((N) * GUI_GRID_W) @@ -34,6 +28,7 @@ #define PATIENT_INFO_IGUI_OFFSET_X (PATIENT_INFO_IGUI_X - PATIENT_INFO_IGUI_BASE_X) #define PATIENT_INFO_IGUI_OFFSET_Y (PATIENT_INFO_IGUI_Y - PATIENT_INFO_IGUI_BASE_Y) +#undef MED_LOG_VARNAME #define MED_LOG_VARNAME(type) (format ["ace_medical_log_%1", type]) #define IDD_MEDICAL_MENU 38580 @@ -107,4 +102,4 @@ #define IDC_BODY_LEFTARM_IV 70135 #define IDC_BODY_RIGHTLEG_IV 70141 -#define IDC_BODY_LEFTLEG_IV 70142 \ No newline at end of file +#define IDC_BODY_LEFTLEG_IV 70142 diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 7a9c7acde..9bf611232 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -1,6 +1,10 @@ #define DEBUG_SYNCHRONOUS #include "\x\cba\addons\main\script_macros_common.hpp" #include "\x\cba\addons\xeh\script_xeh.hpp" +#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" +#include "\a3\ui_f\hpp\defineDIKCodes.inc" +#include "\a3\ui_f\hpp\defineCommonGrids.inc" +#include "\a3\ui_f\hpp\defineCommonColors.inc" // Default versioning level #define DEFAULT_VERSIONING_LEVEL 2 @@ -114,6 +118,30 @@ #define FATAL_INJURIES_CRDC_ARRST 1 #define FATAL_INJURIES_NEVER 2 + +//We have to undef them before redefining +#undef VAR_BLOOD_PRESS +#undef VAR_BLOOD_VOL +#undef VAR_WOUND_BLEEDING +#undef VAR_CRDC_ARRST +#undef VAR_HEART_RATE +#undef VAR_PAIN +#undef VAR_PAIN_SUPP +#undef VAR_PERIPH_RES +#undef VAR_OPEN_WOUNDS +#undef VAR_BANDAGED_WOUNDS +#undef VAR_STITCHED_WOUNDS +#undef VAR_MEDICATIONS +#undef VAR_HEMORRHAGE +#undef VAR_IN_PAIN +#undef VAR_TOURNIQUET +#undef VAR_FRACTURES +#undef GET_PAIN_PERCEIVED +#undef GET_TOURNIQUETS +#undef HAS_TOURNIQUET_APPLIED_ON +#undef PAIN_UNCONSCIOUS +#undef DEFAULT_TOURNIQUET_VALUES + // These variables get stored in object space and used across components // Defined here for easy consistency with GETVAR/SETVAR (also a list for reference) #define VAR_BLOOD_PRESS QACEGVAR(medical,bloodPressure) @@ -124,7 +152,6 @@ #define VAR_PAIN QACEGVAR(medical,pain) #define VAR_PAIN_SUPP QACEGVAR(medical,painSuppress) #define VAR_PERIPH_RES QACEGVAR(medical,peripheralResistance) -#define VAR_UNCON "ACE_isUnconscious" #define VAR_OPEN_WOUNDS QACEGVAR(medical,openWounds) #define VAR_BANDAGED_WOUNDS QACEGVAR(medical,bandagedWounds) #define VAR_STITCHED_WOUNDS QACEGVAR(medical,stitchedWounds) @@ -135,26 +162,14 @@ #define VAR_IN_PAIN QACEGVAR(medical,inPain) #define VAR_TOURNIQUET QACEGVAR(medical,tourniquets) #define VAR_FRACTURES QACEGVAR(medical,fractures) -#define DEFAULT_TOURNIQUET_VALUES [0,0,0,0,0,0] // - Unit Functions --------------------------------------------------- // Retrieval macros for common unit values // Defined for easy consistency and speed +#undef GET_SM_STATE #define GET_SM_STATE(_unit) ([_unit, ACEGVAR(medical,STATE_MACHINE)] call CBA_statemachine_fnc_getCurrentState) -#define GET_BLOOD_VOLUME(unit) (unit getVariable [VAR_BLOOD_VOL, DEFAULT_BLOOD_VOLUME]) -#define GET_WOUND_BLEEDING(unit) (unit getVariable [VAR_WOUND_BLEEDING, 0]) -#define GET_HEART_RATE(unit) (unit getVariable [VAR_HEART_RATE, DEFAULT_HEART_RATE]) -#define GET_HEMORRHAGE(unit) (unit getVariable [VAR_HEMORRHAGE, 0]) -#define GET_PAIN(unit) (unit getVariable [VAR_PAIN, 0]) -#define GET_PAIN_SUPPRESS(unit) (unit getVariable [VAR_PAIN_SUPP, 0]) -#define GET_FRACTURES(unit) (unit getVariable [VAR_FRACTURES, DEFAULT_FRACTURE_VALUES]) -#define IN_CRDC_ARRST(unit) (unit getVariable [VAR_CRDC_ARRST, false]) -#define IS_BLEEDING(unit) (GET_WOUND_BLEEDING(unit) > 0) -#define IS_IN_PAIN(unit) (unit getVariable [VAR_IN_PAIN, false]) -#define IS_UNCONSCIOUS(unit) (unit getVariable [VAR_UNCON, false]) -#define GET_OPEN_WOUNDS(unit) (unit getVariable [VAR_OPEN_WOUNDS, createHashMap]) -#define GET_BANDAGED_WOUNDS(unit) (unit getVariable [VAR_BANDAGED_WOUNDS, createHashMap]) -#define GET_STITCHED_WOUNDS(unit) (unit getVariable [VAR_STITCHED_WOUNDS, createHashMap]) + +#undef GET_DAMAGE_THRESHOLD #define GET_DAMAGE_THRESHOLD(unit) (unit getVariable [QACEGVAR(medical,damageThreshold), [ACEGVAR(medical,AIDamageThreshold),ACEGVAR(medical,playerDamageThreshold)] select (isPlayer unit)]) #define GET_PAIN_PERCEIVED(unit) (0 max (GET_PAIN(unit) - GET_PAIN_SUPPRESS(unit)) min 1) @@ -244,9 +259,14 @@ #define VAR_INTERNAL_BLEEDING QEGVAR(circulation,internalBleeding) #define GET_INTERNAL_BLEEDING(unit) (unit getVariable [VAR_INTERNAL_BLEEDING, 0]) +#undef GET_BLOOD_PRESSURE #define GET_BLOOD_PRESSURE(unit) ([unit] call EFUNC(circulation,getBloodPressure)) #define VAR_BLOODPRESSURE_CHANGE QEGVAR(circulation,bloodPressureChange) #define GET_BLOODPRESSURE_CHANGE(unit) (unit getVariable [VAR_BLOODPRESSURE_CHANGE, [0,0]]) // Pharmacy +#undef GET_BLOOD_LOSS #define GET_BLOOD_LOSS(unit) ([unit] call EFUNC(pharma,getBloodLoss)) + +//Surgery +#define STRING_BODY_PARTS ["head", "body", "left arm", "right arm", "left leg", "right leg"] diff --git a/addons/misc/ACE_Medical_Treatment_Actions.hpp b/addons/misc/ACE_Medical_Treatment_Actions.hpp index 5a82a7f66..82efc841d 100644 --- a/addons/misc/ACE_Medical_Treatment_Actions.hpp +++ b/addons/misc/ACE_Medical_Treatment_Actions.hpp @@ -4,20 +4,20 @@ class ACE_Medical_Treatment_Actions { class SalineIV_Stand: SalineIV { displayName = CSTRING(Display_IVStand); medicRequired = 0; - condition = QUOTE([ARR_2(_medic, 1000)] call FUNC(conditionIV)); + condition = QUOTE([ARR_2(_medic,1000)] call FUNC(conditionIV)); items[] = {}; - callbackSuccess = QUOTE([ARR_5(_medic, _patient, _bodyPart, 'SalineIV', 'ACE_salineIV')] call FUNC(treatmentIV)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,_bodyPart,'SalineIV','ACE_salineIV')] call FUNC(treatmentIV)); consumeItem = 0; }; class SalineIV_Stand_500: SalineIV_Stand { displayName = CSTRING(Display_IVStand_500); - condition = QUOTE([ARR_2(_medic, 500)] call FUNC(conditionIV)); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, _bodyPart, 'SalineIV_500', 'ACE_salineIV_500')] call FUNC(treatmentIV)); + condition = QUOTE([ARR_2(_medic,500)] call FUNC(conditionIV)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,_bodyPart,'SalineIV_500','ACE_salineIV_500')] call FUNC(treatmentIV)); }; class SalineIV_Stand_250: SalineIV_Stand { displayName = CSTRING(Display_IVStand_250); - condition = QUOTE([ARR_2(_medic, 250)] call FUNC(conditionIV)); - callbackSuccess = QUOTE([ARR_5(_medic, _patient, _bodyPart, 'SalineIV_250', 'ACE_salineIV_250')] call FUNC(treatmentIV)); + condition = QUOTE([ARR_2(_medic,250)] call FUNC(conditionIV)); + callbackSuccess = QUOTE([ARR_5(_medic,_patient,_bodyPart,'SalineIV_250','ACE_salineIV_250')] call FUNC(treatmentIV)); }; class RemoveTourniquet: BasicBandage { treatmentTime = QGVAR(treatmentTimeDetachTourniquet); diff --git a/addons/misc/CfgEventHandlers.hpp b/addons/misc/CfgEventHandlers.hpp index 57d594f2b..2ff51542b 100644 --- a/addons/misc/CfgEventHandlers.hpp +++ b/addons/misc/CfgEventHandlers.hpp @@ -8,22 +8,22 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; class Land_IntravenStand_01_empty_F { class ADDON { - init = QUOTE((_this select 0) setVariable [ARR_3(QQGVAR(stand), [], true)]); + init = QUOTE((_this select 0) setVariable [ARR_3(QQGVAR(stand),[],true)]); }; }; class Land_IntravenStand_01_1bag_F { class ADDON { - init = QUOTE((_this select 0) setVariable [ARR_3(QQGVAR(stand), [1000], true)]); + init = QUOTE((_this select 0) setVariable [ARR_3(QQGVAR(stand),[1000],true)]); }; }; class Land_IntravenStand_01_2bags_F { class ADDON { - init = QUOTE((_this select 0) setVariable [ARR_3(QQGVAR(stand), [ARR_2(1000, 1000)], true)]); + init = QUOTE((_this select 0) setVariable [ARR_3(QQGVAR(stand),[ARR_2(1000,1000)],true)]); }; }; }; @@ -59,4 +59,4 @@ class Extended_InitPost_EventHandlers { init = QUOTE(_this call FUNC(addVehicleCarryLoadActions)); }; }; -}; \ No newline at end of file +}; diff --git a/addons/misc/CfgMoves.hpp b/addons/misc/CfgMoves.hpp index 720bcec6d..cc4795ed0 100644 --- a/addons/misc/CfgMoves.hpp +++ b/addons/misc/CfgMoves.hpp @@ -7,7 +7,7 @@ class CfgMovesBasic { class CfgMovesMaleSdr: CfgMovesBasic { class States { class Crew; - class kat_stretcher: crew { + class kat_stretcher: Crew { file = "a3\anims_f\data\anim\sdr\inj\ainjppnemstpsnonwnondnon.rtm"; interpolateTo[] = {"Unconscious", 0.02}; leftHandIKCurve[] = {}; diff --git a/addons/misc/CfgVehicles.hpp b/addons/misc/CfgVehicles.hpp index 4df0f1ea9..fc0e40583 100644 --- a/addons/misc/CfgVehicles.hpp +++ b/addons/misc/CfgVehicles.hpp @@ -210,7 +210,7 @@ class CfgVehicles { class LeftArm { displayName = CSTRING(Armband_Sling_Left_Arm); - condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isLeftArmFree), false)]); + condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isLeftArmFree),false)]); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; statement = ""; showDisabled = 0; @@ -218,44 +218,44 @@ class CfgVehicles { class RedCross { displayName = CSTRING(Armband_Red_Cross_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_red_cross"", 0)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_red_cross"",0)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCross.paa); }; class Medic { displayName = CSTRING(Armband_Medic_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_medic"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_medic"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_medic"", 0)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_medic"",0)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossMedic.paa); }; class Doctor { displayName = CSTRING(Armband_Doctor_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_doctor"", 0)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_doctor"",0)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossDoctor.paa); }; class Kat { displayName = CSTRING(Armband_Kat_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_kat"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_kat"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_kat"", 0)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_kat"",0)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandKat.paa); }; - }; + }; class RightArm { displayName = CSTRING(Armband_Sling_Right_Arm); - condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isRightArmFree), false)]); + condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isRightArmFree),false)]); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; statement = ""; showDisabled = 0; @@ -263,44 +263,44 @@ class CfgVehicles { class RedCross { displayName = CSTRING(Armband_Red_Cross_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_red_cross"", 1)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_red_cross"",1)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCross.paa); }; class Medic { displayName = CSTRING(Armband_Medic_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_medic"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_medic"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_medic"", 1)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_medic"",1)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossMedic.paa); }; class Doctor { displayName = CSTRING(Armband_Doctor_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_doctor"", 1)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_doctor"",1)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossDoctor.paa); }; class Kat { displayName = CSTRING(Armband_Kat_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_kat"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_kat"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_kat"", 1)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_kat"",1)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandKat.paa); }; - }; + }; class LeftLeg { displayName = CSTRING(Armband_Sling_Left_Leg); - condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isLeftLegFree), false)]); + condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isLeftLegFree),false)]); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; statement = ""; showDisabled = 0; @@ -308,44 +308,44 @@ class CfgVehicles { class RedCross { displayName = CSTRING(Armband_Red_Cross_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_red_cross"", 2)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_red_cross"",2)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCross.paa); }; class Medic { displayName = CSTRING(Armband_Medic_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_medic"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_medic"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_medic"", 2)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_medic"",2)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossMedic.paa); }; class Doctor { displayName = CSTRING(Armband_Doctor_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_doctor"", 2)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_doctor"",2)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossDoctor.paa); }; class Kat { displayName = CSTRING(Armband_Kat_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_kat"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_kat"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_kat"", 2)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_kat"",2)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandKat.paa); }; - }; + }; class RightLeg { displayName = CSTRING(Armband_Sling_Right_Leg); - condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isRightLegFree), false)]); + condition = QUOTE(_player getVariable [ARR_2(QQGVAR(isRightLegFree),false)]); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; statement = ""; showDisabled = 0; @@ -353,36 +353,36 @@ class CfgVehicles { class RedCross { displayName = CSTRING(Armband_Red_Cross_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_red_cross"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_red_cross"", 3)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_red_cross"",3)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCross.paa); }; class Medic { displayName = CSTRING(Armband_Medic_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_medic"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_medic"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_medic"", 3)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_medic"",3)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossMedic.paa); }; class Doctor { displayName = CSTRING(Armband_Doctor_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_doctor"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_doctor"", 3)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_doctor"",3)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandWhiteCrossDoctor.paa); }; class Kat { displayName = CSTRING(Armband_Kat_ItemName); - condition = QUOTE([ARR_2(_player, ""kat_armband_kat"")] call ACEFUNC(common,hasItem)); + condition = QUOTE([ARR_2(_player,""kat_armband_kat"")] call ACEFUNC(common,hasItem)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_3(_player, ""kat_armband_kat"", 3)] call FUNC(slingArmband)); + statement = QUOTE([ARR_3(_player,""kat_armband_kat"",3)] call FUNC(slingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandKat.paa); }; @@ -390,36 +390,36 @@ class CfgVehicles { class UnSlingLeftArm { displayName = CSTRING(Armband_UnSling_Left_Arm); - condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isLeftArmFree), false)])); + condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isLeftArmFree),false)])); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_2(_player, 0)] call FUNC(unSlingArmband)); + statement = QUOTE([ARR_2(_player,0)] call FUNC(unSlingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandLeftArm.paa); - }; + }; class UnSlingRightArm { displayName = CSTRING(Armband_UnSling_Right_Arm); - condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isRightArmFree), false)])); + condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isRightArmFree),false)])); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_2(_player, 1)] call FUNC(unSlingArmband)); + statement = QUOTE([ARR_2(_player,1)] call FUNC(unSlingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandRightArm.paa); - }; + }; class UnSlingLeftLeg { displayName = CSTRING(Armband_UnSling_Left_Leg); - condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isLeftLegFree), false)])); + condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isLeftLegFree),false)])); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_2(_player, 2)] call FUNC(unSlingArmband)); + statement = QUOTE([ARR_2(_player,2)] call FUNC(unSlingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandLeftLeg.paa); - }; + }; class UnSlingRightLeg { displayName = CSTRING(Armband_UnSling_Right_Leg); - condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isRightLegFree), false)])); + condition = QUOTE(!(_player getVariable [ARR_2(QQGVAR(isRightLegFree),false)])); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - statement = QUOTE([ARR_2(_player, 3)] call FUNC(unSlingArmband)); + statement = QUOTE([ARR_2(_player,3)] call FUNC(unSlingArmband)); showDisabled = 0; icon = QPATHTOF(ui\ArmbandRightLeg.paa); }; @@ -427,7 +427,7 @@ class CfgVehicles { class BubbleWrapPopping { displayName = CSTRING(Bubble_Wrap_Ace_Action); - condition = QUOTE([ARR_2(_player, ""kat_Bubble_Wrap"")] call ACEFUNC(common,hasMagazine)); + condition = QUOTE([ARR_2(_player,""kat_Bubble_Wrap"")] call ACEFUNC(common,hasMagazine)); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; statement = QUOTE(_player call FUNC(BubbleWrap)); showDisabled = 0; @@ -511,9 +511,9 @@ class CfgVehicles { class ACE_MainActions { class KAT_UnloadAndCarryPatient { displayName = CSTRING(CarryPatient); - condition = QUOTE(_target getVariable [ARR_2('ACE_isUnconscious', false)] && {!(isNull (objectParent _target))} && {isNull (objectParent _player)}); + condition = QUOTE(_target getVariable [ARR_2('ACE_isUnconscious',false)] && {!(isNull (objectParent _target))} && {isNull (objectParent _player)}); exceptions[] = {"isNotDragging", "isNotCarrying", "isNotInside"}; - statement = QUOTE([ARR_2(_player, _target)] call FUNC(unloadAndCarryPatient)); + statement = QUOTE([ARR_2(_player,_target)] call FUNC(unloadAndCarryPatient)); icon = QACEPATHTOF(dragging,UI\icons\person_carry.paa); }; }; diff --git a/addons/misc/functions/fnc_BubbleWrap.sqf b/addons/misc/functions/fnc_BubbleWrap.sqf index 51f8b7052..dc5dd1573 100644 --- a/addons/misc/functions/fnc_BubbleWrap.sqf +++ b/addons/misc/functions/fnc_BubbleWrap.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Plays Poping sound & removes mag @@ -16,4 +16,4 @@ params ["_unit"]; [_unit, 'kat_Bubble_Wrap'] call EFUNC(pharma,removeItemfromMag); [QEGVAR(pharma,medicationLocal), [_unit, "Head", "BubbleWrap"], _unit] call CBA_fnc_targetEvent; -playsound3D [selectRandom [QPATHTOF_SOUND(sounds\bubble_wrap_1.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_2.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_3.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_4.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_5.ogg)], _unit, false, getPosASL _unit, 30, 1, 10]; \ No newline at end of file +playsound3D [selectRandom [QPATHTOF_SOUND(sounds\bubble_wrap_1.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_2.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_3.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_4.ogg),QPATHTOF_SOUND(sounds\bubble_wrap_5.ogg)], _unit, false, getPosASL _unit, 30, 1, 10]; diff --git a/addons/misc/functions/fnc_actionLowerBy10.sqf b/addons/misc/functions/fnc_actionLowerBy10.sqf index 5a485eabc..765e3dbba 100644 --- a/addons/misc/functions/fnc_actionLowerBy10.sqf +++ b/addons/misc/functions/fnc_actionLowerBy10.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka and Tomcat diff --git a/addons/misc/functions/fnc_addActionRaise.sqf b/addons/misc/functions/fnc_addActionRaise.sqf index f2ac703c2..60153256c 100644 --- a/addons/misc/functions/fnc_addActionRaise.sqf +++ b/addons/misc/functions/fnc_addActionRaise.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka and Tomcat diff --git a/addons/misc/functions/fnc_addIVbag.sqf b/addons/misc/functions/fnc_addIVbag.sqf index ac9705bdb..e80805eed 100644 --- a/addons/misc/functions/fnc_addIVbag.sqf +++ b/addons/misc/functions/fnc_addIVbag.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Adds a IV bag for the medicine IV stands. diff --git a/addons/misc/functions/fnc_addPassengersActions.sqf b/addons/misc/functions/fnc_addPassengersActions.sqf index 70debe5fe..54bab177a 100644 --- a/addons/misc/functions/fnc_addPassengersActions.sqf +++ b/addons/misc/functions/fnc_addPassengersActions.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: esteldunedain Edit by Katalam * Create one action per passenger. diff --git a/addons/misc/functions/fnc_addVehicleCarryLoadActions.sqf b/addons/misc/functions/fnc_addVehicleCarryLoadActions.sqf index 798e4db76..5bb383c87 100644 --- a/addons/misc/functions/fnc_addVehicleCarryLoadActions.sqf +++ b/addons/misc/functions/fnc_addVehicleCarryLoadActions.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Add carry load ace actions to vehicle. @@ -21,7 +21,7 @@ private _type = (typeOf _vehicle); private _fnc_getFreeSeats = { params ["_vehicle"]; - + // From ace_common_fnc_nearestVehiclesFreeSeat private _canSitInCargo = (getNumber (configOf _vehicle >> "ejectDeadCargo")) == 0; @@ -40,13 +40,13 @@ ACELLSTRING(Interaction,MainAction), {}, { params ["_vehicle", "_medic", "_args"]; - + !(_medic getVariable [QACEGVAR(dragging,carriedObject), objNull] isEqualTo objNull) && {_medic getVariable [QACEGVAR(dragging,carriedObject), objNull] isKindOf 'CAManBase'} }, { params ["_vehicle", "_medic", "_args"]; _args params ["_type", "_fnc_getFreeSeats"]; - + private _loadAction = []; _loadAction pushBack [ [format ["KAT_LoadCarriedPatient_%1", _type], @@ -76,4 +76,4 @@ ACELLSTRING(Interaction,MainAction), [_type, _fnc_getFreeSeats], {call ACEFUNC(interaction,getVehiclePos)}, 4] call ACEFUNC(interact_menu,createAction); -[_type, 0, [], _action] call ACEFUNC(interact_menu,addActionToClass); \ No newline at end of file +[_type, 0, [], _action] call ACEFUNC(interact_menu,addActionToClass); diff --git a/addons/misc/functions/fnc_addVehicleUnloadCarryPatientActions.sqf b/addons/misc/functions/fnc_addVehicleUnloadCarryPatientActions.sqf index 0df6bf597..aec203ff2 100644 --- a/addons/misc/functions/fnc_addVehicleUnloadCarryPatientActions.sqf +++ b/addons/misc/functions/fnc_addVehicleUnloadCarryPatientActions.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Add carry and unload ace actions to vehicle. @@ -44,4 +44,4 @@ private _actions = []; }; } forEach (_vehicleSeats); -_actions; \ No newline at end of file +_actions; diff --git a/addons/misc/functions/fnc_attachStretcher.sqf b/addons/misc/functions/fnc_attachStretcher.sqf index 71ff4b7e3..0fcd99625 100644 --- a/addons/misc/functions/fnc_attachStretcher.sqf +++ b/addons/misc/functions/fnc_attachStretcher.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Children action for attaching stretcher diff --git a/addons/misc/functions/fnc_canCheckDogtag.sqf b/addons/misc/functions/fnc_canCheckDogtag.sqf index ba4563ae9..b05f43fe5 100644 --- a/addons/misc/functions/fnc_canCheckDogtag.sqf +++ b/addons/misc/functions/fnc_canCheckDogtag.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: SzwedzikPL * Checks if dogtag can be checked. diff --git a/addons/misc/functions/fnc_canTreat.sqf b/addons/misc/functions/fnc_canTreat.sqf index bce0a4fa1..db15be25a 100644 --- a/addons/misc/functions/fnc_canTreat.sqf +++ b/addons/misc/functions/fnc_canTreat.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Modified: Blue diff --git a/addons/misc/functions/fnc_carryObject.sqf b/addons/misc/functions/fnc_carryObject.sqf index f32e8225e..d76d38b90 100644 --- a/addons/misc/functions/fnc_carryObject.sqf +++ b/addons/misc/functions/fnc_carryObject.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: commy2 * Modified: Blue @@ -75,4 +75,4 @@ if (_UAVCrew isNotEqualTo []) then { } forEach _UAVCrew; _target setVariable [QACEGVAR(dragging,isUAV), true, true]; -}; \ No newline at end of file +}; diff --git a/addons/misc/functions/fnc_checkArmbandCondition.sqf b/addons/misc/functions/fnc_checkArmbandCondition.sqf index a70e64448..57f14e2c8 100644 --- a/addons/misc/functions/fnc_checkArmbandCondition.sqf +++ b/addons/misc/functions/fnc_checkArmbandCondition.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Checks if conditions are met for armband parent option to be displayed @@ -17,11 +17,11 @@ params ["_unit"]; -[_unit, "kat_armband_red_cross"] call ACEFUNC(common,hasItem) || -[_unit, "kat_armband_medic"] call ACEFUNC(common,hasItem) || -[_unit, "kat_armband_doctor"] call ACEFUNC(common,hasItem) || -[_unit, "kat_armband_kat"] call ACEFUNC(common,hasItem) || -!(_unit getVariable [QGVAR(isRightArmFree), false]) || -!(_unit getVariable [QGVAR(isLeftLegFree), false]) || -!(_unit getVariable [QGVAR(isRightLegFree), false]) || +[_unit, "kat_armband_red_cross"] call ACEFUNC(common,hasItem) || +[_unit, "kat_armband_medic"] call ACEFUNC(common,hasItem) || +[_unit, "kat_armband_doctor"] call ACEFUNC(common,hasItem) || +[_unit, "kat_armband_kat"] call ACEFUNC(common,hasItem) || +!(_unit getVariable [QGVAR(isRightArmFree), false]) || +!(_unit getVariable [QGVAR(isLeftLegFree), false]) || +!(_unit getVariable [QGVAR(isRightLegFree), false]) || !(_unit getVariable [QGVAR(isLeftArmFree), false]); diff --git a/addons/misc/functions/fnc_conditionExecutionDeath.sqf b/addons/misc/functions/fnc_conditionExecutionDeath.sqf index 46cbb5fc7..9403b1776 100644 --- a/addons/misc/functions/fnc_conditionExecutionDeath.sqf +++ b/addons/misc/functions/fnc_conditionExecutionDeath.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: BaerMitUmlaut * Modified: Blue @@ -23,4 +23,4 @@ params ["_unit"]; } else { (ACEGVAR(medical_statemachine,fatalInjuriesAI) != FATAL_INJURIES_NEVER) && {!(_unit getVariable [QGVAR(PreventInstantAIDeath), false])} }) -&& {!(_unit getVariable [QACEGVAR(medical,deathBlocked), false])} \ No newline at end of file +&& {!(_unit getVariable [QACEGVAR(medical,deathBlocked), false])} diff --git a/addons/misc/functions/fnc_conditionIV.sqf b/addons/misc/functions/fnc_conditionIV.sqf index 7221da5a4..d8e63a076 100644 --- a/addons/misc/functions/fnc_conditionIV.sqf +++ b/addons/misc/functions/fnc_conditionIV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Condition check for the medicine IV stands to remove a bag. diff --git a/addons/misc/functions/fnc_conditionIVstand.sqf b/addons/misc/functions/fnc_conditionIVstand.sqf index 161611163..0a7bcfb32 100644 --- a/addons/misc/functions/fnc_conditionIVstand.sqf +++ b/addons/misc/functions/fnc_conditionIVstand.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Condition check for the medicine IV stands to add a bag. diff --git a/addons/misc/functions/fnc_conditionSecondChance.sqf b/addons/misc/functions/fnc_conditionSecondChance.sqf index e82a02f23..0f3e42ef6 100644 --- a/addons/misc/functions/fnc_conditionSecondChance.sqf +++ b/addons/misc/functions/fnc_conditionSecondChance.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001 * Modified: Blue @@ -22,4 +22,4 @@ if (isPlayer _unit) then { ACEGVAR(medical_statemachine,fatalInjuriesPlayer) != FATAL_INJURIES_ALWAYS } else { ACEGVAR(medical_statemachine,fatalInjuriesAI) != FATAL_INJURIES_ALWAYS || {_unit getVariable [QGVAR(PreventInstantAIDeath), false]} -}; \ No newline at end of file +}; diff --git a/addons/misc/functions/fnc_fullHealLocal.sqf b/addons/misc/functions/fnc_fullHealLocal.sqf index 02d312907..dcc163f72 100644 --- a/addons/misc/functions/fnc_fullHealLocal.sqf +++ b/addons/misc/functions/fnc_fullHealLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Edit: Tomcat --> added heal of airway damage @@ -157,7 +157,7 @@ _unit setDamage 0; _state = [_unit, ACEGVAR(medical,STATE_MACHINE)] call CBA_statemachine_fnc_getCurrentState; TRACE_1("after FullHeal",_state); -/// Clear Stamina & weapon sway +/// Clear Stamina & weapon sway if (ACEGVAR(advanced_fatigue,enabled)) then { ["kat_LSDF"] call ACEFUNC(advanced_fatigue,removeDutyFactor); ["kat_PDF"] call ACEFUNC(advanced_fatigue,removeDutyFactor); @@ -166,10 +166,10 @@ if (ACEGVAR(advanced_fatigue,enabled)) then { } else { _unit setAnimSpeedCoef 1; _unit setCustomAimCoef 1; - + if (GVAR(staminaMedication)) then { _unit enableStamina true; - + }; }; diff --git a/addons/misc/functions/fnc_getDogtagData.sqf b/addons/misc/functions/fnc_getDogtagData.sqf index ed719020a..3ccb0ab48 100644 --- a/addons/misc/functions/fnc_getDogtagData.sqf +++ b/addons/misc/functions/fnc_getDogtagData.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: esteldunedain * Get unit dogtag data. diff --git a/addons/misc/functions/fnc_getUniqueItems.sqf b/addons/misc/functions/fnc_getUniqueItems.sqf index ed4144d7f..a99a2c319 100644 --- a/addons/misc/functions/fnc_getUniqueItems.sqf +++ b/addons/misc/functions/fnc_getUniqueItems.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: mharis001, Blue * Returns list of unique items in the target's inventory. @@ -63,4 +63,4 @@ if (_target isEqualTo ACE_player) then { (call _fnc_getItems) select 0; }; }; -}; \ No newline at end of file +}; diff --git a/addons/misc/functions/fnc_groupID.sqf b/addons/misc/functions/fnc_groupID.sqf index 010540b28..8c1ba7bd4 100644 --- a/addons/misc/functions/fnc_groupID.sqf +++ b/addons/misc/functions/fnc_groupID.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Returns the groupname for a given unit. diff --git a/addons/misc/functions/fnc_handleRespawn.sqf b/addons/misc/functions/fnc_handleRespawn.sqf index 51c5f4c88..6101afb72 100644 --- a/addons/misc/functions/fnc_handleRespawn.sqf +++ b/addons/misc/functions/fnc_handleRespawn.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: YetheSamartaka * Ensures proper initial values reset on respawn @@ -249,7 +249,7 @@ if (EGVAR(pharma,coagulation)) then { }, 8, [_unit]] call CBA_fnc_addPerFrameHandler; }; -/// Clear Stamina & weapon sway +/// Clear Stamina & weapon sway if (ACEGVAR(advanced_fatigue,enabled)) then { ["kat_LSDF"] call ACEFUNC(advanced_fatigue,removeDutyFactor); ["kat_PDF"] call ACEFUNC(advanced_fatigue,removeDutyFactor); @@ -258,10 +258,10 @@ if (ACEGVAR(advanced_fatigue,enabled)) then { } else { _unit setAnimSpeedCoef 1; _unit setCustomAimCoef 1; - + if (GVAR(staminaMedication)) then { _unit enableStamina true; - + }; }; diff --git a/addons/misc/functions/fnc_handleUnconscious.sqf b/addons/misc/functions/fnc_handleUnconscious.sqf index 7c83fc55e..73a71e0dc 100644 --- a/addons/misc/functions/fnc_handleUnconscious.sqf +++ b/addons/misc/functions/fnc_handleUnconscious.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: commy2 * Modified: Blue diff --git a/addons/misc/functions/fnc_hasItem.sqf b/addons/misc/functions/fnc_hasItem.sqf index 9673346ff..4bdc03295 100644 --- a/addons/misc/functions/fnc_hasItem.sqf +++ b/addons/misc/functions/fnc_hasItem.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Modified: Blue @@ -38,4 +38,4 @@ private _fnc_checkItems = { private _vehicleCondition = !(isNull (objectParent _medic)) && {(objectParent _medic) isEqualTo (objectParent _patient)}; -_medic call _fnc_checkItems || {ACEGVAR(medical_treatment,allowSharedEquipment) != 2 && {_patient call _fnc_checkItems}} || {_vehicleCondition && [(vehicle _medic), true] call _fnc_checkItems && (GVAR(allowSharedVehicleEquipment) in [1,3,4] || (GVAR(allowSharedVehicleEquipment) isEqualTo 2 && _patient != _medic))} \ No newline at end of file +_medic call _fnc_checkItems || {ACEGVAR(medical_treatment,allowSharedEquipment) != 2 && {_patient call _fnc_checkItems}} || {_vehicleCondition && [(vehicle _medic), true] call _fnc_checkItems && (GVAR(allowSharedVehicleEquipment) in [1,3,4] || (GVAR(allowSharedVehicleEquipment) isEqualTo 2 && _patient != _medic))} diff --git a/addons/misc/functions/fnc_hasStableVitals.sqf b/addons/misc/functions/fnc_hasStableVitals.sqf index 4e2420062..7b3095148 100644 --- a/addons/misc/functions/fnc_hasStableVitals.sqf +++ b/addons/misc/functions/fnc_hasStableVitals.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Ruthberg * Check if a unit has stable vitals (required to become conscious) diff --git a/addons/misc/functions/fnc_headTourniquet.sqf b/addons/misc/functions/fnc_headTourniquet.sqf index 0de38ea5c..6f4aa37d2 100644 --- a/addons/misc/functions/fnc_headTourniquet.sqf +++ b/addons/misc/functions/fnc_headTourniquet.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Applies a tourniquet to the patient on the given body part. diff --git a/addons/misc/functions/fnc_headTourniquetLocal.sqf b/addons/misc/functions/fnc_headTourniquetLocal.sqf index 5a33ac2c2..ac5eebea7 100644 --- a/addons/misc/functions/fnc_headTourniquetLocal.sqf +++ b/addons/misc/functions/fnc_headTourniquetLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, Edited by MiszczuZPolski * Local callback for applying a tourniquet to a patient. diff --git a/addons/misc/functions/fnc_heliAddActionDeploy.sqf b/addons/misc/functions/fnc_heliAddActionDeploy.sqf index 2d1f8bd95..9c5313358 100644 --- a/addons/misc/functions/fnc_heliAddActionDeploy.sqf +++ b/addons/misc/functions/fnc_heliAddActionDeploy.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka and Tomcat diff --git a/addons/misc/functions/fnc_heliStretcherAttach.sqf b/addons/misc/functions/fnc_heliStretcherAttach.sqf index 0408d76a7..8abadb396 100644 --- a/addons/misc/functions/fnc_heliStretcherAttach.sqf +++ b/addons/misc/functions/fnc_heliStretcherAttach.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Battlekeeper, modified by YetheSamartaka and Tomcat diff --git a/addons/misc/functions/fnc_incompatibilityWarning.sqf b/addons/misc/functions/fnc_incompatibilityWarning.sqf index 61cd19a59..c86de5558 100644 --- a/addons/misc/functions/fnc_incompatibilityWarning.sqf +++ b/addons/misc/functions/fnc_incompatibilityWarning.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: YetheSamartaka * Throws a warning and add line to RPT log if incompatible addons(Listed by us - developers) that @@ -39,6 +39,6 @@ if ((count _foundIncompatibleAddons) > 0) then { //Removes Warning message after 60 seconds [{params ["_rscLayer"]; _rscLayer cutFadeOut 0.2; - }, [_rscLayer], 60] call CBA_fnc_waitAndExecute; + }, [_rscLayer], 60] call CBA_fnc_waitAndExecute; }; }; diff --git a/addons/misc/functions/fnc_init.sqf b/addons/misc/functions/fnc_init.sqf index da4d27848..7139abdd4 100644 --- a/addons/misc/functions/fnc_init.sqf +++ b/addons/misc/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Initializes unit variables. @@ -54,4 +54,4 @@ _unit setVariable [QGVAR(armbandSlingLeftLegRot), _array, true]; private _str = missionNamespace getVariable [QGVAR(armbandSlingRightLegRotation), ""]; private _array = [_str, ","" ", true] call FUNC(stringToArray); -_unit setVariable [QGVAR(armbandSlingRightLegRot), _array, true]; \ No newline at end of file +_unit setVariable [QGVAR(armbandSlingRightLegRot), _array, true]; diff --git a/addons/misc/functions/fnc_removeIVbag.sqf b/addons/misc/functions/fnc_removeIVbag.sqf index df60312d7..36774d2d2 100644 --- a/addons/misc/functions/fnc_removeIVbag.sqf +++ b/addons/misc/functions/fnc_removeIVbag.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Removes a IV bag for the medicine IV stands. diff --git a/addons/misc/functions/fnc_removeItemFromVehicle.sqf b/addons/misc/functions/fnc_removeItemFromVehicle.sqf index 6359f1daf..8db840e14 100644 --- a/addons/misc/functions/fnc_removeItemFromVehicle.sqf +++ b/addons/misc/functions/fnc_removeItemFromVehicle.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Handle removing item / magazine from vehicle @@ -62,4 +62,4 @@ if !(_isMagazine) then { { // name, quantity, ammocount _vehicle addMagazineAmmoCargo [_x select 0, 1, _x select 1]; } forEach (_magsToAdd); -}; \ No newline at end of file +}; diff --git a/addons/misc/functions/fnc_setUnconscious.sqf b/addons/misc/functions/fnc_setUnconscious.sqf index 8cc5ce65c..35c4e66a1 100644 --- a/addons/misc/functions/fnc_setUnconscious.sqf +++ b/addons/misc/functions/fnc_setUnconscious.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Sets a unit in the unconscious state. diff --git a/addons/misc/functions/fnc_slingArmband.sqf b/addons/misc/functions/fnc_slingArmband.sqf index 2b52e327a..ed7965a47 100644 --- a/addons/misc/functions/fnc_slingArmband.sqf +++ b/addons/misc/functions/fnc_slingArmband.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Attaches a armband to the according limb. @@ -51,13 +51,13 @@ private _str = missionNamespace getVariable [QGVAR(armbandSlingRightLegRotation) private _array = [_str, ","" ", true] call FUNC(stringToArray); _unit setVariable [QGVAR(armbandSlingRightLegRot), _array, true]; -switch (_limbNumber) do +switch (_limbNumber) do { // Attach to left arm - case 0: { - switch (_armbandItem) do + case 0: { + switch (_armbandItem) do { - case "kat_armband_red_cross": { + case "kat_armband_red_cross": { _armbandLA = "Kat_armbandRC" createVehicle position _unit; _armbandLA attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftArmPos), [0, 0, 0]], "leftforearm", true]; [_armbandLA, _unit getVariable [QGVAR(armbandSlingLeftArmRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; @@ -98,12 +98,12 @@ switch (_limbNumber) do }; }; }; - + // Attach to right arm - case 1: { - switch (_armbandItem) do + case 1: { + switch (_armbandItem) do { - case "kat_armband_red_cross": { + case "kat_armband_red_cross": { _armbandRA = "Kat_armbandRC" createVehicle position _unit; _armbandRA attachTo [_unit, _unit getVariable [QGVAR(armbandSlingRightArmPos), [0, 0, 0]], "rightforearm", true]; [_armbandRA, _unit getVariable [QGVAR(armbandSlingRightArmRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; @@ -146,12 +146,12 @@ switch (_limbNumber) do }; // Attach to left leg - case 2: { - switch (_armbandItem) do + case 2: { + switch (_armbandItem) do { - case "kat_armband_red_cross": { + case "kat_armband_red_cross": { _armbandLL = "Kat_armbandRC" createVehicle position _unit; - _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; + _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; [_armbandLL, _unit getVariable [QGVAR(armbandSlingLeftLegRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; _unit removeItem _armbandItem; @@ -161,7 +161,7 @@ switch (_limbNumber) do case "kat_armband_medic": { _armbandLL = "Kat_armbandRCM" createVehicle position _unit; - _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; + _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; [_armbandLL, _unit getVariable [QGVAR(armbandSlingLeftLegRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; _unit removeItem _armbandItem; @@ -171,7 +171,7 @@ switch (_limbNumber) do case "kat_armband_doctor": { _armbandLL = "Kat_armbandRCD" createVehicle position _unit; - _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; + _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; [_armbandLL, _unit getVariable [QGVAR(armbandSlingLeftLegRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; _unit removeItem _armbandItem; @@ -181,7 +181,7 @@ switch (_limbNumber) do case "kat_armband_kat": { _armbandLL = "Kat_armbandKAT" createVehicle position _unit; - _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; + _armbandLL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingLeftLegPos), [0, 0, 0]], "LeftUpLeg", true]; [_armbandLL, _unit getVariable [QGVAR(armbandSlingLeftLegRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; _unit removeItem _armbandItem; @@ -192,10 +192,10 @@ switch (_limbNumber) do }; // Attach to right leg - case 3: { - switch (_armbandItem) do + case 3: { + switch (_armbandItem) do { - case "kat_armband_red_cross": { + case "kat_armband_red_cross": { _armbandRL = "Kat_armbandRC" createVehicle position _unit; _armbandRL attachTo [_unit, _unit getVariable [QGVAR(armbandSlingRightLegPos), [0, 0, 0]], "RightUpLeg", true]; [_armbandRL, _unit getVariable [QGVAR(armbandSlingRightLegRot), [0, 0, 0]]] call BIS_fnc_setObjectRotation; diff --git a/addons/misc/functions/fnc_stopCarryingPrompt.sqf b/addons/misc/functions/fnc_stopCarryingPrompt.sqf index 9342af83c..a15b0efed 100644 --- a/addons/misc/functions/fnc_stopCarryingPrompt.sqf +++ b/addons/misc/functions/fnc_stopCarryingPrompt.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Give interactions to stop being carried @@ -52,9 +52,9 @@ _unit setVariable [QGVAR(GetOffActionID), [0xF1, [false, false, false], { _unit setVariable [QGVAR(GetOffActionID), nil]; }, [_carrier, _unit], 3600, { params ["_carrier", "_unit"]; - + [] call ACEFUNC(interaction,hideMouseHint); GVAR(Carrier) = nil; [_unit getVariable QGVAR(GetOffActionID), "keydown"] call CBA_fnc_removeKeyHandler; _unit setVariable [QGVAR(GetOffActionID), nil]; -}] call CBA_fnc_waitUntilAndExecute; \ No newline at end of file +}] call CBA_fnc_waitUntilAndExecute; diff --git a/addons/misc/functions/fnc_stretcher.sqf b/addons/misc/functions/fnc_stretcher.sqf index 77adc2083..d3f2db0b8 100644 --- a/addons/misc/functions/fnc_stretcher.sqf +++ b/addons/misc/functions/fnc_stretcher.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Init function for stretcher diff --git a/addons/misc/functions/fnc_stringToArray.sqf b/addons/misc/functions/fnc_stringToArray.sqf index 662fdd1fd..821baf1d5 100644 --- a/addons/misc/functions/fnc_stringToArray.sqf +++ b/addons/misc/functions/fnc_stringToArray.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Digii * Splits an string into an array. (that can be used by CBA settings) @@ -32,4 +32,4 @@ if (_returnNumber) exitWith _array }; -_clipstring \ No newline at end of file +_clipstring diff --git a/addons/misc/functions/fnc_treatment.sqf b/addons/misc/functions/fnc_treatment.sqf index 7a94455ff..3c497be4b 100644 --- a/addons/misc/functions/fnc_treatment.sqf +++ b/addons/misc/functions/fnc_treatment.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, KoffeinFlummi, mharis001 * Modified: Blue @@ -158,7 +158,7 @@ if (isNull objectParent _medic && {_medicAnim != ""}) then { if (isArray (_config >> "sounds") && count getArray (_config >> "sounds") != 0) then { selectRandom getArray (_config >> "sounds") params ["_file", ["_volume", 1], ["_pitch", 1], ["_distance", 10]]; GVAR(TreatmentSound) = playSound3D [_file, objNull, false, getPosASL _medic, _volume, _pitch, _distance]; - + [{ !dialog; }, { diff --git a/addons/misc/functions/fnc_treatmentIV.sqf b/addons/misc/functions/fnc_treatmentIV.sqf index 9cf9f6483..67009af14 100644 --- a/addons/misc/functions/fnc_treatmentIV.sqf +++ b/addons/misc/functions/fnc_treatmentIV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Treatment handle function to remove a bag. diff --git a/addons/misc/functions/fnc_treatmentSuccess.sqf b/addons/misc/functions/fnc_treatmentSuccess.sqf index 0095e5b6c..bc9dbe092 100644 --- a/addons/misc/functions/fnc_treatmentSuccess.sqf +++ b/addons/misc/functions/fnc_treatmentSuccess.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: KoffeinFlummi, Glowbal, mharis001 * Modified: Blue diff --git a/addons/misc/functions/fnc_unSlingArmband.sqf b/addons/misc/functions/fnc_unSlingArmband.sqf index eb1213649..04c3192ed 100644 --- a/addons/misc/functions/fnc_unSlingArmband.sqf +++ b/addons/misc/functions/fnc_unSlingArmband.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Detaches a armband from a previously attached limb. @@ -18,9 +18,9 @@ params ["_unit", "_limbNumber"]; -switch (_limbNumber) do +switch (_limbNumber) do { - case 0: { + case 0: { private _objectLA = _unit getVariable [QGVAR(whichArmabndisSlingedLA), ObjNull]; switch (typeOf _objectLA) do @@ -143,4 +143,4 @@ switch (_limbNumber) do }; }; }; -}; \ No newline at end of file +}; diff --git a/addons/misc/functions/fnc_unloadAndCarryPatient.sqf b/addons/misc/functions/fnc_unloadAndCarryPatient.sqf index 6009730f3..c6106966e 100644 --- a/addons/misc/functions/fnc_unloadAndCarryPatient.sqf +++ b/addons/misc/functions/fnc_unloadAndCarryPatient.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Unload patient from vehicle and carry (skip animation) @@ -61,4 +61,4 @@ private _mass = getMass _patient; if (_mass > 1) then { _patient setVariable [QACEGVAR(dragging,originalMass), _mass, true]; [QACEGVAR(common,setMass), [_patient, 1e-12]] call CBA_fnc_globalEvent; // force global sync -}; \ No newline at end of file +}; diff --git a/addons/misc/functions/fnc_useItem.sqf b/addons/misc/functions/fnc_useItem.sqf index b095e5ce3..4e23ddc42 100644 --- a/addons/misc/functions/fnc_useItem.sqf +++ b/addons/misc/functions/fnc_useItem.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Modified: Blue @@ -90,7 +90,7 @@ if (GVAR(allowSharedVehicleEquipment) > 0 && _vehicleCondition) then { [_origin, _x] breakOut "Main"; }; } forEach _items; - + _originItems = [_origin, true, true] call FUNC(getUniqueItems); // Magazine { if (_x in _originItems) then { diff --git a/addons/misc/functions/script_component.hpp b/addons/misc/functions/script_component.hpp deleted file mode 100644 index 8d6b209d6..000000000 --- a/addons/misc/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\misc\script_component.hpp" \ No newline at end of file diff --git a/addons/misc/script_component.hpp b/addons/misc/script_component.hpp index d2181bb4f..cda06aac4 100644 --- a/addons/misc/script_component.hpp +++ b/addons/misc/script_component.hpp @@ -14,7 +14,6 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_MISC #endif -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" #include "\x\kat\addons\main\script_macros.hpp" -#define MEDICAL_TREATMENT_ITEMS (call (uiNamespace getVariable [QACEGVAR(medical_treatment,treatmentItems), {[]}])) \ No newline at end of file +#define MEDICAL_TREATMENT_ITEMS (call (uiNamespace getVariable [QACEGVAR(medical_treatment,treatmentItems), {[]}])) diff --git a/addons/pharma/ACE_Medical_Treatment_Actions.hpp b/addons/pharma/ACE_Medical_Treatment_Actions.hpp index c00a187d9..68afee699 100644 --- a/addons/pharma/ACE_Medical_Treatment_Actions.hpp +++ b/addons/pharma/ACE_Medical_Treatment_Actions.hpp @@ -111,8 +111,7 @@ class ACE_Medical_Treatment_Actions { treatmentTime = QGVAR(treatmentTime_Penthrox); items[] = {}; callbackSuccess = QFUNC(treatmentAdvanced_Penthrox); - condition = QUOTE([_patient] call ACEFUNC(common,isAwake) && ([ARR_2(_medic, 'kat_Penthrox')] call ACEFUNC(common,hasMagazine) || [ARR_2(_patient, 'kat_Penthrox')] call ACEFUNC(common,hasMagazine))); - //icon = QPATHTOF(ui\icon_penthrox_action.paa); + condition = QUOTE([_patient] call ACEFUNC(common,isAwake) && ([ARR_2(_medic,'kat_Penthrox')] call ACEFUNC(common,hasMagazine) || [ARR_2(_patient,'kat_Penthrox')] call ACEFUNC(common,hasMagazine))); animationPatient = ""; animationPatientProne = ""; animationMedic = ""; @@ -160,7 +159,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = 1; treatmentTime = 3; items[] = {}; - condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(IVplaced), true)]) && FUNC(salineCheck)); + condition = QUOTE((_patient getVariable [ARR_2(QQGVAR(IVplaced),true)]) && FUNC(salineCheck)); callbackSuccess = QFUNC(treatmentAdvanced_Flush); sounds[] = {}; }; @@ -290,9 +289,9 @@ class ACE_Medical_Treatment_Actions { category = "advanced"; allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"}; items[] = {"kat_IV_16"}; - condition = QUOTE(!([ARR_3(_player, _patient, _bodyPart)] call FUNC(removeIV))); + condition = QUOTE(!([ARR_3(_player,_patient,_bodyPart)] call FUNC(removeIV))); treatmentTime = QGVAR(treatmentTime_ApplyIV); - callbackSuccess = QUOTE([ARR_4(_player, _patient, _bodyPart, 'kat_IV_16')] call FUNC(applyIV)); + callbackSuccess = QUOTE([ARR_4(_player,_patient,_bodyPart,'kat_IV_16')] call FUNC(applyIV)); litter[] = {}; sounds[] = {}; }; @@ -303,9 +302,9 @@ class ACE_Medical_Treatment_Actions { category = "advanced"; allowedSelections[] = {"Body"}; items[] = {"kat_IO_FAST"}; - condition = QUOTE(!([ARR_3(_player, _patient, _bodyPart)] call FUNC(removeIV)) && !(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)])); + condition = QUOTE(!([ARR_3(_player,_patient,_bodyPart)] call FUNC(removeIV)) && !(_patient getVariable [ARR_2(QQEGVAR(airway,recovery),false)])); treatmentTime = QGVAR(treatmentTime_ApplyIO); - callbackSuccess = QUOTE([ARR_4(_player, _patient, _bodyPart, 'kat_IO_FAST')] call FUNC(applyIV)); + callbackSuccess = QUOTE([ARR_4(_player,_patient,_bodyPart,'kat_IO_FAST')] call FUNC(applyIV)); litter[] = {}; sounds[] = {}; }; @@ -369,7 +368,7 @@ class ACE_Medical_Treatment_Actions { callbackProgress = ""; callbackStart = ""; callbackFailure = ""; - callbackSuccess = QUOTE([ARR_2(_medic, _patient)] call FUNC(treatmentAdvanced_Dialysis)); + callbackSuccess = QUOTE([ARR_2(_medic,_patient)] call FUNC(treatmentAdvanced_Dialysis)); litter[] = {}; }; }; diff --git a/addons/pharma/CfgEventHandlers.hpp b/addons/pharma/CfgEventHandlers.hpp index c26ebc2ff..4551ce282 100644 --- a/addons/pharma/CfgEventHandlers.hpp +++ b/addons/pharma/CfgEventHandlers.hpp @@ -8,7 +8,7 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; }; diff --git a/addons/pharma/functions/fnc_alphaAction.sqf b/addons/pharma/functions/fnc_alphaAction.sqf index 87c68a29f..d7dd9b739 100644 --- a/addons/pharma/functions/fnc_alphaAction.sqf +++ b/addons/pharma/functions/fnc_alphaAction.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MJSTIC * Adds the alpha factor value from medications to the patient. diff --git a/addons/pharma/functions/fnc_applyIV.sqf b/addons/pharma/functions/fnc_applyIV.sqf index 2859ae196..25ad4dd2f 100644 --- a/addons/pharma/functions/fnc_applyIV.sqf +++ b/addons/pharma/functions/fnc_applyIV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Opens an IV/IO on a patient and changes the patient's flow variable @@ -94,4 +94,4 @@ if (GVAR(IVdropEnable) && (_usedItem isEqualTo "kat_IV_16")) then { }, GVAR(IVdrop), [_patient, _partIndex]] call CBA_fnc_addPerFrameHandler; }; }, [_patient, _partIndex, _IVpfhActual], GVAR(IVdrop)] call CBA_fnc_waitAndExecute; -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_checkIV.sqf b/addons/pharma/functions/fnc_checkIV.sqf index 25ad767b8..5e2221b56 100644 --- a/addons/pharma/functions/fnc_checkIV.sqf +++ b/addons/pharma/functions/fnc_checkIV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Checks Limb Damage before and IV can be used. diff --git a/addons/pharma/functions/fnc_fluid.sqf b/addons/pharma/functions/fnc_fluid.sqf index 911fb067e..9578c178d 100644 --- a/addons/pharma/functions/fnc_fluid.sqf +++ b/addons/pharma/functions/fnc_fluid.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski, Mazinski.H * Starts ph treatment @@ -19,4 +19,4 @@ params ["_patient", "_ph", "_coagulation"]; -[QGVAR(fluidLocal),[ _patient, _ph, _coagulation], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(fluidLocal),[ _patient, _ph, _coagulation], _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_fluidLocal.sqf b/addons/pharma/functions/fnc_fluidLocal.sqf index f3662a1dd..905158a4f 100644 --- a/addons/pharma/functions/fnc_fluidLocal.sqf +++ b/addons/pharma/functions/fnc_fluidLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Locally changes a patient's PH value @@ -26,4 +26,4 @@ _patient setVariable [QGVAR(pH), (_final), true]; private _factor = _patient getVariable [QGVAR(coagulationFactor), 10]; private _final2 = (_factor + _coagulation) min 30; -_patient setVariable [QGVAR(coagulationFactor), (_final2), true]; \ No newline at end of file +_patient setVariable [QGVAR(coagulationFactor), (_final2), true]; diff --git a/addons/pharma/functions/fnc_getBloodLoss.sqf b/addons/pharma/functions/fnc_getBloodLoss.sqf index 5f9b009bc..6bb6c6447 100644 --- a/addons/pharma/functions/fnc_getBloodLoss.sqf +++ b/addons/pharma/functions/fnc_getBloodLoss.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Calculate the total blood loss of a unit. @@ -24,4 +24,4 @@ private _cardiacOutput = [_unit] call ACEFUNC(medical_status,getCardiacOutput); private _alphaAction = _unit getVariable [QGVAR(alphaAction), 1]; // even if heart stops blood will still flow slowly (gravity) -(_woundBleeding * (_cardiacOutput max EGVAR(circulation,cardiacArrestBleedRate)) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction) \ No newline at end of file +(_woundBleeding * (_cardiacOutput max EGVAR(circulation,cardiacArrestBleedRate)) * ACEGVAR(medical,bleedingCoefficient) * _alphaAction) diff --git a/addons/pharma/functions/fnc_getBloodVolumeChange.sqf b/addons/pharma/functions/fnc_getBloodVolumeChange.sqf index c781e6f1e..1f68ec7bc 100644 --- a/addons/pharma/functions/fnc_getBloodVolumeChange.sqf +++ b/addons/pharma/functions/fnc_getBloodVolumeChange.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal * Calculates the blood volume change and decreases the IVs given to the unit. @@ -58,4 +58,4 @@ if (!isNil {_unit getVariable [QACEGVAR(medical,ivBags),[]]}) then { }; }; -_bloodVolumeChange \ No newline at end of file +_bloodVolumeChange diff --git a/addons/pharma/functions/fnc_init.sqf b/addons/pharma/functions/fnc_init.sqf index 73b724640..6025d6f64 100644 --- a/addons/pharma/functions/fnc_init.sqf +++ b/addons/pharma/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Initializes unit variables. diff --git a/addons/pharma/functions/fnc_inspectCatheter.sqf b/addons/pharma/functions/fnc_inspectCatheter.sqf index bbffd524e..c8178f00e 100644 --- a/addons/pharma/functions/fnc_inspectCatheter.sqf +++ b/addons/pharma/functions/fnc_inspectCatheter.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Function for inspecting catheter diff --git a/addons/pharma/functions/fnc_medication.sqf b/addons/pharma/functions/fnc_medication.sqf index 0cb430359..699d28ce4 100644 --- a/addons/pharma/functions/fnc_medication.sqf +++ b/addons/pharma/functions/fnc_medication.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Edited by MiszczuZPolski @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, _usedItem] call ACEFUNC(medical_treatment,addToTriageCard); [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), getText (configFile >> "CfgWeapons" >> _usedItem >> "displayName")]] call ACEFUNC(medical_treatment,addToLog); -[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_medicationLocal.sqf b/addons/pharma/functions/fnc_medicationLocal.sqf index 5b7e9d763..792e0b1e9 100644 --- a/addons/pharma/functions/fnc_medicationLocal.sqf +++ b/addons/pharma/functions/fnc_medicationLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Modified: MiszczuZPolski, Blue @@ -39,7 +39,7 @@ if !(ACEGVAR(medical_treatment,advancedMedication)) exitWith { if !(_sedated) then { [QACEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent; }; - + [_patient, -0.15] call FUNC(alphaAction); }; }; @@ -96,4 +96,4 @@ TRACE_3("adjustments",_heartRateChange,_painReduce,_viscosityChange); if (_className in ["Lorazepam","Fentanyl","Ketamine","EACA","TXA","Atropine","Amiodarone","Flumazenil"]) then { [format ["kat_pharma_%1Local", toLower _className], [_patient, _bodyPart], _patient] call CBA_fnc_targetEvent; -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_pervitinPP.sqf b/addons/pharma/functions/fnc_pervitinPP.sqf index a37b66212..edbdf506d 100644 --- a/addons/pharma/functions/fnc_pervitinPP.sqf +++ b/addons/pharma/functions/fnc_pervitinPP.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Triggers the perivin visual effect. @@ -37,19 +37,19 @@ if (GVAR(chromatic_aberration_checkbox_pervitin)) then { _handle ppEffectAdjust _effect; _handle ppEffectCommit 120; // 2m for max chroma [LLSTRING(Pervitin_chrom), 2, _target] call ACEFUNC(common,displayTextStructured); - + [{ params["_handle"]; - + [{ params["_handle"]; ppEffectCommitted _handle - }, + }, { params["_handle"]; _handle ppEffectAdjust [0.005, 0.005, false]; _handle ppEffectCommit 257.5; // lowering until 9m [{ params["_handle"]; ppEffectCommitted _handle - }, + }, { params["_handle"]; _handle ppEffectEnable false; ppEffectDestroy _handle; @@ -71,7 +71,7 @@ if (GVAR(chromatic_aberration_checkbox_pervitin)) then { addCamShake[1, 180, 2]; // wearoff after 9m [{ [LLSTRING(Pervitin_chrom3), 2, _target] call ACEFUNC(common,displayTextStructured); - }, + }, [_target], 180] call CBA_fnc_waitAndExecute; -}, -[_target], 360] call CBA_fnc_waitAndExecute; // after 6m start \ No newline at end of file +}, +[_target], 360] call CBA_fnc_waitAndExecute; // after 6m start diff --git a/addons/pharma/functions/fnc_removeIV.sqf b/addons/pharma/functions/fnc_removeIV.sqf index 72d7cde57..185132ace 100644 --- a/addons/pharma/functions/fnc_removeIV.sqf +++ b/addons/pharma/functions/fnc_removeIV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Removes the IV from the patient on the given body part. diff --git a/addons/pharma/functions/fnc_removeItemfromMag.sqf b/addons/pharma/functions/fnc_removeItemfromMag.sqf index 895ba2b4d..08505ad06 100644 --- a/addons/pharma/functions/fnc_removeItemfromMag.sqf +++ b/addons/pharma/functions/fnc_removeItemfromMag.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Katalam * Removes a 'bullet' from a magazine. diff --git a/addons/pharma/functions/fnc_retrieveIV.sqf b/addons/pharma/functions/fnc_retrieveIV.sqf index 433eaf838..a3e68c693 100644 --- a/addons/pharma/functions/fnc_retrieveIV.sqf +++ b/addons/pharma/functions/fnc_retrieveIV.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Retrieves the IV/IO from a patient and returns additional fluids to the medic. diff --git a/addons/pharma/functions/fnc_salineCheck.sqf b/addons/pharma/functions/fnc_salineCheck.sqf index 641282708..574c8db41 100644 --- a/addons/pharma/functions/fnc_salineCheck.sqf +++ b/addons/pharma/functions/fnc_salineCheck.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Checks Saline volume remaining diff --git a/addons/pharma/functions/fnc_tourniquetRemove.sqf b/addons/pharma/functions/fnc_tourniquetRemove.sqf index 0ce088465..53632faa2 100644 --- a/addons/pharma/functions/fnc_tourniquetRemove.sqf +++ b/addons/pharma/functions/fnc_tourniquetRemove.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Glowbal, mharis001 * Removes the tourniquet from the patient on the given body part. @@ -63,4 +63,4 @@ if !(((_patient getVariable [QGVAR(IV), [0,0,0,0,0,0]]) select _partIndex) isEqu _occludedMedications = _occludedMedications - [[]]; _patient setVariable [QACEGVAR(medical,occludedMedications), _occludedMedications, true]; }; -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf index af9175c94..04073ee61 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_AmiodaroneLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H, Edited by MiszczuZPolski * Applies Bradycardia randomly @@ -20,4 +20,4 @@ params ["_patient"]; private _random = random 3; if (_random <= 1) then { [_patient, "BRADYCARDIA", 120, 1200, -40, 0, 0] call ACEFUNC(medical_status,addMedicationAdjustment); -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_AtropineLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_AtropineLocal.sqf index 75af8756d..4a9e57392 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_AtropineLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_AtropineLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Locates and Removes Bradycardia Effect. @@ -14,7 +14,7 @@ * * Public: No */ - + params ["_patient"]; private _medicationArray = _patient getVariable [QACEGVAR(medical,medications), []]; @@ -35,4 +35,4 @@ _patient setVariable [QEGVAR(chemical,enteredPoison),false,true]; _patient setVariable [QEGVAR(chemical,timeleft), missionNamespace getVariable [QEGVAR(chemical,infectionTime), 60], true]; if (_patient getVariable [QEGVAR(chemical,painEffect),0] != 0) then { KAT_PAIN_EFFECT ppEffectEnable false; -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Caffeine.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Caffeine.sqf index 2802bd982..45658b3f2 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Caffeine.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Caffeine.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Begins Caffeine Treatment @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog); [QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; -[QGVAR(caffeineLocal), _patient, _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(caffeineLocal), _patient, _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_CaffeineLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_CaffeineLocal.sqf index 0982c0fea..b9e1a2daa 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_CaffeineLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_CaffeineLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * @@ -18,7 +18,7 @@ params ["_patient"]; if (ACE_Player != _patient) exitWith {}; -/// ACE Fatigue +/// ACE Fatigue if (ACEGVAR(advanced_fatigue,enabled)) then { [{ @@ -26,7 +26,7 @@ if (ACEGVAR(advanced_fatigue,enabled)) then { ACEGVAR(advanced_fatigue,anReserve) = ACEGVAR(advanced_fatigue,anReserve) + 1500; }, [_patient], 2.5] call CBA_fnc_waitAndExecute; - + } else { [{ @@ -35,4 +35,4 @@ if (ACEGVAR(advanced_fatigue,enabled)) then { }, [_patient], 2.5] call CBA_fnc_waitAndExecute; -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Carbonate.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Carbonate.sqf index e87f2e8cb..fc92a20f2 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Carbonate.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Carbonate.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Begins Carbonate Treatment @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog); [QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; -[QGVAR(carbonateLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(carbonateLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_CarbonateLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_CarbonateLocal.sqf index 58d708516..e7b60c77d 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_CarbonateLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_CarbonateLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H, Blue * Checks for Carbonate Wakeup values to restore consciousness @@ -25,4 +25,4 @@ private _bloodPressureH = GET_BLOOD_PRESSURE(_patient) select 1; if ((floor (random 100) < ((linearConversion [50, 100, _bloodPressureH, 0, GVAR(carbonateChance), true]) min (linearConversion [140, 200, _bloodPressureH, GVAR(carbonateChance), 0, true]))) && {[_patient] call EFUNC(misc,hasStableVitals)}) then { [_patient, false] call ACEFUNC(medical,setUnconscious); -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Dialysis.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Dialysis.sqf index 64b994a3c..54fc16a85 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Dialysis.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Dialysis.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Treatment call for dialysis procedure diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_DialysisLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_DialysisLocal.sqf index ff5a5482a..8be16adae 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_DialysisLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_DialysisLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Local treatment call for dialysis procedure @@ -25,4 +25,4 @@ _patient setVariable [QGVAR(kidneyArrest), false, true]; _patient setVariable [QGVAR(kidneyPressure), false, true]; [_patient, "Dialysis"] call ACEFUNC(medical_treatment,addToTriageCard); -[_patient, "activity", LSTRING(dialysis_log), [[_medic] call ACEFUNC(common,getName)]] call ACEFUNC(medical_treatment,addToLog); \ No newline at end of file +[_patient, "activity", LSTRING(dialysis_log), [[_medic] call ACEFUNC(common,getName)]] call ACEFUNC(medical_treatment,addToLog); diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_EACALocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_EACALocal.sqf index 5aa1100bb..d997946d4 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_EACALocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_EACALocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Local function for EACA treatment diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_FentanylLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_FentanylLocal.sqf index 783233c6a..cc7244216 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_FentanylLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_FentanylLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Triggers the fentanyl visual effect. diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_FlumazenilLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_FlumazenilLocal.sqf index 615ed7084..c40be45a6 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_FlumazenilLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_FlumazenilLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Begins Flumazenil unsedating process @@ -17,4 +17,4 @@ params ["_patient"]; -_patient setVariable [QEGVAR(surgery,sedated), false, true]; \ No newline at end of file +_patient setVariable [QEGVAR(surgery,sedated), false, true]; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Flush.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Flush.sqf index ca0d77204..2e0fff55c 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Flush.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Flush.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Flushing IV access with saline diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_FlushLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_FlushLocal.sqf index 28a1cae2b..7892edbbf 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_FlushLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_FlushLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Flushing IV access with saline @@ -48,4 +48,4 @@ if !(HAS_TOURNIQUET_APPLIED_ON(_patient, _partIndex)) then { _occludedMedications = _occludedMedications - [[]]; _patient setVariable [QACEGVAR(medical,occludedMedications), _occludedMedications, true]; }; -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_KetamineLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_KetamineLocal.sqf index d78702e1d..f9686086b 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_KetamineLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_KetamineLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Triggers the ketamine visual effect. diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_LorazepamLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_LorazepamLocal.sqf index fb1cdfbeb..52e9e9db3 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_LorazepamLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_LorazepamLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Begins Lorazepam sedating process @@ -23,4 +23,4 @@ if (_random <= 1) then { }; _patient setVariable [QEGVAR(surgery,sedated), true, true]; -[_patient, true] call ACEFUNC(medical,setUnconscious); \ No newline at end of file +[_patient, true] call ACEFUNC(medical,setUnconscious); diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Naloxone.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Naloxone.sqf index 30cfc51e2..b9b122efc 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Naloxone.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Naloxone.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Begins Naloxone Treatment @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), getText (configFile >> "CfgWeapons" >> _usedItem >> "displayName")]] call ACEFUNC(medical_treatment,addToLog); [QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; -[QGVAR(naloxoneLocal), _patient, _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(naloxoneLocal), _patient, _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_NaloxoneLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_NaloxoneLocal.sqf index 98ff13fde..03119d46e 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_NaloxoneLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_NaloxoneLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Locates and Removes 1x Morphine after the administration of Naloxone. @@ -27,4 +27,4 @@ private _medicationArray = _patient getVariable [QACEGVAR(medical,medications), }; } forEach (_medicationArray); -_patient setVariable [QACEGVAR(medical,medications), _medicationArray, true]; \ No newline at end of file +_patient setVariable [QACEGVAR(medical,medications), _medicationArray, true]; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Painkillers.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Painkillers.sqf index e1613a3dc..4854221ec 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Painkillers.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Painkillers.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Begins Painkillers Treatment @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog); [QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; -[_patient] call EFUNC(circulation,wrongBloodTreatment); \ No newline at end of file +[_patient] call EFUNC(circulation,wrongBloodTreatment); diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Penthrox.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Penthrox.sqf index d4551aa1c..d0582e2c2 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Penthrox.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Penthrox.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Begins Penthrox Inhaler use @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), LLSTRING(Penthrox_Display)]] call ACEFUNC(medical_treatment,addToLog); [_medic, 'kat_Penthrox'] call FUNC(removeItemfromMag); -[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Pervitin.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Pervitin.sqf index e2fa01b1e..00362184e 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Pervitin.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Pervitin.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Miss Heda * Begins Pervitin Treatment @@ -26,4 +26,4 @@ params ["_medic", "_patient", "_bodyPart", "_classname", "", "_usedItem"]; [_patient, "activity", ACELSTRING(medical_treatment,Activity_usedItem), [[_medic] call ACEFUNC(common,getName), _classname]] call ACEFUNC(medical_treatment,addToLog); [QGVAR(medicationLocal), [_patient, _bodyPart, _classname], _patient] call CBA_fnc_targetEvent; -[QGVAR(pervitinLocal), _patient, _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(pervitinLocal), _patient, _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_PervitinLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_PervitinLocal.sqf index 5c11543db..bc6e2ba65 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_PervitinLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_PervitinLocal.sqf @@ -1,8 +1,8 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* - * Author: Miss Heda, + * Author: Miss Heda, * Contributers: YonV, MiszczuZPolski - * + * * * Arguments: * 0: Patient @@ -21,16 +21,16 @@ params ["_patient"]; if (ACE_Player != _patient) exitWith {}; _defaultAnimSpeed = getAnimSpeedCoef _patient; -/// ACE Fatigue +/// ACE Fatigue if (ACEGVAR(advanced_fatigue,enabled)) then { - + [{ params ["_patient", "_defaultAnimSpeed"]; if !(alive _patient) exitWith {}; ACEGVAR(advanced_fatigue,anReserve) = ACEGVAR(advanced_fatigue,anReserve) + 3000; ["kat_PDF", 0] call ACEFUNC(advanced_fatigue,addDutyFactor); - [LLSTRING(Pervitin_start), 2, _patient] call ACEFUNC(common,displayTextStructured); + [LLSTRING(Pervitin_start), 2, _patient] call ACEFUNC(common,displayTextStructured); if (!isNil QACEGVAR(advanced_fatigue,setAnimExclusions)) then { ACEGVAR(advanced_fatigue,setAnimExclusions) pushBack "PervitinOverride"; @@ -123,7 +123,7 @@ if (ACEGVAR(advanced_fatigue,enabled)) then { }, [_patient], 60] call CBA_fnc_waitAndExecute; - + [{ params ["_patient"]; if !(alive _patient) exitWith {}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_Reorientation.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_Reorientation.sqf index b97a7642c..aae7ee165 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_Reorientation.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_Reorientation.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H * Begins Reorientation Treatment @@ -22,4 +22,4 @@ if (GVAR(Reorientation_Slap)) then { playSound3D [QPATHTOF_SOUND(sounds\slap.ogg), _patient, false, getPosASL _patient, 10, 1, 15]; }; -[QGVAR(reorientationLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(reorientationLocal), [_medic, _patient], _patient] call CBA_fnc_targetEvent; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_ReorientationLocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_ReorientationLocal.sqf index 4512611bf..b820cf563 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_ReorientationLocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_ReorientationLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Mazinski.H, Blue * Checks for Reorientation Wakeup values to restore consciousness @@ -27,4 +27,4 @@ if ((floor (random 100) < ((linearConversion [40, 79, _pulse, 0, GVAR(reorientat } else { _output = LLSTRING(Reorienting_Info); [_output, 1.5, _medic] call ACEFUNC(common,displayTextStructured); -}; \ No newline at end of file +}; diff --git a/addons/pharma/functions/fnc_treatmentAdvanced_TXALocal.sqf b/addons/pharma/functions/fnc_treatmentAdvanced_TXALocal.sqf index 842421144..6b6ea77e5 100644 --- a/addons/pharma/functions/fnc_treatmentAdvanced_TXALocal.sqf +++ b/addons/pharma/functions/fnc_treatmentAdvanced_TXALocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Begins TXA bandaging process diff --git a/addons/pharma/functions/fnc_vehicleCheckDialysis.sqf b/addons/pharma/functions/fnc_vehicleCheckDialysis.sqf index e574908d4..767375667 100644 --- a/addons/pharma/functions/fnc_vehicleCheckDialysis.sqf +++ b/addons/pharma/functions/fnc_vehicleCheckDialysis.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Allows for dialysis to occur around medical vehicles diff --git a/addons/pharma/functions/script_component.hpp b/addons/pharma/functions/script_component.hpp deleted file mode 100644 index 67f788f07..000000000 --- a/addons/pharma/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\pharma\script_component.hpp" \ No newline at end of file diff --git a/addons/pharma/script_component.hpp b/addons/pharma/script_component.hpp index a16fe972e..5ac74e7a6 100644 --- a/addons/pharma/script_component.hpp +++ b/addons/pharma/script_component.hpp @@ -14,5 +14,4 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_PHARMA #endif -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" #include "\x\kat\addons\main\script_macros.hpp" diff --git a/addons/pharma/ui/CrossPanel_Dialog.hpp b/addons/pharma/ui/CrossPanel_Dialog.hpp index 06b3d6c6f..03fa0f99d 100644 --- a/addons/pharma/ui/CrossPanel_Dialog.hpp +++ b/addons/pharma/ui/CrossPanel_Dialog.hpp @@ -1,7 +1,7 @@ class GVAR(CrossPanel_Dialog) { idd = -1; movingEnable = 1; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(CrossPanel_Display), (_this select 0))]); + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QQGVAR(CrossPanel_Display),(_this select 0))]); onUnload = QUOTE(_this call FUNC(onCloseDialog)); objects[] = {}; diff --git a/addons/surgery/ACE_Medical_Treatment_Actions.hpp b/addons/surgery/ACE_Medical_Treatment_Actions.hpp index d58641c7d..187162953 100644 --- a/addons/surgery/ACE_Medical_Treatment_Actions.hpp +++ b/addons/surgery/ACE_Medical_Treatment_Actions.hpp @@ -12,7 +12,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(fractureCheck_MedLevel); treatmentTime = QGVAR(fractureCheck_Time); items[] = {}; - condition = QUOTE(([ARR_4(_medic, _patient, _bodyPart, 5)] call FUNC(fractureCheck)) && (GVAR(enable_fracture))); + condition = QUOTE(([ARR_4(_medic,_patient,_bodyPart,5)] call FUNC(fractureCheck)) && (GVAR(enable_fracture))); callbackSuccess = QFUNC(fractureSelect); }; class ClosedReduction: CheckFracture { @@ -25,7 +25,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(closedReduction_MedLevel); treatmentTime = QGVAR(closedTime); items[] = {}; - condition = QUOTE([ARR_4(_medic, _patient, _bodyPart, 1)] call FUNC(fractureCheck)); + condition = QUOTE([ARR_4(_medic,_patient,_bodyPart,1)] call FUNC(fractureCheck)); callbackSuccess = QFUNC(closedReduction); }; class OpenReduction: CheckFracture { @@ -39,7 +39,7 @@ class ACE_Medical_Treatment_Actions { treatmentTime = QGVAR(openTime); items[] = {"kat_plate"}; consumeItem = 1; - condition = QUOTE([ARR_4(_medic, _patient, _bodyPart, 3.5)] call FUNC(openReductionCheck)); + condition = QUOTE([ARR_4(_medic,_patient,_bodyPart,3.5)] call FUNC(openReductionCheck)); callbackSuccess = QFUNC(openReduction); }; class Expose: BasicBandage { @@ -52,9 +52,9 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(surgicalAction_MedLevel); treatmentTime = QGVAR(intermediateTime); items[] = {"kat_retractor"}; - condition = QUOTE([ARR_4(_medic, _patient, _bodyPart, 2.1)] call FUNC(openReductionCheck)); + condition = QUOTE([ARR_4(_medic,_patient,_bodyPart,2.1)] call FUNC(openReductionCheck)); consumeItem = 0; - callbackSuccess = QUOTE([ARR_4(_medic, _patient, _bodyPart, 2.1)] call FUNC(openReductionProgress)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,_bodyPart,2.1)] call FUNC(openReductionProgress)); }; class Incision: BasicBandage { displayName = CSTRING(Scalpel_Use); @@ -66,7 +66,7 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(surgicalAction_MedLevel); treatmentTime = QGVAR(incisionTime); items[] = {"kat_scalpel"}; - condition = QUOTE([ARR_4(_medic, _patient, _bodyPart, 5)] call FUNC(openReductionCheck)); + condition = QUOTE([ARR_4(_medic,_patient,_bodyPart,5)] call FUNC(openReductionCheck)); callbackSuccess = QFUNC(incision); }; class Clamp: BasicBandage { @@ -79,9 +79,9 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(surgicalAction_MedLevel); treatmentTime = QGVAR(intermediateTime); items[] = {"kat_clamp"}; - condition = QUOTE([ARR_4(_medic, _patient, _bodyPart, 3.3)] call FUNC(openReductionCheck)); + condition = QUOTE([ARR_4(_medic,_patient,_bodyPart,3.3)] call FUNC(openReductionCheck)); consumeItem = 0; - callbackSuccess = QUOTE([ARR_4(_medic, _patient, _bodyPart, 3.3)] call FUNC(openReductionProgress)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,_bodyPart,3.3)] call FUNC(openReductionProgress)); }; class Irrigate: BasicBandage { displayName = CSTRING(Irrigate_Use); @@ -93,8 +93,8 @@ class ACE_Medical_Treatment_Actions { medicRequired = QGVAR(surgicalAction_MedLevel); treatmentTime = QGVAR(intermediateTime); items[] = {"ACE_salineIV_250"}; - condition = QUOTE([ARR_4(_medic, _patient, _bodyPart, 2.3)] call FUNC(openReductionCheck)); - callbackSuccess = QUOTE([ARR_4(_medic, _patient, _bodyPart, 2.3)] call FUNC(openReductionProgress)); + condition = QUOTE([ARR_4(_medic,_patient,_bodyPart,2.3)] call FUNC(openReductionCheck)); + callbackSuccess = QUOTE([ARR_4(_medic,_patient,_bodyPart,2.3)] call FUNC(openReductionProgress)); }; class NPWT: BasicBandage { displayName = CSTRING(Vacuum_Use); diff --git a/addons/surgery/CfgEventHandlers.hpp b/addons/surgery/CfgEventHandlers.hpp index c26ebc2ff..4551ce282 100644 --- a/addons/surgery/CfgEventHandlers.hpp +++ b/addons/surgery/CfgEventHandlers.hpp @@ -8,7 +8,7 @@ class Extended_PreInit_EventHandlers { class Extended_Init_EventHandlers { class CAManBase { class ADDON { - init = QUOTE([ARR_2((_this select 0), false)] call FUNC(init)); + init = QUOTE([ARR_2((_this select 0),false)] call FUNC(init)); }; }; }; diff --git a/addons/surgery/functions/fnc_canNPWT.sqf b/addons/surgery/functions/fnc_canNPWT.sqf index f0fe83f85..651f40f4a 100644 --- a/addons/surgery/functions/fnc_canNPWT.sqf +++ b/addons/surgery/functions/fnc_canNPWT.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Check if patient's body part can be treated by NPWT diff --git a/addons/surgery/functions/fnc_closedReduction.sqf b/addons/surgery/functions/fnc_closedReduction.sqf index ebf6ced0d..675cf8867 100644 --- a/addons/surgery/functions/fnc_closedReduction.sqf +++ b/addons/surgery/functions/fnc_closedReduction.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Fully heals a fracture on the selected limb. diff --git a/addons/surgery/functions/fnc_closedReductionLocal.sqf b/addons/surgery/functions/fnc_closedReductionLocal.sqf index cc974ca59..b1fe22238 100644 --- a/addons/surgery/functions/fnc_closedReductionLocal.sqf +++ b/addons/surgery/functions/fnc_closedReductionLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Local call for fully healing a fracture. diff --git a/addons/surgery/functions/fnc_fractureCheck.sqf b/addons/surgery/functions/fnc_fractureCheck.sqf index 3370df2df..92b585d70 100644 --- a/addons/surgery/functions/fnc_fractureCheck.sqf +++ b/addons/surgery/functions/fnc_fractureCheck.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Checks if the patient has a fracture diff --git a/addons/surgery/functions/fnc_fractureSelect.sqf b/addons/surgery/functions/fnc_fractureSelect.sqf index 6d2f1e2c6..bb9aeea10 100644 --- a/addons/surgery/functions/fnc_fractureSelect.sqf +++ b/addons/surgery/functions/fnc_fractureSelect.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Selects the patient's fracture state diff --git a/addons/surgery/functions/fnc_fractureSelectLocal.sqf b/addons/surgery/functions/fnc_fractureSelectLocal.sqf index 67e294e0a..bddd6f4a8 100644 --- a/addons/surgery/functions/fnc_fractureSelectLocal.sqf +++ b/addons/surgery/functions/fnc_fractureSelectLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Local call to select the patient's fracture state @@ -37,7 +37,7 @@ if (_liveFracture != 0) exitWith { if (_liveFracture == 1) then { _fractureString = LSTRING(SIMPLE_FRACTURE); }; - [_patient, "quick_view", LSTRING(fracture_log), [_fractureString, STRING_BODY_PARTS select _part]] call ACEFUNC(medical_treatment,addToLog); + [_patient, "quick_view", LSTRING(fracture_log), [_fractureString, STRING_BODY_PARTS select _part]] call ACEFUNC(medical_treatment,addToLog); }; if (random 100 <= GVAR(simpleChance)) then { diff --git a/addons/surgery/functions/fnc_getNPWTTime.sqf b/addons/surgery/functions/fnc_getNPWTTime.sqf index 6f7aa5e10..b31387eaa 100644 --- a/addons/surgery/functions/fnc_getNPWTTime.sqf +++ b/addons/surgery/functions/fnc_getNPWTTime.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Calculates the Debride treatment time based on the amount of debridable wounds. diff --git a/addons/surgery/functions/fnc_incision.sqf b/addons/surgery/functions/fnc_incision.sqf index d5b0762cb..d3e5d5241 100644 --- a/addons/surgery/functions/fnc_incision.sqf +++ b/addons/surgery/functions/fnc_incision.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Starts the surgical process for a fracture @@ -19,4 +19,4 @@ params ["_medic", "_patient", "_bodyPart"]; -[QGVAR(incision), [_medic, _patient, _bodyPart], _patient] call CBA_fnc_targetEvent; \ No newline at end of file +[QGVAR(incision), [_medic, _patient, _bodyPart], _patient] call CBA_fnc_targetEvent; diff --git a/addons/surgery/functions/fnc_incisionLocal.sqf b/addons/surgery/functions/fnc_incisionLocal.sqf index ffc572821..7157a1c37 100644 --- a/addons/surgery/functions/fnc_incisionLocal.sqf +++ b/addons/surgery/functions/fnc_incisionLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Local call to start the surgical process for a fracture @@ -35,7 +35,7 @@ _patient setVariable [QGVAR(fractures), _fractureArray, true]; [_patient, false] call ACEFUNC(dragging,setCarryable); [_patient, false] call ACEFUNC(dragging,setDraggable); -[_patient, "quick_view", LSTRING(incision_log), [[_medic] call ACEFUNC(common,getName), STRING_BODY_PARTS select _part]] call ACEFUNC(medical_treatment,addToLog); +[_patient, "quick_view", LSTRING(incision_log), [[_medic] call ACEFUNC(common,getName), STRING_BODY_PARTS select _part]] call ACEFUNC(medical_treatment,addToLog); [{ params ["_args", "_idPFH"]; @@ -50,15 +50,15 @@ _patient setVariable [QGVAR(fractures), _fractureArray, true]; if ((!_alive) || (_liveFracture == 0)) exitWith { [_idPFH] call CBA_fnc_removePerFrameHandler; }; - + if ((GVAR(Surgery_ConsciousnessRequirement) == 0 && !(IS_UNCONSCIOUS(_patient)) && _count == 0) || (GVAR(Surgery_ConsciousnessRequirement) == 3 && _count == 0)) exitWith { [_patient, "Pain", 10, 40, 200, 0, 40] call ACEFUNC(medical_status,addMedicationAdjustment); [_patient, true] call ACEFUNC(medical,setUnconscious); }; - + if (GVAR(Surgery_ConsciousnessRequirement) == 2 && _count == 0) then { [_patient, 0.4] call ACEFUNC(medical_status,adjustPainLevel); [_patient, "Pain", 10, 40, 30, 0, 40] call ACEFUNC(medical_status,addMedicationAdjustment); }; - -}, GVAR(etomidateTime), [_patient, _part]] call CBA_fnc_addPerFrameHandler; \ No newline at end of file + +}, GVAR(etomidateTime), [_patient, _part]] call CBA_fnc_addPerFrameHandler; diff --git a/addons/surgery/functions/fnc_init.sqf b/addons/surgery/functions/fnc_init.sqf index ec9cc8e5d..780d23fe6 100644 --- a/addons/surgery/functions/fnc_init.sqf +++ b/addons/surgery/functions/fnc_init.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 2LT.Mazinski * Initializes unit variables. diff --git a/addons/surgery/functions/fnc_npwtTreatmentProgress.sqf b/addons/surgery/functions/fnc_npwtTreatmentProgress.sqf index 0d3ed8d82..d1e56a606 100644 --- a/addons/surgery/functions/fnc_npwtTreatmentProgress.sqf +++ b/addons/surgery/functions/fnc_npwtTreatmentProgress.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: MiszczuZPolski * Local call for clearing all wounds on a patient diff --git a/addons/surgery/functions/fnc_openReduction.sqf b/addons/surgery/functions/fnc_openReduction.sqf index f66699920..3507a5d7b 100644 --- a/addons/surgery/functions/fnc_openReduction.sqf +++ b/addons/surgery/functions/fnc_openReduction.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Removes the fracture status from an open fracture diff --git a/addons/surgery/functions/fnc_openReductionCheck.sqf b/addons/surgery/functions/fnc_openReductionCheck.sqf index a2b2bc928..6c9f5f305 100644 --- a/addons/surgery/functions/fnc_openReductionCheck.sqf +++ b/addons/surgery/functions/fnc_openReductionCheck.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Local call to check if a patient has a complex fracture diff --git a/addons/surgery/functions/fnc_openReductionLocal.sqf b/addons/surgery/functions/fnc_openReductionLocal.sqf index 0a455fb91..fdc2f6acb 100644 --- a/addons/surgery/functions/fnc_openReductionLocal.sqf +++ b/addons/surgery/functions/fnc_openReductionLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Local call to remove the fracture status from an open fracture @@ -41,4 +41,4 @@ if ((_liveFracture == 2.5) || (_liveFracture == 3.5)) exitWith { }; private _output = LLSTRING(fracture_fail); -[_output, 1.5, _medic] call ACEFUNC(common,displayTextStructured); \ No newline at end of file +[_output, 1.5, _medic] call ACEFUNC(common,displayTextStructured); diff --git a/addons/surgery/functions/fnc_openReductionProgress.sqf b/addons/surgery/functions/fnc_openReductionProgress.sqf index 5c5252359..62aba277a 100644 --- a/addons/surgery/functions/fnc_openReductionProgress.sqf +++ b/addons/surgery/functions/fnc_openReductionProgress.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Progresses the treatment process for a complex fracture diff --git a/addons/surgery/functions/fnc_openReductionProgressLocal.sqf b/addons/surgery/functions/fnc_openReductionProgressLocal.sqf index 834a39176..22ed946e6 100644 --- a/addons/surgery/functions/fnc_openReductionProgressLocal.sqf +++ b/addons/surgery/functions/fnc_openReductionProgressLocal.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 1LT.Mazinski.H * Progresses the treatment process for a complex fracture diff --git a/addons/surgery/functions/script_component.hpp b/addons/surgery/functions/script_component.hpp deleted file mode 100644 index d86acad35..000000000 --- a/addons/surgery/functions/script_component.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "\x\kat\addons\surgery\script_component.hpp" - -#define STRING_BODY_PARTS ["head", "body", "left arm", "right arm", "left leg", "right leg"] \ No newline at end of file diff --git a/addons/surgery/script_component.hpp b/addons/surgery/script_component.hpp index 0e25ef449..b6eccf519 100644 --- a/addons/surgery/script_component.hpp +++ b/addons/surgery/script_component.hpp @@ -14,5 +14,4 @@ #define DEBUG_SETTINGS DEBUG_SETTINGS_SURGERY #endif -#include "\z\ace\addons\medical_engine\script_macros_medical.hpp" #include "\x\kat\addons\main\script_macros.hpp" diff --git a/addons/zeus/XEH_preInit.sqf b/addons/zeus/XEH_preInit.sqf index 1846d0626..b47cf6628 100644 --- a/addons/zeus/XEH_preInit.sqf +++ b/addons/zeus/XEH_preInit.sqf @@ -6,6 +6,4 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; - - ADDON = true; diff --git a/addons/zeus/functions/fnc_openMedicalMenu.sqf b/addons/zeus/functions/fnc_openMedicalMenu.sqf index 80f25ba01..bd95371e7 100644 --- a/addons/zeus/functions/fnc_openMedicalMenu.sqf +++ b/addons/zeus/functions/fnc_openMedicalMenu.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGi * Initalizes the "Open Unit medical menu" Zeus module. @@ -33,4 +33,4 @@ if ((_mouseOver select 0) != "OBJECT") then { }; }; -deleteVehicle _logic; \ No newline at end of file +deleteVehicle _logic; diff --git a/addons/zeus/functions/fnc_showMessage.sqf b/addons/zeus/functions/fnc_showMessage.sqf index 563841af2..2df064098 100644 --- a/addons/zeus/functions/fnc_showMessage.sqf +++ b/addons/zeus/functions/fnc_showMessage.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: 654wak654 * Shows a Zeus message through the BIS function, handles localization. diff --git a/addons/zeus/functions/fnc_toggleAIDeathModule.sqf b/addons/zeus/functions/fnc_toggleAIDeathModule.sqf index d7cd6a4c6..99bd96870 100644 --- a/addons/zeus/functions/fnc_toggleAIDeathModule.sqf +++ b/addons/zeus/functions/fnc_toggleAIDeathModule.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: Blue * Toggle whether AI unit can die instantly from fatal injury @@ -39,7 +39,7 @@ if ((_mouseOver select 0) != "OBJECT") then { } else { [LSTRING(toggleAIDeath_Module_Toggled), ACELSTRING(Common,Disabled)] call FUNC(showMessage); }; - + _unit setVariable [QEGVAR(misc,PreventInstantAIDeath), !_enabled, true]; } else { [LSTRING(OnlyAI)] call FUNC(showMessage); diff --git a/addons/zeus/functions/fnc_ui_changeBloodType.sqf b/addons/zeus/functions/fnc_ui_changeBloodType.sqf index 292580dc9..ddf6b71d2 100644 --- a/addons/zeus/functions/fnc_ui_changeBloodType.sqf +++ b/addons/zeus/functions/fnc_ui_changeBloodType.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGi * Initalizes the "Manage Airways" Zeus module. @@ -15,7 +15,7 @@ * Public: No */ -params ["_control"]; +params ["_control"]; private _display = ctrlParent _control; private _ctrlButtonOK = _display displayCtrl 1; @@ -71,7 +71,7 @@ _slider ctrlAddEventHandler ["SliderPosChanged", _fnc_sliderMove]; private _playerBloodyType = _unit getVariable [QEGVAR(circulation,bloodtype), "O_N"]; private _playerBloodyTypeIndex = ["O","O_N","A","A_N","B","B_N","AB","AB_N"] find _playerBloodyType; -private _select = switch (_playerBloodyType) do +private _select = switch (_playerBloodyType) do { case "O+": {0}; case "O-": {1}; diff --git a/addons/zeus/functions/fnc_ui_changeCardiacState.sqf b/addons/zeus/functions/fnc_ui_changeCardiacState.sqf index da01feba6..dedee734c 100644 --- a/addons/zeus/functions/fnc_ui_changeCardiacState.sqf +++ b/addons/zeus/functions/fnc_ui_changeCardiacState.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGi, Blue * Initalizes the "Change Cardiac State" Zeus module. @@ -15,7 +15,7 @@ * Public: No */ -params ["_control"]; +params ["_control"]; private _display = ctrlParent _control; private _ctrlButtonOK = _display displayCtrl 1; diff --git a/addons/zeus/functions/fnc_ui_manageAirway.sqf b/addons/zeus/functions/fnc_ui_manageAirway.sqf index ee18c3a63..52f667316 100644 --- a/addons/zeus/functions/fnc_ui_manageAirway.sqf +++ b/addons/zeus/functions/fnc_ui_manageAirway.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: DiGi * Initalizes the "Manage Airways" Zeus module. @@ -15,7 +15,7 @@ * Public: No */ -params ["_control"]; +params ["_control"]; private _display = ctrlParent _control; private _ctrlButtonOK = _display displayCtrl 1; @@ -117,9 +117,9 @@ private _fnc_onConfirm = { private _pneumothorax = round(sliderPosition (_display displayCtrl 16105)); _unit setVariable [QEGVAR(breathing,pneumothorax), _pneumothorax, true]; - _unit setVariable [QEGVAR(breathing,airwayStatus), round(sliderPosition (_display displayCtrl 16106)), true]; + _unit setVariable [QEGVAR(breathing,airwayStatus), round(sliderPosition (_display displayCtrl 16106)), true]; - if(_curSpO2Val isEqualTo 100) then { + if(_curSpO2Val isEqualTo 100) then { [_unit] call EFUNC(breathing,handleBreathing); }; diff --git a/addons/zeus/functions/fnc_zeusAttributes.sqf b/addons/zeus/functions/fnc_zeusAttributes.sqf index c09d01447..5f6b9e6c0 100644 --- a/addons/zeus/functions/fnc_zeusAttributes.sqf +++ b/addons/zeus/functions/fnc_zeusAttributes.sqf @@ -1,4 +1,4 @@ -#include "script_component.hpp" +#include "..\script_component.hpp" /* * Author: PabstMirror * Dummy function to include BIS script file. diff --git a/addons/zeus/functions/script_component.hpp b/addons/zeus/functions/script_component.hpp deleted file mode 100644 index 7287aa356..000000000 --- a/addons/zeus/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\x\kat\addons\zeus\script_component.hpp" diff --git a/addons/zeus/script_component.hpp b/addons/zeus/script_component.hpp index 511d4dcc7..7102ee07f 100644 --- a/addons/zeus/script_component.hpp +++ b/addons/zeus/script_component.hpp @@ -23,52 +23,3 @@ #define H_PART(num) (num * (SIZEY / 25)) #define X_PART(num) (W_PART(num) + (safeZoneX + (safeZoneW - SIZEX) / 2)) #define Y_PART(num) (H_PART(num) + (safeZoneY + (safeZoneH - SIZEY) / 2)) - -#define IDC_BODY_GROUP 6000 -#define IDC_BODY_HEAD 6005 -#define IDC_BODY_TORSO 6010 -#define IDC_BODY_ARMLEFT 6015 -#define IDC_BODY_ARMRIGHT 6020 -#define IDC_BODY_LEGLEFT 6025 -#define IDC_BODY_LEGRIGHT 6030 -#define IDC_BODY_ARMLEFT_T 6035 -#define IDC_BODY_ARMRIGHT_T 6040 -#define IDC_BODY_LEGLEFT_T 6045 -#define IDC_BODY_LEGRIGHT_T 6050 -#define IDC_BODY_ARMLEFT_B 6055 -#define IDC_BODY_ARMRIGHT_B 6060 -#define IDC_BODY_LEGLEFT_B 6065 -#define IDC_BODY_LEGRIGHT_B 6070 - -#define IDC_TRIAGE_STATUS 7000 -#define IDC_TRIAGE_SELECT 7100 - -#define IDD_MEDICAL_MENU 38580 - -#define IDC_TITLE 1200 -#define IDC_TRIAGE 1300 -#define IDC_EXAMINE 1310 -#define IDC_BANDAGE 1320 -#define IDC_MEDICATION 1330 -#define IDC_AIRWAY 1340 -#define IDC_ADVANCED 1350 -#define IDC_DRAG 1360 -#define IDC_TOGGLE 1370 -#define IDC_SURGERY 1380 - -#define IDC_TRIAGE_CARD 1400 -#define IDC_INJURIES 1410 -#define IDC_ACTIVITY 1420 -#define IDC_QUICKVIEW 1430 - -#define IDC_ACTION_1 1500 -#define IDC_ACTION_2 1510 -#define IDC_ACTION_3 1520 -#define IDC_ACTION_4 1530 -#define IDC_ACTION_5 1540 -#define IDC_ACTION_6 1550 -#define IDC_ACTION_7 1560 -#define IDC_ACTION_8 1570 -#define IDC_ACTION_9 1580 -#define IDC_ACTION_10 1590 -#define IDC_ACTION_11 1600 diff --git a/addons/zeus/ui/RscAttributes.hpp b/addons/zeus/ui/RscAttributes.hpp index d0f97c229..ff117732e 100644 --- a/addons/zeus/ui/RscAttributes.hpp +++ b/addons/zeus/ui/RscAttributes.hpp @@ -26,8 +26,8 @@ class RscDisplayAttributes { class GVAR(RscChangeBloodType): RscDisplayAttributes { - onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscChangeBloodType))] call FUNC(zeusAttributes)); - onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscChangeBloodType))] call FUNC(zeusAttributes)); + onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscChangeBloodType))] call FUNC(zeusAttributes)); + onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscChangeBloodType))] call FUNC(zeusAttributes)); class Controls: Controls { class Background: Background {}; class Title: Title {}; @@ -111,8 +111,8 @@ class GVAR(RscChangeBloodType): RscDisplayAttributes { class GVAR(RscManageAirway): RscDisplayAttributes { - onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscManageAirway))] call FUNC(zeusAttributes)); - onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscManageAirway))] call FUNC(zeusAttributes)); + onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscManageAirway))] call FUNC(zeusAttributes)); + onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscManageAirway))] call FUNC(zeusAttributes)); class Controls: Controls { class Background: Background {}; class Title: Title {}; @@ -210,8 +210,8 @@ class GVAR(RscManageAirway): RscDisplayAttributes { class GVAR(RscCardiacStateModule): RscDisplayAttributes { - onLoad = QUOTE([ARR_3('onLoad', _this, QQGVAR(RscCardiacStateModule))] call FUNC(zeusAttributes)); - onUnload = QUOTE([ARR_3('onUnload', _this, QQGVAR(RscCardiacStateModule))] call FUNC(zeusAttributes)); + onLoad = QUOTE([ARR_3('onLoad',_this,QQGVAR(RscCardiacStateModule))] call FUNC(zeusAttributes)); + onUnload = QUOTE([ARR_3('onUnload',_this,QQGVAR(RscCardiacStateModule))] call FUNC(zeusAttributes)); class Controls: Controls { class Background: Background {}; class Title: Title {}; diff --git a/include/a3/ui_f_curator/UI/Displays/RscDisplayAttributes.sqf b/include/a3/ui_f_curator/UI/Displays/RscDisplayAttributes.sqf index 1bdae769f..806e46226 100644 --- a/include/a3/ui_f_curator/UI/Displays/RscDisplayAttributes.sqf +++ b/include/a3/ui_f_curator/UI/Displays/RscDisplayAttributes.sqf @@ -137,4 +137,4 @@ switch _mode do { case "onUnload": { }; -}; \ No newline at end of file +}; diff --git a/include/z/ace/addons/medical_engine/$PBOPREFIX$ b/include/z/ace/addons/medical_engine/$PBOPREFIX$ new file mode 100644 index 000000000..6dc35db6f --- /dev/null +++ b/include/z/ace/addons/medical_engine/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\medical_engine