Skip to content

Commit

Permalink
Merge branch 'Development' of https://github.com/DayZMod/DayZ into De…
Browse files Browse the repository at this point in the history
…velopment
  • Loading branch information
AsFoxy committed Nov 7, 2015
2 parents c979ab1 + a2f806a commit 04d52f5
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions SQF/dayz_buildings/config.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Devlopment only system - Comment out for stable (Search KeyWord - VERSION)
#define _Devlopment_

class CfgPatches
{
class dayz_buildings
Expand All @@ -22,7 +25,7 @@ class CfgAddons
class CfgMagazines {
class CA_Magazine; // External class reference

/*
#ifdef _Devlopment_
class ItemMetalSheet: CA_Magazine
{
scope = 2;
Expand Down Expand Up @@ -63,7 +66,7 @@ class CfgMagazines {
model = "z\addons\dayz_buildings\models\screws.p3d";
descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
};
*/
#endif
};

class CfgVehicleClasses {
Expand Down Expand Up @@ -251,7 +254,7 @@ class CfgWeapons
displayName = $STR_BLD_name_ItemDIY_wood;//"DIY Manual (Wood)"
descriptionShort = $STR_BLD_desc_ItemDIY_wood;//"For wooden fences"

/*
#ifdef _Devlopment_
class ItemActions {
class Build {
text = $STR_BLD_build_ItemDIY_wood;//"Wooden fence"
Expand All @@ -262,7 +265,7 @@ class CfgWeapons
create = "WoodenFence_1_foundation";
};
};
*/
#endif
};

class ItemDIY_Gate: ItemCore {
Expand All @@ -273,7 +276,7 @@ class CfgWeapons
displayName = $STR_BLD_name_ItemDIY_woodGate;//"DIY Manual (Gate's)"
descriptionShort = $STR_BLD_desc_ItemDIY_woodGate;//"For wooden Gates"

/*
#ifdef _Devlopment_
class ItemActions {
class Build {
text = $STR_BLD_build_ItemDIY_woodGate;//"Wooden Gate"
Expand All @@ -285,7 +288,7 @@ class CfgWeapons
};

};
*/
#endif
};

//Left in place to stop problems with dbs
Expand All @@ -296,7 +299,8 @@ class CfgWeapons
icon = "Ca\misc\data\icons\i_danger_CA.paa";
displayName = $STR_BLD_name_ItemDIY_metal;//"DIY Manual (Metal)"
descriptionShort = $STR_BLD_desc_ItemDIY_metal;//"For Metal fences"
/*

#ifdef _Devlopment_
class ItemActions {
class Build {
text = $STR_BLD_build_ItemDIY_metal;//"Metal fence"
Expand All @@ -307,6 +311,6 @@ class CfgWeapons
create = "MetalFence_1_foundation";
};
};
*/
#endif
};
};

0 comments on commit 04d52f5

Please sign in to comment.