*Merge.

--HG--
branch : trunk

src/game/AccountMgr.cpp

@@ -217,3 +217,4 @@ bool AccountMgr::normilizeString(std::string& utf8str)
 
     return WStrToUtf8(wstr_buf,wstr_len,utf8str);
 }
+

src/game/AccountMgr.h

@@ -58,3 +58,4 @@ class AccountMgr
 
 #define accmgr Trinity::Singleton<AccountMgr>::Instance()
 #endif
+

src/game/AddonHandler.cpp

@@ -229,3 +229,4 @@ void AddonHandler::BuildAddonPacket(WorldPacket* Source, WorldPacket* Target, ui
     }
 }
 */
+

src/game/AddonHandler.h

@@ -37,3 +37,4 @@ class AddonHandler
 };
 #define sAddOnHandler Trinity::Singleton<AddonHandler>::Instance()
 #endif
+

src/game/AggressorAI.cpp

@@ -113,3 +113,4 @@ AggressorAI::UpdateAI(const uint32 /*diff*/)
         }
     }
 }
+

src/game/AggressorAI.h

@@ -50,3 +50,4 @@ class TRINITY_DLL_DECL AggressorAI : public CreatureAI
         TimeTracker i_tracker;
 };
 #endif
+

src/game/AnimalRandomMovementGenerator.h

@@ -28,3 +28,4 @@
  *  animal creatures.
  */
 #endif
+

src/game/ArenaTeam.cpp

@@ -684,3 +684,4 @@ arenateam fields (id from 2.3.3 client):
 1430 - unk - rank?
 1431 - personal arena rating
 */
+

src/game/ArenaTeam.h

@@ -224,3 +224,4 @@ class ArenaTeam
         ArenaTeamStats stats;
 };
 #endif
+

src/game/ArenaTeamHandler.cpp

@@ -438,3 +438,4 @@ ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S "%s is full"
 
 ERR_ARENA_TEAM_LEVEL_TOO_LOW_I "You must be level %d to form an arena team"
 */
+

src/game/AuctionHouse.cpp

