games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Fixed #617

Browse Source
This commit is contained in:
DjWarmonger 2010-08-29 09:00:59 +00:00
parent 6005e7a6ee
commit cb1a01950f
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
client/GUIClasses.cpp
View File

@ -2219,7 +2219,6 @@ void CCreInfoWindow::init(const CCreature *cre, const CStackInstance *stack, int
printLine(4, CGI->generaltexth->allTexts[388], cre->valOfBonuses(Bonus::STACK_HEALTH), finalNode->valOfBonuses(Bonus::STACK_HEALTH));
printLine(6, CGI->generaltexth->zelp[441].first, cre->valOfBonuses(Bonus::STACKS_SPEED), finalNode->valOfBonuses(Bonus::STACKS_SPEED));
//setting morale
morale = new MoraleLuckBox(true);
morale->pos = genRect(42, 42, pos.x + 24, pos.y + 189);
@ -6353,7 +6352,7 @@ CThievesGuildWindow::~CThievesGuildWindow()
// delete resdatabar;
}
void MoraleLuckBox::set(const CBonusSystemNode *hero)
void MoraleLuckBox::set(const CBonusSystemNode *node)
{
const int textId[] = {62, 88}; //eg %s \n\n\n {Current Luck Modifiers:}
const int noneTxtId[] = {77, 108}; //I don't know why we have separate "none" texts for luck and morale...
@ -6365,10 +6364,12 @@ void MoraleLuckBox::set(const CBonusSystemNode *hero)
int mrlt = -9;
TModDescr mrl;
if(hero)
if (node)
{
hero->getModifiersWDescr(mrl, bonusType[morale]);
bonusValue = (hero->*getValue[morale])();
node->getModifiersWDescr(mrl, bonusType[morale]);
bonusValue = (node->*getValue[morale])();
}
else
bonusValue = 0;
@ -6381,8 +6382,18 @@ void MoraleLuckBox::set(const CBonusSystemNode *hero)
if (!mrl.size())
text += CGI->generaltexth->arraytxt[noneTxtId[morale]];
else
for(int it=0; it < mrl.size(); it++)
text += "\n" + mrl[it].second;
{
if (node->nodeType == CBonusSystemNode::STACK &&
(node->hasBonusOfType (Bonus::UNDEAD) || node->hasBonusOfType(Bonus::BLOCK_MORALE) || node->hasBonusOfType(Bonus::NON_LIVING))) //it's a creature window
{
text += CGI->generaltexth->arraytxt[113]; //unaffected by morale
}
else
{
for(int it=0; it < mrl.size(); it++)
text += "\n" + mrl[it].second;
}
}
}
void MoraleLuckBox::showAll(SDL_Surface * to)

2
client/GUIClasses.h
View File

@ -830,7 +830,7 @@ class MoraleLuckBox : public LRClickableAreaWTextComp
public:
bool morale; //true if morale, false if luck
void set(const CBonusSystemNode* hero);
void set(const CBonusSystemNode *node);
void showAll(SDL_Surface * to);
MoraleLuckBox(bool Morale);