Skip to content

Commit 168f1d4

Browse files
eagleivgeagleivg
committed
xrGame: replace \\ to DELIMITER macro
1 parent 3721a94 commit 168f1d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+196
-187
lines changed

‎src/Layers/xrRenderPC_GL/glResourceManager_Resources.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ void simplify_texture(string_path& fn)
1919
if (strstr(Core.Params, "-game_designer"))
2020
{
2121
if (strstr(fn, "$user")) return;
22-
if (strstr(fn, "ui\\")) return;
22+
if (strstr(fn, "ui" DELIMITER )) return;
2323
if (strstr(fn, "lmap#")) return;
24-
if (strstr(fn, "act\\")) return;
25-
if (strstr(fn, "fx\\")) return;
26-
if (strstr(fn, "glow\\")) return;
27-
if (strstr(fn, "map\\")) return;
28-
strcpy_s(fn, "ed\\ed_not_existing_texture");
24+
if (strstr(fn, "act" DELIMITER )) return;
25+
if (strstr(fn, "fx" DELIMITER )) return;
26+
if (strstr(fn, "glow" DELIMITER )) return;
27+
if (strstr(fn, "map" DELIMITER )) return;
28+
strcpy_s(fn, "ed" DELIMITER "ed_not_existing_texture");
2929
}
3030
}
3131

‎src/xrCore/XML/XMLDocument.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ void ParseFile(pcstr path, CMemoryWriter& W, IReader* F, XMLDocument* xml)
2323
if (_GetItem(str, 1, inc_name, '"'))
2424
{
2525
IReader* I = nullptr;
26-
if (inc_name == strstr(inc_name, "ui\\"))
26+
if (inc_name == strstr(inc_name, "ui" DELIMITER ))
2727
{
28-
shared_str fn = xml->correct_file_name("ui", strchr(inc_name, '\\') + 1);
28+
shared_str fn = xml->correct_file_name("ui", strchr(inc_name, _DELIMITER) + 1);
2929
string_path buff;
30-
strconcat(sizeof buff, buff, "ui\\", fn.c_str());
30+
strconcat(sizeof buff, buff, "ui" DELIMITER , fn.c_str());
3131
I = FS.r_open(path, buff);
3232
}
3333

@@ -50,7 +50,7 @@ void XMLDocument::Load(pcstr path_alias, pcstr path, pcstr _xml_filename)
5050
shared_str fn = correct_file_name(path, _xml_filename);
5151

5252
string_path str;
53-
xr_sprintf(str, "%s\\%s", path, *fn);
53+
xr_sprintf(str, "%s" DELIMITER "%s", path, *fn);
5454
return Load(path_alias, str);
5555
}
5656

‎src/xrEngine/GameFont.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ void CGameFont::Initialize(pcstr cShader, pcstr cTextureName)
5959
else
6060
xr_strcpy(cTexture, sizeof(cTexture), cTextureName);
6161

62+
#if defined(LINUX)
63+
char* ptr = strchr(cTexture, '\\');
64+
while (ptr)
65+
{
66+
*ptr = '/';
67+
ptr = strchr(ptr, '\\');
68+
}
69+
#endif
70+
6271
uFlags &= ~fsValid;
6372
vTS.set(1.f, 1.f); // обязательно !!!
6473

‎src/xrEngine/XR_IOConsole.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ void CConsole::OnRender()
219219
if (!m_hShader_back)
220220
{
221221
m_hShader_back = new FactoryPtr<IUIShader>();
222-
(*m_hShader_back)->create("hud\\default", "ui\\ui_console"); // "ui\\ui_empty"
222+
(*m_hShader_back)->create("hud" DELIMITER "default", "ui" DELIMITER "ui_console"); // "ui/ui_empty"
223223
}
224224

225225
if (!pFont)

‎src/xrGame/Actor.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,13 @@ void CActor::Load(LPCSTR section)
387387
char buf[256];
388388

