diff --git a/SQF/dayz_code/actions/player_switchWeapon.sqf b/SQF/dayz_code/actions/player_switchWeapon.sqf index bca3b9e49..e88e65cd5 100644 --- a/SQF/dayz_code/actions/player_switchWeapon.sqf +++ b/SQF/dayz_code/actions/player_switchWeapon.sqf @@ -1,20 +1,13 @@ -#include "\z\addons\dayz_code\util\mutex.hpp" #include "\z\addons\dayz_code\util\player.hpp" -#define BANDAID - -#define TIMEOUT 2 - #define IS_PRIMARY(wpn) (getNumber (configFile >> "CfgWeapons" >> wpn >> "type") == 1) #define MELEE(wpn) getNumber (configFile >> "CfgWeapons" >> wpn >> "melee") #define IS_MELEE(wpn) (MELEE(wpn) == 1) //0 if not found, 1 if in primary slot, 2 if on back -#define FIND_RIFLE() (0 call dz_fn_switchWeapon_find) -#define FIND_MELEE() (1 call dz_fn_switchWeapon_find) +#define FIND_RIFLE (0 call dz_fn_switchWeapon_find) +#define FIND_MELEE (1 call dz_fn_switchWeapon_find) -dz_switchWeapon_mutex = Mutex_New(); -dz_switchWeapon_time = 0; dz_switchWeapon_pistolTime = 0; //0: switch rifle/melee instantly and update gear @@ -22,181 +15,117 @@ dz_switchWeapon_pistolTime = 0; //2: switch to rifle //3: switch to pistol //4: switch to melee -dz_fn_switchWeapon = -{ - if (vehicle player != player) exitWith {}; +dz_fn_switchWeapon = { + if Player_IsInVehicle exitWith {}; if Player_IsOnLadder() exitWith {}; if (dayz_autoRun) then {call dayz_autoRunOff;}; - if (dayz_isSwimming) exitWith {}; - private ["_current","_primary","_secondary","_swapWeapons"]; + private ["_current","_secondary","_option"]; + _option = _this; _current = currentWeapon player; - switch _this do - { - //Instantly switch primary and carry, also update gear - case 0: - { - if (IS_PRIMARY(_current)) then - { true call dz_fn_switchWeapon_swap; } - else - { false call dz_fn_switchWeapon_swap; }; - - /*call _swapWeapons; - if (IS_PRIMARY(_current)) then - { player selectWeapon primaryWeapon player; };*/ - + call { + if (_option == 0) exitWith { // Instantly switch primary and carry, also update gear + if (IS_PRIMARY(_current)) then {true call dz_fn_switchWeapon_swap;} else {false call dz_fn_switchWeapon_swap;}; [[(findDisplay 106)],"onLBSelChanged"] execVM "\z\addons\dayz_code\system\handleGear.sqf"; }; - //Switch primary and carry - case 1: - { - if (dayz_quickSwitch) then - { + if (_option == 1) exitWith { //Switch primary and carry + if (dayz_quickSwitch) then { true call dz_fn_switchWeapon_swap; - #ifdef BANDAID - call dayz_meleeMagazineCheck; - #endif - } - else - { call dz_fn_switchWeapon_swapSecure; }; + } else { + call dz_fn_switchWeapon_swapSecure; + }; }; - //Switch to rifle - case 2: - { - //No current weapon - if (_current == "") exitWith - { - switch FIND_RIFLE() do - { - //In primary - case 1: - { + if (_option == 2) exitWith { // Switch to rifle + if (_current == "") exitWith { // No current weapon + switch FIND_RIFLE do { + case 1: { //In primary player selectWeapon primaryWeapon player; }; - - //On back - case 2: - { + case 2: { //On back true call dz_fn_switchWeapon_swap; }; }; }; - - //Current weapon is primary - if (IS_PRIMARY(_current)) exitWith - { - //if current is melee and on back is rifle - if (IS_MELEE(_current) && { !IS_MELEE(dayz_onBack) }) then - { - if (dayz_quickSwitch) then - { true call dz_fn_switchWeapon_swap; } - else - { call dz_fn_switchWeapon_swapSecure; }; + if (IS_PRIMARY(_current)) exitWith { // Current weapon is primary + if (IS_MELEE(_current) && {!IS_MELEE(dayz_onBack)}) then { // if current is melee and on back is rifle + if (dayz_quickSwitch) then { + true call dz_fn_switchWeapon_swap; + } else { + call dz_fn_switchWeapon_swapSecure; + }; }; }; - - //Current is pistol - switch FIND_RIFLE() do - { - //In primary - case 1: - { - if (Player_GetStance() == Player_GetStance_PRONE) then - { player playMoveNow "AmovPpneMstpSrasWrflDnon"; }; + // Default: Current is pistol + switch FIND_RIFLE do { + case 1: { //In primary + if (Player_GetStance() == Player_GetStance_PRONE) then { + player playMoveNow "AmovPpneMstpSrasWrflDnon"; + }; player selectWeapon primaryWeapon player; }; - - //On back - case 2: - { + case 2: { //On back if (diag_tickTime - dz_switchWeapon_pistolTime < 1) exitWith {}; - if (Player_GetStance() == Player_GetStance_PRONE) then - { player playMoveNow "AmovPpneMstpSrasWrflDnon"; }; + if (Player_GetStance() == Player_GetStance_PRONE) then { + player playMoveNow "AmovPpneMstpSrasWrflDnon"; + }; true call dz_fn_switchWeapon_swap; }; }; }; - //Switch to pistol - case 3: - { - //If current weapon is primary - if (IS_PRIMARY(_current)) then - { + if (_option == 3) exitWith { //Switch to pistol + if (IS_PRIMARY(_current)) then { //If current weapon is primary _secondary = Player_GetSidearm(); - if (!isNil "_secondary") then - { + if (!isNil "_secondary") then { player selectWeapon _secondary; dz_switchWeapon_pistolTime = diag_tickTime; }; }; }; - - //Switch to melee - case 4: - { - //No current weapon - if (_current == "") exitWith - { - switch FIND_MELEE() do - { - //In primary - case 1: - { + if (_option == 4) exitWith { //Switch to melee or onBack + if (_current == "") exitWith { //No current weapon + switch FIND_MELEE do { + case 1: { //In primary player selectWeapon primaryWeapon player; }; - - //On back - case 2: - { + case 2: { //On back true call dz_fn_switchWeapon_swap; - #ifdef BANDAID - call dayz_meleeMagazineCheck; - #endif }; }; }; - - //Current weapon is primary - if (IS_PRIMARY(_current)) exitWith - { - //if current is rifle and on back is melee OR two rifles are allowed - if ((!IS_MELEE(_current) && { IS_MELEE(dayz_onBack) }) or (DZE_TwoPrimaries > 1)) then - { - if (dayz_quickSwitch) then - { + if (IS_PRIMARY(_current)) exitWith { //Current weapon is primary + if ((!IS_MELEE(_current) && { IS_MELEE(dayz_onBack) }) or (DZE_TwoPrimaries > 1)) then { //if current is rifle and on back is melee OR two rifles are allowed + if (dayz_quickSwitch) then { true call dz_fn_switchWeapon_swap; - #ifdef BANDAID - call dayz_meleeMagazineCheck; - #endif - } - else - { call dz_fn_switchWeapon_swapSecure; }; + } else { + call dz_fn_switchWeapon_swapSecure; + }; }; }; - - //Current is pistol - //Find melee weapon - switch FIND_MELEE() do - { - //In primary - case 1: - { - player selectWeapon primaryWeapon player; - if (Player_GetStance() == Player_GetStance_PRONE) then - { player playMoveNow "AmovPpneMstpSrasWrflDnon"; }; + // Default: Current is pistol + if (DZE_TwoPrimaries > 1 && {!IS_MELEE(dayz_onBack)}) exitWith { // Allow switching to on back rifle if DZE_TwoPrimaries = 2. + if (dayz_quickSwitch) then { + true call dz_fn_switchWeapon_swap; + } else { + call dz_fn_switchWeapon_swapSecure; + }; }; - - //On back - case 2: - { + switch FIND_MELEE do { // Find melee weapon + case 1: { // In primary + player selectWeapon primaryWeapon player; + if (Player_GetStance() == Player_GetStance_PRONE) then { + player playMoveNow "AmovPpneMstpSrasWrflDnon"; + }; + }; + case 2: { // On back if (diag_tickTime - dz_switchWeapon_pistolTime < 1) exitWith {}; - if (Player_GetStance() == Player_GetStance_PRONE) then - { player playMoveNow "AmovPpneMstpSrasWrflDnon"; }; + if (Player_GetStance() == Player_GetStance_PRONE) then { + player playMoveNow "AmovPpneMstpSrasWrflDnon"; + }; true call dz_fn_switchWeapon_swap; }; }; @@ -204,90 +133,46 @@ dz_fn_switchWeapon = }; }; -//See FIND_RIFLE() and FIND_MELEE() -dz_fn_switchWeapon_find = -{ +//See FIND_RIFLE and FIND_MELEE +dz_fn_switchWeapon_find = { + private "_primary"; _primary = primaryWeapon player; - - if (_primary != "" && { _this == MELEE(_primary) }) - exitWith { 1 }; - - if (dayz_onBack != "" && { _this == MELEE(dayz_onBack) }) - exitWith { 2 }; - - 0 + if (_primary != "" && { _this == MELEE(_primary) }) exitWith { 1 }; + if (dayz_onBack != "" && { _this == MELEE(dayz_onBack) }) exitWith { 2 }; + 0 // Default }; //Swaps rifle / melee instantly without animation -dz_fn_switchWeapon_swap = -{ - if (dayz_onBack == "") then - { +dz_fn_switchWeapon_swap = { + if (dayz_onBack == "") then { //Must be in a single statement to ensure atomicity in the scheduled environment. - dayz_onBack = - [ - primaryWeapon player, - player removeWeapon primaryWeapon player - ] select 0; - } - else - { - dayz_onBack = - [ - primaryWeapon player, - player removeWeapon primaryWeapon player, - player addWeapon dayz_onBack - ] select 0; + dayz_onBack = [primaryWeapon player,player removeWeapon primaryWeapon player] select 0; + } else { + dayz_onBack = [primaryWeapon player,player removeWeapon primaryWeapon player,player addWeapon dayz_onBack] select 0; }; - if (_this) then - { player selectWeapon primaryWeapon player; }; + if (_this) then { + player selectWeapon primaryWeapon player; + if (IS_MELEE(primaryWeapon player)) then { + call dayz_meleeMagazineCheck; + }; + }; }; //Swaps rifle / melee forcing an animation -dz_fn_switchWeapon_swapSecure = -{ - if (!Mutex_TryLock_Fast(dz_switchWeapon_mutex)) exitWith {}; - +dz_fn_switchWeapon_swapSecure = { + private ["_anim","_array","_str"]; //animation states are in the form "AmovPerc...", "AmovPknl...", "AmovPpne..." - dz_switchWeapon_anim = format - [ - "AmovP%1MstpSrasWrflDnon_AmovP%1MstpSrasWpstDnon", - //Switch on player stance - switch Player_GetStance() do - { - case Player_GetStance_STAND: { "erc" }; - case Player_GetStance_KNEEL: { "knl" }; - case Player_GetStance_PRONE: { "pne" }; - } - ]; + _array = toArray (animationState player); + _str = toString [_array select 5,_array select 6,_array select 7]; + _anim = format["AmovP%1MstpSrasWrflDnon_AmovP%1MstpSrasWpstDnon",_str]; + player playMoveNow _anim; //Add AnimDone event handler to wait until current weapon is put away - dz_switchWeapon_handler = player addEventHandler ["AnimDone", dz_fn_switchWeapon_animDone]; - player playMoveNow dz_switchWeapon_anim; - dz_switchWeapon_time = diag_tickTime; -}; - -dz_fn_switchWeapon_animDone = -{ - //Wait at most TIMEOUT seconds - if (diag_tickTime - dz_switchWeapon_time > TIMEOUT) exitWith - { + dz_switchWeapon_handler = player addEventHandler ["AnimDone", { + + true call dz_fn_switchWeapon_swap; player removeEventHandler ["AnimDone", dz_switchWeapon_handler]; - Mutex_Unlock(dz_switchWeapon_mutex); - }; - - //Check if finished animation is the correct one - if ((_this select 1) != dz_switchWeapon_anim) exitWith {}; - - true call dz_fn_switchWeapon_swap; - - //Remove eventhandler - player removeEventHandler ["AnimDone", dz_switchWeapon_handler]; - Mutex_Unlock(dz_switchWeapon_mutex); - - #ifdef BANDAID - if (IS_MELEE(primaryWeapon player)) then - { call dayz_meleeMagazineCheck; }; - #endif + dz_switchWeapon_handler = nil; + }]; }; diff --git a/SQF/dayz_code/util/Player.hpp b/SQF/dayz_code/util/Player.hpp index 374499ff8..2f04abf3a 100644 --- a/SQF/dayz_code/util/Player.hpp +++ b/SQF/dayz_code/util/Player.hpp @@ -11,7 +11,7 @@ Author: Foxy //True if player is on a ladder, otherwise false #define Player_IsOnLadder() ((getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1) -#define Player_IsInVehicle() (player != vehicle player); +#define Player_IsInVehicle (player != vehicle player) //Gets the classname of the player's sidearm. nil if the player has no sidearm. #define Player_GetSidearm() ({ if ((getNumber (configFile >> "CfgWeapons" >> _x >> "type")) == 2) exitWith { _x }; nil } foreach weapons player) @@ -52,4 +52,4 @@ The weaponholder containing the item is returned. Returns null if the function f #define Player_GetStance_PRONE 3 #define Player_GetStance() (1 + floor ((((toArray animationState player) select 5) - 100) / 5)) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/compile.sqf b/SQF/dayz_code/util/compile.sqf index 9e08c4be1..f9fa38e9d 100644 --- a/SQF/dayz_code/util/compile.sqf +++ b/SQF/dayz_code/util/compile.sqf @@ -1,22 +1,4 @@ -#define STRINGIFY(x) #x -#define PATH(sub_path) STRINGIFY(\z\addons\dayz_code\util\sub_path) -#define CCPP call compile preprocessFileLineNumbers - -//Debug -CCPP PATH(debug.sqf); - -//Very generic utilities -CCPP PATH(util.sqf); -CCPP PATH(mutex.sqf); -CCPP PATH(math.sqf); -CCPP PATH(array.sqf); - -//Collections -CCPP PATH(stack.sqf); -CCPP PATH(queue.sqf); -CCPP PATH(dictionary.sqf); - -//Specialized -CCPP PATH(vector.sqf); -CCPP PATH(task.sqf); -CCPP PATH(request.sqf); \ No newline at end of file +call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\math.sqf"; +call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\array.sqf"; +call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\vector.sqf"; +call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\player.sqf"; diff --git a/SQF/dayz_code/util/player.sqf b/SQF/dayz_code/util/player.sqf index 510aad6ac..83e80fc83 100644 --- a/SQF/dayz_code/util/player.sqf +++ b/SQF/dayz_code/util/player.sqf @@ -1,6 +1,3 @@ -#define DEBUG_STEP() call { dbg_step = false; waitUntil {dbg_step}; } - -#include "Debug.hpp" #include "Player.hpp" #define WeaponSlotPrimary 1 @@ -15,8 +12,6 @@ #define IS_MAGAZINE(type) (type == WeaponSlotHandGunItem || type == WeaponSlotItem) dz_player_invTypes = [WeaponSlotPrimary, WeaponSlotHandGun, WeaponSlotSecondary, WeaponSlotHandGunItem, WeaponSlotItem, WeaponSlotBinocular, WeaponHardMounted, WeaponSlotInventory]; -dz_player_invSlots = [call compile getText (configFile >> "CfgVehicles" >> Player_BASE)] call BIS_FNC_invCodeToArray; -//dz_player_invSlots = [1,1,1,8,12,2,0,12]; dz_fn_player_numItems = { @@ -115,4 +110,4 @@ dz_fn_player_removeWeapon = dz_fn_player_removeMagazine = { Player_RemoveMagazine_Fast(_this) -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/util/Debug.hpp b/Server Files/Archive/dayz_code/util/Debug.hpp similarity index 99% rename from SQF/dayz_code/util/Debug.hpp rename to Server Files/Archive/dayz_code/util/Debug.hpp index 42e84edd1..bba24906a 100644 --- a/SQF/dayz_code/util/Debug.hpp +++ b/Server Files/Archive/dayz_code/util/Debug.hpp @@ -118,4 +118,4 @@ See https://community.bistudio.com/wiki/Data_Types #endif -//Type check define generator http://pastebin.com/kBTVtBzz \ No newline at end of file +//Type check define generator http://pastebin.com/kBTVtBzz diff --git a/SQF/dayz_code/util/Dictionary.hpp b/Server Files/Archive/dayz_code/util/Dictionary.hpp similarity index 99% rename from SQF/dayz_code/util/Dictionary.hpp rename to Server Files/Archive/dayz_code/util/Dictionary.hpp index cba363d2a..418f3e4a7 100644 --- a/SQF/dayz_code/util/Dictionary.hpp +++ b/Server Files/Archive/dayz_code/util/Dictionary.hpp @@ -26,4 +26,4 @@ Author: Foxy //Rearranges the internal data structure of the dictionary to free unused memory. #define Dictionary_Compact(d) ((d) call dz_fn_dictionary_compact) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/Mutex.hpp b/Server Files/Archive/dayz_code/util/Mutex.hpp similarity index 99% rename from SQF/dayz_code/util/Mutex.hpp rename to Server Files/Archive/dayz_code/util/Mutex.hpp index 99a08ce05..ca7495721 100644 --- a/SQF/dayz_code/util/Mutex.hpp +++ b/Server Files/Archive/dayz_code/util/Mutex.hpp @@ -25,4 +25,4 @@ Author: Foxy //Unlocks the mutex. Use only when you have previously obtained lock yourself. #define Mutex_Unlock(mtx) ((mtx) set [0, true]) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/Queue.hpp b/Server Files/Archive/dayz_code/util/Queue.hpp similarity index 99% rename from SQF/dayz_code/util/Queue.hpp rename to Server Files/Archive/dayz_code/util/Queue.hpp index 440eff35f..68a7f8dea 100644 --- a/SQF/dayz_code/util/Queue.hpp +++ b/Server Files/Archive/dayz_code/util/Queue.hpp @@ -33,4 +33,4 @@ Author: Foxy //#define Queue_Resize(q, s) ([q, s] call dz_fn_queue_resize) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/Reference.hpp b/Server Files/Archive/dayz_code/util/Reference.hpp similarity index 98% rename from SQF/dayz_code/util/Reference.hpp rename to Server Files/Archive/dayz_code/util/Reference.hpp index 679316f3e..0d5702a85 100644 --- a/SQF/dayz_code/util/Reference.hpp +++ b/Server Files/Archive/dayz_code/util/Reference.hpp @@ -16,4 +16,4 @@ Author: Foxy //Sets the reference to point to the specified object. #define Ref_Set(ref, val) ((ref) set [0, val]) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/Request.hpp b/Server Files/Archive/dayz_code/util/Request.hpp similarity index 99% rename from SQF/dayz_code/util/Request.hpp rename to Server Files/Archive/dayz_code/util/Request.hpp index 1cfb124a0..523aff5b8 100644 --- a/SQF/dayz_code/util/Request.hpp +++ b/Server Files/Archive/dayz_code/util/Request.hpp @@ -46,4 +46,4 @@ Example: //Retrieves the result of the request. #define Request_GetResult(request) ((request) select 2) -#undef \ No newline at end of file +#undef diff --git a/SQF/dayz_code/util/Request_Server.hpp b/Server Files/Archive/dayz_code/util/Request_Server.hpp similarity index 99% rename from SQF/dayz_code/util/Request_Server.hpp rename to Server Files/Archive/dayz_code/util/Request_Server.hpp index 5951bc871..d96dbe709 100644 --- a/SQF/dayz_code/util/Request_Server.hpp +++ b/Server Files/Archive/dayz_code/util/Request_Server.hpp @@ -30,4 +30,4 @@ Example: */ #define Request_RegisterHandler(id, handler, async) Dictionary_Add(dz_request_handlers, id, Array_New2(handler, async)) -#undef \ No newline at end of file +#undef diff --git a/SQF/dayz_code/util/Stack.hpp b/Server Files/Archive/dayz_code/util/Stack.hpp similarity index 99% rename from SQF/dayz_code/util/Stack.hpp rename to Server Files/Archive/dayz_code/util/Stack.hpp index 14e0fac72..d052d2fa5 100644 --- a/SQF/dayz_code/util/Stack.hpp +++ b/Server Files/Archive/dayz_code/util/Stack.hpp @@ -27,4 +27,4 @@ Author: Foxy //Returns the number of items currently on the stack. #define Stack_Count(stack) ((stack) select 0) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/String.hpp b/Server Files/Archive/dayz_code/util/String.hpp similarity index 99% rename from SQF/dayz_code/util/String.hpp rename to Server Files/Archive/dayz_code/util/String.hpp index d449c6934..11ebdf42c 100644 --- a/SQF/dayz_code/util/String.hpp +++ b/Server Files/Archive/dayz_code/util/String.hpp @@ -19,4 +19,4 @@ #define String_Format15(string,p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14) (format [string,p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14]) #define String_Format16(string,p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15) (format [string,p0,p1,p2,p3,p4,p5,p6,p7,p8,p9,p10,p11,p12,p13,p14,p15]) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/Task.hpp b/Server Files/Archive/dayz_code/util/Task.hpp similarity index 99% rename from SQF/dayz_code/util/Task.hpp rename to Server Files/Archive/dayz_code/util/Task.hpp index 0d7b299d0..6efc4e986 100644 --- a/SQF/dayz_code/util/Task.hpp +++ b/Server Files/Archive/dayz_code/util/Task.hpp @@ -38,4 +38,4 @@ Author: Foxy //Determines whether the task has canceled prior to completion. #define Task_IsCanceled(task) (((task) select 2) == 3) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/Util.hpp b/Server Files/Archive/dayz_code/util/Util.hpp similarity index 99% rename from SQF/dayz_code/util/Util.hpp rename to Server Files/Archive/dayz_code/util/Util.hpp index 6913a11e4..03af0e847 100644 --- a/SQF/dayz_code/util/Util.hpp +++ b/Server Files/Archive/dayz_code/util/Util.hpp @@ -23,4 +23,4 @@ variable is restored automatically after transmission. For example: //Note: the predicate is evaluated once each frame. Expensive operations may cause performance issues. #define Util_WaitUntil(predicate, timeout) ([_this, predicate, timeout, diag_tickTime] call dz_fn_util_waitUntil) -#endif \ No newline at end of file +#endif diff --git a/SQF/dayz_code/util/debug.sqf b/Server Files/Archive/dayz_code/util/debug.sqf similarity index 100% rename from SQF/dayz_code/util/debug.sqf rename to Server Files/Archive/dayz_code/util/debug.sqf diff --git a/SQF/dayz_code/util/dictionary.sqf b/Server Files/Archive/dayz_code/util/dictionary.sqf similarity index 99% rename from SQF/dayz_code/util/dictionary.sqf rename to Server Files/Archive/dayz_code/util/dictionary.sqf index f7df7f255..9a083c42c 100644 --- a/SQF/dayz_code/util/dictionary.sqf +++ b/Server Files/Archive/dayz_code/util/dictionary.sqf @@ -64,4 +64,4 @@ dz_fn_dictionary_compact = _this set [1, _keys]; _this set [2, _values]; -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/util/mutex.sqf b/Server Files/Archive/dayz_code/util/mutex.sqf similarity index 97% rename from SQF/dayz_code/util/mutex.sqf rename to Server Files/Archive/dayz_code/util/mutex.sqf index c45ebc112..7a9c4e689 100644 --- a/SQF/dayz_code/util/mutex.sqf +++ b/Server Files/Archive/dayz_code/util/mutex.sqf @@ -8,4 +8,4 @@ dz_fn_mutex_tryLock = dz_fn_mutex_waitLock = { Mutex_WaitLock_Fast(_this); -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/util/queue.sqf b/Server Files/Archive/dayz_code/util/queue.sqf similarity index 99% rename from SQF/dayz_code/util/queue.sqf rename to Server Files/Archive/dayz_code/util/queue.sqf index e9d7e3d5e..2e9224ff7 100644 --- a/SQF/dayz_code/util/queue.sqf +++ b/Server Files/Archive/dayz_code/util/queue.sqf @@ -52,4 +52,4 @@ dz_fn_queue_isFull = dz_fn_queue_resize = { assert (false); -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/util/request.sqf b/Server Files/Archive/dayz_code/util/request.sqf similarity index 99% rename from SQF/dayz_code/util/request.sqf rename to Server Files/Archive/dayz_code/util/request.sqf index b147f2b8a..518f8751c 100644 --- a/SQF/dayz_code/util/request.sqf +++ b/Server Files/Archive/dayz_code/util/request.sqf @@ -171,4 +171,4 @@ else //SERVER dz_pvc_request = _temp;*/ }; }; -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/util/stack.sqf b/Server Files/Archive/dayz_code/util/stack.sqf similarity index 99% rename from SQF/dayz_code/util/stack.sqf rename to Server Files/Archive/dayz_code/util/stack.sqf index 8bf9a4537..e2cfe3d12 100644 --- a/SQF/dayz_code/util/stack.sqf +++ b/Server Files/Archive/dayz_code/util/stack.sqf @@ -33,4 +33,4 @@ dz_fn_stack_peek = dz_fn_stack_size = { count GET_ARRAY(_this) -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/util/task.sqf b/Server Files/Archive/dayz_code/util/task.sqf similarity index 99% rename from SQF/dayz_code/util/task.sqf rename to Server Files/Archive/dayz_code/util/task.sqf index ff548b288..994361502 100644 --- a/SQF/dayz_code/util/task.sqf +++ b/Server Files/Archive/dayz_code/util/task.sqf @@ -93,4 +93,4 @@ dz_fn_task_waitAll = }; nil -};*/ \ No newline at end of file +};*/ diff --git a/SQF/dayz_code/util/util.sqf b/Server Files/Archive/dayz_code/util/util.sqf similarity index 99% rename from SQF/dayz_code/util/util.sqf rename to Server Files/Archive/dayz_code/util/util.sqf index 633d1aac9..a8b89a64f 100644 --- a/SQF/dayz_code/util/util.sqf +++ b/Server Files/Archive/dayz_code/util/util.sqf @@ -8,4 +8,4 @@ dz_fn_util_waitUntil = { waitUntil { ((_this select 2) + (_this select 3)) > diag_tickTime || { (_this select 0) call (_this select 1) } }; (_this select 0) call (_this select 1); -}; \ No newline at end of file +};