@@ -0,0 +1,759 @@
+/*
+ * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+ *
+ * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "Opcodes.h"
+#include "Log.h"
+#include "World.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "UpdateMask.h"
+#include "AuctionHouseObject.h"
+#include "Util.h"
+#include "AuctionHouseBot.h"
+
+//please DO NOT use iterator++, because it is slower than ++iterator!!!
+//post-incrementation is always slower than pre-incrementation !
+
+//void called when player click on auctioneer npc
+void WorldSession::HandleAuctionHelloOpcode( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8);
+
+    uint64 guid;                                            //NPC guid
+    recv_data >> guid;
+
+    Creature *unit = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!unit)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
+        return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    SendAuctionHello(guid, unit);
+}
+
+static uint8 AuctioneerFactionToLocation(uint32 faction)
+{
+    if(sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
+        return 7;                                           // neutral
+
+    FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(faction);
+    if(!u_entry)
+        return 7;                                           // neutral
+
+    if(u_entry->ourMask & FACTION_MASK_ALLIANCE)
+        return 2;
+    else if(u_entry->ourMask & FACTION_MASK_HORDE)
+        return 6;
+    else
+        return 7;
+}
+
+//this void causes that auction window is opened
+void WorldSession::SendAuctionHello( uint64 guid, Creature* unit )
+{
+    WorldPacket data( MSG_AUCTION_HELLO, 12 );
+    data << (uint64) guid;
+    data << (uint32) AuctioneerFactionToLocation(unit->getFaction());
+    SendPacket( &data );
+}
+
+//this function inserts to WorldPacket auction's data
+bool WorldSession::SendAuctionInfo(WorldPacket & data, AuctionEntry* auction)
+{
+    Item *pItem = objmgr.GetAItem(auction->item_guidlow);
+    if (!pItem)
+    {
+        sLog.outError("auction to item, that doesn't exist !!!!");
+        return false;
+    }
+    data << (uint32) auction->Id;
+    data << (uint32) pItem->GetEntry();
+
+    for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; i++)
+    {
+        data << (uint32) pItem->GetEnchantmentId(EnchantmentSlot(i));
+        data << (uint32) pItem->GetEnchantmentDuration(EnchantmentSlot(i));
+        data << (uint32) pItem->GetEnchantmentCharges(EnchantmentSlot(i));
+    }
+
+    data << (uint32) pItem->GetItemRandomPropertyId();      //random item property id
+    data << (uint32) pItem->GetItemSuffixFactor();          //SuffixFactor
+    data << (uint32) pItem->GetCount();                     //item->count
+    data << (uint32) pItem->GetSpellCharges();              //item->charge FFFFFFF
+    data << (uint32) 0;                                     //Unknown
+    data << (uint64) auction->owner;                        //Auction->owner
+    data << (uint32) auction->startbid;                     //Auction->startbid (not sure if useful)
+    data << (uint32) ((auction->bid)? objmgr.GetAuctionOutBid(auction->bid) : 0);
+                                                            //minimal outbid
+    data << (uint32) auction->buyout;                       //auction->buyout
+    data << (uint32) (auction->time - time(NULL)) * 1000;   //time left
+    data << (uint64) auction->bidder;                       //auction->bidder current
+    data << (uint32) auction->bid;                          //current bid
+    return true;
+}
+
+//call this method when player bids, creates, or deletes auction
+void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError )
+{
+    WorldPacket data( SMSG_AUCTION_COMMAND_RESULT, 16 );
+    data << auctionId;
+    data << Action;
+    data << ErrorCode;
+    if ( !ErrorCode && Action )
+        data << bidError;                                   //when bid, then send 0, once...
+    SendPacket(&data);
+}
+
+//this function sends notification, if bidder is online
+void WorldSession::SendAuctionBidderNotification( uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 item_template)
+{
+    WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4));
+    data << location;
+    data << auctionId;
+    data << (uint64) bidder;
+    data << bidSum;
+    data << (uint32) diff;
+    data << item_template;
+    data << (uint32) 0;
+    SendPacket(&data);
+}
+
+//this void causes on client to display: "Your auction sold"
+void WorldSession::SendAuctionOwnerNotification( AuctionEntry* auction)
+{
+    WorldPacket data(SMSG_AUCTION_OWNER_NOTIFICATION, (7*4));
+    data << auction->Id;
+    data << auction->bid;
+    data << (uint32) 0;                                     //unk
+    data << (uint32) 0;                                     //unk
+    data << (uint32) 0;                                     //unk
+    data << auction->item_template;
+    data << (uint32) 0;                                     //unk
+    SendPacket(&data);
+}
+
+//this function sends mail to old bidder
+void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction, uint32 newPrice)
+{
+    uint64 oldBidder_guid = MAKE_NEW_GUID(auction->bidder,0, HIGHGUID_PLAYER);
+    Player *oldBidder = objmgr.GetPlayer(oldBidder_guid);
+
+    uint32 oldBidder_accId = 0;
+    if(!oldBidder)
+        oldBidder_accId = objmgr.GetPlayerAccountIdByGUID(oldBidder_guid);
+
+    // old bidder exist
+    if(oldBidder || oldBidder_accId)
+    {
+        std::ostringstream msgAuctionOutbiddedSubject;
+        msgAuctionOutbiddedSubject << auction->item_template << ":0:" << AUCTION_OUTBIDDED;
+
+        if (oldBidder && !_player)
+             oldBidder->GetSession()->SendAuctionBidderNotification( auction->location, auction->Id, AHBplayerGUID, newPrice, objmgr.GetAuctionOutBid(auction->bid), auction->item_template);
+
+        if (oldBidder && _player)
+            oldBidder->GetSession()->SendAuctionBidderNotification( auction->location, auction->Id, _player->GetGUID(), newPrice, objmgr.GetAuctionOutBid(auction->bid), auction->item_template);
+
+        WorldSession::SendMailTo(oldBidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, auction->bidder, msgAuctionOutbiddedSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE);
+    }
+}
+
+//this function sends mail, when auction is canceled to old bidder
+void WorldSession::SendAuctionCancelledToBidderMail( AuctionEntry* auction )
+{
+    uint64 bidder_guid = MAKE_NEW_GUID(auction->bidder, 0, HIGHGUID_PLAYER);
+    Player *bidder = objmgr.GetPlayer(bidder_guid);
+
+    uint32 bidder_accId = 0;
+    if(!bidder)
+        bidder_accId = objmgr.GetPlayerAccountIdByGUID(bidder_guid);
+
+    // bidder exist
+    if(bidder || bidder_accId)
+    {
+        std::ostringstream msgAuctionCancelledSubject;
+        msgAuctionCancelledSubject << auction->item_template << ":0:" << AUCTION_CANCELLED_TO_BIDDER;
+
+        WorldSession::SendMailTo(bidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, auction->bidder, msgAuctionCancelledSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE);
+    }
+}
+
+//this void creates new auction and adds auction to some auctionhouse
+void WorldSession::HandleAuctionSellItem( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8+8+4+4+4);
+
+    uint64 auctioneer, item;
+    uint32 etime, bid, buyout;
+    recv_data >> auctioneer >> item;
+    recv_data >> bid >> buyout >> etime;
+    Player *pl = GetPlayer();
+
+    if (!item || !bid || !etime)
+        return;                                             //check for cheaters
+
+    Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!pCreature)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) );
+        return;
+    }
+
+    // client send time in minutes, convert to common used sec time
+    etime *= MINUTE;
+
+    // client understand only 3 auction time
+    switch(etime)
+    {
+        case 1*MIN_AUCTION_TIME:
+        case 2*MIN_AUCTION_TIME:
+        case 4*MIN_AUCTION_TIME:
+            break;
+        default:
+            return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    Item *it = pl->GetItemByGuid( item );
+    //do not allow to sell already auctioned items
+    if(objmgr.GetAItem(GUID_LOPART(item)))
+    {
+        sLog.outError("AuctionError, player %s is sending item id: %u, but item is already in another auction", pl->GetName(), GUID_LOPART(item));
+        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
+        return;
+    }
+    // prevent sending bag with items (cheat: can be placed in bag after adding equiped empty bag to auction)
+    if(!it)
+    {
+        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_ITEM_NOT_FOUND);
+        return;
+    }
+
+    if(!it->CanBeTraded())
+    {
+        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
+        return;
+    }
+
+    if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || it->GetUInt32Value(ITEM_FIELD_DURATION))
+    {
+        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
+        return;
+    }
+
+    uint32 location = AuctioneerFactionToLocation(pCreature->getFaction());
+    AuctionHouseObject * mAuctions;
+    mAuctions = objmgr.GetAuctionsMap( location );
+
+    //we have to take deposit :
+    uint32 deposit = objmgr.GetAuctionDeposit( location, etime, it );
+    if ( pl->GetMoney() < deposit )
+    {
+        SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_NOT_ENOUGHT_MONEY);
+        return;
+    }
+
+    if( GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) )
+    {
+        sLog.outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)",
+            GetPlayerName(),GetAccountId(),it->GetProto()->Name1,it->GetEntry(),it->GetCount());
+    }
+
+    pl->ModifyMoney( -int32(deposit) );
+
+    uint32 auction_time = uint32(etime * sWorld.getRate(RATE_AUCTION_TIME));
+
+    AuctionEntry *AH = new AuctionEntry;
+    AH->Id = objmgr.GenerateAuctionID();
+    AH->auctioneer = GUID_LOPART(auctioneer);
+    AH->item_guidlow = GUID_LOPART(item);
+    AH->item_template = it->GetEntry();
+    AH->owner = pl->GetGUIDLow();
+    AH->startbid = bid;
+    AH->bidder = 0;
+    AH->bid = 0;
+    AH->buyout = buyout;
+    AH->time = time(NULL) + auction_time;
+    AH->deposit = deposit;
+    AH->location = location;
+
+    sLog.outDetail("selling item %u to auctioneer %u with initial bid %u with buyout %u and with time %u (in sec) in location: %u", GUID_LOPART(item), GUID_LOPART(auctioneer), bid, buyout, auction_time, location);
+    mAuctions->AddAuction(AH);
+
+    objmgr.AddAItem(it);
+    pl->MoveItemFromInventory( it->GetBagSlot(), it->GetSlot(), true);
+
+    CharacterDatabase.BeginTransaction();
+    it->DeleteFromInventoryDB();
+    it->SaveToDB();                                         // recursive and not have transaction guard into self, not in inventiory and can be save standalone
+    CharacterDatabase.PExecute("INSERT INTO auctionhouse (id,auctioneerguid,itemguid,item_template,itemowner,buyoutprice,time,buyguid,lastbid,startbid,deposit,location) "
+        "VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '" I64FMTD "', '%u', '%u', '%u', '%u', '%u')",
+        AH->Id, AH->auctioneer, AH->item_guidlow, AH->item_template, AH->owner, AH->buyout, (uint64)AH->time, AH->bidder, AH->bid, AH->startbid, AH->deposit, AH->location);
+    pl->SaveInventoryAndGoldToDB();
+    CharacterDatabase.CommitTransaction();
+
+    SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK);
+}
+
+//this function is called when client bids or buys out auction
+void WorldSession::HandleAuctionPlaceBid( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8+4+4);
+
+    uint64 auctioneer;
+    uint32 auctionId;
+    uint32 price;
+    recv_data >> auctioneer;
+    recv_data >> auctionId >> price;
+
+    if (!auctionId || !price)
+        return;                                             //check for cheaters
+
+    Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!pCreature)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) );
+        return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    uint32 location = AuctioneerFactionToLocation(pCreature->getFaction());
+
+    AuctionHouseObject * mAuctions;
+    mAuctions = objmgr.GetAuctionsMap( location );
+
+    AuctionEntry *auction = mAuctions->GetAuction(auctionId);
+    Player *pl = GetPlayer();
+
+    if( !auction || auction->owner == pl->GetGUIDLow() )
+    {
+        //you cannot bid your own auction:
+        SendAuctionCommandResult( 0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR );
+        return;
+    }
+
+    // impossible have online own another character (use this for speedup check in case online owner)
+    Player* auction_owner = objmgr.GetPlayer(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER));
+    if( !auction_owner && objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)) == pl->GetSession()->GetAccountId())
+    {
+        //you cannot bid your another character auction:
+        SendAuctionCommandResult( 0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR );
+        return;
+    }
+
+    // cheating
+    if(price <= auction->bid)
+        return;
+
+    // price too low for next bid if not buyout
+    if ((price < auction->buyout || auction->buyout == 0) &&
+        price < auction->bid + objmgr.GetAuctionOutBid(auction->bid))
+    {
+        //auction has already higher bid, client tests it!
+        return;
+    }
+
+    if (price > pl->GetMoney())
+    {
+        //you don't have enought money!, client tests!
+        //SendAuctionCommandResult(auction->auctionId, AUCTION_PLACE_BID, ???);
+        return;
+    }
+
+    if ((price < auction->buyout) || (auction->buyout == 0))
+    {
+        if (auction->bidder > 0)
+        {
+            if ( auction->bidder == pl->GetGUIDLow() )
+            {
+                pl->ModifyMoney( -int32(price - auction->bid));
+            }
+            else
+            {
+                // mail to last bidder and return money
+                SendAuctionOutbiddedMail( auction , price );
+                pl->ModifyMoney( -int32(price) );
+            }
+        }
+        else
+        {
+            pl->ModifyMoney( -int32(price) );
+        }
+        auction->bidder = pl->GetGUIDLow();
+        auction->bid = price;
+
+        // after this update we should save player's money ...
+        CharacterDatabase.PExecute("UPDATE auctionhouse SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'", auction->bidder, auction->bid, auction->Id);
+
+        SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK, 0 );
+    }
+    else
+    {
+        //buyout:
+        if (pl->GetGUIDLow() == auction->bidder )
+        {
+            pl->ModifyMoney(-int32(auction->buyout - auction->bid));
+        }
+        else
+        {
+            pl->ModifyMoney(-int32(auction->buyout));
+            if ( auction->bidder )                          //buyout for bidded auction ..
+            {
+                SendAuctionOutbiddedMail( auction, auction->buyout );
+            }
+        }
+        auction->bidder = pl->GetGUIDLow();
+        auction->bid = auction->buyout;
+
+        objmgr.SendAuctionSalePendingMail( auction );
+        objmgr.SendAuctionSuccessfulMail( auction );
+        objmgr.SendAuctionWonMail( auction );
+
+        SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK);
+
+        objmgr.RemoveAItem(auction->item_guidlow);
+        mAuctions->RemoveAuction(auction->Id);
+        CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",auction->Id);
+
+        delete auction;
+    }
+    CharacterDatabase.BeginTransaction();
+    pl->SaveInventoryAndGoldToDB();
+    CharacterDatabase.CommitTransaction();
+}
+
+//this void is called when auction_owner cancels his auction
+void WorldSession::HandleAuctionRemoveItem( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8+4);
+
+    uint64 auctioneer;
+    uint32 auctionId;
+    recv_data >> auctioneer;
+    recv_data >> auctionId;
+    //sLog.outDebug( "Cancel AUCTION AuctionID: %u", auctionId);
+
+    Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, auctioneer,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!pCreature)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)) );
+        return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    uint32 location = AuctioneerFactionToLocation(pCreature->getFaction());
+
+    AuctionHouseObject * mAuctions;
+    mAuctions = objmgr.GetAuctionsMap( location );
+
+    AuctionEntry *auction = mAuctions->GetAuction(auctionId);
+    Player *pl = GetPlayer();
+
+    if (auction && auction->owner == pl->GetGUIDLow())
+    {
+        Item *pItem = objmgr.GetAItem(auction->item_guidlow);
+        if (pItem)
+        {
+            if (auction->bidder > 0)                        // If we have a bidder, we have to send him the money he paid
+            {
+                uint32 auctionCut = objmgr.GetAuctionCut( auction->location, auction->bid);
+                if ( pl->GetMoney() < auctionCut )          //player doesn't have enough money, maybe message needed
+                    return;
+                //some auctionBidderNotification would be needed, but don't know that parts..
+                SendAuctionCancelledToBidderMail( auction );
+                pl->ModifyMoney( -int32(auctionCut) );
+            }
+            // Return the item by mail
+            std::ostringstream msgAuctionCanceledOwner;
+            msgAuctionCanceledOwner << auction->item_template << ":0:" << AUCTION_CANCELED;
+
+            MailItemsInfo mi;
+            mi.AddItem(auction->item_guidlow, auction->item_template, pItem);
+
+            // item will deleted or added to received mail list
+            WorldSession::SendMailTo(pl, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->location, pl->GetGUIDLow(), msgAuctionCanceledOwner.str(), 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
+        }
+        else
+        {
+            sLog.outError("Auction id: %u has non-existed item (item guid : %u)!!!", auction->Id, auction->item_guidlow);
+            SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR );
+            return;
+        }
+    }
+    else
+    {
+        SendAuctionCommandResult( 0, AUCTION_CANCEL, AUCTION_INTERNAL_ERROR );
+        //this code isn't possible ... maybe there should be assert
+        sLog.outError("CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is NULL", pl->GetGUIDLow(), auctionId );
+        return;
+    }
+
+    //inform player, that auction is removed
+    SendAuctionCommandResult( auction->Id, AUCTION_CANCEL, AUCTION_OK );
+    // Now remove the auction
+    CharacterDatabase.BeginTransaction();
+    CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",auction->Id);
+    pl->SaveInventoryAndGoldToDB();
+    CharacterDatabase.CommitTransaction();
+    objmgr.RemoveAItem( auction->item_guidlow );
+    mAuctions->RemoveAuction( auction->Id );
+    delete auction;
+}
+
+//called when player lists his bids
+void WorldSession::HandleAuctionListBidderItems( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8+4+4);
+
+    uint64 guid;                                            //NPC guid
+    uint32 listfrom;                                        //page of auctions
+    uint32 outbiddedCount;                                  //count of outbidded auctions
+
+    recv_data >> guid;
+    recv_data >> listfrom;                                  // not used in fact (this list not have page control in client)
+    recv_data >> outbiddedCount;
+    if (recv_data.size() != (16 + outbiddedCount * 4 ))
+    {
+        sLog.outError("Client sent bad opcode!!! with count: %u and size : %d (mustbe: %d", outbiddedCount, recv_data.size(),(16 + outbiddedCount * 4 ));
+        outbiddedCount = 0;
+    }
+
+    Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!pCreature)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
+        return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    uint32 location = AuctioneerFactionToLocation(pCreature->getFaction());
+    AuctionHouseObject* mAuctions = objmgr.GetAuctionsMap( location );
+
+    WorldPacket data( SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4) );
+    Player *pl = GetPlayer();
+    data << (uint32) 0;                                     //add 0 as count
+    uint32 count = 0;
+    uint32 totalcount = 0;
+    while ( outbiddedCount > 0)                             //add all data, which client requires
+    {
+        --outbiddedCount;
+        uint32 outbiddedAuctionId;
+        recv_data >> outbiddedAuctionId;
+        AuctionEntry * auction = mAuctions->GetAuction( outbiddedAuctionId );
+        if ( auction && SendAuctionInfo(data, auction))
+        {
+            ++totalcount;
+            ++count;
+        }
+    }
+    for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr)
+    {
+        AuctionEntry *Aentry = itr->second;
+        if( Aentry && Aentry->bidder == pl->GetGUIDLow() )
+        {
+            if (SendAuctionInfo(data, itr->second))
+                ++count;
+            ++totalcount;
+        }
+    }
+    data.put<uint32>( 0, count );                           // add count to placeholder
+    data << totalcount;
+    data << (uint32)300;                                    //unk 2.3.0
+    SendPacket(&data);
+}
+
+//this void sends player info about his auctions
+void WorldSession::HandleAuctionListOwnerItems( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8+4);
+
+    uint32 listfrom;
+    uint64 guid;
+
+    recv_data >> guid;
+    recv_data >> listfrom;                                  // not used in fact (this list not have page control in client)
+
+    Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!pCreature)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
+        return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    uint32 location = AuctioneerFactionToLocation(pCreature->getFaction());
+
+    AuctionHouseObject* mAuctions = objmgr.GetAuctionsMap( location );
+
+    WorldPacket data( SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4) );
+    data << (uint32) 0;                                     // amount place holder
+
+    uint32 count = 0;
+    uint32 totalcount = 0;
+    for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr)
+    {
+        AuctionEntry *Aentry = itr->second;
+        if( Aentry && Aentry->owner == _player->GetGUIDLow() )
+        {
+            if(SendAuctionInfo(data, itr->second))
+                ++count;
+            ++totalcount;
+        }
+    }
+    data.put<uint32>(0, count);
+    data << (uint32) totalcount;
+    data << (uint32) 0;
+    SendPacket(&data);
+}
+
+//this void is called when player clicks on search button
+void WorldSession::HandleAuctionListItems( WorldPacket & recv_data )
+{
+    CHECK_PACKET_SIZE(recv_data,8+4+1+1+1+4+4+4+4+1);
+
+    std::string searchedname, name;
+    uint8 levelmin, levelmax, usable, location;
+    uint32 count, totalcount, listfrom, auctionSlotID, auctionMainCategory, auctionSubCategory, quality;
+    uint64 guid;
+
+    recv_data >> guid;
+    recv_data >> listfrom;                                  // start, used for page control listing by 50 elements
+    recv_data >> searchedname;
+
+    // recheck with known string size
+    CHECK_PACKET_SIZE(recv_data,8+4+(searchedname.size()+1)+1+1+4+4+4+4+1);
+
+    recv_data >> levelmin >> levelmax;
+    recv_data >> auctionSlotID >> auctionMainCategory >> auctionSubCategory;
+    recv_data >> quality >> usable;
+
+    Creature *pCreature = ObjectAccessor::GetNPCIfCanInteractWith(*_player, guid,UNIT_NPC_FLAG_AUCTIONEER);
+    if (!pCreature)
+    {
+        sLog.outDebug( "WORLD: HandleAuctionListItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
+        return;
+    }
+
+    // remove fake death
+    if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
+        GetPlayer()->RemoveSpellsCausingAura(SPELL_AURA_FEIGN_DEATH);
+
+    location = AuctioneerFactionToLocation(pCreature->getFaction());
+    AuctionHouseObject * mAuctions;
+    mAuctions = objmgr.GetAuctionsMap( location );
+
+    //sLog.outDebug("Auctionhouse search guid: " I64FMTD ", list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u", guid, listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable);
+
+    WorldPacket data( SMSG_AUCTION_LIST_RESULT, (4+4+4) );
+    count = 0;
+    totalcount = 0;
+    data << (uint32) 0;
+
+    // converting string that we try to find to lower case
+    std::wstring wsearchedname;
+    if(!Utf8toWStr(searchedname,wsearchedname))
+        return;
+
+    wstrToLower(wsearchedname);
+
+    for (AuctionHouseObject::AuctionEntryMap::iterator itr = mAuctions->GetAuctionsBegin();itr != mAuctions->GetAuctionsEnd();++itr)
+    {
+        AuctionEntry *Aentry = itr->second;
+        Item *item = objmgr.GetAItem(Aentry->item_guidlow);
+        if( item )
+        {
+            ItemPrototype const *proto = item->GetProto();
+            if( proto )
+            {
+                if( auctionMainCategory == (0xffffffff) || proto->Class == auctionMainCategory )
+                {
+                    if( auctionSubCategory == (0xffffffff) || proto->SubClass == auctionSubCategory )
+                    {
+                        if( auctionSlotID == (0xffffffff) || proto->InventoryType == auctionSlotID )
+                        {
+                            if( quality == (0xffffffff) || proto->Quality == quality )
+                            {
+                                if( usable == (0x00) || _player->CanUseItem( item ) == EQUIP_ERR_OK )
+                                {
+                                    if( ( levelmin == (0x00) || proto->RequiredLevel >= levelmin ) && ( levelmax == (0x00) || proto->RequiredLevel <= levelmax ) )
+                                    {
+                                        name = proto->Name1;
+
+                                        // local name
+                                        int loc_idx = GetSessionDbLocaleIndex();
+                                        if ( loc_idx >= 0 )
+                                        {
+                                            ItemLocale const *il = objmgr.GetItemLocale(proto->ItemId);
+                                            if (il)
+                                            {
+                                                if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty())
+                                                    name = il->Name[loc_idx];
+                                            }
+                                        }
+
+                                        if(name.empty())
+                                            continue;
+
+                                        if( wsearchedname.empty() || Utf8FitTo(name, wsearchedname) )
+                                        {
+                                            if ((count < 50) && (totalcount >= listfrom))
+                                            {
+                                                ++count;
+                                                SendAuctionInfo( data, Aentry);
+                                            }
+                                            ++totalcount;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    data.put<uint32>(0, count);
+    data << (uint32) totalcount;
+    data << (uint32) 300;                                   // unk 2.3.0 const?
+    SendPacket(&data);
+}
+

src/game/AuctionHouseBot.cpp

@@ -1194,3 +1194,4 @@ void AuctionHouseBotLoadValues(AHBConfig *config)
         {sLog.outError("buyerBidsPerInterval = %u", config->GetBidsPerInterval());}
     }
 }
+

src/game/AuctionHouseBot.h

@@ -686,3 +686,4 @@ void AuctionHouseBotInit();
 void AuctionHouseBotLoadValues(AHBConfig*);
 void AuctionHouseBotCommands(uint32, AuctionLocation, uint32, char*);
 #endif
+

src/game/AuctionHouseObject.h

@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/>
+ *
+ * Copyright (C) 2008 Trinity <http://www.trinitycore.org/>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef _AUCTION_HOUSE_H
+#define _AUCTION_HOUSE_H
+
+#include "SharedDefines.h"
+
+#define MIN_AUCTION_TIME (12*HOUR)
+
+enum AuctionError
+{
+    AUCTION_OK = 0,
+    AUCTION_INTERNAL_ERROR = 2,
+    AUCTION_NOT_ENOUGHT_MONEY = 3,
+    AUCTION_ITEM_NOT_FOUND = 4,
+    CANNOT_BID_YOUR_AUCTION_ERROR = 10
+};
+
+enum AuctionAction
+{
+    AUCTION_SELL_ITEM = 0,
+    AUCTION_CANCEL = 1,
+    AUCTION_PLACE_BID = 2
+};
+
+struct AuctionEntry
+{
+    uint32 Id;
+    uint32 auctioneer;
+    uint32 item_guidlow;
+    uint32 item_template;
+    uint32 owner;
+    uint32 startbid;                                        //maybe useless
+    uint32 bid;
+    uint32 buyout;
+    time_t time;
+    uint32 bidder;
+    uint32 deposit;                                         //deposit can be calculated only when creating auction
+    uint32 location;
+};
+
+//this class is used as auctionhouse instance
+class AuctionHouseObject
+{
+    public:
+        AuctionHouseObject() {}
+        ~AuctionHouseObject()
+        {
+            for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
+                delete itr->second;
+        }
+
+        typedef std::map<uint32, AuctionEntry*> AuctionEntryMap;
+
+        uint32 Getcount() { return AuctionsMap.size(); }
+
+        AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();}
+        AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();}
+
+        void AddAuction(AuctionEntry *ah)
+        {
+            ASSERT( ah );
+            AuctionsMap[ah->Id] = ah;
+        }
+
+        AuctionEntry* GetAuction(uint32 id) const
+        {
+            AuctionEntryMap::const_iterator itr = AuctionsMap.find( id );
+            if( itr != AuctionsMap.end() )
+                return itr->second;
+            return NULL;
+        }
+
+        bool RemoveAuction(uint32 id)
+        {
+            AuctionEntryMap::iterator i = AuctionsMap.find(id);
+            if (i == AuctionsMap.end())
+            {
+                return false;
+            }
+            AuctionsMap.erase(i);
+            return true;
+        }
+
+    private:
+        AuctionEntryMap AuctionsMap;
+};
+#endif
+

src/game/Bag.cpp

@@ -224,3 +224,4 @@ Item* Bag::GetItemByPos( uint8 slot ) const
 
     return NULL;
 }
+

src/game/Bag.h

@@ -75,3 +75,4 @@ inline Item* NewItemOrBag(ItemPrototype const * proto)
     return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item;
 }
 #endif
+

src/game/BattleGround.cpp

@@ -1635,4 +1635,3 @@ void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid )
     if(old_raid) old_raid->SetBattlegroundGroup(NULL);
     if(bg_raid) bg_raid->SetBattlegroundGroup(this);
     old_raid = bg_raid;
-}

src/game/BattleGround.h

@@ -540,3 +540,4 @@ class BattleGround
         float m_TeamStartLocO[2];
 };
 #endif
+

src/game/BattleGroundAA.cpp

@@ -63,3 +63,4 @@ bool BattleGroundAA::SetupBattleGround()
 {
     return true;
 }
+

src/game/BattleGroundAA.h

@@ -47,3 +47,4 @@ class BattleGroundAA : public BattleGround
         void HandleKillPlayer(Player* player, Player *killer);
 };
 #endif
+

src/game/BattleGroundAB.cpp

@@ -675,3 +675,4 @@ void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value
             break;
     }
 }
+

src/game/BattleGroundAB.h

@@ -284,3 +284,4 @@ class BattleGroundAB : public BattleGround
         bool              m_IsInformedNearVictory;
 };
 #endif
+

src/game/BattleGroundAV.cpp

@@ -1446,3 +1446,4 @@ void BattleGroundAV::ResetBGSubclass()
 
 }
 
+

src/game/BattleGroundAV.h

@@ -1579,3 +1579,4 @@ class BattleGroundAV : public BattleGround
 };
 
 #endif
+

src/game/BattleGroundBE.cpp

@@ -253,3 +253,4 @@ spell 32725 - Green Team
 35774 Gold Team
 35775 Green Team
 */
