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 random crashes caused by random artifact starting bonus.

Browse Source
This commit is contained in:
DjWarmonger
2010-07-06 05:09:06 +00:00
parent 88b4d69afa
commit 740c227d6c
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/CGameState.cpp
View File

@ -1444,26 +1444,22 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
}
case bartifact:
{
//TODO: FIX IT!
if(!k->second.heroes.size())
{
tlog5 << "Cannot give starting artifact - no heroes!" << std::endl;
break;
}
CArtifact *toGive;
toGive = VLC->arth->artifacts[VLC->arth->getRandomArt (CArtifact::ART_TREASURE)];
// if(!k->second.heroes.size())
// {
// tlog5 << "Cannot give starting artifact - no heroes!" << std::endl;
// break;
// }
// CArtifact *toGive;
// do
// {
// toGive = VLC->arth->treasures[ran() % VLC->arth->treasures.size()];
// } while (!map->allowedArtifact[toGive->id]);
// CGHeroInstance *hero = k->second.heroes[0];
// std::vector<ui16>::iterator slot = vstd::findFirstNot(hero->artifWorn,toGive->possibleSlots);
// if(slot!=toGive->possibleSlots.end())
// {
// VLC->arth->equipArtifact(hero->artifWorn, *slot, toGive->id, &hero->bonuses);
// }
// else
// hero->giveArtifact(toGive->id);
CGHeroInstance *hero = k->second.heroes[0];
std::vector<ui16>::iterator slot = vstd::findFirstNot (hero->artifWorn, toGive->possibleSlots);
if(slot!=toGive->possibleSlots.end())
{
VLC->arth->equipArtifact(hero->artifWorn, *slot, toGive->id, &hero->bonuses);
}
else
hero->giveArtifact(toGive->id);
}
}
}