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

Cleanup some merge conflicts

Browse Source
This commit is contained in:
ebaydayz
2016-03-04 14:29:49 -05:00
parent 61c64cb14a
commit 732c2fe5a0
8 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp
View File

@@ -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;