+

src/game/BattleGroundBE.h

@@ -74,3 +74,4 @@ class BattleGroundBE : public BattleGround
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
 };
 #endif
+

src/game/BattleGroundEY.cpp

@@ -944,3 +944,4 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(float x, float y,
 
     return nearestEntry;
 }
+

src/game/BattleGroundEY.h

@@ -372,3 +372,4 @@ class BattleGroundEY : public BattleGround
         int32 m_PointAddingTimer;
 };
 #endif
+

src/game/BattleGroundHandler.cpp

@@ -872,3 +872,4 @@ void WorldSession::SendBattleGroundOrArenaJoinError(uint8 err)
     SendPacket(&data);
     return;
 }
+

src/game/BattleGroundMgr.cpp

@@ -1926,4 +1926,3 @@ void BattleGroundMgr::LoadBattleMastersEntry()
 
     sLog.outString();
     sLog.outString( ">> Loaded %u battlemaster entries", count );
-}

src/game/BattleGroundMgr.h

@@ -259,3 +259,4 @@ class BattleGroundMgr
 
 #define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance()
 #endif
+

src/game/BattleGroundNA.cpp

@@ -228,3 +228,4 @@ bool BattleGroundNA::SetupBattleGround()
 0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08  |  ................
 0050: 00 00 00 00 00 00                                |  ......
 */
