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

Fix error messages in log on map start

Browse Source
This commit is contained in:
Ivan Savenko 2023-11-26 18:53:34 +02:00
parent 6730ec64d5
commit 2c8d0338ba
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/MetaString.cpp
View File

@ -51,8 +51,11 @@ void MetaString::appendRawString(const std::string & value)
void MetaString::appendTextID(const std::string & value) void MetaString::appendTextID(const std::string & value)
{ {
message.push_back(EMessage::APPEND_TEXTID_STRING); if (!value.empty())
stringsTextID.push_back(value); {
message.push_back(EMessage::APPEND_TEXTID_STRING);
stringsTextID.push_back(value);
}
} }
void MetaString::appendNumber(int64_t value) void MetaString::appendNumber(int64_t value)

5
lib/mapObjects/CGTownInstance.cpp
View File

@ -947,6 +947,11 @@ std::string CGTownInstance::getNameTranslated() const
return VLC->generaltexth->translate(nameTextId); return VLC->generaltexth->translate(nameTextId);
} }
std::string CGTownInstance::getNameTextID() const
{
return nameTextId;
}
void CGTownInstance::setNameTextId( const std::string & newName ) void CGTownInstance::setNameTextId( const std::string & newName )
{ {
nameTextId = newName; nameTextId = newName;

1
lib/mapObjects/CGTownInstance.h
View File

@ -137,6 +137,7 @@ public:
const CArmedInstance *getUpperArmy() const; //garrisoned hero if present or the town itself const CArmedInstance *getUpperArmy() const; //garrisoned hero if present or the town itself
std::string getNameTranslated() const; std::string getNameTranslated() const;
std::string getNameTextID() const;
void setNameTextId(const std::string & newName); void setNameTextId(const std::string & newName);
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

4
lib/mapObjects/CQuest.h
View File

@ -45,7 +45,9 @@ public:
std::string heroName; //backup of hero name std::string heroName; //backup of hero name
HeroTypeID heroPortrait; HeroTypeID heroPortrait;
MetaString firstVisitText, nextVisitText, completedText; MetaString firstVisitText;
MetaString nextVisitText;
MetaString completedText;
bool isCustomFirst; bool isCustomFirst;
bool isCustomNext; bool isCustomNext;
bool isCustomComplete; bool isCustomComplete;