diff -r 506c71b4ff73 -r a05f33ba5ad4 loader/loader.cpp --- a/loader/loader.cpp Mon Mar 04 11:07:15 2013 -0500 +++ b/loader/loader.cpp Fri Mar 22 20:47:35 2013 -0400 @@ -33,11 +33,9 @@ #include "serverplugin.h" #include "gamedll.h" #include "utility.h" -#include "valve_commandline.h" - -#undef GetCommandLine - -typedef ICommandLine *(*GetCommandLine)(); +#if defined __APPLE__ +#include +#endif static HMODULE mm_library = NULL; static char mm_fatal_logfile[PLATFORM_MAX_PATH] = "metamod-fatal.log"; @@ -186,94 +184,81 @@ return mm_GetLibAddress(mm_library, name); } -#if defined _WIN32 -#define TIER0_NAME "bin\\tier0.dll" -#define VSTDLIB_NAME "bin\\vstdlib.dll" -#elif defined __APPLE__ -#define TIER0_NAME "bin/libtier0.dylib" -#define VSTDLIB_NAME "bin/libvstdlib.dylib" -#elif defined __linux__ -#define TIER0_NAME "bin/" LIB_PREFIX "tier0" LIB_SUFFIX -#define VSTDLIB_NAME "bin/" LIB_PREFIX "vstdlib" LIB_SUFFIX -#endif - -const char * -mm_GetGameName() +bool +mm_GetGameName(char *buffer, size_t size) { - void *lib; - char error[255]; - GetCommandLine valve_cmdline; - char lib_path[PLATFORM_MAX_PATH]; - const char *game_name; + buffer[0] = '\0'; + +#if defined _WIN32 + static char game[128]; -#ifdef __linux__ - if (!mm_ResolvePath("bin/libtier0_srv.so", lib_path, sizeof(lib_path)) - && !mm_ResolvePath("bin/libtier0.so", lib_path, sizeof(lib_path)) - && !mm_ResolvePath("bin/tier0_i486.so", lib_path, sizeof(lib_path))) -#else - if (!mm_ResolvePath(TIER0_NAME, lib_path, sizeof(lib_path))) -#endif + LPWSTR pCmdLine = GetCommandLineW(); + int argc; + LPWSTR *wargv = CommandLineToArgvW(pCmdLine, &argc); + for (int i = 0; i < argc; ++i) { - mm_LogFatal("Could not find path for tier0"); - return NULL; - } + if (wcscmp(wargv[i], L"-game") != 0) + continue; - if ((lib = mm_LoadLibrary(lib_path, error, sizeof(error))) == NULL) - { - mm_LogFatal("Could not load %s: %s", lib_path, error); - return NULL; + if (++i >= argc) + break; + + wcstombs(buffer, wargv[i], size); + buffer[size-1] = '\0'; + break; } - valve_cmdline = (GetCommandLine)mm_GetLibAddress(lib, "CommandLine_Tier0"); + LocalFree(wargv); - /* '_Tier0' dropped on Alien Swarm version */ - if (valve_cmdline == NULL) + return buffer[0] != 0; +#elif defined __APPLE__ + int argc = *_NSGetArgc(); + char **argv = *_NSGetArgv(); + for (int i = 0; i < argc; ++i) { - valve_cmdline = (GetCommandLine)mm_GetLibAddress(lib, "CommandLine"); + if (strcmp(argv[i], "-game") != 0) + continue; + + if (++i >= argc) + break; + + strncpy(buffer, argv[i], size); + buffer[size-1] = '\0'; + break; } - if (valve_cmdline == NULL) + return buffer[0] != 0; +#elif defined __linux__ + FILE *pFile = fopen("/proc/self/cmdline", "rb"); + if (!pFile) + return false; + + char *arg = NULL; + size_t argsize = 0; + bool bNextIsGame = false; + + while (getdelim(&arg, &argsize, NULL, pFile) != -1) { - /* We probably have a Ship engine. */ - mm_UnloadLibrary(lib); -#ifdef __linux__ - if (!mm_ResolvePath("bin/libvstdlib_srv.so", lib_path, sizeof(lib_path)) - && !mm_ResolvePath("bin/libvstdlib.so", lib_path, sizeof(lib_path)) - && !mm_ResolvePath("bin/vstdlib_i486.so", lib_path, sizeof(lib_path))) -#else - if (!mm_ResolvePath(VSTDLIB_NAME, lib_path, sizeof(lib_path))) -#endif + if (bNextIsGame) { - mm_LogFatal("Could not find path for vstdlib"); - return NULL; + strncpy(buffer, arg, size); + buffer[size-1] = '\0'; + break; } - if ((lib = mm_LoadLibrary(lib_path, error, sizeof(error))) == NULL) + if (strcmp(arg, "-game") == 0) { - mm_LogFatal("Could not load %s: %s", lib_path, error); - return NULL; + bNextIsGame = true; } - - valve_cmdline = (GetCommandLine)mm_GetLibAddress(lib, "CommandLine"); } - if (valve_cmdline == NULL) - { - mm_LogFatal("Could not locate any command line functionality"); - return NULL; - } - - game_name = valve_cmdline()->ParmValue("-game"); + free(arg); + fclose(pFile); - mm_UnloadLibrary(lib); - - /* This probably means that the game directory is actually the current directory */ - if (!game_name) - { - game_name = "."; - } - - return game_name; + return buffer[0] != 0; +#else +#error unsupported platform +#endif } MetamodBackend