xrGame: replace \\ to DELIMITER macro

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;

src/xrGame/HUDCrosshair.cpp

@@ -10,7 +10,7 @@
 
 CHUDCrosshair::CHUDCrosshair()
 {
-    hShader->create("hud\\crosshair");
+    hShader->create("hud" DELIMITER "crosshair");
     radius = 0;
 }
 

src/xrGame/HUDTarget.cpp

@@ -42,7 +42,7 @@ CHUDTarget::CHUDTarget()
 {
     fuzzyShowInfo = 0.f;
     PP.RQ.range = 0.f;
-    hShader->create("hud\\cursor", "ui\\cursor");
+    hShader->create("hud" DELIMITER "cursor", "ui" DELIMITER "cursor");
 
     PP.RQ.set(NULL, 0.f, -1);
 

src/xrGame/HitMarker.cpp

@@ -18,10 +18,10 @@ CHitMarker::CHitMarker()
     InitShader_Grenade(pSettings->r_string("hud_hitmark", "grenade_mark_texture"));
 }
 
-void CHitMarker::InitShader(LPCSTR tex_name) { hShader2->create("hud\\default", tex_name); }
+void CHitMarker::InitShader(LPCSTR tex_name) { hShader2->create("hud" DELIMITER "default", tex_name); }
 void CHitMarker::InitShader_Grenade(LPCSTR tex_name)
 {
-    hShader_Grenade->create("hud\\default", tex_name); // "hud\\default2"
+    hShader_Grenade->create("hud" DELIMITER "default", tex_name); // "hud" DELIMITER "default2"
 }
 
 //--------------------------------------------------------------------

src/xrGame/LevelFogOfWar.cpp

@@ -50,7 +50,7 @@ FOG_STORAGE_T& CFogOfWarMngr::GetFogStorage()
 CLevelFogOfWar::CLevelFogOfWar()
     : m_rowNum(0), m_colNum(0){
                        //	m_levelRect.set	(0.0f,0.0f,0.0f,0.0f);
-                       //	hShader.create	("hud\\default","ui\\ui_fog_of_war");
+                       //	hShader.create	("hud" DELIMITER "default","ui" DELIMITER "ui_fog_of_war");
                        //	hGeom.create	(FVF::F_TL, RCache.Vertex.Buffer(), 0);
                    };
 
@@ -73,7 +73,7 @@ void CLevelFogOfWar::Init(const shared_str& level)
 
     m_cells.resize(m_rowNum * m_colNum, false);
 
-    hShader.create("hud\\fog_of_war", "ui\\ui_fog_of_war");
+    hShader.create("hud" DELIMITER "fog_of_war", "ui" DELIMITER "ui_fog_of_war");
     hGeom.create(FVF::F_TL, RCache.Vertex.Buffer(), 0);
 }
 

src/xrGame/LevelGraphDebugRender.cpp

