games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

Fixed #1719.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2014-03-01 17:41:29 +00:00
parent 03fbd4e8a7
commit fe4171eb63
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CGameState.cpp
View File

@ -1356,8 +1356,9 @@ void CGameState::prepareCrossoverHeroes(std::vector<CGameState::CampaignHeroRepl
assert( 8*18 > id );//number of arts that fits into h3m format assert( 8*18 > id );//number of arts that fits into h3m format
bool takeable = travelOptions.artifsKeptByHero[id / 8] & ( 1 << (id%8) ); bool takeable = travelOptions.artifsKeptByHero[id / 8] & ( 1 << (id%8) );
if(!takeable) ArtifactLocation al(hero, artifactPosition);
ArtifactLocation(hero, artifactPosition).removeArtifact(); if(!takeable && !al.getSlot()->locked) //don't try removing locked artifacts -> it crashes #1719
al.removeArtifact();
} }
} }
} }