+

src/game/BattleGroundNA.h

@@ -72,3 +72,4 @@ class BattleGroundNA : public BattleGround
         bool HandlePlayerUnderMap(Player * plr);
 };
 #endif
+

src/game/BattleGroundRL.cpp

@@ -228,3 +228,4 @@ Packet S->C, id 600, SMSG_INIT_WORLD_STATES (706), len 86
 0040: 00 00 00 00 00 00 D3 08 00 00 00 00 00 00 D4 08 | ................
 0050: 00 00 00 00 00 00                               | ......
 */
+

src/game/BattleGroundRL.h

@@ -68,3 +68,4 @@ class BattleGroundRL : public BattleGround
         bool HandlePlayerUnderMap(Player * plr);
 };
 #endif
+

src/game/BattleGroundWS.cpp

@@ -741,3 +741,4 @@ void BattleGroundWS::FillInitialWorldStates(WorldPacket& data)
         data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1);
 
 }
+

src/game/BattleGroundWS.h

@@ -185,3 +185,4 @@ class BattleGroundWS : public BattleGround
         int32 m_FlagsDropTimer[2];
 };
 #endif
+

src/game/Cell.h

@@ -163,3 +163,4 @@ struct TRINITY_DLL_DECL CellLock
     }
 };
 #endif
