Changeset 168 for trunk/src/game/Creature.h

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/Creature.h (modified) (6 diffs)

trunk/src/game/Creature.h

@@ -113 +113 @@
     uint32 Icon;
     uint32 Action;
-    std::string Option;
+    uint32 BoxMoney;
+    bool Coded;
+    std::string OptionText;
+    std::string BoxText;
 };
 
@@ -167 +170 @@
     uint32  baseattacktime;
     uint32  rangeattacktime;
-    uint32  Flags;
+    uint32  unit_flags;                                     // enum UnitFlags mask values
     uint32  dynamicflags;
-    uint32  family;
+    uint32  family;                                         // enum CreatureFamily values for type==CREATURE_TYPE_BEAST, or 0 in another cases
     uint32  trainer_type;
     uint32  trainer_spell;
@@ -177 +180 @@
     float   maxrangedmg;
     uint32  rangedattackpower;
-    uint32  type;
-    uint32  flag1;
+    uint32  type;                                           // enum CreatureType values
+    uint32  type_flags;                                     // enum CreatureTypeFlags mask values
     uint32  lootid;
     uint32  pickpocketLootId;
@@ -206 +209 @@
     uint32 GetRandomValidModelId() const;
     uint32 GetFirstValidModelId() const;
+    
+    SkillType GetRequiredLootSkill() const
+    {
+        if(type_flags & CREATURE_TYPEFLAGS_HERBLOOT)
+            return SKILL_HERBALISM;
+        else if(type_flags & CREATURE_TYPEFLAGS_MININGLOOT)
+            return SKILL_MINING;
+        else
+            return SKILL_SKINNING;                          // normal case
+    }
+    
+    bool isTameable() const
+    {
+        return type == CREATURE_TYPE_BEAST && family != 0 && (type_flags & CREATURE_TYPEFLAGS_TAMEBLE);
+    }
 };
 
@@ -212 +230 @@
     std::vector<std::string> Name;
     std::vector<std::string> SubName;
+};
+
+struct NpcOptionLocale
+{
+    std::vector<std::string> OptionText;
+    std::vector<std::string> BoxText;
 };
 
@@ -474 +498 @@
         char const* GetScriptName() const;
 
-        void prepareGossipMenu( Player *pPlayer,uint32 gossipid );
-        void sendPreparedGossip( Player* player);
+        void prepareGossipMenu( Player *pPlayer, uint32 gossipid = 0 );
+        void sendPreparedGossip( Player* player );
         void OnGossipSelect(Player* player, uint32 option);
         void OnPoiSelect(Player* player, GossipOption const *gossip);