diff --git a/loader/gamedll.cpp b/loader/gamedll.cpp index 49832bf..f9ebdde 100644 --- a/loader/gamedll.cpp +++ b/loader/gamedll.cpp @@ -70,10 +70,7 @@ mm_DetectGameInformation() game_info_detected = -1; - if (!mm_GetGameName(game_name, sizeof(game_name))) - { - return false; - } + mm_GetGameName(game_name, sizeof(game_name)); if (!mm_GetFileOfAddress((void*)mm_DetectGameInformation, mm_path, sizeof(mm_path))) { diff --git a/loader/loader.cpp b/loader/loader.cpp index 62ee44f..52acf59 100644 --- a/loader/loader.cpp +++ b/loader/loader.cpp @@ -191,7 +191,7 @@ mm_GetProcAddress(const char *name) return mm_GetLibAddress(mm_library, name); } -bool +void mm_GetGameName(char *buffer, size_t size) { buffer[0] = '\0'; @@ -217,7 +217,6 @@ mm_GetGameName(char *buffer, size_t size) LocalFree(wargv); - return buffer[0] != 0; #elif defined __APPLE__ int argc = *_NSGetArgc(); char **argv = *_NSGetArgv(); @@ -234,7 +233,6 @@ mm_GetGameName(char *buffer, size_t size) break; } - return buffer[0] != 0; #elif defined __linux__ FILE *pFile = fopen("/proc/self/cmdline", "rb"); if (!pFile) @@ -262,10 +260,14 @@ mm_GetGameName(char *buffer, size_t size) free(arg); fclose(pFile); - return buffer[0] != 0; #else #error unsupported platform #endif + + if (buffer[0] == 0) + { + strncpy(buffer, ".", size); + } } MetamodBackend diff --git a/loader/loader.h b/loader/loader.h index 0a50d96..f638023 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -116,7 +116,7 @@ mm_UnloadMetamodLibrary(); extern void mm_LogFatal(const char *message, ...); -extern bool +extern void mm_GetGameName(char *buffer, size_t size); extern MetamodBackend diff --git a/loader/serverplugin.cpp b/loader/serverplugin.cpp index 5cdee6c..b54d763 100644 --- a/loader/serverplugin.cpp +++ b/loader/serverplugin.cpp @@ -88,10 +88,7 @@ public: /* Backend should already filled in if loaded as gamedll */ if (gamedll_bridge == NULL) { - if (!mm_GetGameName(game_name, sizeof(game_name))) - { - return false; - } + mm_GetGameName(game_name, sizeof(game_name)); mm_backend = mm_DetermineBackend(engineFactory, game_name); }