Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
This commit is contained in:
Nay committed 2013-07-14 18:59:09 +01:00
commit b87f794e16
3 files changed
+18 -4

No files matched your search

+3 -3
View File
@@ -22642,10 +22642,10 @@ bool Player::IsAlwaysDetectableFor(WorldObject const* seer) const
if (const Player* seerPlayer = seer->ToPlayer())
if (IsGroupVisibleFor(seerPlayer))
return true;
return !(seerPlayer->duel && seerPlayer->duel->startTime != 0 && seerPlayer->duel->opponent == this);
return false;
}
return false;
}
bool Player::IsVisibleGloballyFor(Player const* u) const
{
+1 -1
View File
@@ -2542,7 +2542,7 @@ void ObjectMgr::LoadItemTemplates()
itemTemplate.Name1 = fields[4].GetString();
itemTemplate.DisplayInfoID = fields[5].GetUInt32();
itemTemplate.Quality = uint32(fields[6].GetUInt8());
itemTemplate.Flags = uint32(fields[7].GetInt64());
itemTemplate.Flags = uint32(fields[7].GetUInt32());
itemTemplate.Flags2 = fields[8].GetUInt32();
itemTemplate.Unk430_1 = fields[9].GetFloat();
itemTemplate.Unk430_2 = fields[10].GetFloat();