+

src/game/CellImpl.h

@@ -178,3 +178,4 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
     }
 }
 #endif
+

src/game/Channel.cpp

@@ -989,3 +989,4 @@ void Channel::LeaveNotify(uint64 guid)
     data << GetName();
     SendToAll(&data);
 }
+

src/game/Channel.h

@@ -285,3 +285,4 @@ class Channel
         void LeaveNotify(uint64 guid);                                          // invisible notify
 };
 #endif
+

src/game/ChannelHandler.cpp

@@ -387,3 +387,4 @@ void WorldSession::HandleChannelJoinNotify(WorldPacket &recvPacket)
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->JoinNotify(_player->GetGUID());*/
 }
+

src/game/ChannelMgr.h

@@ -101,3 +101,4 @@ inline ChannelMgr* channelMgr(uint32 team)
     return NULL;
 }
 #endif
+

src/game/CharacterHandler.cpp

@@ -1326,5 +1326,3 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
     data << uint8(hairStyle);
     data << uint8(hairColor);
     data << uint8(facialHair);
-    SendPacket(&data);
-}

src/game/Chat.cpp

@@ -1583,3 +1583,4 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G
 
     return true;
 }
+

src/game/Chat.h

@@ -560,3 +560,4 @@ class CliHandler : public ChatHandler
 char const *fmtstring( char const *format, ... );
 
 #endif
