loader/serverplugin.cpp
changeset 579 be04fd67923b
parent 576 fc3600fed257
child 608 30b546cc4e03
     1.1 --- a/loader/serverplugin.cpp	Wed Nov 19 01:17:48 2008 -0600
     1.2 +++ b/loader/serverplugin.cpp	Sun Nov 23 21:21:49 2008 -0600
     1.3 @@ -42,13 +42,14 @@
     1.4  	}
     1.5  };
     1.6  
     1.7 +IVspBridge *vsp_bridge = NULL;
     1.8 +
     1.9  /**
    1.10   * The vtable must match the general layout for ISPC.  We modify the vtable
    1.11   * based on what we get back.
    1.12   */
    1.13  class ServerPlugin
    1.14  {
    1.15 -	IVspBridge* bridge;
    1.16  	unsigned int vsp_version;
    1.17  	bool load_allowed;
    1.18  public:
    1.19 @@ -58,39 +59,16 @@
    1.20  	}
    1.21  	virtual bool Load(QueryValveInterface engineFactory, QueryValveInterface gsFactory)
    1.22  	{
    1.23 -		MetamodBackend backend = MMBackend_UNKNOWN;
    1.24 -
    1.25  		if (!load_allowed)
    1.26  			return false;
    1.27  
    1.28  		load_allowed = false;
    1.29  
    1.30 -		/* Check for L4D */
    1.31 -		if (engineFactory("VEngineServer022", NULL) != NULL &&
    1.32 -			engineFactory("VEngineCvar007", NULL) != NULL)
    1.33 -		{
    1.34 -			backend = MMBackend_Left4Dead;
    1.35 -		}
    1.36 -		else if (engineFactory("VEngineServer021", NULL) != NULL)
    1.37 -		{
    1.38 -			/* Check for OB */
    1.39 -			if (engineFactory("VEngineCvar004", NULL) != NULL &&
    1.40 -				engineFactory("VModelInfoServer002", NULL) != NULL)
    1.41 -			{
    1.42 -				backend = MMBackend_Episode2;
    1.43 -			}
    1.44 -			/* Check for EP1 */
    1.45 -			else if (engineFactory("VModelInfoServer001", NULL) != NULL &&
    1.46 -					 (engineFactory("VEngineCvar003", NULL) != NULL ||
    1.47 -					  engineFactory("VEngineCvar002", NULL) != NULL))
    1.48 -			{
    1.49 -				backend = MMBackend_Episode1;
    1.50 -			}
    1.51 -		}
    1.52 +		MetamodBackend backend = mm_DetermineBackend(engineFactory);
    1.53  
    1.54  		if (backend == MMBackend_UNKNOWN)
    1.55  		{
    1.56 -			mm_LogFatal("Could not detect engine version, spewing stats:");
    1.57 +			mm_LogFatal("Could not detect engine version");
    1.58  			return false;
    1.59  		}
    1.60  		else if (backend >= MMBackend_Episode2)
    1.61 @@ -134,11 +112,11 @@
    1.62  		if (get_bridge == NULL)
    1.63  		{
    1.64  			mm_UnloadMetamodLibrary();
    1.65 -			mm_LogFatal("Detected engine %d but could not find GetVspBridge callback.", backend);
    1.66 +			mm_LogFatal("Detected engine %d but could not find GetVspBridge callback", backend);
    1.67  			return false;
    1.68  		}
    1.69  
    1.70 -		bridge = get_bridge();
    1.71 +		vsp_bridge = get_bridge();
    1.72  
    1.73  		vsp_bridge_info info;
    1.74  
    1.75 @@ -148,8 +126,9 @@
    1.76  		info.vsp_version = vsp_version;
    1.77  
    1.78  		strcpy(error, "Unknown error");
    1.79 -		if (!bridge->Load(&info, error, sizeof(error)))
    1.80 +		if (!vsp_bridge->Load(&info, error, sizeof(error)))
    1.81  		{
    1.82 +			vsp_bridge = NULL;
    1.83  			mm_UnloadMetamodLibrary();
    1.84  			mm_LogFatal("Unknown error loading Metamod for engine %d: %s", backend, error);	
    1.85  			return false;
    1.86 @@ -159,9 +138,9 @@
    1.87  	}
    1.88  	virtual void Unload()
    1.89  	{
    1.90 -		if (bridge == NULL)
    1.91 +		if (vsp_bridge == NULL)
    1.92  			return;
    1.93 -		bridge->Unload();
    1.94 +		vsp_bridge->Unload();
    1.95  		mm_UnloadMetamodLibrary();
    1.96  	}
    1.97  	virtual void Pause()
    1.98 @@ -172,9 +151,9 @@
    1.99  	}
   1.100  	virtual const char *GetPluginDescription()
   1.101  	{
   1.102 -		if (bridge == NULL)
   1.103 +		if (vsp_bridge == NULL)
   1.104  			return "Metamod:Source Loader Shim";
   1.105 -		return bridge->GetDescription();
   1.106 +		return vsp_bridge->GetDescription();
   1.107  	}
   1.108  	virtual void LevelInit(char const *pMapName)
   1.109  	{
   1.110 @@ -232,17 +211,13 @@
   1.111  		vsp_version = version;
   1.112  		load_allowed = true;
   1.113  	}
   1.114 -	bool IsLoaded()
   1.115 -	{
   1.116 -		return bridge != NULL;
   1.117 -	}
   1.118  };
   1.119  
   1.120  ServerPlugin mm_vsp_callbacks;
   1.121  
   1.122  void *mm_GetVspCallbacks(unsigned int version)
   1.123  {
   1.124 -	if (mm_vsp_callbacks.IsLoaded())
   1.125 +	if (vsp_bridge != NULL)
   1.126  		return NULL;
   1.127  
   1.128  	/* Only support versions 1 or 2 right now */