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

Merge pull request #1481 from kambala-decapitator/owner-tooltip

Browse Source 
display owner of ownable objects in tooltip
This commit is contained in:
Andrii Danylchenko 2023-01-25 10:38:13 +02:00 committed by GitHub
commit 94f483c1e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mapObjects/CObjectHandler.cpp
View File

@ -328,7 +328,10 @@ boost::optional<std::string> CGObjectInstance::getRemovalSound() const
std::string CGObjectInstance::getHoverText(PlayerColor player) const
{
return getObjectName();
auto text = getObjectName();
if (tempOwner.isValidPlayer())
text += "\n" + VLC->generaltexth->arraytxt[23 + tempOwner.getNum()];
return text;
}
std::string CGObjectInstance::getHoverText(const CGHeroInstance * hero) const

12
lib/mapObjects/MiscObjects.cpp
View File

@ -715,14 +715,10 @@ std::string CGMine::getObjectName() const
std::string CGMine::getHoverText(PlayerColor player) const
{
std::string hoverName = getObjectName(); // Sawmill
std::string hoverName = CArmedInstance::getHoverText(player);
if (tempOwner != PlayerColor::NEUTRAL)
{
hoverName += "\n";
hoverName += VLC->generaltexth->arraytxt[23 + tempOwner.getNum()]; // owned by Red Player
hoverName += "\n(" + VLC->generaltexth->restypes[producedResource] + ")";
}
if(stacksCount())
{
@ -2200,12 +2196,6 @@ void CGLighthouse::initObj(CRandomGenerator & rand)
}
}
std::string CGLighthouse::getHoverText(PlayerColor player) const
{
//TODO: owned by %s player
return getObjectName();
}
void CGLighthouse::giveBonusTo(PlayerColor player, bool onInit) const
{
GiveBonus gb(GiveBonus::PLAYER);

1
lib/mapObjects/MiscObjects.h
View File

@ -523,7 +523,6 @@ class DLL_LINKAGE CGLighthouse : public CGObjectInstance
public:
void onHeroVisit(const CGHeroInstance * h) const override;
void initObj(CRandomGenerator & rand) override;
std::string getHoverText(PlayerColor player) const override;
template <typename Handler> void serialize(Handler &h, const int version)
{