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

Fix swimming in ground glitch

Browse Source 
Also fixed invisible primary stance glitch when relogging with pistol
but no primary in inventory.

Fixed my mistake from:
e85f6ad1b5
This commit is contained in:
ebaydayz
2016-09-13 18:36:06 -04:00
parent e85f6ad1b5
commit e8e5d24e80
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/medical/selfbloodbag.sqf
View File

@@ -8,7 +8,7 @@ _blood = _unit getVariable ["USEC_BloodQty", 0];
_lowBlood = _unit getVariable ["USEC_lowBlood", false];
_injured = _unit getVariable ["USEC_injured", false];
_inPain = _unit getVariable ["USEC_inPain", false];
_lastused = _unit getVariable ["LastTransfusion", 0];
_lastused = _unit getVariable ["LastTransfusion",-(DZE_selfTransfuse_Values select 2)];
if (time - _lastused <= DZE_selfTransfuse_Values select 2) exitWith {localize "str_actions_medical_18" call dayz_rollingMessages;};
call gear_ui_init;
@@ -46,7 +46,7 @@ if (_haswholebag) then {
_badBag = true;
};
if (dayz_classicBloodBagSystem) then {_wholeBag = false; _badBag = false;};
if (dayz_classicBloodBagSystem) then {_wholeBag = true; _badBag = false;};
call fnc_usec_medic_removeActions;
r_action = false;

8
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -1966,10 +1966,16 @@ class FSM
"Dayz_logonTown = ""Wilderness"";" \n
"if (count _nearestCity > 0) then {Dayz_logonTown = text (_nearestCity select 0)};" \n
"" \n
"[_world,Dayz_logonTown,format[localize ""str_player_06"",dayz_Survived]] spawn {uiSleep 5; _this spawn BIS_fnc_infoText;};" \n
"[_world,Dayz_logonTown,format[localize ""str_player_06"",dayz_Survived]] spawn {" \n
" uiSleep 1;" \n
" if (dayz_isSwimming && !surfaceIsWater (getPosASL player)) then {player setPosATL [getPosATL player select 0,getPosATL player select 1,(getPosATL player select 2)+.1];}; //Fix swimming in ground glitch on some maps" \n
" uiSleep 4;" \n
" _this spawn BIS_fnc_infoText;" \n
"};" \n
"" \n
"dayz_myPosition = getPosATL player;" \n
"Dayz_loginCompleted = true;" \n
"if (primaryWeapon player == '' && dayz_myPosition select 2 < 50) then {player switchMove ''; player playActionNow 'stop';}; //Fix invisible primary stance glitch when player has pistol but no primary" \n
"" \n
"//Other Counters" \n
" dayz_currentGlobalAnimals = count entities ""CAAnimalBase"";" \n