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

Glasses (Goggles) save / load fix

Browse Source
This commit is contained in:
He-Man 2019-08-15 21:37:40 +02:00
parent 2aeef8fa13
commit 5dad45c059
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/epoch_code/System/player_login.fsm
View File

@ -602,6 +602,7 @@ class FSM
itemno = 27; itemno = 27;
init = /*%FSM<STATEINIT""">*/"_ply = player;" \n init = /*%FSM<STATEINIT""">*/"_ply = player;" \n
"_group = group player;" \n "_group = group player;" \n
"_goggles = goggles _playerObject;" \n
"" \n "" \n
"selectPlayer _playerObject;" \n "selectPlayer _playerObject;" \n
"" \n "" \n
@ -896,7 +897,12 @@ class FSM
{ {
name = "Setup_EH_s_and_H"; name = "Setup_EH_s_and_H";
itemno = 50; itemno = 50;
init = /*%FSM<STATEINIT""">*/"{" \n init = /*%FSM<STATEINIT""">*/"" \n
"if (!_newChar || !(_goggles isEqualTo """")) then {" \n
" removeGoggles player;" \n
" player addGoggles _goggles" \n
"};" \n
"{" \n
" player addEventHandler [_x,([""CfgEpochClient"", _x, """"] call EPOCH_fnc_returnConfigEntryV2)];" \n " player addEventHandler [_x,([""CfgEpochClient"", _x, """"] call EPOCH_fnc_returnConfigEntryV2)];" \n
"} forEach ([""CfgEpochClient"", ""addEventHandler"", []] call EPOCH_fnc_returnConfigEntryV2);" \n "} forEach ([""CfgEpochClient"", ""addEventHandler"", []] call EPOCH_fnc_returnConfigEntryV2);" \n
"" \n "" \n

5
Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf
View File

@ -46,6 +46,8 @@ if !(alive player && alive _playerObject && !isPlayer _playerObject) then {
// wait for loadAbs to sync // wait for loadAbs to sync
waitUntil {_loadAbs isEqualTo (loadAbs _playerObject)}; waitUntil {_loadAbs isEqualTo (loadAbs _playerObject)};
_goggles = goggles _playerObject;
// switch to new playerObject // switch to new playerObject
selectPlayer _playerObject; selectPlayer _playerObject;
@ -77,6 +79,9 @@ if !(alive player && alive _playerObject && !isPlayer _playerObject) then {
closeDialog 0; closeDialog 0;
("BIS_fnc_respawnCounter" call BIS_fnc_rscLayer) cutText ["","PLAIN"]; ("BIS_fnc_respawnCounter" call BIS_fnc_rscLayer) cutText ["","PLAIN"];
removeGoggles player;
player addGoggles _goggles;
{ {
player removeEventHandler [_x, 0]; player removeEventHandler [_x, 0];
player addEventHandler [_x,(["CfgEpochClient", _x, ""] call EPOCH_fnc_returnConfigEntryV2)]; player addEventHandler [_x,(["CfgEpochClient", _x, ""] call EPOCH_fnc_returnConfigEntryV2)];