* Merge

--HG--
branch : trunk

src/game/Map.cpp

@@ -3714,6 +3714,18 @@ void Map::ScriptsProcess()
 
                 break;
             }
+            case SCRIPT_COMMAND_MODEL:
+            {
+                if(!source)
+                {
+                    sLog.outError("SCRIPT_COMMAND_MODEL call for NULL creature.");
+                    break;
+                }
+
+                source->ToCreature()->SetDisplayId(step.script->datalong);
+
+                break;
+            }
             default:
                 sLog.outError("Unknown script command %u called.",step.script->command);
                 break;

src/game/SocialMgr.cpp

@@ -313,8 +313,8 @@ PlayerSocial *SocialMgr::LoadFromDB(QueryResult_AutoPtr result, uint32 guid)
 
         social->m_playerSocialMap[friend_guid] = FriendInfo(flags, note);
 
-        // client limit
-        if(social->m_playerSocialMap.size() >= 50)
+        // client's friends list and ignore list limit
+        if(social->m_playerSocialMap.size() >= (SOCIALMGR_FRIEND_LIMIT + SOCIALMGR_IGNORE_LIMIT))
             break;
     }
     while (result->NextRow());

src/game/Spell.cpp

@@ -5029,10 +5029,8 @@ SpellCastResult Spell::CheckCast(bool strict)
                     return SPELL_FAILED_TARGET_UNSKINNABLE;
 
                 Creature* creature = m_targets.getUnitTarget()->ToCreature();
-                if ( creature->GetCreatureType() != CREATURE_TYPE_CRITTER && ( !creature->lootForBody || !creature->loot.empty() ) )
-                {
+                if (creature->GetCreatureType() != CREATURE_TYPE_CRITTER && !creature->loot.isLooted())
                     return SPELL_FAILED_TARGET_NOT_LOOTED;
-                }
 
                 uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill();
 

src/game/World.h

@@ -415,6 +415,7 @@ enum RealmZone
 //trinity only
 #define SCRIPT_COMMAND_ORIENTATION          30              // o = orientation
 #define SCRIPT_COMMAND_EQUIP                31              // datalong = equipment id
+#define SCRIPT_COMMAND_MODEL                32              // datalong = model id
 
 /// Storage class for commands issued for delayed execution
 struct CliCommandHolder