games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

Possibly "fixed" #915.

Browse Source 
Fixed server output (printing ui8 as %d apparently breaks boost.format :/).
This commit is contained in:
Michał W. Urbańczyk 2012-03-31 15:10:16 +00:00
parent 414a896dbd
commit c80d9b0a51
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/CGameState.h
View File

@ -176,7 +176,8 @@ public:
template <typename Handler> void serialize(Handler &h, const int version)
{
h & color & human & currentSelection & team & resources & status;
h & heroes & towns & availableHeroes & dwellings & getBonusList();
h & heroes & towns & availableHeroes & dwellings;
h & getBonusList(); //FIXME FIXME FIXME
h & status & daysWithoutCastle;
h & enteredLosingCheatCode & enteredWinningCheatCode;
h & static_cast<CBonusSystemNode&>(*this);

5
lib/HeroBonus.cpp
View File

@ -695,6 +695,11 @@ void CBonusSystemNode::unpropagateBonus(Bonus * b)
if(b->propagator->shouldBeAttached(this))
{
bonuses -= b;
while(vstd::contains(bonuses, b))
{
tlog1 << "Bonus was duplicated (" << b->Description() << ") at " << nodeName() << std::endl;
bonuses -= b;
}
BONUS_LOG_LINE("#$#" << b->Description() << " #is no longer propagated to# " << nodeName());
}

2
server/CGameHandler.cpp
View File

@ -638,7 +638,7 @@ void CGameHandler::handleConnection(std::set<int> players, CConnection &c)
packType = typeList.getTypeID(pack); //get the id of type
tlog5 << boost::format("Received client message (request %d by player %d) of type with ID=%d (%s).\n")
% requestID % player % packType % typeid(*pack).name();
% requestID % (int)player % packType % typeid(*pack).name();
}
//prepare struct informing that action was applied