From 3438247904baff7a95ba51775d81c438543c9937 Mon Sep 17 00:00:00 2001 From: Uleat Date: Mon, 17 Oct 2016 01:03:40 -0400 Subject: [PATCH] Moved namespace ItemField from item_instance.h to shareddb.cpp --- changelog.txt | 3 +++ common/item_instance.h | 12 ------------ common/shareddb.cpp | 11 +++++++++++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/changelog.txt b/changelog.txt index 5dfeca1d1..0d4412bbd 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 10/17/2016 == +Uleat: Moved namespace ItemField from item_instance.h to shareddb.cpp - the only place it is used + == 10/16/2016 == Uleat: Renamed struct EQEmu::ItemBase to EQEmu::ItemData and class ItemInst to EQEmu::ItemInstance Uleat: Added class EQEmu::InventorySlot. Re-attached pertinent inventory token references to EQDictionary diff --git a/common/item_instance.h b/common/item_instance.h index a1793dee2..b83baa13f 100644 --- a/common/item_instance.h +++ b/common/item_instance.h @@ -39,18 +39,6 @@ class EvolveInfo; // Stores information about an evolving item family #include -namespace ItemField -{ - enum - { - source = 0, -#define F(x) x, -#include "item_fieldlist.h" -#undef F - updated - }; -}; - // Specifies usage type for item inside EQEmu::ItemInstance enum ItemInstTypes { diff --git a/common/shareddb.cpp b/common/shareddb.cpp index e748a2d56..35369c758 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -38,6 +38,17 @@ #include "string_util.h" #include "eqemu_config.h" +namespace ItemField +{ + enum { + source = 0, +#define F(x) x, +#include "item_fieldlist.h" +#undef F + updated + }; +} + SharedDatabase::SharedDatabase() : Database() {