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

* spell scroll campaign bonus

Browse Source 
* minor fix (gratuitous call to giveCampaignBonusToHero)
This commit is contained in:
mateuszb
2011-02-23 11:21:40 +00:00
parent 8e7b855478
commit a6b4cfdde7
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/GUIClasses.cpp
View File

@ -475,7 +475,7 @@ void CGarrisonInt::activate()
for(size_t i = 0; i<splitButtons.size(); i++) for(size_t i = 0; i<splitButtons.size(); i++)
if( (splitButtons[i]->isBlocked()) != !highlighted) if( (splitButtons[i]->isBlocked()) != !highlighted)
splitButtons[i]->block(!highlighted); splitButtons[i]->block(!highlighted);
CIntObject::activate(); CIntObject::activate();
} }
@ -517,7 +517,7 @@ CInfoWindow::CInfoWindow()
ID = -1; ID = -1;
setDelComps(false); setDelComps(false);
text = NULL; text = NULL;
} }
void CInfoWindow::close() void CInfoWindow::close()
{ {

10
lib/CGameState.cpp
View File

@ -814,7 +814,10 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
hero->giveArtifact(curBonus.info2); hero->giveArtifact(curBonus.info2);
break; break;
case 4: //spell scroll case 4: //spell scroll
//TODO {
CArtifactInstance * scroll = CArtifactInstance::createScroll(VLC->spellh->spells[curBonus.info2]);
scroll->putAt(hero, scroll->firstAvailableSlot(hero));
}
break; break;
case 5: //prim skill case 5: //prim skill
{ {
@ -1069,11 +1072,6 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
map->heroes.push_back(nnn); map->heroes.push_back(nnn);
map->objects.push_back(nnn); map->objects.push_back(nnn);
map->addBlockVisTiles(nnn); map->addBlockVisTiles(nnn);
//give campaign bonus
if (scenarioOps->mode == StartInfo::CAMPAIGN && getPlayer(nnn->tempOwner)->human)
{
HLP::giveCampaignBonusToHero(nnn, scenarioOps, campaign->camp->scenarios[scenarioOps->whichMapInCampaign].travelOptions);
}
} }
} }