xrGame: remove DELIMITER from newline operations

Author: eagleivg

src/xrGame/game_news.cpp

@@ -54,7 +54,7 @@ LPCSTR GAME_NEWS_DATA::SingleLineText()
     u32 years, months, days, hours, minutes, seconds, milliseconds;
     split_time		(receive_time, years, months, days, hours, minutes, seconds, milliseconds);
 //#pragma todo("Satan->Satan : insert carry-over")
-    //xr_sprintf(time, "%02i:%02i " DELIMITER "n", hours, minutes);
+    //xr_sprintf(time, "%02i:%02i \\n", hours, minutes);
     xr_sprintf		(time, "%02i:%02i, ", hours, minutes);
 //	strconcat	(result, locationName, time, newsPhrase);
 

src/xrGame/ui/UIInvUpgradeInfo.cpp

@@ -119,28 +119,28 @@ bool UIInvUpgradeInfo::init_upgrade(Upgrade_type* upgr, CInventoryItem* inv_item
         }
         else if (upg_res == inventory::upgrade::result_e_unknown)
         {
-            xr_sprintf(str_res, sizeof(str_res), "%s:" DELIMITER "n - %s", CStringTable().translate("st_upgr_disable").c_str(),
+            xr_sprintf(str_res, sizeof(str_res), "%s:\\n - %s", CStringTable().translate("st_upgr_disable").c_str(),
                 CStringTable().translate("st_upgr_unknown").c_str());
             m_cost->Show(false);
         }
         else if (upg_res == inventory::upgrade::result_e_group)
-            xr_sprintf(str_res, sizeof(str_res), "%s:" DELIMITER "n - %s", CStringTable().translate("st_upgr_disable").c_str(),
+            xr_sprintf(str_res, sizeof(str_res), "%s:\\n - %s", CStringTable().translate("st_upgr_disable").c_str(),
                 CStringTable().translate("st_upgr_group").c_str());
         else if (upg_res_script == inventory::upgrade::result_e_precondition_money)
-            xr_sprintf(str_res, sizeof(str_res), "%s:" DELIMITER "n - %s", CStringTable().translate("st_upgr_disable").c_str(),
+            xr_sprintf(str_res, sizeof(str_res), "%s:\\n - %s", CStringTable().translate("st_upgr_disable").c_str(),
                 CStringTable().translate("st_upgr_cant_do").c_str());
         else
         {
             if (upg_res != inventory::upgrade::result_ok)
             {
-                xr_sprintf(str_res, sizeof(str_res), "%s:" DELIMITER "n%s", CStringTable().translate("st_upgr_disable").c_str(),
+                xr_sprintf(str_res, sizeof(str_res), "%s:\\n%s", CStringTable().translate("st_upgr_disable").c_str(),
                     m_upgrade->get_prerequisites());
                 if (upg_res == inventory::upgrade::result_e_parents)
-                    xr_sprintf(str_res, sizeof(str_res), "%s" DELIMITER "n - %s", str_res,
+                    xr_sprintf(str_res, sizeof(str_res), "%s\\n - %s", str_res,
                         CStringTable().translate("st_upgr_parents").c_str());
 
                 if (upg_res == inventory::upgrade::result_e_precondition_money)
-                    xr_sprintf(str_res, sizeof(str_res), "%s:" DELIMITER "n - %s",
+                    xr_sprintf(str_res, sizeof(str_res), "%s:\\n - %s",
                         CStringTable().translate("st_upgr_disable").c_str(),
                         CStringTable().translate("st_upgr_cant_do").c_str());
             }

src/xrGame/ui/UILine.cpp

@@ -105,7 +105,7 @@ void CUILine::ProcessNewLines()
 {
     for (u32 i = 0; i < m_subLines.size(); i++)
     {
-        StrSize pos = m_subLines[i].m_text.find(DELIMITER "n");
+        StrSize pos = m_subLines[i].m_text.find("\\n");
         //		if (pos != npos)
         //			pos = m_subLines[i].m_text.find('\r');
 

src/xrGame/ui/UILines.cpp

@@ -119,7 +119,7 @@ void CUILines::ParseText(bool force)
                 VERIFY(llen < MAX_MB_CHARS);
                 xr_strcpy(szTempLine, line->m_subLines[i].m_text.c_str());
                 pszSearch = szTempLine;
-                while ((pszTemp = strstr(pszSearch, DELIMITER "n")) != NULL)
+                while ((pszTemp = strstr(pszSearch, "\\n")) != NULL)
                 {
                     bNewLines = TRUE;
                     *pszTemp = '\0';

src/xrGame/ui/UIMapInfo.cpp

@@ -30,7 +30,7 @@ void CUIMapInfo::InitMapInfo(Fvector2 pos, Fvector2 size)
         text += *str_tbl.translate(ltx.r_string_wb("map_info", y)); \
     else                                                            \
         text += *str_tbl.translate(z);                              \
-    text += "%c[default]" DELIMITER "n";                                       \
+    text += "%c[default]\\n";                                       \
     st = new CUITextWnd();                                          \
     st->SetTextComplexMode(true);                                   \
     st->SetFont(txt_font);                                          \
@@ -116,7 +116,7 @@ void CUIMapInfo::InitMap(LPCSTR map_name, LPCSTR map_ver)
             text += *str_tbl.translate("st_artefacthunt");
         }
 
-        text += "%c[default]" DELIMITER "n";
+        text += "%c[default]\\n";
 
         st = new CUITextWnd();
         st->SetTextComplexMode(true);

src/xrGame/ui/UITalkDialogWnd.cpp

@@ -334,7 +334,7 @@ void CUIAnswerItemIconed::Init(LPCSTR text, LPCSTR name, LPCSTR texture_name)
 {
     xr_string res;
     res += name;
-    res += DELIMITER "n %c[250,255,232,208]";
+    res += "\\n %c[250,255,232,208]";
     res += text;
 
     inherited::Init(res.c_str(), "");