games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-07 07:10:04 +02:00
Code Issues Releases Activity

Survive giving Commander's badge to stacks

Browse Source 
Used to SEGFAULT
This commit is contained in:
Vadim Markovtsev 2016-10-30 10:00:25 +01:00
parent 79c85be93f
commit 220e4d2030
2 changed files with 238 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

465
client/CPlayerInterface.cpp
View File

File diff suppressed because it is too large Load Diff

2
client/widgets/CArtifactHolder.cpp
View File

@ -214,6 +214,8 @@ void CArtPlace::clickLeft(tribool down, bool previousState)
bool CArtPlace::askToAssemble(const CArtifactInstance *art, ArtifactPosition slot, bool CArtPlace::askToAssemble(const CArtifactInstance *art, ArtifactPosition slot,
const CGHeroInstance *hero) const CGHeroInstance *hero)
{ {
assert(art != nullptr);
assert(hero != nullptr);
std::vector<const CArtifact *> assemblyPossibilities = art->assemblyPossibilities(hero); std::vector<const CArtifact *> assemblyPossibilities = art->assemblyPossibilities(hero);
// If the artifact can be assembled, display dialog. // If the artifact can be assembled, display dialog.