diff options
| author | click <none@none> | 2010-09-12 01:40:27 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-09-12 01:40:27 +0200 |
| commit | bf664b7a449112fc6d00798b4f2995a0027996a1 (patch) | |
| tree | 44afbd94baa0e2c277859d70c23f465b4484f7b7 /src/server/game/Server | |
| parent | 6fa05cfa3e9b417c7cda4f8926a6842c07ea32fd (diff) | |
Cleanup/Core: Remove whitespace and tabs
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Server')
8 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp index 9c3c395cfd2..c9ddc6b6ffb 100644 --- a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp @@ -361,7 +361,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data) SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK); auction->DeleteFromDB(trans); - + uint32 item_template = auction->item_template; sAuctionMgr.RemoveAItem(auction->item_guidlow); auctionHouse->RemoveAuction(auction, item_template); @@ -438,7 +438,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data) SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, AUCTION_OK); // Now remove the auction - + pl->SaveInventoryAndGoldToDB(trans); auction->DeleteFromDB(trans); CharacterDatabase.CommitTransaction(trans); diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index 73ea818092a..4c76cc077d8 100644 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -1387,7 +1387,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data) SendPacket( &data ); return; } - + if (GetSecurity() == SEC_PLAYER) { uint32 raceMaskDisabled = sWorld.getIntConfig(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK); diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp index 153d9e37010..a0392c9fe75 100644 --- a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp @@ -38,7 +38,7 @@ #include "Guild.h" #include "ScriptMgr.h" -enum StableResultCode +enum StableResultCode { STABLE_ERR_MONEY = 0x01, // "you don't have enough money" STABLE_ERR_STABLE = 0x06, // currently used in most fail cases @@ -554,7 +554,7 @@ void WorldSession::SendStablePetCallback(QueryResult result, uint64 guid) data << uint8(1); // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show) ++num; } - + if (result) { do @@ -618,7 +618,7 @@ void WorldSession::HandleStablePet(WorldPacket & recv_data) m_stablePetCallback = CharacterDatabase.AsyncPQuery("SELECT owner,slot,id FROM character_pet WHERE owner = '%u' AND slot >= '%u' AND slot <= '%u' ORDER BY slot ", _player->GetGUIDLow(),PET_SAVE_FIRST_STABLE_SLOT,PET_SAVE_LAST_STABLE_SLOT); - + } void WorldSession::HandleStablePetCallback(QueryResult result) @@ -797,7 +797,7 @@ void WorldSession::HandleStableSwapPet(WorldPacket & recv_data) } // find swapped pet slot in stable - m_stableSwapCallback.SetParam(pet_number); + m_stableSwapCallback.SetParam(pet_number); m_stableSwapCallback.SetFutureResult( CharacterDatabase.PQuery("SELECT slot,entry FROM character_pet WHERE owner = '%u' AND id = '%u'", _player->GetGUIDLow(), pet_number) diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp index 353670ba78a..cee3f417598 100644 --- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp @@ -415,7 +415,7 @@ bool WorldSession::CheckStableMaster(uint64 guid) if (guid == GetPlayer()->GetGUID()) { if (!GetPlayer()->isGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE)) - { + { sLog.outStaticDebug("Player (GUID:%u) attempt open stable in cheating way.", GUID_LOPART(guid)); return false; } diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp index 9df76001940..f8e9342b49d 100644 --- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp @@ -60,7 +60,7 @@ void WorldSession::SendNameQueryOpcode(Player *p) void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid) { - ACE_Future<QueryResult> lFutureResult = + ACE_Future<QueryResult> lFutureResult = CharacterDatabase.AsyncPQuery( !sWorld.getBoolConfig(CONFIG_DECLINED_NAMES_USED) ? // ------- Query Without Declined Names -------- diff --git a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp index 75e1e98da4d..4d530731bf6 100644 --- a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp @@ -233,7 +233,7 @@ void WorldSession::HandleGMSurveySubmit(WorldPacket& recv_data) ss << nextSurveyID << ", "; ss << mainSurvey << ", "; - // sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10, + // sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10, for (uint8 i = 0; i < 10; i++) { diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 67d7c609bbb..f1642641143 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -968,11 +968,11 @@ void WorldSession::ProcessQueryCallbacks() ACE_Time_Value timeout = ACE_Time_Value::zero; if (m_nameQueryCallbacks.next_readable(lResult, &timeout) != 1) break; - + lResult.get(result); SendNameQueryOpcodeFromDBCallBack(result); } - + //! HandleCharEnumOpcode if (m_charEnumCallback.ready()) { @@ -1007,7 +1007,7 @@ void WorldSession::ProcessQueryCallbacks() HandleChangePlayerNameOpcodeCallBack(result, param); m_charRenameCallback.FreeResult(); } - + //- HandleCharAddIgnoreOpcode if (m_addIgnoreCallback.ready()) { diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 74b3a65fae8..dab19620832 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -818,7 +818,7 @@ class WorldSession private: void ProcessQueryCallbacks(); - ACE_Future_Set<QueryResult> m_nameQueryCallbacks; + ACE_Future_Set<QueryResult> m_nameQueryCallbacks; QueryResultFuture m_charEnumCallback; QueryResultFuture m_addIgnoreCallback; QueryResultFuture m_stablePetCallback; |
