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

* Neutral creatures can join or escape depending on hero strength / army (partially done)

Browse Source 
* Diplomacy secondary skill support
This commit is contained in:
Michał W. Urbańczyk
2009-04-12 01:48:50 +00:00
parent f9aebcc4bd
commit de71191307
5 changed files with 258 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/CGameHandler.cpp
View File

@@ -723,9 +723,10 @@ void CGameHandler::run(bool resume)
for(int i=0;i<quantity;i++)
{
(*cc) >> pom; //read player color
gsm.lock();
connections[pom] = cc;
gsm.unlock();
{
boost::unique_lock<boost::recursive_mutex> lock(gsm);
connections[pom] = cc;
}
}
}
@@ -1385,24 +1386,22 @@ void CGameHandler::changeObjPos( int objid, int3 newPos, ui8 flags )
void CGameHandler::applyAndAsk( Query * sel, ui8 player, boost::function<void(ui32)> &callback )
{
gsm.lock();
boost::unique_lock<boost::recursive_mutex> lock(gsm);
sel->id = QID;
callbacks[QID] = callback;
states.addQuery(player,QID);
QID++;
sendAndApply(sel);
gsm.unlock();
}
void CGameHandler::ask( Query * sel, ui8 player, const CFunctionList<void(ui32)> &callback )
{
gsm.lock();
boost::unique_lock<boost::recursive_mutex> lock(gsm);
sel->id = QID;
callbacks[QID] = callback;
states.addQuery(player,QID);
sendToAllClients(sel);
QID++;
gsm.unlock();
}
void CGameHandler::sendToAllClients( CPackForClient * info )
@@ -1927,7 +1926,7 @@ void CGameHandler::hireHero( ui32 tid, ui8 hid )
void CGameHandler::queryReply( ui32 qid, ui32 answer )
{
gsm.lock();
boost::unique_lock<boost::recursive_mutex> lock(gsm);
if(vstd::contains(callbacks,qid))
{
CFunctionList<void(ui32)> callb = callbacks[qid];
@@ -1946,7 +1945,6 @@ void CGameHandler::queryReply( ui32 qid, ui32 answer )
{
tlog1 << "Unknown query reply...\n";
}
gsm.unlock();
}
void CGameHandler::makeBattleAction( BattleAction &ba )
@@ -2424,14 +2422,16 @@ void CGameHandler::showGarrisonDialog( int upobj, int hid, const boost::function
GarrisonDialog gd;
gd.hid = hid;
gd.objid = upobj;
gsm.lock();
gd.id = QID;
garrisonCallbacks[QID] = cb;
allowedExchanges[QID] = std::pair<si32,si32>(upobj,hid);
states.addQuery(player,QID);
QID++;
sendAndApply(&gd);
gsm.unlock();
{
boost::unique_lock<boost::recursive_mutex> lock(gsm);
gd.id = QID;
garrisonCallbacks[QID] = cb;
allowedExchanges[QID] = std::pair<si32,si32>(upobj,hid);
states.addQuery(player,QID);
QID++;
sendAndApply(&gd);
}
}
bool CGameHandler::isAllowedExchange( int id1, int id2 )
@@ -2440,7 +2440,7 @@ bool CGameHandler::isAllowedExchange( int id1, int id2 )
return true;
{
boost::unique_lock<boost::mutex> lock(gsm);
boost::unique_lock<boost::recursive_mutex> lock(gsm);
for(std::map<ui32, std::pair<si32,si32> >::const_iterator i = allowedExchanges.begin(); i!=allowedExchanges.end(); i++)
if(id1 == i->second.first && id2 == i->second.second || id2 == i->second.first && id1 == i->second.second)
return true;