Skip to content

Commit 2fe3fb2

Browse files
committed
xrEngine: reject net auth for Linux build
1 parent 37b7b48 commit 2fe3fb2

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/xrEngine/EngineAPI.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,14 @@ void CEngineAPI::CreateRendererList()
228228
return;
229229
}
230230

231+
#if defined(WINDOWS)
231232
// Hide "d3d10.dll not found" message box for XP
232233
SetErrorMode(SEM_FAILCRITICALERRORS);
233234

234235
hRenderR2 = XRay::LoadModule("xrRender_R2");
235236
hRenderR3 = XRay::LoadModule("xrRender_R3");
236237
hRenderR4 = XRay::LoadModule("xrRender_R4");
238+
#endif
237239
hRenderRGL = XRay::LoadModule("xrRender_GL");
238240

239241
// Restore error handling
@@ -246,6 +248,7 @@ void CEngineAPI::CreateRendererList()
246248
modes.emplace_back("renderer_r1", 0);
247249
}
248250

251+
#if defined(WINDOWS)
249252
if (hRenderR2->IsLoaded())
250253
{
251254
modes.emplace_back("renderer_r2a", 1);
@@ -269,6 +272,7 @@ void CEngineAPI::CreateRendererList()
269272
else
270273
hRenderR4->Close();
271274
}
275+
#endif
272276

273277
if (hRenderRGL->IsLoaded())
274278
{

src/xrEngine/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ ENGINE_API void InitSettings()
8585
pSettings = new CInifile(fname, TRUE);
8686
CHECK_OR_EXIT(pSettings->section_count(),
8787
make_string("Cannot find file %s.\nReinstalling application may fix this problem.", fname));
88-
xr_auth_strings_t ignoredPaths, checkedPaths;
8988
#if !defined(LINUX)
89+
xr_auth_strings_t ignoredPaths, checkedPaths;
9090
fill_auth_check_params(ignoredPaths, checkedPaths); //TODO port xrNetServer to Linux
91-
#endif
9291
PathIncludePred includePred(&ignoredPaths);
9392
CInifile::allow_include_func_t includeFilter;
9493
includeFilter.bind(&includePred, &PathIncludePred::IsIncluded);
9594
pSettingsAuth = new CInifile(fname, TRUE, TRUE, FALSE, 0, includeFilter);
95+
#endif
9696
FS.update_path(fname, "$game_config$", "game.ltx");
9797
pGameIni = new CInifile(fname, TRUE);
9898
CHECK_OR_EXIT(pGameIni->section_count(),

0 commit comments

Comments
 (0)