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

Half done refactoring of CHeroWindow.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2010-12-16 22:32:53 +00:00
parent e301256f92
commit b15ac97c62
10 changed files with 324 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/CAdvmapInterface.cpp
View File

@ -1188,7 +1188,7 @@ townList(ADVOPT.tlistSize,ADVOPT.tlistX,ADVOPT.tlistY,ADVOPT.tlistAU,ADVOPT.tlis
//townList.init(); //townList.init();
//townList.genList(); //townList.genList();
heroWindow = new CHeroWindow(LOCPLINT->playerID); heroWindow = NULL;
for (int g=0; g<ADVOPT.gemG.size(); ++g) for (int g=0; g<ADVOPT.gemG.size(); ++g)
{ {
@ -1734,7 +1734,6 @@ void CAdvMapInt::setPlayer(int Player)
nextHero.setPlayerColor(player); nextHero.setPlayerColor(player);
endTurn.setPlayerColor(player); endTurn.setPlayerColor(player);
graphics->blueToPlayersAdv(resdatabar.bg,player); graphics->blueToPlayersAdv(resdatabar.bg,player);
heroWindow->setPlayer(player);
//heroList.updateHList(); //heroList.updateHList();
//townList.genList(); //townList.genList();

512
client/CHeroWindow.cpp
View File

@ -25,6 +25,8 @@
#include <cstdlib> #include <cstdlib>
#include <sstream> #include <sstream>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/format.hpp>
#include <boost/foreach.hpp>
#undef min #undef min
@ -45,202 +47,148 @@ void CHeroSwitcher::clickLeft(tribool down, bool previousState)
{ {
if(!down) if(!down)
{ {
owner->deactivate(); getOwner()->deactivate();
const CGHeroInstance * buf = LOCPLINT->getWHero(id); const CGHeroInstance * buf = LOCPLINT->getWHero(id);
owner->setHero(buf); getOwner()->setHero(buf);
owner->redrawCurBack(); getOwner()->activate();
owner->activate();
} }
} }
CHeroSwitcher::CHeroSwitcher() CHeroWindow * CHeroSwitcher::getOwner()
{ {
return dynamic_cast<CHeroWindow*>(parent);
}
CHeroSwitcher::CHeroSwitcher(int serial)
{
pos = Rect(677, 95 + serial * 54, 48, 32) + pos;
id = serial;
used = LCLICK; used = LCLICK;
} }
CHeroWindow::CHeroWindow(int playerColor): CHeroWindow::CHeroWindow(const CGHeroInstance *hero)
player(playerColor)
{ {
background = BitmapHandler::loadBitmap("HeroScr4"); OBJ_CONSTRUCTION_CAPTURING_ALL;
graphics->blueToPlayersAdv(background, playerColor); garr = NULL;
pos.x = screen->w/2 - background->w/2 - 65;
pos.y = screen->h/2 - background->h/2 - 8;
pos.h = background->h;
pos.w = background->w;
curBack = NULL; curBack = NULL;
curHero = NULL; curHero = NULL;
char bufor[400]; player = hero->tempOwner;
artifs = new CArtifactsOfHero(pos.topLeft()); background = new CPicture("HeroScr4.BMP");
artifs->commonInfo = new CArtifactsOfHero::SCommonPart; background->colorizeAndConvert(player);
artifs->commonInfo->participants.insert(artifs); pos = background->center();
garr = NULL;
ourBar = new CStatusBar(pos.x+72, pos.y+567, "ADROLLVR.bmp", 660);
quitButton = new AdventureMapButton(CGI->generaltexth->heroscrn[17], std::string(), boost::function<void()>(), pos.x+674, pos.y+524, "hsbtns.def", SDLK_RETURN); //artifs = new CArtifactsOfHero(pos.topLeft(), true);
dismissButton = new AdventureMapButton(std::string(), CGI->generaltexth->heroscrn[28], boost::bind(&CHeroWindow::dismissCurrent,this), pos.x+519, pos.y+437, "hsbtns2.def", SDLK_d); ourBar = new CGStatusBar(7, 559, "ADROLLVR.bmp", 660); // new CStatusBar(pos.x+72, pos.y+567, "ADROLLVR.bmp", 660);
questlogButton = new AdventureMapButton(CGI->generaltexth->heroscrn[0], std::string(), boost::bind(&CHeroWindow::questlog,this), pos.x+379, pos.y+437, "hsbtns4.def", SDLK_q);
quitButton = new AdventureMapButton(CGI->generaltexth->heroscrn[17], std::string(),boost::bind(&CHeroWindow::quit,this), 609, 516, "hsbtns.def", SDLK_RETURN);
dismissButton = new AdventureMapButton(std::string(), CGI->generaltexth->heroscrn[28], boost::bind(&CHeroWindow::dismissCurrent,this), 454, 429, "hsbtns2.def", SDLK_d);
questlogButton = new AdventureMapButton(CGI->generaltexth->heroscrn[0], std::string(), boost::bind(&CHeroWindow::questlog,this), 314, 429, "hsbtns4.def", SDLK_q);
formations = new CHighlightableButtonsGroup(0); formations = new CHighlightableButtonsGroup(0);
formations->addButton(map_list_of(0,CGI->generaltexth->heroscrn[23]),CGI->generaltexth->heroscrn[29], "hsbtns6.def", pos.x+546, pos.y+491, 0, 0, SDLK_t); {
formations->addButton(map_list_of(0,CGI->generaltexth->heroscrn[24]),CGI->generaltexth->heroscrn[30], "hsbtns7.def", pos.x+546, pos.y+527, 1, 0, SDLK_l); BLOCK_CAPTURING;
formations->addButton(map_list_of(0,CGI->generaltexth->heroscrn[23]),CGI->generaltexth->heroscrn[29], "hsbtns6.def", pos.x+481, pos.y+483, 0, 0, SDLK_t);
formations->addButton(map_list_of(0,CGI->generaltexth->heroscrn[24]),CGI->generaltexth->heroscrn[30], "hsbtns7.def", pos.x+481, pos.y+519, 1, 0, SDLK_l);
}
tacticsButton = new CHighlightableButton(0, 0, map_list_of(0,CGI->generaltexth->heroscrn[26])(3,CGI->generaltexth->heroscrn[25]), CGI->generaltexth->heroscrn[31], false, "hsbtns8.def", NULL, 539, 483, SDLK_b);
gar2button = new CHighlightableButton(0, 0, map_list_of(0,CGI->generaltexth->heroscrn[26])(3,CGI->generaltexth->heroscrn[25]), CGI->generaltexth->heroscrn[31], false, "hsbtns8.def", NULL, pos.x+604, pos.y+491, SDLK_b);
//right list of heroes //right list of heroes
for(int g=0; g<8; ++g) for(int g=0; g<8; ++g)
{ heroListMi.push_back(new CHeroSwitcher(g));
//heroList.push_back(new AdventureMapButton<CHeroWindow>(std::string(), std::string(), &CHeroWindow::switchHero, 677, 95+g*54, "hsbtns5.def", this));
heroListMi.push_back(new CHeroSwitcher());
heroListMi[g]->pos = genRect(32, 48, pos.x+677, pos.y + 95+g*54);
heroListMi[g]->owner = this;
heroListMi[g]->id = g;
}
flags = CDefHandler::giveDefEss("CREST58.DEF"); flags = CDefHandler::giveDefEss("CREST58.DEF");
//areas //areas
portraitArea = new LRClickableAreaWText(); portraitArea = new LRClickableAreaWText(Rect(18, 18, 58, 64));
portraitArea->pos = genRect(64, 58, pos.x+83, pos.y + 26);
for(int v=0; v<PRIMARY_SKILLS; ++v) for(int v=0; v<PRIMARY_SKILLS; ++v)
{ {
primSkillAreas.push_back(new LRClickableAreaWTextComp()); LRClickableAreaWTextComp *area = new LRClickableAreaWTextComp(Rect(30 + 70*v, 109, 42, 64), SComponent::primskill);
primSkillAreas[v]->pos = genRect(64, 42, pos.x+95 + 70*v, pos.y + 117); area->text = CGI->generaltexth->arraytxt[2+v];
primSkillAreas[v]->text = CGI->generaltexth->arraytxt[2+v]; area->type = v;
primSkillAreas[v]->type = v; area->hoverText = boost::str(boost::format(CGI->generaltexth->heroscrn[1]) % CGI->generaltexth->primarySkillNames[v]);
primSkillAreas[v]->bonusValue = -1; // to be initilized when hero is being set primSkillAreas.push_back(area);
primSkillAreas[v]->baseType = 0;
sprintf(bufor, CGI->generaltexth->heroscrn[1].c_str(), CGI->generaltexth->primarySkillNames[v].c_str());
primSkillAreas[v]->hoverText = std::string(bufor);
} }
specArea = new LRClickableAreaWText(); specArea = new LRClickableAreaWText(Rect(18, 180, 136, 42), CGI->generaltexth->heroscrn[27]);
specArea->pos = genRect(42, 136, pos.x+83, pos.y + 188); expArea = new LRClickableAreaWText(Rect(18, 228, 136, 42), CGI->generaltexth->heroscrn[9]);
specArea->hoverText = CGI->generaltexth->heroscrn[27];
morale = new MoraleLuckBox(true, Rect(175,179,53,45));
expArea = new LRClickableAreaWText(); luck = new MoraleLuckBox(false, Rect(233,179,53,45));
expArea->pos = genRect(42, 136, pos.x+83, pos.y + 236); spellPointsArea = new LRClickableAreaWText(Rect(162,228, 136, 42), CGI->generaltexth->heroscrn[22]);
expArea->hoverText = CGI->generaltexth->heroscrn[9];
morale = new MoraleLuckBox(true);
morale->pos = genRect(45,53,pos.x+240,pos.y+187);
luck = new MoraleLuckBox(false);
luck->pos = genRect(45,53,pos.x+298,pos.y+187);
spellPointsArea = new LRClickableAreaWText();
spellPointsArea->pos = genRect(42, 136, pos.x+227, pos.y + 236);
spellPointsArea->hoverText = CGI->generaltexth->heroscrn[22];
for(int i=0; i<SKILL_PER_HERO; ++i) for(int i=0; i<SKILL_PER_HERO; ++i)
{ {
secSkillAreas.push_back(new LRClickableAreaWTextComp()); Rect r = Rect(i%2 == 0 ? 18 : 162, 276 + 48 * (i/2), 136, 42);
secSkillAreas[i]->pos = genRect(42, 136, pos.x + ((i%2==0) ? (83) : (227)), pos.y + (284 + 48 * (i/2))); secSkillAreas.push_back(new LRClickableAreaWTextComp(r, SComponent::secskill));
secSkillAreas[i]->baseType = 1;
} }
pos.x += 65;
pos.y += 8; //////////////////////////////////////////////////////////////////////////???????????????
// pos.x += 65;
// pos.y += 8;
//
//primary skills & exp and mana
new CPicture(graphics->pskillsm->ourImages[0].bitmap, 32, 111, false);
new CPicture(graphics->pskillsm->ourImages[1].bitmap, 102, 111, false);
new CPicture(graphics->pskillsm->ourImages[2].bitmap, 172, 111, false);
new CPicture(graphics->pskillsm->ourImages[5].bitmap, 242, 111, false);
new CPicture(graphics->pskillsm->ourImages[4].bitmap, 20, 230, false);
new CPicture(graphics->pskillsm->ourImages[3].bitmap, 162, 230, false);
setHero(hero);
} }
CHeroWindow::~CHeroWindow() CHeroWindow::~CHeroWindow()
{ {
SDL_FreeSurface(background); delete flags;
delete quitButton; //SDL_FreeSurface(curBack);
delete dismissButton; //curBack = NULL;
delete questlogButton; curHero = NULL;
delete formations;
delete gar2button;
//delete gar4button;
for(size_t g=0; g<heroListMi.size(); ++g) //artifs->dispose();
{
delete heroListMi[g];
}
if(curBack)
{
SDL_FreeSurface(curBack);
}
delete flags;
delete garr;
delete ourBar;
delete artifs;
delete portraitArea;
delete expArea;
delete luck;
delete morale;
delete specArea;
delete spellPointsArea;
for(size_t v=0; v<primSkillAreas.size(); ++v)
{
delete primSkillAreas[v];
}
for(size_t v=0; v<secSkillAreas.size(); ++v)
{
delete secSkillAreas[v];
}
}
void CHeroWindow::show(SDL_Surface *to)
{
if(curBack)
blitAt(curBack,pos.x,pos.y,to);
quitButton->show(to);
dismissButton->show(to);
questlogButton->show(to);
formations->show(to);
gar2button->show(to);
//gar4button->show(to);
garr->show(to);
ourBar->show(to);
artifs->showAll(to);
} }
void CHeroWindow::setHero(const CGHeroInstance *hero) void CHeroWindow::setHero(const CGHeroInstance *hero)
{ {
char bufor[400];
//CGHeroInstance *hero = const_cast<CGHeroInstance*>(Hero); //but don't modify hero! - it's only for easy map reading
if(!hero) //something strange... no hero? it shouldn't happen if(!hero) //something strange... no hero? it shouldn't happen
{
tlog1 << "Set NULL hero? no way...\n";
return;
}
if(hero == curHero)
{ {
return; return;
} }
assert(hero->tempOwner == LOCPLINT->playerID); //for now we won't show hero windows for non-our heroes
curHero = hero; curHero = hero;
artifs->updateState = true;
artifs->setHero(hero);
artifs->updateState = false;
//pos temporarily switched, restored later
pos.x -= 65;
pos.y -= 8;
specArea->text = CGI->generaltexth->hTxts[hero->subID].longBonus; specArea->text = CGI->generaltexth->hTxts[hero->subID].longBonus;
gar2button->callback.clear(); tacticsButton->callback.clear();
gar2button->callback2.clear(); tacticsButton->callback2.clear();
sprintf(bufor, CGI->generaltexth->heroscrn[16].c_str(), curHero->name.c_str(), curHero->type->heroClass->name.c_str());
dismissButton->hoverTexts[0] = std::string(bufor);
sprintf(bufor, CGI->generaltexth->allTexts[15].c_str(), curHero->name.c_str(), curHero->type->heroClass->name.c_str());
portraitArea->hoverText = std::string(bufor);
dismissButton->hoverTexts[0] = boost::str(boost::format(CGI->generaltexth->heroscrn[16]) % curHero->name % curHero->type->heroClass->name);
portraitArea->hoverText = boost::str(boost::format(CGI->generaltexth->allTexts[15]) % curHero->name % curHero->type->heroClass->name);
portraitArea->text = hero->getBiography(); portraitArea->text = hero->getBiography();
delete garr; {
garr = new CGarrisonInt(pos.x+80, pos.y+493, 8, Point(), curBack, Point(16,486), curHero); delete garr;
OBJ_CONSTRUCTION_CAPTURING_ALL;
garr = new CGarrisonInt(80, 493, 8, Point(), curBack->bg, Point(16,486), curHero);
}
AdventureMapButton * split = new AdventureMapButton(CGI->generaltexth->allTexts[256], CGI->generaltexth->heroscrn[32], boost::bind(&CGarrisonInt::splitClick,garr), pos.x+604, pos.y+527, "hsbtns9.def", false, NULL, false); //deleted by garrison destructor AdventureMapButton * split = NULL;
{
BLOCK_CAPTURING;
split = new AdventureMapButton(CGI->generaltexth->allTexts[256], CGI->generaltexth->heroscrn[32], boost::bind(&CGarrisonInt::splitClick,garr), pos.x+604, pos.y+527, "hsbtns9.def", false, NULL, false); //deleted by garrison destructor
}
boost::algorithm::replace_first(split->hoverTexts[0],"%s",CGI->generaltexth->allTexts[43]); boost::algorithm::replace_first(split->hoverTexts[0],"%s",CGI->generaltexth->allTexts[43]);
garr->addSplitBtn(split); garr->addSplitBtn(split);
@ -253,49 +201,45 @@ void CHeroWindow::setHero(const CGHeroInstance *hero)
//secondary skills support //secondary skills support
for(size_t g=0; g<std::min(secSkillAreas.size(),hero->secSkills.size()); ++g) for(size_t g=0; g<std::min(secSkillAreas.size(),hero->secSkills.size()); ++g)
{ {
int skill = hero->secSkills[g].first, int skill = hero->secSkills[g].first,
level = hero->getSecSkillLevel(hero->secSkills[g].first); level = hero->getSecSkillLevel(hero->secSkills[g].first);
secSkillAreas[g]->type = skill; secSkillAreas[g]->type = skill;
secSkillAreas[g]->bonusValue = level; secSkillAreas[g]->bonusValue = level;
secSkillAreas[g]->text = CGI->generaltexth->skillInfoTexts[skill][level-1]; secSkillAreas[g]->text = CGI->generaltexth->skillInfoTexts[skill][level-1];
secSkillAreas[g]->hoverText = boost::str(boost::format(CGI->generaltexth->heroscrn[21]) % CGI->generaltexth->levels[level-1] % CGI->generaltexth->skillName[skill]);
sprintf(bufor, CGI->generaltexth->heroscrn[21].c_str(), CGI->generaltexth->levels[level-1].c_str(), CGI->generaltexth->skillName[skill].c_str());
secSkillAreas[g]->hoverText = std::string(bufor);
} }
//printing experience - original format does not support ui64 //printing experience - original format does not support ui64
expArea->text = CGI->generaltexth->allTexts[2].c_str(); expArea->text = CGI->generaltexth->allTexts[2];
boost::replace_first(expArea->text, "%d", boost::lexical_cast<std::string>(hero->level)); boost::replace_first(expArea->text, "%d", boost::lexical_cast<std::string>(hero->level));
boost::replace_first(expArea->text, "%d", boost::lexical_cast<std::string>(CGI->heroh->reqExp(hero->level+1))); boost::replace_first(expArea->text, "%d", boost::lexical_cast<std::string>(CGI->heroh->reqExp(hero->level+1)));
boost::replace_first(expArea->text, "%d", boost::lexical_cast<std::string>(hero->exp)); boost::replace_first(expArea->text, "%d", boost::lexical_cast<std::string>(hero->exp));
//printing spell points //printing spell points
sprintf(bufor, CGI->generaltexth->allTexts[205].c_str(), hero->name.c_str(), hero->mana, hero->manaLimit()); spellPointsArea->text = boost::str(boost::format(CGI->generaltexth->allTexts[205]) % hero->name % hero->mana % hero->manaLimit());
spellPointsArea->text = std::string(bufor);
//if we have exchange window with this hero open //if we have exchange window with this hero open
bool noDismiss=false; bool noDismiss=false;
for(std::list<IShowActivable *>::iterator it=GH.listInt.begin() ; it != GH.listInt.end(); it++) BOOST_FOREACH(IShowActivable *isa, GH.listInt)
{ {
CExchangeWindow * cew = dynamic_cast<CExchangeWindow*>((*it)); if(CExchangeWindow * cew = dynamic_cast<CExchangeWindow*>(isa))
if(cew) for(int g=0; g < ARRAY_COUNT(cew->heroInst); ++g)
for(int g=0; g<ARRAY_COUNT(cew->heroInst); ++g) if(cew->heroInst[g] == hero)
if(cew->heroInst[g] == hero) noDismiss = true;
noDismiss = true;
CKingdomInterface * cki = dynamic_cast<CKingdomInterface*>((*it)); if (CKingdomInterface * cki = dynamic_cast<CKingdomInterface*>(isa))
if (cki) noDismiss = true;
noDismiss = true;
} }
dismissButton->block(!!hero->visitedTown || noDismiss); dismissButton->block(!!hero->visitedTown || noDismiss);
if(hero->getSecSkillLevel(19)==0)
gar2button->block(true); if(hero->getSecSkillLevel(19) == 0)
tacticsButton->block(true);
else else
{ {
gar2button->block(false); tacticsButton->block(false);
gar2button->callback = vstd::assigno(hero->tacticFormationEnabled,true); tacticsButton->callback = vstd::assigno(hero->tacticFormationEnabled,true);
gar2button->callback2 = vstd::assigno(hero->tacticFormationEnabled,false); tacticsButton->callback2 = vstd::assigno(hero->tacticFormationEnabled,false);
} }
//setting formations //setting formations
@ -305,88 +249,12 @@ void CHeroWindow::setHero(const CGHeroInstance *hero)
morale->set(hero); morale->set(hero);
luck->set(hero); luck->set(hero);
//restoring pos
pos.x += 65;
pos.y += 8;
redrawCurBack();
} }
void CHeroWindow::quit() void CHeroWindow::quit()
{ {
GH.popInt(this); adventureInt->heroWindow = NULL;
dispose(); GH.popIntTotally(this);
}
void CHeroWindow::activate()
{
quitButton->activate();
dismissButton->activate();
questlogButton->activate();
gar2button->activate();
formations->activate();
//gar4button->activate();
portraitArea->activate();
specArea->activate();
expArea->activate();
spellPointsArea->activate();
morale->activate();
luck->activate();
garr->activate();
GH.statusbar = ourBar;
for(size_t v=0; v<primSkillAreas.size(); ++v)
{
primSkillAreas[v]->activate();
}
for(size_t v=0; v<std::min(secSkillAreas.size(), curHero->secSkills.size()); ++v)
{
secSkillAreas[v]->activate();
}
redrawCurBack();
artifs->activate();
for(size_t e=0; e<heroListMi.size(); ++e)
{
heroListMi[e]->activate();
}
}
void CHeroWindow::deactivate()
{
quitButton->deactivate();
dismissButton->deactivate();
questlogButton->deactivate();
gar2button->deactivate();
formations->deactivate();
specArea->deactivate();
//gar4button->deactivate();
portraitArea->deactivate();
expArea->deactivate();
spellPointsArea->deactivate();
morale->deactivate();
luck->deactivate();
garr->deactivate();
for(size_t v=0; v<primSkillAreas.size(); ++v)
{
primSkillAreas[v]->deactivate();
}
for(size_t v=0; v<std::min(secSkillAreas.size(), curHero->secSkills.size()); ++v)
{
secSkillAreas[v]->deactivate();
}
artifs->deactivate();
for(size_t e=0; e<heroListMi.size(); ++e)
{
heroListMi[e]->deactivate();
}
} }
void CHeroWindow::dismissCurrent() void CHeroWindow::dismissCurrent()
@ -399,138 +267,110 @@ void CHeroWindow::dismissCurrent()
void CHeroWindow::questlog() void CHeroWindow::questlog()
{ {
} }
void CHeroWindow::showAll(SDL_Surface * to)
void CHeroWindow::redrawCurBack()
{ {
if(curBack) CIntObject::showAll(to);
SDL_FreeSurface(curBack);
curBack = SDL_DisplayFormat(background);
//primary skills & exp and mana
blitAt(graphics->pskillsm->ourImages[0].bitmap, 32, 111, curBack);
blitAt(graphics->pskillsm->ourImages[1].bitmap, 102, 111, curBack);
blitAt(graphics->pskillsm->ourImages[2].bitmap, 172, 111, curBack);
blitAt(graphics->pskillsm->ourImages[5].bitmap, 242, 111, curBack);
blitAt(graphics->pskillsm->ourImages[4].bitmap, 20, 230, curBack);
blitAt(graphics->pskillsm->ourImages[3].bitmap, 162, 230, curBack);
//blitting portrait //blitting portrait
blitAt(graphics->portraitLarge[curHero->portrait], 19, 19, curBack); blitAtLoc(graphics->portraitLarge[curHero->portrait], 19, 19, to);
//printing hero's name //printing hero's name
CSDL_Ext::printAtMiddle(curHero->name, 190, 38, FONT_BIG, tytulowy, curBack); printAtMiddleLoc(curHero->name, 190, 38, FONT_BIG, tytulowy, to);
//printing hero's level //printing hero's level
std::string secondLine= CGI->generaltexth->allTexts[342]; std::string secondLine= CGI->generaltexth->allTexts[342];
boost::algorithm::replace_first(secondLine,"%d",boost::lexical_cast<std::string>(curHero->level)); boost::algorithm::replace_first(secondLine,"%d",boost::lexical_cast<std::string>(curHero->level));
boost::algorithm::replace_first(secondLine,"%s",curHero->type->heroClass->name); boost::algorithm::replace_first(secondLine,"%s",curHero->type->heroClass->name);
CSDL_Ext::printAtMiddle(secondLine, 190, 65, FONT_MEDIUM, zwykly, curBack); printAtMiddleLoc(secondLine, 190, 65, FONT_MEDIUM, zwykly, to);
//primary skills names //primary skills names
CSDL_Ext::printAtMiddle(CGI->generaltexth->jktexts[1], 52, 99, FONT_SMALL, tytulowy, curBack); printAtMiddleLoc(CGI->generaltexth->jktexts[1], 52, 99, FONT_SMALL, tytulowy, to);
CSDL_Ext::printAtMiddle(CGI->generaltexth->jktexts[2], 123, 99, FONT_SMALL, tytulowy, curBack); printAtMiddleLoc(CGI->generaltexth->jktexts[2], 123, 99, FONT_SMALL, tytulowy, to);
CSDL_Ext::printAtMiddle(CGI->generaltexth->jktexts[3], 193, 99, FONT_SMALL, tytulowy, curBack); printAtMiddleLoc(CGI->generaltexth->jktexts[3], 193, 99, FONT_SMALL, tytulowy, to);
CSDL_Ext::printAtMiddle(CGI->generaltexth->jktexts[4], 262, 99, FONT_SMALL, tytulowy, curBack); printAtMiddleLoc(CGI->generaltexth->jktexts[4], 262, 99, FONT_SMALL, tytulowy, to);
//dismiss / quest log //dismiss / quest log
std::vector<std::string> toPrin = CMessage::breakText(CGI->generaltexth->jktexts[8].substr(1, CGI->generaltexth->jktexts[8].size()-2)); std::vector<std::string> toPrin = CMessage::breakText(CGI->generaltexth->jktexts[8].substr(1, CGI->generaltexth->jktexts[8].size()-2));
if(toPrin.size()==1) if(toPrin.size()==1)
{ {
CSDL_Ext::printAt(toPrin[0], 372, 439, FONT_SMALL, zwykly, curBack); printAtLoc(toPrin[0], 372, 439, FONT_SMALL, zwykly, to);
} }
else else
{ {
CSDL_Ext::printAt(toPrin[0], 372, 430, FONT_SMALL, zwykly, curBack); printAtLoc(toPrin[0], 372, 430, FONT_SMALL, zwykly, to);
CSDL_Ext::printAt(toPrin[1], 372, 446, FONT_SMALL, zwykly, curBack); printAtLoc(toPrin[1], 372, 446, FONT_SMALL, zwykly, to);
} }
toPrin = CMessage::breakText(CGI->generaltexth->jktexts[9].substr(1, CGI->generaltexth->jktexts[9].size()-2)); toPrin = CMessage::breakText(CGI->generaltexth->jktexts[9].substr(1, CGI->generaltexth->jktexts[9].size()-2));
if(toPrin.size()==1) if(toPrin.size()==1)
{ {
CSDL_Ext::printAt(toPrin[0], 512, 439, FONT_SMALL, zwykly, curBack); printAtLoc(toPrin[0], 512, 439, FONT_SMALL, zwykly, to);
} }
else else
{ {
CSDL_Ext::printAt(toPrin[0], 512, 430, FONT_SMALL, zwykly, curBack); printAtLoc(toPrin[0], 512, 430, FONT_SMALL, zwykly, to);
CSDL_Ext::printAt(toPrin[1], 512, 446, FONT_SMALL, zwykly, curBack); printAtLoc(toPrin[1], 512, 446, FONT_SMALL, zwykly, to);
} }
//printing primary skills' amounts //printing primary skills' amounts
for(int m=0; m<4; ++m) for(int m=0; m<4; ++m)
{ {
std::ostringstream primarySkill; std::ostringstream primarySkill;
primarySkill<<curHero->getPrimSkillLevel(m); primarySkill<<curHero->getPrimSkillLevel(m);
CSDL_Ext::printAtMiddle(primarySkill.str(), 53 + 70 * m, 166, FONT_SMALL, zwykly, curBack); printAtMiddleLoc(primarySkill.str(), 53 + 70 * m, 166, FONT_SMALL, zwykly, to);
} }
//morale and luck printing //morale and luck printing
blitAt(graphics->luck42->ourImages[curHero->LuckVal()+3].bitmap, 239, 182, curBack); blitAt(graphics->luck42->ourImages[curHero->LuckVal()+3].bitmap, 239, 182, to);
blitAt(graphics->morale42->ourImages[curHero->MoraleVal()+3].bitmap, 181, 182, curBack); blitAt(graphics->morale42->ourImages[curHero->MoraleVal()+3].bitmap, 181, 182, to);
blitAt(flags->ourImages[player].bitmap, 606, 8, curBack); blitAt(flags->ourImages[player].bitmap, 606, 8, to);
//hero list blitting //hero list blitting
for(int pos=0, g=0; g<LOCPLINT->wanderingHeroes.size(); ++g) for(int pos=0, g=0; g<LOCPLINT->wanderingHeroes.size(); ++g)
{ {
const CGHeroInstance * cur = LOCPLINT->wanderingHeroes[g]; const CGHeroInstance * cur = LOCPLINT->wanderingHeroes[g];
if (cur->inTownGarrison) if (cur->inTownGarrison)
// Only display heroes that are not in garrison // Only display heroes that are not in garrison
continue; continue;
blitAt(graphics->portraitSmall[cur->portrait], 611, 87+pos*54, curBack); blitAt(graphics->portraitSmall[cur->portrait], 611, 87+pos*54, to);
//printing yellow border //printing yellow border
if(cur->name == curHero->name) if(cur->name == curHero->name)
{ {
for(int f=0; f<graphics->portraitSmall[cur->portrait]->w; ++f) for(int f=0; f<graphics->portraitSmall[cur->portrait]->w; ++f)
{ {
for(int h=0; h<graphics->portraitSmall[cur->portrait]->h; ++h) for(int h=0; h<graphics->portraitSmall[cur->portrait]->h; ++h)
if(f==0 || h==0 || f==graphics->portraitSmall[cur->portrait]->w-1 || h==graphics->portraitSmall[cur->portrait]->h-1) if(f==0 || h==0 || f==graphics->portraitSmall[cur->portrait]->w-1 || h==graphics->portraitSmall[cur->portrait]->h-1)
{ {
CSDL_Ext::SDL_PutPixelWithoutRefresh(curBack, 611+f, 87+pos*54+h, 240, 220, 120); CSDL_Ext::SDL_PutPixelWithoutRefresh(to, 611+f, 87+pos*54+h, 240, 220, 120);
} }
} }
} }
pos ++; pos ++;
} }
//secondary skills //secondary skills
for(size_t v=0; v<std::min(secSkillAreas.size(), curHero->secSkills.size()); ++v) for(size_t v=0; v<std::min(secSkillAreas.size(), curHero->secSkills.size()); ++v)
{ {
blitAt(graphics->abils44->ourImages[curHero->secSkills[v].first*3+3+curHero->secSkills[v].second-1].bitmap, v%2 ? 161 : 18, 276 + 48 * (v/2), curBack); blitAt(graphics->abils44->ourImages[curHero->secSkills[v].first*3+3+curHero->secSkills[v].second-1].bitmap, v%2 ? 161 : 18, 276 + 48 * (v/2), to);
CSDL_Ext::printAt(CGI->generaltexth->levels[curHero->secSkills[v].second-1], v%2 ? 212 : 68, 280 + 48 * (v/2), FONT_SMALL, zwykly, curBack); printAtLoc(CGI->generaltexth->levels[curHero->secSkills[v].second-1], v%2 ? 212 : 68, 280 + 48 * (v/2), FONT_SMALL, zwykly, to);
CSDL_Ext::printAt(CGI->generaltexth->skillName[curHero->secSkills[v].first], v%2 ? 212 : 68, 300 + 48 * (v/2), FONT_SMALL, zwykly, curBack); printAtLoc(CGI->generaltexth->skillName[curHero->secSkills[v].first], v%2 ? 212 : 68, 300 + 48 * (v/2), FONT_SMALL, zwykly, to);
} }
//printing special ability //printing special ability
blitAt(graphics->un44->ourImages[curHero->subID].bitmap, 18, 180, curBack); blitAt(graphics->un44->ourImages[curHero->subID].bitmap, 18, 180, to);
CSDL_Ext::printAt(CGI->generaltexth->jktexts[5].substr(1, CGI->generaltexth->jktexts[5].size()-2), 69, 183, FONT_SMALL, tytulowy, curBack); printAtLoc(CGI->generaltexth->jktexts[5].substr(1, CGI->generaltexth->jktexts[5].size()-2), 69, 183, FONT_SMALL, tytulowy, to);
CSDL_Ext::printAt(CGI->generaltexth->hTxts[curHero->subID].bonusName, 69, 205, FONT_SMALL, zwykly, curBack); printAtLoc(CGI->generaltexth->hTxts[curHero->subID].bonusName, 69, 205, FONT_SMALL, zwykly, to);
//printing necessery texts //printing necessery texts
CSDL_Ext::printAt(CGI->generaltexth->jktexts[6].substr(1, CGI->generaltexth->jktexts[6].size()-2), 69, 232, FONT_SMALL, tytulowy, curBack); printAtLoc(CGI->generaltexth->jktexts[6].substr(1, CGI->generaltexth->jktexts[6].size()-2), 69, 232, FONT_SMALL, tytulowy, to);
std::ostringstream expstr; std::ostringstream expstr;
expstr<<curHero->exp; expstr<<curHero->exp;
CSDL_Ext::printAt(expstr.str(), 68, 252, FONT_SMALL, zwykly, curBack); printAtLoc(expstr.str(), 68, 252, FONT_SMALL, zwykly, to);
CSDL_Ext::printAt(CGI->generaltexth->jktexts[7].substr(1, CGI->generaltexth->jktexts[7].size()-2), 213, 232, FONT_SMALL, tytulowy, curBack); printAtLoc(CGI->generaltexth->jktexts[7].substr(1, CGI->generaltexth->jktexts[7].size()-2), 213, 232, FONT_SMALL, tytulowy, to);
std::ostringstream manastr; std::ostringstream manastr;
manastr << curHero->mana << '/' << curHero->manaLimit(); manastr << curHero->mana << '/' << curHero->manaLimit();
CSDL_Ext::printAt(manastr.str(), 211, 252, FONT_SMALL, zwykly, curBack); printAtLoc(manastr.str(), 211, 252, FONT_SMALL, zwykly, to);
} }
void CHeroWindow::dispose()
{
SDL_FreeSurface(curBack);
curBack = NULL;
curHero = NULL;
artifs->dispose();
}
void CHeroWindow::setPlayer(int Player)
{
player = Player;
graphics->blueToPlayersAdv(background,player);
}

30
client/CHeroWindow.h
View File

@ -29,16 +29,21 @@ class CHeroSwitcher : public CIntObject
{ {
public: public:
int id; int id;
CHeroWindow * owner;
CHeroWindow * getOwner();
virtual void clickLeft(tribool down, bool previousState); virtual void clickLeft(tribool down, bool previousState);
CHeroSwitcher(); CHeroSwitcher(int serial);
}; };
class CHeroWindow: public CWindowWithGarrison class CHeroWindow: public CWindowWithGarrison
{ {
SDL_Surface * background, * curBack; enum ELabel {};
CStatusBar * ourBar; //heroWindow's statusBar std::map<ELabel, CLabel*> labels;
CPicture *background, *curBack;
CGStatusBar * ourBar; //heroWindow's statusBar
//general graphics //general graphics
CDefEssential *flags; CDefEssential *flags;
@ -61,23 +66,18 @@ public:
const CGHeroInstance * curHero; const CGHeroInstance * curHero;
AdventureMapButton * quitButton, * dismissButton, * questlogButton; //general AdventureMapButton * quitButton, * dismissButton, * questlogButton; //general
CHighlightableButton *gar2button; //garrison / formation handling; CHighlightableButton *tacticsButton; //garrison / formation handling;
CHighlightableButtonsGroup *formations; CHighlightableButtonsGroup *formations;
int player; int player;
CHeroWindow(int playerColor); //c-tor CHeroWindow(const CGHeroInstance *hero); //c-tor
~CHeroWindow(); //d-tor ~CHeroWindow(); //d-tor
void setHero(const CGHeroInstance * hero); //sets main displayed hero void setHero(const CGHeroInstance * hero); //sets main displayed hero
void activate(); //activates hero window; void showAll(SDL_Surface * to); //shows and activates adv. map interface
void deactivate(); //activates hero window; // void redrawCurBack(); //redraws curBAck from scratch
virtual void show(SDL_Surface * to); //shows hero window void quit(); //stops displaying hero window and disposes
void showAll(SDL_Surface * to){show(to);};
void redrawCurBack(); //redraws curBAck from scratch
void dispose(); //free resources not needed after closing windows and reset state
void quit(); //stops displaying hero window and disposes
void dismissCurrent(); //dissmissed currently displayed hero (curHero) void dismissCurrent(); //dissmissed currently displayed hero (curHero)
void questlog(); //show quest log in hero window void questlog(); //show quest log in hero window
void switchHero(); //changes displayed hero void switchHero(); //changes displayed hero
void setPlayer(int Player);
//friends //friends
friend void CArtPlace::clickLeft(tribool down, bool previousState); friend void CArtPlace::clickLeft(tribool down, bool previousState);

34
client/CKingdomInterface.cpp
View File

@ -708,11 +708,9 @@ CKingdomInterface::CHeroItem::CHeroItem(int num, CKingdomInterface * Owner)
char bufor[400]; char bufor[400];
for(int i=0; i<PRIMARY_SKILLS; i++) for(int i=0; i<PRIMARY_SKILLS; i++)
{ {
primarySkills.push_back(new LRClickableAreaWTextComp()); primarySkills.push_back(new LRClickableAreaWTextComp(genRect(45, 32, pos.x+77 + 36*i, pos.y+26), SComponent::primskill));
primarySkills[i]->pos = genRect(45, 32, pos.x+77 + 36*i, pos.y+26);
primarySkills[i]->text = CGI->generaltexth->arraytxt[2+i]; primarySkills[i]->text = CGI->generaltexth->arraytxt[2+i];
primarySkills[i]->type = i; primarySkills[i]->type = i;
primarySkills[i]->baseType = 0;
sprintf(bufor, CGI->generaltexth->heroscrn[1].c_str(), CGI->generaltexth->primarySkillNames[i].c_str()); sprintf(bufor, CGI->generaltexth->heroscrn[1].c_str(), CGI->generaltexth->primarySkillNames[i].c_str());
primarySkills[i]->hoverText = std::string(bufor); primarySkills[i]->hoverText = std::string(bufor);
}; };
@ -720,11 +718,8 @@ CKingdomInterface::CHeroItem::CHeroItem(int num, CKingdomInterface * Owner)
experience->pos = genRect(33, 49, pos.x+322, pos.y+5); experience->pos = genRect(33, 49, pos.x+322, pos.y+5);
experience->hoverText = CGI->generaltexth->heroscrn[9]; experience->hoverText = CGI->generaltexth->heroscrn[9];
morale = new MoraleLuckBox(true); morale = new MoraleLuckBox(true, genRect(20,32,pos.x+221,pos.y+52));
morale->pos = genRect(20,32,pos.x+221,pos.y+52); luck = new MoraleLuckBox(false, genRect(20,32,pos.x+221,pos.y+28));
luck = new MoraleLuckBox(false);
luck->pos = genRect(20,32,pos.x+221,pos.y+28);
spellPoints = new LRClickableAreaWText(); spellPoints = new LRClickableAreaWText();
spellPoints->pos = genRect(33, 49, pos.x+270, pos.y+5); spellPoints->pos = genRect(33, 49, pos.x+270, pos.y+5);
@ -736,25 +731,18 @@ CKingdomInterface::CHeroItem::CHeroItem(int num, CKingdomInterface * Owner)
for(int i=0; i<SKILL_PER_HERO; ++i) for(int i=0; i<SKILL_PER_HERO; ++i)
{ {
secondarySkills.push_back(new LRClickableAreaWTextComp()); secondarySkills.push_back(new LRClickableAreaWTextComp(genRect(32, 32, pos.x+410+i*37, pos.y+5), SComponent::secskill));
secondarySkills[i]->pos = genRect(32, 32, pos.x+410+i*37, pos.y+5); }
secondarySkills[i]->baseType = 1;
};
for (int i=0; i<18;i++) for (int i=0; i<18;i++)
{ {
artifacts.push_back(new CArtPlace(this)); artifacts.push_back(new CArtPlace(this, genRect(44, 44, pos.x+268+(i%9)*48, pos.y+66)));
artifacts[i]->pos = genRect(44, 44, pos.x+268+(i%9)*48, pos.y+66); }
artifacts[i]->baseType = SComponent::artifact;
};
for (int i=0; i<8;i++) for (int i=0; i<8;i++)
{ {
backpack.push_back(new CArtPlace(this)); backpack.push_back(new CArtPlace(this, genRect(44, 44, pos.x+293+(i%9)*48, pos.y+66)));
backpack[i]->pos = genRect(44, 44, pos.x+293+(i%9)*48, pos.y+66); }
backpack[i]->baseType = SComponent::artifact;
};
} }
CKingdomInterface::CHeroItem::~CHeroItem() CKingdomInterface::CHeroItem::~CHeroItem()
@ -1005,7 +993,8 @@ void CKingdomInterface::CHeroItem::deactivate()
secondarySkills[i]->deactivate(); secondarySkills[i]->deactivate();
} }
CKingdomInterface::CHeroItem::CArtPlace::CArtPlace(CHeroItem * owner) CKingdomInterface::CHeroItem::CArtPlace::CArtPlace(CHeroItem * owner, const Rect &r)
: LRClickableAreaWTextComp(r, SComponent::artifact)
{ {
parent = owner; parent = owner;
used = LCLICK | RCLICK | HOVER; used = LCLICK | RCLICK | HOVER;
@ -1043,6 +1032,7 @@ void CKingdomInterface::CHeroItem::CArtPlace::deactivate()
CKingdomInterface::CTownItem::CCreaPlace::CCreaPlace() CKingdomInterface::CTownItem::CCreaPlace::CCreaPlace()
: LRClickableAreaWTextComp(Rect(0,0,0,0), -1)
{ {
town = NULL; town = NULL;
used = LCLICK | RCLICK | HOVER; used = LCLICK | RCLICK | HOVER;

2
client/CKingdomInterface.h
View File

@ -61,7 +61,7 @@ class CKingdomInterface : public CGarrisonHolder
{ {
public: public:
CHeroItem * parent; CHeroItem * parent;
CArtPlace(CHeroItem * owner); //c-tor CArtPlace(CHeroItem * owner, const Rect &r = Rect(0, 0, 44, 44)); //c-tor
void clickLeft(tribool down, bool previousState); void clickLeft(tribool down, bool previousState);
void clickRight(tribool down, bool previousState); void clickRight(tribool down, bool previousState);
void activate(); void activate();

2
client/CPlayerInterface.cpp
View File

@ -941,8 +941,8 @@ void CPlayerInterface::tileHidden(const std::set<int3> &pos)
void CPlayerInterface::openHeroWindow(const CGHeroInstance *hero) void CPlayerInterface::openHeroWindow(const CGHeroInstance *hero)
{ {
boost::unique_lock<boost::recursive_mutex> un(*pim); boost::unique_lock<boost::recursive_mutex> un(*pim);
adventureInt->heroWindow = new CHeroWindow(hero);
adventureInt->heroWindow->setHero(hero); adventureInt->heroWindow->setHero(hero);
adventureInt->heroWindow->quitButton->callback = boost::bind(&CHeroWindow::quit,adventureInt->heroWindow);
GH.pushInt(adventureInt->heroWindow); GH.pushInt(adventureInt->heroWindow);
} }

60
client/GUIClasses.cpp
View File

@ -2199,12 +2199,10 @@ void CCreInfoWindow::init(const CCreature *cre, const CBonusSystemNode *stackNod
printLine(6, CGI->generaltexth->zelp[441].first, cre->valOfBonuses(Bonus::STACKS_SPEED), stackNode->valOfBonuses(Bonus::STACKS_SPEED)); printLine(6, CGI->generaltexth->zelp[441].first, cre->valOfBonuses(Bonus::STACKS_SPEED), stackNode->valOfBonuses(Bonus::STACKS_SPEED));
//setting morale //setting morale
morale = new MoraleLuckBox(true); morale = new MoraleLuckBox(true, genRect(42, 42, pos.x + 24, pos.y + 189));
morale->pos = genRect(42, 42, pos.x + 24, pos.y + 189);
morale->set(stackNode); morale->set(stackNode);
//setting luck //setting luck
luck = new MoraleLuckBox(false); luck = new MoraleLuckBox(false, genRect(42, 42, pos.x + 77, pos.y + 189));
luck->pos = genRect(42, 42, pos.x + 77, pos.y + 189);
luck->set(stackNode); luck->set(stackNode);
//luck and morale //luck and morale
@ -4482,10 +4480,10 @@ CRClickPopupInt::CRClickPopupInt( IShowActivable *our, bool deleteInt )
CRClickPopupInt::~CRClickPopupInt() CRClickPopupInt::~CRClickPopupInt()
{ {
//workaround for hero window issue - if it's our interface, call dispose to properly reset it's state // //workaround for hero window issue - if it's our interface, call dispose to properly reset it's state
//TODO? it might be better to rewrite hero window so it will bee newed/deleted on opening / closing (not effort-worthy now, but on some day...?) // //TODO? it might be better to rewrite hero window so it will bee newed/deleted on opening / closing (not effort-worthy now, but on some day...?)
if(LOCPLINT && inner == adventureInt->heroWindow) // if(LOCPLINT && inner == adventureInt->heroWindow)
adventureInt->heroWindow->dispose(); // adventureInt->heroWindow->dispose();
if(delInner) if(delInner)
delete inner; delete inner;
@ -4792,13 +4790,26 @@ void LRClickableAreaWText::clickRight(tribool down, bool previousState)
LRClickableAreaWText::LRClickableAreaWText() LRClickableAreaWText::LRClickableAreaWText()
{ {
used = LCLICK | RCLICK | HOVER; init();
}
LRClickableAreaWText::LRClickableAreaWText(const Rect &Pos, const std::string &HoverText /*= ""*/, const std::string &ClickText /*= ""*/)
{
init();
pos = Pos + pos;
hoverText = HoverText;
text = ClickText;
} }
LRClickableAreaWText::~LRClickableAreaWText() LRClickableAreaWText::~LRClickableAreaWText()
{ {
} }
void LRClickableAreaWText::init()
{
used = LCLICK | RCLICK | HOVER;
}
void LRClickableAreaWTextComp::clickLeft(tribool down, bool previousState) void LRClickableAreaWTextComp::clickLeft(tribool down, bool previousState)
{ {
if((!down) && previousState) if((!down) && previousState)
@ -4808,6 +4819,11 @@ void LRClickableAreaWTextComp::clickLeft(tribool down, bool previousState)
} }
} }
LRClickableAreaWTextComp::LRClickableAreaWTextComp(const Rect &Pos, int BaseType)
: LRClickableAreaWText(Pos), baseType(BaseType), bonusValue(-1)
{
}
CHeroArea::CHeroArea(int x, int y, const CGHeroInstance * _hero):hero(_hero) CHeroArea::CHeroArea(int x, int y, const CGHeroInstance * _hero):hero(_hero)
{ {
used = LCLICK | RCLICK | HOVER; used = LCLICK | RCLICK | HOVER;
@ -4860,6 +4876,11 @@ void LRClickableAreaOpenTown::clickRight(tribool down, bool previousState)
LOCPLINT->openTownWindow(town);//TODO: popup? LOCPLINT->openTownWindow(town);//TODO: popup?
} }
LRClickableAreaOpenTown::LRClickableAreaOpenTown()
: LRClickableAreaWTextComp(Rect(0,0,0,0), -1)
{
}
void CArtifactsOfHero::SCommonPart::reset() void CArtifactsOfHero::SCommonPart::reset()
{ {
destAOH = srcAOH = NULL; destAOH = srcAOH = NULL;
@ -4942,7 +4963,7 @@ void CArtifactsOfHero::setHero(const CGHeroInstance * hero)
void CArtifactsOfHero::dispose() void CArtifactsOfHero::dispose()
{ {
delNull(curHero); //delNull(curHero);
unmarkSlots(false); unmarkSlots(false);
CGI->curh->dragAndDropCursor(NULL); CGI->curh->dragAndDropCursor(NULL);
} }
@ -5078,9 +5099,15 @@ void CArtifactsOfHero::eraseSlotData (CArtPlace* artPlace, int slotID)
artPlace->hoverText = CGI->generaltexth->allTexts[507]; artPlace->hoverText = CGI->generaltexth->allTexts[507];
} }
CArtifactsOfHero::CArtifactsOfHero(const Point &position) : CArtifactsOfHero::CArtifactsOfHero(const Point& position, bool createCommonPart /*= false*/)
curHero(NULL), backpackPos(0), commonInfo(NULL), updateState(false), allowedAssembling(true) : curHero(NULL), backpackPos(0), commonInfo(NULL), updateState(false), allowedAssembling(true)
{ {
if(createCommonPart)
{
commonInfo = new CArtifactsOfHero::SCommonPart;
commonInfo->participants.insert(this);
}
OBJ_CONSTRUCTION_CAPTURING_ALL; OBJ_CONSTRUCTION_CAPTURING_ALL;
pos += position; pos += position;
artWorn.resize(19); artWorn.resize(19);
@ -5442,12 +5469,10 @@ CExchangeWindow::CExchangeWindow(si32 hero1, si32 hero2) : bg(NULL)
spellPoints[b]->text = std::string(bufor); spellPoints[b]->text = std::string(bufor);
//setting morale //setting morale
morale[b] = new MoraleLuckBox(true); morale[b] = new MoraleLuckBox(true, genRect(32, 32, pos.x + 177 + 490*b, pos.y + 45));
morale[b]->pos = genRect(32, 32, pos.x + 177 + 490*b, pos.y + 45);
morale[b]->set(heroInst[b]); morale[b]->set(heroInst[b]);
//setting luck //setting luck
luck[b] = new MoraleLuckBox(false); luck[b] = new MoraleLuckBox(false, genRect(32, 32, pos.x + 213 + 490*b, pos.y + 45));
luck[b]->pos = genRect(32, 32, pos.x + 213 + 490*b, pos.y + 45);
luck[b]->set(heroInst[b]); luck[b]->set(heroInst[b]);
} }
@ -6416,10 +6441,11 @@ void MoraleLuckBox::showAll(SDL_Surface * to)
blitAt(def->ourImages[bonusValue].bitmap, pos, to); blitAt(def->ourImages[bonusValue].bitmap, pos, to);
} }
MoraleLuckBox::MoraleLuckBox(bool Morale) MoraleLuckBox::MoraleLuckBox(bool Morale, const Rect &r)
:morale(Morale) :morale(Morale)
{ {
bonusValue = 0; bonusValue = 0;
pos = r + pos;
} }
MoraleLuckBox::~MoraleLuckBox() MoraleLuckBox::~MoraleLuckBox()

9
client/GUIClasses.h
View File

@ -815,7 +815,9 @@ public:
std::string text; std::string text;
LRClickableAreaWText(); LRClickableAreaWText();
LRClickableAreaWText(const Rect &Pos, const std::string &HoverText = "", const std::string &ClickText = "");
virtual ~LRClickableAreaWText(); virtual ~LRClickableAreaWText();
void init();
virtual void clickLeft(tribool down, bool previousState); virtual void clickLeft(tribool down, bool previousState);
virtual void clickRight(tribool down, bool previousState); virtual void clickRight(tribool down, bool previousState);
@ -827,6 +829,8 @@ public:
int baseType; int baseType;
int bonusValue, type; int bonusValue, type;
virtual void clickLeft(tribool down, bool previousState); virtual void clickLeft(tribool down, bool previousState);
LRClickableAreaWTextComp(const Rect &Pos = Rect(0,0,0,0), int BaseType = -1);
}; };
class MoraleLuckBox : public LRClickableAreaWTextComp class MoraleLuckBox : public LRClickableAreaWTextComp
@ -837,7 +841,7 @@ public:
void set(const CBonusSystemNode *node); void set(const CBonusSystemNode *node);
void showAll(SDL_Surface * to); void showAll(SDL_Surface * to);
MoraleLuckBox(bool Morale); MoraleLuckBox(bool Morale, const Rect &r);
~MoraleLuckBox(); ~MoraleLuckBox();
}; };
@ -861,6 +865,7 @@ public:
const CGTownInstance * town; const CGTownInstance * town;
void clickLeft(tribool down, bool previousState); void clickLeft(tribool down, bool previousState);
void clickRight(tribool down, bool previousState); void clickRight(tribool down, bool previousState);
LRClickableAreaOpenTown();
}; };
class CCreInfoWindow : public CIntObject class CCreInfoWindow : public CIntObject
@ -967,7 +972,7 @@ public:
void setSlotData (CArtPlace* artPlace, int slotID); void setSlotData (CArtPlace* artPlace, int slotID);
void eraseSlotData (CArtPlace* artPlace, int slotID); void eraseSlotData (CArtPlace* artPlace, int slotID);
CArtifactsOfHero(const Point& position); //c-tor CArtifactsOfHero(const Point& position, bool createCommonPart = false); //c-tor
~CArtifactsOfHero(); //d-tor ~CArtifactsOfHero(); //d-tor
void updateParentWindow(); void updateParentWindow();
friend class CArtPlace; friend class CArtPlace;

