Skip to content

Commit 76d8518

Browse files
eagleivgeagleivg
committed
xrCore, xrRender, xrEngine, xrNetServer, xrPhysics, xrServerEntities: replace delimiter to macros
1 parent 168f1d4 commit 76d8518

File tree

61 files changed

+316
-316
lines changed

Some content is hidden

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

61 files changed

+316
-316
lines changed

‎src/Layers/xrRender/Blender_BmmD.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ CBlender_BmmD::CBlender_BmmD()
1717
xr_strcpy(oT2_Name, "$null");
1818
xr_strcpy(oT2_xform, "$null");
1919
description.version = 3;
20-
xr_strcpy(oR_Name, "detail\\detail_grnd_grass"); //"$null");
21-
xr_strcpy(oG_Name, "detail\\detail_grnd_asphalt"); //"$null");
22-
xr_strcpy(oB_Name, "detail\\detail_grnd_earth"); //"$null");
23-
xr_strcpy(oA_Name, "detail\\detail_grnd_yantar"); //"$null");
20+
xr_strcpy(oR_Name, "detail" DELIMITER "detail_grnd_grass"); //"$null");
21+
xr_strcpy(oG_Name, "detail" DELIMITER "detail_grnd_asphalt"); //"$null");
22+
xr_strcpy(oB_Name, "detail" DELIMITER "detail_grnd_earth"); //"$null");
23+
xr_strcpy(oA_Name, "detail" DELIMITER "detail_grnd_yantar"); //"$null");
2424
}
2525

2626
CBlender_BmmD::~CBlender_BmmD() {}
@@ -119,7 +119,7 @@ void CBlender_BmmD::Compile(CBlender_Compile& C)
119119
case SE_R1_LSPOT:
120120
C.r_Pass("impl_spot_dt", "add_spot_dt", FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE);
121121
C.r_Sampler("s_base", C.L_textures[0]);
122-
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
122+
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
123123
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
124124
C.r_Sampler("s_detail", oT2_Name);
125125
C.r_End();

‎src/Layers/xrRender/Blender_Lm(EbB).cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void CBlender_LmEbB::Compile(CBlender_Compile& C)
128128
case SE_R1_LSPOT:
129129
C.r_Pass("lmap_spot", "add_spot", FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE);
130130
C.r_Sampler("s_base", C.L_textures[0]);
131-
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
131+
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
132132
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
133133
C.r_End();
134134
break;

‎src/Layers/xrRender/Blender_Model_EbB.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void CBlender_Model_EbB::Compile(CBlender_Compile& C)
130130
psname = "add_spot";
131131
C.r_Pass(vsname, psname, FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE);
132132
C.r_Sampler("s_base", C.L_textures[0]);
133-
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
133+
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
134134
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
135135
C.r_End();
136136
break;

