games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

More fixes for campaigns.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2013-02-05 21:19:08 +00:00
parent 17755caa10
commit 60c18f1bb8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/CPreGame.cpp
View File

@ -498,6 +498,10 @@ void CGPreGame::disposeGraphics()
void CGPreGame::update()
{
boost::unique_lock<boost::recursive_mutex> lock(*CPlayerInterface::pim);
if(CGP != this) //don't update if you are not a main interface
return;
if (GH.listInt.empty())
{
GH.pushInt(this);
@ -3565,10 +3569,10 @@ void CBonusSelection::startMap()
{
StartInfo *si = new StartInfo(sInfo);
if (ourCampaign->mapsConquered.size())
/*if (ourCampaign->mapsConquered.size())
{
GH.popInts(1);
}
}*/
const CCampaignScenario & scenario = ourCampaign->camp->scenarios[ourCampaign->currentMap];
tlog1 << "Starting scenario " << int(ourCampaign->currentMap) << "\n";

1
lib/Mapping/CCampaignHandler.h
View File

@ -155,6 +155,7 @@ public:
CCampaignState();
CCampaignState(unique_ptr<CCampaign> _camp);
~CCampaignState(){};
template <typename Handler> void serialize(Handler &h, const int version)
{