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

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/Creature.h (modified) (5 diffs)

trunk/src/game/Creature.h

@@ -124 +124 @@
     uint32 lastincr;
     uint32 ExtendedCost;
-};
-
-struct TrainerSpell
-{
-    SpellEntry const* spell;
-    uint32 spellcost;
-    uint32 reqskill;
-    uint32 reqskillvalue;
-    uint32 reqlevel;
 };
 
@@ -301 +292 @@
 #endif
 
+struct TrainerSpell
+{
+    uint32 spell;
+    uint32 spellcost;
+    uint32 reqskill;
+    uint32 reqskillvalue;
+    uint32 reqlevel;
+};
+
+typedef std::vector<TrainerSpell*> TrainerSpellList;
+
+struct TrainerSpellData
+{
+    TrainerSpellData() : trainerType(0) {}
+
+    TrainerSpellList spellList;
+    uint32 trainerType;                                     // trainer type based at trainer spells, can be different from creature_template value.
+                                                            // req. for correct show non-prof. trainers like weaponmaster, allowed values 0 and 2.
+
+    void Clear();
+    TrainerSpell const* Find(uint32 spell_id) const;
+};
+
 typedef std::list<GossipOption> GossipOptionList;
 
@@ -441 +455 @@
         }
 
-        /*********************************************************/
-        /***                    TRAINER SYSTEM                 ***/
-        /*********************************************************/
-        typedef std::list<TrainerSpell> SpellsList;
-        void LoadTrainerSpells();                           // must be called before access to trainer spells, lazy loading at first call
-        void ReloadTrainerSpells() { m_trainerSpellsLoaded = false; LoadTrainerSpells(); }
-        SpellsList const& GetTrainerSpells() const { return m_trainer_spells; }
-        uint32 GetTrainerType() const { return m_trainer_type; }
+        TrainerSpellData const* GetTrainerSpells() const;
 
         CreatureInfo const *GetCreatureInfo() const { return m_creatureInfo; }
@@ -559 +566 @@
         bool m_itemsLoaded;                                 // vendor items loading state
 
-        // trainer spells
-        bool m_trainerSpellsLoaded;                         // trainer spells loading state
-        SpellsList m_trainer_spells;
-        uint32 m_trainer_type;                              // trainer type based at trainer spells, can be different from creature_template value.
-                                                            // req. for correct show non-prof. trainers like weaponmaster.
         void _RealtimeSetCreatureInfo();
 
@@ -581 +583 @@
         bool m_gossipOptionLoaded;
         GossipOptionList m_goptions;
-        uint32 m_NPCTextId;                                 // cached value
 
         uint8 m_emoteState;