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

Changes to compile under gcc

Browse Source
This commit is contained in:
Vadim Glazunov
2008-08-17 14:09:30 +00:00
parent 61e66fa89c
commit c94fbbf228
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/CGameHandler.cpp
View File

@ -234,7 +234,8 @@ void CGameHandler::changePrimSkill(int ID, int which, int val, bool abs)
{
hlu.skills.push_back(hero->type->heroClass->chooseSecSkill(none)); //new skill
}
applyAndAsk(&hlu,hero->tempOwner,boost::function<void(ui32)>(boost::bind(callWith<ui16>,hlu.skills,boost::function<void(ui16)>(boost::bind(&CGameHandler::changeSecSkill,this,ID,_1,1,0)),_1))); //call changeSecSkill with appropriate args when client responds
boost::function<void(ui32)> callback = boost::function<void(ui32)>(boost::bind(callWith<ui16>,hlu.skills,boost::function<void(ui16)>(boost::bind(&CGameHandler::changeSecSkill,this,ID,_1,1,0)),_1));
applyAndAsk(&hlu,hero->tempOwner,callback); //call changeSecSkill with appropriate args when client responds
}
}
}
@ -1054,7 +1055,7 @@ void CGameHandler::run()
#else
boost::xtime time={0,0};
time.sec = static_cast<boost::xtime::xtime_sec_t>(p.total_seconds());
cTurn.timed_wait(lock,time);
states.cv.timed_wait(lock,time);
#endif
}
}
@ -1205,4 +1206,4 @@ void CGameHandler::setupBattle( BattleInfo * curB, int3 tile, CCreatureSet &army
BattleStart bs;
bs.info = curB;
sendAndApply(&bs);
}
}