diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/Map.cpp | 12 | ||||
| -rw-r--r-- | src/game/SocialMgr.cpp | 4 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 4 | ||||
| -rw-r--r-- | src/game/World.h | 1 |
4 files changed, 16 insertions, 5 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 1214247efaf..dc20e33047c 100644 --- a/src/game/Map.cpp +++ b/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; diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp index c619da3178d..f11cc092ba0 100644 --- a/src/game/SocialMgr.cpp +++ b/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()); diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 248a390c0b8..bad60d69cfd 100644 --- a/src/game/Spell.cpp +++ b/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(); diff --git a/src/game/World.h b/src/game/World.h index 1f3f9b87601..87450bc4828 100644 --- a/src/game/World.h +++ b/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 |