W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed #813 and cutext confirmation fixes

Browse Source
This commit is contained in:
[VB]AWOL
2013-11-29 13:41:48 -06:00
parent 6a5c4f6b67
commit 9a1193eacc
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SQF/dayz_code/actions/player_tagFriendly.sqf
View File

@@ -3,7 +3,8 @@ _target = _this select 0;
_caller = _this select 1; _caller = _this select 1;
_action = _this select 2; _action = _this select 2;
_caller removeAction _action; call fnc_usec_medic_removeActions;
r_action = false;
_callerID = _caller getVariable "CharacterID"; _callerID = _caller getVariable "CharacterID";
_targetID = _target getVariable "CharacterID"; _targetID = _target getVariable "CharacterID";
@@ -16,8 +17,8 @@ _rfriendlies = _target getVariable ["friendlies", []];
if (!(_callerID in _rfriendlies)) then { if (!(_callerID in _rfriendlies)) then {
// caller // caller
titleText [format["You have tagged a player as friendly. Waiting for other player to accept.",(name _target)], "PLAIN DOWN"]; titleText ["You have tagged a player as friendly. Waiting for other player to accept.", "PLAIN DOWN"]; // TODO: localize
// target // target
PVDZE_plr_FriendRQ = format[(localize "str_epoch_player_2"), (name _caller)]; PVDZE_plr_FriendRQ = _target;
publicVariable "PVDZE_plr_FriendRQ"; publicVariable "PVDZE_plr_FriendRQ";
}; };

6
SQF/dayz_code/init/compiles.sqf
View File

@@ -329,6 +329,12 @@ if (!isDedicated) then {
}; };
}; };
player_tagFriendlyMsg = {
if(player == _this) then {
cutText[(localize "str_epoch_player_2"),"PLAIN DOWN"];
};
};
player_serverModelChange = { player_serverModelChange = {
private["_object","_model"]; private["_object","_model"];
_object = _this select 0; _object = _this select 0;

4
SQF/dayz_code/init/publicEH.sqf
View File

@@ -77,9 +77,9 @@ if (!isDedicated) then {
"PVDZE_plr_Morph2" addPublicVariableEventHandler {(_this select 1) call player_serverModelChange}; "PVDZE_plr_Morph2" addPublicVariableEventHandler {(_this select 1) call player_serverModelChange};
"PVDZE_plr_Morph" addPublicVariableEventHandler {(_this select 1) call server_switchPlayer}; "PVDZE_plr_Morph" addPublicVariableEventHandler {(_this select 1) call server_switchPlayer};
"PVDZE_obj_Fire" addPublicVariableEventHandler {nul=(_this select 1) spawn BIS_Effects_Burn}; "PVDZE_obj_Fire" addPublicVariableEventHandler {nul=(_this select 1) spawn BIS_Effects_Burn};
"PVDZE_plr_FriendRQ" addPublicVariableEventHandler {cutText[(_this select 1),"PLAIN DOWN"];}; "PVDZE_plr_FriendRQ" addPublicVariableEventHandler {(_this select 1) call player_tagFriendlyMsg};
"PVDZE_obj_Debris" addPublicVariableEventHandler {(_this select 1) call local_roadDebris}; // "PVDZE_obj_Debris" addPublicVariableEventHandler {(_this select 1) call local_roadDebris};
"norrnRaDrag" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\animDrag.sqf"}; "norrnRaDrag" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\animDrag.sqf"};
"norrnRnoAnim" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\noAnim.sqf"}; "norrnRnoAnim" addPublicVariableEventHandler {(_this select 1) execVM "\z\addons\dayz_code\medical\publicEH\noAnim.sqf"};