1.1 --- a/loader/serverplugin.cpp Tue Nov 17 04:49:17 2009 -0500
1.2 +++ b/loader/serverplugin.cpp Sun Nov 22 23:54:55 2009 -0600
1.3 @@ -31,6 +31,7 @@
1.4 #include <sh_memfuncinfo.h>
1.5 #include <sh_memory.h>
1.6 #include "serverplugin.h"
1.7 +#include "gamedll.h"
1.8
1.9 typedef enum
1.10 {
1.11 @@ -52,12 +53,6 @@
1.12 class IServerPluginCallbacks;
1.13 struct edict_t;
1.14
1.15 -#if defined WIN32
1.16 -#define LIBRARY_EXT ".dll"
1.17 -#else
1.18 -#define LIBRARY_EXT "_i486.so"
1.19 -#endif
1.20 -
1.21 class IRandomThings
1.22 {
1.23 public:
1.24 @@ -90,19 +85,23 @@
1.25
1.26 load_allowed = false;
1.27
1.28 - if ((game_name = mm_GetGameName()) == NULL)
1.29 + /* Backend should already filled in if loaded as gamedll */
1.30 + if (gamedll_bridge == NULL)
1.31 {
1.32 - return false;
1.33 + if ((game_name = mm_GetGameName()) == NULL)
1.34 + {
1.35 + return false;
1.36 + }
1.37 +
1.38 + mm_backend = mm_DetermineBackend(engineFactory, game_name);
1.39 }
1.40
1.41 - MetamodBackend backend = mm_DetermineBackend(engineFactory, game_name);
1.42 -
1.43 - if (backend == MMBackend_UNKNOWN)
1.44 + if (mm_backend == MMBackend_UNKNOWN)
1.45 {
1.46 mm_LogFatal("Could not detect engine version");
1.47 return false;
1.48 }
1.49 - else if (backend >= MMBackend_Episode2)
1.50 + else if (mm_backend >= MMBackend_Episode2)
1.51 {
1.52 /* We need to insert the right type of call into this vtable */
1.53 void **vtable_src;
1.54 @@ -126,24 +125,30 @@
1.55 vtable_src = (void **)*(void **)&sample;
1.56 vtable_dest = (void **)*(void **)this;
1.57 SourceHook::SetMemAccess(&vtable_dest[mfp_dest.vtblindex],
1.58 - sizeof(void*),
1.59 + sizeof(void*),
1.60 SH_MEM_READ|SH_MEM_WRITE|SH_MEM_EXEC);
1.61 vtable_dest[mfp_dest.vtblindex] = vtable_src[mfp_src.vtblindex];
1.62 }
1.63
1.64 char error[255];
1.65 - if (!mm_LoadMetamodLibrary(backend, error, sizeof(error)))
1.66 + if (gamedll_bridge == NULL)
1.67 {
1.68 - mm_LogFatal("Detected engine %d but could not load: %s", backend, error);
1.69 - return false;
1.70 + if (!mm_LoadMetamodLibrary(mm_backend, error, sizeof(error)))
1.71 + {
1.72 + mm_LogFatal("Detected engine %d but could not load: %s", mm_backend, error);
1.73 + return false;
1.74 + }
1.75 }
1.76
1.77 typedef IVspBridge *(*GetVspBridge)();
1.78 GetVspBridge get_bridge = (GetVspBridge)mm_GetProcAddress("GetVspBridge");
1.79 if (get_bridge == NULL)
1.80 {
1.81 - mm_UnloadMetamodLibrary();
1.82 - mm_LogFatal("Detected engine %d but could not find GetVspBridge callback", backend);
1.83 + if (gamedll_bridge == NULL)
1.84 + {
1.85 + mm_UnloadMetamodLibrary();
1.86 + }
1.87 + mm_LogFatal("Detected engine %d but could not find GetVspBridge callback", mm_backend);
1.88 return false;
1.89 }
1.90
1.91 @@ -160,8 +165,11 @@
1.92 if (!vsp_bridge->Load(&info, error, sizeof(error)))
1.93 {
1.94 vsp_bridge = NULL;
1.95 - mm_UnloadMetamodLibrary();
1.96 - mm_LogFatal("Unknown error loading Metamod for engine %d: %s", backend, error);
1.97 + if (gamedll_bridge == NULL)
1.98 + {
1.99 + mm_UnloadMetamodLibrary();
1.100 + }
1.101 + mm_LogFatal("Unknown error loading Metamod for engine %d: %s", mm_backend, error);
1.102 return false;
1.103 }
1.104
1.105 @@ -172,7 +180,11 @@
1.106 if (vsp_bridge == NULL)
1.107 return;
1.108 vsp_bridge->Unload();
1.109 - mm_UnloadMetamodLibrary();
1.110 +
1.111 + if (gamedll_bridge == NULL)
1.112 + {
1.113 + mm_UnloadMetamodLibrary();
1.114 + }
1.115 }
1.116 virtual void Pause()
1.117 {