diff --git a/OpenRA.Game/TextNotificationsManager.cs b/OpenRA.Game/TextNotificationsManager.cs index 54af0fdb8a..d1e2b965d7 100644 --- a/OpenRA.Game/TextNotificationsManager.cs +++ b/OpenRA.Game/TextNotificationsManager.cs @@ -31,6 +31,11 @@ namespace OpenRA AddTextNotification(TextNotificationPool.Feedback, SystemMessageLabel, text); } + public static void AddMissionLine(string prefix, string text, Color? prefixColor = null) + { + AddTextNotification(TextNotificationPool.Mission, prefix, text, prefixColor); + } + public static void AddSystemLine(string text) { AddSystemLine(SystemMessageLabel, text); diff --git a/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs index db4f309544..52a20a0faf 100644 --- a/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/MediaGlobal.cs @@ -194,7 +194,7 @@ namespace OpenRA.Mods.Common.Scripting return; var c = color.HasValue ? color.Value : Color.White; - TextNotificationsManager.AddChatLine(prefix, text, c); + TextNotificationsManager.AddMissionLine(prefix, text, c); } [Desc("Display a system message to the player. If 'prefix' is nil the default system prefix is used.")] diff --git a/OpenRA.Mods.Common/Widgets/TextNotificationsDisplayWidget.cs b/OpenRA.Mods.Common/Widgets/TextNotificationsDisplayWidget.cs index 10424d1dd5..bb2ab2863e 100644 --- a/OpenRA.Mods.Common/Widgets/TextNotificationsDisplayWidget.cs +++ b/OpenRA.Mods.Common/Widgets/TextNotificationsDisplayWidget.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Widgets public string ChatTemplate = "CHAT_LINE_TEMPLATE"; public string SystemTemplate = "SYSTEM_LINE_TEMPLATE"; - public string MissionTemplate = "SYSTEM_LINE_TEMPLATE"; + public string MissionTemplate = "CHAT_LINE_TEMPLATE"; public string FeedbackTemplate = "TRANSIENT_LINE_TEMPLATE"; readonly Dictionary templates = new Dictionary(); diff --git a/mods/cnc/chrome/ingame-chat.yaml b/mods/cnc/chrome/ingame-chat.yaml index 462a26fe03..6153af88c5 100644 --- a/mods/cnc/chrome/ingame-chat.yaml +++ b/mods/cnc/chrome/ingame-chat.yaml @@ -9,7 +9,7 @@ Container@CHAT_PANEL: Templates: Chat: CHAT_LINE_TEMPLATE System: SYSTEM_LINE_TEMPLATE - Mission: SYSTEM_LINE_TEMPLATE + Mission: CHAT_LINE_TEMPLATE Children: Container@CHAT_OVERLAY: Width: PARENT_RIGHT - 24 diff --git a/mods/cnc/chrome/ingame-infochat.yaml b/mods/cnc/chrome/ingame-infochat.yaml index ae15662794..e13b6b14f0 100644 --- a/mods/cnc/chrome/ingame-infochat.yaml +++ b/mods/cnc/chrome/ingame-infochat.yaml @@ -6,7 +6,7 @@ Container@CHAT_CONTAINER: Templates: Chat: CHAT_LINE_TEMPLATE System: SYSTEM_LINE_TEMPLATE - Mission: SYSTEM_LINE_TEMPLATE + Mission: CHAT_LINE_TEMPLATE Children: Container@CHAT_CHROME: X: 15 diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index ab45ed6231..f1e5353af4 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -3,7 +3,7 @@ Container@SERVER_LOBBY: ChatTemplates: Chat: CHAT_LINE_TEMPLATE System: SYSTEM_LINE_TEMPLATE - Mission: SYSTEM_LINE_TEMPLATE + Mission: CHAT_LINE_TEMPLATE Feedback: TRANSIENT_LINE_TEMPLATE X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - 560) / 2 diff --git a/mods/common/chrome/ingame-chat.yaml b/mods/common/chrome/ingame-chat.yaml index 0d75ea6ad2..dceb441d02 100644 --- a/mods/common/chrome/ingame-chat.yaml +++ b/mods/common/chrome/ingame-chat.yaml @@ -9,7 +9,7 @@ Container@CHAT_PANEL: Templates: Chat: CHAT_LINE_TEMPLATE System: SYSTEM_LINE_TEMPLATE - Mission: SYSTEM_LINE_TEMPLATE + Mission: CHAT_LINE_TEMPLATE Children: Container@CHAT_OVERLAY: Width: PARENT_RIGHT - 24 diff --git a/mods/common/chrome/ingame-infochat.yaml b/mods/common/chrome/ingame-infochat.yaml index 88906eb142..59b9470cc9 100644 --- a/mods/common/chrome/ingame-infochat.yaml +++ b/mods/common/chrome/ingame-infochat.yaml @@ -6,7 +6,7 @@ Container@CHAT_CONTAINER: Templates: Chat: CHAT_LINE_TEMPLATE System: SYSTEM_LINE_TEMPLATE - Mission: SYSTEM_LINE_TEMPLATE + Mission: CHAT_LINE_TEMPLATE Children: Container@CHAT_CHROME: X: 20 diff --git a/mods/common/chrome/lobby.yaml b/mods/common/chrome/lobby.yaml index 5f967474d9..0535cb1d58 100644 --- a/mods/common/chrome/lobby.yaml +++ b/mods/common/chrome/lobby.yaml @@ -3,7 +3,7 @@ Background@SERVER_LOBBY: ChatTemplates: Chat: CHAT_LINE_TEMPLATE System: SYSTEM_LINE_TEMPLATE - Mission: SYSTEM_LINE_TEMPLATE + Mission: CHAT_LINE_TEMPLATE Feedback: TRANSIENT_LINE_TEMPLATE X: (WINDOW_RIGHT - WIDTH) / 2 Y: (WINDOW_BOTTOM - HEIGHT) / 2