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

Merge 'develop' branch

Browse Source
This commit is contained in:
Dydzio
2023-01-11 16:24:53 +01:00
parent 58fe0e6bd9 5e72ef76cf
commit aac515f64e
169 changed files with 8437 additions and 3989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/widgets/AdventureMapClasses.cpp
View File

@ -237,7 +237,7 @@ void CHeroList::CHeroItem::open()
void CHeroList::CHeroItem::showTooltip()
{
CRClickPopup::createAndPush(hero, GH.current->motion);
CRClickPopup::createAndPush(hero, Point(GH.current->motion));
}
std::string CHeroList::CHeroItem::getHoverText()
@ -329,7 +329,7 @@ void CTownList::CTownItem::open()
void CTownList::CTownItem::showTooltip()
{
CRClickPopup::createAndPush(town, GH.current->motion);
CRClickPopup::createAndPush(town, Point(GH.current->motion));
}
std::string CTownList::CTownItem::getHoverText()
@ -975,11 +975,8 @@ void CInGameConsole::show(SDL_Surface * to)
boost::unique_lock<boost::mutex> lock(texts_mx);
for(auto it = texts.begin(); it != texts.end(); ++it, ++number)
{
Point leftBottomCorner(0, screen->h);
if(LOCPLINT->battleInt)
{
leftBottomCorner = LOCPLINT->battleInt->pos.bottomLeft();
}
Point leftBottomCorner(0, pos.h);
graphics->fonts[FONT_MEDIUM]->renderTextLeft(to, it->first, Colors::GREEN,
Point(leftBottomCorner.x + 50, leftBottomCorner.y - (int)texts.size() * 20 - 80 + number*20));