diff --git a/mapeditor/mapsettings/loseconditions.cpp b/mapeditor/mapsettings/loseconditions.cpp
index fe761df9b..3ea029991 100644
--- a/mapeditor/mapsettings/loseconditions.cpp
+++ b/mapeditor/mapsettings/loseconditions.cpp
@@ -137,7 +137,7 @@ void LoseConditions::update(CMap & map)
{
map.triggeredEvents.push_back(standardDefeat);
map.defeatIconIndex = 3;
- map.defeatMessage.appendTextID("core.lcdesc.0");
+ map.defeatMessage = MetaString::createFromTextID("core.lcdesc.0");
}
else
{
@@ -162,7 +162,7 @@ void LoseConditions::update(CMap & map)
noneOf.expressions.push_back(cond);
specialDefeat.onFulfill.appendTextID("core.genrltxt.251");
specialDefeat.trigger = EventExpression(noneOf);
- map.defeatMessage.appendTextID("core.lcdesc.1");
+ map.defeatMessage = MetaString::createFromTextID("core.lcdesc.1");
break;
}
@@ -176,7 +176,7 @@ void LoseConditions::update(CMap & map)
noneOf.expressions.push_back(cond);
specialDefeat.onFulfill.appendTextID("core.genrltxt.253");
specialDefeat.trigger = EventExpression(noneOf);
- map.defeatMessage.appendTextID("core.lcdesc.2");
+ map.defeatMessage = MetaString::createFromTextID("core.lcdesc.2");
break;
}
@@ -186,7 +186,7 @@ void LoseConditions::update(CMap & map)
cond.value = expiredDate(loseValueWidget->text());
specialDefeat.onFulfill.appendTextID("core.genrltxt.254");
specialDefeat.trigger = EventExpression(cond);
- map.defeatMessage.appendTextID("core.lcdesc.3");
+ map.defeatMessage = MetaString::createFromTextID("core.lcdesc.3");
break;
}
diff --git a/mapeditor/mapsettings/loseconditions.ui b/mapeditor/mapsettings/loseconditions.ui
index f96f2a635..35d3cb7ce 100644
--- a/mapeditor/mapsettings/loseconditions.ui
+++ b/mapeditor/mapsettings/loseconditions.ui
@@ -42,7 +42,11 @@
-
-
+
+
+ true
+
+
diff --git a/mapeditor/mapsettings/victoryconditions.cpp b/mapeditor/mapsettings/victoryconditions.cpp
index f88eee931..be9ffd168 100644
--- a/mapeditor/mapsettings/victoryconditions.cpp
+++ b/mapeditor/mapsettings/victoryconditions.cpp
@@ -186,7 +186,7 @@ void VictoryConditions::update(CMap & map)
{
map.triggeredEvents.push_back(standardVictory);
map.victoryIconIndex = 11;
- map.victoryMessage.appendTextID(VLC->generaltexth->victoryConditions[0]);
+ map.victoryMessage = MetaString::createFromTextID("core.vcdesc.0");
}
else
{
@@ -198,7 +198,7 @@ void VictoryConditions::update(CMap & map)
specialVictory.description.clear(); // TODO: display in quest window
map.victoryIconIndex = vicCondition;
- map.victoryMessage.appendTextID(VLC->generaltexth->victoryConditions[size_t(vicCondition) + 1]);
+ map.victoryMessage = MetaString::createFromTextID("core.vcdesc." + std::to_string(vicCondition + 1));
switch(vicCondition)
{
@@ -301,7 +301,7 @@ void VictoryConditions::update(CMap & map)
if(ui->standardVictoryCheck->isChecked())
{
map.victoryMessage.appendRawString(" / ");
- map.victoryMessage.appendTextID(VLC->generaltexth->victoryConditions[0]);
+ map.victoryMessage.appendTextID("core.vcdesc.0");
map.triggeredEvents.push_back(standardVictory);
}
map.triggeredEvents.push_back(specialVictory);
diff --git a/mapeditor/mapsettings/victoryconditions.ui b/mapeditor/mapsettings/victoryconditions.ui
index 2bd91bb40..d1c86ea47 100644
--- a/mapeditor/mapsettings/victoryconditions.ui
+++ b/mapeditor/mapsettings/victoryconditions.ui
@@ -42,7 +42,11 @@
-
-
+
+
+ true
+
+