W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-18 14:12:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Merge Conflict 1

Browse Source
This commit is contained in:
icomrade
2016-03-03 22:09:38 -05:00
parent bad0a2e461 479097e7a8
commit 61c64cb14a
175 changed files with 9333 additions and 7650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SQF/dayz_code/Configs/RscDisplay/RscDisplayCraftingMenu.hpp
View File

@@ -3,7 +3,7 @@ class RscListNBox;
class RscDisplayCraftingMenu {
idd = 6903;
enableDisplay = 1;
onLoad = "uiNamespace setVariable ['DAYZ_CraftingDialog', _this select 0]; ['init'] call fn_updateCraftUI;";
onLoad = "uiNamespace setVariable ['DAYZ_CraftingDialog', _this select 0]; ['initcrafting'] call fn_updateCraftUI;";
onUnload = "['close'] call fn_updateCraftUI;";
class Controls
@@ -90,6 +90,15 @@ class RscDisplayCraftingMenu {
text = $STR_UI_START_CRAFTING;
action = "['craft'] call fn_updateCraftUI;";
};
/*
class ConstructionButton: RscIGUIShortcutButton {
idc = 430;
x = 0.631 * safezoneW + safezoneX;
y = 0.744 * safezoneH + safezoneY;
text = "Construction";
action = "['construction'] call fn_updateCraftUI;";
};
*/
class craftingslot01: RscPicture
{

4
SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp
View File

@@ -825,7 +825,7 @@ class RscDisplayGear {
h = 0.174;
color[] = {1,1,1,0.5};
colorActive[] = {1,1,1,0.8};
action = "[""gear""] call player_switchWeapon";
action = "0 call dz_fn_switchWeapon";
};
class Button2: RscActiveText {
@@ -840,7 +840,7 @@ class RscDisplayGear {
h = 0.174;
color[] = {1,1,1,0.5};
colorActive[] = {1,1,1,0.8};
action = "[""gear""] call player_switchWeapon";
action = "0 call dz_fn_switchWeapon";
};
};
};