aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-08-14 02:56:45 +0100
committerNay <dnpd.dd@gmail.com>2012-08-14 02:56:45 +0100
commita768bba3c67e8c663ba95851dfedf2b300dfdee3 (patch)
tree6f6f49f39a2b6245a801a1fce4d9ba6ae3e3946a
parentdf073d3d692905f1fc1c64ff42d73cff04c5738d (diff)
Core: Add enum for currency flags, update MAX_VENDOR_ITEMS and fix build
-rw-r--r--src/server/game/DataStores/DBCStructure.h2
-rwxr-xr-xsrc/server/game/Entities/Creature/Creature.h2
-rwxr-xr-xsrc/server/game/Entities/Item/ItemPrototype.h8
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
4 files changed, 12 insertions, 4 deletions
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 56f422faf9d..c5344adbc8d 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1120,7 +1120,7 @@ struct GtRegenMPPerSptEntry
struct GtSpellScalingEntry
{
float value;
-}
+};
struct GtOCTBaseHPByClassEntry
{
diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h
index 4b2582ec558..61982026933 100755
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -406,7 +406,7 @@ typedef std::map<uint32, time_t> CreatureSpellCooldowns;
// max different by z coordinate for creature aggro reaction
#define CREATURE_Z_ATTACK_RANGE 3
-#define MAX_VENDOR_ITEMS 150 // Limitation in 3.x.x item count in SMSG_LIST_INVENTORY
+#define MAX_VENDOR_ITEMS 300 // Limitation in 4.x.x item count in SMSG_LIST_INVENTORY
enum CreatureCellMoveState
{
diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h
index 0d51c6e7e70..1fd46a2d879 100755
--- a/src/server/game/Entities/Item/ItemPrototype.h
+++ b/src/server/game/Entities/Item/ItemPrototype.h
@@ -210,6 +210,14 @@ enum ItemFlagsCustom
ITEM_FLAGS_CU_FOLLOW_LOOT_RULES = 0x0004, // Item will always follow group/master/need before greed looting rules
};
+enum CurrencyFlags
+{
+ CURRENCY_FLAG_TRADEABLE = 0x01,
+ // ...
+ CURRENCY_FLAG_HIGH_PRECISION = 0x08,
+ // ...
+};
+
enum BAG_FAMILY_MASK
{
BAG_FAMILY_MASK_NONE = 0x00000000,
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 17cead41795..108e4b05e08 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7253,7 +7253,7 @@ void Player::SendCurrencies() const
if (!entry) // should never happen
continue;
- uint32 precision = (entry->Flags & 0x8) ? 100 : 1;
+ uint32 precision = (entry->Flags & CURRENCY_FLAG_HIGH_PRECISION) ? 100 : 1;
uint32 weekCount = itr->second.weekCount / precision;
uint32 weekCap = _GetCurrencyWeekCap(entry) / precision;
@@ -7299,7 +7299,7 @@ void Player::ModifyCurrency(uint32 id, int32 count)
CurrencyTypesEntry const* currency = sCurrencyTypesStore.LookupEntry(id);
ASSERT(currency);
- int32 precision = currency->Flags & 0x8 ? 100 : 1;
+ int32 precision = currency->Flags & CURRENCY_FLAG_HIGH_PRECISION ? 100 : 1;
uint32 oldTotalCount = 0;
uint32 oldWeekCount = 0;
PlayerCurrenciesMap::iterator itr = m_currencies.find(id);