diff --git a/SQF/dayz_code/compile/ui_changeDisplay.sqf b/SQF/dayz_code/compile/ui_changeDisplay.sqf index bf36d4022..69764eb10 100644 --- a/SQF/dayz_code/compile/ui_changeDisplay.sqf +++ b/SQF/dayz_code/compile/ui_changeDisplay.sqf @@ -12,10 +12,7 @@ if !(DZE_UI == 0) then { 3 cutRsc [_ui,"PLAIN",0]; if (Z_singleCurrency) then {16 cutRsc ["ZSC_Money_Display","PLAIN"];}; call player_updateGui; - //call ui_initDisplay; // I think this function is old and no longer necessary - JasonTM. - //hintSilent ""; // not sure why this is here. } else { 3 cutRsc ["default","PLAIN",0]; if (Z_singleCurrency) then {16 cutRsc ["default","PLAIN"];}; - //hintSilent ""; // or here. }; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index b22e7494e..08391ccef 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -286,35 +286,6 @@ if (!isDedicated) then { _myExp }; - /* This function doesn't appear to be necessary. Leaving it commented out for now - JasonTM. - ui_initDisplay = { - private ["_ctrlBleed","_ctrlFracture","_display","_control"]; - disableSerialization; - _display = uiNamespace getVariable 'DAYZ_GUI_display'; - _control = _display displayCtrl 1204; - _control ctrlShow false; - if (!r_player_injured) then { - _ctrlBleed = _display displayCtrl 1303; - _ctrlBleed ctrlShow false; - }; - if (!r_fracture_legs && {!r_fracture_arms}) then { - _ctrlFracture = _display displayCtrl 1203; - _ctrlFracture ctrlShow false; - }; - // These controls don't exist yet - _ctrlDogFoodBorder = _display displayCtrl 1501; - _ctrlDogFoodBorder ctrlShow false; - _ctrlDogFood = _display displayCtrl 1701; - _ctrlDogFood ctrlShow false; - - _ctrlDogWaterBorder = _display displayCtrl 1502; - _ctrlDogWaterBorder ctrlShow false; - _ctrlDogWater = _display displayCtrl 1702; - _ctrlDogWater ctrlShow false - - }; - */ - dayz_angleCheck = { private ["_degree","_tPos","_zPos","_inAngle","_agent","_target","_eyeDir"]; _target = _this select 0; diff --git a/SQF/dayz_code/system/dog_agent.fsm b/SQF/dayz_code/system/dog_agent.fsm index ebf8474b4..11b92313b 100644 --- a/SQF/dayz_code/system/dog_agent.fsm +++ b/SQF/dayz_code/system/dog_agent.fsm @@ -768,16 +768,6 @@ class FSM " _handle setFSMVariable [""_thirst"",0];" \n " _handle setFSMVariable [""_hunger"",0];" \n " " \n - " //_display = uiNamespace getVariable 'DAYZ_GUI_display';" \n - " //_ctrlDogFood = _display displayCtrl 1701;" \n - " //_ctrlDogFood ctrlShow true;" \n - " //_ctrlDogFoodBorder = _display displayCtrl 1501;" \n - " //_ctrlDogFoodBorder ctrlShow true;" \n - " //_ctrlDogWater = _display displayCtrl 1702;" \n - " //_ctrlDogWater ctrlShow true;" \n - " //_ctrlDogWaterBorder = _display displayCtrl 1502;" \n - " //_ctrlDogWaterBorder ctrlShow true;" \n - " " \n " while {alive _dog} do {" \n " _vel = velocity _dog;" \n " _speed = [0,0,0] distance _vel;" \n @@ -788,17 +778,6 @@ class FSM " _foodVal = 1 - (_hunger / SleepFood);" \n " _thirstVal = 1 - (_thirst / SleepWater);" \n " " \n - " //_ctrlDogFood ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_foodVal))),(Dayz_GUI_G * _foodVal),(Dayz_GUI_B * _foodVal), 0.5];" \n - " //_ctrlDogWater ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_thirstVal))),(Dayz_GUI_G * _thirstVal),(Dayz_GUI_B * _thirstVal), 0.5];" \n - " " \n - " //_flash = {if (ctrlShown _this) then {_this ctrlShow false;} else {_this ctrlShow true;};};" \n - " //if (_foodVal < 0.2) then {" \n - " //_ctrlDogFood call _flash;" \n - " //};" \n - " //if (_thirstVal < 0.2) then {" \n - " //_ctrlDogWater call _flash;" \n - " //};" \n - "" \n " if (_foodVal <= 0 || _thirstVal <= 0) then {" \n " _cantSee = [player, _dog] call dayz_losCheck;" \n " while {alive _dog && !(_cantSee)} do {" \n