xrGame: replace \\ to DELIMITER macro

Author: eagleivg

src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp

@@ -19,13 +19,13 @@ void simplify_texture(string_path& fn)
     if (strstr(Core.Params, "-game_designer"))
     {
         if (strstr(fn, "$user")) return;
-        if (strstr(fn, "ui\\")) return;
+        if (strstr(fn, "ui" DELIMITER )) return;
         if (strstr(fn, "lmap#")) return;
-        if (strstr(fn, "act\\")) return;
-        if (strstr(fn, "fx\\")) return;
-        if (strstr(fn, "glow\\")) return;
-        if (strstr(fn, "map\\")) return;
-        strcpy_s(fn, "ed\\ed_not_existing_texture");
+        if (strstr(fn, "act" DELIMITER )) return;
+        if (strstr(fn, "fx" DELIMITER )) return;
+        if (strstr(fn, "glow" DELIMITER )) return;
+        if (strstr(fn, "map" DELIMITER )) return;
+        strcpy_s(fn, "ed" DELIMITER "ed_not_existing_texture");
     }
 }
 

src/xrCore/XML/XMLDocument.cpp

@@ -23,11 +23,11 @@ void ParseFile(pcstr path, CMemoryWriter& W, IReader* F, XMLDocument* xml)
             if (_GetItem(str, 1, inc_name, '"'))
             {
                 IReader* I = nullptr;
-                if (inc_name == strstr(inc_name, "ui\\"))
+                if (inc_name == strstr(inc_name, "ui" DELIMITER ))
                 {
-                    shared_str fn = xml->correct_file_name("ui", strchr(inc_name, '\\') + 1);
+                    shared_str fn = xml->correct_file_name("ui", strchr(inc_name, _DELIMITER) + 1);
                     string_path buff;
-                    strconcat(sizeof buff, buff, "ui\\", fn.c_str());
+                    strconcat(sizeof buff, buff, "ui" DELIMITER , fn.c_str());
                     I = FS.r_open(path, buff);
                 }
 
@@ -50,7 +50,7 @@ void XMLDocument::Load(pcstr path_alias, pcstr path, pcstr _xml_filename)
     shared_str fn = correct_file_name(path, _xml_filename);
 
     string_path str;
-    xr_sprintf(str, "%s\\%s", path, *fn);
+    xr_sprintf(str, "%s" DELIMITER "%s", path, *fn);
     return Load(path_alias, str);
 }
 

src/xrEngine/GameFont.cpp

@@ -59,6 +59,15 @@ void CGameFont::Initialize(pcstr cShader, pcstr cTextureName)
     else
         xr_strcpy(cTexture, sizeof(cTexture), cTextureName);
 
+#if defined(LINUX)
+        char* ptr = strchr(cTexture, '\\');
+        while (ptr)
+        {
+            *ptr = '/';
+            ptr = strchr(ptr, '\\');
+        }
+#endif
+
     uFlags &= ~fsValid;
     vTS.set(1.f, 1.f); // обязательно !!!
 

src/xrEngine/XR_IOConsole.cpp

@@ -219,7 +219,7 @@ void CConsole::OnRender()
     if (!m_hShader_back)
     {
         m_hShader_back = new FactoryPtr<IUIShader>();
-        (*m_hShader_back)->create("hud\\default", "ui\\ui_console"); // "ui\\ui_empty"
+        (*m_hShader_back)->create("hud" DELIMITER "default", "ui" DELIMITER "ui_console"); // "ui/ui_empty"
     }
 
     if (!pFont)

src/xrGame/Actor.cpp

@@ -387,13 +387,13 @@ void CActor::Load(LPCSTR section)
             char buf[256];
 
             GEnv.Sound->create(
-                sndDie[0], strconcat(sizeof(buf), buf, *cName(), "\\die0"), st_Effect, SOUND_TYPE_MONSTER_DYING);
+                sndDie[0], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die0"), st_Effect, SOUND_TYPE_MONSTER_DYING);
             GEnv.Sound->create(
-                sndDie[1], strconcat(sizeof(buf), buf, *cName(), "\\die1"), st_Effect, SOUND_TYPE_MONSTER_DYING);
+                sndDie[1], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die1"), st_Effect, SOUND_TYPE_MONSTER_DYING);
             GEnv.Sound->create(
-                sndDie[2], strconcat(sizeof(buf), buf, *cName(), "\\die2"), st_Effect, SOUND_TYPE_MONSTER_DYING);
+                sndDie[2], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die2"), st_Effect, SOUND_TYPE_MONSTER_DYING);
             GEnv.Sound->create(
-                sndDie[3], strconcat(sizeof(buf), buf, *cName(), "\\die3"), st_Effect, SOUND_TYPE_MONSTER_DYING);
+                sndDie[3], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die3"), st_Effect, SOUND_TYPE_MONSTER_DYING);
 
             m_HeavyBreathSnd.create(
                 pSettings->r_string(section, "heavy_breath_snd"), st_Effect, SOUND_TYPE_MONSTER_INJURING);

