From 709802a70bc71bf69da7d0bf1edd8986e01f4560 Mon Sep 17 00:00:00 2001
From: vbawol <awol@veteranbastards.com>
Date: Wed, 13 Feb 2013 00:51:45 -0600
Subject: [PATCH] 0.945

+Pack position login now the same as lock and unlock Fixes #73
---
 dayz_code/actions/player_craftItem.sqf |  4 +-
 dayz_code/compile/player_packVault.sqf | 51 +++++++++++++++-----------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/dayz_code/actions/player_craftItem.sqf b/dayz_code/actions/player_craftItem.sqf
index 79dadb916..d7b23e6fb 100644
--- a/dayz_code/actions/player_craftItem.sqf
+++ b/dayz_code/actions/player_craftItem.sqf
@@ -128,9 +128,9 @@ if (inflamed cursorTarget and _canDo) then {
 		{
 			_itemOut = _x select 0;
 			_countOut = _x select 1;
-			diag_log format["Recipe Finish: %1 %2", _itemIn,_countIn];
+			diag_log format["Recipe Output: %1 %2", _itemOut,_countOut];
 		
-			for "_x" from 1 to _countIn do {
+			for "_x" from 1 to _countOut do {
 				player addMagazine _itemOut;
 			};
 		
diff --git a/dayz_code/compile/player_packVault.sqf b/dayz_code/compile/player_packVault.sqf
index 7c334081c..b99e6abf5 100644
--- a/dayz_code/compile/player_packVault.sqf
+++ b/dayz_code/compile/player_packVault.sqf
@@ -1,57 +1,60 @@
 /*
 [_obj] spawn player_packVault;
 */
-private["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr"];
+private["_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr"];
 _obj = _this;
 _ownerID = _obj getVariable["CharacterID","0"];
 _objectID 	= _obj getVariable["ObjectID","0"];
 _objectUID	= _obj getVariable["ObjectUID","0"];
-player playActionNow "Medic";
 
 player removeAction s_player_packvault;
-s_player_packvault = -1;
+s_player_packvault = 1;
 
 if(_ownerID == dayz_playerUID) then {
 	_alreadyPacking = _obj getVariable["packing",0];
-
 	if (_alreadyPacking == 1) exitWith {cutText ["That vault is already being packed." , "PLAIN DOWN"]};
-
 	_obj setVariable["packing",1];
 
+	cutText ["Packing vault move from this position to cancel within 5 seconds.", "PLAIN DOWN"];
+	sleep 1; 
+	_location1 = getPosATL player;
+	sleep 5;
+	_location2 = getPosATL player;
+	
+	if(_location1 distance _location2 > 0.1) exitWith {
+		cutText ["Packing vault canceled." , "PLAIN DOWN"]
+	};
+
+	player playActionNow "Medic";
+
 	_dir = direction _obj;
-	_pos = getposATL _obj;
+	
+	_pos = _obj getVariable["OEMPos",(getposATL _obj)];
+	
 	[player,"tentpack",0,false] call dayz_zombieSpeak;
 	sleep 3;
 
-	_building = nearestObject [(vehicle player), "HouseBase"];
-		_isBuilding = [(vehicle player),_building] call fnc_isInsideBuilding;
-
-		if(_isBuilding) then {
-			
-			_ppos = _building worldToModel _pos;
-			_ppos set [1,1.5];
-				
-			_location = _building modelToWorld _ppos;
-		};
-
 	//place tent (local)
 	_bag = createVehicle ["WeaponHolder_ItemVault",_pos,[], 0, "CAN_COLLIDE"];
 	_bag setdir _dir;
 	_bag setpos _pos;
 	player reveal _bag;
-	
 
-
-	// _holder = "WeaponHolder" createVehicle _pos; 
+	/*
+	_holder = "WeaponHolder" createVehicle _pos; 
+	_holder setpos _pos;
+	player reveal _holder;
 	
 	_weapons = 		getWeaponCargo _obj;
 	_magazines = 	getMagazineCargo _obj;
 	_backpacks = 	getBackpackCargo _obj;
-	
+	*/
+
 	["dayzDeleteObj",[_objectID,_objectUID]] call callRpcProcedure;
 	
 	deleteVehicle _obj;
 	
+	/*
 	//Add weapons
 	_objWpnTypes = 	_weapons select 0;
 	_objWpnQty = 	_weapons select 1;
@@ -78,8 +81,12 @@ if(_ownerID == dayz_playerUID) then {
 		_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
 		_countr = _countr + 1;
 	} forEach _objWpnTypes;
+	*/
+	
 	
 	cutText ["Your vault has been packed", "PLAIN DOWN"];
 } else {
 	cutText ["You cannot pack this vault, it is not yours", "PLAIN DOWN"];
-};
\ No newline at end of file
+};
+
+s_player_packvault = -1;
\ No newline at end of file