games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Cleanup

Browse Source
This commit is contained in:
AlexVinS
2016-09-22 21:35:37 +03:00
parent fb384d83b8
commit 62d272f3e5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/CGameHandler.cpp
View File

@@ -2520,7 +2520,7 @@ void CGameHandler::heroExchange(ObjectInstanceID hero1, ObjectInstanceID hero2)
void CGameHandler::sendToAllClients( CPackForClient * info ) void CGameHandler::sendToAllClients( CPackForClient * info )
{ {
logGlobal->trace("Sending to all clients a package of type %s", typeid(*info).name()); logNetwork->trace("Sending to all clients a package of type %s", typeid(*info).name());
for(auto & elem : conns) for(auto & elem : conns)
{ {
boost::unique_lock<boost::mutex> lock(*(elem)->wmx); boost::unique_lock<boost::mutex> lock(*(elem)->wmx);

8
server/CQuery.cpp
View File

@@ -126,7 +126,7 @@ void CObjectVisitQuery::onExposure(CGameHandler *gh, QueryPtr topQuery)
void Queries::popQuery(PlayerColor player, QueryPtr query) void Queries::popQuery(PlayerColor player, QueryPtr query)
{ {
LOG_TRACE_PARAMS(logGlobal, "player='%s', query='%s'", player % query); //LOG_TRACE_PARAMS(logGlobal, "player='%s', query='%s'", player % query);
if(topQuery(player) != query) if(topQuery(player) != query)
{ {
logGlobal->trace("Cannot remove, not a top!"); logGlobal->trace("Cannot remove, not a top!");
@@ -147,7 +147,7 @@ void Queries::popQuery(PlayerColor player, QueryPtr query)
void Queries::popQuery(const CQuery &query) void Queries::popQuery(const CQuery &query)
{ {
LOG_TRACE_PARAMS(logGlobal, "query='%s'", query); //LOG_TRACE_PARAMS(logGlobal, "query='%s'", query);
assert(query.players.size()); assert(query.players.size());
for(auto player : query.players) for(auto player : query.players)
@@ -174,7 +174,7 @@ void Queries::addQuery(QueryPtr query)
void Queries::addQuery(PlayerColor player, QueryPtr query) void Queries::addQuery(PlayerColor player, QueryPtr query)
{ {
LOG_TRACE_PARAMS(logGlobal, "player='%d', query='%s'", player.getNum() % query); //LOG_TRACE_PARAMS(logGlobal, "player='%d', query='%s'", player.getNum() % query);
query->onAdding(gh, player); query->onAdding(gh, player);
queries[player].push_back(query); queries[player].push_back(query);
} }
@@ -186,7 +186,7 @@ QueryPtr Queries::topQuery(PlayerColor player)
void Queries::popIfTop(QueryPtr query) void Queries::popIfTop(QueryPtr query)
{ {
LOG_TRACE_PARAMS(logGlobal, "query='%d'", query); //LOG_TRACE_PARAMS(logGlobal, "query='%d'", query);
if(!query) if(!query)
logGlobal->error("The query is nullptr! Ignoring."); logGlobal->error("The query is nullptr! Ignoring.");