games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

gcc fixes(bad idea to call global vars such as log2, this name used by math function). Colored log support on some non-win32 platforms. Small Automake project update

Browse Source
This commit is contained in:
Vadim Glazunov
2008-09-18 20:24:53 +00:00
parent 5ee37eeb3d
commit a1dd7f22f9
16 changed files with 227 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/CGameHandler.cpp
View File

@ -341,7 +341,7 @@ void CGameHandler::handleConnection(std::set<int> players, CConnection &c)
{
case 99: //end!
{
log0 << "We have been requested to close.\n";
_log0 << "We have been requested to close.\n";
exit(0);
}
case 100: //my interface ended its turn
@ -967,12 +967,12 @@ upgend:
}
catch (const std::exception& e)
{
log1 << e.what() << std::endl;
_log1 << e.what() << std::endl;
end2 = true;
}
catch (const std::exception * e)
{
log1 << e->what()<< std::endl;
_log1 << e->what()<< std::endl;
end2 = true;
delete e;
}
@ -1273,7 +1273,7 @@ void CGameHandler::setupBattle( BattleInfo * curB, int3 tile, CCreatureSet &army
positions.open("config" PATHSEPARATOR "battleStartpos.txt", std::ios_base::in|std::ios_base::binary);
if(!positions.is_open())
{
log0<<"Unable to open battleStartpos.txt!"<<std::endl;
_log0<<"Unable to open battleStartpos.txt!"<<std::endl;
}
std::string dump;
positions>>dump; positions>>dump;
@ -1376,4 +1376,4 @@ void CGameHandler::giveSpells( const CGTownInstance *t, const CGHeroInstance *h
}
if(cs.spells.size())
sendAndApply(&cs);
}
}