From af97a33cd8263c8ec19575e67d507ad62428d3ce Mon Sep 17 00:00:00 2001 From: theluda Date: Fri, 27 Oct 2006 09:57:31 +0000 Subject: [PATCH] [2501] Applied MaNGOS coding style (see trunk/bcpp.cfg). --- src/game/Chat.h | 2 +- src/game/Level1.cpp | 10 +++++----- src/game/Level3.cpp | 45 ++++++++++++++++++++++----------------------- src/game/LootHandler.cpp | 4 ++-- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/game/Chat.h b/src/game/Chat.h index 0c74a42b..195f7125 100644 --- a/src/game/Chat.h +++ b/src/game/Chat.h @@ -188,7 +188,7 @@ class ChatHandler bool HandleGetDistanceCommand(const char* args); bool HandleGameObjectCommand(const char* args); bool HandleAnimCommand(const char* args); - bool HandlePlaySoundCommand(const char* args); + bool HandlePlaySoundCommand(const char* args); bool HandleStandStateCommand(const char* args); bool HandleDieCommand(const char* args); bool HandleReviveCommand(const char* args); diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp index 7f893cdf..c92167c6 100644 --- a/src/game/Level1.cpp +++ b/src/game/Level1.cpp @@ -1306,16 +1306,16 @@ bool ChatHandler::HandlePlaySoundCommand(const char* args) if( *args ) { int dwSoundId = atoi((char*)args); - if( dwSoundId >= 0 ) + if( dwSoundId >= 0 ) { WorldPacket data; data.Initialize(SMSG_PLAY_OBJECT_SOUND); - data << uint32(dwSoundId) << m_session->GetPlayer()->GetGUID(); - m_session->SendPacket(&data); + data << uint32(dwSoundId) << m_session->GetPlayer()->GetGUID(); + m_session->SendPacket(&data); sLog.outDebug("Player %s use command .playsound with #soundid=%u", m_session->GetPlayer()->GetName(), dwSoundId); - PSendSysMessage(LANG_YOU_HEAR_SOUND, dwSoundId); - return true; + PSendSysMessage(LANG_YOU_HEAR_SOUND, dwSoundId); + return true; } } diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index 3977e8d6..3a076de2 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -1307,30 +1307,29 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args) return true; } -bool ChatHandler::HandleLookupItemCommand(const char* args) -{ - if(!*args) - return false; - - QueryResult *result=sDatabase.PQuery("SELECT `entry`,`name` FROM `item_template` WHERE `name` LIKE \"%%%s%%\"",args); - if(!result) - { - SendSysMessage("No items found!"); - return true; - } - - do - { - Field *fields = result->Fetch(); - uint16 id = fields[0].GetUInt16(); - std::string name = fields[1].GetCppString(); - PSendSysMessage("%d - %s",id,name.c_str()); - } while (result->NextRow()); - - delete result; - return true; -} +bool ChatHandler::HandleLookupItemCommand(const char* args) +{ + if(!*args) + return false; + + QueryResult *result=sDatabase.PQuery("SELECT `entry`,`name` FROM `item_template` WHERE `name` LIKE \"%%%s%%\"",args); + if(!result) + { + SendSysMessage("No items found!"); + return true; + } + do + { + Field *fields = result->Fetch(); + uint16 id = fields[0].GetUInt16(); + std::string name = fields[1].GetCppString(); + PSendSysMessage("%d - %s",id,name.c_str()); + } while (result->NextRow()); + + delete result; + return true; +} bool ChatHandler::HandleCreateGuildCommand(const char* args) { diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp index 362fb9a3..5cdcebc8 100644 --- a/src/game/LootHandler.cpp +++ b/src/game/LootHandler.cpp @@ -49,10 +49,10 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data ) else if (IS_ITEM_GUID(lguid)) { Item *pItem = player->GetItemByPos( player->GetPosByGuid( lguid )); - + if (!pItem) return; - + loot = &pItem->loot; } else -- 2.11.4.GIT