From 0fa4e03db6a6334b628accaea2c2932fa8dea6d8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 5 Mar 2019 00:22:26 +0100 Subject: [PATCH] - process escape sequences for episode and skill names For these, colorization is a desirable feature. --- src/gamedata/g_mapinfo.cpp | 2 +- src/gamedata/g_skill.cpp | 2 +- src/gamedata/umapinfo.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gamedata/g_mapinfo.cpp b/src/gamedata/g_mapinfo.cpp index 488ac4f0d..c69430b09 100644 --- a/src/gamedata/g_mapinfo.cpp +++ b/src/gamedata/g_mapinfo.cpp @@ -2019,7 +2019,7 @@ void FMapInfoParser::ParseEpisodeInfo () { ParseAssign(); sc.MustGetString (); - name = sc.String; + name = strbin1(sc.String); } else if (sc.Compare ("picname")) { diff --git a/src/gamedata/g_skill.cpp b/src/gamedata/g_skill.cpp index 897ffdc76..1b8d15e14 100644 --- a/src/gamedata/g_skill.cpp +++ b/src/gamedata/g_skill.cpp @@ -214,7 +214,7 @@ void FMapInfoParser::ParseSkill () { ParseAssign(); sc.MustGetString (); - skill.MenuName = sc.String; + skill.MenuName = strbin1(sc.String); } else if (sc.Compare("PlayerClassName")) { diff --git a/src/gamedata/umapinfo.cpp b/src/gamedata/umapinfo.cpp index ac82ff8e2..39b91efd3 100644 --- a/src/gamedata/umapinfo.cpp +++ b/src/gamedata/umapinfo.cpp @@ -24,6 +24,7 @@ #include "r_defs.h" #include "p_setup.h" #include "gi.h" +#include "cmdlib.h" FName MakeEndPic(const char *string); @@ -231,7 +232,7 @@ static int ParseStandardProperty(FScanner &scanner, UMapEntry *mape) // add the given episode FEpisode epi; - epi.mEpisodeName = split[1]; + epi.mEpisodeName = strbin1(split[1]); epi.mEpisodeMap = mape->MapName; epi.mPicName = split[0]; epi.mShortcut = split[2][0];