From a2470215ed1498daa5a78611c30fc271b99707f0 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Thu, 10 Apr 2008 20:12:12 +0000 Subject: [PATCH] Merged revs 2029 and 2030 from trunk - bit of cleaning and added svn:keywords property to some files that didn't have them yet --HG-- branch : sourcemod-1.0.x extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.x%402031 --- extensions/regex/CRegEx.cpp | 31 +++++++++++++++++++++ extensions/regex/CRegEx.h | 31 +++++++++++++++++++++ extensions/regex/svn_version.h | 6 ++--- extensions/sdktools/Makefile | 2 +- extensions/sdktools/detours.cpp | 39 --------------------------- extensions/sdktools/output.cpp | 5 ++-- extensions/sdktools/outputnatives.cpp | 2 -- extensions/sdktools/util.h | 2 +- extensions/sdktools/vhelpers.cpp | 7 ----- plugins/include/regex.inc | 32 ++++++++++++++++++++++ 10 files changed, 101 insertions(+), 56 deletions(-) delete mode 100644 extensions/sdktools/detours.cpp diff --git a/extensions/regex/CRegEx.cpp b/extensions/regex/CRegEx.cpp index 6405a3a0..a775b0ef 100644 --- a/extensions/regex/CRegEx.cpp +++ b/extensions/regex/CRegEx.cpp @@ -1,3 +1,34 @@ +/** + * vim: set ts=4 : + * ============================================================================= + * SourceMod Regular Expressions Extension + * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. + * ============================================================================= + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License, version 3.0, as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + * + * As a special exception, AlliedModders LLC gives you permission to link the + * code of this program (as well as its derivative works) to "Half-Life 2," the + * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software + * by the Valve Corporation. You must obey the GNU General Public License in + * all respects for all other code used. Additionally, AlliedModders LLC grants + * this exception to all derivative works. AlliedModders LLC defines further + * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), + * or . + * + * Version: $Id$ + */ + #include "pcre.h" #include "CRegEx.h" #include diff --git a/extensions/regex/CRegEx.h b/extensions/regex/CRegEx.h index 183a3039..56e1dfd4 100644 --- a/extensions/regex/CRegEx.h +++ b/extensions/regex/CRegEx.h @@ -1,3 +1,34 @@ +/** + * vim: set ts=4 : + * ============================================================================= + * SourceMod Regular Expressions Extension + * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. + * ============================================================================= + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License, version 3.0, as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + * + * As a special exception, AlliedModders LLC gives you permission to link the + * code of this program (as well as its derivative works) to "Half-Life 2," the + * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software + * by the Valve Corporation. You must obey the GNU General Public License in + * all respects for all other code used. Additionally, AlliedModders LLC grants + * this exception to all derivative works. AlliedModders LLC defines further + * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), + * or . + * + * Version: $Id$ + */ + #ifndef _INCLUDE_CREGEX_H #define _INCLUDE_CREGEX_H diff --git a/extensions/regex/svn_version.h b/extensions/regex/svn_version.h index ff7be5c2..e3b80bba 100644 --- a/extensions/regex/svn_version.h +++ b/extensions/regex/svn_version.h @@ -1,7 +1,7 @@ /** * vim: set ts=4 : * ============================================================================= - * SourceMod SQLite Extension + * SourceMod Regular Expressions Extension * Copyright (C) 2004-2008 AlliedModders LLC. All rights reserved. * ============================================================================= * @@ -36,7 +36,7 @@ #ifndef _INCLUDE_REGEXEXT_VERSION_H_ #define _INCLUDE_REGEXEXT_VERSION_H_ -#define SVN_FULL_VERSION "1.0.0.1994" -#define SVN_FILE_VERSION 1,0,0,1994 +#define SVN_FULL_VERSION "1.1.0.1994" +#define SVN_FILE_VERSION 1,1,0,1994 #endif //_INCLUDE_REGEXEXT_VERSION_H_ diff --git a/extensions/sdktools/Makefile b/extensions/sdktools/Makefile index 4459d9a3..dbf0c7ec 100644 --- a/extensions/sdktools/Makefile +++ b/extensions/sdktools/Makefile @@ -20,7 +20,7 @@ USEMETA = true OBJECTS = sdk/smsdk_ext.cpp extension.cpp vdecoder.cpp vcallbuilder.cpp vcaller.cpp \ vnatives.cpp vsound.cpp tenatives.cpp trnatives.cpp tempents.cpp vstringtable.cpp \ vhelpers.cpp vglobals.cpp voice.cpp inputnatives.cpp teamnatives.cpp output.cpp \ - outputnatives.cpp detours.cpp + outputnatives.cpp ############################################## ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ### diff --git a/extensions/sdktools/detours.cpp b/extensions/sdktools/detours.cpp deleted file mode 100644 index f4646009..00000000 --- a/extensions/sdktools/detours.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * vim: set ts=4 : - * ============================================================================= - * SourceMod SDKTools Extension - * Copyright (C) 2004-2007 AlliedModders LLC. All rights reserved. - * ============================================================================= - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, version 3.0, as published by the - * Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - * - * As a special exception, AlliedModders LLC gives you permission to link the - * code of this program (as well as its derivative works) to "Half-Life 2," the - * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software - * by the Valve Corporation. You must obey the GNU General Public License in - * all respects for all other code used. Additionally, AlliedModders LLC grants - * this exception to all derivative works. AlliedModders LLC defines further - * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), - * or . - * - * Version: $Id$ - */ - -#include "extension.h" -#include "output.h" - - - - - - diff --git a/extensions/sdktools/output.cpp b/extensions/sdktools/output.cpp index e35739c5..a8ec86d6 100644 --- a/extensions/sdktools/output.cpp +++ b/extensions/sdktools/output.cpp @@ -437,6 +437,7 @@ const char *EntityOutputManager::FindOutputName(void *pOutput, CBaseEntity *pCal return NULL; } + #if 0 // Almost identical copy of this function from cbase.cpp - FIELD_EHANDLE changed to remove dependencies const char *variant_t::ToString( void ) const @@ -518,6 +519,7 @@ const char *variant_t::ToString( void ) const return("No conversion to string"); } #endif + // Thanks SM core edict_t *EntityOutputManager::BaseHandleToEdict(CBaseHandle &hndl) { @@ -551,6 +553,3 @@ edict_t *EntityOutputManager::BaseHandleToEdict(CBaseHandle &hndl) return pStoredEdict; } - - - diff --git a/extensions/sdktools/outputnatives.cpp b/extensions/sdktools/outputnatives.cpp index 11c9d4f6..84017a56 100644 --- a/extensions/sdktools/outputnatives.cpp +++ b/extensions/sdktools/outputnatives.cpp @@ -32,7 +32,6 @@ #include "extension.h" #include "output.h" - // HookSingleEntityOutput(ent, const String:output[], function, bool:once); cell_t HookSingleEntityOutput(IPluginContext *pContext, const cell_t *params) { @@ -98,7 +97,6 @@ cell_t HookSingleEntityOutput(IPluginContext *pContext, const cell_t *params) return 1; } - // HookEntityOutput(const String:classname[], const String:output[], function); cell_t HookEntityOutput(IPluginContext *pContext, const cell_t *params) { diff --git a/extensions/sdktools/util.h b/extensions/sdktools/util.h index b304923a..e3f46fa8 100644 --- a/extensions/sdktools/util.h +++ b/extensions/sdktools/util.h @@ -26,7 +26,7 @@ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), * or . * - * Version: $Id: vcallbuilder.h 1566 2007-10-14 22:12:46Z faluco $ + * Version: $Id$ */ #ifndef _INCLUDE_SOURCEMOD_UTIL_H_ diff --git a/extensions/sdktools/vhelpers.cpp b/extensions/sdktools/vhelpers.cpp index 5a73dcec..6c7dfec6 100644 --- a/extensions/sdktools/vhelpers.cpp +++ b/extensions/sdktools/vhelpers.cpp @@ -824,10 +824,3 @@ CON_COMMAND(sm_dump_datamaps, "Dumps the data map list as a text file") fclose(fp); } - - - - - - - diff --git a/plugins/include/regex.inc b/plugins/include/regex.inc index f4efb22c..233a6d3b 100644 --- a/plugins/include/regex.inc +++ b/plugins/include/regex.inc @@ -1,3 +1,35 @@ +/** + * vim: set ts=4 : + * ============================================================================= + * SourceMod (C)2004-2007 AlliedModders LLC. All rights reserved. + * ============================================================================= + * + * This file is part of the SourceMod/SourcePawn SDK. + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License, version 3.0, as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + * + * As a special exception, AlliedModders LLC gives you permission to link the + * code of this program (as well as its derivative works) to "Half-Life 2," the + * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software + * by the Valve Corporation. You must obey the GNU General Public License in + * all respects for all other code used. Additionally, AlliedModders LLC grants + * this exception to all derivative works. AlliedModders LLC defines further + * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007), + * or . + * + * Version: $Id$ + */ + #if defined _regex_included #endinput #endif