From e016fa299ec89068a5d29f18cb24d8f55bd95271 Mon Sep 17 00:00:00 2001 From: jeefo Date: Thu, 25 May 2023 15:19:08 +0300 Subject: [PATCH] fix: lightlevel calculation crash on 64bit xash --- ext/linkage | 2 +- src/engine.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/linkage b/ext/linkage index a8117ca..2cee19a 160000 --- a/ext/linkage +++ b/ext/linkage @@ -1 +1 @@ -Subproject commit a8117ca144f5652974d3eb3210396138a907a980 +Subproject commit 2cee19a0433fb71aa96b93151ceb1850b6106b5d diff --git a/src/engine.cpp b/src/engine.cpp index b464b30..d94b2ad 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -763,7 +763,7 @@ bool Game::loadCSBinary () { if (!modname) { return false; } - StringArray libs { "mp", "cs", "cs_i386" }; + Array libs { "mp", "cs", "cs_i386" }; // lookup for x64 binaries first if (plat.x64) { @@ -786,7 +786,7 @@ bool Game::loadCSBinary () { // search the libraries inside game dlls directory for (const auto &lib : libs) { - auto path = strings.joinPath (modname, "dlls", lib + DLL_SUFFIX); + auto path = strings.joinPath (modname, "dlls", lib) + DLL_SUFFIX; // if we can't read file, skip it if (!plat.fileExists (path.chars ())) {