diff --git a/addons/gui/UI/RscTitles.hpp b/addons/gui/UI/RscTitles.hpp index 93f422bc9f..02e68e8d32 100644 --- a/addons/gui/UI/RscTitles.hpp +++ b/addons/gui/UI/RscTitles.hpp @@ -176,76 +176,4 @@ class RscTitles { }; }; - class GVAR(ScreenEffectsBlack) { - duration = 10e10; - idd = 1111; - movingenable = 0; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBlack))), _this select 0)]); - - class controlsBackground { - class blackScreen: ACE_gui_backgroundBase { - text = QUOTE(PATHTOF(data\black_out.paa)); - colorText[] = {0.0, 0.0, 0.0, 0.0}; - idc = 11112; - x = safezoneX; - y = safezoneY; - w = safezoneW; - h = safezoneH; - }; - }; - }; - class GVAR(ScreenEffectsBleeding) { - duration = 1; - idd = 1111; - movingenable = 0; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBleeding))), _this select 0)]); - - class controlsBackground { - class bleedingScreen: ACE_gui_backgroundBase { - text = QUOTE(PATHTOF(data\bleeding.paa)); - colorText[] = {0.9, 0.2, 0.2, 0.6}; - idc = 11113; - x = safezoneX; - y = safezoneY; - w = safezoneW; - h = safezoneH; - }; - }; - }; - class GVAR(ScreenEffectsHit) { - duration = 1.1; - idd = 1111; - movingenable = 0; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsHit))), _this select 0)]); - - class controlsBackground { - class effectHit: ACE_gui_backgroundBase { - text = QUOTE(PATHTOF(data\hit.paa)); - colorText[] = {0.7, 0.2, 0.2, 0.4}; - idc = 11113; - x = safezoneX; - y = safezoneY; - w = safezoneW; - h = safezoneH; - }; - }; - }; - class GVAR(ScreenEffectsPain) { - duration = 1; - idd = 1111; - movingenable = 0; - onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsPain))), _this select 0)]); - - class controlsBackground { - class painScreen: ACE_gui_backgroundBase { - text = QUOTE(PATHTOF(data\painScreen.paa)); - colorText[] = {1, 1, 1, 0.5}; - idc = 11115; - x = safezoneX; - y = safezoneY; - w = safezoneW; - h = safezoneH; - }; - }; - }; }; \ No newline at end of file diff --git a/addons/gui/XEH_preInit.sqf b/addons/gui/XEH_preInit.sqf index b3de51cd9b..9c2bcf0909 100644 --- a/addons/gui/XEH_preInit.sqf +++ b/addons/gui/XEH_preInit.sqf @@ -17,9 +17,6 @@ PREP(displayInformation); PREP(displayMessage); PREP(blurScreen); PREP(displayIcon); -PREP(effectPain); -PREP(effectBleeding); -PREP(effectBlackOut); PREP(sendHintTo); PREP(sendMessageTo); PREP(sendDisplayInformationTo); diff --git a/addons/medical/XEH_preInit.sqf b/addons/medical/XEH_preInit.sqf index 1c81d6de96..390ea920f0 100644 --- a/addons/medical/XEH_preInit.sqf +++ b/addons/medical/XEH_preInit.sqf @@ -37,6 +37,10 @@ PREP(determineIfFatal); PREP(determineIfUnconscious); PREP(fromNumberToBodyPart); +PREP(effectPain); +PREP(effectBleeding); +PREP(effectBlackOut); + PREP(getActivityLog); PREP(getBloodLoss); PREP(getBloodPressure); diff --git a/addons/gui/data/bleeding.paa b/addons/medical/data/bleeding.paa similarity index 100% rename from addons/gui/data/bleeding.paa rename to addons/medical/data/bleeding.paa diff --git a/addons/gui/data/hit.paa b/addons/medical/data/hit.paa similarity index 100% rename from addons/gui/data/hit.paa rename to addons/medical/data/hit.paa diff --git a/addons/gui/data/painScreen.paa b/addons/medical/data/painScreen.paa similarity index 100% rename from addons/gui/data/painScreen.paa rename to addons/medical/data/painScreen.paa diff --git a/addons/gui/functions/fnc_effectBlackOut.sqf b/addons/medical/functions/fnc_effectBlackOut.sqf similarity index 100% rename from addons/gui/functions/fnc_effectBlackOut.sqf rename to addons/medical/functions/fnc_effectBlackOut.sqf diff --git a/addons/gui/functions/fnc_effectBleeding.sqf b/addons/medical/functions/fnc_effectBleeding.sqf similarity index 100% rename from addons/gui/functions/fnc_effectBleeding.sqf rename to addons/medical/functions/fnc_effectBleeding.sqf diff --git a/addons/gui/functions/fnc_effectPain.sqf b/addons/medical/functions/fnc_effectPain.sqf similarity index 100% rename from addons/gui/functions/fnc_effectPain.sqf rename to addons/medical/functions/fnc_effectPain.sqf diff --git a/addons/medical/functions/fnc_handleDisplayEffects.sqf b/addons/medical/functions/fnc_handleDisplayEffects.sqf index a6fcaa1771..b640532cac 100644 --- a/addons/medical/functions/fnc_handleDisplayEffects.sqf +++ b/addons/medical/functions/fnc_handleDisplayEffects.sqf @@ -11,7 +11,7 @@ #include "script_component.hpp" if (!hasInterface) exitwith{}; -45 cutRsc [QEGVAR(gui,ScreenEffectsBlack),"PLAIN"]; +45 cutRsc [QGVAR(ScreenEffectsBlack),"PLAIN"]; FUNC(hb_effect) = { _heartRate = _this select 0; @@ -56,11 +56,11 @@ GVAR(BloodLevel_CC) ppEffectCommit 0; if ([_unit] call EFUNC(common,isAwake) && false) then { _bloodLoss = _unit call FUNC(getBloodLoss); if (_bloodLoss >0) then { - [_bloodLoss] call EFUNC(gui,effectBleeding); + [_bloodLoss] call FUNC(effectBleeding); }; [{ - [((_this select 0) getvariable[QGVAR(amountOfPain), 0])] call EFUNC(gui,effectPain); + [((_this select 0) getvariable[QGVAR(amountOfPain), 0])] call FUNC(effectPain); }, [_unit], 0.25, 0.25] call EFUNC(common,waitAndExecute); [(_unit getvariable[QGVAR(heartRate), 70])] call FUNC(hb_effect); diff --git a/addons/medical/functions/fnc_handleReactionHit.sqf b/addons/medical/functions/fnc_handleReactionHit.sqf index 7f10a64620..2128fa65c6 100644 --- a/addons/medical/functions/fnc_handleReactionHit.sqf +++ b/addons/medical/functions/fnc_handleReactionHit.sqf @@ -39,13 +39,13 @@ if (_amountOfDamage > 0.2) then { }; }; if (isPlayer _unit) then { - 76 cutRsc [QEGVAR(gui,ScreenEffectsHit),"PLAIN"]; + 76 cutRsc [QGVAR(ScreenEffectsHit),"PLAIN"]; addCamShake [3, 5, _amountOfDamage + random 10]; }; } else { if (_amountOfDamage > 0) then { if (isPlayer _unit) then { - 76 cutRsc [QEGVAR(gui,ScreenEffectsHit),"PLAIN"]; + 76 cutRsc [QGVAR(ScreenEffectsHit),"PLAIN"]; }; }; }; \ No newline at end of file diff --git a/addons/medical/ui/RscTitles.hpp b/addons/medical/ui/RscTitles.hpp new file mode 100644 index 0000000000..524a1c0ad3 --- /dev/null +++ b/addons/medical/ui/RscTitles.hpp @@ -0,0 +1,74 @@ +class Rsctitles { + class GVAR(ScreenEffectsBlack) { + duration = 10e10; + idd = 1111; + movingenable = 0; + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBlack))), _this select 0)]); + + class controlsBackground { + class blackScreen: ACE_gui_backgroundBase { + text = QUOTE(PATHTOF(data\black_out.paa)); + colorText[] = {0.0, 0.0, 0.0, 0.0}; + idc = 11112; + x = safezoneX; + y = safezoneY; + w = safezoneW; + h = safezoneH; + }; + }; + }; + class GVAR(ScreenEffectsBleeding) { + duration = 1; + idd = 1111; + movingenable = 0; + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsBleeding))), _this select 0)]); + + class controlsBackground { + class bleedingScreen: ACE_gui_backgroundBase { + text = QUOTE(PATHTOF(data\bleeding.paa)); + colorText[] = {0.9, 0.2, 0.2, 0.6}; + idc = 11113; + x = safezoneX; + y = safezoneY; + w = safezoneW; + h = safezoneH; + }; + }; + }; + class GVAR(ScreenEffectsHit) { + duration = 1.1; + idd = 1111; + movingenable = 0; + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsHit))), _this select 0)]); + + class controlsBackground { + class effectHit: ACE_gui_backgroundBase { + text = QUOTE(PATHTOF(data\hit.paa)); + colorText[] = {0.7, 0.2, 0.2, 0.4}; + idc = 11113; + x = safezoneX; + y = safezoneY; + w = safezoneW; + h = safezoneH; + }; + }; + }; + class GVAR(ScreenEffectsPain) { + duration = 1; + idd = 1111; + movingenable = 0; + onLoad = QUOTE(uiNamespace setVariable [ARR_2(QUOTE(QUOTE(GVAR(ScreenEffectsPain))), _this select 0)]); + + class controlsBackground { + class painScreen: ACE_gui_backgroundBase { + text = QUOTE(PATHTOF(data\painScreen.paa)); + colorText[] = {1, 1, 1, 0.5}; + idc = 11115; + x = safezoneX; + y = safezoneY; + w = safezoneW; + h = safezoneH; + }; + }; + }; +}; \ No newline at end of file