diff options
author | Yehonal <yehonal.azeroth@gmail.com> | 2017-09-19 10:40:27 +0200 |
---|---|---|
committer | Yehonal <yehonal.azeroth@gmail.com> | 2017-09-19 10:40:27 +0200 |
commit | 9975fb5923f70a85e53f8ec9c7ef2ff26dda03f7 (patch) | |
tree | f950d498412d44b2776246e67b1c1ad1025c6052 | |
parent | af6fc3d873e46d15a53f02417d20089710a95d45 (diff) |
Fixed linux compilation error with linker
This was caused by a GNUC compiler optimization that removes
LFG.obj from binaries since its functions have never been called
by gamelib. So we had to call at least one of them on LFGMgr forcing
compiler to include LFG.cpp in build. I can't find another way.
-rw-r--r-- | src/game/DungeonFinding/LFGMgr.cpp | 16 | ||||
-rw-r--r-- | src/scripts/Commands/cs_lfg.cpp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/game/DungeonFinding/LFGMgr.cpp b/src/game/DungeonFinding/LFGMgr.cpp index 64d9eb265a..415a73ede1 100644 --- a/src/game/DungeonFinding/LFGMgr.cpp +++ b/src/game/DungeonFinding/LFGMgr.cpp @@ -2263,19 +2263,19 @@ void LFGMgr::SetState(uint64 guid, LfgState state) if (IS_GROUP_GUID(guid)) { LfgGroupData& data = GroupsStore[guid]; - //char const * const ns = GetStateString(state); - //char const * const ps = GetStateString(data.GetState()); - //char const * const os = GetStateString(data.GetOldState()); - //sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Group: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns, ps, os); + std::string ns = GetStateString(state); + std::string ps = GetStateString(data.GetState()); + std::string os = GetStateString(data.GetOldState()); + sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Group: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns.c_str(), ps.c_str(), os.c_str()); data.SetState(state); } else { LfgPlayerData& data = PlayersStore[guid]; - //char const * const ns = GetStateString(state); - //char const * const ps = GetStateString(data.GetState()); - //char const * const os = GetStateString(data.GetOldState()); - //sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Player: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns, ps, os); + std::string ns = GetStateString(state); + std::string ps = GetStateString(data.GetState()); + std::string os = GetStateString(data.GetOldState()); + sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Player: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns.c_str(), ps.c_str(), os.c_str()); data.SetState(state); } } diff --git a/src/scripts/Commands/cs_lfg.cpp b/src/scripts/Commands/cs_lfg.cpp index 88b2d72573..b491c45b3a 100644 --- a/src/scripts/Commands/cs_lfg.cpp +++ b/src/scripts/Commands/cs_lfg.cpp @@ -72,7 +72,7 @@ public: handler->PSendSysMessage(LANG_LFG_NOT_IN_GROUP, playerName.c_str()); return true; } - /* + uint64 guid = grp->GetGUID(); std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid)); handler->PSendSysMessage(LANG_LFG_GROUP_INFO, grp->isLFGGroup(), @@ -80,7 +80,7 @@ public: for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr; itr = itr->next()) GetPlayerInfo(handler, itr->GetSource()); - */ + return true; } |