1.1 --- a/loader/loader.cpp Tue Nov 17 04:49:17 2009 -0500
1.2 +++ b/loader/loader.cpp Sun Nov 22 23:54:55 2009 -0600
1.3 @@ -41,6 +41,7 @@
1.4
1.5 static HMODULE mm_library = NULL;
1.6 static char mm_fatal_logfile[PLATFORM_MAX_PATH] = "metamod-fatal.log";
1.7 +MetamodBackend mm_backend = MMBackend_UNKNOWN;
1.8
1.9 extern void
1.10 mm_LogFatal(const char *message, ...)
1.11 @@ -81,7 +82,7 @@
1.12 #define LIBRARY_EXT ".dll"
1.13 #define LIBRARY_MINEXT ".dll"
1.14 #elif defined __linux__
1.15 -#define LIBRARY_EXT BINARY_SUFFIX
1.16 +#define LIBRARY_EXT LIB_SUFFIX
1.17 #define LIBRARY_MINEXT ".so"
1.18 #endif
1.19
1.20 @@ -146,16 +147,22 @@
1.21 return NULL;
1.22 }
1.23
1.24 - /* If we've got a gamedll bridge, forward the request. */
1.25 - if (gamedll_bridge != NULL)
1.26 - return gamedll_bridge->QueryInterface(name, ret);
1.27 -
1.28 - /* Otherwise, we're probably trying to load Metamod. */
1.29 void *ptr;
1.30 if (strncmp(name, "ISERVERPLUGINCALLBACKS", 22) == 0)
1.31 + {
1.32 + /* Either load as VSP or start VSP listener */
1.33 ptr = mm_GetVspCallbacks(atoi(&name[22]));
1.34 + }
1.35 + else if (gamedll_bridge == NULL)
1.36 + {
1.37 + /* Load as gamedll */
1.38 + ptr = mm_GameDllRequest(name, ret);
1.39 + }
1.40 else
1.41 - ptr = mm_GameDllRequest(name, ret);
1.42 + {
1.43 + /* If we've got a gamedll bridge, forward the request. */
1.44 + return gamedll_bridge->QueryInterface(name, ret);
1.45 + }
1.46
1.47 if (ret != NULL)
1.48 *ret = (ptr != NULL) ? 0 : 1;
1.49 @@ -173,8 +180,8 @@
1.50 #define TIER0_NAME "bin\\tier0.dll"
1.51 #define VSTDLIB_NAME "bin\\vstdlib.dll"
1.52 #elif defined __linux__
1.53 -#define TIER0_NAME "bin/tier0" BINARY_SUFFIX
1.54 -#define VSTDLIB_NAME "bin/vstdlib" BINARY_SUFFIX
1.55 +#define TIER0_NAME "bin/tier0" LIB_SUFFIX
1.56 +#define VSTDLIB_NAME "bin/vstdlib" LIB_SUFFIX
1.57 #endif
1.58
1.59 const char *