games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge pull request #6211 from Laserlicht/text_edit

Browse Source 
Allowing editing town name
This commit is contained in:
Ivan Savenko
2025-10-28 15:33:50 +02:00
committed by GitHub
parent 185c41810f a4d840f60f
commit dc9fd90f3e
28 changed files with 265 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/mapObjects/CGTownInstance.cpp
View File

@@ -860,7 +860,7 @@ CBonusSystemNode & CGTownInstance::whatShouldBeAttached()
std::string CGTownInstance::getNameTranslated() const
{
return LIBRARY->generaltexth->translate(nameTextId);
return customName.empty() ? LIBRARY->generaltexth->translate(nameTextId) : customName;
}
std::string CGTownInstance::getNameTextID() const
@@ -873,6 +873,11 @@ void CGTownInstance::setNameTextId( const std::string & newName )
nameTextId = newName;
}
void CGTownInstance::setCustomName( const std::string & newName )
{
customName = newName;
}
const CArmedInstance * CGTownInstance::getUpperArmy() const
{
if(getGarrisonHero())

4
lib/mapObjects/CGTownInstance.h
View File

@@ -46,6 +46,7 @@ class DLL_LINKAGE CGTownInstance : public CGDwelling, public IShipyard, public I
{
friend class CTownInstanceConstructor;
std::string nameTextId; // name of town
std::string customName;
std::map<BuildingID, TownRewardableBuildingInstance*> convertOldBuildings(std::vector<TownRewardableBuildingInstance*> oldVector);
std::set<BuildingID> builtBuildings;
@@ -75,6 +76,8 @@ public:
{
h & static_cast<CGDwelling&>(*this);
h & nameTextId;
if (h.version >= Handler::Version::CUSTOM_NAMES)
h & customName;
h & built;
h & destroyed;
h & identifier;
@@ -128,6 +131,7 @@ public:
std::string getNameTranslated() const;
std::string getNameTextID() const;
void setNameTextId(const std::string & newName);
void setCustomName(const std::string & newName);
//////////////////////////////////////////////////////////////////////////