common: fix some linux file loading

OpenXRay · Oct 9, 2018 · 71b9867 · 71b9867
1 parent 354bfed
commit 71b9867
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/xrCore/XML/XMLDocument.cpp b/src/xrCore/XML/XMLDocument.cpp
@@ -22,6 +22,9 @@ void ParseFile(pcstr path, CMemoryWriter& W, IReader* F, XMLDocument* xml)
             string256 inc_name;
             if (_GetItem(str, 1, inc_name, '"'))
             {
+#if defined(LINUX)
+                while (char* sep = strchr(inc_name, '\\')) *sep = '/';
+#endif
                 IReader* I = nullptr;
                 if (inc_name == strstr(inc_name, "ui" DELIMITER ))
                 {

diff --git a/src/xrEngine/thunderbolt.cpp b/src/xrEngine/thunderbolt.cpp
@@ -62,7 +62,12 @@ void SThunderboltDesc::load(CInifile& pIni, shared_str const& sect)
 
     // models
     LPCSTR m_name = pIni.r_string(sect, "lightning_model");
-    m_pRender->CreateModel(m_name);
+    string_path tmp;
+    xr_strcpy(tmp, m_name);
+#if defined(LINUX)
+    while (char* sep = strchr(tmp, '\\')) *sep = '/';
+#endif
+    m_pRender->CreateModel(tmp);
 
     /*
     IReader* F = 0;
@@ -73,8 +78,11 @@ void SThunderboltDesc::load(CInifile& pIni, shared_str const& sect)
 
     // sound
     m_name = pIni.r_string(sect, "sound");
+#if defined(LINUX)
+    while (char* sep = strchr(tmp, '\\')) *sep = '/';
+#endif
     if (m_name && m_name[0])
-        snd.create(m_name, st_Effect, sg_Undefined);
+        snd.create(tmp, st_Effect, sg_Undefined);
 }
 
 //----------------------------------------------------------------------------------------------

diff --git a/src/xrSound/SoundRender_Source_loader.cpp b/src/xrSound/SoundRender_Source_loader.cpp
@@ -126,7 +126,12 @@ void CSoundRender_Source::load(pcstr name)
 {
     string_path fn, N;
     xr_strcpy(N, name);
+#ifdef WINDOWS
     xr_strlwr(N);
+#elif defined(LINUX)
+    while (char* sep = strchr(N, '\\')) *sep = '/';
+#endif
+
     if (strext(N))
         *strext(N) = 0;