From 27f9d6af270bf9fc9d467c98c196a526a87e359e Mon Sep 17 00:00:00 2001
From: "[GNC]Lord-MDB]" <lord.mdb@gmx.net>
Date: Thu, 25 Feb 2021 20:17:10 +0100
Subject: [PATCH] Umstellung auf anderen EH
---
addons/OPT/REVIVE/fn_clientInitEH.sqf | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/addons/OPT/REVIVE/fn_clientInitEH.sqf b/addons/OPT/REVIVE/fn_clientInitEH.sqf
index b5198e3f..6261a76b 100644
--- a/addons/OPT/REVIVE/fn_clientInitEH.sqf
+++ b/addons/OPT/REVIVE/fn_clientInitEH.sqf
@@ -86,16 +86,16 @@ DFUNC(playercheckINCAPACITATED) =
if ((lifeState GVAR(playerHandleDamage_unit) isEqualTo "INCAPACITATED") and isNil "OPT_REVIVE_unconsciousHandler") then
{
OPT_REVIVE_unconsciousHandler = true;
- [GVAR(playerHandleDamage_unit), GVAR(playerHandleDamage_instigator), GVAR(playerHandleDamage_source), GVAR(playerHandleDamage_projectile)] remoteExecCall ["OPT_SHOP_fnc_writeKill", 2, false];
- if (GVAR(playerHandleDamage_unit) == GVAR(playerHandleDamage_source)) then
+ if ((GVAR(playerHandleDamage_unit) == GVAR(playerHandleDamage_source)) or (GVAR(playerHandleDamage_unit) == GVAR(playerHandleDamage_instigator)))then
{
[MLOC(KILL_MSG), MLOC(KILL_SELF)] spawn BIS_fnc_infoText;
+ [GVAR(playerHandleDamage_unit), GVAR(playerHandleDamage_instigator), GVAR(playerHandleDamage_source), GVAR(playerHandleDamage_projectile)] remoteExecCall ["OPT_SHOP_fnc_writeKill", 2, false];
}
else
- {
+ {
[MLOC(KILL_MSG), format["%1",name GVAR(playerHandleDamage_instigator)]] spawn BIS_fnc_infoText;
-
+ [GVAR(playerHandleDamage_unit), GVAR(playerHandleDamage_instigator), GVAR(playerHandleDamage_source), GVAR(playerHandleDamage_projectile)] remoteExecCall ["OPT_SHOP_fnc_writeKill", 2, false];
};
//Funktion starten wenn Spieler bewustlos ist.
@@ -106,13 +106,13 @@ DFUNC(playercheckINCAPACITATED) =
DFUNC(playerHandleDamage) =
{
- params ["_unit", "_selection", "_damage", "_source", "_projectile", "_hitIndex", "_instigator", "_hitPoint"];
+ params ["_unit", "_source", "_damage", "_instigator"];
//Var übergabe
GVAR(playerHandleDamage_unit) = _unit;
GVAR(playerHandleDamage_instigator) = _instigator;
GVAR(playerHandleDamage_source) = _source;
- GVAR(playerHandleDamage_projectile) = _projectile;
+ GVAR(playerHandleDamage_projectile) = "";
GVAR(playerHandleDamage_damage) = _damage;
// Schade hoeher eingestellen Werte Blocken um Autorespwan zu verhindern.
@@ -129,7 +129,7 @@ DFUNC(playerHandleDamage) =
[FUNC(playercheckINCAPACITATED), 1,""] call CLib_fnc_wait;
};
-player addEventHandler ["HandleDamage", FUNC(playerHandleDamage)];
+player addEventHandler ["hit", FUNC(playerHandleDamage)];
// 3D Marker
GVAR(missionEH_draw3D) = addMissionEventHandler ["Draw3D",