+

src/game/ChatHandler.cpp

@@ -588,3 +588,4 @@ void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
 }
+

src/game/CombatHandler.cpp

@@ -95,3 +95,4 @@ void WorldSession::SendAttackStop(Unit const* enemy)
     data << uint32(0);                                      // unk, can be 1 also
     SendPacket(&data);
 }
+

src/game/ConfusedMovementGenerator.cpp

@@ -161,3 +161,4 @@ template void ConfusedMovementGenerator<Player>::Reset(Player &player);
 template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature);
 template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff);
 template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff);
+

src/game/ConfusedMovementGenerator.h

@@ -55,3 +55,4 @@ class TRINITY_DLL_SPEC ConfusedMovementGenerator
         uint32 i_nextMove;
 };
 #endif
+

src/game/Corpse.cpp

@@ -216,3 +216,4 @@ bool Corpse::isVisibleForInState(Player const* u, bool inVisibleList) const
 {
     return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
+

src/game/Corpse.h

@@ -100,3 +100,4 @@ class Corpse : public WorldObject
         GridPair m_grid;                                    // gride for corpse position for fast search
 };
 #endif
+

src/game/Creature.cpp

@@ -2329,3 +2329,4 @@ const char* Creature::GetNameForLocaleIdx(int32 loc_idx) const
 
     return GetName();
 }