@@ -47,7 +47,7 @@
 
 LevelGraphDebugRender::LevelGraphDebugRender() : gameGraph(nullptr), levelGraph(nullptr)
 {
-    debugShader->create("debug\\ai_nodes", "$null");
+    debugShader->create("debug" DELIMITER "ai_nodes", "$null");
     currentLevelId = -1;
     currentActual = false;
     currentCenter = {flt_max, flt_max, flt_max};

src/xrGame/MainMenu.cpp

@@ -154,7 +154,7 @@ void CMainMenu::ReadTextureInfo()
 {
     string_path buf;
     FS_FileSet fset;
-    FS.file_list(fset, "$game_config$", FS_ListFiles, strconcat(sizeof(buf), buf, UI_PATH, "\\", "textures_descr\\*.xml"));
+    FS.file_list(fset, "$game_config$", FS_ListFiles, strconcat(sizeof(buf), buf, UI_PATH, DELIMITER, "textures_descr" DELIMITER "*.xml"));
     for (const auto& file : fset)
     {
         string_path fn1, fn2, fn3;
@@ -624,7 +624,7 @@ void CMainMenu::OnDownloadPatch(CUIWindow*, void*)
         m_sPatchFileName = fname;
     }
     else
-        m_sPatchFileName.printf("downloads\\%s", FileName);
+        m_sPatchFileName.printf("downloads" DELIMITER "%s", FileName);
 
     m_sPDProgress.IsInProgress = true;
     m_sPDProgress.Progress = 0;

src/xrGame/ShootingObject.h

@@ -16,7 +16,7 @@ class IRender_Sector;
 
 extern const Fvector zero_vel;
 
-#define WEAPON_MATERIAL_NAME "objects\\bullet"
+#define WEAPON_MATERIAL_NAME "objects" DELIMITER "bullet"
 
 class CShootingObject : public IAnticheatDumpable
 {

src/xrGame/UICursor.cpp

@@ -45,7 +45,7 @@ void CUICursor::Hide()
 void CUICursor::InitInternal()
 {
     m_static = new CUIStatic();
-    m_static->InitTextureEx("ui\\ui_ani_cursor", "hud\\cursor");
+    m_static->InitTextureEx("ui" DELIMITER "ui_ani_cursor", "hud" DELIMITER "cursor");
     Frect rect;
     rect.set(0.0f, 0.0f, 40.0f, 40.0f);
     m_static->SetTextureRect(rect);

src/xrGame/UIFrameRect.cpp

@@ -25,7 +25,7 @@ void CUIFrameRect::InitTextureEx(LPCSTR texture, LPCSTR shader)
     CUITextureMaster::InitTexture(strconcat(sizeof(buf), buf, texture, "_lb"), shader, &frame[CUIFrameRect::fmLB]);
 }
 
-void CUIFrameRect::InitTexture(LPCSTR texture) { InitTextureEx(texture, "hud\\default"); }
+void CUIFrameRect::InitTexture(LPCSTR texture) { InitTextureEx(texture, "hud" DELIMITER "default"); }
 void CUIFrameRect::UpdateSize(bool recall)
 {
     //	VERIFY(g_bRendering);

src/xrGame/UIGameCustom.cpp

@@ -326,7 +326,7 @@ CMapListHelper gMapListHelper;
 void CMapListHelper::LoadMapInfo(const char* cfgName, const xr_string& levelName, const char* levelVer /*= "1.0"*/)
 {
     CInifile levelCfg(cfgName);
-    shared_str shLevelName = levelName.substr(0, levelName.find('\\')).c_str();
+    shared_str shLevelName = levelName.substr(0, levelName.find(_DELIMITER)).c_str();
     shared_str shLevelVer = levelVer;
     if (levelCfg.section_exist("map_usage"))
     {
@@ -369,7 +369,7 @@ void CMapListHelper::LoadMapInfo(const char* cfgName, const xr_string& levelName
 void CMapListHelper::Load()
 {
     string_path cfgFileName;
-    FS.update_path(cfgFileName, "$game_config$", "mp\\map_list.ltx");
+    FS.update_path(cfgFileName, "$game_config$", "mp" DELIMITER "map_list.ltx");
     CInifile maplistCfg(cfgFileName);
     // read weathers set
     CInifile::Sect weatherCfg = maplistCfg.r_section("weather");
@@ -390,7 +390,7 @@ void CMapListHelper::Load()
         LoadMapInfo(cfgFileName, cfg.name);
     }
     // scan all not loaded archieves
-    LPCSTR tempRoot = "temporary_gamedata\\";
+    LPCSTR tempRoot = "temporary_gamedata" DELIMITER;
     FS_Path* levelsPath = FS.get_path("$game_levels$");
     xr_string prevRoot = levelsPath->m_Root;
     levelsPath->_set_root(tempRoot);
@@ -402,7 +402,7 @@ void CMapListHelper::Load()
         const char* levelVersion = arch.header->r_string("header", "level_ver");
         FS.LoadArchive(arch, tempRoot);
         FS.update_path(cfgFileName, "$game_levels$", levelName);
-        xr_strcat(cfgFileName, "\\level.ltx");
+        xr_strcat(cfgFileName, "" DELIMITER "level.ltx");
         LoadMapInfo(cfgFileName, levelName, levelVersion);
         FS.unload_archive(arch);
     }

src/xrGame/UIStaticItem.h

@@ -31,7 +31,7 @@ class CUIStaticItem
     shared_str dbg_tex_name;
 #endif
 
-    void CreateShader(LPCSTR tex, LPCSTR sh = "hud\\default");
+    void CreateShader(LPCSTR tex, LPCSTR sh = "hud" DELIMITER "default");
     void SetShader(const ui_shader& sh) { hShader = sh; };
     void Init(LPCSTR tex, LPCSTR sh, float left, float top);
     void Render();

src/xrGame/UIZoneMap.cpp

@@ -151,7 +151,7 @@ bool CUIZoneMap::ZoomIn() { return true; }
 bool CUIZoneMap::ZoomOut() { return true; }
 void CUIZoneMap::SetupCurrentMap()
 {
-    m_activeMap->Initialize(Level().name(), "hud\\default");
+    m_activeMap->Initialize(Level().name(), "hud" DELIMITER "default");
 
     Frect r;
     m_clipFrame.GetAbsoluteRect(r);

src/xrGame/WeaponBinocularsVision.cpp

@@ -31,16 +31,16 @@ struct FindVisObjByObject
 void SBinocVisibleObj::create_default(u32 color)
 {
     Frect r = {0, 0, RECT_SIZE, RECT_SIZE};
-    m_lt.InitTexture("ui\\ui_enemy_frame");
+    m_lt.InitTexture("ui" DELIMITER "ui_enemy_frame");
     m_lt.SetWndRect(r);
     m_lt.SetAlignment(waCenter);
-    m_lb.InitTexture("ui\\ui_enemy_frame");
+    m_lb.InitTexture("ui" DELIMITER "ui_enemy_frame");
     m_lb.SetWndRect(r);
     m_lb.SetAlignment(waCenter);
-    m_rt.InitTexture("ui\\ui_enemy_frame");
+    m_rt.InitTexture("ui" DELIMITER "ui_enemy_frame");
     m_rt.SetWndRect(r);
     m_rt.SetAlignment(waCenter);
-    m_rb.InitTexture("ui\\ui_enemy_frame");
+    m_rb.InitTexture("ui" DELIMITER "ui_enemy_frame");
     m_rb.SetWndRect(r);
     m_rb.SetAlignment(waCenter);
 

src/xrGame/WeaponKnife.cpp

@@ -18,7 +18,7 @@
 #include <iterator>
 #endif
 
-#define KNIFE_MATERIAL_NAME "objects\\knife"
+#define KNIFE_MATERIAL_NAME "objects" DELIMITER "knife"
 
 #ifdef DEBUG
 #include "debug_renderer.h"

src/xrGame/ai/crow/ai_crow.cpp

@@ -117,7 +117,7 @@ void CAI_Crow::Load(LPCSTR section)
     //////////////////////////////////////////////////////////////////////////
 
     // sounds
-    m_Sounds.m_idle.Load("monsters\\crow\\idle");
+    m_Sounds.m_idle.Load("monsters" DELIMITER "crow" DELIMITER "idle");
     // play defaut
 
     fSpeed = pSettings->r_float(section, "speed");

src/xrGame/ai/monsters/controller/controller.cpp

@@ -76,8 +76,8 @@ void CController::Load(LPCSTR section)
     inherited::Load(section);
 
     // Load Control FX texture
-    //	m_UIControlFX.Init(pSettings->r_string(section, "control_fx_texture"), "hud\\default",0,0,0);
-    //	m_UIControlFX2.Init(pSettings->r_string(section, "control_fx_texture2"), "hud\\default",0,0,0);
+    //	m_UIControlFX.Init(pSettings->r_string(section, "control_fx_texture"), "hud" DELIMITER "default",0,0,0);
+    //	m_UIControlFX2.Init(pSettings->r_string(section, "control_fx_texture2"), "hud" DELIMITER "default",0,0,0);
 
     m_max_controlled_number = pSettings->r_u8(section, "Max_Controlled_Count");
     m_controlled_objects.reserve(m_max_controlled_number);
@@ -211,19 +211,19 @@ void CController::Load(LPCSTR section)
     load_friend_community_overrides(section);
 
     // load
-    m_sound_hit_fx.create("affects\\tinnitus3a", st_Effect, sg_SourceType);
+    m_sound_hit_fx.create("affects" DELIMITER "tinnitus3a", st_Effect, sg_SourceType);
 
-    m_sound_aura_left_channel.create("monsters\\controller\\controller_psy_aura_l", st_Effect, sg_SourceType);
-    m_sound_aura_right_channel.create("monsters\\controller\\controller_psy_aura_r", st_Effect, sg_SourceType);
-    m_sound_aura_hit_left_channel.create("monsters\\controller\\controller_psy_hit_l", st_Effect, sg_SourceType);
-    m_sound_aura_hit_right_channel.create("monsters\\controller\\controller_psy_hit_l", st_Effect, sg_SourceType);
+    m_sound_aura_left_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_aura_l", st_Effect, sg_SourceType);
+    m_sound_aura_right_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_aura_r", st_Effect, sg_SourceType);
+    m_sound_aura_hit_left_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_hit_l", st_Effect, sg_SourceType);
+    m_sound_aura_hit_right_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_hit_l", st_Effect, sg_SourceType);
 
-    m_sound_tube_start.create("monsters\\controller\\controller_first_hit", st_Effect, sg_SourceType);
-    m_sound_tube_pull.create("monsters\\controller\\controller_whoosh", st_Effect, sg_SourceType);
-    m_sound_tube_hit_left.create("monsters\\controller\\controller_final_hit_l", st_Effect, sg_SourceType);
-    m_sound_tube_hit_right.create("monsters\\controller\\controller_final_hit_r", st_Effect, sg_SourceType);
+    m_sound_tube_start.create("monsters" DELIMITER "controller" DELIMITER "controller_first_hit", st_Effect, sg_SourceType);
+    m_sound_tube_pull.create("monsters" DELIMITER "controller" DELIMITER "controller_whoosh", st_Effect, sg_SourceType);
+    m_sound_tube_hit_left.create("monsters" DELIMITER "controller" DELIMITER "controller_final_hit_l", st_Effect, sg_SourceType);
+    m_sound_tube_hit_right.create("monsters" DELIMITER "controller" DELIMITER "controller_final_hit_r", st_Effect, sg_SourceType);
 
-    m_sound_tube_prepare.create("monsters\\controller\\controller_tube_prepare", st_Effect, sg_SourceType);
+    m_sound_tube_prepare.create("monsters" DELIMITER "controller" DELIMITER "controller_tube_prepare", st_Effect, sg_SourceType);
 
     particles_fire = pSettings->r_string(section, "Control_Hit");