games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-29 00:41:38 +02:00
Code Issues Releases Activity

- fixed out of sync hero armies

Browse Source 
- one more crash in garrison
This commit is contained in:
Ivan Savenko
2012-12-12 14:52:42 +00:00
parent 72ea5e4ac9
commit ec8e078ef8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/GUIClasses.cpp
View File

@ -371,8 +371,11 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
} }
} }
int countLeft = owner->getSelection()->myStack ? owner->getSelection()->myStack->count : 0;
int countRight = myStack ? myStack->count : 0;
GH.pushInt(new CSplitWindow(owner->getSelection()->creature, boost::bind(&CGarrisonInt::splitStacks, owner, _1, _2), GH.pushInt(new CSplitWindow(owner->getSelection()->creature, boost::bind(&CGarrisonInt::splitStacks, owner, _1, _2),
minLeft, minRight, owner->getSelection()->myStack->count, myStack->count)); minLeft, minRight, countLeft, countRight));
refr = true; refr = true;
} }
else if(creature != owner->getSelection()->creature) //swap else if(creature != owner->getSelection()->creature) //swap

5
lib/CGameState.cpp
View File

@ -494,7 +494,10 @@ int CGameState::pickHero(int owner)
for (si32 i=firstHero; i<lastHero; i++) for (si32 i=firstHero; i<lastHero; i++)
factionHeroes.push_back(i); factionHeroes.push_back(i);
// we need random order to select hero // we need random order to select hero
std::random_shuffle(factionHeroes.begin(), factionHeroes.end()); std::random_shuffle(factionHeroes.begin(), factionHeroes.end(), [](size_t range)
{
return ran() % range;
});
for (size_t i=0; i<factionHeroes.size(); i++) for (size_t i=0; i<factionHeroes.size(); i++)
{ {