From 732c2fe5a093a0decba3a0a7b7e4b2447e095eca Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 4 Mar 2016 14:29:49 -0500 Subject: [PATCH] Cleanup some merge conflicts --- .../Configs/CfgPlayerStats/p__cover.hpp | 4 +-- SQF/dayz_code/actions/player_checkRecipe.sqf | 2 ++ SQF/dayz_code/actions/player_craftitemGUI.sqf | 2 ++ SQF/dayz_code/compile/fn_updateCraftUI.sqf | 2 ++ SQF/dayz_code/compile/player_death.sqf | 3 -- SQF/dayz_code/config.cpp | 4 +-- SQF/dayz_code/init/compiles.sqf | 19 +----------- SQF/dayz_code/init/variables.sqf | 31 +------------------ 8 files changed, 10 insertions(+), 57 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp b/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp index aff34f35f..fd4afccff 100644 --- a/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp +++ b/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp @@ -18,7 +18,7 @@ class horde_journal_front_cover controls[] = { "book_page_image", - //"open_craft", //crafting disabled for now + "open_craft", "open_book", "click_here_to_close_book_1", "click_here_to_close_book_2", @@ -40,7 +40,6 @@ class horde_journal_front_cover }; // buttons - /* // crafting disabled for now class open_craft: RscIGUIShortcutButton { idc = -1; x = 0.48 * safezoneW + safezoneX; @@ -48,7 +47,6 @@ class horde_journal_front_cover text = $STR_UI_CRAFT_OPEN; action = "closeDialog 0; createDialog 'RscDisplayCraftingMenu';"; }; - */ class open_book: horde_RscButton { idc = 1900; diff --git a/SQF/dayz_code/actions/player_checkRecipe.sqf b/SQF/dayz_code/actions/player_checkRecipe.sqf index 2f6ff039c..4aef117f7 100644 --- a/SQF/dayz_code/actions/player_checkRecipe.sqf +++ b/SQF/dayz_code/actions/player_checkRecipe.sqf @@ -1,6 +1,8 @@ /* Created by Alby exclusively for DayZMod. Please request permission to use/alter from Alby. + + Included in Epoch with permission by @ebaydayz */ private ["_items","_counts","_config","_isRecipe","_item","_index","_amount","_count","_entry","_input","_array"]; diff --git a/SQF/dayz_code/actions/player_craftitemGUI.sqf b/SQF/dayz_code/actions/player_craftitemGUI.sqf index 676312107..9832c6b21 100644 --- a/SQF/dayz_code/actions/player_craftitemGUI.sqf +++ b/SQF/dayz_code/actions/player_craftitemGUI.sqf @@ -1,6 +1,8 @@ /* Created by Alby exclusively for DayZMod. Please request permission to use/alter from Alby. + + Included in Epoch with permission by @ebaydayz */ private["_config","_input","_output","_required","_failChance","_hasInput","_availabeSpace"]; diff --git a/SQF/dayz_code/compile/fn_updateCraftUI.sqf b/SQF/dayz_code/compile/fn_updateCraftUI.sqf index b4882b557..9b9e82b67 100644 --- a/SQF/dayz_code/compile/fn_updateCraftUI.sqf +++ b/SQF/dayz_code/compile/fn_updateCraftUI.sqf @@ -3,6 +3,8 @@ Please request permission to use/alter from ziellos2k. Edited by Alby with permission from ziellos2k. + + Included in Epoch with permission by @ebaydayz */ disableSerialization; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index ada2d4ab7..1d2b26d23 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -50,11 +50,8 @@ player setVariable ["bloodTaken", false, true]; player setVariable ["startcombattimer", 0]; r_player_unconscious = false; r_player_cardiac = false; -<<<<<<< HEAD _model = typeOf player; -======= autoRunActive = 0; ->>>>>>> upstream/master _array = _this; if (count _array > 0) then { diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 95ac58d99..9bb8bcb81 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -116,8 +116,6 @@ class CfgAddons #include "Configs\RscDisplay\safegui.hpp" #include "Configs\RscDisplay\dialog.hpp" #include "Configs\RscDisplay\deathboards.hpp" -<<<<<<< HEAD -======= #include "Configs\CfgVehicles.hpp" #include "Configs\CfgWeapons.hpp" @@ -131,6 +129,6 @@ class CfgAddons #include "Configs\CfgAmmo.hpp" #include "Configs\CfgLoot\CfgBuildingLoot.hpp" #include "Configs\CfgArma.hpp" ->>>>>>> upstream/master + #include "Configs\CfgExtra\snappoints.hpp" #include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h" \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 953da7dda..a981815ab 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -7,14 +7,10 @@ if (isServer) then { if (!isDedicated) then { "filmic" setToneMappingParams [0.07, 0.31, 0.23, 0.37, 0.011, 3.750, 6, 4]; setToneMapping "Filmic"; -<<<<<<< HEAD + call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_padlock.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\compile.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_code\loot\compile.sqf"; -======= - - call compile preprocessFileLineNumbers "\z\addons\dayz_code\util\compile.sqf"; ->>>>>>> upstream/master fn_dropItem = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_dropItem.sqf"; //fnc to drop items. _item call fn_dropItem; BIS_Effects_Burn = compile preprocessFile "\ca\Data\ParticleEffects\SCRIPTS\destruction\burn.sqf"; @@ -149,10 +145,6 @@ if (!isDedicated) then { player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf"; object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf"; -<<<<<<< HEAD - //player_switchWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf"; -======= ->>>>>>> upstream/master call compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_switchWeapon.sqf"; player_flipvehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_flipvehicle.sqf"; player_sleep = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sleep.sqf"; @@ -181,11 +173,7 @@ if (!isDedicated) then { horde_epeen_setText_humanity_fnc = compile preProcessFile "\z\addons\dayz_code\actions\playerstats\epeen_setText_humanity.sqf"; horde_epeen_setText_stats_fnc = compile preProcessFile "\z\addons\dayz_code\actions\playerstats\epeen_setText_stats.sqf"; horde_epeen_show_humanity_fnc = compile preProcessFile "\z\addons\dayz_code\actions\playerstats\show_humanity_fnc.sqf"; -<<<<<<< HEAD - -======= ->>>>>>> upstream/master //System player_monitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_monitor.sqf"; player_spawn_1 = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\player_spawn_1.sqf"; @@ -204,11 +192,6 @@ if (!isDedicated) then { onPreloadStarted "dayz_preloadFinished = false;"; onPreloadFinished "if (!isNil 'init_keyboard') then { [] spawn init_keyboard; }; dayz_preloadFinished = true;"; - - //Crafting - fn_updateCraftUI = {}; //need permission - compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_updateCraftUI.sqf"; - player_craftItemGUI = {}; //need permission - compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_craftItemGUI.sqf"; - player_checkRecipe = {}; //need permission - compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_checkRecipe.sqf"; // helper functions player_addDuplicateTool = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_addDuplicateTool.sqf"; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index b306aeaf5..03fc85459 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -611,18 +611,6 @@ dayz_canDelete = 350; // Z, further than this distance from its "owner", will be dayz_traps = []; dayz_traps_active = []; dayz_traps_trigger = []; -//Remove -if(isNil "dayz_ForcefullmoonNights") then { - dayz_ForcefullmoonNights = false; //force full moon nights. -}; -if(isNil "dayz_bleedingeffect") then { - dayz_bleedingeffect = 3; -};//dayz_bleedingeffect = 3; //1= blood on the ground, 2= partical effect, 3 = both. - -<<<<<<< HEAD -if(isNil "dayz_temperature_override") then { - dayz_temperature_override = false; -}; //Settings Not under dayz_settings if(isNil "dayz_attackRange") then { @@ -631,17 +619,6 @@ if(isNil "dayz_attackRange") then { }; if(isNil "dayz_DamageMultiplier") then { dayz_DamageMultiplier = 1; - -======= -if(isNil "dayz_ForcefullmoonNights") then { - dayz_ForcefullmoonNights = false; //force full moon nights. -}; -if(isNil "dayz_temperature_override") then { - dayz_temperature_override = false; -}; -if(isNil "dayz_spawnselection") then { - dayz_spawnselection = 0; ->>>>>>> upstream/master }; if(isNil "dayz_quickSwitch") then { dayz_quickSwitch = false; //Enable quick weapon switch, @@ -1085,11 +1062,8 @@ if(!isDedicated) then { //if (uiNamespace getVariable ['DZ_displayUI', 0] == 2) then { // dayzDebug = true; //}; -<<<<<<< HEAD dayz_dodge = false; -======= - dayz_onBack = ""; ->>>>>>> upstream/master + DZE_ActionInProgress = false; // DayZ Epoch Client only variables @@ -1160,9 +1134,6 @@ if(!isDedicated) then { DZE_SaveTime = 30; Dayz_constructionContext = []; -<<<<<<< HEAD Dayz_freefall = [ time, 0, 0.1 ]; -======= autoRunActive = 0; ->>>>>>> upstream/master };