Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Fixed warnings

Browse Source
This commit is contained in:
Vincent-Michael
2016-06-08 13:05:23 +02:00
parent 15bea97f83
commit 7eceba09d7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
View File

@@ -443,11 +443,11 @@ void AuctionHouseMgr::PendingAuctionProcess(Player* player)
totaldeposit = GetAuctionDeposit(itr->auctionHouseEntry, itr->etime, item, totalItems);
uint32 depositremain = totaldeposit;
for (auto itr = thisAH->begin(); itr != thisAH->end(); ++itr)
for (auto itrAH = thisAH->begin(); itrAH != thisAH->end(); ++itrAH)
{
AuctionEntry* AH = (*itr);
AuctionEntry* AH = (*itrAH);
if (next(itr) == thisAH->end())
if (next(itrAH) == thisAH->end())
AH->deposit = depositremain;
else
{

2
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -446,7 +446,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
if (Unit* unit = object->ToUnit())
{
if (ConditionValue1 == 0)
condMeets = (unit->GetStandState() == ConditionValue2);
condMeets = (unit->GetStandState() == UnitStandStateType(ConditionValue2));
else if (ConditionValue2 == 0)
condMeets = unit->IsStandState();
else if (ConditionValue2 == 1)

4
src/server/scripts/Pet/pet_mage.cpp
View File

@@ -198,8 +198,8 @@ class npc_pet_mage_mirror_image : public CreatureScript
if (!target || me->GetVictim() != target)
{
Unit* ownerTarget = nullptr;
if (Player* owner = me->GetCharmerOrOwner()->ToPlayer())
ownerTarget = owner->GetSelectedUnit();
if (Player* ownerPlayer = me->GetCharmerOrOwner()->ToPlayer())
ownerTarget = ownerPlayer->GetSelectedUnit();
// recognize which victim will be choosen
if (ownerTarget && ownerTarget->GetTypeId() == TYPEID_PLAYER)