(909dcf05d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-07 18:05:33 +03:00
parent 427526aba2
commit b83302408f
3 changed files with 9 additions and 8 deletions
@@ -141,7 +141,7 @@ namespace Barotrauma
}
currentVideo = CreateVideo(scaledVideoResolution);
title.Text = TextManager.Get(contentId);
title.Text = textSettings != null ? TextManager.Get(contentId) : string.Empty;
textContent.Text = textSettings != null ? textSettings.Text : string.Empty;
objectiveText.Text = objective;