Changeset 168 for trunk/src/game/Spell.cpp

Timestamp:

11/19/08 13:42:33 (17 years ago)

Author:

yumileroy

Message:

[svn] *** Source Mangos ***
*Load npc_options at server startup, use cached data at creature gossip menu init.
* Also new .reload table command added
*Implement npc_option localization support, also store in DB BoxText/BoxMoney/Coded?
* Use characters.guid instead low guid value from characters.data in charcter enum data prepering for client.
* Fixed crash at .pinfo command use from console.
* Fixed windows ad.exe build
*Creature related code and DB cleanups.
* Rename 2 creature_template fields to more clean names and related code update also.
* Use enum values instead raw values for type_flags, use halper functions instead code repeating.
* Move tamed pet creating code to new function.

** Small code changes to make things compliant with above changes.
** Another rev with big changes so test away.

Original author: KingPin?
Date: 2008-11-05 09:22:56-06:00

Files:

• trunk/src/game/Spell.cpp (modified) (2 diffs)

trunk/src/game/Spell.cpp

@@ -3670 +3670 @@
                 }
 
-                uint32 skill;
-                if(creature->GetCreatureInfo()->flag1 & 256)
-                    skill = SKILL_HERBALISM;                // special case
-                else if(creature->GetCreatureInfo()->flag1 & 512)
-                    skill = SKILL_MINING;                   // special case
-                else
-                    skill = SKILL_SKINNING;                 // normal case
+                uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill();
 
                 int32 skillValue = ((Player*)m_caster)->GetSkillValue(skill);
@@ -3968 +3962 @@
                         return SPELL_FAILED_HIGHLEVEL;
 
-                    CreatureInfo const *cinfo = ((Creature*)m_targets.getUnitTarget())->GetCreatureInfo();
-                    if( cinfo->type != CREATURE_TYPE_BEAST )
-                        return SPELL_FAILED_BAD_TARGETS;
-
                     // use SMSG_PET_TAME_FAILURE?
-                    if( !(cinfo->flag1 & 1) || !(cinfo->family) )
+                    if (!((Creature*)m_targets.getUnitTarget())->GetCreatureInfo()->isTameable ())
                         return SPELL_FAILED_BAD_TARGETS;