5
lib/ConstTransitivePtr.h
View File

@ -5,10 +5,7 @@ class ConstTransitivePtr
{ {
T *ptr; T *ptr;
public: public:
ConstTransitivePtr() ConstTransitivePtr(T *Ptr = NULL)
: ptr(NULL)
{}
ConstTransitivePtr(T *Ptr)
: ptr(Ptr) : ptr(Ptr)
{} {}

68
lib/NetPacks.h
View File

@ -601,6 +601,7 @@ struct SetHeroesInTown : public CPackForClient //508
h & tid & visiting & garrison; h & tid & visiting & garrison;
} }
}; };
struct SetHeroArtifacts : public CPackForClient //509 struct SetHeroArtifacts : public CPackForClient //509
{ {
SetHeroArtifacts(){type = 509;}; SetHeroArtifacts(){type = 509;};
@ -701,7 +702,7 @@ struct SetAvailableArtifacts : public CPackForClient //519
} }
}; };
struct NewArtifact : public CPackForClient struct NewArtifact : public CPackForClient //520
{ {
NewArtifact(){type = 520;}; NewArtifact(){type = 520;};
//void applyCl(CClient *cl); //void applyCl(CClient *cl);
@ -826,6 +827,71 @@ struct RebalanceStacks : CGarrisonOperationPack //526
} }
}; };
typedef CArtifact TTempArtInstance;
typedef si32 TArtPos;
struct ArtifactLocation
{
ConstTransitivePtr<CGHeroInstance> hero;
TArtPos slot;
ArtifactLocation()
{
hero = NULL;
slot = -1;
}
ArtifactLocation(const CGHeroInstance *Hero, TArtPos Slot)
{
hero = const_cast<CGHeroInstance*>(Hero); //we are allowed here to const cast -> change will go through one of our packages... do not abuse!
slot = Slot;
}
DLL_EXPORT const TTempArtInstance *getArt();
template <typename Handler> void serialize(Handler &h, const int version)
{
h & hero & slot;
}
};
struct PutArtifact : CGarrisonOperationPack //526
{
ArtifactLocation al;
TTempArtInstance *art;
void applyCl(CClient *cl);
DLL_EXPORT void applyGs(CGameState *gs);
template <typename Handler> void serialize(Handler &h, const int version)
{
h & src & dst & count;
}
};
struct EraseArtifact : CGarrisonOperationPack //527
{
ArtifactLocation al;
void applyCl(CClient *cl);
DLL_EXPORT void applyGs(CGameState *gs);
template <typename Handler> void serialize(Handler &h, const int version)
{
h & al;
}
};
struct MoveArtifact : CGarrisonOperationPack //528
{
ArtifactLocation src, dst;
void applyCl(CClient *cl);
DLL_EXPORT void applyGs(CGameState *gs);
template <typename Handler> void serialize(Handler &h, const int version)
{
h & src & dst;
}
};
struct NewTurn : public CPackForClient //101 struct NewTurn : public CPackForClient //101
{ {
enum weekType {NORMAL, DOUBLE_GROWTH, BONUS_GROWTH, DEITYOFFIRE, PLAGUE, CUSTOM, NO_ACTION, NONE}; enum weekType {NORMAL, DOUBLE_GROWTH, BONUS_GROWTH, DEITYOFFIRE, PLAGUE, CUSTOM, NO_ACTION, NONE};