aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChaz Brown <iamparadox@netscape.net>2009-08-15 14:10:50 -0400
committerChaz Brown <iamparadox@netscape.net>2009-08-15 14:10:50 -0400
commitdb31023cc5731118471ea6ba45ade7b50b2ed054 (patch)
tree5dcda1158cd031ed8fe1f153beb0e0cc3b22a0d4 /src
parentab744808c7b7d0c88377073cbc94019d464756bc (diff)
Reintroduce spell categories for Food and drink removed in 4904 (bd5ef2d4ac26) and change code that used hard coded numbers to use them instead - Thanks, Peldor
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp6
-rw-r--r--src/game/SharedDefines.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 82c8eb2ded0..ebcf6a1d3c6 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
// ***********************************