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

Core/AH: Code cleanup

Browse Source 
Remove unused paramters from RemoveAuction(), kept till now for compatibility with ahbot patch.
Reverts 28dffbee11

(cherry picked from commit 8d39ad435a)
This commit is contained in:
jackpoz
2014-10-26 19:37:07 +01:00
parent 54adc80d64
commit 5a02018836
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,7 +435,7 @@ void AuctionHouseObject::AddAuction(AuctionEntry* auction)
sScriptMgr->OnAuctionAdd(this, auction);
}
bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction, uint32 /*itemEntry*/)
bool AuctionHouseObject::RemoveAuction(AuctionEntry* auction)
{
bool wasInMap = AuctionsMap.erase(auction->Id) ? true : false;
@@ -492,7 +492,7 @@ void AuctionHouseObject::Update()
auction->DeleteFromDB(trans);
sAuctionMgr->RemoveAItem(auction->itemGUIDLow);
RemoveAuction(auction, auction->itemEntry);
RemoveAuction(auction);
}
// Run DB changes

2
src/server/game/AuctionHouse/AuctionHouseMgr.h
View File

@@ -117,7 +117,7 @@ class AuctionHouseObject
void AddAuction(AuctionEntry* auction);
bool RemoveAuction(AuctionEntry* auction, uint32 itemEntry);
bool RemoveAuction(AuctionEntry* auction);
void Update();

6
src/server/game/Handlers/AuctionHouseHandler.cpp
View File

@@ -528,9 +528,8 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket& recvData)
auction->DeleteFromDB(trans);
uint32 itemEntry = auction->itemEntry;
sAuctionMgr->RemoveAItem(auction->itemGUIDLow);
auctionHouse->RemoveAuction(auction, itemEntry);
auctionHouse->RemoveAuction(auction);
}
player->SaveInventoryAndGoldToDB(trans);
CharacterDatabase.CommitTransaction(trans);
@@ -606,9 +605,8 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket& recvData)
auction->DeleteFromDB(trans);
CharacterDatabase.CommitTransaction(trans);
uint32 itemEntry = auction->itemEntry;
sAuctionMgr->RemoveAItem(auction->itemGUIDLow);
auctionHouse->RemoveAuction(auction, itemEntry);
auctionHouse->RemoveAuction(auction);
}
//called when player lists his bids