‎src/Layers/xrRender/Blender_tree.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void CBlender_Tree::Compile(CBlender_Compile& C)
154154
{
155155
C.r_Pass(tsv_spot, tsp_spot, FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE, 0);
156156
C.r_Sampler("s_base", C.L_textures[0]);
157-
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
157+
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
158158
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
159159
if (C.bDetail_Diffuse)
160160
C.r_Sampler("s_detail", C.detail_texture);

‎src/Layers/xrRender/DetailManager_VS.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void CDetailManager::hw_Load_Shaders()
171171
{
172172
// Create shader to access constant storage
173173
ref_shader S;
174-
S.create("details\\set");
174+
S.create("details" DELIMITER "set");
175175
R_constant_table& T0 = *(S->E[0]->passes[0]->constants);
176176
R_constant_table& T1 = *(S->E[1]->passes[0]->constants);
177177
hwc_consts = T0.get("consts");

‎src/Layers/xrRender/ETextureParams.cpp‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -157,75 +157,75 @@ void STextureParams::FillProp(LPCSTR base_name, PropItemVec& items, PropValue::T
157157
OnTypeChangeEvent = on_type_change;
158158
PropValue* P = PHelper().CreateToken32(items, "Type", (u32*)&type, ttype_token);
159159
P->OnChangeEvent.bind(this, &STextureParams::OnTypeChange);
160-
PHelper().CreateCaption(items, "Source\\Width", shared_str().printf("%d", width));
161-
PHelper().CreateCaption(items, "Source\\Height", shared_str().printf("%d", height));
162-
PHelper().CreateCaption(items, "Source\\Alpha", HasAlpha() ? "present" : "absent");
160+
PHelper().CreateCaption(items, "Source" DELIMITER "Width", shared_str().printf("%d", width));
161+
PHelper().CreateCaption(items, "Source" DELIMITER "Height", shared_str().printf("%d", height));
162+
PHelper().CreateCaption(items, "Source" DELIMITER "Alpha", HasAlpha() ? "present" : "absent");
163163
switch (type)
164164
{
165165
case ttImage:
166166
case ttCubeMap:
167167
PHelper().CreateToken32(items, "Format", (u32*)&fmt, tfmt_token);
168168

169-
PHelper().CreateFlag32(items, "MipMaps\\Enabled", &flags, flGenerateMipMaps);
170-
PHelper().CreateToken32(items, "MipMaps\\Filter", (u32*)&mip_filter, tparam_token);
169+
PHelper().CreateFlag32(items, "MipMaps" DELIMITER "Enabled", &flags, flGenerateMipMaps);
170+
PHelper().CreateToken32(items, "MipMaps" DELIMITER "Filter", (u32*)&mip_filter, tparam_token);
171171

172-
P = PHelper().CreateToken32(items, "Bump\\Mode", (u32*)&bump_mode, tbmode_token);
172+
P = PHelper().CreateToken32(items, "Bump" DELIMITER "Mode", (u32*)&bump_mode, tbmode_token);
173173
P->OnChangeEvent.bind(this, &STextureParams::OnTypeChange);
174174
if (tbmUse == bump_mode || tbmUseParallax == bump_mode)
175175
{
176176
AnsiString path;
177177
path = base_name;
178-
PHelper().CreateChoose(items, "Bump\\Texture", &bump_name, smTexture, path.c_str());
178+
PHelper().CreateChoose(items, "Bump" DELIMITER "Texture", &bump_name, smTexture, path.c_str());
179179
}
180180

181-
PHelper().CreateFlag32(items, "Details\\Use As Diffuse", &flags, flDiffuseDetail);
182-
PHelper().CreateFlag32(items, "Details\\Use As Bump (R2)", &flags, flBumpDetail);
183-
PHelper().CreateChoose(items, "Details\\Texture", &detail_name, smTexture);
184-
PHelper().CreateFloat(items, "Details\\Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);
181+
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Diffuse", &flags, flDiffuseDetail);
182+
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Bump (R2)", &flags, flBumpDetail);
183+
PHelper().CreateChoose(items, "Details" DELIMITER "Texture", &detail_name, smTexture);
184+
PHelper().CreateFloat(items, "Details" DELIMITER "Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);
185185

186-
PHelper().CreateToken32(items, "Material\\Base", (u32*)&material, tmtl_token);
187-
PHelper().CreateFloat(items, "Material\\Weight", &material_weight);
186+
PHelper().CreateToken32(items, "Material" DELIMITER "Base", (u32*)&material, tmtl_token);
187+
PHelper().CreateFloat(items, "Material" DELIMITER "Weight", &material_weight);
188188

189-
// PHelper().CreateFlag32 (items, "Flags\\Binary Alpha", &flags, flBinaryAlpha);
190-
PHelper().CreateFlag32(items, "Flags\\Dither", &flags, flDitherColor);
191-
PHelper().CreateFlag32(items, "Flags\\Dither Each MIP", &flags, flDitherEachMIPLevel);
192-
PHelper().CreateFlag32(items, "Flags\\Implicit Lighted", &flags, flImplicitLighted);
189+
// PHelper().CreateFlag32 (items, "Flags" DELIMITER "Binary Alpha", &flags, flBinaryAlpha);
190+
PHelper().CreateFlag32(items, "Flags" DELIMITER "Dither", &flags, flDitherColor);
191+
PHelper().CreateFlag32(items, "Flags" DELIMITER "Dither Each MIP", &flags, flDitherEachMIPLevel);
192+
PHelper().CreateFlag32(items, "Flags" DELIMITER "Implicit Lighted", &flags, flImplicitLighted);
193193

194-
PHelper().CreateFlag32(items, "Fade\\Enable Color", &flags, flFadeToColor);
195-
PHelper().CreateFlag32(items, "Fade\\Enabled Alpha", &flags, flFadeToAlpha);
196-
PHelper().CreateU8(items, "Fade\\Delay 'n' MIP", &fade_delay, 0, 255);
197-
PHelper().CreateU32(items, "Fade\\% of color to fade in", &fade_amount, 0, 100, 0);
198-
PHelper().CreateColor(items, "Fade\\Color", &fade_color);
199-
PHelper().CreateU8(items, "Fade\\Alpha", ((u8*)&fade_color) + 3, 0, 255);
194+
PHelper().CreateFlag32(items, "Fade" DELIMITER "Enable Color", &flags, flFadeToColor);
195+
PHelper().CreateFlag32(items, "Fade" DELIMITER "Enabled Alpha", &flags, flFadeToAlpha);
196+
PHelper().CreateU8(items, "Fade" DELIMITER "Delay 'n' MIP", &fade_delay, 0, 255);
197+
PHelper().CreateU32(items, "Fade" DELIMITER "% of color to fade in", &fade_amount, 0, 100, 0);
198+
PHelper().CreateColor(items, "Fade" DELIMITER "Color", &fade_color);
199+
PHelper().CreateU8(items, "Fade" DELIMITER "Alpha", ((u8*)&fade_color) + 3, 0, 255);
200200

201-
PHelper().CreateFlag32(items, "Border\\Enabled Color", &flags, flColorBorder);
202-
PHelper().CreateFlag32(items, "Border\\Enabled Alpha", &flags, flAlphaBorder);
203-
PHelper().CreateColor(items, "Border\\Color", &border_color);
201+
PHelper().CreateFlag32(items, "Border" DELIMITER "Enabled Color", &flags, flColorBorder);
202+
PHelper().CreateFlag32(items, "Border" DELIMITER "Enabled Alpha", &flags, flAlphaBorder);
203+
PHelper().CreateColor(items, "Border" DELIMITER "Color", &border_color);
204204
break;
205205
case ttBumpMap:
206-
PHelper().CreateChoose(items, "Bump\\Special NormalMap", &ext_normal_map_name, smTexture, base_name);
207-
PHelper().CreateFloat(items, "Bump\\Virtual Height (m)", &bump_virtual_height, 0.f, 0.1f, 0.001f, 3);
206+
PHelper().CreateChoose(items, "Bump" DELIMITER "Special NormalMap", &ext_normal_map_name, smTexture, base_name);
207+
PHelper().CreateFloat(items, "Bump" DELIMITER "Virtual Height (m)", &bump_virtual_height, 0.f, 0.1f, 0.001f, 3);
208208
break;
209209
case ttNormalMap:
210210
P = PHelper().CreateToken32(items, "Format", (u32*)&fmt, tfmt_token);
211211
P->Owner()->Enable(false);
212212

213-
PHelper().CreateFlag32(items, "MipMaps\\Enabled", &flags, flGenerateMipMaps);
214-
PHelper().CreateToken32(items, "MipMaps\\Filter", (u32*)&mip_filter, tparam_token);
213+
PHelper().CreateFlag32(items, "MipMaps" DELIMITER "Enabled", &flags, flGenerateMipMaps);
214+
PHelper().CreateToken32(items, "MipMaps" DELIMITER "Filter", (u32*)&mip_filter, tparam_token);
215215
break;
216216
case ttTerrain:
217217
P = PHelper().CreateToken32(items, "Format", (u32*)&fmt, tfmt_token);
218218
P->Owner()->Enable(false);
219219

220-
PHelper().CreateFlag32(items, "Details\\Use As Diffuse", &flags, flDiffuseDetail);
221-
PHelper().CreateFlag32(items, "Details\\Use As Bump (R2)", &flags, flBumpDetail);
222-
PHelper().CreateChoose(items, "Details\\Texture", &detail_name, smTexture);
223-
PHelper().CreateFloat(items, "Details\\Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);
220+
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Diffuse", &flags, flDiffuseDetail);
221+
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Bump (R2)", &flags, flBumpDetail);
222+
PHelper().CreateChoose(items, "Details" DELIMITER "Texture", &detail_name, smTexture);
223+
PHelper().CreateFloat(items, "Details" DELIMITER "Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);
224224

225-
PHelper().CreateToken32(items, "Material\\Base", (u32*)&material, tmtl_token);
226-
PHelper().CreateFloat(items, "Material\\Weight", &material_weight);
225+
PHelper().CreateToken32(items, "Material" DELIMITER "Base", (u32*)&material, tmtl_token);
226+
PHelper().CreateFloat(items, "Material" DELIMITER "Weight", &material_weight);
227227

228-
P = PHelper().CreateFlag32(items, "Flags\\Implicit Lighted", &flags, flImplicitLighted);
228+
P = PHelper().CreateFlag32(items, "Flags" DELIMITER "Implicit Lighted", &flags, flImplicitLighted);
229229
P->Owner()->Enable(false);
230230
break;
231231
}
@@ -245,119 +245,119 @@ BOOL STextureParams::similar(STextureParams& tp1, xr_vector<AnsiString>& sel_par
245245
{
246246
res = (type == tp1.type);
247247
}
248-
else if (par_name == "Source\\Width")
248+
else if (par_name == "Source" DELIMITER "Width")
249249
{
250250
res = (width == tp1.width);
251251
}
252-
else if (par_name == "Source\\Height")
252+
else if (par_name == "Source" DELIMITER "Height")
253253
{
254254
res = (height == tp1.height);
255255
}
256-
else if (par_name == "Source\\Alpha")
256+
else if (par_name == "Source" DELIMITER "Alpha")
257257
{
258258
res = (HasAlpha() == tp1.HasAlpha());
259259
}
260260
else if (par_name == "Format")
261261
{
262262
res = (fmt == tp1.fmt);
263263
}
264-
else if (par_name == "MipMaps\\Enabled")
264+
else if (par_name == "MipMaps" DELIMITER "Enabled")
265265
{
266266
res = (flags.test(flGenerateMipMaps) == tp1.flags.test(flGenerateMipMaps));
267267
}
268-
else if (par_name == "MipMaps\\Filter")
268+
else if (par_name == "MipMaps" DELIMITER "Filter")
269269
{
270270
res = (mip_filter == tp1.mip_filter);
271271
}
272-
else if (par_name == "Bump\\Mode")
272+
else if (par_name == "Bump" DELIMITER "Mode")
273273
{
274274
res = (bump_mode == tp1.bump_mode);
275275
}
276-
else if (par_name == "Bump\\Texture")
276+
else if (par_name == "Bump" DELIMITER "Texture")
277277
{
278278
res = (bump_name == tp1.bump_name);
279279
}
280-
else if (par_name == "Details\\Use As Diffuse")
280+
else if (par_name == "Details" DELIMITER "Use As Diffuse")
281281
{
282282
res = (flags.test(flDiffuseDetail) == tp1.flags.test(flDiffuseDetail));
283283
}
284-
else if (par_name == "Details\\Use As Bump (R2)")
284+
else if (par_name == "Details" DELIMITER "Use As Bump (R2)")
285285
{
286286
res = (flags.test(flBumpDetail) == tp1.flags.test(flBumpDetail));
287287
}
288-
else if (par_name == "Details\\Texture")
288+
else if (par_name == "Details" DELIMITER "Texture")
289289
{
290290
res = (detail_name == tp1.detail_name);
291291
}
292-
else if (par_name == "Details\\Scale")
292+
else if (par_name == "Details" DELIMITER "Scale")
293293
{
294294
res = (fsimilar(detail_scale, tp1.detail_scale));
295295
}
296-
else if (par_name == "Material\\Base")
296+
else if (par_name == "Material" DELIMITER "Base")
297297
{
298298
res = (material == tp1.material);
299299
}
300-
else if (par_name == "Material\\Weight")
300+
else if (par_name == "Material" DELIMITER "Weight")
301301
{
302302
res = (fsimilar(material_weight, tp1.material_weight));
303303
}
304-
else if (par_name == "Flags\\Binary Alpha")
304+
else if (par_name == "Flags" DELIMITER "Binary Alpha")
305305
{
306306
res = (flags.test(flBinaryAlpha) == tp1.flags.test(flBinaryAlpha));
307307
}
308-
else if (par_name == "Flags\\Dither")
308+
else if (par_name == "Flags" DELIMITER "Dither")
309309
{
310310
res = (flags.test(flDitherColor) == tp1.flags.test(flDitherColor));
311311
}
312-
else if (par_name == "Flags\\Dither Each MIP")
312+
else if (par_name == "Flags" DELIMITER "Dither Each MIP")
313313
{
314314
res = (flags.test(flDitherEachMIPLevel) == tp1.flags.test(flDitherEachMIPLevel));
315315
}
316-
else if (par_name == "Flags\\Implicit Lighted")
316+
else if (par_name == "Flags" DELIMITER "Implicit Lighted")
317317
{
318318
res = (flags.test(flImplicitLighted) == tp1.flags.test(flImplicitLighted));
319319
}
320-
else if (par_name == "Fade\\Enable Color")
320+
else if (par_name == "Fade" DELIMITER "Enable Color")
321321
{
322322
res = (flags.test(flFadeToColor) == tp1.flags.test(flFadeToColor));
323323
}
324-
else if (par_name == "Fade\\Enabled Alpha")
324+
else if (par_name == "Fade" DELIMITER "Enabled Alpha")
325325
{
326326
res = (flags.test(flFadeToAlpha) == tp1.flags.test(flFadeToAlpha));
327327
}
328-
else if (par_name == "Fade\\Delay 'n' MIP")
328+
else if (par_name == "Fade" DELIMITER "Delay 'n' MIP")
329329
{
330330
res = (fade_delay == tp1.fade_delay);
331331
}
332-
else if (par_name == "Fade\\% of color to fade in")
332+
else if (par_name == "Fade" DELIMITER "% of color to fade in")
333333
{
334334
res = (fade_amount == tp1.fade_amount);
335335
}
336-
else if (par_name == "Fade\\Color")
336+
else if (par_name == "Fade" DELIMITER "Color")
337337
{
338338
res = (fade_color == tp1.fade_color);
339339
}
340-
else if (par_name == "Fade\\Alpha")
340+
else if (par_name == "Fade" DELIMITER "Alpha")
341341
{
342342
res = (color_get_A(fade_color) == color_get_A(tp1.fade_color));
343343
}
344-
else if (par_name == "Border\\Enabled Color")
344+
else if (par_name == "Border" DELIMITER "Enabled Color")
345345
{
346346
res = (flags.test(flColorBorder) == tp1.flags.test(flColorBorder));
347347
}
348-
else if (par_name == "Border\\Enabled Alpha")
348+
else if (par_name == "Border" DELIMITER "Enabled Alpha")
349349
{
350350
res = (flags.test(flAlphaBorder) == tp1.flags.test(flAlphaBorder));
351351
}
352-
else if (par_name == "Border\\Color")
352+
else if (par_name == "Border" DELIMITER "Color")
353353
{
354354
res = (border_color == tp1.border_color);
355355
}
356-
else if (par_name == "Bump\\Special NormalMap")
356+
else if (par_name == "Bump" DELIMITER "Special NormalMap")
357357
{
358358
res = (ext_normal_map_name == tp1.ext_normal_map_name);
359359
}
360-
else if (par_name == "Bump\\Virtual Height (m)")
360+
else if (par_name == "Bump" DELIMITER "Virtual Height (m)")
361361
{
362362
res = (fsimilar(bump_virtual_height, tp1.bump_virtual_height));
363363
}

‎src/Layers/xrRender/ResourceManager_Loader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ void CResourceManager::StoreNecessaryTextures()
155155
for (; it != it_e; ++it)
156156
{
157157
LPCSTR texture_name = it->first;
158-
if (strstr(texture_name, "\\levels\\"))
158+
if (strstr(texture_name, DELIMITER "levels" DELIMITER))
159159
continue;
160-
if (!strchr(texture_name, '\\'))
160+
if (!strchr(texture_name, _DELIMITER))
161161
continue;
162162

163163
ref_texture T;

‎src/Layers/xrRender/ResourceManager_Resources.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ void simplify_texture(string_path& fn)
2626
{
2727
if (strstr(fn, "$user"))
2828
return;
29-
if (strstr(fn, "ui\\"))
29+
if (strstr(fn, "ui" DELIMITER))
3030
return;
3131
if (strstr(fn, "lmap#"))
3232
return;
33-
if (strstr(fn, "act\\"))
33+
if (strstr(fn, "act" DELIMITER))
3434
return;
35-
if (strstr(fn, "fx\\"))
35+
if (strstr(fn, "fx" DELIMITER))
3636
return;
37-
if (strstr(fn, "glow\\"))
37+
if (strstr(fn, "glow" DELIMITER))
3838
return;
39-
if (strstr(fn, "map\\"))
39+
if (strstr(fn, "map" DELIMITER))
4040
return;
41-
xr_strcpy(fn, "ed\\ed_not_existing_texture");
41+
xr_strcpy(fn, "ed" DELIMITER "ed_not_existing_texture");
4242
}
4343
}
4444

‎src/Layers/xrRender/ResourceManager_Scripting.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ BOOL CResourceManager::_lua_HasShader(LPCSTR s_shader)
307307
{
308308
string256 undercorated;
309309
for (int i = 0, l = xr_strlen(s_shader) + 1; i < l; i++)
310-
undercorated[i] = ('\\' == s_shader[i]) ? '_' : s_shader[i];
310+
undercorated[i] = (_DELIMITER == s_shader[i]) ? '_' : s_shader[i];
311311

312312
#ifdef _EDITOR
313313
return ScriptEngine.object(undercorated, "editor", LUA_TFUNCTION);
@@ -325,7 +325,7 @@ Shader* CResourceManager::_lua_Create(LPCSTR d_shader, LPCSTR s_textures)
325325
// undecorate
326326
string256 undercorated;
327327
for (int i = 0, l = xr_strlen(d_shader) + 1; i < l; i++)
328-
undercorated[i] = ('\\' == d_shader[i]) ? '_' : d_shader[i];
328+
undercorated[i] = (_DELIMITER == d_shader[i]) ? '_' : d_shader[i];
329329
LPCSTR s_shader = undercorated;
330330

331331
// Access to template

‎src/Layers/xrRender/SH_Texture.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void CTexture::Load()
185185
else
186186
{
187187
flags.MemoryUsage = pTheora->Width(true) * pTheora->Height(true) * 4;
188-
BOOL bstop_at_end = (nullptr != strstr(cName.c_str(), "intro\\")) || (nullptr != strstr(cName.c_str(), "outro\\"));
188+
BOOL bstop_at_end = (nullptr != strstr(cName.c_str(), "intro" DELIMITER)) || (nullptr != strstr(cName.c_str(), "outro" DELIMITER));
189189
pTheora->Play(!bstop_at_end, RDEVICE.dwTimeContinual);
190190

191191
// Now create texture

0 commit comments

Comments
 (0)