From 873b6026c7b7bf6b7121c47d4d520e0167893dba Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sat, 7 Jun 2014 17:48:31 -0500 Subject: [PATCH 1/3] Error Undefined variable in expression: dayz_disablerespawn --- SQF/dayz_code/medical/publicEH/medMorphine.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/medical/publicEH/medMorphine.sqf b/SQF/dayz_code/medical/publicEH/medMorphine.sqf index 13016cb7b..018ac87b9 100644 --- a/SQF/dayz_code/medical/publicEH/medMorphine.sqf +++ b/SQF/dayz_code/medical/publicEH/medMorphine.sqf @@ -16,5 +16,5 @@ if ((_unit == player) || (vehicle player != player)) then { _control = _display displayCtrl 1203; _control ctrlShow false; - _id = false spawn dayz_disableRespawn; + // _id = false spawn dayz_disableRespawn; }; \ No newline at end of file From d4bfc2e4c17f8d4f9930f81742307f87fb0708d8 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sat, 7 Jun 2014 17:54:49 -0500 Subject: [PATCH 2/3] should fix #1208 --- SQF/dayz_code/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 557ad77d0..9ddb149a8 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -21,7 +21,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights","gnt_c185"}; + requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights","gnt_c185","usec_ch53"}; }; class DZ_DebriefingRemoved { From c9c6f0309a9593cc57f4d3e65931932a96acfb54 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Sat, 7 Jun 2014 18:05:19 -0500 Subject: [PATCH 3/3] fixed #1311 --- SQF/dayz_code/actions/player_drink.sqf | 41 +++++++++++++++----------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/SQF/dayz_code/actions/player_drink.sqf b/SQF/dayz_code/actions/player_drink.sqf index 5eaf17910..dd2d5d8d1 100644 --- a/SQF/dayz_code/actions/player_drink.sqf +++ b/SQF/dayz_code/actions/player_drink.sqf @@ -48,26 +48,31 @@ if (["ItemSoda",_itemorignal] call fnc_inString) then { [player,_dis,true,(getPosATL player)] spawn player_alertZombies; }; -if (_hasoutput && !_invehicle) then { - // Selecting output - _itemtodrop = drink_output select (drink_with_output find _itemorignal); +if (_hasoutput) then{ + _itemtodrop = drink_output select(drink_with_output find _itemorignal); - sleep 3; - _nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2]; - if (count _nearByPile ==0) then { - _iPos = getPosATL player; - _radius = 0.0; - _item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"]; - _item setposATL _iPos; - } else { - _item = _nearByPile select 0; - }; - _item addMagazineCargoGlobal [_itemtodrop,1]; -}; + if (!_invehicle) then { + // Selecting output + _itemtodrop = drink_output select (drink_with_output find _itemorignal); + + sleep 3; + _nearByPile= nearestObjects [(getPosATL player), ["WeaponHolder","WeaponHolderBase"],2]; + if (count _nearByPile ==0) then { + _iPos = getPosATL player; + _radius = 0.0; + _item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"]; + _item setposATL _iPos; + } else { + _item = _nearByPile select 0; + }; + _item addMagazineCargoGlobal [_itemtodrop,1]; + }; + + if (_invehicle) then { + sleep 2; + (vehicle player) addMagazineCargoGlobal [_itemtodrop,1]; + }; -if (_hasoutput && _invehicle) then { - sleep 2; - (vehicle player) addMagazineCargoGlobal [_itemtodrop,1]; }; //add infection chance for "ItemWaterbottle",