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

Pointless merge conflict

Browse Source
This commit is contained in:
icomrade
2016-03-04 15:23:22 -05:00
parent fbedaf9b8d
commit 9863c0765a
1 changed files with 0 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
SQF/dayz_code/compile/fn_unconscious.sqf
View File

@@ -14,7 +14,6 @@ r_player_unconsciousInProgress = true;
default { 0 }; // bare hands / flare
}
};
<<<<<<< HEAD
_sprint = if (count _anim <= 10) then { false } else { _anim select 10 in [112, 118] };
_stance = if (count _anim <= 5) then { 2 } else {
switch (_anim select 5) do {
@@ -22,42 +21,6 @@ r_player_unconsciousInProgress = true;
case 112 : { 0 }; // prone
default { 2 }; // erected
}
=======
"dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [2]; "dynamicBlur" ppEffectCommit 0;
"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 0.1], [1, 1, 1, 0.0]];"colorCorrections" ppEffectCommit 0;
0 fadeSound 0.05;
disableUserInput true;
_disableHdlr = [] spawn { uiSleep 2; disableUserInput true; r_player_unconsciousInputDisabled = true; };
autoRunActive = 0;
while {r_player_unconscious} do {
_ctrl1 ctrlSetPosition [(_ctrl1Pos select 0),(_ctrl1Pos select 1),(_ctrl1Pos select 2),((0.136829 * safezoneH) * (1 -(r_player_timeout / _totalTimeout)))];
_ctrl1 ctrlCommit 1;
playSound "heartbeat_1";
uiSleep 1;
_bloodLow = ((r_player_blood/r_player_bloodTotal) < 0.5);
if(_timeout == 0) then {
if (!r_player_dead && !_bloodLow && r_player_injured) then {
_timeout = 10;
};
} else {
_timeout = _timeout - 1;
};
if (r_player_timeout > 0) then {
r_player_timeout = r_player_timeout - 1;
} else {
if (!r_player_dead) then {
_nul = [] spawn fnc_usec_recoverUncons;
};
};
if (!(player getVariable ["NORRN_unconscious", true])) then {
_nul = [] spawn fnc_usec_recoverUncons;
};
if(animationState player == "AmovPpneMstpSnonWnonDnon_healed") then {
_nul = [] spawn fnc_usec_recoverUncons;
};
>>>>>>> upstream/master
};
_transmove = (switch true do {