389389
GEnv.Sound->create(
390-
sndDie[0], strconcat(sizeof(buf), buf, *cName(), "\\die0"), st_Effect, SOUND_TYPE_MONSTER_DYING);
390+
sndDie[0], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die0"), st_Effect, SOUND_TYPE_MONSTER_DYING);
391391
GEnv.Sound->create(
392-
sndDie[1], strconcat(sizeof(buf), buf, *cName(), "\\die1"), st_Effect, SOUND_TYPE_MONSTER_DYING);
392+
sndDie[1], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die1"), st_Effect, SOUND_TYPE_MONSTER_DYING);
393393
GEnv.Sound->create(
394-
sndDie[2], strconcat(sizeof(buf), buf, *cName(), "\\die2"), st_Effect, SOUND_TYPE_MONSTER_DYING);
394+
sndDie[2], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die2"), st_Effect, SOUND_TYPE_MONSTER_DYING);
395395
GEnv.Sound->create(
396-
sndDie[3], strconcat(sizeof(buf), buf, *cName(), "\\die3"), st_Effect, SOUND_TYPE_MONSTER_DYING);
396+
sndDie[3], strconcat(sizeof(buf), buf, *cName(), DELIMITER "die3"), st_Effect, SOUND_TYPE_MONSTER_DYING);
397397

398398
m_HeavyBreathSnd.create(
399399
pSettings->r_string(section, "heavy_breath_snd"), st_Effect, SOUND_TYPE_MONSTER_INJURING);

