Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some moved funcs/strings

Browse Source
This commit is contained in:
PabstMirror 2016-09-29 15:08:36 -05:00
parent 03e24d8fd9
commit 60a7490b7e
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hitreactions/functions/fnc_fallDown.sqf
View File

@ -31,8 +31,8 @@ if (_unit == ACE_player) then {
}; };
// play scream sound // play scream sound
if (!isNil QEFUNC(medical,playInjuredSound)) then { if (!isNil QEFUNC(medical_engine,playInjuredSound)) then {
[_unit] call EFUNC(medical,playInjuredSound); [_unit] call EFUNC(medical_engine,playInjuredSound);
}; };
private _vehicle = vehicle _unit; private _vehicle = vehicle _unit;

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

@ -181,7 +181,7 @@ if (_show) then {
_logCtrl lbAdd format["%1 %2", _moment, _message]; _logCtrl lbAdd format["%1 %2", _moment, _message];
} foreach _logs; } foreach _logs;
private _triageStatus = [_target] call FUNC(getTriageStatus); private _triageStatus = [_target] call EFUNC(medical_treatment,getTriageStatus);
(_display displayCtrl 303) ctrlSetText (_triageStatus select 0); (_display displayCtrl 303) ctrlSetText (_triageStatus select 0);
(_display displayCtrl 303) ctrlSetBackgroundColor (_triageStatus select 2); (_display displayCtrl 303) ctrlSetBackgroundColor (_triageStatus select 2);

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

@ -22,5 +22,5 @@ systemChat format["handling state default for unit: %1", _this];
private _pain = _unit getVariable [QGVAR(pain), 0]; private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then { if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call FUNC(playInjuredSound); [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
}; };

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

@ -20,5 +20,5 @@ if (!local _unit) exitWith {
private _pain = _unit getVariable [QGVAR(pain), 0]; private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then { if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call FUNC(playInjuredSound); [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
}; };

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

@ -51,5 +51,5 @@ if (GVAR(level) >= 2) then {
private _pain = _unit getVariable [QGVAR(pain), 0]; private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then { if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call FUNC(playInjuredSound); [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
}; };

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

@ -20,5 +20,5 @@ if (!local _unit) exitWith {
private _pain = _unit getVariable [QGVAR(pain), 0]; private _pain = _unit getVariable [QGVAR(pain), 0];
if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then { if (_pain > (_unit getVariable [QGVAR(painSuppress), 0])) then {
[_unit, _pain] call FUNC(playInjuredSound); [_unit, _pain] call EFUNC(medical_engine,playInjuredSound);
}; };

2
addons/medical_ai/functions/fnc_healSelf.sqf
View File

@ -33,7 +33,7 @@ switch (true) do {
}; };
} forEach _openWounds; } forEach _openWounds;
private _selection = ["head","body","hand_l","hand_r","leg_l","leg_r"] select _partIndex; private _selection = ["head","body","hand_l","hand_r","leg_l","leg_r"] select _partIndex;
[_this, "Bandage", _selection] call EFUNC(medical,treatmentAdvanced_bandageLocal); [_this, "Bandage", _selection] call EFUNC(medical_treatment,treatmentAdvanced_bandageLocal);
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat format ["%1 is bandaging selection %2", _this, _selection]; systemChat format ["%1 is bandaging selection %2", _this, _selection];

2
addons/medical_ai/functions/fnc_healUnit.sqf
View File

@ -62,7 +62,7 @@ switch (true) do {
}; };
} forEach _openWounds; } forEach _openWounds;
private _selection = ["head","body","hand_l","hand_r","leg_l","leg_r"] select _partIndex; private _selection = ["head","body","hand_l","hand_r","leg_l","leg_r"] select _partIndex;
[_target, "Bandage", _selection] call EFUNC(medical,treatmentAdvanced_bandageLocal); [_target, "Bandage", _selection] call EFUNC(medical_treatment,treatmentAdvanced_bandageLocal);
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL
systemChat format ["%1 is bandaging selection %2 on %3", _this, _selection, _target]; systemChat format ["%1 is bandaging selection %2 on %3", _this, _selection, _target];

