UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Matt Woodrow 2008-09-18 15:33:50 +12:00
commit 46095d797c
19 changed files with 138 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/sm_version.h
View File

@ -40,7 +40,9 @@
* @file Contains SourceMod version information. * @file Contains SourceMod version information.
*/ */
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_SOURCEMOD_VERSION_H_ #endif //_INCLUDE_SOURCEMOD_VERSION_H_

16
core/smn_filesystem.cpp
View File

@ -487,6 +487,21 @@ static cell_t sm_FileSize(IPluginContext *pContext, const cell_t *params)
#endif #endif
} }
static cell_t sm_CreateDirectory(IPluginContext *pContext, const cell_t *params)
{
char *name;
char realpath[PLATFORM_MAX_PATH];
pContext->LocalToString(params[1], &name);
g_SourceMod.BuildPath(Path_Game, realpath, sizeof(realpath), "%s", name);
#if defined PLATFORM_WINDOWS
return mkdir(realpath) == 0;
#else
return mkdir(realpath, params[2]) == 0;
#endif
}
static cell_t sm_RemoveDir(IPluginContext *pContext, const cell_t *params) static cell_t sm_RemoveDir(IPluginContext *pContext, const cell_t *params)
{ {
char *name; char *name;
@ -959,5 +974,6 @@ REGISTER_NATIVES(filesystem)
{"WriteFileString", sm_WriteFileString}, {"WriteFileString", sm_WriteFileString},
{"AddGameLogHook", sm_AddGameLogHook}, {"AddGameLogHook", sm_AddGameLogHook},
{"RemoveGameLogHook", sm_RemoveGameLogHook}, {"RemoveGameLogHook", sm_RemoveGameLogHook},
{"CreateDirectory", sm_CreateDirectory},
{NULL, NULL}, {NULL, NULL},
}; };

9
core/systems/HandleSys.cpp
View File

@ -910,6 +910,15 @@ bool HandleSystem::RemoveType(HandleType_t type, IdentityToken_t *ident)
} }
} }
/* Remove it from the type cache. */
if (pType->nameIdx != -1)
{
const char *typeName;
typeName = m_strtab->GetString(pType->nameIdx);
sm_trie_delete(m_TypeLookup, typeName);
}
return true; return true;
} }

6
extensions/bintools/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_BINTOOLS_VERSION_H_ #ifndef _INCLUDE_BINTOOLS_VERSION_H_
#define _INCLUDE_BINTOOLS_VERSION_H_ #define _INCLUDE_BINTOOLS_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_BINTOOLS_VERSION_H_

6
extensions/cstrike/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
#define _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_SDKTOOLS_VERSION_H_

6
extensions/geoip/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_GEOIP_VERSION_H_ #ifndef _INCLUDE_GEOIP_VERSION_H_
#define _INCLUDE_GEOIP_VERSION_H_ #define _INCLUDE_GEOIP_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_GEOIP_VERSION_H_

6
extensions/mysql/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_MYSQLEXT_VERSION_H_ #ifndef _INCLUDE_MYSQLEXT_VERSION_H_
#define _INCLUDE_MYSQLEXT_VERSION_H_ #define _INCLUDE_MYSQLEXT_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_MYSQLEXT_VERSION_H_

6
extensions/regex/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_REGEXEXT_VERSION_H_ #ifndef _INCLUDE_REGEXEXT_VERSION_H_
#define _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_REGEXEXT_VERSION_H_

35
extensions/sdktools/extension.cpp
View File