‎src/xrGame/Actor_Movement.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void CActor::g_cl_CheckControls(u32 mstate_wf, Fvector& vControlAccel, float& Ju
339339
xr_sprintf(eff_name, sizeof(eff_name), "%s.anm", state_anm);
340340
string_path ce_path;
341341
string_path anm_name;
342-
strconcat(sizeof(anm_name), anm_name, "camera_effects\\actor_move\\", eff_name);
342+
strconcat(sizeof(anm_name), anm_name, "camera_effects" DELIMITER "actor_move" DELIMITER, eff_name);
343343
if (FS.exist(ce_path, "$game_anims$", anm_name))
344344
{
345345
CAnimatorCamLerpEffectorConst* e = new CAnimatorCamLerpEffectorConst();

‎src/xrGame/BlackGraviArtifact.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ BOOL CBlackGraviArtefact::net_Spawn(CSE_Abstract* DC)
4242
return FALSE;
4343

4444
CParticlesObject* pStaticPG;
45-
pStaticPG = CParticlesObject::Create("anomaly\\galantine", FALSE);
45+
pStaticPG = CParticlesObject::Create("anomaly" DELIMITER "galantine", FALSE);
4646
Fmatrix pos;
4747
// pos.rotateY(1.57);
4848
// pos.mulA(pos);

‎src/xrGame/Car.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ CCar::CCar()
7070
///////////////////////////////
7171
//////////////////////////////
7272
/////////////////////////////
73-
m_exhaust_particles = "vehiclefx\\exhaust_1";
73+
m_exhaust_particles = "vehiclefx" DELIMITER "exhaust_1";
7474
m_car_sound = new SCarSound(this);
7575

7676
//у машины слотов в инвентаре нет

‎src/xrGame/CarSound.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ void CCar::SCarSound::Init()
2626
volume = ini->r_float("car_sound", "snd_volume");
2727

2828
snd_engine.create(ini->r_string("car_sound", "snd_name"), st_Effect, sg_SourceType); //
29-
snd_engine_start.create(READ_IF_EXISTS(ini, r_string, "car_sound", "engine_start", "car\\test_car_start"),
29+
snd_engine_start.create(READ_IF_EXISTS(ini, r_string, "car_sound", "engine_start", "car" DELIMITER "test_car_start"),
3030
st_Effect, sg_SourceType);
3131
snd_engine_stop.create(
32-
READ_IF_EXISTS(ini, r_string, "car_sound", "engine_stop", "car\\test_car_stop"), st_Effect, sg_SourceType);
32+
READ_IF_EXISTS(ini, r_string, "car_sound", "engine_stop", "car" DELIMITER "test_car_stop"), st_Effect, sg_SourceType);
3333
float fengine_start_delay = READ_IF_EXISTS(ini, r_float, "car_sound", "engine_sound_start_dellay", 0.25f);
3434
engine_start_delay =
3535
iFloor((snd_engine_start._handle() ? iFloor(snd_engine_start.get_length_sec() * 1000.0f) : 1.f) *

‎src/xrGame/GamePersistent.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ void FillUIStyleToken()
5151
UIStyleToken.emplace_back("ui_style_default", 0);
5252

5353
string_path path;
54-
strconcat(sizeof(path), path, UI_PATH, "\\styles\\");
54+
strconcat(sizeof(path), path, UI_PATH, DELIMITER "styles" DELIMITER);
5555
FS.update_path(path, _game_config_, path);
5656
auto styles = FS.file_list_open(path, FS_ListFolders | FS_RootOnly);
5757
if (styles != nullptr)
5858
{
5959
int i = 1; // It's 1, because 0 is default style
6060
for (const auto& style : *styles)
6161
{
62-
const auto pos = strchr(style, '\\');
62+
const auto pos = strchr(style, _DELIMITER);
6363
*pos = '\0'; // we don't need that backslash in the end
6464
UIStyleToken.emplace_back(xr_strdup(style), i++); // It's important to have postfix increment!
6565
}
@@ -82,7 +82,7 @@ void SetupUIStyle()
8282
selectedStyle = token.name;
8383

8484
string128 selectedStylePath;
85-
strconcat(sizeof(selectedStylePath), selectedStylePath, UI_PATH, "\\styles\\", selectedStyle);
85+
strconcat(sizeof(selectedStylePath), selectedStylePath, UI_PATH, DELIMITER "styles" DELIMITER, selectedStyle);
8686

8787
UI_PATH = xr_strdup(selectedStylePath);
8888
defaultUIStyle = false;

‎src/xrGame/HUDCrosshair.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
CHUDCrosshair::CHUDCrosshair()
1212
{
13-
hShader->create("hud\\crosshair");
13+
hShader->create("hud" DELIMITER "crosshair");
1414
radius = 0;
1515
}
1616

‎src/xrGame/HUDTarget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CHUDTarget::CHUDTarget()
4242
{
4343
fuzzyShowInfo = 0.f;
4444
PP.RQ.range = 0.f;
45-
hShader->create("hud\\cursor", "ui\\cursor");
45+
hShader->create("hud" DELIMITER "cursor", "ui" DELIMITER "cursor");
4646

4747
PP.RQ.set(NULL, 0.f, -1);
4848

‎src/xrGame/HitMarker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ CHitMarker::CHitMarker()
1818
InitShader_Grenade(pSettings->r_string("hud_hitmark", "grenade_mark_texture"));
1919
}
2020

21-
void CHitMarker::InitShader(LPCSTR tex_name) { hShader2->create("hud\\default", tex_name); }
21+
void CHitMarker::InitShader(LPCSTR tex_name) { hShader2->create("hud" DELIMITER "default", tex_name); }
2222
void CHitMarker::InitShader_Grenade(LPCSTR tex_name)
2323
{
24-
hShader_Grenade->create("hud\\default", tex_name); // "hud\\default2"
24+
hShader_Grenade->create("hud" DELIMITER "default", tex_name); // "hud" DELIMITER "default2"
2525
}
2626

2727
//--------------------------------------------------------------------

‎src/xrGame/LevelFogOfWar.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ FOG_STORAGE_T& CFogOfWarMngr::GetFogStorage()
5050
CLevelFogOfWar::CLevelFogOfWar()
5151
: m_rowNum(0), m_colNum(0){
5252
// m_levelRect.set (0.0f,0.0f,0.0f,0.0f);
53-
// hShader.create ("hud\\default","ui\\ui_fog_of_war");
53+
// hShader.create ("hud" DELIMITER "default","ui" DELIMITER "ui_fog_of_war");
5454
// hGeom.create (FVF::F_TL, RCache.Vertex.Buffer(), 0);
5555
};
5656

@@ -73,7 +73,7 @@ void CLevelFogOfWar::Init(const shared_str& level)
7373

7474
m_cells.resize(m_rowNum * m_colNum, false);
7575

76-
hShader.create("hud\\fog_of_war", "ui\\ui_fog_of_war");
76+
hShader.create("hud" DELIMITER "fog_of_war", "ui" DELIMITER "ui_fog_of_war");
7777
hGeom.create(FVF::F_TL, RCache.Vertex.Buffer(), 0);
7878
}
7979

‎src/xrGame/LevelGraphDebugRender.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
LevelGraphDebugRender::LevelGraphDebugRender() : gameGraph(nullptr), levelGraph(nullptr)
4949
{
50-
debugShader->create("debug\\ai_nodes", "$null");
50+
debugShader->create("debug" DELIMITER "ai_nodes", "$null");
5151
currentLevelId = -1;
5252
currentActual = false;
5353
currentCenter = {flt_max, flt_max, flt_max};

‎src/xrGame/MainMenu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void CMainMenu::ReadTextureInfo()
154154
{
155155
string_path buf;
156156
FS_FileSet fset;
157-
FS.file_list(fset, "$game_config$", FS_ListFiles, strconcat(sizeof(buf), buf, UI_PATH, "\\", "textures_descr\\*.xml"));
157+
FS.file_list(fset, "$game_config$", FS_ListFiles, strconcat(sizeof(buf), buf, UI_PATH, DELIMITER, "textures_descr" DELIMITER "*.xml"));
158158
for (const auto& file : fset)
159159
{
160160
string_path fn1, fn2, fn3;
@@ -624,7 +624,7 @@ void CMainMenu::OnDownloadPatch(CUIWindow*, void*)
624624
m_sPatchFileName = fname;
625625
}
626626
else
627-
m_sPatchFileName.printf("downloads\\%s", FileName);
627+
m_sPatchFileName.printf("downloads" DELIMITER "%s", FileName);
628628

629629
m_sPDProgress.IsInProgress = true;
630630
m_sPDProgress.Progress = 0;

‎src/xrGame/ShootingObject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class IRender_Sector;
1616

1717
extern const Fvector zero_vel;
1818

19-
#define WEAPON_MATERIAL_NAME "objects\\bullet"
19+
#define WEAPON_MATERIAL_NAME "objects" DELIMITER "bullet"
2020

2121
class CShootingObject : public IAnticheatDumpable
2222
{

‎src/xrGame/UICursor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void CUICursor::Hide()
4545
void CUICursor::InitInternal()
4646
{
4747
m_static = new CUIStatic();
48-
m_static->InitTextureEx("ui\\ui_ani_cursor", "hud\\cursor");
48+
m_static->InitTextureEx("ui" DELIMITER "ui_ani_cursor", "hud" DELIMITER "cursor");
4949
Frect rect;
5050
rect.set(0.0f, 0.0f, 40.0f, 40.0f);
5151
m_static->SetTextureRect(rect);

‎src/xrGame/UIFrameRect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void CUIFrameRect::InitTextureEx(LPCSTR texture, LPCSTR shader)
2525
CUITextureMaster::InitTexture(strconcat(sizeof(buf), buf, texture, "_lb"), shader, &frame[CUIFrameRect::fmLB]);
2626
}
2727

28-
void CUIFrameRect::InitTexture(LPCSTR texture) { InitTextureEx(texture, "hud\\default"); }
28+
void CUIFrameRect::InitTexture(LPCSTR texture) { InitTextureEx(texture, "hud" DELIMITER "default"); }
2929
void CUIFrameRect::UpdateSize(bool recall)
3030
{
3131
// VERIFY(g_bRendering);

‎src/xrGame/UIGameCustom.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ CMapListHelper gMapListHelper;
326326
void CMapListHelper::LoadMapInfo(const char* cfgName, const xr_string& levelName, const char* levelVer /*= "1.0"*/)
327327
{
328328
CInifile levelCfg(cfgName);
329-
shared_str shLevelName = levelName.substr(0, levelName.find('\\')).c_str();
329+
shared_str shLevelName = levelName.substr(0, levelName.find(_DELIMITER)).c_str();
330330
shared_str shLevelVer = levelVer;
331331
if (levelCfg.section_exist("map_usage"))
332332
{
@@ -369,7 +369,7 @@ void CMapListHelper::LoadMapInfo(const char* cfgName, const xr_string& levelName
369369
void CMapListHelper::Load()
370370
{
371371
string_path cfgFileName;
372-
FS.update_path(cfgFileName, "$game_config$", "mp\\map_list.ltx");
372+
FS.update_path(cfgFileName, "$game_config$", "mp" DELIMITER "map_list.ltx");
373373
CInifile maplistCfg(cfgFileName);
374374
// read weathers set
375375
CInifile::Sect weatherCfg = maplistCfg.r_section("weather");
@@ -390,7 +390,7 @@ void CMapListHelper::Load()
390390
LoadMapInfo(cfgFileName, cfg.name);
391391
}
392392
// scan all not loaded archieves
393-
LPCSTR tempRoot = "temporary_gamedata\\";
393+
LPCSTR tempRoot = "temporary_gamedata" DELIMITER;
394394
FS_Path* levelsPath = FS.get_path("$game_levels$");
395395
xr_string prevRoot = levelsPath->m_Root;
396396
levelsPath->_set_root(tempRoot);
@@ -402,7 +402,7 @@ void CMapListHelper::Load()
402402
const char* levelVersion = arch.header->r_string("header", "level_ver");
403403
FS.LoadArchive(arch, tempRoot);
404404
FS.update_path(cfgFileName, "$game_levels$", levelName);
405-
xr_strcat(cfgFileName, "\\level.ltx");
405+
xr_strcat(cfgFileName, "" DELIMITER "level.ltx");
406406
LoadMapInfo(cfgFileName, levelName, levelVersion);
407407
FS.unload_archive(arch);
408408
}

‎src/xrGame/UIStaticItem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class CUIStaticItem
3131
shared_str dbg_tex_name;
3232
#endif
3333

34-
void CreateShader(LPCSTR tex, LPCSTR sh = "hud\\default");
34+
void CreateShader(LPCSTR tex, LPCSTR sh = "hud" DELIMITER "default");
3535
void SetShader(const ui_shader& sh) { hShader = sh; };
3636
void Init(LPCSTR tex, LPCSTR sh, float left, float top);
3737
void Render();

‎src/xrGame/UIZoneMap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ bool CUIZoneMap::ZoomIn() { return true; }
151151
bool CUIZoneMap::ZoomOut() { return true; }
152152
void CUIZoneMap::SetupCurrentMap()
153153
{
154-
m_activeMap->Initialize(Level().name(), "hud\\default");
154+
m_activeMap->Initialize(Level().name(), "hud" DELIMITER "default");
155155

156156
Frect r;
157157
m_clipFrame.GetAbsoluteRect(r);

‎src/xrGame/WeaponBinocularsVision.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ struct FindVisObjByObject
3131
void SBinocVisibleObj::create_default(u32 color)
3232
{
3333
Frect r = {0, 0, RECT_SIZE, RECT_SIZE};
34-
m_lt.InitTexture("ui\\ui_enemy_frame");
34+
m_lt.InitTexture("ui" DELIMITER "ui_enemy_frame");
3535
m_lt.SetWndRect(r);
3636
m_lt.SetAlignment(waCenter);
37-
m_lb.InitTexture("ui\\ui_enemy_frame");
37+
m_lb.InitTexture("ui" DELIMITER "ui_enemy_frame");
3838
m_lb.SetWndRect(r);
3939
m_lb.SetAlignment(waCenter);
40-
m_rt.InitTexture("ui\\ui_enemy_frame");
40+
m_rt.InitTexture("ui" DELIMITER "ui_enemy_frame");
4141
m_rt.SetWndRect(r);
4242
m_rt.SetAlignment(waCenter);
43-
m_rb.InitTexture("ui\\ui_enemy_frame");
43+
m_rb.InitTexture("ui" DELIMITER "ui_enemy_frame");
4444
m_rb.SetWndRect(r);
4545
m_rb.SetAlignment(waCenter);
4646

‎src/xrGame/WeaponKnife.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <iterator>
1919
#endif
2020

21-
#define KNIFE_MATERIAL_NAME "objects\\knife"
21+
#define KNIFE_MATERIAL_NAME "objects" DELIMITER "knife"
2222

2323
#ifdef DEBUG
2424
#include "debug_renderer.h"

‎src/xrGame/ai/crow/ai_crow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void CAI_Crow::Load(LPCSTR section)
117117
//////////////////////////////////////////////////////////////////////////
118118

119119
// sounds
120-
m_Sounds.m_idle.Load("monsters\\crow\\idle");
120+
m_Sounds.m_idle.Load("monsters" DELIMITER "crow" DELIMITER "idle");
121121
// play defaut
122122

123123
fSpeed = pSettings->r_float(section, "speed");

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ void CController::Load(LPCSTR section)
7676
inherited::Load(section);
7777

7878
// Load Control FX texture
79-
// m_UIControlFX.Init(pSettings->r_string(section, "control_fx_texture"), "hud\\default",0,0,0);
80-
// m_UIControlFX2.Init(pSettings->r_string(section, "control_fx_texture2"), "hud\\default",0,0,0);
79+
// m_UIControlFX.Init(pSettings->r_string(section, "control_fx_texture"), "hud" DELIMITER "default",0,0,0);
80+
// m_UIControlFX2.Init(pSettings->r_string(section, "control_fx_texture2"), "hud" DELIMITER "default",0,0,0);
8181

8282
m_max_controlled_number = pSettings->r_u8(section, "Max_Controlled_Count");
8383
m_controlled_objects.reserve(m_max_controlled_number);
@@ -211,19 +211,19 @@ void CController::Load(LPCSTR section)
211211
load_friend_community_overrides(section);
212212

213213
// load
214-
m_sound_hit_fx.create("affects\\tinnitus3a", st_Effect, sg_SourceType);
214+
m_sound_hit_fx.create("affects" DELIMITER "tinnitus3a", st_Effect, sg_SourceType);
215215

216-
m_sound_aura_left_channel.create("monsters\\controller\\controller_psy_aura_l", st_Effect, sg_SourceType);
217-
m_sound_aura_right_channel.create("monsters\\controller\\controller_psy_aura_r", st_Effect, sg_SourceType);
218-
m_sound_aura_hit_left_channel.create("monsters\\controller\\controller_psy_hit_l", st_Effect, sg_SourceType);
219-
m_sound_aura_hit_right_channel.create("monsters\\controller\\controller_psy_hit_l", st_Effect, sg_SourceType);
216+
m_sound_aura_left_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_aura_l", st_Effect, sg_SourceType);
217+
m_sound_aura_right_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_aura_r", st_Effect, sg_SourceType);
218+
m_sound_aura_hit_left_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_hit_l", st_Effect, sg_SourceType);
219+
m_sound_aura_hit_right_channel.create("monsters" DELIMITER "controller" DELIMITER "controller_psy_hit_l", st_Effect, sg_SourceType);
220220

221-
m_sound_tube_start.create("monsters\\controller\\controller_first_hit", st_Effect, sg_SourceType);
222-
m_sound_tube_pull.create("monsters\\controller\\controller_whoosh", st_Effect, sg_SourceType);
223-
m_sound_tube_hit_left.create("monsters\\controller\\controller_final_hit_l", st_Effect, sg_SourceType);
224-
m_sound_tube_hit_right.create("monsters\\controller\\controller_final_hit_r", st_Effect, sg_SourceType);
221+
m_sound_tube_start.create("monsters" DELIMITER "controller" DELIMITER "controller_first_hit", st_Effect, sg_SourceType);
222+
m_sound_tube_pull.create("monsters" DELIMITER "controller" DELIMITER "controller_whoosh", st_Effect, sg_SourceType);
223+
m_sound_tube_hit_left.create("monsters" DELIMITER "controller" DELIMITER "controller_final_hit_l", st_Effect, sg_SourceType);
224+
m_sound_tube_hit_right.create("monsters" DELIMITER "controller" DELIMITER "controller_final_hit_r", st_Effect, sg_SourceType);
225225

226-
m_sound_tube_prepare.create("monsters\\controller\\controller_tube_prepare", st_Effect, sg_SourceType);
226+
m_sound_tube_prepare.create("monsters" DELIMITER "controller" DELIMITER "controller_tube_prepare", st_Effect, sg_SourceType);
227227

228228
particles_fire = pSettings->r_string(section, "Control_Hit");
229229

0 commit comments

Comments
 (0)