mirror of
https://github.com/vcmi/vcmi.git
synced 2024-11-28 08:48:48 +02:00
Fixed initialization of recruited stacks.
Fixed displaying garrison slots in CCastleInterface.
This commit is contained in:
parent
ed07cfe073
commit
591ba76f69
@ -772,7 +772,7 @@ void CCastleInterface::showAll( SDL_Surface * to/*=NULL*/)
|
|||||||
statusbar->show(to);
|
statusbar->show(to);
|
||||||
resdatabar->draw(to);
|
resdatabar->draw(to);
|
||||||
|
|
||||||
garr->show(to);
|
garr->showAll(to);
|
||||||
//draw creatures icons and their growths
|
//draw creatures icons and their growths
|
||||||
for(size_t i=0;i<creainfo.size();i++)
|
for(size_t i=0;i<creainfo.size();i++)
|
||||||
creainfo[i]->show(to);
|
creainfo[i]->show(to);
|
||||||
|
@ -197,7 +197,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
|
|||||||
for(size_t i = 0; i<owner->splitButtons.size(); i++)
|
for(size_t i = 0; i<owner->splitButtons.size(); i++)
|
||||||
owner->splitButtons[i]->block(true);
|
owner->splitButtons[i]->block(true);
|
||||||
|
|
||||||
show(screen2);
|
redraw();
|
||||||
refr = true;
|
refr = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -262,7 +262,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
|
|||||||
{
|
{
|
||||||
if(creature)
|
if(creature)
|
||||||
owner->highlighted = this;
|
owner->highlighted = this;
|
||||||
show(screen2);
|
redraw();
|
||||||
refr = true;
|
refr = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -276,7 +276,7 @@ void CGarrisonSlot::clickLeft(tribool down, bool previousState)
|
|||||||
for(size_t i = 0; i<owner->splitButtons.size(); i++)
|
for(size_t i = 0; i<owner->splitButtons.size(); i++)
|
||||||
owner->splitButtons[i]->block(false);
|
owner->splitButtons[i]->block(false);
|
||||||
}
|
}
|
||||||
show(screen2);
|
redraw();
|
||||||
refr = true;
|
refr = true;
|
||||||
}
|
}
|
||||||
if(refr) {hover(false); hover(true); } //to refresh statusbar
|
if(refr) {hover(false); hover(true); } //to refresh statusbar
|
||||||
|
@ -402,7 +402,7 @@ CStackInstance::CStackInstance(const CCreature *cre, TQuantity Count)
|
|||||||
: armyObj(_armyObj)
|
: armyObj(_armyObj)
|
||||||
{
|
{
|
||||||
init();
|
init();
|
||||||
type = cre;
|
setType(cre);
|
||||||
count = Count;
|
count = Count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user