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

Merge pull request #1411 from hogscraper/test_branch

Browse Source 
Additional update to UI
This commit is contained in:
vbawol
2014-07-11 14:28:14 -05:00
parent 83ec44e402 572b646107
commit 07b3f14c1b
2 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
SQF/dayz_code/compile/player_updateGui.sqf
View File

@@ -87,32 +87,49 @@ if (!canStand player) then {
/*
Flashing:
*/
if (_combatVal == 1) then {
_ctrlCombat call player_guiControlFlash;
_ctrl_Array=[];
if (_combatVal > 0) then {
_ctrl_Array=_ctrl_Array + [_ctrlCombat];
}else {
_ctrlCombat ctrlShow true;
};
if (_bloodVal < 0.2) then {
_ctrlBlood call player_guiControlFlash;
if (_bloodVal < 0.4) then {
_ctrl_Array=_ctrl_Array + [_ctrlBlood];
}else {
_ctrlBlood ctrlShow true;
};
if (_thirstVal > 0.8) then {
_ctrlThirst call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlThirst];
}else {
_ctrlThirst ctrlShow true;
};
if (_foodVal > 0.8) then {
_ctrlFood call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlFood];
}else {
_ctrlFood ctrlShow true;
};
if (_tempVal < 0.2) then { //TeeChange
_ctrlTemp call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlTemp];
} else {
_ctrlTemp ctrlShow true;
};
if (r_player_injured) then {
_ctrlBleed call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlBleed];
}else {
_ctrlBleed ctrlShow false;
};
if((count _ctrl_Array) > 0) then
{
_ctrl_Array call player_guiControlFlash;
};
}
@@ -226,30 +243,48 @@ if (!canStand player) then {
/*
Flashing:
*/
_ctrl_Array=[];
if (_combatVal == 0) then {
_ctrlCombat call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlCombat];
}else {
_ctrlCombat ctrlShow true;
};
if (_bloodVal < 0.2) then {
_ctrlBlood call player_guiControlFlash;
if (_bloodVal < 0.4) then {
_ctrl_Array=_ctrl_Array + [_ctrlBlood];
}else {
_ctrlBlood ctrlShow true;
};
if (_thirstVal < 0.2) then {
_ctrlThirst call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlThirst];
}else {
_ctrlThirst ctrlShow true;
};
if (_foodVal < 0.2) then {
_ctrlFood call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlFood];
}else {
_ctrlFood ctrlShow true;
};
if (_tempVal > 0.8) then { //TeeChange
_ctrlTemp call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlTemp];
} else {
_ctrlTemp ctrlShow true;
};
if (r_player_injured) then {
_ctrlBleed call player_guiControlFlash;
_ctrl_Array=_ctrl_Array + [_ctrlBleed];
}else {
_ctrlBleed ctrlShow false;
};
if((count _ctrl_Array) > 0) then
{
_ctrl_Array call player_guiControlFlash;
};

18
SQF/dayz_code/init/compiles.sqf
View File

@@ -285,15 +285,15 @@ if (!isDedicated) then {
};
};
player_guiControlFlash = {
private["_control"];
_control = _this;
if (ctrlShown _control) then {
_control ctrlShow false;
} else {
_control ctrlShow true;
};
};
player_guiControlFlash = {
private["_control"];
_control = _this;
if (ctrlShown (_control select 0)) then {
{_x ctrlShow false} foreach _control;
} else {
{_x ctrlShow true} foreach _control;
};
};
gearDialog_create = {
private ["_i","_dialog"];