Merge
authorNicholas Hastings <skamonkey@gmail.com>
Fri Nov 19 15:52:41 2010 -0500 (2010-11-19)
changeset 31562469806bb7ed
parent 3154 021f89d73ba0
parent 3155 faf3e4ffabd9
child 3157 a998690a87e4
Merge
     1.1 --- a/extensions/sdktools/extension.cpp	Fri Nov 19 18:16:24 2010 +1300
     1.2 +++ b/extensions/sdktools/extension.cpp	Fri Nov 19 15:52:41 2010 -0500
     1.3 @@ -441,11 +441,6 @@
     1.4  	{
     1.5  		return iserver;
     1.6  	}
     1.7 -
     1.8 -	virtual IGameRules *GetGameRules()
     1.9 -	{
    1.10 -		return (IGameRules*)g_pGameRules;
    1.11 -	}
    1.12  } g_SDKTools_API;
    1.13  
    1.14  static void InitSDKToolsAPI()
     2.1 --- a/public/extensions/ISDKTools.h	Fri Nov 19 18:16:24 2010 +1300
     2.2 +++ b/public/extensions/ISDKTools.h	Fri Nov 19 15:52:41 2010 -0500
     2.3 @@ -35,10 +35,9 @@
     2.4  #include <IShareSys.h>
     2.5  
     2.6  #define SMINTERFACE_SDKTOOLS_NAME		"ISDKTools"
     2.7 -#define SMINTERFACE_SDKTOOLS_VERSION	2
     2.8 +#define SMINTERFACE_SDKTOOLS_VERSION	1
     2.9  
    2.10  class IServer;
    2.11 -class IGameRules;
    2.12  
    2.13  /**
    2.14   * @brief SDKTools shared API
    2.15 @@ -62,13 +61,6 @@
    2.16  		 * @return			IServer pointer, or NULL if SDKTools was unable to find one.
    2.17  		 */
    2.18  		virtual IServer* GetIServer() = 0;
    2.19 -
    2.20 -		/**
    2.21 -		 * @brief Returns a pointer to GameRules if one was found.
    2.22 -		 *
    2.23 -		 * @return			GameRules pointer, or NULL if SDKTools was unable to find one.
    2.24 -		 */
    2.25 -		virtual IGameRules* GetGameRules() = 0;
    2.26  	};
    2.27  }
    2.28