mirror of
https://github.com/vcmi/vcmi.git
synced 2025-07-07 00:58:39 +02:00
Merge branch 'develop' into SDL2
Conflicts: client/CPlayerInterface.cpp
This commit is contained in:
@ -317,7 +317,7 @@ void CTownList::CTownItem::showTooltip()
|
||||
|
||||
std::string CTownList::CTownItem::getHoverText()
|
||||
{
|
||||
return town->hoverName;
|
||||
return town->getObjectName();
|
||||
}
|
||||
|
||||
CTownList::CTownList(int size, Point position, std::string btnUp, std::string btnDown):
|
||||
|
Reference in New Issue
Block a user