Changeset 79 for trunk/src/game/Level2.cpp

Timestamp:

11/19/08 13:32:21 (17 years ago)

Author:

yumileroy

Message:

[svn] * Minor code fixes
* Move account related functions from ObjectMgr? to AccountMgr? and drop duplicate functions - source mangos
* recognize the dummy spells 38637, 38638 and 38639 as negative - source mangos
* added new command ".reload all_locales". Now all locales_* tables can be reloaded - source mangos

Original author: KingPin?
Date: 2008-10-20 12:59:45-05:00

Files:

• trunk/src/game/Level2.cpp (modified) (6 diffs)

trunk/src/game/Level2.cpp

@@ -97 +97 @@
     {
         account_id = objmgr.GetPlayerAccountIdByGUID(guid);
-        security = objmgr.GetSecurityByAccount(account_id);
+        security = accmgr.GetSecurity(account_id);
     }
 
@@ -163 +163 @@
     {
         account_id = objmgr.GetPlayerAccountIdByGUID(guid);
-        security = objmgr.GetSecurityByAccount(account_id);
+        security = accmgr.GetSecurity(account_id);
     }
 
@@ -1450 +1450 @@
         type_str = guid_str;
         pCreature = getSelectedCreature();
-        if(!pCreature)
+        if(!pCreature || pCreature->isPet())
             return false;
         lowguid = pCreature->GetDBTableGUIDLow();
@@ -1596 +1596 @@
     Creature *pCreature = getSelectedCreature();
 
-    if(!pCreature)
+    if(!pCreature || pCreature->isPet())
     {
         SendSysMessage(LANG_SELECT_CREATURE);
@@ -2213 +2213 @@
         // -> Player must have selected a creature
 
-        if(!target)
+        if(!target || target->isPet())
         {
             SendSysMessage(LANG_SELECT_CREATURE);
@@ -2297 +2297 @@
 
         target = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_UNIT));
-        if(!target)
+        if(!target || target->isPet())
         {
             PSendSysMessage(LANG_WAYPOINT_CREATNOTFOUND, lowguid);