@ -82,6 +82,8 @@ extern sp_nativeinfo_t g_TeamNatives[];
bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late) bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
{ {
HandleError err;
if (!gameconfs->LoadGameConfigFile(SDKTOOLS_GAME_FILE, &g_pGameConf, error, maxlength)) if (!gameconfs->LoadGameConfigFile(SDKTOOLS_GAME_FILE, &g_pGameConf, error, maxlength))
{ {
return false; return false;
@ -102,14 +104,26 @@ bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
SM_GET_IFACE(GAMEHELPERS, g_pGameHelpers); SM_GET_IFACE(GAMEHELPERS, g_pGameHelpers);
playerhelpers->AddClientListener(&g_SdkTools); 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; TypeAccess TraceAccess;
handlesys->InitAccessDefaults(&TraceAccess, NULL); handlesys->InitAccessDefaults(&TraceAccess, NULL);
TraceAccess.ident = myself->GetIdentity(); TraceAccess.ident = myself->GetIdentity();
TraceAccess.access[HTypeAccess_Create] = true; TraceAccess.access[HTypeAccess_Create] = true;
TraceAccess.access[HTypeAccess_Inherit] = 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 #if defined ORANGEBOX_BUILD
g_pCVar = icvar; g_pCVar = icvar;
@ -186,6 +200,23 @@ void SDKTools::SDK_OnUnload()
SH_RELEASE_CALLCLASS(enginesoundPatch); SH_RELEASE_CALLCLASS(enginesoundPatch);
enginesoundPatch = NULL; 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) bool SDKTools::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)

6
extensions/sdktools/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
#define _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_SDKTOOLS_VERSION_H_

6
extensions/sqlite/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
#define _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_SQLITEEXT_VERSION_H_

6
extensions/tf2/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_SDKTOOLS_VERSION_H_ #ifndef _INCLUDE_SDKTOOLS_VERSION_H_
#define _INCLUDE_SDKTOOLS_VERSION_H_ #define _INCLUDE_SDKTOOLS_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_SDKTOOLS_VERSION_H_

6
extensions/topmenus/svn_version.h
View File

@ -36,7 +36,9 @@
#ifndef _INCLUDE_SQLITEEXT_VERSION_H_ #ifndef _INCLUDE_SQLITEEXT_VERSION_H_
#define _INCLUDE_SQLITEEXT_VERSION_H_ #define _INCLUDE_SQLITEEXT_VERSION_H_
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_ #endif //_INCLUDE_SQLITEEXT_VERSION_H_

6
loader/svn_version.h
View File

@ -40,7 +40,9 @@
* @file Contains SourceMod version information. * @file Contains SourceMod version information.
*/ */
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2230 #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_SOURCEMOD_VERSION_H_ #endif //_INCLUDE_SOURCEMOD_VERSION_H_

19
plugins/include/files.inc
View File

@ -353,6 +353,25 @@ native FlushFile(Handle:file);
*/ */
native bool:RemoveDir(const String:path[]); native bool:RemoveDir(const String:path[]);
#define FPERM_U_READ 0x0100 /* User can read. */
#define FPERM_U_WRITE 0x0080 /* User can write. */
#define FPERM_U_EXEC 0x0040 /* User can exec. */
#define FPERM_G_READ 0x0020 /* Group can read. */
#define FPERM_G_WRITE 0x0010 /* Group can write. */
#define FPERM_G_EXEC 0x0008 /* Group can exec. */
#define FPERM_O_READ 0x0004 /* Anyone can read. */
#define FPERM_O_WRITE 0x0002 /* Anyone can write. */
#define FPERM_O_EXEC 0x0001 /* Anyone can exec. */
/**
* Creates a directory.
*
* @param path Path to create.
* @param mode Permissions (default is o=rx,g=rx,u=rwx). Note that folders must have
* the execute bit set on Linux. On Windows, the mode is ignored.
*/
native bool:CreateDirectory(const String:path[], mode);
/** /**
* Returns a file timestamp as a unix timestamp. * Returns a file timestamp as a unix timestamp.
* *

2
plugins/include/version.inc
View File

@ -39,4 +39,4 @@
#define SOURCEMOD_V_MINOR 1 /**< SourceMod Minor version */ #define SOURCEMOD_V_MINOR 1 /**< SourceMod Minor version */
#define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */ #define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */
#define SOURCEMOD_VERSION "1.1.0-svn" /**< SourceMod version string (major.minor.release.build) */ #define SOURCEMOD_VERSION "1.1.0" /**< SourceMod version string (major.minor.release.build) */

6
sourcepawn/compiler/svn_version.h
View File

@ -19,7 +19,9 @@
* @file Contains SourceMod version information. * @file Contains SourceMod version information.
*/ */
#define SVN_FULL_VERSION "1.1.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,1,0,2139 #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_SOURCEMOD_VERSION_H_ #endif //_INCLUDE_SOURCEMOD_VERSION_H_

6
sourcepawn/jit/jit_version.h
View File

@ -32,7 +32,9 @@
#ifndef _INCLUDE_JIT_VERSION_H_ #ifndef _INCLUDE_JIT_VERSION_H_
#define _INCLUDE_JIT_VERSION_H_ #define _INCLUDE_JIT_VERSION_H_
#define SVN_FULL_VERSION "1.2.0-svn" #define SM_BUILD_STRING ""
#define SVN_FILE_VERSION 1,2,0,2218 #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_JIT_VERSION_H_ #endif //_INCLUDE_JIT_VERSION_H_

8
sourcepawn/jit/x86/jit_x86.cpp
View File

@ -2647,6 +2647,10 @@ jit_rewind:
/* Write these last because error jumps should be predicted forwardly (not taken) */ /* Write these last because error jumps should be predicted forwardly (not taken) */
WriteErrorRoutines(data, jit); WriteErrorRoutines(data, jit);
AlignMe(jit);
data->jit_sysreq_c = jit->get_outputpos();
WriteOp_Sysreq_C_Function(jit);
/* Build thunk tables */ /* Build thunk tables */
if (data->num_thunks > data->max_thunks) if (data->num_thunks > data->max_thunks)
{ {
@ -2709,6 +2713,10 @@ jit_rewind:
/* Write these last because error jumps should be predicted as not taken (forward) */ /* Write these last because error jumps should be predicted as not taken (forward) */
WriteErrorRoutines(data, jit); WriteErrorRoutines(data, jit);
AlignMe(jit);
data->jit_sysreq_c = jit->get_outputpos();
WriteOp_Sysreq_C_Function(jit);
/* Write the thunk offsets. */ /* Write the thunk offsets. */
for (unsigned int i = 0; i < data->num_thunks; i++) for (unsigned int i = 0; i < data->num_thunks; i++)
{ {