+

src/game/Creature.h

@@ -727,3 +727,4 @@ class AssistDelayEvent : public BasicEvent
 };
 
 #endif
+

src/game/CreatureAI.cpp

@@ -100,3 +100,4 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/)
     if(!target || !charmer->canAttack(target))
         AttackStart(charmer->SelectNearestTarget());
 }
+

src/game/CreatureAI.h

@@ -177,3 +177,4 @@ typedef FactoryHolder<CreatureAI> CreatureAICreator;
 typedef FactoryHolder<CreatureAI>::FactoryHolderRegistry CreatureAIRegistry;
 typedef FactoryHolder<CreatureAI>::FactoryHolderRepository CreatureAIRepository;
 #endif
+

src/game/CreatureAIImpl.h

@@ -30,3 +30,4 @@ CreatureAIFactory<REAL_AI>::Create(void *data) const
     return (new REAL_AI(creature));
 }
 #endif
+

src/game/CreatureAIRegistry.cpp

@@ -53,3 +53,4 @@ namespace AIRegistry
         (new MovementGeneratorFactory<WaypointMovementGenerator<Creature> >(WAYPOINT_MOTION_TYPE))->RegisterSelf();
     }
 }
+

src/game/CreatureAIRegistry.h

@@ -26,3 +26,4 @@ namespace AIRegistry
     void Initialize(void);
 }
 #endif
+

src/game/CreatureAISelector.cpp

@@ -125,3 +125,4 @@ namespace FactorySelector
 
     }
 }
+

src/game/CreatureAISelector.h

@@ -31,3 +31,4 @@ namespace FactorySelector
     MovementGenerator* selectMovementGenerator(Creature *);
 }
 #endif
+

src/game/CreatureGroups.cpp

@@ -212,3 +212,4 @@ void CreatureGroup::SetMemberDestination(Creature *member)
         member->GetMotionMaster()->MovePoint(0, x, y, z);
     }
 }
+

src/game/CreatureGroups.h

@@ -66,3 +66,4 @@ extern UNORDERED_MAP<uint32, FormationMember*> CreatureGroupMap;
 #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
 
 #endif
+

src/game/Debugcmds.cpp

@@ -657,5 +657,3 @@ bool ChatHandler::HandleSendSetPhaseShiftCommand(const char* args)
 
     uint32 PhaseShift = atoi(args);
     m_session->SendSetPhaseShift(PhaseShift);
-    return true;
-}

src/game/DestinationHolder.cpp

@@ -19,3 +19,4 @@
  */
 
 #include "DestinationHolder.h"
+

src/game/DestinationHolder.h

@@ -62,3 +62,4 @@ class TRINITY_DLL_DECL DestinationHolder
 
 };
 #endif
+

src/game/DestinationHolderImp.h

@@ -247,3 +247,4 @@ DestinationHolder<TRAVELLER>::GetLocationNowNoMicroMovement(float &x, float &y,
 }
 
 #endif
+

src/game/DuelHandler.cpp

@@ -90,3 +90,4 @@ void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
 
     GetPlayer()->DuelComplete(DUEL_INTERUPTED);
 }
+

src/game/DynamicObject.cpp

@@ -52,6 +52,13 @@ void DynamicObject::AddToWorld()
 
 void DynamicObject::RemoveFromWorld()
 {
+    // Make sure the object is back to grid container for removal as farsight targets
+    // are switched to world container on creation and they are also set to active
+    if (isActive())
+    {
+        GetMap()->SwitchGridContainers(this, false);
+        setActive(false);
+    }
     ///- Remove the dynamicObject from the accessor
     if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
     WorldObject::RemoveFromWorld();
@@ -129,19 +136,6 @@ void DynamicObject::Update(uint32 p_time)
 
 void DynamicObject::Delete()
 {
-    // Make sure the object is back to grid container for removal as farsight targets
-    // are switched to world container on creation and they are also set to active
-    if (isActive())
-    {
-        Map* map = GetMap();
-        if(!map)
-        {
-            sLog.outError("DynamicObject (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());
-            return;
-        }
-        map->SwitchGridContainers(this, false);
-        setActive(false);
-    }
     SendObjectDeSpawnAnim(GetGUID());
     AddObjectToRemoveList();
 }
@@ -160,3 +154,4 @@ bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) con
         && (IsWithinDistInMap(u,World::GetMaxVisibleDistanceForObject()+(inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false)
         || GetCasterGUID() == u->GetGUID());
 }
+

src/game/DynamicObject.h

@@ -73,3 +73,4 @@ class DynamicObject : public WorldObject
         GridReference<DynamicObject> m_gridRef;
 };
 #endif
