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

Fixed Faerie Ring bonus, removed unused code

Browse Source
This commit is contained in:
Ivan Savenko 2014-07-01 18:19:51 +03:00
parent c956b3f02a
commit cc349fa64f
1 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/mapObjects/CRewardableObject.cpp
View File

@ -658,7 +658,7 @@ void CGBonusingObject::initObj()
break; break;
case Obj::FAERIE_RING: case Obj::FAERIE_RING:
configureMessage(info[0], 49, 50, soundBase::LUCK); configureMessage(info[0], 49, 50, soundBase::LUCK);
configureBonus(info[0], Bonus::LUCK, 2, 71); configureBonus(info[0], Bonus::LUCK, 1, 71);
break; break;
case Obj::FOUNTAIN_OF_FORTUNE: case Obj::FOUNTAIN_OF_FORTUNE:
selectMode = SELECT_RANDOM; selectMode = SELECT_RANDOM;
@ -961,59 +961,6 @@ void CGVisitableOPH::initObj()
} }
} }
//TODO: re-enable. Probably in some different form but still necessary
/*
const std::string & CGVisitableOPH::getHoverText() const
{
int pom = -1;
switch(ID)
{
case Obj::ARENA:
pom = -1;
break;
case Obj::MERCENARY_CAMP:
pom = 8;
break;
case Obj::MARLETTO_TOWER:
pom = 7;
break;
case Obj::STAR_AXIS:
pom = 11;
break;
case Obj::GARDEN_OF_REVELATION:
pom = 4;
break;
case Obj::LEARNING_STONE:
pom = 5;
break;
case Obj::TREE_OF_KNOWLEDGE:
pom = 18;
break;
case Obj::LIBRARY_OF_ENLIGHTENMENT:
break;
case Obj::SCHOOL_OF_MAGIC:
pom = 9;
break;
case Obj::SCHOOL_OF_WAR:
pom = 10;
break;
default:
throw std::runtime_error("Wrong CGVisitableOPH object ID!\n");
}
hoverName = VLC->objtypeh->getObjectName(ID);
if(pom >= 0)
hoverName += ("\n" + VLC->generaltexth->xtrainfo[pom]);
const CGHeroInstance *h = cb->getSelectedHero (cb->getCurrentPlayer());
if(h)
{
hoverName += "\n\n";
bool visited = vstd::contains (visitors, h->id);
hoverName += visitedTxt (visited);
}
return hoverName;
}
*/
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
CGVisitableOPW::CGVisitableOPW() CGVisitableOPW::CGVisitableOPW()