Merge
This commit is contained in:
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_BINTOOLS_VERSION_H_
|
||||
#define _INCLUDE_BINTOOLS_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_BINTOOLS_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
|
||||
#define _INCLUDE_SDKTOOLS_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_SDKTOOLS_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_GEOIP_VERSION_H_
|
||||
#define _INCLUDE_GEOIP_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_GEOIP_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_MYSQLEXT_VERSION_H_
|
||||
#define _INCLUDE_MYSQLEXT_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_MYSQLEXT_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_REGEXEXT_VERSION_H_
|
||||
#define _INCLUDE_REGEXEXT_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_REGEXEXT_VERSION_H_
|
||||
|
||||
@@ -82,6 +82,8 @@ extern sp_nativeinfo_t g_TeamNatives[];
|
||||
|
||||
bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
|
||||
{
|
||||
HandleError err;
|
||||
|
||||
if (!gameconfs->LoadGameConfigFile(SDKTOOLS_GAME_FILE, &g_pGameConf, error, maxlength))
|
||||
{
|
||||
return false;
|
||||
@@ -102,14 +104,26 @@ bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
|
||||
SM_GET_IFACE(GAMEHELPERS, g_pGameHelpers);
|
||||
|
||||
playerhelpers->AddClientListener(&g_SdkTools);
|
||||
g_CallHandle = handlesys->CreateType("ValveCall", this, 0, NULL, NULL, myself->GetIdentity(), NULL);
|
||||
g_CallHandle = handlesys->CreateType("ValveCall", this, 0, NULL, NULL, myself->GetIdentity(), &err);
|
||||
if (g_CallHandle == 0)
|
||||
{
|
||||
snprintf(error, maxlength, "Could not create call handle type (err: %d)", err);
|
||||
return false;
|
||||
}
|
||||
|
||||
TypeAccess TraceAccess;
|
||||
handlesys->InitAccessDefaults(&TraceAccess, NULL);
|
||||
TraceAccess.ident = myself->GetIdentity();
|
||||
TraceAccess.access[HTypeAccess_Create] = true;
|
||||
TraceAccess.access[HTypeAccess_Inherit] = true;
|
||||
g_TraceHandle = handlesys->CreateType("TraceRay", this, 0, &TraceAccess, NULL, myself->GetIdentity(), NULL);
|
||||
g_TraceHandle = handlesys->CreateType("TraceRay", this, 0, &TraceAccess, NULL, myself->GetIdentity(), &err);
|
||||
if (g_TraceHandle == 0)
|
||||
{
|
||||
handlesys->RemoveType(g_CallHandle, myself->GetIdentity());
|
||||
g_CallHandle = 0;
|
||||
snprintf(error, maxlength, "Could not create traceray handle type (err: %d)", err);
|
||||
return false;
|
||||
}
|
||||
|
||||
#if defined ORANGEBOX_BUILD
|
||||
g_pCVar = icvar;
|
||||
@@ -186,6 +200,23 @@ void SDKTools::SDK_OnUnload()
|
||||
SH_RELEASE_CALLCLASS(enginesoundPatch);
|
||||
enginesoundPatch = NULL;
|
||||
}
|
||||
|
||||
bool err;
|
||||
if (g_CallHandle != 0)
|
||||
{
|
||||
if ((err = handlesys->RemoveType(g_CallHandle, myself->GetIdentity())) != true)
|
||||
{
|
||||
g_pSM->LogError(myself, "Could not remove call handle (type=%x, err=%d)", g_CallHandle, err);
|
||||
}
|
||||
}
|
||||
|
||||
if (g_TraceHandle != 0)
|
||||
{
|
||||
if ((err = handlesys->RemoveType(g_TraceHandle, myself->GetIdentity())) != true)
|
||||
{
|
||||
g_pSM->LogError(myself, "Could not remove trace handle (type=%x, err=%d)", g_TraceHandle, err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
|
||||
#define _INCLUDE_SDKTOOLS_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_SDKTOOLS_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_SQLITEEXT_VERSION_H_
|
||||
#define _INCLUDE_SQLITEEXT_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_SQLITEEXT_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_SDKTOOLS_VERSION_H_
|
||||
#define _INCLUDE_SDKTOOLS_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_SDKTOOLS_VERSION_H_
|
||||
|
||||
@@ -36,7 +36,9 @@
|
||||
#ifndef _INCLUDE_SQLITEEXT_VERSION_H_
|
||||
#define _INCLUDE_SQLITEEXT_VERSION_H_
|
||||
|
||||
#define SVN_FULL_VERSION "1.1.0-svn"
|
||||
#define SVN_FILE_VERSION 1,1,0,2230
|
||||
#define SM_BUILD_STRING ""
|
||||
#define SM_BUILD_UNIQUEID "2302:54350d76a097" SM_BUILD_STRING
|
||||
#define SVN_FULL_VERSION "1.1.0" SM_BUILD_STRING
|
||||
#define SVN_FILE_VERSION 1,1,0,0
|
||||
|
||||
#endif //_INCLUDE_SQLITEEXT_VERSION_H_
|
||||
|
||||
Reference in New Issue
Block a user