src/xrGame/Actor_Movement.cpp

@@ -339,7 +339,7 @@ void CActor::g_cl_CheckControls(u32 mstate_wf, Fvector& vControlAccel, float& Ju
                 xr_sprintf(eff_name, sizeof(eff_name), "%s.anm", state_anm);
                 string_path ce_path;
                 string_path anm_name;
-                strconcat(sizeof(anm_name), anm_name, "camera_effects\\actor_move\\", eff_name);
+                strconcat(sizeof(anm_name), anm_name, "camera_effects" DELIMITER "actor_move" DELIMITER, eff_name);
                 if (FS.exist(ce_path, "$game_anims$", anm_name))
                 {
                     CAnimatorCamLerpEffectorConst* e = new CAnimatorCamLerpEffectorConst();

src/xrGame/BlackGraviArtifact.cpp

@@ -42,7 +42,7 @@ BOOL CBlackGraviArtefact::net_Spawn(CSE_Abstract* DC)
         return FALSE;
 
     CParticlesObject* pStaticPG;
-    pStaticPG = CParticlesObject::Create("anomaly\\galantine", FALSE);
+    pStaticPG = CParticlesObject::Create("anomaly" DELIMITER "galantine", FALSE);
     Fmatrix pos;
     // pos.rotateY(1.57);
     // pos.mulA(pos);

src/xrGame/Car.cpp

@@ -70,7 +70,7 @@ CCar::CCar()
     ///////////////////////////////
     //////////////////////////////
     /////////////////////////////
-    m_exhaust_particles = "vehiclefx\\exhaust_1";
+    m_exhaust_particles = "vehiclefx" DELIMITER "exhaust_1";
     m_car_sound = new SCarSound(this);
 
     //у машины слотов в инвентаре нет

src/xrGame/CarSound.cpp

@@ -26,10 +26,10 @@ void CCar::SCarSound::Init()
         volume = ini->r_float("car_sound", "snd_volume");
 
         snd_engine.create(ini->r_string("car_sound", "snd_name"), st_Effect, sg_SourceType); //
-        snd_engine_start.create(READ_IF_EXISTS(ini, r_string, "car_sound", "engine_start", "car\\test_car_start"),
+        snd_engine_start.create(READ_IF_EXISTS(ini, r_string, "car_sound", "engine_start", "car" DELIMITER "test_car_start"),
                                 st_Effect, sg_SourceType);
         snd_engine_stop.create(
-            READ_IF_EXISTS(ini, r_string, "car_sound", "engine_stop", "car\\test_car_stop"), st_Effect, sg_SourceType);
+            READ_IF_EXISTS(ini, r_string, "car_sound", "engine_stop", "car" DELIMITER "test_car_stop"), st_Effect, sg_SourceType);
         float fengine_start_delay = READ_IF_EXISTS(ini, r_float, "car_sound", "engine_sound_start_dellay", 0.25f);
         engine_start_delay =
             iFloor((snd_engine_start._handle() ? iFloor(snd_engine_start.get_length_sec() * 1000.0f) : 1.f) *

src/xrGame/GamePersistent.cpp

@@ -51,15 +51,15 @@ void FillUIStyleToken()
     UIStyleToken.emplace_back("ui_style_default", 0);
 
     string_path path;
-    strconcat(sizeof(path), path, UI_PATH, "\\styles\\");
+    strconcat(sizeof(path), path, UI_PATH, DELIMITER "styles" DELIMITER);
     FS.update_path(path, _game_config_, path);
     auto styles = FS.file_list_open(path, FS_ListFolders | FS_RootOnly);
     if (styles != nullptr)
     {
         int i = 1; // It's 1, because 0 is default style
         for (const auto& style : *styles)
         {
-            const auto pos = strchr(style, '\\');
+            const auto pos = strchr(style, _DELIMITER);
             *pos = '\0'; // we don't need that backslash in the end
             UIStyleToken.emplace_back(xr_strdup(style), i++); // It's important to have postfix increment!
         }
@@ -82,7 +82,7 @@ void SetupUIStyle()
             selectedStyle = token.name;
 
     string128 selectedStylePath;
-    strconcat(sizeof(selectedStylePath), selectedStylePath, UI_PATH, "\\styles\\", selectedStyle);
+    strconcat(sizeof(selectedStylePath), selectedStylePath, UI_PATH, DELIMITER "styles" DELIMITER, selectedStyle);
 
     UI_PATH = xr_strdup(selectedStylePath);
     defaultUIStyle = false;