sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed linux compilation error with linker

Browse Source 
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.
This commit is contained in:
Yehonal
2017-09-19 10:40:27 +02:00
parent af6fc3d873
commit 9975fb5923
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/DungeonFinding/LFGMgr.cpp
+8 -8
View File
@@ -2263,19 +2263,19 @@ void LFGMgr::SetState(uint64 guid, LfgState state)
if (IS_GROUP_GUID(guid)) if (IS_GROUP_GUID(guid))
{ {
LfgGroupData& data = GroupsStore[guid]; LfgGroupData& data = GroupsStore[guid];
//char const * const ns = GetStateString(state); std::string ns = GetStateString(state);
//char const * const ps = GetStateString(data.GetState()); std::string ps = GetStateString(data.GetState());
//char const * const os = GetStateString(data.GetOldState()); std::string os = GetStateString(data.GetOldState());
//sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Group: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns, ps, os); 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); data.SetState(state);
} }
else else
{ {
LfgPlayerData& data = PlayersStore[guid]; LfgPlayerData& data = PlayersStore[guid];
//char const * const ns = GetStateString(state); std::string ns = GetStateString(state);
//char const * const ps = GetStateString(data.GetState()); std::string ps = GetStateString(data.GetState());
//char const * const os = GetStateString(data.GetOldState()); std::string os = GetStateString(data.GetOldState());
//sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::SetState: Player: [" UI64FMTD "] newState: %s, previous: %s, oldState: %s", guid, ns, ps, os); 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); data.SetState(state);
} }
} }
src/scripts/Commands/cs_lfg.cpp
+2 -2
View File
@@ -72,7 +72,7 @@ public:
handler->PSendSysMessage(LANG_LFG_NOT_IN_GROUP, playerName.c_str()); handler->PSendSysMessage(LANG_LFG_NOT_IN_GROUP, playerName.c_str());
return true; return true;
} }
/*
uint64 guid = grp->GetGUID(); uint64 guid = grp->GetGUID();
std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid)); std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid));
handler->PSendSysMessage(LANG_LFG_GROUP_INFO, grp->isLFGGroup(), handler->PSendSysMessage(LANG_LFG_GROUP_INFO, grp->isLFGGroup(),
@@ -80,7 +80,7 @@ public:
for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr; itr = itr->next()) for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr; itr = itr->next())
GetPlayerInfo(handler, itr->GetSource()); GetPlayerInfo(handler, itr->GetSource());
*/
return true; return true;
} }