games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Merged changes from trunk.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-01-15 02:35:46 +00:00
parent a940daba5e b8f65697ca
commit f52d4f7cd6
16 changed files with 141 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/GUIClasses.cpp
View File

@ -3520,7 +3520,7 @@ CAltarWindow::CAltarWindow(const IMarket *Market, const CGHeroInstance *Hero /*=
{
BLOCK_CAPTURING;
arts = new CArtifactsOfHero(Point(-267,-10));
arts = new CArtifactsOfHero(Point(pos.x-363, pos.y-12));
arts->commonInfo = new CArtifactsOfHero::SCommonPart;
arts->commonInfo->participants.insert(arts);
arts->setHero(Hero);
@ -5983,7 +5983,10 @@ void CUniversityWindow::CItem::showAll(SDL_Surface * to)
break;
case 2: bar = parent->green;
break;
default:bar = NULL;
break;
}
assert(bar);
blitAtLoc(bar->bg, -28, -22, to);
blitAtLoc(bar->bg, -28, 48, to);