tjh.dev
1diff --git a/SamTSE/Sources/Engine/Engine.cpp b/SamTSE/Sources/Engine/Engine.cpp
2index 6febab8..5963e34 100644
3--- a/SamTSE/Sources/Engine/Engine.cpp
4+++ b/SamTSE/Sources/Engine/Engine.cpp
5@@ -742,53 +742,8 @@
6 CPrintF(TRANSV("Running %d-bit version\n"), sys_iGameBits);
7
8 #ifdef PLATFORM_UNIX
9-#if defined(__OpenBSD__) || defined(__FreeBSD__)
10- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/local/bin/", (size_t) 15 );
11-#elif defined(__NetBSD__)
12- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/pkg/bin/", (size_t) 13 );
13-#else
14- int _isystempath = strncmp((const char *)strExePath, (const char *) "/usr/bin/", (size_t) 9 );
15-#endif
16- if( _isystempath == 0 ) {
17- sys_iSysPath = 1; // using system path
18- } else {
19- sys_iSysPath = 0; // using standarted path
20- }
21-
22- // get library path for mods
23- _fnmModLibPath = "";
24-#if defined(__OpenBSD__) || defined(__FreeBSD__)
25- if( sys_iSysPath == 1 ) {
26- _fnmModLibPath = "/usr/local/lib/" + strGameID + "/";
27-#elif defined(__NetBSD__)
28- if( sys_iSysPath == 1 ) {
29- _fnmModLibPath = "/usr/pkg/lib/" + strGameID + "/";
30-#else
31- if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/aarch64-linux-gnu/" + strGameID)) {
32- _fnmModLibPath = "/usr/lib/aarch64-linux-gnu/" + strGameID + "/";
33- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/arm-linux-gnueabihf/" + strGameID)) {
34- _fnmModLibPath = "/usr/lib/arm-linux-gnueabihf/" + strGameID + "/";
35- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/riscv64-linux-gnu/" + strGameID)) {
36- _fnmModLibPath = "/usr/lib/riscv64-linux-gnu/" + strGameID + "/";
37- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/s390x-linux-gnu/" + strGameID)) {
38- _fnmModLibPath = "/usr/lib/s390x-linux-gnu/" + strGameID + "/";
39- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/powerpc64-linux-gnu/" + strGameID)) {
40- _fnmModLibPath = "/usr/lib/powerpc64-linux-gnu/" + strGameID + "/";
41- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib/x86_64-linux-gnu/" + strGameID)) {
42- _fnmModLibPath = "/usr/lib/x86_64-linux-gnu/" + strGameID + "/";
43- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib/i386-linux-gnu/" + strGameID)) {
44- _fnmModLibPath = "/usr/lib/i386-linux-gnu/" + strGameID + "/";
45- } else if( sys_iSysPath == 1 && sys_iGameBits == 64 && _pFileSystem->IsDirectory((const char *) "/usr/lib64/" + strGameID)) {
46- _fnmModLibPath = "/usr/lib64/" + strGameID + "/";
47- } else if( sys_iSysPath == 1 && sys_iGameBits == 32 && _pFileSystem->IsDirectory((const char *) "/usr/lib//" + strGameID)) {
48- _fnmModLibPath = "/usr/lib/" + strGameID + "/";
49-#endif
50- } else if( sys_iSysPath == 0 ) {
51- _fnmModLibPath = _fnmApplicationPath;
52- } else {
53- CPrintF(TRANSV("ERROR: Game libraries not ound!\n"));
54- FatalError(TRANSV("Failed to search game libraries installed!\nPlease reinstall the game.\nSee the log for more details.\nGame log is here: ~/.local/share/Serious-Engine/%s/SeriousSam.log"),(const char *) strGameID);
55- }
56+ sys_iSysPath = 1; // using system path
57+ _fnmModLibPath = _fnmApplicationPath + "lib/" + strGameID + "/";
58
59 if( sys_iSysPath == 1 ) { // search game data
60 CTFileName _fnm_usr_TestFile, _fnm_local_TestFile, _fnm_home_TestFile;