+

src/game/FleeingMovementGenerator.cpp

@@ -409,3 +409,4 @@ template void FleeingMovementGenerator<Player>::Reset(Player &);
 template void FleeingMovementGenerator<Creature>::Reset(Creature &);
 template bool FleeingMovementGenerator<Player>::Update(Player &, const uint32 &);
 template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint32 &);
+

src/game/FleeingMovementGenerator.h

@@ -63,3 +63,4 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator
         DestinationHolder< Traveller<T> > i_destinationHolder;
 };
 #endif
+

src/game/FollowerRefManager.h

@@ -31,3 +31,4 @@ class FollowerRefManager : public RefManager<Unit, TargetedMovementGeneratorBase
 
 };
 #endif
+

src/game/FollowerReference.cpp

@@ -36,3 +36,4 @@ void FollowerReference::sourceObjectDestroyLink()
 {
     getSource()->stopFollowing();
 }
+

src/game/FollowerReference.h

@@ -34,3 +34,4 @@ class TRINITY_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMoveme
         void sourceObjectDestroyLink();
 };
 #endif
+

src/game/Formulas.h

@@ -155,3 +155,4 @@ namespace Trinity
     }
 }
 #endif
+

src/game/GameEvent.cpp

@@ -1535,3 +1535,4 @@ void GameEvent::SendWorldStateUpdate(Player * plr, uint16 event_id)
             plr->SendUpdateWorldState(itr->second.max_world_state, (uint32)(itr->second.reqNum));
     }
 }
+

src/game/GameEvent.h

@@ -160,3 +160,4 @@ class GameEvent
 
 #define gameeventmgr Trinity::Singleton<GameEvent>::Instance()
 #endif
+

src/game/GameObject.cpp

@@ -1380,3 +1380,4 @@ const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
 
     return GetName();
 }
+

src/game/GameObject.h

@@ -608,3 +608,4 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         GridReference<GameObject> m_gridRef;
 };
 #endif
+

src/game/GlobalEvents.cpp

@@ -86,3 +86,4 @@ void CorpsesErase()
     CorpsesErase(true, 20*MINUTE);
     CorpsesErase(false,3*DAY);
 }
+

src/game/GlobalEvents.h

@@ -29,3 +29,4 @@ void CorpsesErase();
 void HandleCorpsesErase(void*);
 #endif
 /// @}
+

src/game/GossipDef.cpp

@@ -807,3 +807,4 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
 }
+

src/game/GossipDef.h

@@ -207,3 +207,4 @@ class TRINITY_DLL_SPEC PlayerMenu
         void SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel );
 };
 #endif
+

src/game/GridDefines.h

@@ -188,3 +188,4 @@ namespace Trinity
     }
 }
 #endif
+

src/game/GridNotifiers.h

@@ -1013,3 +1013,4 @@ namespace Trinity
     #endif
 }
 #endif
+

src/game/GridNotifiersImpl.h

@@ -540,3 +540,4 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m)
 }
 
 #endif                                                      // TRINITY_GRIDNOTIFIERSIMPL_H
+

src/game/GridStates.cpp

@@ -73,3 +73,4 @@ RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, c
         }
     }
 }
+

src/game/GridStates.h

@@ -73,3 +73,4 @@ class TRINITY_DLL_DECL RemovalState : public GridState
         void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
 };
 #endif
+

src/game/Group.cpp

@@ -1560,3 +1560,4 @@ void Group::BroadcastGroupUpdate(void)
         }
     }
 }
+

src/game/Group.h

@@ -413,3 +413,4 @@ class TRINITY_DLL_SPEC Group
         uint8*              m_subGroupsCounts;
 };
 #endif
+

src/game/GroupHandler.cpp

@@ -949,3 +949,4 @@ void WorldSession::HandleGroupPassOnLootOpcode( WorldPacket & recv_data )
     if(unkn!=0)
         sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!");
 }
+

src/game/GroupRefManager.h

@@ -33,3 +33,4 @@ class GroupRefManager : public RefManager<Group, Player>
         GroupReference* getFirst() { return ((GroupReference* ) RefManager<Group, Player>::getFirst()); }
 };
 #endif
+

src/game/GroupReference.cpp

@@ -39,3 +39,4 @@ void GroupReference::sourceObjectDestroyLink()
     // called from invalidate()
     getTarget()->DelinkMember(this);
 }
+

src/game/GroupReference.h

@@ -41,3 +41,4 @@ class TRINITY_DLL_SPEC GroupReference : public Reference<Group, Player>
         void setSubGroup(uint8 pSubGroup) { iSubGroup = pSubGroup; }
 };
 #endif
+

src/game/GuardAI.cpp

@@ -137,3 +137,4 @@ void GuardAI::JustDied(Unit *killer)
         i_creature.SendZoneUnderAttackMessage(pkiller);
 }
 
+

src/game/GuardAI.h

@@ -53,3 +53,4 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI
         TimeTracker i_tracker;
 };
 #endif
+

src/game/Guild.cpp

@@ -2020,3 +2020,4 @@ bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const
 
     return false;
 }
+

src/game/Guild.h

@@ -457,3 +457,4 @@ class Guild
         Item* _StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone );
 };
 #endif
+

src/game/GuildHandler.cpp

@@ -1702,3 +1702,4 @@ void WorldSession::SendSaveGuildEmblem( uint32 msg )
     data << uint32(msg);                                    // not part of guild
     SendPacket( &data );
 }
+