Allow climbing out of water

Author: SceptreOfficial

addons/main/functions/fnc_canClimb.sqf

@@ -24,6 +24,13 @@ private _dir = vectorDirVisual _unit;
 // offset pos to line up with view
 _pos = _pos vectorAdd (([_dir] matrixMultiply GVAR(rotVect90) select 0) vectorMultiply 0.1);
 
+if (animationState _unit select [1,3] in ["sdv","ssw","dve","swm"]) then {
+	_pos = _pos vectorAdd [0,0,0.5];
+	_unit setVariable [QGVAR(swimFix),animationState _unit];
+} else {
+	_unit setVariable [QGVAR(swimFix),nil];
+};
+
 private _animPosASL = +_pos;
 private _height = 0;
 private _targetHeight = 0;

addons/main/functions/fnc_startClimbing.sqf

@@ -75,6 +75,11 @@ private _animDoneEHID = [_unit,"AnimDone",{
 		_unit setPosASL _targetPosASL;
 		ANIM_SPEED_COEF_END(_unit);
 
+		if (_unit getVariable [QGVAR(swimFix),""] isNotEqualTo "") then {
+			_unit switchMove (_unit getVariable QGVAR(swimFix));
+			_unit setVariable [QGVAR(swimFix),nil];
+		};
+
 		// CBA event
 		[QGVAR(climbingEnd),[_unit,_actionAnim,true]] call CBA_fnc_localEvent;
 	};

addons/main/script_macros.hpp

@@ -15,7 +15,7 @@
 	!alive _unit || \
 	{!(_unit in _unit)} || \
 	{stance _unit == "PRONE"} || \
-	{animationState _unit select [1,3] in ["bdv","bsw","dve","sdv","ssw","swm","inv"]} || \
+	{animationState _unit select [1,3] in ["bdv","bsw","inv"]} || \
 	{GVAR(actionExitConditions) findIf {_unit call _x} != -1} || \
 	{_unit getVariable [QGVAR(isAssisting),false]}