Browse Source

* spell scroll campaign bonus
* minor fix (gratuitous call to giveCampaignBonusToHero)

mateuszb 14 years ago
parent
commit
a6b4cfdde7
2 changed files with 6 additions and 8 deletions
  1. 2 2
      client/GUIClasses.cpp
  2. 4 6
      lib/CGameState.cpp

+ 2 - 2
client/GUIClasses.cpp

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

+ 4 - 6
lib/CGameState.cpp

@@ -814,7 +814,10 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
 					hero->giveArtifact(curBonus.info2);
 					break;
 				case 4: //spell scroll
-					//TODO
+					{
+						CArtifactInstance * scroll = CArtifactInstance::createScroll(VLC->spellh->spells[curBonus.info2]);
+						scroll->putAt(hero, scroll->firstAvailableSlot(hero));
+					}
 					break;
 				case 5: //prim skill
 					{
@@ -1069,11 +1072,6 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
 			map->heroes.push_back(nnn);
 			map->objects.push_back(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);
-			}
 		}
 	}