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

Merge branch 'develop' into SpellsRefactoring8

Browse Source
This commit is contained in:
AlexVinS
2016-09-17 20:29:44 +03:00
parent 505e53c17d 512908b989
commit d993710f8e
19 changed files with 292 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@@ -945,8 +945,8 @@ void CGameHandler::handleConnection(std::set<PlayerColor> players, CConnection &
packType = typeList.getTypeID(pack); //get the id of type
logGlobal->trace("Received client message (request %d by player %d) of type with ID=%d (%s).\n",
requestID, player.getNum(), packType, typeid(*pack).name());
logGlobal->trace("Received client message (request %d by player %d (%s)) of type with ID=%d (%s).\n",
requestID, player, player.getStr(), packType, typeid(*pack).name());
}
//prepare struct informing that action was applied
@@ -1963,7 +1963,7 @@ bool CGameHandler::moveHero( ObjectInstanceID hid, int3 dst, ui8 teleporting, bo
return false;
}
logGlobal->trace("Player %d wants to move hero %d from %s to %s", asker.getNum(), hid.getNum(), h->pos(), dst());
logGlobal->trace("Player %d (%s) wants to move hero %d from %s to %s", asker, asker.getStr(), hid.getNum(), h->pos(), dst());
const int3 hmpos = CGHeroInstance::convertPosition(dst, false);
if(!gs->map->isInTheMap(hmpos))