Changeset 168 for trunk/src/game/Level2.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/Level2.cpp (modified) (3 diffs)

trunk/src/game/Level2.cpp

@@ -1797 +1797 @@
     {
         accId = objmgr.GetPlayerAccountIdByGUID(targetGUID);
-        Player plr(m_session);                              // use current session for temporary load
+        WorldSession session(0,NULL,SEC_PLAYER,0,0,LOCALE_enUS);
+        Player plr(&session);                               // use fake session for temporary load
         plr.MinimalLoadFromDB(NULL, targetGUID);
         money = plr.GetMoney();
@@ -4133 +4134 @@
         Player *player = m_session->GetPlayer();
         Creature *creatureTarget = getSelectedCreature();
+    
+        if(!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER)
+        {
+                PSendSysMessage(LANG_SELECT_CREATURE);
+                SetSentErrorMessage(true);
+                return false;
+        }
 
         CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creatureTarget->GetEntry());
@@ -4149 +4157 @@
                 return false;
         }
-        
-        if(!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER)
-        {
-                PSendSysMessage(LANG_SELECT_CREATURE);
-                SetSentErrorMessage(true);
-                return false;
-        }
 
         // Everything looks OK, create new pet