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

Merge remote-tracking branch 'vcmi/master' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-19 13:49:54 +02:00
parent 3e8f110482 dceae7398c
commit bd5682ecc3
191 changed files with 3188 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/mapping/CMapHeader.cpp
View File

@ -122,13 +122,9 @@ CMapHeader::CMapHeader() : version(EMapFormat::VCMI), height(72), width(72),
setupEvents();
allowedHeroes = VLC->heroh->getDefaultAllowed();
players.resize(PlayerColor::PLAYER_LIMIT_I);
VLC->generaltexth->addSubContainer(*this);
}
CMapHeader::~CMapHeader()
{
VLC->generaltexth->removeSubContainer(*this);
}
CMapHeader::~CMapHeader() = default;
ui8 CMapHeader::levels() const
{
@ -137,9 +133,6 @@ ui8 CMapHeader::levels() const
void CMapHeader::registerMapStrings()
{
VLC->generaltexth->removeSubContainer(*this);
VLC->generaltexth->addSubContainer(*this);
//get supported languages. Assuming that translation containing most strings is the base language
std::set<std::string, std::less<>> mapLanguages;
std::set<std::string, std::less<>> mapBaseLanguages;
@ -195,7 +188,7 @@ void CMapHeader::registerMapStrings()
JsonUtils::mergeCopy(data, translations[language]);
for(auto & s : data.Struct())
registerString("map", TextIdentifier(s.first), s.second.String(), language);
texts.registerString("map", TextIdentifier(s.first), s.second.String(), language);
}
std::string mapRegisterLocalizedString(const std::string & modContext, CMapHeader & mapHeader, const TextIdentifier & UID, const std::string & localized)
@ -205,7 +198,7 @@ std::string mapRegisterLocalizedString(const std::string & modContext, CMapHeade
std::string mapRegisterLocalizedString(const std::string & modContext, CMapHeader & mapHeader, const TextIdentifier & UID, const std::string & localized, const std::string & language)
{
mapHeader.registerString(modContext, UID, localized, language);
mapHeader.texts.registerString(modContext, UID, localized, language);
mapHeader.translations.Struct()[language].Struct()[UID.get()].String() = localized;
return UID.get();
}