2
addons/medical_menu/CfgVehicles.hpp
View File

@ -48,7 +48,7 @@ class CfgVehicles {
displayName = ECSTRING(medical,Actions_Medical); displayName = ECSTRING(medical,Actions_Medical);
runOnHover = 1; runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical_treatment,displayPatientInformation));
condition = "true"; condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa); icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
#include "InteractionBodyParts.hpp" #include "InteractionBodyParts.hpp"

12
addons/medical_menu/InteractionBodyParts.hpp
View File

@ -2,7 +2,7 @@ class ACE_Head {
displayName = ECSTRING(interaction,Head); displayName = ECSTRING(interaction,Head);
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa); icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 0)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,0,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction)); modifierFunction = QUOTE([ARR_4(_target,_player,0,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true"; condition = "true";
runOnHover = 1; runOnHover = 1;
@ -13,7 +13,7 @@ class ACE_Torso {
condition = "true"; condition = "true";
runOnHover = 1; runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 1)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 1)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,1,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction)); modifierFunction = QUOTE([ARR_4(_target,_player,1,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
showDisabled = 1; showDisabled = 1;
priority = 2; priority = 2;
@ -23,7 +23,7 @@ class ACE_ArmLeft {
displayName = ECSTRING(interaction,ArmLeft); displayName = ECSTRING(interaction,ArmLeft);
runOnHover = 1; runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 2)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 2)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,2,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction)); modifierFunction = QUOTE([ARR_4(_target,_player,2,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true"; condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa); icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
@ -32,7 +32,7 @@ class ACE_ArmRight {
displayName = ECSTRING(interaction,ArmRight); displayName = ECSTRING(interaction,ArmRight);
runOnHover = 1; runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 3)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 3)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,3,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction)); modifierFunction = QUOTE([ARR_4(_target,_player,3,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true"; condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa); icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
@ -41,7 +41,7 @@ class ACE_LegLeft {
displayName = ECSTRING(interaction,LegLeft); displayName = ECSTRING(interaction,LegLeft);
runOnHover = 1; runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 4)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 4)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,4,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction)); modifierFunction = QUOTE([ARR_4(_target,_player,4,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true"; condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa); icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);
@ -50,7 +50,7 @@ class ACE_LegRight {
displayName = ECSTRING(interaction,LegRight); displayName = ECSTRING(interaction,LegRight);
runOnHover = 1; runOnHover = 1;
exceptions[] = {"isNotInside", "isNotSitting"}; exceptions[] = {"isNotInside", "isNotSitting"};
statement = QUOTE([ARR_3(_target, true, 5)] call EFUNC(medical,displayPatientInformation)); statement = QUOTE([ARR_3(_target, true, 5)] call EFUNC(medical_treatment,displayPatientInformation));
modifierFunction = QUOTE([ARR_4(_target,_player,5,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction)); modifierFunction = QUOTE([ARR_4(_target,_player,5,_this select 3)] call EFUNC(medical_treatment,modifyMedicalAction));
condition = "true"; condition = "true";
icon = QPATHTOEF(medical,UI\icons\medical_cross.paa); icon = QPATHTOEF(medical,UI\icons\medical_cross.paa);

4
addons/medical_treatment/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
View File

@ -65,6 +65,6 @@ if (alive _target) exitWith {
// Resetting damage // Resetting damage
_target setDamage 0; _target setDamage 0;
[_target, "activity", LSTRING(Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); [_target, "activity", ELSTRING(medical,Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog);
[_target, "activity_view", LSTRING(Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); // TODO expand message [_target, "activity_view", ELSTRING(medical,Activity_fullHeal), [[_caller, false, true] call EFUNC(common,getName)]] call FUNC(addToLog); // TODO expand message
}; };