diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/game/DungeonFinding/LFG.cpp | 93 | ||||
-rw-r--r-- | src/game/DungeonFinding/LFG.h | 3 | ||||
-rw-r--r-- | src/scripts/Commands/cs_lfg.cpp | 6 |
3 files changed, 51 insertions, 51 deletions
diff --git a/src/game/DungeonFinding/LFG.cpp b/src/game/DungeonFinding/LFG.cpp index b704b86636..880ed01a4e 100644 --- a/src/game/DungeonFinding/LFG.cpp +++ b/src/game/DungeonFinding/LFG.cpp @@ -11,60 +11,60 @@ namespace lfg { -/*std::string ConcatenateDungeons(LfgDungeonSet const& dungeons) -{ - std::string dungeonstr = ""; - if (!dungeons.empty()) + std::string ConcatenateDungeons(LfgDungeonSet const& dungeons) { - std::ostringstream o; - LfgDungeonSet::const_iterator it = dungeons.begin(); - o << (*it); - for (++it; it != dungeons.end(); ++it) - o << ", " << uint32(*it); - dungeonstr = o.str(); + std::string dungeonstr = ""; + if (!dungeons.empty()) + { + std::ostringstream o; + LfgDungeonSet::const_iterator it = dungeons.begin(); + o << (*it); + for (++it; it != dungeons.end(); ++it) + o << ", " << uint32(*it); + dungeonstr = o.str(); + } + return dungeonstr; } - return dungeonstr; -} -std::string GetRolesString(uint8 roles) -{ - std::string rolesstr = ""; + std::string GetRolesString(uint8 roles) + { + std::string rolesstr = ""; - if (roles & PLAYER_ROLE_TANK) - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_TANK)); + if (roles & PLAYER_ROLE_TANK) + rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_TANK)); - if (roles & PLAYER_ROLE_HEALER) - { - if (!rolesstr.empty()) - rolesstr.append(", "); - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_HEALER)); - } + if (roles & PLAYER_ROLE_HEALER) + { + if (!rolesstr.empty()) + rolesstr.append(", "); + rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_HEALER)); + } - if (roles & PLAYER_ROLE_DAMAGE) - { - if (!rolesstr.empty()) - rolesstr.append(", "); - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_DAMAGE)); - } + if (roles & PLAYER_ROLE_DAMAGE) + { + if (!rolesstr.empty()) + rolesstr.append(", "); + rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_DAMAGE)); + } - if (roles & PLAYER_ROLE_LEADER) - { - if (!rolesstr.empty()) - rolesstr.append(", "); - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_LEADER)); - } + if (roles & PLAYER_ROLE_LEADER) + { + if (!rolesstr.empty()) + rolesstr.append(", "); + rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_LEADER)); + } - if (rolesstr.empty()) - rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_NONE)); + if (rolesstr.empty()) + rolesstr.append(sObjectMgr->GetTrinityStringForDBCLocale(LANG_LFG_ROLE_NONE)); - return rolesstr; -} + return rolesstr; + } -std::string GetStateString(LfgState state) -{ - int32 entry = LANG_LFG_ERROR; - switch (state) + std::string GetStateString(LfgState state) { + int32 entry = LANG_LFG_ERROR; + switch (state) + { case LFG_STATE_NONE: entry = LANG_LFG_STATE_NONE; break; @@ -89,9 +89,10 @@ std::string GetStateString(LfgState state) case LFG_STATE_RAIDBROWSER: entry = LANG_LFG_STATE_RAIDBROWSER; break; - } + } - return std::string(sObjectMgr->GetTrinityStringForDBCLocale(entry)); -}*/ + return std::string(sObjectMgr->GetTrinityStringForDBCLocale(entry)); + } } // namespace lfg + diff --git a/src/game/DungeonFinding/LFG.h b/src/game/DungeonFinding/LFG.h index 955a8ce574..e5b9c5a833 100644 --- a/src/game/DungeonFinding/LFG.h +++ b/src/game/DungeonFinding/LFG.h @@ -191,11 +191,10 @@ public: } }; -/* std::string ConcatenateDungeons(LfgDungeonSet const& dungeons); std::string GetRolesString(uint8 roles); std::string GetStateString(LfgState state); -*/ + } // namespace lfg diff --git a/src/scripts/Commands/cs_lfg.cpp b/src/scripts/Commands/cs_lfg.cpp index d2bb608242..88b2d72573 100644 --- a/src/scripts/Commands/cs_lfg.cpp +++ b/src/scripts/Commands/cs_lfg.cpp @@ -11,7 +11,7 @@ #include "Group.h" #include "Player.h" -void GetPlayerInfo(ChatHandler* /*handler*/, Player* player) +void GetPlayerInfo(ChatHandler* handler, Player* player) { if (!player) return; @@ -19,10 +19,10 @@ void GetPlayerInfo(ChatHandler* /*handler*/, Player* player) uint64 guid = player->GetGUID(); lfg::LfgDungeonSet dungeons = sLFGMgr->GetSelectedDungeons(guid); - /*std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid)); + std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid)); handler->PSendSysMessage(LANG_LFG_PLAYER_INFO, player->GetName().c_str(), state.c_str(), uint8(dungeons.size()), lfg::ConcatenateDungeons(dungeons).c_str(), - lfg::GetRolesString(sLFGMgr->GetRoles(guid)).c_str(), sLFGMgr->GetComment(guid).c_str());*/ + lfg::GetRolesString(sLFGMgr->GetRoles(guid)).c_str(), sLFGMgr->GetComment(guid).c_str()); } class lfg_commandscript : public CommandScript |