rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-26 19:54:14 +01:00
Code Issues Releases Activity

Merge pull request #122 from alliedmodders/psy/s2-linux-load-fix

Browse Source 
Fix load on Source 2 Linux servers when -game launch arg is missing
This commit is contained in:
Nicholas Hastings 2023-09-29 16:10:35 +00:00 committed by GitHub
commit 57043e30c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
loader/loader.cpp
View File

@ -50,6 +50,12 @@ mm_LogFatal(const char *message, ...)
va_list ap; va_list ap;
char header[256]; char header[256];
printf("MMS: Fatal error: ");
va_start(ap, message);
vprintf(message, ap);
va_end(ap);
printf("\n");
fp = fopen(mm_fatal_logfile, "at"); fp = fopen(mm_fatal_logfile, "at");
if (!fp && (fp = fopen("metamod-fatal.log", "at")) == NULL) if (!fp && (fp = fopen("metamod-fatal.log", "at")) == NULL)
return; return;
@ -292,16 +298,28 @@ mm_GetGameName(char *buffer, size_t size)
#ifdef _WIN32 #ifdef _WIN32
GetGameInfoStringFn func = (GetGameInfoStringFn)mm_GetLibAddress(pTier0, "?GetGameInfoString@@YAPEBDPEBD0PEAD_K@Z"); GetGameInfoStringFn func = (GetGameInfoStringFn)mm_GetLibAddress(pTier0, "?GetGameInfoString@@YAPEBDPEBD0PEAD_K@Z");
#else #else
GetGameInfoStringFn func = (GetGameInfoStringFn)mm_GetLibAddress(pTier0, "__Z17GetGameInfoStringPKcS0_Pcm"); GetGameInfoStringFn func = (GetGameInfoStringFn)mm_GetLibAddress(pTier0, "_Z17GetGameInfoStringPKcS0_Pcm");
#endif #endif
if (func != nullptr) if (func != nullptr)
{ {
static char szTmp[260]; static char szTmp[260];
strncpy(buffer, func("FileSystem/SearchPaths/Mod", "", szTmp, sizeof(szTmp)), size); strncpy(buffer, func("FileSystem/SearchPaths/Mod", "", szTmp, sizeof(szTmp)), size);
} }
else
{
mm_LogFatal("Failed to resolve GetGameInfoString in fallback gamedir lookup.");
}
mm_UnloadLibrary(pTier0); mm_UnloadLibrary(pTier0);
} }
else
{
mm_LogFatal("Failed to load tier0 from \"%s\" in fallback gamedir lookup: %s", tier0_path, err);
}
}
else
{
mm_LogFatal("Failed to resolve tier0 path in fallback gamedir lookup.");
} }
} }