diff options
| author | Machiavelli <none@none> | 2009-08-15 20:25:28 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-08-15 20:25:28 +0200 |
| commit | eb9d9ff071936aa0b3b8aead01025da77e1c6b2a (patch) | |
| tree | 7cc4ae47418b78cbe4aef01c88fb272edc98ce30 | |
| parent | b3a363cc4f8bd49745f398aee70e473f4d5c6ec3 (diff) | |
| parent | db31023cc5731118471ea6ba45ade7b50b2ed054 (diff) | |
*Merge
--HG--
branch : trunk
| -rw-r--r-- | src/game/Player.cpp | 6 | ||||
| -rw-r--r-- | src/game/SharedDefines.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index a8af03ae0e6..d1358e5a5c3 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -751,15 +751,15 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 // BuyCount by default uint32 count = iProto->BuyCount; - // special amount for foor/drink + // special amount for food/drink if(iProto->Class==ITEM_CLASS_CONSUMABLE && iProto->SubClass==ITEM_SUBCLASS_FOOD) { switch(iProto->Spells[0].SpellCategory) { - case 11: // food + case SPELL_CATEGORY_FOOD: // food count = getClass()==CLASS_DEATH_KNIGHT ? 10 : 4; break; - case 59: // drink + case SPELL_CATEGORY_DRINK: // drink count = 2; break; } diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h index 8c8a569dcc8..ffd6c0ce2ee 100644 --- a/src/game/SharedDefines.h +++ b/src/game/SharedDefines.h @@ -209,6 +209,12 @@ enum ItemQualities #define MAX_ITEM_QUALITY 8 +enum SpellCategory +{ + SPELL_CATEGORY_FOOD = 11, + SPELL_CATEGORY_DRINK = 59, +}; + // *********************************** // Spell Attributes definitions // *********************************** |