mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-13 21:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Use localized faction name when using TFH

Browse Source
This commit is contained in:
Andrei Kortunov 2019-10-05 16:59:04 +04:00
parent f0b73e0a27
commit f75f9cb337
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwgui/tooltips.cpp
View File

@ -652,19 +652,22 @@ namespace MWGui
std::string ret; std::string ret;
ret += getMiscString(cellref.getOwner(), "Owner"); ret += getMiscString(cellref.getOwner(), "Owner");
const std::string factionId = cellref.getFaction(); const std::string factionId = cellref.getFaction();
ret += getMiscString(factionId, "Faction"); if (!factionId.empty())
if (!factionId.empty() && cellref.getFactionRank() >= 0)
{ {
const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore &store = MWBase::Environment::get().getWorld()->getStore();
const ESM::Faction *fact = store.get<ESM::Faction>().search(factionId); const ESM::Faction *fact = store.get<ESM::Faction>().search(factionId);
if (fact != nullptr) if (fact != nullptr)
{ {
int rank = cellref.getFactionRank(); ret += getMiscString(fact->mName.empty() ? factionId : fact->mName, "Owner Faction");
const std::string rankName = fact->mRanks[rank]; if (cellref.getFactionRank() >= 0)
if (rankName.empty()) {
ret += getValueString(cellref.getFactionRank(), "Rank"); int rank = cellref.getFactionRank();
else const std::string rankName = fact->mRanks[rank];
ret += getMiscString(rankName, "Rank"); if (rankName.empty())
ret += getValueString(cellref.getFactionRank(), "Rank");
else
ret += getMiscString(rankName, "Rank");
}
} }
} }