sourcemm/sourcemm.cpp
branchsourcemm-1.6.0
changeset 348 716af2e7be78
parent 347 e82968c21606
child 351 7347be0355ae
     1.1 --- a/sourcemm/sourcemm.cpp	Tue Sep 18 20:03:47 2007 +0000
     1.2 +++ b/sourcemm/sourcemm.cpp	Tue Sep 18 20:35:29 2007 +0000
     1.3 @@ -58,8 +58,9 @@
     1.4  SourceHook::List<GameDllInfo *> gamedll_list;
     1.5  SourceHook::CallClass<IServerGameDLL> *g_GameDllPatch;
     1.6  int g_GameDllVersion = 0;
     1.7 -const char VSPIFACE_001[] = "ISERVERPLUGINCALLBACKS001";
     1.8 -const char VSPIFACE_002[] = "ISERVERPLUGINCALLBACKS002";
     1.9 +int g_GameClientsVersion = 0;
    1.10 +int g_VspVersion = 0;
    1.11 +const char VSPIFACE[] = "ISERVERPLUGINCALLBACKS";
    1.12  const char GAMEINFO_PATH[] = "|gameinfo_path|";
    1.13  
    1.14  void ClearGamedllList();
    1.15 @@ -227,17 +228,18 @@
    1.16  		return NULL;
    1.17  	}
    1.18  
    1.19 -	/* We check these separately because we can't reply
    1.20 -	 * unless our interface version really matches.
    1.21 -	 */
    1.22 -	if ((strcmp(iface, VSPIFACE_002) == 0)
    1.23 -		|| strcmp(iface, VSPIFACE_001) == 0)
    1.24 +	if (strncmp(iface, VSPIFACE, 22) == 0)
    1.25  	{
    1.26 -		if (ret)
    1.27 +		g_VspVersion = atoi(&(iface[22]));
    1.28 +
    1.29 +		if (g_VspVersion <= MAX_VSP_VERSION)
    1.30  		{
    1.31 -			*ret = IFACE_OK;
    1.32 +			if (ret)
    1.33 +			{
    1.34 +				*ret = IFACE_OK;
    1.35 +			}
    1.36 +			return &g_VspListener;
    1.37  		}
    1.38 -		return &g_VspListener;
    1.39  	}
    1.40  
    1.41  	if (!gParsedGameInfo)
    1.42 @@ -278,7 +280,6 @@
    1.43  
    1.44  		char buffer[255];
    1.45  		char key[128], val[128];
    1.46 -		size_t len = 0;
    1.47  		bool search = false;
    1.48  		bool gamebin = false;
    1.49  		char *ptr;
    1.50 @@ -291,9 +292,6 @@
    1.51  		{
    1.52  			buffer[0] = '\0';
    1.53  			fgets(buffer, sizeof(buffer), fp);
    1.54 -			len = strlen(buffer);
    1.55 -			if (buffer[len-1] == '\n')
    1.56 -				buffer[--len] = '\0';
    1.57  			UTIL_TrimComments(buffer);
    1.58  			UTIL_TrimLeft(buffer);
    1.59  			UTIL_TrimRight(buffer);
    1.60 @@ -450,6 +448,7 @@
    1.61  	{
    1.62  		void *ptr = (g_GameDll.factory)(iface, ret);
    1.63  		g_GameDll.pGameClients = static_cast<IServerGameClients *>(ptr);
    1.64 +		g_GameClientsVersion = atoi(&iface[17]);
    1.65  
    1.66  		return ptr;
    1.67  	}