summaryrefslogtreecommitdiffstats
path: root/src/Enchantments.h
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-04-17 19:31:43 +0200
committerdaniel0916 <theschokolps@gmail.com>2014-04-17 19:31:43 +0200
commit0086fcfef18db58f3a4509853399c0a9b610e950 (patch)
treefa84dc65a061981a56c3040ef3ff87adb4182885 /src/Enchantments.h
parentModified many things (diff)
downloadcuberite-0086fcfef18db58f3a4509853399c0a9b610e950.tar
cuberite-0086fcfef18db58f3a4509853399c0a9b610e950.tar.gz
cuberite-0086fcfef18db58f3a4509853399c0a9b610e950.tar.bz2
cuberite-0086fcfef18db58f3a4509853399c0a9b610e950.tar.lz
cuberite-0086fcfef18db58f3a4509853399c0a9b610e950.tar.xz
cuberite-0086fcfef18db58f3a4509853399c0a9b610e950.tar.zst
cuberite-0086fcfef18db58f3a4509853399c0a9b610e950.zip
Diffstat (limited to '')
-rw-r--r--src/Enchantments.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Enchantments.h b/src/Enchantments.h
index 1d226330a..fa07dc2d4 100644
--- a/src/Enchantments.h
+++ b/src/Enchantments.h
@@ -20,6 +20,11 @@ class cFastNBTWriter;
class cParsedNBT;
+// fwd:
+struct cWeightedEnchantment;
+
+typedef std::vector<cWeightedEnchantment> cWeightedEnchantments;
+
@@ -111,7 +116,6 @@ public:
/** Gets random enchantment from Vector and returns it */
static cEnchantments GetRandomEnchantmentFromVector(cWeightedEnchantments & a_Enchantments);
-
/// Returns true if a_Other doesn't contain exactly the same enchantments and levels
bool operator !=(const cEnchantments & a_Other) const;
@@ -131,15 +135,14 @@ protected:
} ; // tolua_export
-/** Things below for the Enchanting System */
+
+
+// Define the cWeightedEnchantment struct:
struct cWeightedEnchantment
{
int m_Weight;
cEnchantments m_Enchantments;
};
-typedef std::vector<cWeightedEnchantment> cWeightedEnchantments;
-
-