瀏覽代碼

Fix error messages in log on map start

Ivan Savenko 1 年之前
父節點
當前提交
2c8d0338ba
共有 4 個文件被更改,包括 14 次插入3 次删除
  1. 5 2
      lib/MetaString.cpp
  2. 5 0
      lib/mapObjects/CGTownInstance.cpp
  3. 1 0
      lib/mapObjects/CGTownInstance.h
  4. 3 1
      lib/mapObjects/CQuest.h

+ 5 - 2
lib/MetaString.cpp

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

+ 5 - 0
lib/mapObjects/CGTownInstance.cpp

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

+ 1 - 0
lib/mapObjects/CGTownInstance.h

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

+ 3 - 1
lib/mapObjects/CQuest.h

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