From 21412b74d2af7485b5594f348277fa57a18eacf7 Mon Sep 17 00:00:00 2001 From: ebayShopper Date: Tue, 6 Feb 2018 18:55:35 -0500 Subject: [PATCH] Move ItemKeys back to dayz_code This reverts commit c4682e5 Fixes #2010 --- CHANGE LOG 1.0.6.3.txt | 3 ++- SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp | 2 +- .../Configs/CfgWeapons/Item}/ItemKeys.hpp | 0 SQF/dayz_epoch_b/config.cpp | 5 ----- 4 files changed, 3 insertions(+), 7 deletions(-) rename SQF/{dayz_epoch_b => dayz_code/Configs/CfgWeapons/Item}/ItemKeys.hpp (100%) diff --git a/CHANGE LOG 1.0.6.3.txt b/CHANGE LOG 1.0.6.3.txt index 690563300..c01b5a986 100644 --- a/CHANGE LOG 1.0.6.3.txt +++ b/CHANGE LOG 1.0.6.3.txt @@ -4,7 +4,8 @@ [FIXED] Combo locks could be duplicated by two players removing them at the same time (564e3da) [FIXED] Bush b_corylus.p3d allowed chopping down for wood like a tree (42e519a) [FIXED] Player could shoot during unconscious wake up animation (634a01a) -[FIXED] publicVariableEval kicks from the evil RNG god @oiad @AirwavesMan +[FIXED] Rare publicVariable value restrictions for AuthKey due to RNG with basic Latin characters (d48c907) @oiad @AirwavesMan +[FIXED] Freeze when iterating through CfgWeapons in A2OA 1.64 due to conflict with ItemKeys in dayz_epoch_b.pbo #2010 @S-fly [UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_ [UPDATED] Added notification when status icons are disabled diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index ae0e7f98d..c10c7af8e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -277,7 +277,7 @@ class CfgWeapons #include "Tools\Radio.hpp" #include "Item\ItemKeyKit.hpp" - //#include "Item\ItemKeys.hpp" //Moved to epoch_b.pbo + #include "Item\ItemKeys.hpp" #include "Item\Documents.hpp" diff --git a/SQF/dayz_epoch_b/ItemKeys.hpp b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemKeys.hpp similarity index 100% rename from SQF/dayz_epoch_b/ItemKeys.hpp rename to SQF/dayz_code/Configs/CfgWeapons/Item/ItemKeys.hpp diff --git a/SQF/dayz_epoch_b/config.cpp b/SQF/dayz_epoch_b/config.cpp index 718da0e71..03cb0ba0a 100644 --- a/SQF/dayz_epoch_b/config.cpp +++ b/SQF/dayz_epoch_b/config.cpp @@ -6,9 +6,4 @@ class CfgPatches { dayzVersion = "1.0.6"; requiredAddons[] = {"dayz_code"}; }; -}; -class CfgWeapons -{ - class ItemCore; - #include "ItemKeys.hpp" }; \ No newline at end of file