diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index 81ccbaa94..5dea0e8e7 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -21,5 +21,6 @@ [FIXED] No damage from hitting ground after HALO jump when DZE_HaloOpenChuteHeight was set to -1. @ebayShopper [FIXED] Added back missing call to Epoch player_antiWall function for preventing base glitching. #1817 @ndavalos @ebayShopper [FIXED] HALO fresh spawns stuck in air or failing to start correctly sometimes due to player simulation disabled. #1809 @oiad @ebayShopper +[FIXED] Self actions sometimes duplicating when changing clothes and looking at a safe. [INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes. \ No newline at end of file diff --git a/SQF/dayz_code/actions/player_wearClothes.sqf b/SQF/dayz_code/actions/player_wearClothes.sqf index 1bde3b5e5..cfeeaa4d7 100644 --- a/SQF/dayz_code/actions/player_wearClothes.sqf +++ b/SQF/dayz_code/actions/player_wearClothes.sqf @@ -9,11 +9,11 @@ _item call player_wearClothes; Added Female skin changes - DayZ Epoch - vbawol */ private ["_item","_onLadder","_hasclothesitem","_config","_text","_isFemale","_myModel","_humanity","_isBandit","_isHero", -"_itemNew","_model","_skinToArray","_finalArray","_skinToModel"]; +"_itemNew","_model","_skinToArray","_finalArray","_skinToModel","_morphHandle"]; _item = _this; call gear_ui_init; -dayz_actionInProgress = false; //reset for strange glitch + _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages; dayz_actionInProgress = false;}; @@ -32,6 +32,7 @@ _humanity = player getVariable ["humanity",0]; _isBandit = _humanity < -2000; _isHero = _humanity > 5000; _itemNew = "Skin_" + _myModel; +_morphHandle = nil; if ( (isClass(_config >> _itemNew)) ) then { if ( (isClass(_config >> _item)) ) then { @@ -56,7 +57,7 @@ if ( (isClass(_config >> _itemNew)) ) then { waitUntil {getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "disableWeapons") == 0}; */ player addMagazine _itemNew; - [dayz_playerUID,dayz_characterID,_model] spawn player_humanityMorph; + _morphHandle = [dayz_playerUID,dayz_characterID,_model] spawn player_humanityMorph; }; }; @@ -65,4 +66,8 @@ if ( (isClass(_config >> _itemNew)) ) then { }; }; }; -dayz_actionInProgress = false; + +if (isNil "_morphHandle") then { + // Don't set if humanity morph is still in progress (done at bottom of humanityMorph) + dayz_actionInProgress = false; +}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_humanityMorph.sqf b/SQF/dayz_code/compile/player_humanityMorph.sqf index a2db9589b..c1fdba5f5 100644 --- a/SQF/dayz_code/compile/player_humanityMorph.sqf +++ b/SQF/dayz_code/compile/player_humanityMorph.sqf @@ -93,7 +93,8 @@ player setVariable ["DZE_display_name",_tagSetting,true]; //PVDZ_serverStoreVar = [player,"Achievements",_achievements]; //publicVariableServer "PVDZ_serverStoreVar"; -call dayz_resetSelfActions; +call dayz_resetSelfActions; //New unit has no self actions yet. Reset variables so actions can be added back. +dayz_actionInProgress = false; //Allow self actions to run now. eh_player_killed = player addeventhandler ["FiredNear",{_this call player_weaponFiredNear;}]; [player] call fnc_usec_damageHandle; player allowDamage true;