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

Serializer will now smartly send over network CArtifact* and CHero*. Unified handling of items stored in vector.

Browse Source 
Started making support for Black Market / Artifact merchant.
This commit is contained in:
Michał W. Urbańczyk
2010-06-26 16:02:10 +00:00
parent 627a1a5905
commit ec6342d9a7
20 changed files with 367 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/Client.cpp
View File

@@ -281,7 +281,7 @@ void CClient::loadGame( const std::string & fname )
tlog0 <<"Waiting for server: "<<tmh.getDif()<<std::endl;
serv = new CConnection(conf.cc.server,portc,NAME);
serv->setGS(gs);
serv->addStdVecItems(gs);
tlog0 <<"Setting up connection: "<<tmh.getDif()<<std::endl;
ui8 pom8;
@@ -356,7 +356,6 @@ void CClient::newGame( CConnection *con, StartInfo *si )
CGI->state = new CGameState();
tlog0 <<"\tGamestate: "<<tmh.getDif()<<std::endl;
serv = con;
serv->setGS(CGI->state);
CConnection &c(*con);
////////////////////////////////////////////////////
ui8 pom8;
@@ -411,6 +410,7 @@ void CClient::newGame( CConnection *con, StartInfo *si )
playerint[color]->init(cb);
}
serv->addStdVecItems(CGI->state);
hotSeat = (humanPlayers > 1);
playerint[255] = CAIHandler::getNewAI(cb,conf.cc.defaultAI);