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

Missed fixed for #858 (TortoiseSVN tricked me...)

Browse Source 
Fixed #852.
This commit is contained in:
Michał W. Urbańczyk 2012-02-16 21:46:28 +00:00
parent 4baf4e13ed
commit 1abf089bc7
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AI/VCAI/StdInc.h
View File

@ -34,8 +34,8 @@ using boost::str;
#define INDENT AILogger::Tab ___dummy_ind #define INDENT AILogger::Tab ___dummy_ind
#define PNLOG(txt) {int i = logger.lvl; while(i--) printf("\t"); tlog4 << txt; printf("\n");} #define PNLOG(txt) {int i = logger.lvl; while(i--) tlog4 << "\t"; tlog4 << txt << "\n";}
#define BNLOG(txt, formattingEls) {int i = logger.lvl; while(i--) printf("\t"); tlog4 << (boost::format(txt) % formattingEls); printf("\n");} #define BNLOG(txt, formattingEls) {int i = logger.lvl; while(i--) tlog4 << "\t"; tlog4 << (boost::format(txt) % formattingEls) << "\n";}
//#define LOG_ENTRY PNLOG("Entered " __FUNCTION__) //#define LOG_ENTRY PNLOG("Entered " __FUNCTION__)
#define LOG_ENTRY #define LOG_ENTRY

1
AI/VCAI/VCAI.cpp
View File

@ -718,6 +718,7 @@ void VCAI::init(CCallback * CB)
LOG_ENTRY; LOG_ENTRY;
playerID = myCb->getMyColor(); playerID = myCb->getMyColor();
myCb->waitTillRealize = true; myCb->waitTillRealize = true;
myCb->unlockGsWhenWaiting = true;
retreiveVisitableObjs(visitableObjs); retreiveVisitableObjs(visitableObjs);
} }

1
CCallback.cpp
View File

@ -333,6 +333,7 @@ CCallback::CCallback( CGameState * GS, int Player, CClient *C )
:CBattleCallback(GS, Player, C) :CBattleCallback(GS, Player, C)
{ {
waitTillRealize = false; waitTillRealize = false;
unlockGsWhenWaiting = false;
} }
const CGPathNode * CCallback::getPathInfo( int3 tile ) const CGPathNode * CCallback::getPathInfo( int3 tile )

6
client/CMT.cpp
View File

@ -543,10 +543,10 @@ void processCommand(const std::string &message)
readed >> fname; readed >> fname;
startGameFromFile(fname); startGameFromFile(fname);
} }
else if(client && client->serv && client->serv->connected) //send to server else if(client && client->serv && client->serv->connected && LOCPLINT) //send to server
{ {
PlayerMessage pm(LOCPLINT->playerID,message); boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);
*client->serv << &pm; LOCPLINT->cb->sendMessage(message);
} }
} }