Changeset 3194

Timestamp:

03/03/2010 01:37:14 PM (6 months ago)

Author:

jackpoz

Message:

MODIFIED: Added some more notifications when an invalid faction is assigned to Units And GameObjects?. This fixes some crashes related to invalid factions, too.
MODIFIED: Some code cleanup.

Location:

trunk/src/arcemu-world

Files:

• Creature.cpp (modified) (2 diffs)
• GameObject.cpp (modified) (1 diff)
• GameObject.h (modified) (1 diff)
• Object.cpp (modified) (2 diffs)
• SpellEffects.cpp (modified) (1 diff)

trunk/src/arcemu-world/Creature.cpp

@@ -1294 +1294 @@
         m_aiInterface->timed_emotes = objmgr.GetTimedEmoteList(spawn->id);
 
-        m_faction = dbcFactionTemplate.LookupEntryForced(spawn->factionid);
-        if(m_faction)
-        {
-                m_factionDBC = dbcFaction.LookupEntry(m_faction->Faction);
-                // not a neutral creature
-                if(!(m_factionDBC->RepListId == -1 && m_faction->HostileMask == 0 && m_faction->FriendlyMask == 0))
-                {
-                        GetAIInterface()->m_canCallForHelp = true;
-                }
+        // not a neutral creature
+        if(!(m_factionDBC->RepListId == -1 && m_faction->HostileMask == 0 && m_faction->FriendlyMask == 0))
+        {
+                GetAIInterface()->m_canCallForHelp = true;
         }
 
@@ -1525 +1520 @@
         m_position.ChangeCoords( x, y, z, o );
         m_spawnLocation.ChangeCoords(x, y, z, o);
-        m_faction = dbcFactionTemplate.LookupEntryForced(proto->Faction);
-
-        if(m_faction)
-        {
-                m_factionDBC = dbcFaction.LookupEntry(m_faction->Faction);
-                // not a neutral creature
-                if(!(m_factionDBC->RepListId == -1 && m_faction->HostileMask == 0 && m_faction->FriendlyMask == 0))
-                {
-                        GetAIInterface()->m_canCallForHelp = true;
-                }
+
+        // not a neutral creature
+        if(!(m_factionDBC->RepListId == -1 && m_faction->HostileMask == 0 && m_faction->FriendlyMask == 0))
+        {
+                GetAIInterface()->m_canCallForHelp = true;
         }
 

trunk/src/arcemu-world/GameObject.cpp

@@ -457 +457 @@
         {
                 SetFaction(spawn->faction);
-                m_faction = dbcFactionTemplate.LookupEntryForced(spawn->faction);
-                if(m_faction)
-                        m_factionDBC = dbcFaction.LookupEntry(m_faction->Faction);
         }
         SetScale( spawn->scale);

trunk/src/arcemu-world/GameObject.h

@@ -330 +330 @@
         float GetParentRotation( uint8 rot ) { return GetFloatValue(GAMEOBJECT_PARENTROTATION+rot); }
 
-        void SetFaction( uint32 id ) { SetUInt32Value(GAMEOBJECT_FACTION, id); }
+        void SetFaction( uint32 id ) 
+        { 
+                SetUInt32Value(GAMEOBJECT_FACTION, id); 
+                _setFaction();
+        }
         uint32 GetFaction() { return GetUInt32Value(GAMEOBJECT_FACTION); }
 

trunk/src/arcemu-world/Object.cpp

@@ -1551 +1551 @@
                 factT = dbcFactionTemplate.LookupEntryForced(TO_UNIT(this)->GetFaction());
                 if( !factT )
-                        sLog.outDetail("Unit does not have a valid faction. It will make him act stupid in world. Don't blame us, blame yourself for not checking :P, faction %u set to entry %u",TO_UNIT(this)->GetFaction(),GetEntry() );
+                        sLog.outError("Unit does not have a valid faction. It will make him act stupid in world. Don't blame us, blame yourself for not checking :P, faction %u set to entry %u",TO_UNIT(this)->GetFaction(),GetEntry() );
         }
         else
@@ -1558 +1558 @@
                 factT = dbcFactionTemplate.LookupEntryForced(static_cast<GameObject*>(this)->GetFaction());
                 if( !factT )
-                        sLog.outDetail("Game Object does not have a valid faction. It will make him act stupid in world. Don't blame us, blame yourself for not checking :P, faction %u set to entry %u",static_cast<GameObject*>(this)->GetFaction(),GetEntry() );
+                        sLog.outError("Game Object does not have a valid faction. It will make him act stupid in world. Don't blame us, blame yourself for not checking :P, faction %u set to entry %u",static_cast<GameObject*>(this)->GetFaction(),GetEntry() );
         }
 

trunk/src/arcemu-world/SpellEffects.cpp

@@ -4187 +4187 @@
                         p->SetFaction(proto->Faction );
                 }
-
-                p->m_faction = dbcFactionTemplate.LookupEntryForced(proto->Faction);
-                if(p->m_faction)
-                        p->m_factionDBC = dbcFaction.LookupEntry(p->m_faction->Faction);
                 p->PushToWorld(u_caster->GetMapMgr());
                 //make sure they will be desummoned (roxor)