version bump

--HG--
branch : sourcemod-1.0.1
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402166

.arcconfig

@@ -1,5 +0,0 @@
-{
-	"project_id" : "sourcemod",
-	"conduit_uri" : "https://phabricator.alliedmods.net/",
-	"history.immutable" : false
-}

.gitignore

@@ -1,37 +0,0 @@
-# Binaries
-*.dll
-*.dylib
-*.exe
-*.so
-
-# Files generated by Visual Studio
-*.aps
-*.ipch
-*.ncb
-*.opensdf
-*.sdf
-*.suo
-*.user
-
-# Build directories
-CrazyDebug*/
-Debug*/
-Release*/
-LIB-Release/
-LIB-Debug/
-
-# Files generated by Mac OS X Finder
-.DS_Store
-
-# Files generated by Windows Explorer
-[Dd]esktop.ini
-[Tt]humbs.db
-
-# AMBuild build directories
-build/
-obj-*/
-*~
-*.rej
-*.orig
-*.smx
-*.swp

.travis.yml

@@ -1,11 +0,0 @@
-language: cpp
-compiler:
-  - clang
-before_script:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y g++-multilib libc6-dev-i386 lib32stdc++6 lib32z1-dev
-  - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh && cd $CHECKOUT_DIR
-script:
-  - mkdir build && cd build
-  - python ../configure.py --enable-optimize --sdks=episode1,tf2,l4d2,csgo,dota
-  - ambuild

AMBuildScript

@@ -1,526 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import os, sys
-
-class SDK(object):
-  def __init__(self, sdk, ext, aDef, name, platform, dir):
-    self.folder = 'hl2sdk-' + dir
-    self.envvar = sdk
-    self.ext = ext
-    self.code = aDef
-    self.define = name
-    self.platform = platform
-    self.name = dir
-    self.path = None # Actual path
-
-WinOnly = ['windows']
-WinLinux = ['windows', 'linux']
-WinLinuxMac = ['windows', 'linux', 'mac']
-
-PossibleSDKs = {
-  'episode1':  SDK('HL2SDK', '1.ep1', '1', 'EPISODEONE', WinLinux, 'episode1'),
-  'ep2':  SDK('HL2SDKOB', '2.ep2', '3', 'ORANGEBOX', WinLinux, 'orangebox'),
-  'css':  SDK('HL2SDKCSS', '2.css', '6', 'CSS', WinLinuxMac, 'css'),
-  'hl2dm':  SDK('HL2SDKHL2DM', '2.hl2dm', '7', 'HL2DM', WinLinuxMac, 'hl2dm'),
-  'dods': SDK('HL2SDKDODS', '2.dods', '8', 'DODS', WinLinuxMac, 'dods'),
-  'sdk2013': SDK('HL2SDK2013', '2.sdk2013', '9', 'SDK2013', WinLinuxMac, 'sdk2013'),
-  'tf2':  SDK('HL2SDKTF2', '2.tf2', '10', 'TF2', WinLinuxMac, 'tf2'),
-  'l4d':  SDK('HL2SDKL4D', '2.l4d', '11', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
-  'nucleardawn': SDK('HL2SDKND', '2.nd', '12', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
-  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '14', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
-  'darkm':  SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
-  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '15', 'ALIENSWARM', WinOnly, 'swarm'),
-  'bgt':  SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
-  'eye':  SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
-  'csgo': SDK('HL2SDKCSGO', '2.csgo', '19', 'CSGO', WinLinuxMac, 'csgo'),
-  'dota': SDK('HL2SDKDOTA', '2.dota', '20', 'DOTA', WinLinuxMac, 'dota'),
-  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '16', 'PORTAL2', [], 'portal2'),
-  'blade':  SDK('HL2SDKBLADE', '2.blade', '17', 'BLADE', WinLinux, 'blade'),
-  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '18', 'INSURGENCY', WinLinuxMac, 'insurgency'),
-  'contagion':  SDK('HL2SDKCONTAGION', '2.contagion', '13', 'CONTAGION', WinOnly, 'contagion'),
-}
-
-def ResolveEnvPath(env, folder):
-  if env in os.environ:
-    path = os.environ[env]
-    if os.path.isdir(path):
-      return path
-    return None
-
-  head = os.getcwd()
-  oldhead = None
-  while head != None and head != oldhead:
-    path = os.path.join(head, folder)
-    if os.path.isdir(path):
-      return path
-    oldhead = head
-    head, tail = os.path.split(head)
-
-  return None
-
-def Normalize(path):
-  return os.path.abspath(os.path.normpath(path))
-
-class SMConfig(object):
-  def __init__(self):
-    self.sdks = {}
-    self.binaries = []
-    self.extensions = []
-    self.generated_headers = None
-    self.mms_root = None
-    self.mysql_root = None
-    self.spcomp = None
-    self.smx_files = {}
-    self.versionlib = None
-
-  def use_auto_versioning(self):
-    if builder.backend != 'amb2':
-      return False
-    return not getattr(builder.options, 'disable_auto_versioning', False)
-
-  @property
-  def tag(self):
-    if builder.options.debug == '1':
-      return 'Debug'
-    return 'Release'
-
-  def detectProductVersion(self):
-    builder.AddConfigureFile('product.version')
-
-    # For OS X dylib versioning
-    import re
-    with open(os.path.join(builder.sourcePath, 'product.version'), 'r') as fp:
-      productContents = fp.read()
-    m = re.match('(\d+)\.(\d+)\.(\d+).*', productContents)
-    if m == None:
-      self.productVersion = '1.0.0'
-    else:
-      major, minor, release = m.groups()
-      self.productVersion = '{0}.{1}.{2}'.format(major, minor, release)
-
-  def detectSDKs(self):
-    sdk_list = builder.options.sdks.split(',')
-    use_all = sdk_list[0] == 'all'
-    use_present = sdk_list[0] == 'present'
-
-    for sdk_name in PossibleSDKs:
-      sdk = PossibleSDKs[sdk_name]
-      if builder.target_platform in sdk.platform:
-        if builder.options.hl2sdk_root:
-          sdk_path = os.path.join(builder.options.hl2sdk_root, sdk.folder)
-        else:
-          sdk_path = ResolveEnvPath(sdk.envvar, sdk.folder)
-        if sdk_path is None or not os.path.isdir(sdk_path):
-          if use_all or sdk_name in sdk_list:
-            raise Exception('Could not find a valid path for {0}'.format(sdk.envvar))
-          continue
-        if use_all or use_present or sdk_name in sdk_list:
-          sdk.path = Normalize(sdk_path)
-          self.sdks[sdk_name] = sdk
-
-    if len(self.sdks) < 1:
-      raise Exception('At least one SDK must be available.')
-
-   
-    if builder.options.mms_path:
-      self.mms_root = builder.options.mms_path
-    else:
-      self.mms_root = ResolveEnvPath('MMSOURCE110', 'mmsource-1.10')
-      if not self.mms_root:
-        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'metamod-source')
-      if not self.mms_root:
-        self.mms_root = ResolveEnvPath('MMSOURCE_DEV', 'mmsource-central')
-
-    if not self.mms_root or not os.path.isdir(self.mms_root):
-      raise Exception('Could not find a source copy of Metamod:Source')
-    self.mms_root = Normalize(self.mms_root)
-
-    if builder.options.hasMySql:
-      if builder.options.mysql_path:
-        self.mysql_root = builder.options.mysql_path
-      else:
-        for i in range(7):
-          self.mysql_root = ResolveEnvPath('MYSQL5', 'mysql-5.' + str(i))
-          if self.mysql_root:
-            break
-      if not self.mysql_root or not os.path.isdir(self.mysql_root):
-        raise Exception('Could not find a path to MySQL!')
-      self.mysql_root = Normalize(self.mysql_root)
-
-  def configure(self):
-    builder.AddConfigureFile('pushbuild.txt')
-
-    cxx = builder.DetectCompilers()
-
-    if cxx.like('gcc'):
-      cxx.defines += [
-        'stricmp=strcasecmp',
-        '_stricmp=strcasecmp',
-        '_snprintf=snprintf',
-        '_vsnprintf=vsnprintf',
-        'HAVE_STDINT_H',
-        'GNUC',
-      ]
-      cxx.cflags += [
-        '-pipe',
-        '-fno-strict-aliasing',
-        '-Wall',
-        '-Werror',
-        '-Wno-unused',
-        '-Wno-switch',
-        '-Wno-array-bounds',
-        '-msse',
-        '-m32',
-      ]
-      cxx.cxxflags += [
-          '-std=c++11',
-      ]
-
-      have_gcc = cxx.vendor == 'gcc'
-      have_clang = cxx.vendor == 'clang'
-      if have_clang or (have_gcc and cxx.version >= '4'):
-        cxx.cflags += ['-fvisibility=hidden']
-        cxx.cxxflags += ['-fvisibility-inlines-hidden']
-        if have_clang or (have_gcc and cxx.version >= '4.6'):
-          cxx.cflags += ['-Wno-narrowing']
-        if (have_gcc and cxx.version >= '4.7') or (have_clang and cxx.version >= '3'):
-          cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
-        if have_gcc and cxx.version >= '4.8':
-          cxx.cflags += ['-Wno-unused-result']
-      if have_clang:
-        cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
-        if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
-          cxx.cxxflags += ['-Wno-deprecated-register']
-        else:
-          cxx.cxxflags += ['-Wno-deprecated']
-        cxx.cflags += ['-Wno-sometimes-uninitialized']
-
-      cxx.linkflags += ['-m32']
-      cxx.cxxflags += [
-        '-fno-exceptions',
-        '-fno-threadsafe-statics',
-        '-Wno-non-virtual-dtor',
-        '-Wno-overloaded-virtual',
-      ]
-
-      if have_gcc:
-        cxx.cflags += ['-mfpmath=sse']
-    elif cxx.vendor == 'msvc':
-      if builder.options.debug == '1':
-        cxx.cflags += ['/MTd']
-        cxx.linkflags += ['/NODEFAULTLIB:libcmt']
-      else:
-        cxx.cflags += ['/MT']
-      cxx.defines += [
-        '_CRT_SECURE_NO_DEPRECATE',
-        '_CRT_SECURE_NO_WARNINGS',
-        '_CRT_NONSTDC_NO_DEPRECATE',
-        '_ITERATOR_DEBUG_LEVEL=0',
-      ]
-      if cxx.version < 1800:
-        cxx.defines += 'strtoull=_strtoui64'
-      cxx.cflags += [
-        '/W3',
-      ]
-      cxx.cxxflags += [
-        '/EHsc',
-        '/GR-',
-        '/TP',
-      ]
-      cxx.linkflags += [
-        '/MACHINE:X86',
-        '/SUBSYSTEM:WINDOWS',
-        'kernel32.lib',
-        'user32.lib',
-        'gdi32.lib',
-        'winspool.lib',
-        'comdlg32.lib',
-        'advapi32.lib',
-        'shell32.lib',
-        'ole32.lib',
-        'oleaut32.lib',
-        'uuid.lib',
-        'odbc32.lib',
-        'odbccp32.lib',
-      ] 
-
-    # Optimization
-    if builder.options.opt == '1':
-      cxx.defines += ['NDEBUG']
-      if cxx.like('gcc'):
-        cxx.cflags += ['-O3']
-      elif cxx.like('msvc'):
-        cxx.cflags += ['/Ox', '/Zo']
-        cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
-
-    # Debugging
-    if builder.options.debug == '1':
-      cxx.defines += ['DEBUG', '_DEBUG']
-      if cxx.like('msvc'):
-        cxx.cflags += ['/Od', '/RTC1']
-
-    # This needs to be after our optimization flags which could otherwise disable it.
-    if cxx.vendor == 'msvc':
-      # Don't omit the frame pointer.
-      cxx.cflags += ['/Oy-']
-
-    # Platform-specifics
-    if builder.target_platform == 'linux':
-      cxx.defines += ['_LINUX', 'POSIX']
-      if cxx.vendor == 'gcc':
-        cxx.linkflags += ['-static-libgcc']
-      elif cxx.vendor == 'clang':
-        cxx.linkflags += ['-lgcc_eh']
-    elif builder.target_platform == 'mac':
-      cxx.defines += ['OSX', '_OSX', 'POSIX']
-      cxx.cflags += ['-mmacosx-version-min=10.5']
-      cxx.linkflags += [
-        '-mmacosx-version-min=10.5',
-        '-arch', 'i386',
-        '-lstdc++',
-        '-stdlib=libstdc++',
-      ]
-      cxx.cxxflags += ['-stdlib=libstdc++']
-    elif builder.target_platform == 'windows':
-      cxx.defines += ['WIN32', '_WINDOWS']
-
-    # Finish up.
-    cxx.defines += [
-      'SOURCEMOD_BUILD',
-      'SM_USE_VERSIONLIB',
-    ]
-    if self.use_auto_versioning():
-      cxx.defines += ['SM_GENERATED_BUILD']
-      cxx.includes += [os.path.join(builder.buildPath, 'includes')]
-      cxx.includes += [os.path.join(builder.sourcePath, 'versionlib')]
-
-  def AddVersioning(self, binary):
-    if builder.target_platform == 'windows':
-      binary.sources += ['version.rc']
-      binary.compiler.rcdefines += [
-        'BINARY_NAME="{0}"'.format(binary.outputFile),
-        'RC_COMPILE',
-      ]
-      if self.use_auto_versioning():
-        binary.compiler.rcdefines += ['SM_GENERATED_BUILD']
-    elif builder.target_platform == 'mac':
-      if binary.type == 'library':
-        binary.compiler.postlink += [
-          '-compatibility_version', '1.0.0',
-          '-current_version', self.productVersion
-        ]
-    if self.use_auto_versioning():
-      binary.compiler.linkflags += [self.versionlib]
-      binary.compiler.sourcedeps += SM.generated_headers
-    return binary
-
-  def Library(self, context, name):
-    binary = context.compiler.Library(name)
-    return self.AddVersioning(binary)
-
-  def Program(self, context, name):
-    binary = context.compiler.Program(name)
-    return self.AddVersioning(binary)
-
-  def ConfigureForExtension(self, context, compiler):
-    compiler.cxxincludes += [
-      os.path.join(context.currentSourcePath),
-      os.path.join(context.currentSourcePath, 'sdk'),
-      os.path.join(builder.sourcePath, 'public'),
-      os.path.join(builder.sourcePath, 'public', 'extensions'),
-      os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
-      os.path.join(builder.sourcePath, 'public', 'amtl'),
-    ]
-    return compiler
-
-  def ExtLibrary(self, context, name):
-    binary = context.compiler.Library(name)
-    self.ConfigureForExtension(context, binary.compiler)
-    return self.AddVersioning(binary)
-
-  def ConfigureForHL2(self, binary, sdk):
-    compiler = binary.compiler
-
-    if sdk.name == 'episode1':
-      mms_path = os.path.join(self.mms_root, 'core-legacy')
-    else:
-      mms_path = os.path.join(self.mms_root, 'core')
-
-    compiler.cxxincludes += [
-      os.path.join(mms_path),
-      os.path.join(mms_path, 'sourcehook'),
-    ]
-
-    defines = ['SE_' + PossibleSDKs[i].define + '=' + PossibleSDKs[i].code for i in PossibleSDKs]
-    compiler.defines += defines
-
-    paths = [
-      ['public'],
-      ['public', 'engine'],
-      ['public', 'mathlib'],
-      ['public', 'vstdlib'],
-      ['public', 'tier0'],
-      ['public', 'tier1']
-    ]
-    if sdk.name == 'episode1' or sdk.name == 'darkm':
-      paths.append(['public', 'dlls'])
-      paths.append(['game_shared'])
-    else:
-      paths.append(['public', 'game', 'server'])
-      paths.append(['public', 'toolframework'])
-      paths.append(['game', 'shared'])
-      paths.append(['common'])
-
-    compiler.defines += ['SOURCE_ENGINE=' + sdk.code]
-
-    if sdk.name == 'sdk2013' and compiler.like('gcc'):
-      # The 2013 SDK already has these in public/tier0/basetypes.h
-      compiler.defines.remove('stricmp=strcasecmp')
-      compiler.defines.remove('_stricmp=strcasecmp')
-      compiler.defines.remove('_snprintf=snprintf')
-      compiler.defines.remove('_vsnprintf=vsnprintf')
-
-    if compiler.like('msvc'):
-      compiler.defines += ['COMPILER_MSVC', 'COMPILER_MSVC32']
-    else:
-      compiler.defines += ['COMPILER_GCC']
-
-    # For everything after Swarm, this needs to be defined for entity networking
-    # to work properly with sendprop value changes.
-    if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']:
-      compiler.defines += ['NETWORK_VARS_ENABLED']
-
-    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota']:
-      if builder.target_platform in ['linux', 'mac']:
-        compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
-
-    if sdk.name == 'csgo' and builder.target_platform == 'linux':
-      compiler.linkflags += ['-lstdc++']
-
-    for path in paths:
-      compiler.cxxincludes += [os.path.join(sdk.path, *path)]
-
-    if builder.target_platform == 'linux':
-      if sdk.name == 'episode1':
-        lib_folder = os.path.join(sdk.path, 'linux_sdk')
-      elif sdk.name == 'sdk2013':
-        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
-      else:
-        lib_folder = os.path.join(sdk.path, 'lib', 'linux')
-    elif builder.target_platform == 'mac':
-      if sdk.name == 'sdk2013':
-        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
-      else:
-        lib_folder = os.path.join(sdk.path, 'lib', 'mac')
-
-    if builder.target_platform in ['linux', 'mac']:
-      if sdk.name == 'sdk2013':
-        compiler.postlink += [
-          compiler.Dep(os.path.join(lib_folder, 'tier1.a')),
-          compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))
-        ]
-      else:
-        compiler.postlink += [
-          compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a')),
-          compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a'))
-        ]
-
-      if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']:
-        compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
-
-    self.AddVersioning(binary)
-
-    dynamic_libs = []
-    if builder.target_platform == 'linux':
-      compiler.linkflags[0:0] = ['-lm']
-      if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'nucleardawn', 'l4d2']:
-        dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
-      elif sdk.name in ['l4d', 'blade', 'insurgency', 'csgo', 'dota']:
-        dynamic_libs = ['libtier0.so', 'libvstdlib.so']
-      else:
-        dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
-    elif builder.target_platform == 'mac':
-      compiler.linkflags.append('-liconv')
-      dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
-    elif builder.target_platform == 'windows':
-      libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
-      if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
-        libs.append('interfaces')
-      for lib in libs:
-        lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
-        compiler.linkflags.append(compiler.Dep(lib_path))
-
-    for library in dynamic_libs:
-      source_path = os.path.join(lib_folder, library)
-      output_path = os.path.join(binary.localFolder, library)
-
-      def make_linker(source_path, output_path):
-        def link(context, binary):
-          cmd_node, (output,) = context.AddSymlink(source_path, output_path)
-          return output
-        return link
-
-      linker = make_linker(source_path, output_path)
-      compiler.linkflags[0:0] = [compiler.Dep(library, linker)]
-
-    return binary
-
-  def HL2Library(self, context, name, sdk):
-    binary = context.compiler.Library(name)
-    self.ConfigureForExtension(context, binary.compiler)
-    return self.ConfigureForHL2(binary, sdk)
-
-  def HL2Project(self, context, name):
-    project = context.compiler.LibraryProject(name)
-    self.ConfigureForExtension(context, project.compiler)
-    return project
-
-  def HL2Config(self, project, name, sdk):
-    binary = project.Configure(name, '{0} - {1}'.format(self.tag, sdk.name))
-    return self.ConfigureForHL2(binary, sdk)
-
-SM = SMConfig()
-SM.detectProductVersion()
-SM.detectSDKs()
-SM.configure()
-
-if SM.use_auto_versioning():
-  SM.generated_headers = builder.RunScript(
-    'tools/buildbot/Versioning',
-    { 'SM': SM }
-  )
-  SM.versionlib = builder.RunScript(
-    'versionlib/AMBuilder',
-    { 'SM': SM }
-  )
-
-BuildScripts = [
-  'loader/AMBuilder',
-  'core/AMBuilder',
-  'core/logic/AMBuilder',
-  'extensions/bintools/AMBuilder',
-  'extensions/clientprefs/AMBuilder',
-  'extensions/curl/AMBuilder',
-  'extensions/cstrike/AMBuilder',
-  'extensions/geoip/AMBuilder',
-  'extensions/mysql/AMBuilder',
-  'extensions/regex/AMBuilder',
-  'extensions/sdkhooks/AMBuilder',
-  'extensions/sdktools/AMBuilder',
-  'extensions/sqlite/AMBuilder',
-  'extensions/tf2/AMBuilder',
-  'extensions/topmenus/AMBuilder',
-  'extensions/updater/AMBuilder',
-  'sourcepawn/compiler/AMBuilder',
-  'sourcepawn/jit/AMBuilder',
-]
-
-if builder.backend == 'amb2':
-  BuildScripts += [
-    'plugins/AMBuilder',
-    'tools/buildbot/PackageScript',
-  ]
-
-builder.RunBuildScripts(BuildScripts, { 'SM': SM })
-
-if builder.options.breakpad_dump:
-  builder.RunScript('tools/buildbot/BreakpadSymbols', { 'SM': SM })

NOTICE.txt

@@ -0,0 +1,21 @@
+We now use svn:keywords "Id" on all .c/.cpp/.h/.sp/.inc files.  Please make sure your client is configured properly.  
+
+WINDOWS:
+ Open your Application Data folder.  
+ Windows XP/2000:	C:\Documents and Settings\<user>\Application Data
+ Windows Vista:		C:\Users\<user>\AppData\Roaming
+
+ Now go to Subversion.  Open the "config" file with a text editor.
+
+LINUX: 
+ Open ~/.subversion/config with your favorite text editor.
+
+Under [miscellany], uncomment this line:
+# enable-auto-props = yes
+
+Under [auto-props], add these lines:
+*.c = svn:keywords=Id
+*.cpp = svn:keywords=Id
+*.h = svn:keywords=Id
+*.sp = svn:keywords=Id
+*.inc = svn:keywords=Id

README.md

@@ -1,17 +0,0 @@
-SourceMod
-=========
-
-General
--------
-- [SourceMod website](http://www.sourcemod.net): Source Engine scripting and server administration
-- [Forum](https://forums.alliedmods.net/forumdisplay.php?f=52): Discussion forum including plugin/extension development
-- [General documentation](https://wiki.alliedmods.net/Category:SourceMod_Documentation): Miscellaneous information about SourceMod
-- [Latest release](http://www.sourcemod.net/downloads.php): The latest stable SourceMod release
-- [Build snapshots](http://www.sourcemod.net/snapshots.php): Builds of recent development versions
- 
-Development
------------
-- [Issue tracker](https://bugs.alliedmods.net): Issues that require back and forth communication
-- [Building SourceMod](https://wiki.alliedmods.net/Building_SourceMod): Instructions on how to build SourceMod itself using [AMBuild](https://github.com/alliedmodders/ambuild)
-- [SourcePawn scripting](https://wiki.alliedmods.net/Category:SourceMod_Scripting): SourcePawn examples and introduction to the language
-- [SourceMod extension development](https://wiki.alliedmods.net/Category:SourceMod_Development): C++ examples and introduction to various extension interfaces

configs/adminmenu_custom.txt

@@ -1,12 +0,0 @@
-// Custom admin menu commands.
-// For more information:
-//
-// http://wiki.alliedmods.net/Custom_Admin_Menu_%28SourceMod%29
-//
-// Note: This file must be in Valve KeyValues format (no multiline comments)
-//
-
-"Commands"
-{
-
-}

configs/adminmenu_grouping.txt

@@ -1,20 +0,0 @@
-/* Add group options to be added to 'group' or 'groupplayer' type submenus
- * The left side is the name that will show in the menu, right is the command that will be fired
- *
- * For more information: http://wiki.alliedmods.net/Custom_Admin_Menu_%28SourceMod%29
- */	
-
-Groups
-{
-	"All"					"@all"
-	"Bots"					"@bots"
-	"Alive"					"@alive"
-	"Dead"					"@dead"
-	"Humans"				"@humans"
-	"Current aim"			"@aim"
-
-	/* You can enable these if you are using Counter-Strike Source and running the cstrike extension */
-//	"Terrorists"			"@t"
-//	"Counter-Terrorists"	"@ct"
-
-}

configs/admins_simple.ini

@@ -16,7 +16,7 @@
 //  "@Full Admins"
 //
 //	You can also specify immunity values.  Two examples:
-//	"83:abcdefgh"			//Immunity is 83, flags are abcdefgh
+//	"83:abcdefg"			//Immunity is 83, flags are abcefgh
 //	"6:@Full Admins"		//Immunity is 6, group is "Full Admins"
 //
 //	Immunity values can be any number.  An admin cannot target an admin with 
@@ -37,9 +37,9 @@
 ////////////////////////////////
 // Examples: (do not put // in front of real lines, as // means 'comment')
 //
-//   "STEAM_0:1:16"		"bce"				//generic, kick, unban for this steam ID, no immunity
+//   "STEAM_0:1:16"		"bce"				//kick, ban, slay for this steam ID, no immunity
 //   "!127.0.0.1"		"99:z"				//all permissions for this ip, immunity value is 99
-//   "BAILOPAN"			"abc"	"Gab3n"		//name BAILOPAN, password "Gab3n": gets reservation, generic, kick
+//   "BAILOPAN"			"abc"	"Gab3n"		//name BAILOPAN, password "Gab3n": gets reservation, kick, ban
 //
 ////////////////////////////////
  

configs/banreasons.txt

@@ -1,16 +0,0 @@
-"banreasons"
-{
-	"Abusive"			"Abusive"
-	"Racism"			"Racism"
-	"General cheating/exploits"	"General cheating/exploits"
-	"Wallhack"			"Wallhack"
-	"Aimbot"			"Aimbot"
-	"Speedhacking"			"Speedhacking"
-	"Mic spamming"			"Mic spamming"
-	"Admin disrespect"		"Admin disrespect"
-	"Camping"			"Camping"
-	"Team killing"			"Team killing"
-	"Unacceptable Spray"		"Unacceptable Spray"
-	"Breaking Server Rules"		"Breaking Server Rules"
-	"Other"				"Other"
-}

configs/cfg/sm_warmode_on.cfg

@@ -1,7 +1,6 @@
 //This file unloads all plugins, re-loads a few "safe" ones, and then prevents 
 //any more plugins from being loaded.
 sm plugins unload_all
-sm plugins load_unlock
 sm plugins load basebans.smx
 sm plugins load basecommands.smx
 sm plugins load admin-flatfile.smx

configs/cfg/sourcemod.cfg

@@ -80,21 +80,21 @@ sm_reserve_type 0
 sm_reserved_slots 0
 
 // Specifies whether or not reserved slots will be hidden (subtracted from max
-// slot count). Valid values are 0 (Visible) or 1 (Hidden).
+// slot count). Valid values are 0 (visible) or 1 (hidden).
 // --
 // Requires: reservedslots.smx
 // Default: 0
 sm_hide_slots 0
 
 // Specifies whether or not non-admins can send messages to admins using
-// say_team @<message>. Valid values are 0 (Disabled) or 1 (Enabled)
+// say_team @<message>. Valid values are 0 (disabled) or 1 (enabled)
 // --
 // Requires: basechat.smx
 // Default: 1
 sm_chat_mode 1
 
 // Specifies whether or not "timeleft" will automaticly be triggered every
-// x seconds. Valid values are 0 (Disabled) to 1800 seconds.
+// x seconds. Valid values are 0 (disabled) to 1800 seconds.
 // --
 // Requires: basetriggers.smx
 // Default: 0
@@ -105,30 +105,5 @@ sm_timeleft_interval 0
 // 1 (Enabled)
 // --
 // Requires: basetriggers.smx
-// Default: 0
-sm_trigger_show 0
-
-// Specifies whether or not to display vote progress to clients in the
-// "hint" box (near the bottom of the screen in most games).
-// Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_hintbox 0
-
-// Specifies whether or not to display vote progress to clients in the
-// chat area. Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_chat 0
-
-// Specifies whether or not to display vote progress in the server console.
-// Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_console 0
-
-// Specifies whether or not to display vote progress to clients in the
-// client console. Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_client_console 0
+// Default: 1
+sm_trigger_show 1

configs/core.cfg

@@ -4,6 +4,14 @@
  */
 "Core"
 {
+	/**
+	 * Relative path to SourceMod's base directory. This is relative to the game/mod directory.
+	 * Only change this if you have installed SourceMod in a non-default location.
+	 *
+	 * The default value is "addons/sourcemod"
+	 */
+	"BasePath"		"addons/sourcemod"
+	
 	/**
 	 * This option determines if SourceMod logging is enabled.
 	 *
@@ -80,57 +88,4 @@
 	 * "off"	- Translate using default server's language
 	 */
 	"AllowClLanguageVar"		"On"
-
-	/**
-	 * Enables or Disables SourceMod's automatic gamedata updating.
-	 *
-	 * The default value is "no". A value of "yes" will block the Auto Updater.
-	 */
-	"DisableAutoUpdate"			"no"
-
-	/**
-	 * If set to yes, a successful gamedata update will attempt to restart SourceMod.
-	 * SourceMod is unloaded and reloaded, and the map is changed to the current map.
-	 * Since gamedata updates occur when the server loads, impact should be minimal.
-	 * But to be safe, this option is disabled by default.
-	 */
-	"ForceRestartAfterUpdate"	"no"
-
-	/**
-	 * URL to use for retrieving update information.
-	 * SSL is not yet supported.
-	 */
-	"AutoUpdateURL"				"http://update.sourcemod.net/update/"
-
-	/**
-	 * Whether to show debug spew.  
-	 * Currently this will log details about the gamedata updating process.
-	 */
-	"DebugSpew"					"no"
-	
-	/**
-	 * If set to yes, SourceMod will validate steamid auth strings with the Steam backend before giving out admin access.
-	 * This can prevent malicious users from impersonating admins with stolen Steam apptickets.
-	 * If Steam is down, admins will not be authenticated until Steam comes back up.
-	 * This option increases the security of your server, but is still experimental.
-	 */
-	"SteamAuthstringValidation"	"yes"
-	
-	/**
-	 * Enables or disables whether SourceMod blocks known or potentially malicious plugins from loading.
-	 * It is STRONGLY advised that this is left enabled, there have been cases in the past with plugins that
-	 * allow anyone to delete files on the server, gain full rcon control, etc.
-	 *
-	 * "yes"	- Block malware or illegal plugins from loading (default)
-	 * "no"		- Warn about malware or illegal plugins loading
-	 */
-	"BlockBadPlugins"	"yes"
-
-	/**
-	 * If a plugin takes too long to execute, hanging or freezing the game server in the process, 
-	 * SourceMod will attempt to terminate that plugin after the specified timeout length has
-	 * passed. You can disable this feature by setting the value to "0".
-	 */
-	"SlowScriptTimeout"	"8"
 }
-

configs/databases.cfg

@@ -2,8 +2,6 @@
 {
 	"driver_default"		"mysql"
 	
-	// When specifying "host", you may use an IP address, a hostname, or a socket file path
-	
 	"default"
 	{
 		"driver"			"default"
@@ -20,15 +18,4 @@
 		"driver"			"sqlite"
 		"database"			"sourcemod-local"
 	}
-
-	"clientprefs"
-	{
-		"driver"			"sqlite"
-		"host"				"localhost"
-		"database"			"clientprefs-sqlite"
-		"user"				"root"
-		"pass"				""
-		//"timeout"			"0"
-		//"port"			"0"
-	}
 }

configs/languages.cfg

@@ -1,4 +1,6 @@
 "Languages"
 {
 	"en"			"English"
+	"es"			"Español"
 }
+

configs/maplists.cfg

@@ -51,8 +51,8 @@
 		"target"		"default"
 	}
 	
-	/* For the "nominations" plugin */
-	"nominations"
+	/* For the "randomcycle" plugin */
+	"rockthevote"
 	{
 		"target"		"default"
 	}

configs/plugin_settings.cfg

@@ -0,0 +1,38 @@
+/**
+ *   Each sub-section of "Plugins" should have a title which specifies a plugin filename.
+ * Filenames have a wildcard of *.  Appending .smx is not required.
+ * If the filename has no explicit path, it will be patched to any sub-path in the plugins folder.
+ *
+ *   Available properties for plugins are:
+ * "pause"			- Whether or not the plugin should load paused - "yes" or "no" (default)
+ * "lifetime"		- Lifetime of the plugin.  Options:
+ *		  "mapsync"	 - Plugins should be reloaded on mapchange if changed (default)
+ *		  "global"	 - Plugin will never be unloaded or updated
+ * "blockload" 		- Plugin will always be blocked from loading.  Implicit (automatic) loads 
+ *					  produce no error, but explicit (manual) loads will show an error message.
+ *					  (Options are one of "yes" or "no")
+ *
+ * You can also have an "Options" section declaring options to pass onto the JIT:
+ * "debug"		- Whether or not to load the plugin in debug mode
+ * "profile"	- Bit flags for profiling level.  Add flags together to reach a value.
+ *				  WARNING: Profiler is _ALPHA_ software!  Use it at your own risk for 
+ *				  development cycles only (not production setups).
+ *				  See the wiki article "SourceMod Profiler" for more information.
+ *				  1 - Profile natives
+ *				  2 - Profile callbacks
+ *				  4 - Profile internal plugin function calls
+ */
+	
+"Plugins"
+{
+	"*"
+	{
+		"pause"			"no"
+		"lifetime"		"mapsync"
+		
+		"Options"
+		{
+			"debug"		"no"
+		}
+	}
+}

configs/sql-init-scripts/mysql/clientprefs-mysql.sql

@@ -1,17 +0,0 @@
-CREATE TABLE sm_cookies
-(
-	id INTEGER unsigned NOT NULL auto_increment,
-	name varchar(30) NOT NULL UNIQUE,
-	description varchar(255),
-	access INTEGER,
-	PRIMARY KEY (id)
-);
-
-CREATE TABLE sm_cookie_cache
-(
-	player varchar(65) NOT NULL,
-	cookie_id int(10) NOT NULL,
-	value varchar(100),
-	timestamp int NOT NULL,
-	PRIMARY KEY (player, cookie_id)
-);

configs/sql-init-scripts/sqlite/clientprefs-sqlite.sql

@@ -1,16 +0,0 @@
-CREATE TABLE sm_cookies
-(
-	id INTEGER PRIMARY KEY AUTOINCREMENT,
-	name varchar(30) NOT NULL UNIQUE,
-	description varchar(255),
-	access INTEGER
-);
-
-CREATE TABLE sm_cookie_cache
-(
-	player varchar(65) NOT NULL,
-	cookie_id int(10) NOT NULL,
-	value varchar(100),
-	timestamp int,
-	PRIMARY KEY (player, cookie_id)
-);

configure.py

@@ -1,36 +0,0 @@
-# vim: set ts=2 sw=2 tw=99 noet:
-import sys
-try:
-	from ambuild2 import run
-except:
-	try:
-		import ambuild
-		sys.stderr.write('It looks like you have AMBuild 1 installed, but this project uses AMBuild 2.\n')
-		sys.stderr.write('Upgrade to the latest version of AMBuild to continue.\n')
-	except:
-		sys.stderr.write('AMBuild must be installed to build this project.\n')
-		sys.stderr.write('http://www.alliedmods.net/ambuild\n')
-	sys.exit(1)
-
-run = run.PrepareBuild(sourcePath=sys.path[0])
-run.default_build_folder = 'obj-' + run.target_platform
-run.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
-		                   help='Root search folder for HL2SDKs')
-run.options.add_option('--mysql-path', type=str, dest='mysql_path', default=None,
-		                   help='Path to MySQL 5')
-run.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
-                       help='Path to Metamod:Source')
-run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
-                       help='Enable debugging symbols')
-run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
-                       help='Enable optimization')
-run.options.add_option('--no-mysql', action='store_false', default=True, dest='hasMySql',
-                       help='Disable building MySQL extension')
-run.options.add_option('-s', '--sdks', default='all', dest='sdks',
-                       help='Build against specified SDKs; valid args are "all", "present", or '
-                            'comma-delimited list of engine names (default: %default)')
-run.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump',
-											 default=False, help='Dump and upload breakpad symbols')
-run.options.add_option('--disable-auto-versioning', action='store_true', dest='disable_auto_versioning',
-                       default=False, help='Disable the auto versioning script')
-run.Configure()

core/ADTFactory.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,6 +30,7 @@
  */
 
 #include "ADTFactory.h"
+#include "sm_globals.h"
 #include "ShareSys.h"
 
 ADTFactory g_AdtFactory;
@@ -56,30 +57,32 @@ IBasicTrie *ADTFactory::CreateBasicTrie()
 
 BaseTrie::BaseTrie()
 {
+	m_pTrie = sm_trie_create();
 }
 
 BaseTrie::~BaseTrie()
 {
+	sm_trie_destroy(m_pTrie);
 }
 
 bool BaseTrie::Insert(const char *key, void *value)
 {
-	return map_.insert(key, value);
+	return sm_trie_insert(m_pTrie, key, value);
 }
 
 bool BaseTrie::Retrieve(const char *key, void **value)
 {
-	return map_.retrieve(key, value);
+	return sm_trie_retrieve(m_pTrie, key, value);
 }
 
 bool BaseTrie::Delete(const char *key)
 {
-	return map_.remove(key);
+	return sm_trie_delete(m_pTrie, key);
 }
 
 void BaseTrie::Clear()
 {
-	map_.clear();
+	sm_trie_clear(m_pTrie);
 }
 
 void BaseTrie::Destroy()
@@ -89,5 +92,5 @@ void BaseTrie::Destroy()
 
 bool BaseTrie::Replace(const char *key, void *value)
 {
-	return map_.replace(key, value);
+	return sm_trie_replace(m_pTrie, key, value);
 }

core/ADTFactory.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,8 @@
 #define _INCLUDE_SOURCEMOD_ADTFACTORY_H_
 
 #include <IADTFactory.h>
-#include "common_logic.h"
-#include <sm_stringhashmap.h>
+#include "sm_globals.h"
+#include "sm_trie.h"
 
 using namespace SourceMod;
 
@@ -50,7 +50,7 @@ public:
 	virtual void Clear();
 	virtual void Destroy();
 private:
-	StringHashMap<void *> map_;
+	Trie *m_pTrie;
 };
 
 class ADTFactory : 

core/AMBuilder

@@ -1,118 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: 
-import os
-
-project = SM.HL2Project(builder, 'sourcemod')
-project.sources += [
-  'MenuStyle_Valve.cpp',
-  'logic_bridge.cpp',
-  'smn_entities.cpp',
-  'sm_stringutil.cpp',
-  'MenuVoting.cpp',
-  'smn_events.cpp',
-  'CDataPack.cpp',
-  'frame_hooks.cpp',
-  'smn_nextmap.cpp',
-  'sourcemm_api.cpp',
-  'ChatTriggers.cpp',
-  'smn_player.cpp',
-  'sourcemod.cpp',
-  'concmd_cleaner.cpp',
-  'HalfLife2.cpp',
-  'NextMap.cpp',
-  'ConCmdManager.cpp',
-  'ConVarManager.cpp',
-  'LibrarySys.cpp',
-  'PlayerManager.cpp',
-  'TimerSys.cpp',
-  'CoreConfig.cpp',
-  'Logger.cpp',
-  'smn_halflife.cpp',
-  'smn_console.cpp',
-  'UserMessages.cpp',
-  'MenuManager.cpp',
-  'smn_hudtext.cpp',
-  'smn_usermsgs.cpp',
-  'MenuStyle_Base.cpp',
-  'smn_keyvalues.cpp',
-  'smn_vector.cpp',
-  'EventManager.cpp',
-  'MenuStyle_Radio.cpp',
-  'sm_autonatives.cpp',
-  'sm_srvcmds.cpp',
-  'ConsoleDetours.cpp',
-  'vprof_tool.cpp',
-  'smn_commandline.cpp',
-]
-
-for sdk_name in SM.sdks:
-  sdk = SM.sdks[sdk_name]
-  binary_name = 'sourcemod.' + sdk.ext
-
-  binary = SM.HL2Config(project, binary_name, sdk)
-  compiler = binary.compiler
-
-  if sdk.name == 'csgo':
-    compiler.cxxincludes += [
-      os.path.join(sdk.path, 'common', 'protobuf-2.5.0', 'src'),
-      os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf')
-    ]
-  elif sdk.name == 'dota':
-    compiler.cxxincludes += [
-      os.path.join(sdk.path, 'common', 'protobuf-2.6.1', 'src'),
-      os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf')
-    ]
-
-  if builder.target_platform == 'linux':
-    compiler.postlink += ['-lpthread', '-lrt']
-
-  if sdk.name == 'csgo' or sdk.name == 'dota':
-    if builder.target_platform == 'linux':
-      lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a')
-    elif builder.target_platform == 'mac':
-      lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
-    elif builder.target_platform == 'windows':
-      msvc_ver = compiler.version
-      vs_year = ''
-      if msvc_ver == 1800:
-        vs_year = '2013'
-      elif msvc_ver == 1700:
-        vs_year = '2012'
-      elif msvc_ver == 1600:
-        vs_year = '2010'
-      else:
-        raise Exception('Cannot find libprotobuf for MSVC version "' + compiler.version + '"')
-
-      if 'DEBUG' in compiler.defines:
-        lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs' + vs_year, 'libprotobuf.lib')
-      else:
-        lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs' + vs_year, 'libprotobuf.lib')
-    compiler.linkflags.insert(0, binary.Dep(lib_path))
-  
-  if sdk.name in ['csgo', 'dota']:
-    binary.sources += ['smn_protobuf.cpp']
-  else:
-    binary.sources += ['smn_bitbuffer.cpp']
-
-  if sdk.name == 'csgo':
-    binary.sources += [
-      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
-    ]
-  elif sdk.name == 'dota':
-    binary.sources += [
-      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'networkbasetypes.pb.cc'),
-      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
-      os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'network_connection.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'ai_activity.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'protobuf', 'usermessages.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_commonmessages.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessages.pb.cc'),
-      os.path.join(sdk.path, 'public', 'game', 'shared', 'dota', 'protobuf', 'dota_usermessage_helpers.cpp'),
-    ]
-
-SM.binaries += builder.Add(project)
-

core/AdminCache.h

@@ -1,227 +1,201 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_SOURCEMOD_ADMINCACHE_H_
-#define _INCLUDE_SOURCEMOD_ADMINCACHE_H_
-
-#include "common_logic.h"
-#include <IAdminSystem.h>
-#include "sm_memtable.h"
-#include <sm_trie.h>
-#include <sh_list.h>
-#include <sh_string.h>
-#include <IForwardSys.h>
-#include <sm_stringhashmap.h>
-#include <sm_namehashset.h>
-
-using namespace SourceHook;
-
-#define GRP_MAGIC_SET		0xDEADFADE
-#define GRP_MAGIC_UNSET		0xFACEFACE
-#define USR_MAGIC_SET		0xDEADFACE
-#define USR_MAGIC_UNSET		0xFADEDEAD
-
-typedef StringHashMap<OverrideRule> OverrideMap;
-
-struct AdminGroup
-{
-	uint32_t magic;					/* Magic flag, for memory validation (ugh) */
-	unsigned int immunity_level;	/* Immunity level */
-	/* Immune from target table (-1 = nonexistent)
-	 * [0] = number of entries
-	 * [1...N] = immune targets
-	 */
-	int immune_table;			
-	OverrideMap *pCmdTable;			/* Command override table (can be NULL) */
-	OverrideMap *pCmdGrpTable;		/* Command group override table (can be NULL) */
-	int next_grp;					/* Next group in the chain */
-	int prev_grp;					/* Previous group in the chain */
-	int nameidx;					/* Name */
-	FlagBits addflags;				/* Additive flags */
-};
-
-struct AuthMethod
-{
-	String name;
-	StringHashMap<AdminId> identities;
-
-	AuthMethod(const char *name)
-		: name(name)
-	{
-	}
-
-	static inline bool matches(const char *name, const AuthMethod *method)
-	{
-		return strcmp(name, method->name.c_str()) == 0;
-	}
-};
-
-struct UserAuth
-{
-	unsigned int index;				/* Index into auth table */
-	int identidx;					/* Index into the string table */
-};
-
-struct AdminUser
-{
-	uint32_t magic;					/* Magic flag, for memory validation */
-	FlagBits flags;					/* Flags */
-	FlagBits eflags;				/* Effective flags */
-	int nameidx;					/* Name index */
-	int password;					/* Password index */
-	unsigned int grp_count;			/* Number of groups */
-	unsigned int grp_size;			/* Size of groups table */
-	int grp_table;					/* Group table itself */
-	int next_user;					/* Next user in the list */
-	int prev_user;					/* Previous user in the list */
-	UserAuth auth;					/* Auth method for this user */
-	unsigned int immunity_level;	/* Immunity level */
-	unsigned int serialchange;		/* Serial # for changes */
-};
-
-class AdminCache : 
-	public IAdminSystem,
-	public SMGlobalClass
-{
-public:
-	AdminCache();
-	~AdminCache();
-public: //SMGlobalClass
-	void OnSourceModStartup(bool late);
-	void OnSourceModAllInitialized();
-	void OnSourceModLevelChange(const char *mapName);
-	void OnSourceModShutdown();
-	void OnSourceModPluginsLoaded();
-public: //IAdminSystem
-	/** Command cache stuff */
-	void AddCommandOverride(const char *cmd, OverrideType type, FlagBits flags);
-	bool GetCommandOverride(const char *cmd, OverrideType type, FlagBits *flags);
-	void UnsetCommandOverride(const char *cmd, OverrideType type);
-	/** Group cache stuff */
-	GroupId AddGroup(const char *group_name);
-	GroupId FindGroupByName(const char *group_name);
-	void SetGroupAddFlag(GroupId id, AdminFlag flag, bool enabled);
-	bool GetGroupAddFlag(GroupId id, AdminFlag flag);
-	FlagBits GetGroupAddFlags(GroupId id);
-	void SetGroupGenericImmunity(GroupId id, ImmunityType type, bool enabled);
-	bool GetGroupGenericImmunity(GroupId id, ImmunityType type);
-	void InvalidateGroup(GroupId id);
-	void AddGroupImmunity(GroupId id, GroupId other_id);
-	unsigned int GetGroupImmunityCount(GroupId id);
-	GroupId GetGroupImmunity(GroupId id, unsigned int number);
-	void AddGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule rule);
-	bool GetGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule *pRule);
-	void DumpAdminCache(AdminCachePart part, bool rebuild);
-	void AddAdminListener(IAdminListener *pListener);
-	void RemoveAdminListener(IAdminListener *pListener);
-	/** User stuff */
-	void RegisterAuthIdentType(const char *name);
-	AdminId CreateAdmin(const char *name);
-	const char *GetAdminName(AdminId id);
-	bool BindAdminIdentity(AdminId id, const char *auth, const char *ident);
-	virtual void SetAdminFlag(AdminId id, AdminFlag flag, bool enabled);
-	bool GetAdminFlag(AdminId id, AdminFlag flag, AccessMode mode);
-	FlagBits GetAdminFlags(AdminId id, AccessMode mode);
-	bool AdminInheritGroup(AdminId id, GroupId gid);
-	unsigned int GetAdminGroupCount(AdminId id);
-	GroupId GetAdminGroup(AdminId id, unsigned int index, const char **name);
-	void SetAdminPassword(AdminId id, const char *password);
-	const char *GetAdminPassword(AdminId id);
-	AdminId FindAdminByIdentity(const char *auth, const char *identity);
-	bool InvalidateAdmin(AdminId id);
-	unsigned int FlagBitsToBitArray(FlagBits bits, bool array[], unsigned int maxSize);
-	FlagBits FlagBitArrayToBits(const bool array[], unsigned int maxSize);
-	FlagBits FlagArrayToBits(const AdminFlag array[], unsigned int numFlags);
-	unsigned int FlagBitsToArray(FlagBits bits, AdminFlag array[], unsigned int maxSize);
-	bool CheckAdminFlags(AdminId id, FlagBits bits);
-	bool CanAdminTarget(AdminId id, AdminId target);
-	void SetAdminFlags(AdminId id, AccessMode mode, FlagBits bits);
-	bool FindFlag(const char *str, AdminFlag *pFlag);
-	bool FindFlag(char c, AdminFlag *pAdmFlag);
-	FlagBits ReadFlagString(const char *flags, const char **end);
-	size_t FillFlagString(FlagBits bits, char *buffer, size_t maxlen);
-	unsigned int GetAdminSerialChange(AdminId id);
-	bool CanAdminUseCommand(int client, const char *cmd);
-	const char *GetGroupName(GroupId gid);
-	unsigned int SetGroupImmunityLevel(GroupId gid, unsigned int level);
-	unsigned int GetGroupImmunityLevel(GroupId gid);
-	unsigned int SetAdminImmunityLevel(AdminId id, unsigned int level);
-	unsigned int GetAdminImmunityLevel(AdminId id);
-	bool CheckAccess(int client, 
-		const char *cmd, 
-		FlagBits flags, 
-		bool override_only);
-	bool FindFlagChar(AdminFlag flag, char *c);
-	bool IsValidAdmin(AdminId id);
-	bool CheckClientCommandAccess(int client, const char *cmd, FlagBits cmdflags);
-public:
-	bool DumpCache(const char *filename);
-	AdminGroup *GetGroup(GroupId gid);
-	AdminUser *GetUser(AdminId id);
-	const char *GetString(int idx);
-	bool CheckAdminCommandAccess(AdminId adm, const char *cmd, FlagBits flags);
-private:
-	void _UnsetCommandOverride(const char *cmd);
-	void _UnsetCommandGroupOverride(const char *group);
-	void InvalidateGroupCache();
-	void InvalidateAdminCache(bool unlink_admins);
-	void DumpCommandOverrideCache(OverrideType type);
-	AuthMethod *GetMethodByIndex(unsigned int index);
-	bool GetMethodIndex(const char *name, unsigned int *_index);
-	const char *GetMethodName(unsigned int index);
-	void NameFlag(const char *str, AdminFlag flag);
-	bool GetUnifiedSteamIdentity(const char *ident, char *out, size_t maxlen);
-public:
-	typedef StringHashMap<FlagBits> FlagMap;
-
-	BaseStringTable *m_pStrings;
-	BaseMemTable *m_pMemory;
-	FlagMap m_CmdOverrides;
-	FlagMap m_CmdGrpOverrides;
-	int m_FirstGroup;
-	int m_LastGroup;
-	int m_FreeGroupList;
-	StringHashMap<GroupId> m_Groups;
-	List<IAdminListener *> m_hooks;
-	List<AuthMethod *> m_AuthMethods;
-	NameHashSet<AuthMethod *> m_AuthTables;
-	IForward *m_pCacheFwd;
-	int m_FirstUser;
-	int m_LastUser;
-	int m_FreeUserList;
-	bool m_InvalidatingAdmins;
-	bool m_destroying;
-	StringHashMap<AdminFlag> m_LevelNames;
-};
-
-extern AdminCache g_Admins;
-
-#endif //_INCLUDE_SOURCEMOD_ADMINCACHE_H_
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * 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 <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_ADMINCACHE_H_
+#define _INCLUDE_SOURCEMOD_ADMINCACHE_H_
+
+#include "sm_memtable.h"
+#include <sm_trie.h>
+#include <sh_list.h>
+#include <sh_string.h>
+#include <IAdminSystem.h>
+#include "sm_globals.h"
+#include <IForwardSys.h>
+
+using namespace SourceHook;
+
+#define GRP_MAGIC_SET		0xDEADFADE
+#define GRP_MAGIC_UNSET		0xFACEFACE
+#define USR_MAGIC_SET		0xDEADFACE
+#define USR_MAGIC_UNSET		0xFADEDEAD
+
+struct AdminGroup
+{
+	uint32_t magic;					/* Magic flag, for memory validation (ugh) */
+	unsigned int immunity_level;	/* Immunity level */
+	/* Immune from target table (-1 = nonexistent)
+	 * [0] = number of entries
+	 * [1...N] = immune targets
+	 */
+	int immune_table;			
+	Trie *pCmdTable;				/* Command override table (can be NULL) */
+	Trie *pCmdGrpTable;				/* Command group override table (can be NULL) */
+	int next_grp;					/* Next group in the chain */
+	int prev_grp;					/* Previous group in the chain */
+	int nameidx;					/* Name */
+	FlagBits addflags;				/* Additive flags */
+};
+
+struct AuthMethod
+{
+	String name;
+	Trie *table;
+};
+
+struct UserAuth
+{
+	unsigned int index;				/* Index into auth table */
+	int identidx;					/* Index into the string table */
+};
+
+struct AdminUser
+{
+	uint32_t magic;					/* Magic flag, for memory validation */
+	FlagBits flags;					/* Flags */
+	FlagBits eflags;				/* Effective flags */
+	int nameidx;					/* Name index */
+	int password;					/* Password index */
+	unsigned int grp_count;			/* Number of groups */
+	unsigned int grp_size;			/* Size of groups table */
+	int grp_table;					/* Group table itself */
+	int next_user;					/* Next user in the list */
+	int prev_user;					/* Previous user in the list */
+	UserAuth auth;					/* Auth method for this user */
+	unsigned int immunity_level;	/* Immunity level */
+	unsigned int serialchange;		/* Serial # for changes */
+};
+
+class AdminCache : 
+	public IAdminSystem,
+	public SMGlobalClass
+{
+public:
+	AdminCache();
+	~AdminCache();
+public: //SMGlobalClass
+	void OnSourceModStartup(bool late);
+	void OnSourceModAllInitialized();
+	void OnSourceModLevelChange(const char *mapName);
+	void OnSourceModShutdown();
+	void OnSourceModPluginsLoaded();
+public: //IAdminSystem
+	/** Command cache stuff */
+	void AddCommandOverride(const char *cmd, OverrideType type, FlagBits flags);
+	bool GetCommandOverride(const char *cmd, OverrideType type, FlagBits *flags);
+	void UnsetCommandOverride(const char *cmd, OverrideType type);
+	/** Group cache stuff */
+	GroupId AddGroup(const char *group_name);
+	GroupId FindGroupByName(const char *group_name);
+	void SetGroupAddFlag(GroupId id, AdminFlag flag, bool enabled);
+	bool GetGroupAddFlag(GroupId id, AdminFlag flag);
+	FlagBits GetGroupAddFlags(GroupId id);
+	void SetGroupGenericImmunity(GroupId id, ImmunityType type, bool enabled);
+	bool GetGroupGenericImmunity(GroupId id, ImmunityType type);
+	void InvalidateGroup(GroupId id);
+	void AddGroupImmunity(GroupId id, GroupId other_id);
+	unsigned int GetGroupImmunityCount(GroupId id);
+	GroupId GetGroupImmunity(GroupId id, unsigned int number);
+	void AddGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule rule);
+	bool GetGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule *pRule);
+	void DumpAdminCache(AdminCachePart part, bool rebuild);
+	void AddAdminListener(IAdminListener *pListener);
+	void RemoveAdminListener(IAdminListener *pListener);
+	/** User stuff */
+	void RegisterAuthIdentType(const char *name);
+	AdminId CreateAdmin(const char *name);
+	const char *GetAdminName(AdminId id);
+	bool BindAdminIdentity(AdminId id, const char *auth, const char *ident);
+	virtual void SetAdminFlag(AdminId id, AdminFlag flag, bool enabled);
+	bool GetAdminFlag(AdminId id, AdminFlag flag, AccessMode mode);
+	FlagBits GetAdminFlags(AdminId id, AccessMode mode);
+	bool AdminInheritGroup(AdminId id, GroupId gid);
+	unsigned int GetAdminGroupCount(AdminId id);
+	GroupId GetAdminGroup(AdminId id, unsigned int index, const char **name);
+	void SetAdminPassword(AdminId id, const char *password);
+	const char *GetAdminPassword(AdminId id);
+	AdminId FindAdminByIdentity(const char *auth, const char *identity);
+	bool InvalidateAdmin(AdminId id);
+	unsigned int FlagBitsToBitArray(FlagBits bits, bool array[], unsigned int maxSize);
+	FlagBits FlagBitArrayToBits(const bool array[], unsigned int maxSize);
+	FlagBits FlagArrayToBits(const AdminFlag array[], unsigned int numFlags);
+	unsigned int FlagBitsToArray(FlagBits bits, AdminFlag array[], unsigned int maxSize);
+	bool CheckAdminFlags(AdminId id, FlagBits bits);
+	bool CanAdminTarget(AdminId id, AdminId target);
+	void SetAdminFlags(AdminId id, AccessMode mode, FlagBits bits);
+	bool FindFlag(const char *str, AdminFlag *pFlag);
+	bool FindFlag(char c, AdminFlag *pAdmFlag);
+	FlagBits ReadFlagString(const char *flags, const char **end);
+	unsigned int GetAdminSerialChange(AdminId id);
+	bool CanAdminUseCommand(int client, const char *cmd);
+	const char *GetGroupName(GroupId gid);
+	unsigned int SetGroupImmunityLevel(GroupId gid, unsigned int level);
+	unsigned int GetGroupImmunityLevel(GroupId gid);
+	unsigned int SetAdminImmunityLevel(AdminId id, unsigned int level);
+	unsigned int GetAdminImmunityLevel(AdminId id);
+	bool CheckAccess(int client, 
+		const char *cmd, 
+		FlagBits flags, 
+		bool override_only);
+public:
+	bool IsValidAdmin(AdminId id);
+private:
+	void _UnsetCommandOverride(const char *cmd);
+	void _UnsetCommandGroupOverride(const char *group);
+	void InvalidateGroupCache();
+	void InvalidateAdminCache(bool unlink_admins);
+	void DumpCommandOverrideCache(OverrideType type);
+	Trie *GetMethodByIndex(unsigned int index);
+	bool GetMethodIndex(const char *name, unsigned int *_index);
+	void NameFlag(const char *str, AdminFlag flag);
+public:
+	BaseStringTable *m_pStrings;
+	BaseMemTable *m_pMemory;
+	Trie *m_pCmdOverrides;
+	Trie *m_pCmdGrpOverrides;
+	int m_FirstGroup;
+	int m_LastGroup;
+	int m_FreeGroupList;
+	Trie *m_pGroups;
+	List<IAdminListener *> m_hooks;
+	List<AuthMethod> m_AuthMethods;
+	Trie *m_pAuthTables;
+	IForward *m_pCacheFwd;
+	int m_FirstUser;
+	int m_LastUser;
+	int m_FreeUserList;
+	bool m_InvalidatingAdmins;
+	bool m_destroying;
+	Trie *m_pLevelNames;
+};
+
+extern AdminCache g_Admins;
+
+#endif //_INCLUDE_SOURCEMOD_ADMINCACHE_H_

core/CDataPack.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -29,7 +29,7 @@
  * Version: $Id$
  */
 
-#include <stdlib.h>
+#include <malloc.h>
 #include <string.h>
 #include "CDataPack.h"
 
@@ -76,12 +76,9 @@ void CDataPack::ResetSize()
 
 size_t CDataPack::CreateMemory(size_t size, void **addr)
 {
-	CheckSize(sizeof(char) + sizeof(size_t) + size);
+	CheckSize(sizeof(size_t) + size);
 	size_t pos = m_curptr - m_pBase;
 
-	*(char *)m_curptr = Raw;
-	m_curptr += sizeof(char);
-
 	*(size_t *)m_curptr = size;
 	m_curptr += sizeof(size_t);
 
@@ -91,17 +88,14 @@ size_t CDataPack::CreateMemory(size_t size, void **addr)
 	}
 
 	m_curptr += size;
-	m_size += sizeof(char) + sizeof(size_t) + size;
+	m_size += sizeof(size_t) + size;
 
 	return pos;
 }
 
 void CDataPack::PackCell(cell_t cell)
 {
-	CheckSize(sizeof(char) + sizeof(size_t) + sizeof(cell_t));
-
-	*(char *)m_curptr = Cell;
-	m_curptr += sizeof(char);
+	CheckSize(sizeof(size_t) + sizeof(cell_t));
 
 	*(size_t *)m_curptr = sizeof(cell_t);
 	m_curptr += sizeof(size_t);
@@ -109,15 +103,12 @@ void CDataPack::PackCell(cell_t cell)
 	*(cell_t *)m_curptr = cell;
 	m_curptr += sizeof(cell_t);
 
-	m_size += sizeof(char) + sizeof(size_t) + sizeof(cell_t);
+	m_size += sizeof(size_t) + sizeof(cell_t);
 }
 
 void CDataPack::PackFloat(float val)
 {
-	CheckSize(sizeof(char) + sizeof(size_t) + sizeof(float));
-
-	*(char *)m_curptr = Float;
-	m_curptr += sizeof(char);
+	CheckSize(sizeof(size_t) + sizeof(float));
 
 	*(size_t *)m_curptr = sizeof(float);
 	m_curptr += sizeof(size_t);
@@ -125,18 +116,15 @@ void CDataPack::PackFloat(float val)
 	*(float *)m_curptr = val;
 	m_curptr += sizeof(float);
 
-	m_size += sizeof(char) + sizeof(size_t) + sizeof(float);
+	m_size += sizeof(size_t) + sizeof(float);
 }
 
 void CDataPack::PackString(const char *string)
 {
 	size_t len = strlen(string);
-	size_t maxsize = sizeof(char) + sizeof(size_t) + len + 1;
+	size_t maxsize = sizeof(size_t) + len + 1;
 	CheckSize(maxsize);
 
-	*(char *)m_curptr = String;
-	m_curptr += sizeof(char);
-
 	// Pack the string length first for buffer overrun checking.
 	*(size_t *)m_curptr = len;
 	m_curptr += sizeof(size_t);
@@ -172,16 +160,10 @@ bool CDataPack::SetPosition(size_t pos) const
 
 cell_t CDataPack::ReadCell() const
 {
-	if (!IsReadable(sizeof(char) + sizeof(size_t) + sizeof(cell_t)))
+	if (!IsReadable(sizeof(size_t) + sizeof(cell_t)))
 	{
 		return 0;
 	}
-	if (*reinterpret_cast<char *>(m_curptr) != Cell)
-	{
-		return 0;
-	}
-	m_curptr += sizeof(char);
-
 	if (*reinterpret_cast<size_t *>(m_curptr) != sizeof(cell_t))
 	{
 		return 0;
@@ -196,16 +178,10 @@ cell_t CDataPack::ReadCell() const
 
 float CDataPack::ReadFloat() const
 {
-	if (!IsReadable(sizeof(char) + sizeof(size_t) + sizeof(float)))
+	if (!IsReadable(sizeof(size_t) + sizeof(float)))
 	{
 		return 0;
 	}
-	if (*reinterpret_cast<char *>(m_curptr) != Float)
-	{
-		return 0;
-	}
-	m_curptr += sizeof(char);
-
 	if (*reinterpret_cast<size_t *>(m_curptr) != sizeof(float))
 	{
 		return 0;
@@ -225,15 +201,10 @@ bool CDataPack::IsReadable(size_t bytes) const
 
 const char *CDataPack::ReadString(size_t *len) const
 {
-	if (!IsReadable(sizeof(char) + sizeof(size_t)))
+	if (!IsReadable(sizeof(size_t)))
 	{
 		return NULL;
 	}
-	if (*reinterpret_cast<char *>(m_curptr) != String)
-	{
-		return NULL;
-	}
-	m_curptr += sizeof(char);
 
 	size_t real_len = *(size_t *)m_curptr;
 
@@ -266,11 +237,6 @@ void *CDataPack::ReadMemory(size_t *size) const
 	{
 		return NULL;
 	}
-	if (*reinterpret_cast<char *>(m_curptr) != Raw)
-	{
-		return NULL;
-	}
-	m_curptr += sizeof(char);
 
 	size_t bytecount = *(size_t *)m_curptr;
 	m_curptr += sizeof(size_t);
@@ -291,43 +257,3 @@ void *CDataPack::ReadMemory(size_t *size) const
 
 	return ptr;
 }
-
-void CDataPack::PackFunction(cell_t function)
-{
-	CheckSize(sizeof(char) + sizeof(size_t) + sizeof(cell_t));
-
-	*(char *)m_curptr = Function;
-	m_curptr += sizeof(char);
-
-	*(size_t *)m_curptr = sizeof(cell_t);
-	m_curptr += sizeof(size_t);
-
-	*(cell_t *)m_curptr = function;
-	m_curptr += sizeof(cell_t);
-
-	m_size += sizeof(char) + sizeof(size_t) + sizeof(cell_t);
-}
-
-cell_t CDataPack::ReadFunction() const
-{
-	if (!IsReadable(sizeof(char) + sizeof(size_t) + sizeof(cell_t)))
-	{
-		return 0;
-	}
-	if (*reinterpret_cast<char *>(m_curptr) != Function)
-	{
-		return 0;
-	}
-	m_curptr += sizeof(char);
-
-	if (*reinterpret_cast<size_t *>(m_curptr) != sizeof(cell_t))
-	{
-		return 0;
-	}
-
-	m_curptr += sizeof(size_t);
-
-	cell_t val = *reinterpret_cast<cell_t *>(m_curptr);
-	m_curptr += sizeof(cell_t);
-	return val;
-}

core/CDataPack.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -51,14 +51,12 @@ public: //IDataReader
 	const char *ReadString(size_t *len) const;
 	void *GetMemory() const;
 	void *ReadMemory(size_t *size) const;
-	cell_t ReadFunction() const;
 public: //IDataPack
 	void ResetSize();
 	void PackCell(cell_t cell);
 	void PackFloat(float val);
 	void PackString(const char *string);
 	size_t CreateMemory(size_t size, void **addr);
-	void PackFunction(cell_t function);
 public:
 	void Initialize();
 private:
@@ -68,14 +66,6 @@ private:
 	mutable char *m_curptr;
 	size_t m_capacity;
 	size_t m_size;
-
-	enum DataPackType {
-		Raw,
-		Cell,
-		Float,
-		String,
-		Function
-	};
 };
 
 #endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_

core/CellArray.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -29,10 +29,7 @@
  * Version: $Id$
  */
 
-#ifndef _INCLUDE_SOURCEMOD_CELLARRAY_H_
-#define _INCLUDE_SOURCEMOD_CELLARRAY_H_
-
-#include <stdlib.h>
+#include <malloc.h>
 #include <string.h>
 
 extern HandleType_t htCellArray;
@@ -43,17 +40,14 @@ public:
 	CellArray(size_t blocksize) : m_Data(NULL), m_BlockSize(blocksize), m_AllocSize(0), m_Size(0)
 	{
 	}
-
 	~CellArray()
 	{
 		free(m_Data);
 	}
-
 	size_t size() const
 	{
 		return m_Size;
 	}
-
 	cell_t *push()
 	{
 		if (!GrowIfNeeded(1))
@@ -64,22 +58,18 @@ public:
 		m_Size++;
 		return arr;
 	}
-
 	cell_t *at(size_t b) const
 	{
 		return &m_Data[b * m_BlockSize];
 	}
-
 	size_t blocksize() const
 	{
 		return m_BlockSize;
 	}
-
 	void clear()
 	{
 		m_Size = 0;
 	}
-
 	bool swap(size_t item1, size_t item2)
 	{
 		/* Make sure there is extra space available */
@@ -100,7 +90,6 @@ public:
 
 		return true;
 	}
-
 	void remove(size_t index)
 	{
 		/* If we're at the end, take the easy way out */
@@ -118,7 +107,6 @@ public:
 
 		m_Size--;
 	}
-
 	cell_t *insert_at(size_t index)
 	{
 		/* Make sure it'll fit */
@@ -136,7 +124,6 @@ public:
 
 		return src;
 	}
-
 	bool resize(size_t count)
 	{
 		if (count <= m_Size)
@@ -145,7 +132,7 @@ public:
 			return true;
 		}
 
-		if (!GrowIfNeeded(count - m_Size))
+		if(!GrowIfNeeded(count - m_Size))
 		{
 			return false;
 		}
@@ -207,6 +194,3 @@ private:
 	size_t m_AllocSize;
 	size_t m_Size;
 };
-
-#endif /* _INCLUDE_SOURCEMOD_CELLARRAY_H_ */
-

core/CellRecipientFilter.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -44,11 +44,7 @@ public: //IRecipientFilter
 	bool IsReliable() const;
 	bool IsInitMessage() const;
 	int GetRecipientCount() const;
-#if SOURCE_ENGINE == SE_DOTA
-	CEntityIndex GetRecipientIndex(int slot) const;
-#else
 	int GetRecipientIndex(int slot) const;
-#endif
 public:
 	void Initialize(const cell_t *ptr, size_t count);
 	void SetToReliable(bool isreliable);
@@ -83,27 +79,13 @@ inline int CellRecipientFilter::GetRecipientCount() const
 	return m_Size;
 }
 
-#if SOURCE_ENGINE == SE_DOTA
-inline CEntityIndex CellRecipientFilter::GetRecipientIndex(int slot) const
-#else
 inline int CellRecipientFilter::GetRecipientIndex(int slot) const
-#endif
 {
-	int ret;
 	if ((slot < 0) || (slot >= GetRecipientCount()))
 	{
-		ret = -1;
+		return -1;
 	}
-	else
-	{
-		ret = static_cast<int>(m_Players[slot]);
-	}
-
-#if SOURCE_ENGINE == SE_DOTA
-	return CEntityIndex(ret);
-#else
-	return ret;
-#endif
+	return static_cast<int>(m_Players[slot]);
 }
 
 inline void CellRecipientFilter::SetToInit(bool isinitmsg)

core/ChatTriggers.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,40 +34,39 @@
 #include "sm_stringutil.h"
 #include "ConCmdManager.h"
 #include "PlayerManager.h"
+#include "Translator.h"
 #include "HalfLife2.h"
-#include "logic_bridge.h"
-#include "sourcemod.h"
 
-#if SOURCE_ENGINE == SE_DOTA
-SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommandContext &, const CCommand &);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
-#elif SOURCE_ENGINE == SE_DARKMESSIAH
-SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+/* :HACKHACK: We can't SH_DECL here because ConCmdManager.cpp does.
+ * While the OB build only runs on MM:S 1.6.0+ (SH 5+), the older one 
+ * can technically be compiled against any MM:S version after 1.4.2.
+ */
+#if defined ORANGEBOX_BUILD
+extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
+extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate1<const CCommand &, void>);
 #else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-#endif
+extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+#if SH_IMPL_VERSION >= 5
+extern int __SourceHook_FHAddConCommandDispatch(void *, ISourceHook::AddHookMode, bool, class fastdelegate::FastDelegate0<void>);
+#elif SH_IMPL_VERSION == 4
+extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+#elif SH_IMPL_VERSION == 3
+extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+#endif //SH_IMPL_VERSION
+#endif //ORANGEBOX_BUILD
 
 ChatTriggers g_ChatTriggers;
 bool g_bSupressSilentFails = false;
+CPhraseFile *g_pFloodPhrases = NULL;
 
 ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), 
-	m_ReplyTo(SM_REPLY_CONSOLE), m_ArgSBackup(NULL)
+	m_bTriggerWasSilent(false), m_ReplyTo(SM_REPLY_CONSOLE)
 {
 	m_PubTrigger = sm_strdup("!");
 	m_PrivTrigger = sm_strdup("/");
 	m_PubTriggerSize = 1;
 	m_PrivTriggerSize = 1;
 	m_bIsChatTrigger = false;
-	m_bPluginIgnored = true;
-#if SOURCE_ENGINE == SE_EPISODEONE
-	m_bIsINS = false;
-#endif
 }
 
 ChatTriggers::~ChatTriggers()
@@ -76,8 +75,6 @@ ChatTriggers::~ChatTriggers()
 	m_PubTrigger = NULL;
 	delete [] m_PrivTrigger;
 	m_PrivTrigger = NULL;
-	delete [] m_ArgSBackup;
-	m_ArgSBackup = NULL;
 }
 
 ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, 
@@ -111,94 +108,76 @@ ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key,
 
 void ChatTriggers::OnSourceModAllInitialized()
 {
-	m_pShouldFloodBlock = forwardsys->CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
-	m_pDidFloodBlock = forwardsys->CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
-	m_pOnClientSayCmd = forwardsys->CreateForward("OnClientSayCommand", ET_Event, 3, NULL, Param_Cell, Param_String, Param_String);
-	m_pOnClientSayCmd_Post = forwardsys->CreateForward("OnClientSayCommand_Post", ET_Ignore, 3, NULL, Param_Cell, Param_String, Param_String);
+	m_pShouldFloodBlock = g_Forwards.CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
+	m_pDidFloodBlock = g_Forwards.CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
 }
 
 void ChatTriggers::OnSourceModAllInitialized_Post()
 {
-	logicore.AddCorePhraseFile("antiflood.phrases");
+	unsigned int file_id;
+	
+	file_id = g_Translator.FindOrAddPhraseFile("antiflood.phrases.txt");
+	g_pFloodPhrases = g_Translator.GetFileByIndex(file_id);
 }
 
 void ChatTriggers::OnSourceModGameInitialized()
 {
-	m_pSayCmd = FindCommand("say");
-	m_pSayTeamCmd = FindCommand("say_team");
+	unsigned int total = 2;
+	ConCommandBase *pCmd = icvar->GetCommands();
+	const char *name;
+	while (pCmd)
+	{
+		if (pCmd->IsCommand())
+		{
+			name = pCmd->GetName();
+			if (!m_pSayCmd && strcmp(name, "say") == 0)
+			{
+				m_pSayCmd = (ConCommand *)pCmd;
+				if (--total == 0)
+				{
+					break;
+				}
+			} else if (!m_pSayTeamCmd && strcmp(name, "say_team") == 0) {
+				m_pSayTeamCmd = (ConCommand *)pCmd;
+				if (--total == 0)
+				{
+					break;
+				}
+			}
+		}
+		pCmd = const_cast<ConCommandBase *>(pCmd->GetNext());
+	}
 
 	if (m_pSayCmd)
 	{
-		SH_ADD_HOOK(ConCommand, Dispatch, m_pSayCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-		SH_ADD_HOOK(ConCommand, Dispatch, m_pSayCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+		SH_ADD_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
+		SH_ADD_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Post, true);
 	}
 	if (m_pSayTeamCmd)
 	{
-		SH_ADD_HOOK(ConCommand, Dispatch, m_pSayTeamCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-		SH_ADD_HOOK(ConCommand, Dispatch, m_pSayTeamCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
+		SH_ADD_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
+		SH_ADD_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Post, true);
 	}
-
-#if SOURCE_ENGINE == SE_EPISODEONE
-	m_bIsINS = (strcmp(g_SourceMod.GetGameFolderName(), "insurgency") == 0);
-
-	if (m_bIsINS)
-	{
-		m_pSay2Cmd = FindCommand("say2");
-		if (m_pSay2Cmd)
-		{
-			SH_ADD_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-			SH_ADD_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
-		}
-	}
-#elif SOURCE_ENGINE == SE_NUCLEARDAWN
-	m_pSaySquadCmd = FindCommand("say_squad");
-
-	if (m_pSaySquadCmd)
-	{
-		SH_ADD_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-		SH_ADD_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
-	}
-#endif
 }
 
 void ChatTriggers::OnSourceModShutdown()
 {
-	if (m_pSayCmd)
-	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSayCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSayCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-	}
-
 	if (m_pSayTeamCmd)
 	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSayTeamCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSayTeamCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
+		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Post, true);
+		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
+	}
+	if (m_pSayCmd)
+	{
+		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Post, true);
+		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
 	}
 
-#if SOURCE_ENGINE == SE_EPISODEONE
-	if (m_bIsINS && m_pSay2Cmd)
-	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSay2Cmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
-	}
-#elif SOURCE_ENGINE == SE_NUCLEARDAWN
-	if (m_pSaySquadCmd)
-	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Pre), false);
-		SH_REMOVE_HOOK(ConCommand, Dispatch, m_pSaySquadCmd, SH_MEMBER(this, &ChatTriggers::OnSayCommand_Post), true);
-	}
-#endif
-
-	forwardsys->ReleaseForward(m_pShouldFloodBlock);
-	forwardsys->ReleaseForward(m_pDidFloodBlock);
-	forwardsys->ReleaseForward(m_pOnClientSayCmd);
-	forwardsys->ReleaseForward(m_pOnClientSayCmd_Post);
+	g_Forwards.ReleaseForward(m_pShouldFloodBlock);
+	g_Forwards.ReleaseForward(m_pDidFloodBlock);
 }
 
-#if SOURCE_ENGINE == SE_DOTA
-void ChatTriggers::OnSayCommand_Pre(const CCommandContext &context, const CCommand &command)
-{
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void ChatTriggers::OnSayCommand_Pre(const CCommand &command)
 {
 #else
@@ -206,95 +185,28 @@ void ChatTriggers::OnSayCommand_Pre()
 {
 	CCommand command;
 #endif
-	int client = g_ConCmds.GetCommandClient();
+	int client;
+	CPlayer *pPlayer;
+	
+	client = g_ConCmds.GetCommandClient();
 	m_bIsChatTrigger = false;
 	m_bWasFloodedMessage = false;
-	m_bPluginIgnored = true;
-
-	const char *args = command.ArgS();
-
-	if (!args)
-	{
-		RETURN_META(MRES_IGNORED);
-	}
-
-	/* Save these off for post hook as the command data returned from the engine in older engine versions 
-	 * can be NULL, despite the data still being there and valid. */
-	m_Arg0Backup = command.Arg(0);
-	size_t len = strlen(args);
-
-#if SOURCE_ENGINE == SE_EPISODEONE
-	if (m_bIsINS)
-	{
-		if (strcmp(m_Arg0Backup, "say2") == 0 && len >= 4)
-		{
-			args += 4;
-			len -= 4;
-		}
-
-		if (len == 0)
-		{
-			RETURN_META(MRES_SUPERCEDE);
-		}
-	}
-#endif
-
-	/* The first pair of quotes are stripped from client say commands, but not console ones.
-	 * We do not want the forwards to differ from what is displayed.
-	 * So only strip the first pair of quotes from client say commands. */
-	bool is_quoted = false;
-
-	if (
-#if SOURCE_ENGINE == SE_EPISODEONE
-		!m_bIsINS && 
-#endif
-		client != 0 && args[0] == '"' && args[len-1] == '"')
-	{
-		/* The server normally won't display empty say commands, but in this case it does.
-		 * I don't think it's desired so let's block it. */
-		if (len <= 2)
-		{
-			RETURN_META(MRES_SUPERCEDE);
-		}
-
-		args++;
-		len--;
-		is_quoted = true;
-	}
-
-	/* Some? engines strip the last quote when printing the string to chat.
-	 * This results in having a double-quoted message passed to the OnClientSayCommand ("message") forward,
-	 * but losing the last quote in the OnClientSayCommand_Post ("message) forward.
-	 * To compensate this, we copy the args into our own buffer where the engine won't mess with
-	 * and strip the quotes. */
-	delete [] m_ArgSBackup;
-	m_ArgSBackup = new char[CCommand::MaxCommandLength()+1];
-	memcpy(m_ArgSBackup, args, len+1);
-
-	/* Strip the quotes from the argument */
-	if (is_quoted)
-	{
-		if (m_ArgSBackup[len-1] == '"')
-		{
-			m_ArgSBackup[--len] = '\0';
-		}
-	}
 
 	/* The server console cannot do this */
-	if (client == 0)
+	if (client == 0 || (pPlayer = g_Players.GetPlayerByIndex(client)) == NULL)
 	{
-		if (CallOnClientSayCommand(client) >= Pl_Handled)
-		{
-			RETURN_META(MRES_SUPERCEDE);
-		}
-
 		RETURN_META(MRES_IGNORED);
 	}
 
-	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
-
 	/* We guarantee the client is connected */
-	if (!pPlayer || !pPlayer->IsConnected())
+	if (!pPlayer->IsConnected())
+	{
+		RETURN_META(MRES_IGNORED);
+	}
+
+	const char *args = command.ArgS();
+	
+	if (!args)
 	{
 		RETURN_META(MRES_IGNORED);
 	}
@@ -304,8 +216,18 @@ void ChatTriggers::OnSayCommand_Pre()
 	{
 		char buffer[128];
 
-		if (!logicore.CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "Flooding the server", &client))
+		/* :TODO: log an error? */
+		if (g_Translator.CoreTransEx(g_pFloodPhrases, 
+			client, 
+			buffer, 
+			sizeof(buffer),
+			"Flooding the server",
+			NULL,
+			NULL)
+			!= Trans_Okay)
+		{
 			UTIL_Format(buffer, sizeof(buffer), "You are flooding the server!");
+		}
 
 		/* :TODO: we should probably kick people who spam too much. */
 
@@ -318,41 +240,62 @@ void ChatTriggers::OnSayCommand_Pre()
 		RETURN_META(MRES_SUPERCEDE);
 	}
 
+	/* Handle quoted string sets */
+	bool is_quoted = false;
+	if (args[0] == '"')
+	{
+		args++;
+		is_quoted = true;
+	}
+
 	bool is_trigger = false;
 	bool is_silent = false;
 
 	/* Check for either trigger */
-	if (m_PubTriggerSize && strncmp(m_ArgSBackup, m_PubTrigger, m_PubTriggerSize) == 0)
+	if (m_PubTriggerSize && strncmp(args, m_PubTrigger, m_PubTriggerSize) == 0)
 	{
 		is_trigger = true;
-		args = &m_ArgSBackup[m_PubTriggerSize];
+		args = &args[m_PubTriggerSize];
 	} 
-	else if (m_PrivTriggerSize && strncmp(m_ArgSBackup, m_PrivTrigger, m_PrivTriggerSize) == 0) 
+	else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) 
 	{
 		is_trigger = true;
 		is_silent = true;
-		args = &m_ArgSBackup[m_PrivTriggerSize];
+		args = &args[m_PrivTriggerSize];
+	}
+
+	if (!is_trigger)
+	{
+		RETURN_META(MRES_IGNORED);
 	}
 
 	/**
 	 * Test if this is actually a command!
 	 */
-	if (is_trigger && PreProcessTrigger(PEntityOfEntIndex(client), args))
+	if (!PreProcessTrigger(engine->PEntityOfEntIndex(client), args, is_quoted))
 	{
-		m_bIsChatTrigger = true;
-
-		/**
-		 * We'll execute it in post.
-		 */
-		m_bWillProcessInPost = true;
+		CPlayer *pPlayer;
+		if (is_silent 
+			&& g_bSupressSilentFails 
+			&& client != 0
+			&& (pPlayer = g_Players.GetPlayerByIndex(client)) != NULL
+			&& pPlayer->GetAdminId() != INVALID_ADMIN_ID)
+		{
+			RETURN_META(MRES_SUPERCEDE);
+		}
+		RETURN_META(MRES_IGNORED);
 	}
 
-	if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)))
-	{
-		RETURN_META(MRES_SUPERCEDE);
-	}
+	m_bIsChatTrigger = true;
 
-	if (CallOnClientSayCommand(client) >= Pl_Handled)
+	/**
+	 * We'll execute it in post.
+	 */
+	m_bWillProcessInPost = true;
+	m_bTriggerWasSilent = is_silent;
+
+	/* If we're silent, block */
+	if (is_silent)
 	{
 		RETURN_META(MRES_SUPERCEDE);
 	}
@@ -361,44 +304,28 @@ void ChatTriggers::OnSayCommand_Pre()
 	RETURN_META(MRES_IGNORED);
 }
 
-#if SOURCE_ENGINE == SE_DOTA
-void ChatTriggers::OnSayCommand_Post(const CCommandContext &context, const CCommand &command)
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void ChatTriggers::OnSayCommand_Post(const CCommand &command)
 #else
 void ChatTriggers::OnSayCommand_Post()
 #endif
 {
-	int client = g_ConCmds.GetCommandClient();
-
+	m_bIsChatTrigger = false;
+	m_bWasFloodedMessage = false;
 	if (m_bWillProcessInPost)
 	{
 		/* Reset this for re-entrancy */
 		m_bWillProcessInPost = false;
-
+		
 		/* Execute the cached command */
+		int client = g_ConCmds.GetCommandClient();
 		unsigned int old = SetReplyTo(SM_REPLY_CHAT);
-#if SOURCE_ENGINE == SE_DOTA
-		engine->ClientCommand(client, "%s", m_ToExecute);
-#else
-		serverpluginhelpers->ClientCommand(PEntityOfEntIndex(client), m_ToExecute);
-#endif
+		serverpluginhelpers->ClientCommand(engine->PEntityOfEntIndex(client), m_ToExecute);
 		SetReplyTo(old);
 	}
-
-	if (!m_bPluginIgnored && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
-	{
-		m_pOnClientSayCmd_Post->PushCell(client);
-		m_pOnClientSayCmd_Post->PushString(m_Arg0Backup);
-		m_pOnClientSayCmd_Post->PushString(m_ArgSBackup);
-		m_pOnClientSayCmd_Post->Execute(NULL);
-	}
-
-	m_bIsChatTrigger = false;
-	m_bWasFloodedMessage = false;
 }
 
-bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
+bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted)
 {
 	/* Extract a command.  This is kind of sloppy. */
 	char cmd_buf[64];
@@ -440,12 +367,12 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
 		{
 			return false;
 		}
-
+		
 		prepended = true;
 	}
 
 	/* See if we need to do extra string manipulation */
-	if (prepended)
+	if (is_quoted || prepended)
 	{
 		size_t len;
 
@@ -456,6 +383,15 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
 		} else {
 			len = strncopy(m_ToExecute, args, sizeof(m_ToExecute));
 		}
+		
+		/* Check if we need to strip a quote */
+		if (is_quoted)
+		{
+			if (m_ToExecute[len-1] == '"')
+			{
+				m_ToExecute[--len] = '\0';
+			}
+		}
 	} else {
 		strncopy(m_ToExecute, args, sizeof(m_ToExecute));
 	}
@@ -463,22 +399,6 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
 	return true;
 }
 
-cell_t ChatTriggers::CallOnClientSayCommand(int client)
-{
-	cell_t res = Pl_Continue;
-	if (m_pOnClientSayCmd->GetFunctionCount() != 0)
-	{
-		m_pOnClientSayCmd->PushCell(client);
-		m_pOnClientSayCmd->PushString(m_Arg0Backup);
-		m_pOnClientSayCmd->PushString(m_ArgSBackup);
-		m_pOnClientSayCmd->Execute(&res);
-	}
-
-	m_bPluginIgnored = (res >= Pl_Stop);
-
-	return res;
-}
-
 unsigned int ChatTriggers::SetReplyTo(unsigned int reply)
 {
 	unsigned int old = m_ReplyTo;

core/ChatTriggers.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -54,10 +54,7 @@ public: //SMGlobalClass
 		char *error, 
 		size_t maxlength);
 private: //ConCommand
-#if SOURCE_ENGINE == SE_DOTA
-	void OnSayCommand_Pre(const CCommandContext &, const CCommand &command);
-	void OnSayCommand_Post(const CCommandContext &, const CCommand &command);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 	void OnSayCommand_Pre(const CCommand &command);
 	void OnSayCommand_Post(const CCommand &command);
 #else
@@ -70,36 +67,23 @@ public:
 	bool IsChatTrigger();
 	bool WasFloodedMessage();
 private:
-	bool PreProcessTrigger(edict_t *pEdict, const char *args);
+	bool PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted);
 	bool ClientIsFlooding(int client);
-	cell_t CallOnClientSayCommand(int client);
 private:
 	ConCommand *m_pSayCmd;
 	ConCommand *m_pSayTeamCmd;
-#if SOURCE_ENGINE == SE_EPISODEONE
-	ConCommand *m_pSay2Cmd;
-#elif SOURCE_ENGINE == SE_NUCLEARDAWN
-	ConCommand *m_pSaySquadCmd;
-#endif
 	char *m_PubTrigger;
 	size_t m_PubTriggerSize;
 	char *m_PrivTrigger;
 	size_t m_PrivTriggerSize;
 	bool m_bWillProcessInPost;
+	bool m_bTriggerWasSilent;
 	bool m_bIsChatTrigger;
 	bool m_bWasFloodedMessage;
-	bool m_bPluginIgnored;
 	unsigned int m_ReplyTo;
 	char m_ToExecute[300];
-	const char *m_Arg0Backup;
-	char *m_ArgSBackup;
 	IForward *m_pShouldFloodBlock;
 	IForward *m_pDidFloodBlock;
-	IForward *m_pOnClientSayCmd;
-	IForward *m_pOnClientSayCmd_Post;
-#if SOURCE_ENGINE == SE_EPISODEONE
-	bool m_bIsINS;
-#endif
 };
 
 extern ChatTriggers g_ChatTriggers;

core/ConCmdManager.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,90 +34,71 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include <IForwardSys.h>
+#include "ForwardSys.h"
+#include "sm_trie.h"
+#include "sm_memtable.h"
 #include <sh_list.h>
 #include <sh_string.h>
 #include <IRootConsoleMenu.h>
 #include <IAdminSystem.h>
 #include "concmd_cleaner.h"
-#include <sm_stringhashmap.h>
-#include <am-utility.h>
-#include <am-inlinelist.h>
-#include <am-linkedlist.h>
-#include <am-refcounting.h>
 
 using namespace SourceHook;
 
-struct CmdHook;
-struct ConCmdInfo;
-
-struct CommandGroup : public ke::Refcounted<CommandGroup>
+enum CmdType
 {
-	ke::LinkedList<CmdHook *> hooks;
+	Cmd_Server,
+	Cmd_Console,
+	Cmd_Admin,
 };
 
 struct AdminCmdInfo
 {
-	AdminCmdInfo(const ke::Ref<CommandGroup> &group, FlagBits flags)
-		: group(group),
-		  flags(flags),
-		  eflags(0)
+	AdminCmdInfo()
 	{
+		cmdGrpId = -1;
+		flags = 0;
+		eflags = 0;
 	}
-	ke::Ref<CommandGroup> group;
+	int cmdGrpId;			/* index into cmdgroup string table */
 	FlagBits flags;			/* default flags */
 	FlagBits eflags;		/* effective flags */
 };
 
-struct CmdHook : public ke::InlineListNode<CmdHook>
+struct CmdHook
 {
-	enum Type {
-		Server,
-		Client
-	};
-
-	CmdHook(Type type, ConCmdInfo *cmd, IPluginFunction *fun, const char *description)
-		: type(type),
-		  info(cmd),
-		  pf(fun),
-		  helptext(description)
+	CmdHook()
 	{
+		pf = NULL;
+		pAdmin = NULL;
 	}
-
-	Type type;
-	ConCmdInfo *info;
-	IPluginFunction *pf;				/* function hook */
-	ke::AString helptext;				/* help text */
-	ke::AutoPtr<AdminCmdInfo> admin;	/* admin requirements, if any */
+	IPluginFunction *pf;	/* function hook */
+	String helptext;		/* help text */
+	AdminCmdInfo *pAdmin;	/* admin requirements, if any */
 };
 
-typedef ke::InlineList<CmdHook> CmdHookList;
-
 struct ConCmdInfo
 {
 	ConCmdInfo()
 	{
 		sourceMod = false;
 		pCmd = NULL;
-		eflags = 0;
 	}
 	bool sourceMod;					/**< Determines whether or not concmd was created by a SourceMod plugin */
 	ConCommand *pCmd;				/**< Pointer to the command itself */
-	CmdHookList hooks;				/**< Hook list */
-	FlagBits eflags;				/**< Effective admin flags */
+	List<CmdHook *> srvhooks;		/**< Hooks as a server command */
+	List<CmdHook *> conhooks;		/**< Hooks as a console command */
+	AdminCmdInfo admin;				/**< Admin info, if any */
+	bool is_admin_set;				/**< Whether or not admin info is set */
 };
 
-typedef List<ConCmdInfo *> ConCmdList;
-
 class ConCmdManager :
 	public SMGlobalClass,
 	public IRootConsoleCommand,
 	public IPluginsListener,
 	public IConCommandTracker
 {
-#if SOURCE_ENGINE == SE_DOTA
-	friend void CommandCallback(const CCommandContext &context, const CCommand &command);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 	friend void CommandCallback(const CCommand &command);
 #else
 	friend void CommandCallback();
@@ -136,6 +117,7 @@ public: //IConCommandTracker
 	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
 public:
 	bool AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
+	bool AddConsoleCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
 	bool AddAdminCommand(IPluginFunction *pFunction, 
 						 const char *name, 
 						 const char *group,
@@ -146,6 +128,7 @@ public:
 	void UpdateAdminCmdFlags(const char *cmd, OverrideType type, FlagBits bits, bool remove);
 	bool LookForSourceModCommand(const char *cmd);
 	bool LookForCommandAdminFlags(const char *cmd, FlagBits *pFlags);
+	bool CheckCommandAccess(int client, const char *cmd, FlagBits flags);
 private:
 	void InternalDispatch(const CCommand &command);
 	ResultType RunAdminCommand(ConCmdInfo *pInfo, int client, int args);
@@ -153,13 +136,9 @@ private:
 	void SetCommandClient(int client);
 	void AddToCmdList(ConCmdInfo *info);
 	void RemoveConCmd(ConCmdInfo *info, const char *cmd, bool is_read_safe, bool untrack);
+	void RemoveConCmds(List<CmdHook *> &cmdlist);
+	void RemoveConCmds(List<CmdHook *> &cmdlist, IPluginContext *pContext);
 	bool CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin);
-
-	// Case insensitive
-	ConCmdList::iterator FindInList(const char *name);
-
-	// Case sensitive
-	ConCmdInfo *FindInTrie(const char *name);
 public:
 	inline int GetCommandClient()
 	{
@@ -170,15 +149,13 @@ public:
 		return m_CmdList;
 	}
 private:
-	typedef StringHashMap<ke::Ref<CommandGroup> > GroupMap;
-
-	StringHashMap<ConCmdInfo *> m_Cmds; /* command lookup */
-	GroupMap m_CmdGrps;				/* command group map */
-	ConCmdList m_CmdList;			/* command list */
+	Trie *m_pCmds;					/* command lookup */
+	Trie *m_pCmdGrps;				/* command group lookup */
+	List<ConCmdInfo *> m_CmdList;	/* command list */
 	int m_CmdClient;				/* current client */
+	BaseStringTable m_Strings;		/* string table */
 };
 
 extern ConCmdManager g_ConCmds;
 
 #endif // _INCLUDE_SOURCEMOD_CONCMDMANAGER_H_
-

core/ConCommandBaseIterator.h

@@ -1,89 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2010 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-#ifndef _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
-#define _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
-
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-class ConCommandBaseIterator
-{
-public:
-	inline ConCommandBaseIterator() : iter(icvar)
-	{
-		iter.SetFirst();
-	}
-
-	inline bool IsValid()
-	{
-		return iter.IsValid();
-	}
-
-	inline void Next()
-	{
-		iter.Next();
-	}
-
-	inline ConCommandBase *Get()
-	{
-		return iter.Get();
-	}
-private:
-	ICvar::Iterator iter;
-};
-#else
-class ConCommandBaseIterator
-{
-public:
-	inline ConCommandBaseIterator()
-	{
-		iter = icvar->GetCommands();
-	}
-
-	inline bool IsValid()
-	{
-		return iter != NULL;
-	}
-
-	inline void Next()
-	{
-		iter = const_cast<ConCommandBase *>(iter->GetNext());
-	}
-
-	inline ConCommandBase *Get()
-	{
-		return iter;
-	}
-private:
-	ConCommandBase *iter;
-};
-#endif
-
-#endif /* _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_ */
-

core/ConVarManager.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -25,69 +25,38 @@
  * this exception to all derivative works.  AlliedModders LLC defines further
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
  */
 
 #include "ConVarManager.h"
 #include "HalfLife2.h"
+#include "PluginSys.h"
+#include "ForwardSys.h"
+#include "HandleSys.h"
 #include "sm_srvcmds.h"
 #include "sm_stringutil.h"
 #include <sh_vector.h>
-#include <sm_namehashset.h>
-#include "logic_bridge.h"
+#include <sm_trie_tpl.h>
 
 ConVarManager g_ConVarManager;
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-SH_DECL_HOOK3_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *, float);
-#else
-SH_DECL_HOOK2_void(ICvar, CallGlobalChangeCallback, SH_NOATTRIB, false, ConVar *, const char *);
+#if !defined ORANGEBOX_BUILD
+#define CallGlobalChangeCallbacks	CallGlobalChangeCallback
+#endif
+
+#if defined ORANGEBOX_BUILD
+SH_DECL_HOOK3_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *, float);
+#else
+SH_DECL_HOOK2_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *);
 #endif
 
-#if SOURCE_ENGINE == SE_DOTA
-SH_DECL_HOOK5_void(IServerGameDLL, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, CEntityIndex, EQueryCvarValueStatus, const char *, const char *);
-SH_DECL_HOOK5_void(IServerPluginCallbacks, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, CEntityIndex, EQueryCvarValueStatus, const char *, const char *);
-#elif SOURCE_ENGINE != SE_DARKMESSIAH
 SH_DECL_HOOK5_void(IServerGameDLL, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, edict_t *, EQueryCvarValueStatus, const char *, const char *);
 SH_DECL_HOOK5_void(IServerPluginCallbacks, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, edict_t *, EQueryCvarValueStatus, const char *, const char *);
-#endif
 
 const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
 typedef List<const ConVar *> ConVarList;
-NameHashSet<ConVarInfo *> convar_cache;
-
-class ConVarReentrancyGuard
-{
-	ConVar *cvar;
-	ConVarReentrancyGuard *up;
-public:
-	static ConVarReentrancyGuard *chain;
-
-	ConVarReentrancyGuard(ConVar *cvar)
-		: cvar(cvar), up(chain)
-	{
-		chain = this;
-	}
-
-	~ConVarReentrancyGuard()
-	{
-		assert(chain == this);
-		chain = up;
-	}
-
-	static bool IsCvarInChain(ConVar *cvar)
-	{
-		ConVarReentrancyGuard *guard = chain;
-		while (guard != NULL)
-		{
-			if (guard->cvar == cvar)
-				return true;
-			guard = guard->up;
-		}
-		return false;
-	}
-};
-
-ConVarReentrancyGuard *ConVarReentrancyGuard::chain = NULL;
+KTrie<ConVarInfo *> convar_cache;
 
 ConVarManager::ConVarManager() : m_ConVarType(0), m_bIsDLLQueryHooked(false), m_bIsVSPQueryHooked(false)
 {
@@ -107,7 +76,7 @@ void ConVarManager::OnSourceModStartup(bool late)
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 	/* Create the 'ConVar' handle type */
-	m_ConVarType = handlesys->CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_ConVarType = g_HandleSys.CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void ConVarManager::OnSourceModAllInitialized()
@@ -115,23 +84,15 @@ void ConVarManager::OnSourceModAllInitialized()
 	/**
 	 * Episode 2 has this function by default, but the older versions do not.
 	 */
-#if SOURCE_ENGINE == SE_EPISODEONE
+#if !defined ORANGEBOX_BUILD
 	if (g_SMAPI->GetGameDLLVersion() >= 6)
 	{
-		SH_ADD_HOOK(IServerGameDLL, OnQueryCvarValueFinished, gamedll, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
+		SH_ADD_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
 		m_bIsDLLQueryHooked = true;
 	}
 #endif
 
-	g_Players.AddClientListener(this);
-
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	SH_ADD_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
-#else
-	SH_ADD_HOOK(ICvar, CallGlobalChangeCallback, icvar, SH_STATIC(OnConVarChanged), false);
-#endif
-
-	scripts->AddPluginsListener(this);
+	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
 
 	/* Add the 'convars' option to the 'sm' console command */
 	g_RootMenu.AddRootConsoleCommand("cvars", "View convars created by a plugin", this);
@@ -149,10 +110,10 @@ void ConVarManager::OnSourceModShutdown()
 
 		iter = m_ConVars.erase(iter);
 
-		handlesys->FreeHandle(pInfo->handle, &sec);
+		g_HandleSys.FreeHandle(pInfo->handle, &sec);
 		if (pInfo->pChangeForward != NULL)
 		{
-			forwardsys->ReleaseForward(pInfo->pChangeForward);
+			g_Forwards.ReleaseForward(pInfo->pChangeForward);
 		}
 		if (pInfo->sourceMod)
 		{
@@ -180,37 +141,25 @@ void ConVarManager::OnSourceModShutdown()
 	}
 	convar_cache.clear();
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH
 	/* Unhook things */
 	if (m_bIsDLLQueryHooked)
 	{
-		SH_REMOVE_HOOK(IServerGameDLL, OnQueryCvarValueFinished, gamedll, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
+		SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
 		m_bIsDLLQueryHooked = false;
 	}
 	else if (m_bIsVSPQueryHooked)
 	{
-#if SOURCE_ENGINE != SE_DOTA
-		SH_REMOVE_HOOK(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
-#endif
+		SH_REMOVE_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
 		m_bIsVSPQueryHooked = false;
 	}
-#endif
 
-	g_Players.RemoveClientListener(this);
-
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	SH_REMOVE_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
-#else
-	SH_REMOVE_HOOK(ICvar, CallGlobalChangeCallback, icvar, SH_STATIC(OnConVarChanged), false);
-#endif
+	SH_REMOVE_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
 
 	/* Remove the 'convars' option from the 'sm' console command */
 	g_RootMenu.RemoveRootConsoleCommand("cvars", this);
 
-	scripts->RemovePluginsListener(this);
-
 	/* Remove the 'ConVar' handle type */
-	handlesys->RemoveType(m_ConVarType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent);
 }
 
 /**
@@ -227,7 +176,7 @@ void ConVarManager::OnSourceModVSPReceived()
 	}
 
 	/* For later MM:S versions, use the updated API, since it's cleaner. */
-#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
+#if defined METAMOD_PLAPI_VERSION
 	int engine = g_SMAPI->GetSourceEngineBuild();
 	if (engine == SOURCE_ENGINE_ORIGINAL || vsp_version < 2)
 	{
@@ -240,15 +189,22 @@ void ConVarManager::OnSourceModVSPReceived()
 	}
 #endif
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH && SOURCE_ENGINE != SE_DOTA
-	SH_ADD_HOOK(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, SH_MEMBER(this, &ConVarManager::OnQueryCvarValueFinished), false);
+	SH_ADD_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
 	m_bIsVSPQueryHooked = true;
-#endif
 }
 
 bool convar_cache_lookup(const char *name, ConVarInfo **pVar)
 {
-	return convar_cache.retrieve(name, pVar);
+	ConVarInfo **pLookup = convar_cache.retrieve(name);
+	if (pLookup != NULL)
+	{
+		*pVar = *pLookup;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
 }
 
 void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe)
@@ -267,7 +223,7 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	convar_cache.remove(name);
 
 	/* Now make sure no plugins are referring to this pointer */
-	IPluginIterator *pl_iter = scripts->GetPluginIterator();
+	IPluginIterator *pl_iter = g_PluginSys.GetPluginIterator();
 	while (pl_iter->MorePlugins())
 	{
 		IPlugin *pl = pl_iter->GetPlugin();
@@ -283,51 +239,19 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	}
 
 	/* Free resources */
-	handlesys->FreeHandle(pInfo->handle, &sec);
+	g_HandleSys.FreeHandle(pInfo->handle, &sec);
 	delete pInfo;
 }
 
 void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 {
 	ConVarList *pConVarList;
-	List<ConVarQuery>::iterator iter;
 
 	/* If plugin has a convar list, free its memory */
 	if (plugin->GetProperty("ConVarList", (void **)&pConVarList, true))
 	{
 		delete pConVarList;
 	}
-
-	const IPluginRuntime * pRuntime = plugin->GetRuntime();
-
-	/* Remove convar queries for this plugin that haven't returned results yet */
-	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
-	{
-		ConVarQuery &query = (*iter);
-		if (query.pCallback->GetParentRuntime() == pRuntime)
-		{
-			iter = m_ConVarQueries.erase(iter);
-			continue;
-		}
-
-		++iter;
-	}
-}
-
-void ConVarManager::OnClientDisconnected(int client)
-{
-	/* Remove convar queries for this client that haven't returned results yet */
-	for (List<ConVarQuery>::iterator iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
-	{
-		ConVarQuery &query = (*iter);
-		if (query.client == client)
-		{
-			iter = m_ConVarQueries.erase(iter);
-			continue;
-		}
-
-		++iter;
-	}
 }
 
 void ConVarManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -345,18 +269,11 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 	int argcount = command.ArgC();
 	if (argcount >= 3)
 	{
-		bool wantReset = false;
-		
 		/* Get plugin index that was passed */
 		const char *arg = command.Arg(2);
-		if (argcount >= 4 && strcmp(arg, "reset") == 0)
-		{
-			wantReset = true;
-			arg = command.Arg(3);
-		}
 		
 		/* Get plugin object */
-		IPlugin *plugin = scripts->FindPluginByConsoleArg(arg);
+		CPlugin *plugin = g_PluginSys.FindPluginByConsoleArg(arg);
 
 		if (!plugin)
 		{
@@ -378,34 +295,21 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 			return;
 		}
 
-		if (!wantReset)
-		{
-			g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
-			g_RootMenu.ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
-		}
-		
-		/* Iterate convar list and display/reset each one */
+		g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
+		g_RootMenu.ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
+
+		/* Iterate convar list and display each one */
 		for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
 		{
-			/*const */ConVar *pConVar = const_cast<ConVar *>(*iter);
-			if (!wantReset)
-			{
-				g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
-			} else {
-				pConVar->Revert();
-			}
-		}
-		
-		if (wantReset)
-		{
-			g_RootMenu.ConsolePrint("[SM] Reset %d convars for: %s", pConVarList->size(), plname);
+			const ConVar *pConVar = (*iter);
+			g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
 		}
 
 		return;
 	}
 
 	/* Display usage of subcommand */
-	g_RootMenu.ConsolePrint("[SM] Usage: sm cvars [reset] <plugin #>");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm convars <plugin #>");
 }
 
 Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *description, int flags, bool hasMin, float min, bool hasMax, float max)
@@ -437,7 +341,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 			pInfo->pVar = pConVar;
 
 			/* If we don't, then create a new handle from the convar */
-			hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+			hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 			if (hndl == BAD_HANDLE)
 			{
 				delete pInfo;
@@ -455,10 +359,17 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 		}
 	}
 
-	/* Prevent creating a convar that has the same name as a console command */
-	if (FindCommand(name))
+	/* To prevent creating a convar that has the same name as a console command... ugh */
+	ConCommandBase *pBase = icvar->GetCommands();
+
+	while (pBase)
 	{
-		return BAD_HANDLE;
+		if (pBase->IsCommand() && strcmp(pBase->GetName(), name) == 0)
+		{
+			return BAD_HANDLE;
+		}
+
+		pBase = const_cast<ConCommandBase *>(pBase->GetNext());
 	}
 
 	/* Create and initialize ConVarInfo structure */
@@ -468,7 +379,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	pInfo->pChangeForward = NULL;
 
 	/* Create a handle from the new convar */
-	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -497,13 +408,7 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	ConVarInfo *pInfo;
 	Handle_t hndl;
 
-	/* Check convar cache to find out if we already have a handle */
-	if (convar_cache_lookup(name, &pInfo))
-	{
-		return pInfo->handle;
-	}
-
-	/* Couldn't find it in cache, so search for it */
+	/* Search for convar */
 	pConVar = icvar->FindVar(name);
 
 	/* If it doesn't exist, then return an invalid handle */
@@ -512,6 +417,12 @@ Handle_t ConVarManager::FindConVar(const char *name)
 		return BAD_HANDLE;
 	}
 
+	/* At this point, the convar exists. So, find out if we already have a handle */
+	if (convar_cache_lookup(name, &pInfo))
+	{
+		return pInfo->handle;
+	}
+
 	/* Create and initialize ConVarInfo structure */
 	pInfo = new ConVarInfo();
 	pInfo->sourceMod = false;
@@ -519,7 +430,7 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	pInfo->pVar = pConVar;
 
 	/* If we don't have a handle, then create a new one */
-	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -577,7 +488,7 @@ void ConVarManager::HookConVarChange(ConVar *pConVar, IPluginFunction *pFunction
 		/* If forward does not exist, create it */
 		if (!pForward)
 		{
-			pForward = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
+			pForward = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
 			pInfo->pChangeForward = pForward;
 		}
 
@@ -613,11 +524,10 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 		}
 
 		/* If the forward now has 0 functions in it... */
-		if (pForward->GetFunctionCount() == 0 &&
-			!ConVarReentrancyGuard::IsCvarInChain(pConVar))
+		if (pForward->GetFunctionCount() == 0)
 		{
 			/* Free this forward */
-			forwardsys->ReleaseForward(pForward);
+			g_Forwards.ReleaseForward(pForward);
 			pInfo->pChangeForward = NULL;
 		}
 	}
@@ -625,35 +535,24 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 
 QueryCvarCookie_t ConVarManager::QueryClientConVar(edict_t *pPlayer, const char *name, IPluginFunction *pCallback, Handle_t hndl)
 {
-	QueryCvarCookie_t cookie = 0;
+	QueryCvarCookie_t cookie;
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH
 	/* Call StartQueryCvarValue() in either the IVEngineServer or IServerPluginHelpers depending on situation */
 	if (m_bIsDLLQueryHooked)
 	{
-#if SOURCE_ENGINE == SE_DOTA
-		cookie = engine->StartQueryCvarValue(CEntityIndex(IndexOfEdict(pPlayer)), name);
-#else
 		cookie = engine->StartQueryCvarValue(pPlayer, name);	
-#endif
 	}
-#if SOURCE_ENGINE != SE_DOTA
 	else if (m_bIsVSPQueryHooked)
 	{
 		cookie = serverpluginhelpers->StartQueryCvarValue(pPlayer, name);
 	}
-#endif
 	else
 	{
 		return InvalidQueryCvarCookie;
 	}
 
-	if (pCallback != NULL)
-	{
-		ConVarQuery query = { cookie, pCallback, (cell_t) hndl, IndexOfEdict(pPlayer) };
-		m_ConVarQueries.push_back(query);
-	}
-#endif
+	ConVarQuery query = {cookie, pCallback, hndl};
+	m_ConVarQueries.push_back(query);
 
 	return cookie;
 }
@@ -665,7 +564,7 @@ void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar
 	bool inserted = false;
 	const char *orig = pConVar->GetName();
 
-	IPlugin *plugin = scripts->FindPluginByContext(pContext->GetContext());
+	IPlugin *plugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
 
 	/* Check plugin for an existing convar list */
 	if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
@@ -696,7 +595,7 @@ void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar
 	}
 }
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue)
 #else
 void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
@@ -724,7 +623,7 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 			 i != pInfo->changeListeners.end();
 			 i++)
 		{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 			(*i)->OnConVarChanged(pConVar, oldValue, flOldValue);
 #else
 			(*i)->OnConVarChanged(pConVar, oldValue, atof(oldValue));
@@ -734,8 +633,6 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 
 	if (pForward != NULL)
 	{
-		ConVarReentrancyGuard guard(pConVar);
-
 		/* Now call forwards in plugins that have hooked this */
 		pForward->PushCell(pInfo->handle);
 		pForward->PushString(oldValue);
@@ -749,20 +646,8 @@ bool ConVarManager::IsQueryingSupported()
 	return (m_bIsDLLQueryHooked || m_bIsVSPQueryHooked);
 }
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-#if SOURCE_ENGINE == SE_DOTA
-void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, CEntityIndex player, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue)
-#else
 void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue)
-#endif // SE_DOTA
 {
-#if SOURCE_ENGINE == SE_CSGO
-	if (g_Players.HandleConVarQuery(cookie, pPlayer, result, cvarName, cvarValue))
-	{
-		return;
-	}
-#endif
-
 	IPluginFunction *pCallback = NULL;
 	cell_t value = 0;
 	List<ConVarQuery>::iterator iter;
@@ -783,11 +668,7 @@ void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *
 		cell_t ret;
 
 		pCallback->PushCell(cookie);
-#if SOURCE_ENGINE == SE_DOTA
-		pCallback->PushCell(player.Get());
-#else
-		pCallback->PushCell(IndexOfEdict(pPlayer));
-#endif
+		pCallback->PushCell(engine->IndexOfEdict(pPlayer));
 		pCallback->PushCell(result);
 		pCallback->PushString(cvarName);
 
@@ -806,14 +687,13 @@ void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *
 		m_ConVarQueries.erase(iter);
 	}
 }
-#endif
 
 HandleError ConVarManager::ReadConVarHandle(Handle_t hndl, ConVar **pVar)
 {
 	ConVarInfo *pInfo;
 	HandleError error;
 	
-	if ((error = handlesys->ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
+	if ((error = g_HandleSys.ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
 	{
 		return error;
 	}

core/ConVarManager.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -39,15 +39,8 @@
 #include <IForwardSys.h>
 #include <IHandleSys.h>
 #include <IRootConsoleMenu.h>
-#include <IPlayerHelpers.h>
 #include <compat_wrappers.h>
 #include "concmd_cleaner.h"
-#include "PlayerManager.h"
-
-#if SOURCE_ENGINE == SE_DARKMESSIAH
-class EQueryCvarValueStatus;
-typedef int QueryCvarCookie_t;
-#endif
 
 using namespace SourceHook;
 
@@ -67,11 +60,6 @@ struct ConVarInfo
 	IChangeableForward *pChangeForward;	/**< Forward associated with convar */
 	ConVar *pVar;						/**< The actual convar */
 	List<IConVarChangeListener *> changeListeners;
-
-	static inline bool matches(const char *name, const ConVarInfo *info)
-	{
-		return strcmp(name, info->pVar->GetName()) == 0;
-	}
 };
 
 /**
@@ -82,7 +70,6 @@ struct ConVarQuery
 	QueryCvarCookie_t cookie;			/**< Cookie that identifies query */
 	IPluginFunction *pCallback;			/**< Function that will be called when query is finished */
 	cell_t value;						/**< Optional value passed to query function */
-	cell_t client;						/**< Only used for cleaning up on client disconnection */
 };
 
 class ConVarManager :
@@ -90,8 +77,7 @@ class ConVarManager :
 	public IHandleTypeDispatch,
 	public IPluginsListener,
 	public IRootConsoleCommand,
-	public IConCommandTracker,
-	public IClientListener
+	public IConCommandTracker
 {
 public:
 	ConVarManager();
@@ -110,8 +96,6 @@ public: //IRootConsoleCommand
 	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public: //IConCommandTracker
 	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
-public: //IClientListener
-	void OnClientDisconnected(int client);
 public:
 	/**
 	 * Create a convar and return a handle to it.
@@ -156,7 +140,7 @@ private:
 	/**
 	 * Static callback that Valve's ConVar object executes when the convar's value changes.
 	 */
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 	static void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
 #else
 	static void OnConVarChanged(ConVar *pConVar, const char *oldValue);
@@ -165,13 +149,8 @@ private:
 	/**
 	 * Callback for when StartQueryCvarValue() has finished.
 	 */
-#if SOURCE_ENGINE == SE_DOTA
-	void OnQueryCvarValueFinished(QueryCvarCookie_t cookie, CEntityIndex player, EQueryCvarValueStatus result,
-	                              const char *cvarName, const char *cvarValue);
-#elif SOURCE_ENGINE != SE_DARKMESSIAH
 	void OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result,
 	                              const char *cvarName, const char *cvarValue);
-#endif
 private:
 	HandleType_t m_ConVarType;
 	List<ConVarInfo *> m_ConVars;

core/ConsoleDetours.cpp

@@ -1,739 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2009 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * On SourceHook v4.3 or lower, there are no DVP hooks. Very sad, right?
- * Only do this on newer versions. For the older code, we'll do an incredibly
- * hacky detour.
- *
- * The idea of the "non-hacky" (yeah... no) code is that every unique
- * ConCommand vtable gets its own DVP hook. We watch for unloading and
- * loading commands to remove stale hooks from SH.
- */
-
-#include "sourcemod.h"
-#include "sourcemm_api.h"
-#include "Logger.h"
-#include "compat_wrappers.h"
-#include "ConsoleDetours.h"
-#include <IGameConfigs.h>
-#include "sm_stringutil.h"
-#include "ConCmdManager.h"
-#include "HalfLife2.h"
-#include "ConCommandBaseIterator.h"
-#include "logic_bridge.h"
-#include <am-utility.h>
-
-#if defined PLATFORM_POSIX
-# include <dlfcn.h>
-# include <sys/mman.h>
-# include <stdint.h>
-# include <unistd.h>
-#endif
-
-#if SH_IMPL_VERSION >= 5
-# if SOURCE_ENGINE == SE_DOTA
-	SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommandContext &, const CCommand &);
-# elif SOURCE_ENGINE >= SE_ORANGEBOX
-	SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
-# else
-	SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
-# endif
-#else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHVPAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>,bool);
- extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
-# endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
-#endif
-
-#if SH_IMPL_VERSION >= 4
-
-class GenericCommandHooker : public IConCommandLinkListener
-{
-	struct HackInfo
-	{
-		void **vtable;
-		int hook;
-		unsigned int refcount;
-	};
-	CVector<HackInfo> vtables;
-	bool enabled;
-	SourceHook::MemFuncInfo dispatch;
-
-	inline void **GetVirtualTable(ConCommandBase *pBase)
-	{
-		return *reinterpret_cast<void***>(reinterpret_cast<char*>(pBase) +
-		                                  dispatch.thisptroffs +
-		                                  dispatch.vtbloffs);
-	}
-
-	inline bool FindVtable(void **ptr, size_t& index)
-	{
-		for (size_t i = 0; i < vtables.size(); i++)
-		{
-			if (vtables[i].vtable == ptr)
-			{
-				index = i;
-				return true;
-			}
-		}
-		return false;
-	}
-
-	void MakeHookable(ConCommandBase *pBase)
-	{
-		if (!pBase->IsCommand())
-			return;
-
-		ConCommand *cmd = (ConCommand*)pBase;
-		void **vtable = GetVirtualTable(cmd);
-
-		size_t index;
-		if (!FindVtable(vtable, index))
-		{
-			HackInfo hack;
-			hack.vtable = vtable;
-			hack.hook = SH_ADD_VPHOOK(ConCommand, Dispatch, cmd, SH_MEMBER(this, &GenericCommandHooker::Dispatch), false);
-			hack.refcount = 1;
-			vtables.push_back(hack);
-		}
-		else
-		{
-			vtables[index].refcount++;
-		}
-	}
-
-# if SOURCE_ENGINE == SE_DOTA
-	void Dispatch(const CCommandContext &context, const CCommand& args)
-# elif SOURCE_ENGINE >= SE_ORANGEBOX
-	void Dispatch(const CCommand& args)
-# else
-	void Dispatch()
-# endif
-	{
-		cell_t res = ConsoleDetours::Dispatch(META_IFACEPTR(ConCommand)
-# if SOURCE_ENGINE >= SE_ORANGEBOX
-			, args
-# endif
-			);
-		if (res >= Pl_Handled)
-			RETURN_META(MRES_SUPERCEDE);
-	}
-
-	void ReparseCommandList()
-	{
-		for (size_t i = 0; i < vtables.size(); i++)
-			vtables[i].refcount = 0;
-		for (ConCommandBaseIterator iter; iter.IsValid(); iter.Next())
-			MakeHookable(iter.Get());
-		CVector<HackInfo>::iterator iter = vtables.begin();
-		while (iter != vtables.end())
-		{
-			if ((*iter).refcount)
-			{
-				iter++;
-				continue;
-			}
-			/* Damn it. This event happens AFTER the plugin has unloaded!
-			 * There's two options. Remove the hook now and hope SH's memory
-			 * protection will prevent a crash. Otherwise, we can wait until
-			 * the server shuts down and more likely crash then.
-			 *
-			 * This situation only arises if:
-			 * 1) Someone has used AddCommandFilter()
-			 * 2) ... on a Dark Messiah server (mm:s new api)
-			 * 3) ... and another MM:S plugin that uses ConCommands has unloaded.
-			 *
-			 * Even though the impact is really small, we'll wait until the
-			 * server shuts down, so normal operation isn't interrupted.
-			 *
-			 * See bug 4018.
-			 */
-			iter = vtables.erase(iter);
-		}
-	}
-
-	void UnhookCommand(ConCommandBase *pBase)
-	{
-		if (!pBase->IsCommand())
-			return;
-
-		ConCommand *cmd = (ConCommand*)pBase;
-		void **vtable = GetVirtualTable(cmd);
-
-		size_t index;
-		if (!FindVtable(vtable, index))
-		{
-			logger->LogError("Console detour tried to unhook command \"%s\" but it wasn't found", pBase->GetName());
-			return;
-		}
-
-		assert(vtables[index].refcount > 0);
-		vtables[index].refcount--;
-		if (vtables[index].refcount == 0)
-		{
-			SH_REMOVE_HOOK_ID(vtables[index].hook);
-			vtables.erase(vtables.iterAt(index));
-		}
-	}
-
-public:
-	GenericCommandHooker() : enabled(false)
-	{
-	}
-
-	bool Enable()
-	{
-		SourceHook::GetFuncInfo(&ConCommand::Dispatch, dispatch);
-
-		if (dispatch.thisptroffs < 0)
-		{
-			logger->LogError("Command filter could not determine ConCommand layout");
-			return false;
-		}
-
-		for (ConCommandBaseIterator iter; iter.IsValid(); iter.Next())
-			MakeHookable(iter.Get());
-
-		if (!vtables.size())
-		{
-			logger->LogError("Command filter could not find any cvars!");
-			return false;
-		}
-
-		enabled = true;
-
-		return true;
-	}
-
-	void Disable()
-	{
-		for (size_t i = 0; i < vtables.size(); i++)
-			SH_REMOVE_HOOK_ID(vtables[i].hook);
-		vtables.clear();
-	}
-
-	virtual void OnLinkConCommand(ConCommandBase *pBase)
-	{
-		if (!enabled)
-			return;
-		MakeHookable(pBase);
-	}
-
-	virtual void OnUnlinkConCommand(ConCommandBase *pBase)
-	{
-		if (!enabled)
-			return;
-		if (pBase == NULL)
-			ReparseCommandList();
-		else
-			UnhookCommand(pBase);
-	}
-};
-
-/**
- * END DVP HOOK VERSION
- */
-
-#else /* SH_IMPL_VERSION >= 4 */
-
-/**
- * BEGIN ENGINE DETOUR VERSION
- */
-
-# include <jit/jit_helpers.h>
-# include <jit/x86/x86_macros.h>
-
-class GenericCommandHooker
-{
-	struct Patch
-	{
-		Patch() : applied(false)
-		{
-		}
-
-		bool applied;
-		void *base;
-		unsigned char search[16];
-		size_t search_len;
-		size_t offset;
-		size_t saveat;
-		int regparam;
-		void *detour;
-	};
-	
-	Patch ces;
-	Patch cgc;
-
-public:
- 	static void DelayedActivation(void *inparam)
- 	{
- 		GenericCommandHooker *cdtrs = reinterpret_cast<GenericCommandHooker*>(inparam);
- 		/* Safe to re-enter because the frame queue is lock+swapped. */
- 		if ((!cdtrs->ces.applied || !cdtrs->cgc.applied) &&
- 		    g_HL2.PeekCommandStack() != NULL)
- 		{
- 			g_SourceMod.AddFrameAction(GenericCommandHooker::DelayedActivation, cdtrs);
- 			return;
- 		}
- 
- 		if (!cdtrs->ces.applied)
- 			cdtrs->ApplyPatch(&cdtrs->ces);
- 		if (!cdtrs->cgc.applied)
- 			cdtrs->ApplyPatch(&cdtrs->cgc);
- 	}
-
-	bool Enable()
-	{
-		const char *platform = NULL;
-# if defined(PLATFORM_WINDOWS)
-		platform = "Windows";
-# else	
-		void *addrInBase = (void *)g_SMAPI->GetEngineFactory(false);
-		Dl_info info;
-		if (!dladdr(addrInBase, &info))
-		{
-			g_Logger.LogError("Command filter could not find engine name");
-			return false;
-		}
-		if (strstr(info.dli_fname, "engine_i486"))
-		{
-			platform = "Linux_486";
-		}
-		else if (strstr(info.dli_fname, "engine_i686"))
-		{
-			platform = "Linux_686";
-		}
-		else if (strstr(info.dli_fname, "engine_amd"))
-		{
-			platform = "Linux_AMD";
-		}
-		else
-		{
-			g_Logger.LogError("Command filter could not determine engine (%s)", info.dli_fname);
-			return false;
-		}
-# endif
-
-		if (!PrepPatch("Cmd_ExecuteString", "CES", platform, &ces))
-			return false;
-		if (!PrepPatch("CGameClient::ExecuteString", "CGC", platform, &cgc))
-			return false;
-
- 		if (g_HL2.PeekCommandStack() != NULL)
- 		{
- 			g_SourceMod.AddFrameAction(GenericCommandHooker::DelayedActivation, this);
- 			return true;
- 		}
-
-		ApplyPatch(&ces);
-		ApplyPatch(&cgc);
-
-		return true;
-	}
-
-	void Disable()
-	{
-		UndoPatch(&ces);
-		UndoPatch(&cgc);
-	}
-
-private:
-
-# if !defined PLATFORM_WINDOWS
-#  define PAGE_READWRITE     PROT_READ|PROT_WRITE
-#  define PAGE_EXECUTE_READ  PROT_READ|PROT_EXEC
-
-	static inline uintptr_t AddrToPage(uintptr_t address)
-	{
-		return (address & ~(uintptr_t(sysconf(_SC_PAGE_SIZE) - 1)));
-	}
-
-# endif
-
-	void Protect(void *addr, size_t length, int prot)
-	{
-# if defined PLATFORM_WINDOWS
-		DWORD ignore;
-		VirtualProtect(addr, length, prot, &ignore);
-# else
-		uintptr_t startPage = AddrToPage(uintptr_t(addr));
-		length += (uintptr_t(addr) - startPage);
-		mprotect((void*)startPage, length, prot);
-# endif
-	}
-
-	void UndoPatch(Patch *patch)
-	{
-		if (!patch->applied || patch->detour == NULL)
-			return;
-
-		g_pSourcePawn->FreePageMemory(patch->detour);
-
-		unsigned char *source = (unsigned char *)patch->base + patch->offset;
-		Protect(source, patch->search_len, PAGE_READWRITE);
-		for (size_t i = 0; i < patch->search_len; i++)
-			source[i] = patch->search[i];
-		Protect(source, patch->search_len, PAGE_EXECUTE_READ);
-	}
-
-	void ApplyPatch(Patch *patch)
-	{
-		assert(!patch->applied);
-
-		size_t length = 0;
-		void *callback = (void*)&ConsoleDetours::Dispatch;
-
-		/* Bogus assignment to make compiler is doing the right thing. */
-		patch->detour = callback;
-
-		/* Assemgle the detour. */
-		JitWriter writer;
-		writer.outbase = NULL;
-		writer.outptr = NULL;
-		do
-		{
-			/* Need a specific register, or value on stack? */
-			if (patch->regparam != -1)
-				IA32_Push_Reg(&writer, patch->regparam);
-			/* Call real function. */
-			IA32_Write_Jump32_Abs(&writer, IA32_Call_Imm32(&writer, 0), callback);
-			/* Restore stack. */
-			if (patch->regparam != -1)
-				IA32_Pop_Reg(&writer, patch->regparam);
-			/* Copy any saved bytes */
-			if (patch->saveat)
-			{
-				for (size_t i = patch->saveat; i < patch->search_len; i++)
-				{
-					writer.write_ubyte(patch->search[i]);
-				}
-			}
-			/* Jump back to the caller. */
-			unsigned char *target = (unsigned char *)patch->base + patch->offset + patch->search_len;
-			IA32_Jump_Imm32_Abs(&writer, target);
-			/* Assemble, if we can. */
-			if (writer.outbase == NULL)
-			{
-				length = writer.outptr - writer.outbase;
-				patch->detour = g_pSourcePawn->AllocatePageMemory(length);
-				if (patch->detour == NULL)
-				{
-					g_Logger.LogError("Ran out of memory!");
-					return;
-				}
-				g_pSourcePawn->SetReadWrite(patch->detour);
-				writer.outbase = (jitcode_t)patch->detour;
-				writer.outptr = writer.outbase;
-			}
-			else
-			{
-				break;
-			}
-		} while (true);
-
-		g_pSourcePawn->SetReadExecute(patch->detour);
-
-		unsigned char *source = (unsigned char *)patch->base + patch->offset;
-		Protect(source, 6, PAGE_READWRITE);
-		source[0] = 0xFF;
-		source[1] = 0x25;
-		*(void **)&source[2] = &patch->detour;
-		Protect(source, 6, PAGE_EXECUTE_READ);
-
-		patch->applied = true;
-	}
-
-	bool PrepPatch(const char *signature, const char *name, const char *platform, Patch *patch)
-	{
-		/* Get the base address of the function. */
-		if (!g_pGameConf->GetMemSig(signature, &patch->base) || patch->base == NULL)
-		{
-			g_Logger.LogError("Command filter could not find signature: %s", signature);
-			return false;
-		}
-
-		const char *value;
-		char keyname[255];
-
-		/* Get the verification bytes that will be written over. */
-		UTIL_Format(keyname, sizeof(keyname), "%s_Patch_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) == NULL)
-		{
-			g_Logger.LogError("Command filter could not find key: %s", keyname);
-			return false;
-		}
-		patch->search_len = UTIL_DecodeHexString(patch->search, sizeof(patch->search), value);
-		if (patch->search_len < 6)
-		{
-			g_Logger.LogError("Error decoding %s value, or not long enough", keyname);
-			return false;
-		}
-
-		/* Get the offset into the function. */
-		UTIL_Format(keyname, sizeof(keyname), "%s_Offset_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) == NULL)
-		{
-			g_Logger.LogError("Command filter could not find key: %s", keyname);
-			return false;
-		}
-		patch->offset = atoi(value);
-		if (patch->offset > 20000)
-		{
-			g_Logger.LogError("Command filter %s value is bogus", keyname);
-			return false;
-		}
-
-		/* Get the number of bytes to save from what was written over. */
-		patch->saveat = 0;
-		UTIL_Format(keyname, sizeof(keyname), "%s_Save_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) != NULL)
-		{
-			patch->saveat = atoi(value);
-			if (patch->saveat >= patch->search_len)
-			{
-				g_Logger.LogError("Command filter %s value is too large", keyname);
-				return false;
-			}
-		}
-
-		/* Get register for parameter, if any. */
-		patch->regparam = -1;
-		UTIL_Format(keyname, sizeof(keyname), "%s_Reg_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) != NULL)
-		{
-			patch->regparam = atoi(value);
-		}
-
-		/* Everything loaded from gamedata, make sure the patch will succeed. */
-		unsigned char *address = (unsigned char *)patch->base + patch->offset;
-		for (size_t i = 0; i < patch->search_len; i++)
-		{
-			if (address[i] != patch->search[i])
-			{
-				g_Logger.LogError("Command filter %s has changed (byte %x is not %x sub-offset %d)",
-				                  name, address[i], patch->search[i], i);
-				return false;
-			}
-		}
-
-		return true;
-	}
-};
-
-static bool dummy_hook_set = false;
-void DummyHook()
-{
-	if (dummy_hook_set)
-	{
-		dummy_hook_set = false;
-		RETURN_META(MRES_SUPERCEDE);
-	}
-}
-
-#endif
-
-/**
- * BEGIN THE ACTUALLY GENERIC CODE.
- */
-
-#define FEATURECAP_COMMANDLISTENER  "command listener"
-
-static GenericCommandHooker s_GenericHooker;
-ConsoleDetours g_ConsoleDetours;
-
-ConsoleDetours::ConsoleDetours() : status(FeatureStatus_Unknown)
-{
-}
-
-void ConsoleDetours::OnSourceModAllInitialized()
-{
-	m_pForward = forwardsys->CreateForwardEx("OnAnyCommand", ET_Hook, 3, NULL, Param_Cell,
-	                                        Param_String, Param_Cell);
-	sharesys->AddCapabilityProvider(NULL, this, FEATURECAP_COMMANDLISTENER);
-}
-
-void ConsoleDetours::OnSourceModShutdown()
-{
-	for (StringHashMap<IChangeableForward *>::iterator iter = m_Listeners.iter();
-		 !iter.empty();
-		 iter.next())
-	{
-		forwardsys->ReleaseForward(iter->value);
-	}
-
-	forwardsys->ReleaseForward(m_pForward);
-	s_GenericHooker.Disable();
-}
-
-FeatureStatus ConsoleDetours::GetFeatureStatus(FeatureType type, const char *name)
-{
-	return GetStatus();
-}
-
-FeatureStatus ConsoleDetours::GetStatus()
-{
-	if (status == FeatureStatus_Unknown)
-	{
-		status = s_GenericHooker.Enable() ? FeatureStatus_Available : FeatureStatus_Unavailable;
-	}
-	return status;
-}
-
-bool ConsoleDetours::AddListener(IPluginFunction *fun, const char *command)
-{
-	if (GetStatus() != FeatureStatus_Available)
-		return false;
-
-	if (command == NULL)
-	{
-		m_pForward->AddFunction(fun);
-	}
-	else
-	{
-		ke::AutoArray<char> str(UTIL_ToLowerCase(command));
-		IChangeableForward *forward;
-		if (!m_Listeners.retrieve(str, &forward))
-		{
-			forward = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
-			                                     Param_String, Param_Cell);
-			m_Listeners.insert(str, forward);
-		}
-		forward->AddFunction(fun);
-	}
-
-	return true;
-}
-
-bool ConsoleDetours::RemoveListener(IPluginFunction *fun, const char *command)
-{
-	if (command == NULL)
-	{
-		return m_pForward->RemoveFunction(fun);
-	}
-	else
-	{
-		ke::AutoArray<char> str(UTIL_ToLowerCase(command));
-		IChangeableForward *forward;
-		if (!m_Listeners.retrieve(str, &forward))
-			return false;
-		return forward->RemoveFunction(fun);
-	}
-}
-
-cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
-{
-	char name[255];
-	const char *realname = args.Arg(0);
-	size_t len = strlen(realname);
-
-	// Disallow command strings that are too long, for now.
-	if (len >= sizeof(name) - 1)
-		return Pl_Continue;
-
-	for (size_t i = 0; i < len; i++)
-	{
-		if (realname[i] >= 'A' && realname[i] <= 'Z')
-			name[i] = tolower(realname[i]);
-		else
-			name[i] = realname[i];
-	}
-	name[len] = '\0';
-
-	cell_t result = Pl_Continue;
-	m_pForward->PushCell(client);
-	m_pForward->PushString(name);
-	m_pForward->PushCell(args.ArgC() - 1);
-	m_pForward->Execute(&result, NULL);
-
-	/* Don't let plugins block this. */
-	if (strcmp(name, "sm") == 0)
-		result = Pl_Continue;
-
-	if (result >= Pl_Handled)
-		return result;
-	
-	IChangeableForward *forward;
-	if (!m_Listeners.retrieve(name, &forward))
-		return result;
-	if (forward->GetFunctionCount() == 0)
-		return result;
-
-	cell_t result2 = Pl_Continue;
-	forward->PushCell(client);
-	forward->PushString(name);
-	forward->PushCell(args.ArgC() - 1);
-	forward->Execute(&result2, NULL);
-
-	if (result2 > result)
-		result = result2;
-
-	/* "sm" should not have flown through the above. */
-	assert(strcmp(name, "sm") != 0 || result == Pl_Continue);
-
-	return result;
-}
-
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-cell_t ConsoleDetours::Dispatch(ConCommand *pBase, const CCommand& args)
-{
-#else
-cell_t ConsoleDetours::Dispatch(ConCommand *pBase)
-{
-	CCommand args;
-#endif
-	g_HL2.PushCommandStack(&args);
-	cell_t res = g_ConsoleDetours.InternalDispatch(g_ConCmds.GetCommandClient(), args);
-	g_HL2.PopCommandStack();
-
-#if SH_IMPL_VERSION < 4
-	if (res >= Pl_Handled)
-	{
-		/* See bug 4020 - we can't optimize this because looking at the vtable
-		 * is probably more expensive, since there's no SH_GET_ORIG_VFNPTR_ENTRY.
-		 */
-		SH_ADD_HOOK(ConCommand, Dispatch, pBase, SH_STATIC(DummyHook), false);
-		dummy_hook_set = true;
-		pBase->Dispatch();
-		SH_REMOVE_HOOK(ConCommand, Dispatch, pBase, SH_STATIC(DummyHook), false);
-	}
-	else
-	{
-		/* Make sure the command gets invoked. See bug 4019 on making this better. */
-		pBase->Dispatch();
-	}
-#endif
-
-	return res;
-}

core/ConsoleDetours.h

@@ -1,78 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2009 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-#ifndef _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
-#define _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
-
-#include "sm_globals.h"
-#include "sourcemm_api.h"
-#include <IForwardSys.h>
-#include <sm_stringhashmap.h>
-
-class ConsoleDetours :
-	public SMGlobalClass,
-	public IFeatureProvider
-{
-	friend class PlayerManager;
-	friend class GenericCommandHooker;
-
-public:
-	ConsoleDetours();
-public: //SMGlobalClass
-	void OnSourceModAllInitialized();
-	void OnSourceModShutdown();
-public: //IFeatureProvider
-	FeatureStatus GetFeatureStatus(FeatureType type, const char *name);
-public:
-	bool AddListener(IPluginFunction *fun, const char *command);
-	bool RemoveListener(IPluginFunction *fun, const char *command);
-private:
-	cell_t InternalDispatch(int client, const CCommand& args);
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	static cell_t Dispatch(ConCommand *pBase, const CCommand& args);
-#else
-	static cell_t Dispatch(ConCommand *pBase);
-#endif
-public:
-	FeatureStatus GetStatus();
-	bool IsEnabled()
-	{
-		return status == FeatureStatus_Available;
-	}
-private:
-	FeatureStatus status;
-	IChangeableForward *m_pForward;
-	StringHashMap<IChangeableForward *> m_Listeners;
-};
-
-extern ConsoleDetours g_ConsoleDetours;
-
-#endif /* _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_ */
-

core/CoreConfig.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,153 +34,41 @@
 #include "sourcemod.h"
 #include "sourcemm_api.h"
 #include "sm_srvcmds.h"
+#include "sm_version.h"
 #include "sm_stringutil.h"
 #include "LibrarySys.h"
 #include "Logger.h"
-#include "frame_hooks.h"
-#include "logic_bridge.h"
-#include <sourcemod_version.h>
+#include "PluginSys.h"
+#include "ForwardSys.h"
 
 #ifdef PLATFORM_WINDOWS
 ConVar sm_corecfgfile("sm_corecfgfile", "addons\\sourcemod\\configs\\core.cfg", 0, "SourceMod core configuration file");
-#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE
+#elif defined PLATFORM_LINUX
 ConVar sm_corecfgfile("sm_corecfgfile", "addons/sourcemod/configs/core.cfg", 0, "SourceMod core configuration file");
 #endif
 
 IForward *g_pOnServerCfg = NULL;
 IForward *g_pOnConfigsExecuted = NULL;
-IForward *g_pOnAutoConfigsBuffered = NULL;
 CoreConfig g_CoreConfig;
 bool g_bConfigsExecd = false;
-bool g_bServerExecd = false;
-bool g_bGotServerStart = false;
-bool g_bGotTrigger = false;
-ConCommand *g_pExecPtr = NULL;
-ConVar *g_ServerCfgFile = NULL;
-
-void CheckAndFinalizeConfigs();
-
-#if SOURCE_ENGINE == SE_DOTA
-SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommandContext &, const CCommand &);
-void Hook_ExecDispatchPre(const CCommandContext &context, const CCommand &cmd)
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
-void Hook_ExecDispatchPre(const CCommand &cmd)
-#elif SOURCE_ENGINE == SE_DARKMESSIAH
-SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
-void Hook_ExecDispatchPre()
-#else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-void Hook_ExecDispatchPre()
-#endif
-{
-#if SOURCE_ENGINE <= SE_DARKMESSIAH
-	CCommand cmd;
-#endif
-
-	const char *arg = cmd.Arg(1);
-
-	if (!g_bServerExecd && arg != NULL && strcmp(arg, g_ServerCfgFile->GetString()) == 0)
-	{
-		g_bGotTrigger = true;
-	}
-}
-
-#if SOURCE_ENGINE == SE_DOTA
-void Hook_ExecDispatchPost(const CCommandContext &context, const CCommand &cmd)
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-void Hook_ExecDispatchPost(const CCommand &cmd)
-#else
-void Hook_ExecDispatchPost()
-#endif
-{
-	if (g_bGotTrigger)
-	{
-		g_bGotTrigger = false;
-		g_bServerExecd = true;
-		CheckAndFinalizeConfigs();
-	}
-}
-
-void CheckAndFinalizeConfigs()
-{
-	if ((g_bServerExecd || g_ServerCfgFile == NULL) && g_bGotServerStart)
-	{
-        g_PendingInternalPush = true;
-	}
-}
 
 void CoreConfig::OnSourceModAllInitialized()
 {
 	g_RootMenu.AddRootConsoleCommand("config", "Set core configuration options", this);
-	g_pOnServerCfg = forwardsys->CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
-	g_pOnConfigsExecuted = forwardsys->CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
-	g_pOnAutoConfigsBuffered = forwardsys->CreateForward("OnAutoConfigsBuffered", ET_Ignore, 0, NULL);
-}
-
-CoreConfig::CoreConfig()
-{
-}
-
-CoreConfig::~CoreConfig()
-{
+	g_pOnServerCfg = g_Forwards.CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
+	g_pOnConfigsExecuted = g_Forwards.CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
 }
 
 void CoreConfig::OnSourceModShutdown()
 {
 	g_RootMenu.RemoveRootConsoleCommand("config", this);
-	forwardsys->ReleaseForward(g_pOnServerCfg);
-	forwardsys->ReleaseForward(g_pOnConfigsExecuted);
-	forwardsys->ReleaseForward(g_pOnAutoConfigsBuffered);
-
-	if (g_pExecPtr != NULL)
-	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPre), false);
-		SH_REMOVE_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPost), true);
-		g_pExecPtr = NULL;
-	}
+	g_Forwards.ReleaseForward(g_pOnServerCfg);
+	g_Forwards.ReleaseForward(g_pOnConfigsExecuted);
 }
 
 void CoreConfig::OnSourceModLevelChange(const char *mapName)
 {
-	static bool already_checked = false;
-
-	if (!already_checked)
-	{
-		if (engine->IsDedicatedServer())
-		{
-			g_ServerCfgFile = icvar->FindVar("servercfgfile");
-		}
-		else
-		{
-			g_ServerCfgFile = icvar->FindVar("lservercfgfile");
-		}
-
-		if (g_ServerCfgFile != NULL)
-		{
-			g_pExecPtr = FindCommand("exec");
-			if (g_pExecPtr != NULL)
-			{
-				SH_ADD_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPre), false);
-				SH_ADD_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPost), true);
-			}
-			else
-			{
-				g_ServerCfgFile = NULL;
-			}
-		}
-		already_checked = true;
-	}
-
 	g_bConfigsExecd = false;
-	g_bServerExecd = false;
-	g_bGotServerStart = false;
-	g_bGotTrigger = false;
 }
 
 void CoreConfig::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
@@ -197,30 +85,17 @@ void CoreConfig::OnRootConsoleCommand(const char *cmdname, const CCommand &comma
 
 		if (res == ConfigResult_Reject)
 		{
-			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\". (%s)", option, value, error);
+			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\" (%s)", option, value, error);
 		} else if (res == ConfigResult_Ignore) {
 			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
 		} else {
-			g_RootMenu.ConsolePrint("[SM] Config option \"%s\" successfully set to \"%s\".", option, value);
+			g_RootMenu.ConsolePrint("Config option \"%s\" successfully set to \"%s.\"", option, value);
 		}
 
-		return;
-	} else if (argcount >= 3) {
-		const char *option = command.Arg(2);
-		
-		const char *value = GetCoreConfigValue(option);
-		
-		if (value == NULL)
-		{
-			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
-		} else {
-			g_RootMenu.ConsolePrint("[SM] Config option \"%s\" is set to \"%s\".", option, value);
-		}
-		
 		return;
 	}
 
-	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> [value]");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> <value>");
 }
 
 void CoreConfig::Initialize()
@@ -231,38 +106,21 @@ void CoreConfig::Initialize()
 	/* Try to get command line value of core config convar */
 	const char *corecfg = icvar->GetCommandLineValue("sm_corecfgfile");
 
-	/* If sm_corecfgfile is on the command line, use that
-	 * If sm_corecfgfile isn't there, check sm_basepath on the command line and build the path off that
-	 * If sm_basepath isn't there, just use the default path for the cfg
-	 */
-	if (corecfg)
+	/* If sm_corecfgfile not specified on command line, use default value */
+	if (!corecfg)
 	{
-		g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
-	}
-	else
-	{
-		const char *basepath = icvar->GetCommandLineValue("sm_basepath");
-
-		/* Format path to config file */
-		if (basepath)
-		{
-			g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s/%s", g_SourceMod.GetGamePath(), basepath, "configs/core.cfg");
-		}
-		else
-		{
-			g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), sm_corecfgfile.GetDefault());
-		}
+		corecfg = sm_corecfgfile.GetDefault();
 	}
 
-	/* Reset cached key values */
-	m_KeyValues.clear();
+	/* Format path to config file */
+	g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
 
 	/* Parse config file */
 	if ((err=textparsers->ParseFile_SMC(filePath, this, NULL)) != SMCError_Okay)
 	{
  		/* :TODO: This won't actually log or print anything :( - So fix that somehow */
 		const char *error = textparsers->GetSMCErrorString(err);
-		logger->LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
+		g_Logger.LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
 	}
 }
 
@@ -274,7 +132,7 @@ SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 	if (err == ConfigResult_Reject)
 	{
 		/* This is a fatal error */
-		logger->LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
+		g_Logger.LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
 	}
 
 	return SMCResult_Continue;
@@ -295,20 +153,9 @@ ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value,
 		pBase = pBase->m_pGlobalClassNext;
 	}
 
-	ke::AString vstr(value);
-	m_KeyValues.replace(option, ke::Move(vstr));
-
 	return ConfigResult_Ignore;
 }
 
-const char *CoreConfig::GetCoreConfigValue(const char *key)
-{
-	StringHashMap<ke::AString>::Result r = m_KeyValues.find(key);
-	if (!r.found())
-		return NULL;
-	return r->value.chars();
-}
-
 bool SM_AreConfigsExecuted()
 {
 	return g_bConfigsExecd;
@@ -318,12 +165,12 @@ inline bool IsPathSepChar(char c)
 {
 #if defined PLATFORM_WINDOWS
 	return (c == '\\' || c == '/');
-#elif defined PLATFORM_LINUX || defined PLATFORM_POSIX
+#elif defined PLATFORM_LINUX
 	return (c == '/');
 #endif
 }
 
-bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
+bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 {
 	bool will_create = false;
 	
@@ -410,7 +257,7 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 			FILE *fp = fopen(file, "wt");
 			if (fp)
 			{
-				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SOURCEMOD_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SVN_FULL_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 
@@ -467,11 +314,6 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 				can_create = false;
 				fclose(fp);
 			}
-			else
-			{
-				logger->LogError("Failed to auto generate config for %s, make sure the directory has write permission.", pl->GetFilename());
-				return can_create;
-			}
 		}
 	}
 
@@ -502,10 +344,10 @@ void SM_DoSingleExecFwds(IPluginContext *ctx)
 
 void SM_ConfigsExecuted_Plugin(unsigned int serial)
 {
-	IPluginIterator *iter = scripts->GetPluginIterator();
+	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
 	while (iter->MorePlugins())
 	{
-		IPlugin *plugin = iter->GetPlugin();
+		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
 		if (plugin->GetSerial() == serial)
 		{
 			SM_DoSingleExecFwds(plugin->GetBaseContext());
@@ -518,7 +360,7 @@ void SM_ConfigsExecuted_Plugin(unsigned int serial)
 
 void SM_ExecuteForPlugin(IPluginContext *ctx)
 {
-	SMPlugin *plugin = scripts->FindPluginByContext(ctx->GetContext());
+	CPlugin *plugin = (CPlugin *)g_PluginSys.GetPluginByCtx(ctx->GetContext());
 
 	unsigned int num = plugin->GetConfigCount();
 	if (!num)
@@ -540,27 +382,28 @@ void SM_ExecuteForPlugin(IPluginContext *ctx)
 
 void SM_ExecuteAllConfigs()
 {
-	if (g_bGotServerStart)
+	if (g_bConfigsExecd)
 	{
 		return;
 	}
 
 	engine->ServerCommand("exec sourcemod/sourcemod.cfg\n");
 
-	AutoPluginList plugins(scripts);
-	for (size_t i = 0; i < plugins->size(); i++)
+	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
+	while (iter->MorePlugins())
 	{
-		SMPlugin *plugin = plugins->at(i);
+		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
 		unsigned int num = plugin->GetConfigCount();
 		bool can_create = true;
 		for (unsigned int i=0; i<num; i++)
 		{
 			can_create = SM_ExecuteConfig(plugin, plugin->GetConfig(i), can_create);
 		}
+		iter->NextPlugin();
 	}
+	iter->Release();
 
-	g_bGotServerStart = true;
-	CheckAndFinalizeConfigs();
+	engine->ServerCommand("sm internal 1\n");
 }
 
 void SM_ConfigsExecuted_Global()
@@ -575,12 +418,3 @@ void SM_ConfigsExecuted_Global()
 	g_pOnServerCfg->Execute(NULL);
 	g_pOnConfigsExecuted->Execute(NULL);
 }
-
-void SM_InternalCmdTrigger()
-{
-	/* Order is important here.  We need to buffer things before we send the command out. */
-	g_pOnAutoConfigsBuffered->Execute(NULL);
-	engine->ServerCommand("sm internal 1\n");
-    g_PendingInternalPush = false;
-}
-

core/CoreConfig.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,8 +35,6 @@
 #include "sm_globals.h"
 #include <ITextParsers.h>
 #include <IRootConsoleMenu.h>
-#include <am-string.h>
-#include <sm_stringhashmap.h>
 
 using namespace SourceMod;
 
@@ -45,9 +43,6 @@ class CoreConfig :
 	public ITextListener_SMC,
 	public IRootConsoleCommand
 {
-public:
-	CoreConfig();
-	~CoreConfig();
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
@@ -61,14 +56,11 @@ public:
 	 * Initializes CoreConfig by reading from core.cfg file
 	 */
 	void Initialize();
-	const char *GetCoreConfigValue(const char *key);
 private:
 	/**
 	 * Sets configuration option by notifying SourceMod components that rely on core.cfg
 	 */
 	ConfigResult SetConfigOption(const char *option, const char *value, ConfigSource, char *Error, size_t maxlength);
-private:
-	StringHashMap<ke::AString> m_KeyValues;
 };
 
 extern bool SM_AreConfigsExecuted();
@@ -76,7 +68,6 @@ extern void SM_ExecuteAllConfigs();
 extern void SM_ExecuteForPlugin(IPluginContext *ctx);
 extern void SM_ConfigsExecuted_Global();
 extern void SM_ConfigsExecuted_Plugin(unsigned int serial);
-extern void SM_InternalCmdTrigger();
 
 extern CoreConfig g_CoreConfig;
 

core/CrazyDebugger.cpp

@@ -168,7 +168,9 @@ public:
 			}
 			else if (strcasecmp(me32.szModule, "steam.dll") == 0)
 			{
+				/* Steam.dll is loaded by engine.dll, so we can exit the loop here */
 				steam = me32.modBaseAddr;
+				break;
 			}
 		} while  (Module32Next(hModuleList, &me32));
 

core/Database.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,12 +30,14 @@
  */
 
 #include "Database.h"
-#include "ISourceMod.h"
 #include "HandleSys.h"
+#include "ShareSys.h"
+#include "sourcemod.h"
+#include "sm_stringutil.h"
+#include "Logger.h"
 #include "ExtensionSys.h"
-#include "PluginSys.h"
 #include <stdlib.h>
-#include <IThreader.h>
+#include "ThreadSupport.h"
 
 #define DBPARSE_LEVEL_NONE		0
 #define DBPARSE_LEVEL_MAIN		1
@@ -45,18 +47,10 @@ DBManager g_DBMan;
 static bool s_OneTimeThreaderErrorMsg = false;
 
 DBManager::DBManager() 
-	: m_Terminate(false),
-	  m_ParseLevel(0),
-	  m_ParseState(0),
-	  m_pDefault(NULL)
+: m_StrTab(512), m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
 {
 }
 
-static void FrameHook(bool simulating)
-{
-	g_DBMan.RunFrame();
-}
-
 void DBManager::OnSourceModAllInitialized()
 {
 	HandleAccess sec;
@@ -70,11 +64,13 @@ void DBManager::OnSourceModAllInitialized()
 
 	g_ShareSys.AddInterface(NULL, this);
 
-	g_pSM->BuildPath(Path_SM, m_Filename, sizeof(m_Filename), "configs/databases.cfg");
+	g_SourceMod.BuildPath(Path_SM, m_Filename, sizeof(m_Filename), "configs/databases.cfg");
+
+	m_pConfigLock = g_pThreader->MakeMutex();
+	m_pThinkLock = g_pThreader->MakeMutex();
+	m_pQueueLock = g_pThreader->MakeMutex();
 
 	g_PluginSys.AddPluginsListener(this);
-	
-	g_pSM->AddGameFrameHook(&FrameHook);
 }
 
 void DBManager::OnSourceModLevelChange(const char *mapName)
@@ -86,26 +82,28 @@ void DBManager::OnSourceModLevelChange(const char *mapName)
 	 * This way the thread's search won't be searching through a
 	 * potentially empty/corrupt list, which would be very bad.
 	 */
-	ke::AutoLock lock(&m_ConfigLock);
+	m_pConfigLock->Lock();
 	if ((err = textparsers->ParseFile_SMC(m_Filename, this, &states)) != SMCError_Okay)
 	{
-		logger->LogError("[SM] Detected parse error(s) in file \"%s\"", m_Filename);
+		g_Logger.LogError("[SM] Detected parse error(s) in file \"%s\"", m_Filename);
 		if (err != SMCError_Custom)
 		{
 			const char *txt = textparsers->GetSMCErrorString(err);
-			logger->LogError("[SM] Line %d: %s", states.line, txt);
+			g_Logger.LogError("[SM] Line %d: %s", states.line, txt);
 		}
 	}
+	m_pConfigLock->Unlock();
 }
 
 void DBManager::OnSourceModShutdown()
 {
-	g_pSM->RemoveGameFrameHook(&FrameHook);
 	KillWorkerThread();
 	g_PluginSys.RemovePluginsListener(this);
+	m_pConfigLock->DestroyThis();
+	m_pThinkLock->DestroyThis();
+	m_pQueueLock->DestroyThis();
 	g_HandleSys.RemoveType(m_DatabaseType, g_pCoreIdent);
 	g_HandleSys.RemoveType(m_DriverType, g_pCoreIdent);
-	ClearConfigs();
 }
 
 unsigned int DBManager::GetInterfaceVersion()
@@ -135,20 +133,13 @@ void DBManager::OnHandleDestroy(HandleType_t type, void *object)
 
 void DBManager::ReadSMC_ParseStart()
 {
-	ClearConfigs();
+	m_confs.clear();
 	m_ParseLevel = 0;
 	m_ParseState = DBPARSE_LEVEL_NONE;
+	m_StrTab.Reset();
 	m_DefDriver.clear();
 }
 
-void DBManager::ClearConfigs()
-{
-	List<ConfDbInfo *>::iterator iter;
-	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
-		delete (*iter);
-	m_confs.clear();
-}
-
 ConfDbInfo s_CurInfo;
 SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *name)
 {
@@ -168,7 +159,7 @@ SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *nam
 		}
 	} else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
 		s_CurInfo = ConfDbInfo();
-		s_CurInfo.name = name;
+		s_CurInfo.name = m_StrTab.AddString(name);
 		m_ParseState = DBPARSE_LEVEL_DATABASE;
 	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
 		m_ParseLevel++;
@@ -195,16 +186,16 @@ SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 		{
 			if (strcmp(value, "default") != 0)
 			{
-				s_CurInfo.driver = value;
+				s_CurInfo.driver = m_StrTab.AddString(value);
 			}
 		} else if (strcmp(key, "database") == 0) {
-			s_CurInfo.database = value;
+			s_CurInfo.database = m_StrTab.AddString(value);
 		} else if (strcmp(key, "host") == 0) {
-			s_CurInfo.host = value;
+			s_CurInfo.host = m_StrTab.AddString(value);
 		} else if (strcmp(key, "user") == 0) {
-			s_CurInfo.user = value;
+			s_CurInfo.user = m_StrTab.AddString(value);
 		} else if (strcmp(key, "pass") == 0) {
-			s_CurInfo.pass = value;
+			s_CurInfo.pass = m_StrTab.AddString(value);
 		} else if (strcmp(key, "timeout") == 0) {
 			s_CurInfo.info.maxTimeout = atoi(value);
 		} else if (strcmp(key, "port") == 0) {
@@ -215,6 +206,13 @@ SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 	return SMCResult_Continue;
 }
 
+#define ASSIGN_VAR(var) \
+	if (s_CurInfo.var == -1) { \
+		s_CurInfo.info.var = ""; \
+	} else { \
+		s_CurInfo.info.var = m_StrTab.GetString(s_CurInfo.var); \
+	}
+
 SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
 {
 	if (m_ParseLevel)
@@ -225,26 +223,17 @@ SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
 
 	if (m_ParseState == DBPARSE_LEVEL_DATABASE)
 	{
-		ConfDbInfo *cdb = new ConfDbInfo();
-
-		cdb->name = s_CurInfo.name;
-		cdb->driver = s_CurInfo.driver;
-		cdb->host = s_CurInfo.host;
-		cdb->user = s_CurInfo.user;
-		cdb->pass = s_CurInfo.pass;
-		cdb->database = s_CurInfo.database;
-		cdb->realDriver = s_CurInfo.realDriver;
-		cdb->info.maxTimeout = s_CurInfo.info.maxTimeout;
-		cdb->info.port = s_CurInfo.info.port;
-
-		cdb->info.driver = cdb->driver.c_str();
-		cdb->info.database = cdb->database.c_str();
-		cdb->info.host = cdb->host.c_str();
-		cdb->info.user = cdb->user.c_str();
-		cdb->info.pass = cdb->pass.c_str();
+		/* Set all of the info members to either a blank string
+		 * or the string pointer from the string table.
+		 */
+		ASSIGN_VAR(driver);
+		ASSIGN_VAR(database);
+		ASSIGN_VAR(host);
+		ASSIGN_VAR(user);
+		ASSIGN_VAR(pass);
 		
 		/* Save it.. */
-		m_confs.push_back(cdb);
+		m_confs.push_back(s_CurInfo);
 
 		/* Go up one level */
 		m_ParseState = DBPARSE_LEVEL_MAIN;
@@ -255,6 +244,7 @@ SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
 
 	return SMCResult_Continue;
 }
+#undef ASSIGN_VAR
 
 void DBManager::ReadSMC_ParseEnd(bool halted, bool failed)
 {
@@ -271,7 +261,7 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 			*pdr = NULL;
 		}
 		*pdb = NULL;
-		g_pSM->Format(error, maxlength, "Configuration \"%s\" not found", name);
+		UTIL_Format(error, maxlength, "Configuration \"%s\" not found", name);
 		return false;
 	}
 
@@ -308,7 +298,7 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 	}
 	*pdb = NULL;
 
-	g_pSM->Format(error, maxlength, "Driver \"%s\" not found", dname);
+	UTIL_Format(error, maxlength, "Driver \"%s\" not found", dname);
 
 	return false;
 }
@@ -343,22 +333,16 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
 	}
 
 	/* Make sure NOTHING references this! */
-	List<ConfDbInfo *>::iterator iter;
+	List<ConfDbInfo>::iterator iter;
 	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
 	{
-		ConfDbInfo &db = *(*iter);
+		ConfDbInfo &db = (*iter);
 		if (db.realDriver == pDriver)
 		{
 			db.realDriver = NULL;
 		}
 	}
 
-	/* Someone unloaded the default driver? Silly.. */
-	if (pDriver == m_pDefault)
-	{
-		m_pDefault = NULL;
-	}
-
 	/* Now that the driver is gone, we have to test the think queue.
 	 * Whatever happens therein is up to the db op!
 	 */
@@ -464,12 +448,12 @@ const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
 
 ConfDbInfo *DBManager::GetDatabaseConf(const char *name)
 {
-	List<ConfDbInfo *>::iterator iter;
+	List<ConfDbInfo>::iterator iter;
 
 	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
 	{
-		ConfDbInfo &conf = *(*iter);
-		if (conf.name == name)
+		ConfDbInfo &conf = (*iter);
+		if (strcmp(m_StrTab.GetString(conf.name), name) == 0)
 		{
 			return &conf;
 		}
@@ -490,7 +474,7 @@ IDBDriver *DBManager::FindOrLoadDriver(const char *name)
 	}
 
 	char filename[PLATFORM_MAX_PATH];
-	g_pSM->Format(filename, sizeof(filename), "dbi.%s.ext", name);
+	UTIL_Format(filename, sizeof(filename), "dbi.%s.ext", name);
 
 	IExtension *pExt = g_Extensions.LoadAutoExtension(filename);
 	if (!pExt || !pExt->IsLoaded() || m_drivers.size() <= last_size)
@@ -511,17 +495,12 @@ IDBDriver *DBManager::FindOrLoadDriver(const char *name)
 
 void DBManager::KillWorkerThread()
 {
-	if (m_Worker)
+	if (m_pWorker)
 	{
-		{
-			ke::AutoLock lock(&m_QueueEvent);
-			m_Terminate = true;
-			m_QueueEvent.Notify();
-		}
-		m_Worker->Join();
-		m_Worker = NULL;
+		m_pWorker->Stop(false);
+		g_pThreader->DestroyWorker(m_pWorker);
+		m_pWorker = NULL;
 		s_OneTimeThreaderErrorMsg = false;
-		m_Terminate = false;
 	}
 }
 
@@ -534,106 +513,99 @@ bool DBManager::AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio)
 		return false;
 	}
 
-	if (!m_Worker)
+	if (!m_pWorker)
 	{
-		m_Worker = new ke::Thread(this, "SM SQL Worker");
-		if (!m_Worker->Succeeded())
+		m_pWorker = g_pThreader->MakeWorker(this, true);
+		if (!m_pWorker)
 		{
 			if (!s_OneTimeThreaderErrorMsg)
 			{
-				logger->LogError("[SM] Unable to create db threader (error unknown)");
+				g_Logger.LogError("[SM] Unable to create db threader (error unknown)");
 				s_OneTimeThreaderErrorMsg = true;
 			}
-			m_Worker = NULL;
+			return false;
+		}
+		if (!m_pWorker->Start())
+		{
+			if (!s_OneTimeThreaderErrorMsg)
+			{
+				g_Logger.LogError("[SM] Unable to start db threader (error unknown)");
+				s_OneTimeThreaderErrorMsg = true;
+			}
+			g_pThreader->DestroyWorker(m_pWorker);
+			m_pWorker = NULL;
 			return false;
 		}
 	}
 
 	/* Add to the queue */
 	{
-		ke::AutoLock lock(&m_QueueEvent);
+		m_pQueueLock->Lock();
 		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetQueue(prio);
 		queue.push(op);
-		m_QueueEvent.Notify();
+		m_pQueueLock->Unlock();
 	}
 
+	/* Make the thread */
+	m_pWorker->MakeThread(this);
+
 	return true;
 }
 
-void DBManager::Run()
+void DBManager::OnWorkerStart(IThreadWorker *pWorker)
 {
-	// Initialize DB threadsafety.
-	for (size_t i=0; i < m_drivers.size(); i++)
+	m_drSafety.clear();
+	for (size_t i=0; i<m_drivers.size(); i++)
 	{
 		if (m_drivers[i]->IsThreadSafe())
+		{
 			m_drSafety.push_back(m_drivers[i]->InitializeThreadSafety());
-		else
+		} else {
 			m_drSafety.push_back(false);
+		}
 	}
+}
 
-	// Run actual worker thread logic.
-	ThreadMain();
-
-	// Shutdown DB threadsafety.
+void DBManager::OnWorkerStop(IThreadWorker *pWorker)
+{
 	for (size_t i=0; i<m_drivers.size(); i++)
 	{
 		if (m_drSafety[i])
+		{
 			m_drivers[i]->ShutdownThreadSafety();
+		}
 	}
 	m_drSafety.clear();
 }
 
-void DBManager::ThreadMain()
+void DBManager::RunThread(IThreadHandle *pThread)
 {
-	ke::AutoLock lock(&m_QueueEvent);
+	IDBThreadOperation *op = NULL;
 
-	while (true) {
-		// The lock has been acquired. Grab everything we can out of the
-		// queue. Since we want to flush the queue even if we're terminated,
-		// we process all operations we can before checking to terminate.
-		// There's no risk of starvation since the main thread blocks on us
-		// terminating.
-		while (true)
+	/* Get something from the queue */
+	{
+		m_pQueueLock->Lock();
+		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
+		if (!queue.empty())
 		{
-			Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
-			if (queue.empty())
-				break;
-
-			IDBThreadOperation *op = queue.first();
+			op = queue.first();
 			queue.pop();
-
-			// Unlock the queue when we run the query, so the main thread can
-			// keep pumping events. We re-acquire the lock to check for more
-			// items. It's okay if we terminate while unlocked; the main
-			// thread would be blocked and we'd need to flush the queue
-			// anyway, so after we've depleted the queue here, we'll just
-			// reach the terminate at the top of the loop.
-			{
-				ke::AutoUnlock unlock(&m_QueueEvent);
-				op->RunThreadPart();
-
-				ke::AutoLock lock(&m_ThinkLock);
-				m_ThinkQueue.push(op);
-			}
-			
-			
-			if (!m_Terminate)
-			{
-				ke::AutoUnlock unlock(&m_QueueEvent);
-#ifdef _WIN32
-				Sleep(20);
-#else
-				usleep(20000);
-#endif
-			}
 		}
-
-		if (m_Terminate)
-			return;
-
-		// Release the lock and wait for a signal.
-		m_QueueEvent.Wait();
+		m_pQueueLock->Unlock();
 	}
+
+	/* whoa.  hi.  did we get something? we should have. */
+	if (!op)
+	{
+		/* wtf? */
+		return;
+	}
+
+	op->RunThreadPart();
+
+	m_pThinkLock->Lock();
+	m_ThinkQueue.push(op);
+	m_pThinkLock->Unlock();
 }
 
 void DBManager::RunFrame()
@@ -645,16 +617,19 @@ void DBManager::RunFrame()
 	}
 
 	/* Dump one thing per-frame so the server stays sane. */
-	IDBThreadOperation *op;
-	{
-		ke::AutoLock lock(&m_ThinkLock);
-		op = m_ThinkQueue.first();
-		m_ThinkQueue.pop();
-	}
+	m_pThinkLock->Lock();
+	IDBThreadOperation *op = m_ThinkQueue.first();
+	m_ThinkQueue.pop();
+	m_pThinkLock->Unlock();
 	op->RunThinkPart();
 	op->Destroy();
 }
 
+void DBManager::OnTerminate(IThreadHandle *pThread, bool cancel)
+{
+	/* Do nothing */
+}
+
 void DBManager::OnSourceModIdentityDropped(IdentityToken_t *pToken)
 {
 	s_pAddBlock = pToken;
@@ -730,21 +705,15 @@ void DBManager::OnPluginUnloaded(IPlugin *plugin)
 
 void DBManager::LockConfig()
 {
-	m_ConfigLock.Lock();
+	m_pConfigLock->Lock();
 }
 
 void DBManager::UnlockConfig()
 {
-	m_ConfigLock.Unlock();
+	m_pConfigLock->Unlock();
 }
 
 const char *DBManager::GetDefaultDriverName()
 {
 	return m_DefDriver.c_str();
 }
-
-void DBManager::AddDependency(IExtension *myself, IDBDriver *driver)
-{
-	g_Extensions.AddRawDependency(myself, driver->GetIdentity(), driver);
-}
-

core/Database.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,29 +33,30 @@
 #define _INCLUDE_DATABASE_MANAGER_H_
 
 #include <IDBDriver.h>
-#include "common_logic.h"
+#include "sm_globals.h"
 #include <sh_vector.h>
 #include <sh_string.h>
 #include <sh_list.h>
 #include <ITextParsers.h>
+#include "sm_memtable.h"
 #include <IThreader.h>
-#include <IPluginSys.h>
-#include <am-thread-utils.h>
 #include "sm_simple_prioqueue.h"
+#include "PluginSys.h"
 
 using namespace SourceHook;
 
 struct ConfDbInfo
 {
-	ConfDbInfo() : realDriver(NULL)
+	ConfDbInfo() : name(-1), driver(-1), host(-1), user(-1), pass(-1), 
+		database(-1), realDriver(NULL)
 	{
 	}
-	String name;
-	String driver;
-	String host;
-	String user;
-	String pass;
-	String database;
+	int name;
+	int driver;
+	int host;
+	int user;
+	int pass;
+	int database;
 	IDBDriver *realDriver;
 	DatabaseInfo info;
 };
@@ -65,8 +66,9 @@ class DBManager :
 	public SMGlobalClass,
 	public IHandleTypeDispatch,
 	public ITextListener_SMC,
-	public IPluginsListener,
-	public ke::IRunnable
+	public IThread,
+	public IThreadWorkerCallbacks,
+	public IPluginsListener
 {
 public:
 	DBManager();
@@ -90,16 +92,18 @@ public: //IDBManager
 	Handle_t CreateHandle(DBHandleType type, void *ptr, IdentityToken_t *pToken);
 	HandleError ReadHandle(Handle_t hndl, DBHandleType type, void **ptr);
 	HandleError ReleaseHandle(Handle_t hndl, DBHandleType type, IdentityToken_t *token);
-	void AddDependency(IExtension *myself, IDBDriver *driver);
 public: //ITextListener_SMC
 	void ReadSMC_ParseStart();
 	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
 	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
 	SMCResult ReadSMC_LeavingSection(const SMCStates *states);
 	void ReadSMC_ParseEnd(bool halted, bool failed);
-public: //ke::IRunnable
-	void Run();
-	void ThreadMain();
+public: //IThread
+	void RunThread(IThreadHandle *pThread);
+	void OnTerminate(IThreadHandle *pThread, bool cancel);
+public: //IThreadWorkerCallbacks
+	void OnWorkerStart(IThreadWorker *pWorker);
+	void OnWorkerStop(IThreadWorker *pWorker);
 public: //IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public:
@@ -116,7 +120,6 @@ public:
 		return m_DatabaseType;
 	}
 private:
-	void ClearConfigs();
 	void KillWorkerThread();
 private:
 	CVector<IDBDriver *> m_drivers;
@@ -125,16 +128,16 @@ private:
 	PrioQueue<IDBThreadOperation *> m_OpQueue;
 	Queue<IDBThreadOperation *> m_ThinkQueue;
 	CVector<bool> m_drSafety;			/* which drivers are safe? */
-	ke::AutoPtr<ke::Thread> m_Worker;
-	ke::ConditionVariable m_QueueEvent;
-	ke::Mutex m_ConfigLock;
-	ke::Mutex m_ThinkLock;
-	bool m_Terminate;
+	IThreadWorker *m_pWorker;			/* Worker thread object */
+	IMutex *m_pConfigLock;				/* Configuration lock */
+	IMutex *m_pQueueLock;				/* Queue safety lock */
+	IMutex *m_pThinkLock;				/* Think-queue lock */
 
-	List<ConfDbInfo *> m_confs;
+	List<ConfDbInfo> m_confs;
 	HandleType_t m_DriverType;
 	HandleType_t m_DatabaseType;
 	String m_DefDriver;
+	BaseStringTable m_StrTab;
 	char m_Filename[PLATFORM_MAX_PATH];
 	unsigned int m_ParseLevel;
 	unsigned int m_ParseState;

core/DebugReporter.cpp

@@ -29,46 +29,34 @@
  * Version: $Id$
  */
 
-#include <IPluginSys.h>
-#include <stdarg.h>
 #include "DebugReporter.h"
 #include "Logger.h"
+#include "PluginSys.h"
+#include "sm_stringutil.h"
 
 DebugReport g_DbgReporter;
 
+/* I'm really lazy.  This should probably be exported to ISourcePawnEngine someday,
+ * but we need to make sure the JIT will deal with the version bump.
+ */
+extern const char *GetSourcePawnErrorMessage(int error);
+
 void DebugReport::OnSourceModAllInitialized()
 {
 	g_pSourcePawn->SetDebugListener(this);
 }
 
-void DebugReport::OnDebugSpew(const char *msg, ...)
-{
-	va_list ap;
-	char buffer[512];
-
-	va_start(ap, msg);
-	smcore.FormatArgs(buffer, sizeof(buffer), msg, ap);
-	va_end(ap);
-
-	g_Logger.LogMessage("[SM] %s", buffer);
-}
-
 void DebugReport::GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...)
 {
 	va_list ap;
+	char buffer[512];
 
 	va_start(ap, message);
-	GenerateErrorVA(ctx, func_idx, err, message, ap);
+	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
 	va_end(ap);
-}
 
-void DebugReport::GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap)
-{
-	char buffer[512];
-	smcore.FormatArgs(buffer, sizeof(buffer), message, ap);
-
-	const char *plname = pluginsys->FindPluginByContext(ctx->GetContext())->GetFilename();
-	const char *error = g_pSourcePawn2->GetErrorString(err);
+	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
+	const char *error = GetSourcePawnErrorMessage(err);
 
 	if (error)
 	{
@@ -85,7 +73,7 @@ void DebugReport::GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err,
 		{
 			func_idx >>= 1;
 			sp_public_t *function;
-			if (ctx->GetRuntime()->GetPublicByIndex(func_idx, &function) == SP_ERROR_NONE)
+			if (ctx->GetPublicByIndex(func_idx, &function) == SP_ERROR_NONE)
 			{
 				g_Logger.LogError("[SM] Unable to call function \"%s\" due to above error(s).", function->name);
 			}
@@ -99,11 +87,11 @@ void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t code_addr
 	char buffer[512];
 
 	va_start(ap, message);
-	smcore.FormatArgs(buffer, sizeof(buffer), message, ap);
+	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
 	va_end(ap);
 
-	const char *plname = pluginsys->FindPluginByContext(pContext->GetContext())->GetFilename();
-	const char *error = g_pSourcePawn2->GetErrorString(err);
+	const char *plname = g_PluginSys.FindPluginByContext(pContext->GetContext())->GetFilename();
+	const char *error = GetSourcePawnErrorMessage(err);
 
 	if (error)
 	{
@@ -115,7 +103,7 @@ void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t code_addr
 	g_Logger.LogError("[SM] %s", buffer);
 
 	IPluginDebugInfo *pDebug;
-	if ((pDebug = pContext->GetRuntime()->GetDebugInfo()) == NULL)
+	if ((pDebug = pContext->GetDebugInfo()) == NULL)
 	{
 		g_Logger.LogError("[SM] Debug mode is not enabled for \"%s\"", plname);
 		g_Logger.LogError("[SM] To enable debug mode, edit plugin_settings.cfg, or type: sm plugins debug %d on",
@@ -135,7 +123,7 @@ void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t code_addr
 void DebugReport::OnContextExecuteError(IPluginContext *ctx, IContextTrace *error)
 {
 	const char *lastname;
-	const char *plname = pluginsys->FindPluginByContext(ctx->GetContext())->GetFilename();
+	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
 	int n_err = error->GetErrorCode();
 
 	if (n_err != SP_ERROR_NATIVE)
@@ -180,7 +168,7 @@ void DebugReport::OnContextExecuteError(IPluginContext *ctx, IContextTrace *erro
 int DebugReport::_GetPluginIndex(IPluginContext *ctx)
 {
 	int id = 1;
-	IPluginIterator *iter = pluginsys->GetPluginIterator();
+	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
 
 	for (; iter->MorePlugins(); iter->NextPlugin(), id++)
 	{
@@ -196,6 +184,6 @@ int DebugReport::_GetPluginIndex(IPluginContext *ctx)
 
 	/* If we don't know which plugin this is, it's one being loaded.  Fake its index for now. */
 
-	return pluginsys->GetPluginCount() + 1;
+	return g_PluginSys.GetPluginCount() + 1;
 }
 

core/DebugReporter.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,7 +33,7 @@
 #define _INCLUDE_SOURCEMOD_CDBGREPORTER_H_
 
 #include "sp_vm_api.h"
-#include "common_logic.h"
+#include "sm_globals.h"
 
 class DebugReport : 
 	public SMGlobalClass, 
@@ -43,10 +43,7 @@ public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 public: // IDebugListener
 	void OnContextExecuteError(IPluginContext *ctx, IContextTrace *error);
-	void OnDebugSpew(const char *msg, ...);
-public:
 	void GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...);
-	void GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap); 
 	void GenerateCodeError(IPluginContext *ctx, uint32_t code_addr, int err, const char *message, ...);
 private:
 	int _GetPluginIndex(IPluginContext *ctx);

core/EventManager.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,8 +30,10 @@
  */
 
 #include "EventManager.h"
+#include "ForwardSys.h"
+#include "HandleSys.h"
+#include "PluginSys.h"
 #include "sm_stringutil.h"
-#include "logic_bridge.h"
 
 EventManager g_EventManager;
 
@@ -40,26 +42,16 @@ SH_DECL_HOOK2(IGameEventManager2, FireEvent, SH_NOATTRIB, 0, bool, IGameEvent *,
 const ParamType GAMEEVENT_PARAMS[] = {Param_Cell, Param_String, Param_Cell};
 typedef List<EventHook *> EventHookList;
 
-class EventForwardFilter : public IForwardFilter
-{
-	EventInfo *pEventInfo;
-public:
-	EventForwardFilter(EventInfo *pEventInfo) : pEventInfo(pEventInfo)
-	{
-	}
-
-	void Preprocess(IPluginFunction *fun, FwdParamInfo *params)
-	{
-		params[2].val = pEventInfo->bDontBroadcast ? 1 : 0;
-	}
-};
-
 EventManager::EventManager() : m_EventType(0)
 {
+	/* Create an event lookup trie */
+	m_EventHooks = sm_trie_create();
 }
 
 EventManager::~EventManager()
 {
+	sm_trie_destroy(m_EventHooks);
+
 	/* Free memory used by EventInfo structs if any */
 	CStack<EventInfo *>::iterator iter;
 	for (iter = m_FreeEvents.begin(); iter != m_FreeEvents.end(); iter++)
@@ -73,8 +65,8 @@ EventManager::~EventManager()
 void EventManager::OnSourceModAllInitialized()
 {
 	/* Add a hook for IGameEventManager2::FireEvent() */
-	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
-	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
+	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
+	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
 
 	HandleAccess sec;
 
@@ -84,17 +76,17 @@ void EventManager::OnSourceModAllInitialized()
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 	/* Create the 'GameEvent' handle type */
-	m_EventType = handlesys->CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_EventType = g_HandleSys.CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void EventManager::OnSourceModShutdown()
 {
 	/* Remove hook for IGameEventManager2::FireEvent() */
-	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
-	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
+	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
+	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
 
 	/* Remove the 'GameEvent' handle type */
-	handlesys->RemoveType(m_EventType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_EventType, g_pCoreIdent);
 
 	/* Remove ourselves as listener for events */
 	gameevents->RemoveListener(this);
@@ -132,12 +124,12 @@ void EventManager::OnPluginUnloaded(IPlugin *plugin)
 			{
 				if (pHook->pPreHook)
 				{
-					forwardsys->ReleaseForward(pHook->pPreHook);
+					g_Forwards.ReleaseForward(pHook->pPreHook);
 				}
 
 				if (pHook->pPostHook)
 				{
-					forwardsys->ReleaseForward(pHook->pPostHook);
+					g_Forwards.ReleaseForward(pHook->pPostHook);
 				}
 
 				delete pHook;
@@ -155,13 +147,6 @@ void EventManager::FireGameEvent(IGameEvent *pEvent)
 	   Just need to add ourselves as a listener to make our hook on IGameEventManager2::FireEvent work */
 }
 
-#if SOURCE_ENGINE >= SE_LEFT4DEAD && SOURCE_ENGINE != SE_DOTA
-int EventManager::GetEventDebugID()
-{
-	return EVENT_DEBUG_ID_INIT;
-}
-#endif
-
 EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunction, EventHookMode mode)
 {
 	EventHook *pHook;
@@ -178,10 +163,10 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 	}
 
 	/* If a hook structure does not exist... */
-	if (!m_EventHooks.retrieve(name, &pHook))
+	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
 	{
 		EventHookList *pHookList;
-		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
 
 		/* Check plugin for an existing EventHook list */
 		if (!plugin->GetProperty("EventHooks", (void **)&pHookList))
@@ -196,27 +181,24 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		if (mode == EventHookMode_Pre)
 		{
 			/* Create forward for a pre hook */
-			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
 			/* Add to forward list */
 			pHook->pPreHook->AddFunction(pFunction);
 		} else {
 			/* Create forward for a post hook */
-			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 			/* Should we copy data from a pre hook to the post hook? */
 			pHook->postCopy = (mode == EventHookMode_Post);
 			/* Add to forward list */
 			pHook->pPostHook->AddFunction(pFunction);
 		}
 
-		/* Cache the name for post hooks */
-		pHook->name = name;
-
 		/* Increase reference count */
 		pHook->refCount++;
 
 		/* Add hook structure to hook lists */
 		pHookList->push_back(pHook);
-		m_EventHooks.insert(name, pHook);
+		sm_trie_insert(m_EventHooks, name, pHook);
 
 		return EventHookErr_Okay;
 	}
@@ -228,7 +210,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create pre hook forward if necessary */
 		if (!pHook->pPreHook)
 		{
-			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
 		}
 
 		/* Add plugin function to forward list */
@@ -237,7 +219,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create post hook forward if necessary */
 		if (!pHook->pPostHook)
 		{
-			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 		}
 
 		/* If postCopy is false, then we may want to set it to true */
@@ -262,7 +244,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	IChangeableForward **pEventForward;
 
 	/* If hook does not exist at all */
-	if (!m_EventHooks.retrieve(name, &pHook))
+	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
 	{
 		return EventHookErr_NotActive;
 	}
@@ -284,7 +266,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	/* If forward's list contains 0 functions now, free it */
 	if ((*pEventForward)->GetFunctionCount() == 0)
 	{
-		forwardsys->ReleaseForward(*pEventForward);
+		g_Forwards.ReleaseForward(*pEventForward);
 		*pEventForward = NULL;
 	}
 
@@ -294,7 +276,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		/* If reference count is now 0, free hook structure */
 
 		EventHookList *pHookList;
-		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
 
 		/* Get plugin's event hook list */
 		if (!plugin->GetProperty("EventHooks", (void**)&pHookList))
@@ -312,7 +294,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		pHookList->remove(pHook);
 
 		/* Delete entry in trie */
-		m_EventHooks.remove(name);
+		sm_trie_delete(m_EventHooks, name);
 
 		/* And finally free structure memory */
 		delete pHook;
@@ -339,7 +321,6 @@ EventInfo *EventManager::CreateEvent(IPluginContext *pContext, const char *name,
 
 		pInfo->pEvent = pEvent;
 		pInfo->pOwner = pContext->GetIdentity();
-		pInfo->bDontBroadcast = false;
 
 		return pInfo;
 	}
@@ -378,49 +359,33 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 	IChangeableForward *pForward;
 	const char *name;
 	cell_t res = Pl_Continue;
-	bool broadcast = bDontBroadcast;
-
-	/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
-	if (!pEvent)
-	{
-		RETURN_META_VALUE(MRES_IGNORED, false);
-	}
-
-	name = pEvent->GetName();
 	
-	if (m_EventHooks.retrieve(name, &pHook))
-	{
-		/* Push the event onto the event stack.  The reference count is increased to make sure 
-		 * the structure is not garbage collected in between now and the post hook.
-		 */
-		pHook->refCount++;
-		m_EventStack.push(pHook);
+	/* Get the event name, we're going to need this for passing to post hooks */
+	name = pEvent->GetName();
 
+	m_EventNames.push(name);
+
+	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
+	{
 		pForward = pHook->pPreHook;
 
 		if (pForward)
 		{
-			EventInfo info(pEvent, NULL);
-			HandleSecurity sec(NULL, g_pCoreIdent);
-			Handle_t hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
-
-			info.bDontBroadcast = bDontBroadcast;
-
-			EventForwardFilter filter(&info);
+			EventInfo info = { pEvent, NULL };
 
+			Handle_t hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 			pForward->PushCell(hndl);
 			pForward->PushString(name);
 			pForward->PushCell(bDontBroadcast);
-			pForward->Execute(&res, &filter);
+			pForward->Execute(&res, NULL);
 
-			broadcast = info.bDontBroadcast;
-
-			handlesys->FreeHandle(hndl, &sec);
+			HandleSecurity sec(NULL, g_pCoreIdent);
+			g_HandleSys.FreeHandle(hndl, &sec);
 		}
 
 		if (pHook->postCopy)
 		{
-			m_EventCopies.push(gameevents->DuplicateEvent(pEvent));
+			pHook->pEventCopy = gameevents->DuplicateEvent(pEvent);
 		}
 
 		if (res)
@@ -429,13 +394,6 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 			RETURN_META_VALUE(MRES_SUPERCEDE, false);
 		}
 	}
-	else
-	{
-		m_EventStack.push(NULL);
-	}
-
-	if (broadcast != bDontBroadcast)
-		RETURN_META_VALUE_NEWPARAMS(MRES_IGNORED, true, &IGameEventManager2::FireEvent, (pEvent, broadcast));
 
 	RETURN_META_VALUE(MRES_IGNORED, true);
 }
@@ -443,38 +401,32 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 /* IGameEventManager2::FireEvent post hook */
 bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 {
+	IGameEvent *pEventCopy = NULL;
 	EventHook *pHook;
-	EventInfo info;
 	IChangeableForward *pForward;
+	const char *name;
 	Handle_t hndl = 0;
 
-	/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
-	if (!pEvent)
-	{
-		RETURN_META_VALUE(MRES_IGNORED, false);
-	}
+	name = m_EventNames.front();
 
-	pHook = m_EventStack.front();
-
-	if (pHook != NULL)
+	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
 	{
 		pForward = pHook->pPostHook;
 
 		if (pForward)
 		{
+			EventInfo info = { pHook->pEventCopy, NULL };
+
 			if (pHook->postCopy)
 			{
-				info.bDontBroadcast = bDontBroadcast;
-				info.pEvent = m_EventCopies.front();
-				info.pOwner = NULL;
-				hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
+				hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 
 				pForward->PushCell(hndl);
 			} else {
 				pForward->PushCell(BAD_HANDLE);
 			}
 
-			pForward->PushString(pHook->name.chars());
+			pForward->PushString(name);
 			pForward->PushCell(bDontBroadcast);
 			pForward->Execute(NULL);
 
@@ -482,25 +434,16 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 			{
 				/* Free handle */
 				HandleSecurity sec(NULL, g_pCoreIdent);
-				handlesys->FreeHandle(hndl, &sec);
+				g_HandleSys.FreeHandle(hndl, &sec);
 
 				/* Free event structure */
-				gameevents->FreeEvent(info.pEvent);
-				m_EventCopies.pop();
+				gameevents->FreeEvent(pEventCopy);
+				pHook->pEventCopy = NULL;
 			}
 		}
-
-		/* Decrement reference count, check if a delayed delete is needed */
-		if (--pHook->refCount == 0)
-		{
-			assert(pHook->pPostHook == NULL);
-			assert(pHook->pPreHook == NULL);
-			m_EventHooks.remove(pHook->name.chars());
-			delete pHook;
-		}
 	}
 
-	m_EventStack.pop();
+	m_EventNames.pop();
 
 	RETURN_META_VALUE(MRES_IGNORED, true);
 }

core/EventManager.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,7 +34,7 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include <sm_namehashset.h>
+#include "sm_trie.h"
 #include <sh_list.h>
 #include <sh_stack.h>
 #include <IHandleSys.h>
@@ -45,15 +45,8 @@ using namespace SourceHook;
 
 struct EventInfo
 {
-	EventInfo()
-	{
-	}
-	EventInfo(IGameEvent *ev, IdentityToken_t *owner) : pEvent(ev), pOwner(owner)
-	{
-	}
 	IGameEvent *pEvent;
 	IdentityToken_t *pOwner;
-	bool bDontBroadcast;
 };
 
 struct EventHook
@@ -63,18 +56,14 @@ struct EventHook
 		pPreHook = NULL;
 		pPostHook = NULL;
 		postCopy = false;
+		pEventCopy = NULL;
 		refCount = 0;
 	}
 	IChangeableForward *pPreHook;
 	IChangeableForward *pPostHook;
 	bool postCopy;
+	IGameEvent *pEventCopy;
 	unsigned int refCount;
-	ke::AString name;
-
-	static inline bool matches(const char *name, const EventHook *hook)
-	{
-		return strcmp(name, hook->name.chars()) == 0;
-	}
 };
 
 enum EventHookMode
@@ -110,9 +99,6 @@ public: // IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public: // IGameEventListener2
 	void FireGameEvent(IGameEvent *pEvent);
-#if SOURCE_ENGINE >= SE_LEFT4DEAD && SOURCE_ENGINE != SE_DOTA
-	int GetEventDebugID();
-#endif
 public:
 	/**
 	 * Get the 'GameEvent' handle type ID.
@@ -132,10 +118,9 @@ private: // IGameEventManager2 hooks
 	bool OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast);
 private:
 	HandleType_t m_EventType;
-	NameHashSet<EventHook *> m_EventHooks;
+	Trie *m_EventHooks;
 	CStack<EventInfo *> m_FreeEvents;
-	CStack<EventHook *> m_EventStack;
-	CStack<IGameEvent *> m_EventCopies;
+	CStack<const char *> m_EventNames;
 };
 
 extern EventManager g_EventManager;

core/GameConfigs.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,20 +32,26 @@
 #include <string.h>
 #include <stdlib.h>
 #include "GameConfigs.h"
-//#include "sm_stringutil.h"
-//#include "sourcemod.h"
-//#include "sourcemm_api.h"
-//#include "HalfLife2.h"
-//#include "Logger.h"
-//#include "ShareSys.h"
-//#include "MemoryUtils.h"
-//#include "LibrarySys.h"
-//#include "HandleSys.h"
-//#include "sm_crc32.h"
+#include "sm_stringutil.h"
+#include "sourcemod.h"
+#include "sourcemm_api.h"
+#include "HalfLife2.h"
+#include "Logger.h"
+#include "ShareSys.h"
+#include "MemoryUtils.h"
+#include "LibrarySys.h"
+#include "HandleSys.h"
+#include "sm_crc32.h"
 
-//#if defined PLATFORM_LINUX
-//#include <dlfcn.h>
-//#endif
+#if defined PLATFORM_LINUX
+#include <dlfcn.h>
+#endif
+
+GameConfigManager g_GameConfigs;
+IGameConfig *g_pGameConf = NULL;
+char g_Game[256];
+char g_GameDesc[256] = {'!', '\0'};
+char g_GameName[256] = {'$', '\0'};
 
 #define PSTATE_NONE						0
 #define PSTATE_GAMES					1
@@ -58,53 +64,47 @@
 #define PSTATE_GAMEDEFS_SIGNATURES_SIG	8
 #define PSTATE_GAMEDEFS_CRC				9
 #define PSTATE_GAMEDEFS_CRC_BINARY		10
-#define PSTATE_GAMEDEFS_CUSTOM			11
-
-#define WIN 0
-#define LIN 1
 
+#if defined PLATFORM_WINDOWS
+#define PLATFORM_NAME				"windows"
+#define PLATFORM_SERVER_BINARY		"server.dll"
+#elif defined PLATFORM_LINUX
 #define PLATFORM_NAME				"linux"
 #define PLATFORM_SERVER_BINARY		"server_i486.so"
+#endif
 
-Offset *tempOffset;
-Sig *tempSig;
-
+struct TempSigInfo
+{
+	void Reset()
+	{
+		library[0] = '\0';
+		sig[0] = '\0';
+	}
+	char sig[512];
+	char library[64];
+} s_TempSig;
 unsigned int s_ServerBinCRC;
 bool s_ServerBinCRC_Ok = false;
 
-bool /*CGameConfig::*/DoesGameMatch(const char *value)
+CGameConfig::CGameConfig(const char *file)
 {
-	if (strcmp(value, /*m_gdcG*/game) == 0)
-	{
-		return true;
-	}
-	return false;
-}
-
-bool /*CGameConfig::*/DoesEngineMatch(const char *value)
-{
-	if (strcmp(value, /*m_gdcE*/engine) == 0)
-	{
-		return true;
-	}
-	return false;
-}
-
-CGameConfig::CGameConfig()//const char *file)//, const char *game, const char *engine)
-{
-//	strncopy(m_File, file, sizeof(m_File));
-//	strncopy(m_gdcGame, game, sizeof(m_gdcGame));
-//	strncopy(m_gdcEngine, engine, sizeof(m_gdcEngine));
-	//m_pStrings = new BaseStringTable(512);
+	m_pFile = sm_strdup(file);
+	m_pOffsets = sm_trie_create();
+	m_pProps = sm_trie_create();
+	m_pKeys = sm_trie_create();
+	m_pSigs = sm_trie_create();
+	m_pStrings = new BaseStringTable(512);
 	m_RefCount = 0;
-
-	m_CustomLevel = 0;
-	m_CustomHandler = NULL;
 }
 
 CGameConfig::~CGameConfig()
 {
-//	delete m_pStrings;
+	sm_trie_destroy(m_pOffsets);
+	sm_trie_destroy(m_pProps);
+	sm_trie_destroy(m_pKeys);
+	sm_trie_destroy(m_pSigs);
+	delete [] m_pFile;
+	delete m_pStrings;
 }
 
 SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *name)
@@ -129,9 +129,11 @@ SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *n
 		}
 	case PSTATE_GAMES:
 		{
-			if (strcmp(name, "*") == 0 ||
-				strcmp(name, "#default") == 0 ||
-				DoesGameMatch(name))
+			if ((strcmp(name, "*") == 0)
+				|| (strcmp(name, "#default") == 0)
+				|| (strcasecmp(name, g_Game) == 0)
+				|| (strcasecmp(name, g_GameDesc) == 0)
+				|| (strcasecmp(name, g_GameName) == 0))
 			{
 				bShouldBeReadingDefault = true;
 				m_ParseState = PSTATE_GAMEDEFS;
@@ -151,15 +153,12 @@ SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *n
 			{
 				m_ParseState = PSTATE_GAMEDEFS_KEYS;
 			}
-			else if ((strcmp(name, "#supported") == 0) && (strcmp(m_Game, "#default") == 0))
+			else if ((strcmp(name, "#supported") == 0)
+					 && (strcmp(m_Game, "#default") == 0))
 			{
 				m_ParseState = PSTATE_GAMEDEFS_SUPPORTED;
 				/* Ignore this section unless we get a game. */
 				bShouldBeReadingDefault = false;
-				had_game = false;
-				matched_game = false;
-				had_engine = false;
-				matched_engine = false;
 			}
 			else if (strcmp(name, "Signatures") == 0)
 			{
@@ -167,25 +166,12 @@ SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *n
 			}
 			else if (strcmp(name, "CRC") == 0)
 			{
-#if 0
 				m_ParseState = PSTATE_GAMEDEFS_CRC;
 				bShouldBeReadingDefault = false;
-#endif
 			}
 			else
 			{
-#if 0
-				ITextListener_SMC **pListen = g_GameConfigs.m_customHandlers.retrieve(name);
-
-				if (pListen != NULL)
-				{
-					m_CustomLevel = 0;
-					m_ParseState = PSTATE_GAMEDEFS_CUSTOM;
-					m_CustomHandler = *pListen;
-					m_CustomHandler->ReadSMC_ParseStart();
-					break;
-				}
-#endif
+				m_IgnoreLevel++;
 			}
 			break;
 		}
@@ -193,19 +179,17 @@ SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *n
 		{
 			m_Prop[0] = '\0';
 			m_Class[0] = '\0';
-			tempOffset = new Offset();
-			tempOffset->setName(name);
+			strncopy(m_offset, name, sizeof(m_offset));
 			m_ParseState = PSTATE_GAMEDEFS_OFFSETS_OFFSET;
 			break;
 		}
 	case PSTATE_GAMEDEFS_SIGNATURES:
 		{
-			tempSig = new Sig();
-			tempSig->setName(name);
+			strncopy(m_offset, name, sizeof(m_offset));
+			s_TempSig.Reset();
 			m_ParseState = PSTATE_GAMEDEFS_SIGNATURES_SIG;
 			break;
 		}
-#if 0
 	case PSTATE_GAMEDEFS_CRC:
 		{
 			char error[255];
@@ -236,26 +220,18 @@ SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *n
 					s_ServerBinCRC = UTIL_CRC32(buffer, size);
 					free(buffer);
 					s_ServerBinCRC_Ok = true;
-					fclose(fp);
 				}
 			}
 			if (error[0] != '\0')
 			{
 				m_IgnoreLevel = 1;
-				g_Logger.LogError("[SM] Error while parsing CRC section for \"%s\" (%s):", m_Game, m_CurFile);
+				g_Logger.LogError("[SM] Error while parsing CRC section for \"%s\" (%s):", m_Game, m_pFile);
 				g_Logger.LogError("[SM] %s", error);
 			} else {
 				m_ParseState = PSTATE_GAMEDEFS_CRC_BINARY;
 			}
 			break;
 		}
-	case PSTATE_GAMEDEFS_CUSTOM:
-		{
-			m_CustomLevel++;
-			return m_CustomHandler->ReadSMC_NewSection(states, name);
-			break;
-		}
-#endif
 	/* No sub-sections allowed:
 	 case PSTATE_GAMEDEFS_OFFSETS_OFFSET:
 	 case PSTATE_GAMEDEFS_KEYS:
@@ -288,46 +264,29 @@ SMCResult CGameConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key
 			strncopy(m_Class, value, sizeof(m_Class));
 		} else if (strcmp(key, "prop") == 0) {
 			strncopy(m_Prop, value, sizeof(m_Prop));
-		} else /*if (strcmp(key, PLATFORM_NAME) == 0) */ {
+		} else if (strcmp(key, PLATFORM_NAME) == 0) {
 			int val = atoi(value);
-//			sm_trie_replace(m_pOffsets, m_offset, (void *)val);
-			if (strcmp(key, "windows") == 0) tempOffset->setWin(val);
-			else if (strcmp(key, "linux") == 0) tempOffset->setLin(val);
+			sm_trie_replace(m_pOffsets, m_offset, (void *)val);
 		}
 	} else if (m_ParseState == PSTATE_GAMEDEFS_KEYS) {
-		m_Keys[key] = value;
-//		printf("Inserting %s - %s\n", key, value);
-//		int id = m_pStrings->AddString(value);
-//		sm_trie_replace(m_pKeys, key, (void *)id);
+		int id = m_pStrings->AddString(value);
+		sm_trie_replace(m_pKeys, key, (void *)id);
 	} else if (m_ParseState == PSTATE_GAMEDEFS_SUPPORTED) {
-		if (strcmp(key, "game") == 0)
+		if (strcmp(key, "game") == 0
+			&& (strcasecmp(value, g_Game) == 0 
+				|| strcasecmp(value, g_GameDesc) == 0
+				|| strcasecmp(value, g_GameName) == 0)
+				)
 		{
-			had_game = true;
-			if (DoesGameMatch(value))
-			{
-				matched_game = true;
-			}
-			if ((!had_engine && matched_game) || (matched_engine && matched_game))
-			{
-				bShouldBeReadingDefault = true;
-			}
-		}
-		else if (strcmp(key, "engine") == 0)
-		{
-			had_engine = true;
-			if (DoesEngineMatch(value))
-			{
-				matched_engine = true;
-			}
-			if ((!had_game && matched_engine) || (matched_game && matched_engine))
-			{
-				bShouldBeReadingDefault = true;
-			}
+			bShouldBeReadingDefault = true;
 		}
 	} else if (m_ParseState == PSTATE_GAMEDEFS_SIGNATURES_SIG) {
-		if (strcmp(key, "windows") == 0) tempSig->setWin(value);
-		else if (strcmp(key, "linux") == 0) tempSig->setLin(value);
-		else if (strcmp(key, "library") == 0) tempSig->setLib(value);
+		if (strcmp(key, PLATFORM_NAME) == 0)
+		{
+			strncopy(s_TempSig.sig, value, sizeof(s_TempSig.sig));
+		} else if (strcmp(key, "library") == 0) {
+			strncopy(s_TempSig.library, value, sizeof(s_TempSig.library));
+		}
 	} else if (m_ParseState == PSTATE_GAMEDEFS_CRC_BINARY) {
 		if (strcmp(key, PLATFORM_NAME) == 0 
 			&& s_ServerBinCRC_Ok
@@ -340,8 +299,6 @@ SMCResult CGameConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key
 				bShouldBeReadingDefault = true;
 			}
 		}
-	} else if (m_ParseState == PSTATE_GAMEDEFS_CUSTOM) {
-		return m_CustomHandler->ReadSMC_KeyValue(states, key, value);
 	}
 
 	return SMCResult_Continue;
@@ -355,13 +312,6 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 		return SMCResult_Continue;
 	}
 
-	if (m_CustomLevel)
-	{
-		m_CustomLevel--;
-		m_CustomHandler->ReadSMC_LeavingSection(states);
-		return SMCResult_Continue;
-	}
-
 	switch (m_ParseState)
 	{
 	case PSTATE_GAMES:
@@ -374,12 +324,6 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 			m_ParseState = PSTATE_GAMES;
 			break;
 		}
-	case PSTATE_GAMEDEFS_CUSTOM:
-		{
-			m_ParseState = PSTATE_GAMEDEFS;
-			m_CustomHandler->ReadSMC_ParseEnd(false, false);
-			break;
-		}
 	case PSTATE_GAMEDEFS_KEYS:
 	case PSTATE_GAMEDEFS_OFFSETS:
 		{
@@ -388,8 +332,6 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 		}
 	case PSTATE_GAMEDEFS_OFFSETS_OFFSET:
 		{
-			m_Offsets.push_back(*tempOffset);
-#if 0
 			/* Parse the offset... */
 			if (m_Class[0] != '\0'
 				&& m_Prop[0] != '\0')
@@ -408,12 +350,11 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 						g_Logger.LogError("[SM] Unable to find property %s.%s (file \"%s\") (mod \"%s\")", 
 							m_Class,
 							m_Prop,
-							m_CurFile,
+							m_pFile,
 							m_Game);
 					}
 				}
 			}
-#endif
 			m_ParseState = PSTATE_GAMEDEFS_OFFSETS;
 			break;
 		}
@@ -442,8 +383,6 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 		}
 	case PSTATE_GAMEDEFS_SIGNATURES_SIG:
 		{
-			m_Sigs.push_back(*tempSig);
-#if 0
 			if (s_TempSig.library[0] == '\0')
 			{
 				/* assume server */
@@ -461,7 +400,7 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 			{
 				g_Logger.LogError("[SM] Unrecognized library \"%s\" (gameconf \"%s\")", 
 					s_TempSig.library, 
-					m_CurFile);
+					m_pFile);
 			} else {
 #if defined PLATFORM_LINUX
 				if (s_TempSig.sig[0] == '@')
@@ -478,12 +417,12 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 						} else {
 							g_Logger.LogError("[SM] Unable to load library \"%s\" (gameconf \"%s\")",
 								s_TempSig.library,
-								m_File);
+								m_pFile);
 						}
 					} else {
 						g_Logger.LogError("[SM] Unable to find library \"%s\" in memory (gameconf \"%s\")",
 							s_TempSig.library,
-							m_File);
+							m_pFile);
 					}
 				}
 				if (final_addr)
@@ -538,7 +477,6 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 skip_find:
 #endif
 			sm_trie_replace(m_pSigs, m_offset, final_addr);
-#endif
 			m_ParseState = PSTATE_GAMEDEFS_SIGNATURES;
 
 			break;
@@ -548,220 +486,48 @@ skip_find:
 	return SMCResult_Continue;
 }
 
-#define MSTATE_NONE		0
-#define MSTATE_MAIN		1
-#define MSTATE_FILE		2
-
-class MasterReader : public ITextListener_SMC
-{
-public:
-	virtual void ReadSMC_ParseStart()
-	{
-		state = MSTATE_NONE;
-		ignoreLevel = 0;
-	}
-
-	virtual SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name)
-	{
-		if (ignoreLevel)
-		{
-			return SMCResult_Continue;
-		}
-
-		if (state == MSTATE_NONE)
-		{
-			if (strcmp(name, "Game Master") == 0)
-			{
-				state = MSTATE_MAIN;
-			}
-			else
-			{
-				ignoreLevel++;
-			}
-		}
-		else if (state == MSTATE_MAIN)
-		{
-			strncopy(cur_file, name, sizeof(cur_file));
-			had_engine = false;
-			matched_engine = false;
-			had_game = false;
-			matched_game = false;
-			state = MSTATE_FILE;
-		}
-		else if (state == MSTATE_FILE)
-		{
-			ignoreLevel++;
-		}
-
-		return SMCResult_Continue;
-	}
-
-	virtual SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
-	{
-		if (ignoreLevel || state != MSTATE_FILE)
-		{
-			return SMCResult_Continue;
-		}
-
-		if (strcmp(key, "engine") == 0)
-		{
-			had_engine = true;
-			if (DoesEngineMatch(value))
-			{
-				matched_engine = true;
-			}
-		}
-		else if (strcmp(key, "game") == 0)
-		{
-			had_game = true;
-			if (DoesGameMatch(value))
-			{
-				matched_game = true;
-			}
-		}
-
-		return SMCResult_Continue;
-	}
-
-	virtual SMCResult ReadSMC_LeavingSection(const SMCStates *states)
-	{
-		if (ignoreLevel)
-		{
-			ignoreLevel--;
-			return SMCResult_Continue;
-		}
-
-		if (state == MSTATE_FILE)
-		{
-			/* The four success conditions:
-			 * 1. Needed nothing.
-			 * 2. Needed game only.
-			 * 3. Needed engine only.
-			 * 4. Needed both engine and game.
-			 * Final result is minimized via k-map.
-			 */
-#if 0
-			if ((!had_engine && !had_game) ||
-				(!had_engine && (had_game && matched_game)) ||
-				(!had_game && (had_engine && matched_engine)) ||
-				((had_game && had_engine) && (matched_game && matched_engine)))
-#endif
-			if ((!had_engine && !had_game) ||
-				(!had_engine && matched_game) ||
-				(!had_game && matched_engine) ||
-				(matched_engine && matched_game))
-			{
-				fileList->push_back(cur_file);
-			}
-			state = MSTATE_MAIN;
-		}
-		else if (state == MSTATE_MAIN)
-		{
-			state = MSTATE_NONE;
-		}
-
-		return SMCResult_Continue;
-	}
-public:
-	list<char*> *fileList;
-	unsigned int state;
-	unsigned int ignoreLevel;
-	char cur_file[PLATFORM_MAX_PATH];
-	bool had_engine;
-	bool matched_engine;
-	bool had_game;
-	bool matched_game;
-};
-
-static MasterReader master_reader;
-
 bool CGameConfig::Reparse(char *error, size_t maxlength)
 {
-	/* Reset cached data */
-//	m_pStrings->Reset();
-	m_Offsets.clear();
-	m_Sigs.clear();
-	
+	SMCError err;
+	SMCStates state = {0, 0};
 
 	char path[PLATFORM_MAX_PATH];
-
-	/* See if we can use the extended gamedata format. */
-	//TODO pass in path to gamedata somehow
-//	g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "gamedata/%s/master.games.txt", m_File);
-
-	/* Otherwise, it's time to parse the master. */
-	SMCError err;
-	SMCStates state = {0, 0};
-	list<char*> fileList;
-	master_reader.fileList = &fileList;
-
-	err = textparsers->ParseSMCFile(path, &master_reader, &state, error, maxlength);
-	if (err != SMCError_Okay)
+	g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "gamedata/%s.txt", m_pFile);
+	/* Backwards compatibility */
+	if (!g_LibSys.PathExists(path))
 	{
-		const char *msg = textparsers->GetSMCErrorString(err);
-
-		printf("[SM] Error parsing master gameconf file \"%s\":", path);
-		printf("[SM] Error %d on line %d, col %d: %s", 
-			err,
-			state.line,
-			state.col,
-			msg ? msg : "Unknown error");
-		exit(PARSE_ERROR);
+		g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "configs/gamedata/%s.txt", m_pFile);
 	}
 
-	/* Go through each file we found and parse it. */
-	list<char*>::iterator iter;
-	for (iter = fileList.begin(); iter != fileList.end(); iter++)
-	{
-		UTIL_Format(path, sizeof(path), "%s/%s", m_File, *iter);
-		if (!EnterFile(path, error, maxlength))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool CGameConfig::EnterFile(const char *file, char *error, size_t maxlength)
-{
-	SMCError err;
-	SMCStates state = {0, 0};
-
 	/* Initialize parse states */
 	m_IgnoreLevel = 0;
 	bShouldBeReadingDefault = true;
 	m_ParseState = PSTATE_NONE;
+	/* Reset cached data */
+	m_pStrings->Reset();
+	sm_trie_clear(m_pOffsets);
+	sm_trie_clear(m_pProps);
+	sm_trie_clear(m_pKeys);
 
-	if ((err=textparsers->ParseSMCFile(file, this, &state, error, maxlength))
+	if ((err=textparsers->ParseSMCFile(path, this, &state, error, maxlength))
 		!= SMCError_Okay)
 	{
 		const char *msg;
 
 		msg = textparsers->GetSMCErrorString(err);
 
-		printf("[SM] Error parsing gameconfig file \"%s\":\n", file);
-		printf("[SM] Error %d on line %d, col %d: %s\n", 
+		g_Logger.LogError("[SM] Error parsing gameconfig file \"%s\":", path);
+		g_Logger.LogError("[SM] Error %d on line %d, col %d: %s", 
 			err,
 			state.line,
 			state.col,
 			msg ? msg : "Unknown error");
-
-		if (m_ParseState == PSTATE_GAMEDEFS_CUSTOM)
-		{
-			//error occurred while parsing a custom section
-			m_CustomHandler->ReadSMC_ParseEnd(true, true);
-			m_CustomHandler = NULL;
-			m_CustomLevel = 0;
-		}
-
-		exit(PARSE_ERROR);
+		return false;
 	}
 
 	return true;
 }
 
-#if 0
 bool CGameConfig::GetOffset(const char *key, int *value)
 {
 	void *obj;
@@ -813,16 +579,108 @@ unsigned int CGameConfig::DecRefCount()
 	m_RefCount--;
 	return m_RefCount;
 }
-#endif
 
-const char *CGameConfig::GetKeyValue(const char *key)
+GameConfigManager::GameConfigManager()
 {
-	map<const char*,const char*,cmp_str>::iterator it = m_Keys.find(key);
-	if (it == m_Keys.end()) return NULL;
-
-	return it->second;
+	m_pLookup = sm_trie_create();
 }
 
-list<Offset> CGameConfig::GetOffsets() { return m_Offsets; }
-list<Sig> CGameConfig::GetSigs() { return m_Sigs; }
+GameConfigManager::~GameConfigManager()
+{
+	sm_trie_destroy(m_pLookup);
+}
 
+void GameConfigManager::OnSourceModStartup(bool late)
+{
+	LoadGameConfigFile("core.games", &g_pGameConf, NULL, 0);
+
+	strncopy(g_Game, g_SourceMod.GetGameFolderName(), sizeof(g_Game));
+	strncopy(g_GameDesc + 1, SERVER_CALL(GetGameDescription)(), sizeof(g_GameDesc) - 1);
+
+	KeyValues *pGameInfo = new KeyValues("GameInfo");
+	if (pGameInfo->LoadFromFile(basefilesystem, "gameinfo.txt"))
+	{
+		const char *str;
+		if ((str = pGameInfo->GetString("game", NULL)) != NULL)
+		{
+			strncopy(g_GameName + 1, str, sizeof(g_GameName) - 1);
+		}
+	}
+	pGameInfo->deleteThis();
+}
+
+void GameConfigManager::OnSourceModAllInitialized()
+{
+	/* NOW initialize the game file */
+	CGameConfig *pGameConf = (CGameConfig *)g_pGameConf;
+	
+	char error[255];
+	if (!pGameConf->Reparse(error, sizeof(error)))
+	{
+		/* :TODO: log */
+	}
+
+	g_ShareSys.AddInterface(NULL, this);
+}
+
+void GameConfigManager::OnSourceModAllShutdown()
+{
+	CloseGameConfigFile(g_pGameConf);
+}
+
+bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pConfig, char *error, size_t maxlength)
+{
+	CGameConfig *pConfig;
+
+	if (sm_trie_retrieve(m_pLookup, file, (void **)&pConfig))
+	{
+		pConfig->IncRefCount();
+		*_pConfig = pConfig;
+		return true;
+	}
+
+	pConfig = new CGameConfig(file);
+
+	/* :HACKHACK: Don't parse the main config file */
+	bool retval = true;
+	if (_pConfig != &g_pGameConf)
+	{
+		retval = pConfig->Reparse(error, maxlength);
+	}
+
+	m_cfgs.push_back(pConfig);
+	sm_trie_insert(m_pLookup, file, pConfig);
+
+	pConfig->IncRefCount();
+
+	*_pConfig = pConfig;
+
+	return retval;
+}
+
+void GameConfigManager::CloseGameConfigFile(IGameConfig *cfg)
+{
+	CGameConfig *pConfig = (CGameConfig *)cfg;
+
+	if (pConfig->DecRefCount() == 0)
+	{
+		sm_trie_delete(m_pLookup, pConfig->m_pFile);
+		delete pConfig;
+	}
+}
+
+extern HandleType_t g_GameConfigsType;
+
+IGameConfig *GameConfigManager::ReadHandle(Handle_t hndl, IdentityToken_t *ident, HandleError *err)
+{
+	HandleSecurity sec(ident, g_pCoreIdent);
+	IGameConfig *conf = NULL;
+	HandleError _err = g_HandleSys.ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&conf);
+
+	if (err)
+	{
+		*err = _err;
+	}
+
+	return conf;
+}

core/GameConfigs.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet:
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,12 +32,12 @@
 #ifndef _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
 #define _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
 
-#include "common_logic.h"
 #include <IGameConfigs.h>
 #include <ITextParsers.h>
-#include <am-refcounting.h>
-#include <sm_stringhashmap.h>
-#include <sm_namehashset.h>
+#include <sh_list.h>
+#include "sm_trie.h"
+#include "sm_globals.h"
+#include "sm_memtable.h"
 
 using namespace SourceMod;
 using namespace SourceHook;
@@ -46,18 +46,14 @@ class SendProp;
 
 class CGameConfig : 
 	public ITextListener_SMC,
-	public IGameConfig,
-	public ke::Refcounted<CGameConfig>
+	public IGameConfig
 {
 	friend class GameConfigManager;
 public:
-	CGameConfig(const char *file, const char *engine = NULL);
+	CGameConfig(const char *file);
 	~CGameConfig();
 public:
 	bool Reparse(char *error, size_t maxlength);
-	bool EnterFile(const char *file, char *error, size_t maxlength);
-	void SetBaseEngine(const char *engine);
-	void SetParseEngine(const char *engine);
 public: //ITextListener_SMC
 	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
 	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
@@ -67,19 +63,17 @@ public: //IGameConfig
 	bool GetOffset(const char *key, int *value);
 	SendProp *GetSendProp(const char *key);
 	bool GetMemSig(const char *key, void **addr);
-	bool GetAddress(const char *key, void **addr);
-public: //NameHashSet
-	static inline bool matches(const char *key, const CGameConfig *value)
-	{
-		return strcmp(key, value->m_File) == 0;
-	}
+public:
+	void IncRefCount();
+	unsigned int DecRefCount();
 private:
-	char m_File[PLATFORM_MAX_PATH];
-	char m_CurFile[PLATFORM_MAX_PATH];
-	StringHashMap<int> m_Offsets;
-	StringHashMap<SendProp *> m_Props;
-	StringHashMap<ke::AString> m_Keys;
-	StringHashMap<void *> m_Sigs;
+	BaseStringTable *m_pStrings;
+	char *m_pFile;
+	Trie *m_pOffsets;
+	Trie *m_pProps;
+	Trie *m_pKeys;
+	Trie *m_pSigs;
+	unsigned int m_RefCount;
 	/* Parse states */
 	int m_ParseState;
 	unsigned int m_IgnoreLevel;
@@ -88,35 +82,6 @@ private:
 	char m_offset[64];
 	char m_Game[256];
 	bool bShouldBeReadingDefault;
-	bool had_game;
-	bool matched_game;
-	bool had_engine;
-	bool matched_engine;
-	bool matched_platform;
-
-	/* Custom Sections */
-	unsigned int m_CustomLevel;
-	ITextListener_SMC *m_CustomHandler;
-
-	/* Support for reading Addresses */
-	struct AddressConf
-	{
-		char signatureName[64];
-		int readCount;
-		int read[8];
-
-		AddressConf(char *sigName, unsigned sigLength, unsigned readCount, int *read);
-
-		AddressConf() {}
-	};
-
-	char m_Address[64];
-	char m_AddressSignature[64];
-	int m_AddressReadCount;
-	int m_AddressRead[8];
-	StringHashMap<AddressConf> m_Addresses;
-	const char *m_pEngine;
-	const char *m_pBaseEngine;
 };
 
 class GameConfigManager : 
@@ -132,20 +97,13 @@ public: //IGameConfigManager
 	IGameConfig *ReadHandle(Handle_t hndl,
 		IdentityToken_t *ident,
 		HandleError *err);
-	void AddUserConfigHook(const char *sectionname, ITextListener_SMC *listener);
-	void RemoveUserConfigHook(const char *sectionname, ITextListener_SMC *listener);
-	void AcquireLock();
-	void ReleaseLock();
 public: //SMGlobalClass
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
 	void OnSourceModAllShutdown();
-public:
-	void RemoveCachedConfig(CGameConfig *config);
 private:
-	NameHashSet<CGameConfig *> m_Lookup;
-public:
-	StringHashMap<ITextListener_SMC *> m_customHandlers;
+	List<CGameConfig *> m_cfgs;
+	Trie *m_pLookup;
 };
 
 extern GameConfigManager g_GameConfigs;

core/HalfLife2.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,21 +35,14 @@
 #include <sh_list.h>
 #include <sh_string.h>
 #include <sh_tinyhash.h>
-#include <am-utility.h>
-#include <am-hashmap.h>
-#include <sm_stringhashmap.h>
-#include <sm_namehashset.h>
+#include <sm_trie_tpl.h>
+#include "sm_trie.h"
 #include "sm_globals.h"
 #include "sm_queue.h"
 #include <IGameHelpers.h>
 #include <KeyValues.h>
 #include <server_class.h>
 #include <datamap.h>
-#include <ihandleentity.h>
-#include <tier0/icommandline.h>
-#if SOURCE_ENGINE >= SE_PORTAL2
-#include <string_t.h>
-#endif
 
 class CCommand;
 
@@ -61,38 +54,16 @@ using namespace SourceMod;
 
 struct DataTableInfo
 {
-	struct SendPropPolicy
-	{
-		static inline bool matches(const char *name, const sm_sendprop_info_t &info)
-		{
-			return strcmp(name, info.prop->GetName()) == 0;
-		}
-	};
-
-	static inline bool matches(const char *name, const DataTableInfo *info)
-	{
-		return strcmp(name, info->sc->GetName()) == 0;
-	}
-
-	DataTableInfo(ServerClass *sc)
-		: sc(sc)
-	{
-	}
-
 	ServerClass *sc;
-	NameHashSet<sm_sendprop_info_t, SendPropPolicy> lookup;
+	KTrie<sm_sendprop_info_t> lookup;
 };
 
-struct DataMapCachePolicy
+struct DataMapTrie
 {
-	static inline bool matches(const char *name, const sm_datatable_info_t &info)
-	{
-		return strcmp(name, info.prop->fieldName) == 0;
-	}
+	DataMapTrie() : trie(NULL) {}
+	Trie *trie;
 };
 
-typedef NameHashSet<sm_datatable_info_t, DataMapCachePolicy> DataMapCache;
-
 struct DelayedFakeCliCmd
 {
 	String cmd;
@@ -103,32 +74,11 @@ struct DelayedFakeCliCmd
 struct CachedCommandInfo
 {
 	const CCommand *args;
-#if SOURCE_ENGINE <= SE_DARKMESSIAH
+#if !defined ORANGEBOX_BUILD
 	char cmd[300];
 #endif
 };
 
-struct DelayedKickInfo
-{
-	int userid;
-	int client;
-	char buffer[384];
-};
-
-// copy from game/shared/entitylist_base.h
-class CEntInfo
-{
-public:
-	IHandleEntity	*m_pEntity;
-	int				m_SerialNumber;
-	CEntInfo		*m_pPrev;
-	CEntInfo		*m_pNext;
-#if (SOURCE_ENGINE >= SE_PORTAL2) && (SOURCE_ENGINE != SE_DOTA)
-	string_t		m_iName;
-	string_t		m_iClassName;
-#endif
-};
-
 class CHalfLife2 : 
 	public SMGlobalClass,
 	public IGameHelpers
@@ -139,7 +89,6 @@ public:
 public:
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
-	void OnSourceModAllInitialized_Post();
 	/*void OnSourceModAllShutdown();*/
 public: //IGameHelpers
 	SendProp *FindInSendTable(const char *classname, const char *offset);
@@ -147,33 +96,11 @@ public: //IGameHelpers
 	datamap_t *GetDataMap(CBaseEntity *pEntity);
 	ServerClass *FindServerClass(const char *classname);
 	typedescription_t *FindInDataMap(datamap_t *pMap, const char *offset);
-	bool FindDataMapInfo(datamap_t *pMap, const char *offset, sm_datatable_info_t *pDataTable);
 	void SetEdictStateChanged(edict_t *pEdict, unsigned short offset);
 	bool TextMsg(int client, int dest, const char *msg);
 	bool HintTextMsg(int client, const char *msg);
-	bool HintTextMsg(cell_t *players, int count, const char *msg);
 	bool ShowVGUIMenu(int client, const char *name, KeyValues *data, bool show);
 	bool IsLANServer();
-	bool KVLoadFromFile(KeyValues *kv, IBaseFileSystem *filesystem, const char *resourceName, const char *pathID = NULL);
-	edict_t *EdictOfIndex(int index);
-	int IndexOfEdict(edict_t *pEnt);
-	edict_t *GetHandleEntity(CBaseHandle &hndl);
-	void SetHandleEntity(CBaseHandle &hndl, edict_t *pEnt);
-	const char *GetCurrentMap();
-	void ServerCommand(const char *buffer);
-	CBaseEntity *ReferenceToEntity(cell_t entRef);
-	cell_t EntityToReference(CBaseEntity *pEntity);
-	cell_t IndexToReference(int entIndex);
-	int ReferenceToIndex(cell_t entRef);
-	cell_t ReferenceToBCompatRef(cell_t entRef);
-	CEntInfo *LookupEntity(int entIndex);
-	cell_t EntityToBCompatRef(CBaseEntity *pEntity);
-	void *GetGlobalEntityList();
-	int GetSendPropOffset(SendProp *prop);
-	ICommandLine *GetValveCommandLine();
-	const char *GetEntityClassname(edict_t *pEdict);
-	const char *GetEntityClassname(CBaseEntity *pEntity);
-	bool IsMapValid(const char *map);
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
@@ -182,34 +109,23 @@ public:
 	void PopCommandStack();
 	const CCommand *PeekCommandStack();
 	const char *CurrentCommandName();
-	void AddDelayedKick(int client, int userid, const char *msg);
-	void ProcessDelayedKicks();
-#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
+#if !defined METAMOD_PLAPI_VERSION
 	bool IsOriginalEngine();
 #endif
 private:
 	DataTableInfo *_FindServerClass(const char *classname);
 private:
-	void InitLogicalEntData();
-	void InitCommandLine();
-private:
-	typedef ke::HashMap<datamap_t *, DataMapCache *, ke::PointerPolicy<datamap_t> > DataTableMap;
-
-	NameHashSet<DataTableInfo *> m_Classes;
-	DataTableMap m_Maps;
+	Trie *m_pClasses;
+	List<DataTableInfo *> m_Tables;
+	THash<datamap_t *, DataMapTrie> m_Maps;
 	int m_MsgTextMsg;
 	int m_HinTextMsg;
-	int m_SayTextMsg;
 	int m_VGUIMenu;
 	Queue<DelayedFakeCliCmd *> m_CmdQueue;
 	CStack<DelayedFakeCliCmd *> m_FreeCmds;
 	CStack<CachedCommandInfo> m_CommandStack;
-	Queue<DelayedKickInfo> m_DelayedKicks;
-	void *m_pGetCommandLine;
 };
 
 extern CHalfLife2 g_HL2;
 
-bool IndexToAThings(cell_t, CBaseEntity **pEntData, edict_t **pEdictData);
-
 #endif //_INCLUDE_SOURCEMOD_CHALFLIFE2_H_

core/Logger.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,37 +34,479 @@
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "Logger.h"
-#include "LibrarySys.h"
+#include "systems/LibrarySys.h"
 #include "TimerSys.h"
-#include "logic_bridge.h"
-#include <sourcemod_version.h>
+#include "sm_version.h"
+
+Logger g_Logger;
+
+/**
+ * :TODO: This should be creating the log folder if it doesn't exist
+ */
+
+ConfigResult Logger::OnSourceModConfigChanged(const char *key, 
+									  const char *value, 
+									  ConfigSource source,
+									  char *error, 
+									  size_t maxlength)
+{
+	if (strcasecmp(key, "Logging") == 0)
+	{
+		bool state;
+
+		if (strcasecmp(value, "on") == 0)
+		{
+			state = true;
+		} else if (strcasecmp(value, "off") == 0) {
+			state = false;
+		} else {
+			UTIL_Format(error, maxlength, "Invalid value: must be \"on\" or \"off\"");
+			return ConfigResult_Reject;
+		}
+
+		if (source == ConfigSource_Console)
+		{
+			state ? EnableLogging() : DisableLogging();
+		} else {
+			m_InitialState = state;
+		}
+
+		return ConfigResult_Accept;
+	} else if (strcasecmp(key, "LogMode") == 0) {
+		if (strcasecmp(value, "daily") == 0) 
+		{
+			m_Mode = LoggingMode_Daily;
+		} else if (strcasecmp(value, "map") == 0) {
+			m_Mode = LoggingMode_PerMap;
+		} else if (strcasecmp(value, "game") == 0) {
+			m_Mode = LoggingMode_Game;
+		} else {
+			UTIL_Format(error, maxlength, "Invalid value: must be [daily|map|game]");
+			return ConfigResult_Reject;
+		}
+
+		return ConfigResult_Accept;
+	}
+
+	return ConfigResult_Ignore;
+}
+
+void Logger::OnSourceModStartup(bool late)
+{
+	InitLogger(m_Mode);
+}
+
+void Logger::OnSourceModAllShutdown()
+{
+	CloseLogger();
+}
+
+void Logger::OnSourceModLevelChange(const char *mapName)
+{
+	MapChange(mapName);
+}
+
+void Logger::_NewMapFile()
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	/* Append "Log file closed" to previous log file */
+	_CloseFile();
+	
+	char _filename[256];
+	int i = 0;
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+
+	while (true)
+	{
+		g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%02d%02d%03d.log", curtime->tm_mon + 1, curtime->tm_mday, i);
+		FILE *fp = fopen(_filename, "r");
+		if (!fp)
+		{
+			break;
+		}
+		fclose(fp);
+		i++;
+	}
+	m_NrmFileName.assign(_filename);
+
+	FILE *fp = fopen(m_NrmFileName.c_str(), "w");
+	if (!fp)
+	{
+		char error[255];
+		g_LibSys.GetPlatformError(error, sizeof(error));
+		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
+		LogFatal("[SM] Platform returned error: \"%s\"", error);
+		LogFatal("[SM] Logging has been disabled.");
+		m_Active = false;
+		return;
+	} else {
+		char date[32];
+		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SVN_FULL_VERSION);
+		fclose(fp);
+	}
+}
+
+void Logger::_CloseFile()
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	FILE *fp = NULL;
+	if (!m_NrmFileName.empty())
+	{
+		fp = fopen(m_NrmFileName.c_str(), "r+");
+		if (fp)
+		{
+			fseek(fp, 0, SEEK_END);
+			LogMessage("Log file closed.");
+			fclose(fp);
+		}
+		m_NrmFileName.clear();
+	}
+
+	if (!m_ErrMapStart)
+	{
+		return;
+	}
+	fp = fopen(m_ErrFileName.c_str(), "r+");
+	if (fp)
+	{
+		fseek(fp, 0, SEEK_END);
+		LogError("Error log file session closed.");
+		fclose(fp);
+	}
+	m_ErrFileName.clear();
+}
+
+void Logger::InitLogger(LoggingMode mode)
+{
+	m_Mode = mode;
+	m_Active = m_InitialState;
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+	m_CurDay = curtime->tm_mday;
+
+	char _filename[256];
+	g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+	m_ErrFileName.assign(_filename);
+
+	switch (m_Mode)
+	{
+	case LoggingMode_PerMap:
+		{
+			if (!m_Active)
+			{
+				m_DelayedStart = true;
+			}
+			break;
+		}
+	case LoggingMode_Daily:
+		{
+			g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+			m_NrmFileName.assign(_filename);
+			m_DailyPrintHdr = true;
+			break;
+		}
+	default:
+		{
+			/* do nothing... */
+			break;
+		}
+	}
+}
+
+void Logger::CloseLogger()
+{
+	_CloseFile();
+}
+
+void Logger::LogToOpenFile(FILE *fp, const char *msg, ...)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	va_list ap;
+	va_start(ap, msg);
+	LogToOpenFileEx(fp, msg, ap);
+	va_end(ap);
+}
+
+void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	char buffer[3072];
+	UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
+
+	char date[32];
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+	strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+
+	fprintf(fp, "L %s: %s\n", date, buffer);
+	g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
+}
+
+void Logger::LogMessage(const char *vafmt, ...)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	if (m_Mode == LoggingMode_Game)
+	{
+		va_list ap;
+		va_start(ap, vafmt);
+		_PrintToGameLog(vafmt, ap);
+		va_end(ap);
+		return;
+	}
+
+	if (m_DelayedStart)
+	{
+		m_DelayedStart = false;
+		_NewMapFile();
+	}
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+
+	FILE *fp = NULL;
+	if (m_Mode == LoggingMode_PerMap)
+	{
+		fp = fopen(m_NrmFileName.c_str(), "a+");
+		if (!fp)
+		{
+			_NewMapFile();
+			fp = fopen(m_NrmFileName.c_str(), "a+");
+			if (!fp)
+			{
+				goto print_error;
+			}
+		}
+	} else {
+		if (m_CurDay != curtime->tm_mday)
+		{
+			char _filename[256];
+			g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+			m_NrmFileName.assign(_filename);
+			m_CurDay = curtime->tm_mday;
+			m_DailyPrintHdr = true;
+		}
+		fp = fopen(m_NrmFileName.c_str(), "a+");
+	}
+
+	if (fp)
+	{
+		if (m_DailyPrintHdr)
+		{
+			char date[32];
+			m_DailyPrintHdr = false;
+			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SVN_FULL_VERSION);
+	 	}
+		va_list ap;
+		va_start(ap, vafmt);
+		LogToOpenFileEx(fp, vafmt, ap);
+		va_end(ap);
+		fclose(fp);
+	} else {
+		goto print_error;
+	}
+
+	return;
+print_error:
+	char error[255];
+	g_LibSys.GetPlatformError(error, sizeof(error));
+	LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
+	LogFatal("[SM] Platform returned error: \"%s\"", error);
+	LogFatal("[SM] Logging has been disabled.");
+	m_Active = false;
+}
+
+void Logger::LogError(const char *vafmt, ...)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+
+	if (curtime->tm_mday != m_CurDay)
+	{
+		char _filename[256];
+		g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+		m_ErrFileName.assign(_filename);
+		m_CurDay = curtime->tm_mday;
+		m_ErrMapStart = false;
+	}
+
+	FILE *fp = fopen(m_ErrFileName.c_str(), "a+");
+	if (fp)
+	{
+		if (!m_ErrMapStart)
+		{
+			char date[32];
+			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+			fprintf(fp, "L %s: SourceMod error session started\n", date);
+			fprintf(fp, "L %s: Info (map \"%s\") (file \"errors_%04d%02d%02d.log\")\n", date, m_CurMapName.c_str(), curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+			m_ErrMapStart = true;
+		}
+		va_list ap;
+		va_start(ap, vafmt);
+		LogToOpenFileEx(fp, vafmt, ap);
+		va_end(ap);
+		fclose(fp);
+	}
+	else
+	{
+		char error[255];
+		g_LibSys.GetPlatformError(error, sizeof(error));
+		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
+		LogFatal("[SM] Platform returned error: \"%s\"", error);
+		LogFatal("[SM] Logging has been disabled.");
+		m_Active = false;
+		return;
+	}
+}
+
+void Logger::MapChange(const char *mapname)
+{
+	m_CurMapName.assign(mapname);
+
+	switch (m_Mode)
+	{
+	case LoggingMode_Daily:
+		{
+			LogMessage("-------- Mapchange to %s --------", mapname);
+			break;
+		}
+	case LoggingMode_PerMap:
+		{
+			_NewMapFile();
+			break;
+		}
+	default:
+		{
+			/* Do nothing... */
+			break;
+		}
+	}
+
+	if (m_ErrMapStart)
+	{
+		LogError("Error log file session closed.");
+	}
+	m_ErrMapStart = false;
+}
+
+void Logger::_PrintToGameLog(const char *fmt, va_list ap)
+{
+	char msg[3072];
+	size_t len;
+
+	len = vsnprintf(msg, sizeof(msg)-2, fmt, ap);
+	len = (len >= sizeof(msg)) ? (sizeof(msg) - 2) : len;
+
+	msg[len++] = '\n';
+	msg[len] = '\0';
+
+	Engine_LogPrintWrapper(msg);
+}
+
+const char *Logger::GetLogFileName(LogType type) const
+{
+	switch (type)
+	{
+	case LogType_Normal:
+		{
+			return m_NrmFileName.c_str();
+		}
+	case LogType_Error:
+		{
+			return m_ErrFileName.c_str();
+		}
+	default:
+		{
+			return "";
+		}
+	}
+}
+
+LoggingMode Logger::GetLoggingMode() const
+{
+	return m_Mode;
+}
+
+void Logger::EnableLogging()
+{
+	if (m_Active)
+	{
+		return;
+	}
+	m_Active = true;
+	LogMessage("[SM] Logging enabled manually by user.");
+}
+
+void Logger::DisableLogging()
+{
+	if (!m_Active)
+	{
+		return;
+	}
+	LogMessage("[SM] Logging disabled manually by user.");
+	m_Active = false;
+}
+
+void Logger::LogFatal(const char *msg, ...)
+{
+	/* :TODO: make this print all pretty-like
+	 * In fact, the pretty log printing function should be abstracted. 
+	 * It's already implemented twice which is bad.
+	 */
+
+	va_list ap;
+	char path[PLATFORM_MAX_PATH];
+
+	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "sourcemod_fatal.log");
+
+	FILE *fp = fopen(path, "at");
+	if (fp)
+	{
+		m_Active = true;
+		va_start(ap, msg);
+		LogToOpenFileEx(fp, msg, ap);
+		va_end(ap);
+		m_Active = false;
+		fclose(fp);
+	}
+}
 
 bool g_in_game_log_hook = false;
 
-static LoggerCore g_LoggerCore;
-
-SH_DECL_HOOK1_void(IVEngineServer, LogPrint, SH_NOATTRIB, false, const char *);
-
-static void HookLogPrint(const char *message)
-{
-	g_in_game_log_hook = true;
-	bool stopped = logicore.OnLogPrint(message);
-	g_in_game_log_hook = false;
-
-	if (stopped)
-		RETURN_META(MRES_SUPERCEDE);
-}
-
-void LoggerCore::OnSourceModStartup(bool late)
-{
-	SH_ADD_HOOK(IVEngineServer, LogPrint, engine, SH_STATIC(HookLogPrint), false);
-}
-
-void LoggerCore::OnSourceModAllShutdown()
-{
-	SH_REMOVE_HOOK(IVEngineServer, LogPrint, engine, SH_STATIC(HookLogPrint), false);
-}
-
 void Engine_LogPrintWrapper(const char *msg)
 {
 	if (g_in_game_log_hook)

core/Logger.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,13 +38,69 @@
 
 using namespace SourceHook;
 
-class LoggerCore : public SMGlobalClass
+enum LogType
 {
+	LogType_Normal,
+	LogType_Error
+};
+
+enum LoggingMode
+{
+	LoggingMode_Daily,
+	LoggingMode_PerMap,
+	LoggingMode_Game
+};
+
+class Logger : public SMGlobalClass
+{
+public:
+	Logger() : m_Mode(LoggingMode_Daily), m_ErrMapStart(false), 
+		m_Active(false), m_DelayedStart(false), m_DailyPrintHdr(false), 
+		m_InitialState(true)
+	{
+	}
 public: //SMGlobalClass
+	ConfigResult OnSourceModConfigChanged(const char *key, 
+		const char *value, 
+		ConfigSource source,
+		char *error, 
+		size_t maxlength);
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllShutdown();
+	void OnSourceModLevelChange(const char *mapName);
+public:
+	void InitLogger(LoggingMode mode);
+	void CloseLogger();
+	void EnableLogging();
+	void DisableLogging();
+	void LogMessage(const char *msg, ...);
+	void LogError(const char *msg, ...);
+	void LogFatal(const char *msg, ...);
+	void LogToOpenFile(FILE *fp, const char *msg, ...);
+	void LogToOpenFileEx(FILE *fp, const char *msg, va_list ap);
+	void MapChange(const char *mapname);
+	const char *GetLogFileName(LogType type) const;
+	LoggingMode GetLoggingMode() const;
+private:
+	void _CloseFile();
+	void _NewMapFile();
+	void _PrintToGameLog(const char *fmt, va_list ap);
+private:
+	String m_NrmFileName;
+	String m_ErrFileName;
+	String m_CurMapName;
+	LoggingMode m_Mode;
+	int m_CurDay;
+	bool m_ErrMapStart;
+	bool m_Active;
+	bool m_DelayedStart;
+	bool m_DailyPrintHdr;
+	bool m_InitialState;
 };
 
 void Engine_LogPrintWrapper(const char *msg);
 
+extern bool g_in_game_log_hook;
+extern Logger g_Logger;
+
 #endif // _INCLUDE_SOURCEMOD_CLOGGER_H_

core/Makefile

@@ -1,216 +1,133 @@
-# (C)2004-2008 SourceMod Development Team
+#(C)2004-2008 Metamod:Source Development Team
 # Makefile written by David "BAILOPAN" Anderson
 
-SMSDK = ..
+#Local paths
 HL2SDK_ORIG = ../../hl2sdk
 HL2SDK_OB = ../../hl2sdk-ob
-HL2SDK_CSS = ../../hl2sdk-css
-HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
-HL2SDK_L4D = ../../hl2sdk-l4d
-HL2SDK_L4D2 = ../../hl2sdk-l4d2
-HL2SDK_CSGO = ../../hl2sdk-csgo
-MMSOURCE = ../../mmsource-central
+SOURCEMM14 = ../../sourcemm-1.4
+SOURCEMM16 = ../../sourcemm-1.6
+SRCDS_BASE = ~/srcds
+SMSDK = ..
+
+#Project options
+OPT_FLAGS = -O3 -funroll-loops -pipe -fno-strict-aliasing
+GCC4_FLAGS = -fvisibility=hidden 
+GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
+DEBUG_FLAGS = -g -ggdb3
+CPP = gcc-4.1
 
-#####################################
-### EDIT BELOW FOR OTHER PROJECTS ###
-#####################################
 
 OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreConfig.cpp \
-	Database.cpp DebugReporter.cpp EventManager.cpp HalfLife2.cpp Logger.cpp \
-	PlayerManager.cpp TimerSys.cpp UserMessages.cpp \
-	sm_autonatives.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \
+	Database.cpp DebugReporter.cpp EventManager.cpp GameConfigs.cpp HalfLife2.cpp Logger.cpp \
+	MemoryUtils.cpp PlayerManager.cpp TextParsers.cpp TimerSys.cpp Translator.cpp UserMessages.cpp \
+	sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \
 	sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \
-	MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp \
-	frame_hooks.cpp concmd_cleaner.cpp NextMap.cpp \
-	NativeOwner.cpp logic_bridge.cpp ConsoleDetours.cpp
-OBJECTS += smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
-	smn_database.cpp smn_entities.cpp smn_events.cpp \
-	smn_fakenatives.cpp smn_filesystem.cpp smn_halflife.cpp \
-	smn_keyvalues.cpp smn_player.cpp \
-	smn_usermsgs.cpp smn_menus.cpp smn_vector.cpp \
-	smn_hudtext.cpp smn_nextmap.cpp
-OBJECTS += ExtensionSys.cpp 		\
-		   ForwardSys.cpp 			\
-		   HandleSys.cpp 			\
-		   LibrarySys.cpp 			\
-		   PluginInfoDatabase.cpp 	\
-		   PluginSys.cpp 			\
-		   ShareSys.cpp				\
-		   NativeInvoker.cpp
-
-##############################################
-### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
-##############################################
-
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
-C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
-C_GCC4_FLAGS = -fvisibility=hidden
-CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
-CPP = gcc
-
-override ENGSET = false
-
-ifneq (,$(filter original orangebox css orangeboxvalve left4dead left4dead2 csgo,$(ENGINE)))
-	override ENGSET = true
-endif
+	MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp sm_crc32.cpp \
+	frame_hooks.cpp concmd_cleaner.cpp Profiler.cpp
+OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
+	smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \
+	smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp \
+	smn_handles.cpp smn_keyvalues.cpp smn_banning.cpp smn_maplists.cpp \
+	smn_lang.cpp smn_player.cpp smn_string.cpp smn_sorting.cpp smn_textparse.cpp smn_timers.cpp \
+	smn_usermsgs.cpp smn_menus.cpp smn_database.cpp smn_vector.cpp smn_adt_array.cpp \
+	smn_adt_trie.cpp smn_hudtext.cpp
+OBJECTS += systems/ExtensionSys.cpp systems/ForwardSys.cpp systems/HandleSys.cpp \
+	systems/LibrarySys.cpp systems/PluginInfoDatabase.cpp systems/PluginSys.cpp \
+	systems/ShareSys.cpp vm/sp_vm_basecontext.cpp vm/sp_vm_function.cpp
+OBJECTS += thread/ThreadWorker.cpp thread/BaseWorker.cpp thread/PosixThreads.cpp ThreadSupport.cpp
+OBJECTS_C = zlib/adler32.c zlib/compress.c zlib/crc32.c zlib/deflate.c zlib/gzio.c \
+	   zlib/infback.c zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
+	   zlib/uncompr.c zlib/zutil.c
+OBJECTS_SM16 = vm/sp_vm_engine.cpp
 
 ifeq "$(ENGINE)" "original"
 	HL2SDK = $(HL2SDK_ORIG)
+	HL2PUB = $(HL2SDK_ORIG)/public
 	HL2LIB = $(HL2SDK)/linux_sdk
-	CFLAGS += -DSOURCE_ENGINE=1
-	METAMOD = $(MMSOURCE)/core-legacy
-	INCLUDE += -I$(HL2SDK)/public/dlls
+	METAMOD = $(SOURCEMM14)
+	INCLUDE += -I$(HL2PUB)/dlls
+	SRCDS = $(SRCDS_BASE)
 	BINARY = sourcemod.1.ep1.so
 endif
 ifeq "$(ENGINE)" "orangebox"
 	HL2SDK = $(HL2SDK_OB)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=3
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
+	HL2PUB = $(HL2SDK_OB)/public
+	HL2LIB = $(HL2SDK)/linux_sdk
+	CFLAGS += -DORANGEBOX_BUILD
+	METAMOD = $(SOURCEMM16)
+	INCLUDE += -I$(HL2PUB)/game/server
+	SRCDS = $(SRCDS_BASE)/orangebox
 	BINARY = sourcemod.2.ep2.so
 endif
-ifeq "$(ENGINE)" "css"
-	HL2SDK = $(HL2SDK_CSS)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=6
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server 
-	BINARY = sourcemod.2.css.so
-endif
-ifeq "$(ENGINE)" "orangeboxvalve"
-	HL2SDK = $(HL2SDK_OB_VALVE)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=7
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server 
-	BINARY = sourcemod.2.ep2v.so
-endif
-ifeq "$(ENGINE)" "left4dead"
-	HL2SDK = $(HL2SDK_L4D)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=8
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.l4d.so
-endif
-ifeq "$(ENGINE)" "left4dead2"
-	HL2SDK = $(HL2SDK_L4D2)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=9
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.l4d2.so
-endif
-ifeq "$(ENGINE)" "csgo"
-	HL2SDK = $(HL2SDK_CSGO)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=12
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.csgo.so
+ifeq "$(BINARY)" ""
+	echo "You must supply ENGINE=orangebox or ENGINE=original"
+	false
 endif
 
-HL2PUB = $(HL2SDK)/public
+LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
+	tier0_i486.so -lpthread -static-libgcc
 
-OS := $(shell uname -s)
+INCLUDE_SMSDK = -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions 
 
-ifeq "$(OS)" "Darwin"
-	LIB_EXT = dylib
-	HL2LIB = $(HL2SDK)/lib/mac
-else
-	LIB_EXT = so
-	ifeq "$(ENGINE)" "original"
-		HL2LIB = $(HL2SDK)/linux_sdk
-	else
-		HL2LIB = $(HL2SDK)/lib/linux
-	endif
-endif
+INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \
+	-I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm \
+	-I$(HL2PUB)/mathlib -Isystems $(INCLUDE_SMSDK)
 
-ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
-	LIB_SUFFIX = _i486.$(LIB_EXT)
-else
-	LIB_PREFIX = lib
-	ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
-		ifneq "$(OS)" "Darwin"
-			LIB_SUFFIX = _srv.$(LIB_EXT)
-		else
-			LIB_SUFFIX = .$(LIB_EXT)
-		endif
-	else
-		LIB_SUFFIX = .$(LIB_EXT)
-	endif
-endif
-
-CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
-	-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
-	-DSE_PORTAL2=11 -DSE_CSGO=12
-
-LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) \
-	$(LIB_PREFIX)tier0$(LIB_SUFFIX) -static-libgcc
-
-ifeq "$(ENGINE)" "csgo"
-	LINK += $(HL2LIB)/interfaces_i486.a
-endif
-	
-INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
-	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook \
-	-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
-
-CFLAGS += -D_LINUX -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
-	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror \
-	-Wno-uninitialized -Wno-unused -Wno-switch -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H \
-	-DSM_DEFAULT_THREADER -m32 -DCOMPILER_GCC
-CPPFLAGS += -Wno-non-virtual-dtor -Wno-overloaded-virtual -fno-threadsafe-statics -fno-exceptions -fno-rtti
-
-################################################
-### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
-################################################
+SM16_INCLUDE = -I. -I.. -I$(SOURCEMM16)/sourcehook $(INCLUDE_SMSDK)
 
 ifeq "$(DEBUG)" "true"
 	BIN_DIR = Debug.$(ENGINE)
-	CFLAGS += $(C_DEBUG_FLAGS)
+	CFLAGS += $(DEBUG_FLAGS)
 else
 	BIN_DIR = Release.$(ENGINE)
-	CFLAGS += $(C_OPT_FLAGS)
+	CFLAGS += $(OPT_FLAGS)
 endif
 
 GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
+
+CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
+	-Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
+	-Dstrcmpi=strcasecmp -Wall -Wno-uninitialized -Werror -mfpmath=sse -msse \
+	-DSOURCEMOD_BUILD -DSM_DEFAULT_THREADER -m32
+CPPFLAGS = -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
+
 ifeq "$(GCC_VERSION)" "4"
-	CFLAGS += $(C_GCC4_FLAGS)
-	CPPFLAGS += $(CPP_GCC4_FLAGS)
+	CFLAGS += $(GCC4_FLAGS)
+	CPPFLAGS += $(GCC4_CPP_FLAGS)
 endif
 
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
-OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
+OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.ox)
+OBJ_LINUX_C := $(OBJECTS_C:%.c=$(BIN_DIR)/%.oc)
+OBJ_LINUX_SM16 := $(OBJECTS_SM16:%.cpp=$(BIN_DIR)/%.ok)
 
-$(BIN_DIR)/%.o: %.cpp
+$(BIN_DIR)/%.ox: %.cpp
 	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 
-$(BIN_DIR)/%.o: %.c
+$(BIN_DIR)/%.oc: %.c
 	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
 
-all: check
-	mkdir -p $(BIN_DIR)
-	ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX)
-	ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX)
+$(BIN_DIR)/%.ok: %.cpp
+	$(CPP) $(SM16_INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+all:
+	mkdir -p $(BIN_DIR)/systems
+	mkdir -p $(BIN_DIR)/vm
+	mkdir -p $(BIN_DIR)/zlib
+	mkdir -p $(BIN_DIR)/thread
+	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
+	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
 	$(MAKE) -f Makefile sourcemod
 
-check:
-	if [ "$(ENGSET)" = "false" ]; then \
-		echo "You must supply one of the following values for ENGINE:"; \
-		echo "csgo, left4dead2, left4dead, orangeboxvalve, css, orangebox, or original"; \
-		exit 1; \
-	fi
-
-sourcemod: check $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
-
-debug:
-	$(MAKE) -f Makefile all DEBUG=true
+sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C) $(OBJ_LINUX_SM16)
+	$(CPP) $(OBJ_LINUX) $(OBJ_LINUX_C) $(OBJ_LINUX_SM16) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
 default: all
 
-clean: check
-	rm -rf $(BIN_DIR)/*.o
+clean:
+	rm -rf $(BIN_DIR)/*.ox
+	rm -rf $(BIN_DIR)/systems/*.ox
+	rm -rf $(BIN_DIR)/zlib/*.oc
+	rm -rf $(BIN_DIR)/vm/*.ox
+	rm -rf $(BIN_DIR)/thread/*.ox
 	rm -rf $(BIN_DIR)/$(BINARY)
+

core/MemoryUtils.cpp

@@ -0,0 +1,220 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * 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 <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include "MemoryUtils.h"
+#include "ShareSys.h"
+#ifdef PLATFORM_LINUX
+#include <string.h>
+#include <elf.h>
+#endif
+
+MemoryUtils g_MemUtils;
+
+#if 0
+MemoryUtils::MemoryUtils()
+{
+#ifdef PLATFORM_WINDOWS
+
+	SYSTEM_INFO info;
+	GetSystemInfo(&info);
+
+	m_PageSize = info.dwPageSize;
+
+#elif defined PLATFORM_POSIX
+
+	m_PageSize = sysconf(_SC_PAGE_SIZE);
+
+#endif
+}
+#endif
+
+void MemoryUtils::OnSourceModAllInitialized()
+{
+	g_ShareSys.AddInterface(NULL, this);
+}
+
+void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t len)
+{
+	DynLibInfo lib;
+	bool found;
+	char *ptr, *end;
+
+	memset(&lib, 0, sizeof(DynLibInfo));
+
+	if (!GetLibraryInfo(libPtr, lib))
+	{
+		return NULL;
+	}
+
+	ptr = reinterpret_cast<char *>(lib.baseAddress);
+	end = ptr + lib.memorySize;
+
+	while (ptr < end)
+	{
+		found = true;
+		for (register size_t i = 0; i < len; i++)
+		{
+			if (pattern[i] != '\x2A' && pattern[i] != ptr[i])
+			{
+				found = false;
+				break;
+			}
+		}
+
+		if (found)
+			return ptr;
+
+		ptr++;
+	}
+
+	return NULL;
+}
+
+bool MemoryUtils::GetLibraryInfo(const void *libPtr, DynLibInfo &lib)
+{
+	unsigned long baseAddr;
+
+	if (libPtr == NULL)
+	{
+		return false;
+	}
+
+#ifdef PLATFORM_WINDOWS
+
+	MEMORY_BASIC_INFORMATION info;
+	IMAGE_DOS_HEADER *dos;
+	IMAGE_NT_HEADERS *pe;
+	IMAGE_FILE_HEADER *file;
+	IMAGE_OPTIONAL_HEADER *opt;
+
+	if (!VirtualQuery(libPtr, &info, sizeof(MEMORY_BASIC_INFORMATION)))
+	{
+		return false;
+	}
+
+	baseAddr = reinterpret_cast<unsigned long>(info.AllocationBase);
+
+	/* All this is for our insane sanity checks :o */
+	dos = reinterpret_cast<IMAGE_DOS_HEADER *>(baseAddr);
+	pe = reinterpret_cast<IMAGE_NT_HEADERS *>(baseAddr + dos->e_lfanew);
+	file = &pe->FileHeader;
+	opt = &pe->OptionalHeader;
+
+	/* Check PE magic and signature */
+	if (dos->e_magic != IMAGE_DOS_SIGNATURE || pe->Signature != IMAGE_NT_SIGNATURE || opt->Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC)
+	{
+		return false;
+	}
+
+	/* Check architecture, which is 32-bit/x86 right now
+	 * Should change this for 64-bit if Valve gets their act together
+	 */
+	if (file->Machine != IMAGE_FILE_MACHINE_I386)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library */
+	if ((file->Characteristics & IMAGE_FILE_DLL) == 0)
+	{
+		return false;
+	}
+
+	/* Finally, we can do this */
+	lib.memorySize = opt->SizeOfImage;
+
+#elif defined PLATFORM_LINUX
+
+	Dl_info info;
+	Elf32_Ehdr *file;
+	Elf32_Phdr *phdr;
+	uint16_t phdrCount;
+
+	if (!dladdr(libPtr, &info))
+	{
+		return false;
+	}
+
+	if (!info.dli_fbase || !info.dli_fname)
+	{
+		return false;
+	}
+
+	/* This is for our insane sanity checks :o */
+	baseAddr = reinterpret_cast<unsigned long>(info.dli_fbase);
+	file = reinterpret_cast<Elf32_Ehdr *>(baseAddr);
+
+	/* Check ELF magic */
+	if (memcmp(ELFMAG, file->e_ident, SELFMAG) != 0)
+	{
+		return false;
+	}
+
+	/* Check ELF version */
+	if (file->e_ident[EI_VERSION] != EV_CURRENT)
+	{
+		return false;
+	}
+
+	/* Check ELF architecture, which is 32-bit/x86 right now
+	 * Should change this for 64-bit if Valve gets their act together
+	 */
+	if (file->e_ident[EI_CLASS] != ELFCLASS32 || file->e_machine != EM_386 || file->e_ident[EI_DATA] != ELFDATA2LSB)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library/shared object */
+	if (file->e_type != ET_DYN)
+	{
+		return false;
+	}
+
+	phdrCount = file->e_phnum;
+	phdr = reinterpret_cast<Elf32_Phdr *>(baseAddr + file->e_phoff);
+	
+	/* Add up the memory sizes of segments marked as PT_LOAD as those are the only ones that should be in memory */
+	for (uint16_t i = 0; i < phdrCount; i++)
+	{
+		Elf32_Phdr &hdr = phdr[i];
+
+		if (hdr.p_type == PT_LOAD)
+		{
+			lib.memorySize += hdr.p_memsz;
+		}
+	}
+
+#endif
+
+	lib.baseAddress = reinterpret_cast<void *>(baseAddr);
+
+	return true;
+}

core/MemoryUtils.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2011 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -25,64 +25,34 @@
  * this exception to all derivative works.  AlliedModders LLC defines further
  * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
  * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
  */
 
 #ifndef _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
 #define _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
 
-#include "common_logic.h"
 #include <IMemoryUtils.h>
-#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
-#include <sh_vector.h>
-#include "sm_symtable.h"
-
-using namespace SourceHook;
-#endif
+#include "sm_globals.h"
 
 using namespace SourceMod;
 
-#ifdef PLATFORM_APPLE
-#include <CoreServices/CoreServices.h>
-#endif
-
 struct DynLibInfo
 {
 	void *baseAddress;
 	size_t memorySize;
 };
 
-#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
-struct LibSymbolTable
-{
-	SymbolTable table;
-	uintptr_t lib_base;
-	uint32_t last_pos;
-};
-#endif
-
 class MemoryUtils : 
 	public IMemoryUtils,
 	public SMGlobalClass
 {
-public:
-	MemoryUtils();
-	~MemoryUtils();
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 public: // IMemoryUtils
 	void *FindPattern(const void *libPtr, const char *pattern, size_t len);
-	void *ResolveSymbol(void *handle, const char *symbol);
-public:
-	bool GetLibraryInfo(const void *libPtr, DynLibInfo &lib);
-#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
 private:
-	CVector<LibSymbolTable *> m_SymTables;
-#ifdef PLATFORM_APPLE
-	struct dyld_all_image_infos *m_ImageList;
-	SInt32 m_OSXMajor;
-	SInt32 m_OSXMinor;
-#endif
-#endif
+	bool GetLibraryInfo(const void *libPtr, DynLibInfo &lib);
 };
 
 extern MemoryUtils g_MemUtils;

core/MenuManager.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,8 +38,9 @@
 #include "sourcemm_api.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
+#include "ShareSys.h"
+#include "HandleSys.h"
 #include "sourcemm_api.h"
-#include "logic_bridge.h"
 
 MenuManager g_Menus;
 VoteMenuHandler s_VoteHandler;
@@ -54,24 +55,24 @@ MenuManager::MenuManager()
 
 void MenuManager::OnSourceModAllInitialized()
 {
-	sharesys->AddInterface(NULL, this);
+	g_ShareSys.AddInterface(NULL, this);
 
 	HandleAccess access;
-	handlesys->InitAccessDefaults(NULL, &access);
+	g_HandleSys.InitAccessDefaults(NULL, &access);
 
 	/* Deny cloning to menus */
 	access.access[HandleAccess_Clone] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_MenuType = handlesys->CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_MenuType = g_HandleSys.CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
 
 	/* Also deny deletion to styles */
 	access.access[HandleAccess_Delete] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_StyleType = handlesys->CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_StyleType = g_HandleSys.CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
 }
 
 void MenuManager::OnSourceModAllShutdown()
 {
-	handlesys->RemoveType(m_MenuType, g_pCoreIdent);
-	handlesys->RemoveType(m_StyleType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_MenuType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_StyleType, g_pCoreIdent);
 }
 
 void MenuManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -110,7 +111,7 @@ Handle_t MenuManager::CreateMenuHandle(IBaseMenu *menu, IdentityToken_t *pOwner)
 		return BAD_HANDLE;
 	}
 
-	return handlesys->CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
+	return g_HandleSys.CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
 }
 
 Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
@@ -120,7 +121,7 @@ Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
 		return BAD_HANDLE;
 	}
 
-	return handlesys->CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
+	return g_HandleSys.CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
 }
 
 HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
@@ -130,7 +131,7 @@ HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = NULL;
 
-	return handlesys->ReadHandle(handle, m_MenuType, &sec, (void **)menu);
+	return g_HandleSys.ReadHandle(handle, m_MenuType, &sec, (void **)menu);
 }
 
 HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
@@ -140,7 +141,7 @@ HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = g_pCoreIdent;
 
-	return handlesys->ReadHandle(handle, m_StyleType, &sec, (void **)style);
+	return g_HandleSys.ReadHandle(handle, m_StyleType, &sec, (void **)style);
 }
 
 bool MenuManager::SetDefaultStyle(IMenuStyle *style)
@@ -229,7 +230,6 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 	unsigned int pgn = menu->GetPagination();
 	unsigned int maxItems = style->GetMaxPageItems();
 	bool exitButton = (menu->GetMenuOptionFlags() & MENUFLAG_BUTTON_EXIT) == MENUFLAG_BUTTON_EXIT;
-	bool novoteButton = (menu->GetMenuOptionFlags() & MENUFLAG_BUTTON_NOVOTE) == MENUFLAG_BUTTON_NOVOTE;
 
 	if (pgn != MENU_NO_PAGINATION)
 	{
@@ -240,11 +240,6 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 		maxItems--;
 	}
 
-	if (novoteButton)
-	{
-		maxItems--;
-	}
-
 	/* This is very not allowed! */
 	if (maxItems < 2)
 	{
@@ -440,20 +435,6 @@ skip_search:
 	/* Draw the item according to the order */
 	menu_slots_t *slots = md.slots;
 	unsigned int position = 0;			/* Keep track of the last position */
-
-	if (novoteButton)
-	{
-		char text[50];
-		if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "No Vote", &client))
-		{
-			UTIL_Format(text, sizeof(text), "No Vote");
-		}
-		ItemDrawInfo dr(text, 0);
-		position = panel->DrawItem(dr);
-		slots[position].type = ItemSel_Exit;
-		position++;
-	}
-
 	if (order == ItemOrder_Ascending)
 	{
 		md.item_on_page = drawItems[0].position;
@@ -604,20 +585,14 @@ skip_search:
 				{
 					if (exitBackButton)
 					{
-						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Back", &client))
-						{
-							UTIL_Format(text, sizeof(text), "Back");
-						}
+						CorePlayerTranslate(client, text, sizeof(text), "Back", NULL);
 						dr.style = ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
 						slots[position].type = ItemSel_ExitBack;
 					}
 					else
 					{
-						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Previous", &client))
-						{
-							UTIL_Format(text, sizeof(text), "Previous");
-						}
+						CorePlayerTranslate(client, text, sizeof(text), "Previous", NULL);
 						dr.style = (displayPrev ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
 						slots[position].type = ItemSel_Back;
@@ -635,10 +610,7 @@ skip_search:
 				/* NEXT */
 				if (displayNext || canDrawDisabled)
 				{
-					if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Next", &client))
-					{
-						UTIL_Format(text, sizeof(text), "Next");
-					}
+					CorePlayerTranslate(client, text, sizeof(text), "Next", NULL);
 					dr.style = (displayNext ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 					position = panel->DrawItem(dr);
 					slots[position].type = ItemSel_Next;
@@ -666,10 +638,7 @@ skip_search:
 		/* EXIT */
 		if (exitButton)
 		{
-			if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Exit", &client))
-			{
-				UTIL_Format(text, sizeof(text), "Exit");
-			}
+			CorePlayerTranslate(client, text, sizeof(text), "Exit", NULL);
 			dr.style = ITEMDRAW_CONTROL;
 			position = panel->DrawItem(dr);
 			slots[position].type = ItemSel_Exit;
@@ -808,19 +777,3 @@ unsigned int MenuManager::GetRemainingVoteDelay()
 {
 	return s_VoteHandler.GetRemainingVoteDelay();
 }
-
-bool MenuManager::IsClientInVotePool(int client)
-{
-	return s_VoteHandler.IsClientInVotePool(client);
-}
-
-bool MenuManager::RedrawClientVoteMenu(int client)
-{
-	return RedrawClientVoteMenu2(client, true);
-}
-
-bool MenuManager::RedrawClientVoteMenu2(int client, bool revote)
-{
-	return s_VoteHandler.RedrawToClient(client, revote);
-}
-

core/MenuManager.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -37,6 +37,7 @@
 #include <sh_stack.h>
 #include <sh_list.h>
 #include <sh_string.h>
+#include "sm_memtable.h"
 #include "sm_globals.h"
 
 using namespace SourceMod;
@@ -88,9 +89,6 @@ public:
 	bool IsVoteInProgress();
 	void CancelVoting();
 	unsigned int GetRemainingVoteDelay();
-	bool IsClientInVotePool(int client);
-	bool RedrawClientVoteMenu(int client);
-	bool RedrawClientVoteMenu2(int client, bool revote);
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize);

core/MenuStyle_Base.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,12 +34,11 @@
 #include "MenuStyle_Base.h"
 #include "PlayerManager.h"
 #include "MenuManager.h"
+#include "HandleSys.h"
 #include "CellRecipientFilter.h"
 #if defined MENU_DEBUG
 #include "Logger.h"
 #endif
-#include "logic_bridge.h"
-#include "AutoHandleRooter.h"
 
 BaseMenuStyle::BaseMenuStyle() : m_WatchList(256), m_hHandle(BAD_HANDLE)
 {
@@ -315,7 +314,7 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 
 			if (sound != NULL)
 			{
-				edict_t *pEdict = PEntityOfEntIndex(client);
+				edict_t *pEdict = engine->PEntityOfEntIndex(client);
 				if (pEdict)
 				{
 					ICollideable *pCollideable = pEdict->GetCollideable();
@@ -323,24 +322,15 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 					if (pCollideable)
 					{
 						const Vector & pos = pCollideable->GetCollisionOrigin();
+		
 						enginesound->EmitSound(filter, 
 							client, 
 							CHAN_AUTO, 
-#if SOURCE_ENGINE >= SE_PORTAL2
-							sound, 
-							-1, 
-#endif
 							sound, 
 							VOL_NORM, 
 							ATTN_NORM, 
-#if SOURCE_ENGINE >= SE_PORTAL2
-							0, 
-#endif
 							0, 
 							PITCH_NORM, 
-#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_SDK2013 || SOURCE_ENGINE == SE_TF2
-							0,
-#endif
 							&pos);
 					}
 				}
@@ -387,9 +377,6 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 		RemoveClientFromWatch(client);
 	}
 
-	Handle_t hndl = menu ? menu->GetHandle() : BAD_HANDLE;
-	AutoHandleRooter ahr(hndl);
-
 	if (cancel)
 	{
 		mh->OnMenuCancel(menu, client, reason);
@@ -604,7 +591,7 @@ bool BaseMenuStyle::RedoClientMenu(int client, ItemOrder order)
 }
 
 CBaseMenu::CBaseMenu(IMenuHandler *pHandler, IMenuStyle *pStyle, IdentityToken_t *pOwner) : 
-m_pStyle(pStyle), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false), 
+m_pStyle(pStyle), m_Strings(512), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false), 
 m_pOwner(pOwner ? pOwner : g_pCoreIdent), m_bDeleting(false), m_bWillFreeHandle(false), 
 m_hHandle(BAD_HANDLE), m_pHandler(pHandler), m_nFlags(MENUFLAG_BUTTON_EXIT)
 {
@@ -627,74 +614,94 @@ Handle_t CBaseMenu::GetHandle()
 bool CBaseMenu::AppendItem(const char *info, const ItemDrawInfo &draw)
 {
 	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
-		&& m_items.length() >= m_pStyle->GetMaxPageItems())
+		&& m_items.size() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}
 
 	CItem item;
 
-	item.info = info;
+	item.infoString = m_Strings.AddString(info);
 	if (draw.display)
-		item.display = new ke::AString(draw.display);
+	{
+		item.displayString = m_Strings.AddString(draw.display);
+	}
 	item.style = draw.style;
 
-	m_items.append(ke::Move(item));
+	m_items.push_back(item);
+
 	return true;
 }
 
 bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDrawInfo &draw)
 {
-	if (m_Pagination == (unsigned)MENU_NO_PAGINATION &&
-	    m_items.length() >= m_pStyle->GetMaxPageItems())
+	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
+		&& m_items.size() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}
 
-	if (position >= m_items.length())
+	if (position >= m_items.size())
+	{
 		return false;
+	}
 
 	CItem item;
-	item.info = info;
+	item.infoString = m_Strings.AddString(info);
 	if (draw.display)
-		item.display = new ke::AString(draw.display);
+	{
+		item.displayString = m_Strings.AddString(draw.display);
+	}
 	item.style = draw.style;
 
-	m_items.insert(position, ke::Move(item));
+	CVector<CItem>::iterator iter = m_items.iterAt(position);
+	m_items.insert(iter, item);
+
 	return true;
 }
 
 bool CBaseMenu::RemoveItem(unsigned int position)
 {
-	if (position >= m_items.length())
+	if (position >= m_items.size())
+	{
 		return false;
+	}
+
+	m_items.erase(m_items.iterAt(position));
+
+	if (m_items.size() == 0)
+	{
+		m_Strings.Reset();
+	}
 
-	m_items.remove(position);
 	return true;
 }
 
 void CBaseMenu::RemoveAllItems()
 {
 	m_items.clear();
+	m_Strings.Reset();
 }
 
 const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =NULL */)
 {
-	if (position >= m_items.length())
+	if (position >= m_items.size())
+	{
 		return NULL;
+	}
 
 	if (draw)
 	{
-		draw->display = m_items[position].display->chars();
+		draw->display = m_Strings.GetString(m_items[position].displayString);
 		draw->style = m_items[position].style;
 	}
 
-	return m_items[position].info.chars();
+	return m_Strings.GetString(m_items[position].infoString);
 }
 
 unsigned int CBaseMenu::GetItemCount()
 {
-	return m_items.length();
+	return m_items.size();
 }
 
 bool CBaseMenu::SetPagination(unsigned int itemsPerPage)
@@ -727,12 +734,12 @@ IMenuStyle *CBaseMenu::GetDrawStyle()
 
 void CBaseMenu::SetDefaultTitle(const char *message)
 {
-	m_Title = message;
+	m_Title.assign(message);
 }
 
 const char *CBaseMenu::GetDefaultTitle()
 {
-	return m_Title.chars();
+	return m_Title.c_str();
 }
 
 void CBaseMenu::Cancel()
@@ -799,7 +806,7 @@ void CBaseMenu::InternalDelete()
 
 		m_hHandle = BAD_HANDLE;
 		m_bDeleting = true;
-		handlesys->FreeHandle(hndl, &sec);
+		g_HandleSys.FreeHandle(hndl, &sec);
 	}
 
 	m_pHandler->OnMenuDestroy(this);
@@ -824,5 +831,7 @@ IMenuHandler *CBaseMenu::GetHandler()
 
 unsigned int CBaseMenu::GetBaseMemUsage()
 {
-	return m_Title.length() + (m_items.length() * sizeof(CItem));
+	return m_Title.size() 
+		+ m_Strings.GetMemTable()->GetMemUsage()
+		+ (m_items.size() * sizeof(CItem));
 }

core/MenuStyle_Base.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,45 +34,29 @@
 
 #include <IMenuManager.h>
 #include <IPlayerHelpers.h>
-#include <am-string.h>
-#include <am-vector.h>
+#include <sh_string.h>
+#include <sh_vector.h>
+#include "sm_memtable.h"
 #include "sm_fastlink.h"
 
 using namespace SourceMod;
+using namespace SourceHook;
 
 class CItem
 {
 public:
 	CItem()
 	{
+		infoString = -1;
+		displayString = -1;
 		style = 0;
 		access = 0;
 	}
-	CItem(ke::Moveable<CItem> other)
-	: info(ke::Move(other->info)),
-	  display(ke::Move(other->display))
-	{
-		style = other->style;
-		access = other->access;
-	}
-	CItem & operator =(ke::Moveable<CItem> other)
-	{
-		info = ke::Move(other->info);
-		display = ke::Move(other->display);
-		style = other->style;
-		access = other->access;
-		return *this;
-	}
-
 public:
-	ke::AString info;
-	ke::AutoPtr<ke::AString> display;
+	int infoString;
+	int displayString;
 	unsigned int style;
 	unsigned int access;
-
-private:
-	CItem(const CItem &other) KE_DELETE;
-	CItem &operator =(const CItem &other) KE_DELETE;
 };
 
 class CBaseMenuPlayer
@@ -155,10 +139,11 @@ public:
 private:
 	void InternalDelete();
 protected:
-	ke::AString m_Title;
+	String m_Title;
 	IMenuStyle *m_pStyle;
+	BaseStringTable m_Strings;
 	unsigned int m_Pagination;
-	ke::Vector<CItem> m_items;
+	CVector<CItem> m_items;
 	bool m_bShouldDelete;
 	bool m_bCancelling;
 	IdentityToken_t *m_pOwner;

core/MenuStyle_Radio.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,20 +32,11 @@
 #include "MenuStyle_Radio.h"
 #include "sm_stringutil.h"
 #include "UserMessages.h"
-#include <IGameConfigs.h>
+#include "GameConfigs.h"
 #include "PlayerManager.h"
 #if defined MENU_DEBUG
 #include "Logger.h"
 #endif
-#include "logic_bridge.h"
-
-#ifdef USE_PROTOBUF_USERMESSAGES
-#include <google/protobuf/descriptor.h>
-#endif
-
-#if SOURCE_ENGINE == SE_CSGO
-#include <game/shared/csgo/protobuf/cstrike15_usermessages.pb.h>
-#endif
 
 extern const char *g_RadioNumTable[];
 CRadioStyle g_RadioMenuStyle;
@@ -53,14 +44,6 @@ int g_ShowMenuId = -1;
 bool g_bRadioInit = false;
 unsigned int g_RadioMenuTimeout = 0;
 
-// back, next, exit
-#define MAX_PAGINATION_OPTIONS 3
-
-#define MAX_MENUSLOT_KEYS 10
-
-static unsigned int s_RadioMaxPageItems = MAX_MENUSLOT_KEYS;
-
-
 CRadioStyle::CRadioStyle()
 {
 	m_players = new CRadioMenuPlayer[256+1];
@@ -83,10 +66,6 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 	}
 
 	g_bRadioInit = true;
-
-	// Always register the style. Use IsSupported() to check for validity before use.
-	g_Menus.AddStyle(this);
-
 	const char *msg = g_pGameConf->GetKeyValue("HudRadioMenuMsg");
 	if (!msg || msg[0] == '\0')
 	{
@@ -110,18 +89,7 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 		g_RadioMenuTimeout = 0;
 	}
 
-	const char *items = g_pGameConf->GetKeyValue("RadioMenuMaxPageItems");
-	if (items != NULL)
-	{
-		int value = atoi(items);
-
-		// Only override the mostly-safe default if it's a sane value
-		if (value > MAX_PAGINATION_OPTIONS && value <= MAX_MENUSLOT_KEYS)
-		{
-			s_RadioMaxPageItems = value;
-		}
-	}
-
+	g_Menus.AddStyle(this);
 	g_Menus.SetDefaultStyle(this);
 
 	g_UserMsgs.HookUserMessage(g_ShowMenuId, this, false);
@@ -141,11 +109,7 @@ void CRadioStyle::OnSourceModShutdown()
 
 bool CRadioStyle::IsSupported()
 {
-#if SOURCE_ENGINE == SE_DOTA
-	return false;
-#else
 	return (g_ShowMenuId != -1);
-#endif
 }
 
 bool CRadioStyle::OnClientCommand(int client, const char *cmdname, const CCommand &cmd)
@@ -170,23 +134,13 @@ static unsigned int g_last_holdtime = 0;
 static unsigned int g_last_client_count = 0;
 static int g_last_clients[256];
 
-#ifdef USE_PROTOBUF_USERMESSAGES
-void CRadioStyle::OnUserMessage(int msg_id, protobuf::Message &msg, IRecipientFilter *pFilter)
-#else
 void CRadioStyle::OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter)
-#endif
 {
-#if SOURCE_ENGINE != SE_DOTA
 	int count = pFilter->GetRecipientCount();
-
-#ifdef USE_PROTOBUF_USERMESSAGES
-	int c = ((CCSUsrMsg_ShowMenu &)msg).display_time();
-#else
 	bf_read br(bf->GetBasePointer(), 3);
 
 	br.ReadWord();
 	int c = br.ReadChar();
-#endif
 
 	g_last_holdtime = (c == -1) ? 0 : (unsigned)c;
 
@@ -194,7 +148,6 @@ void CRadioStyle::OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFil
 	{
 		g_last_clients[g_last_client_count++] = pFilter->GetRecipientIndex(i);
 	}
-#endif
 }
 
 void CRadioStyle::OnUserMessageSent(int msg_id)
@@ -235,7 +188,7 @@ IBaseMenu *CRadioStyle::CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwn
 
 unsigned int CRadioStyle::GetMaxPageItems()
 {
-	return s_RadioMaxPageItems;
+	return 10;
 }
 
 const char *CRadioStyle::GetStyleName()
@@ -264,6 +217,15 @@ CRadioDisplay *CRadioStyle::MakeRadioDisplay(CRadioMenu *menu)
 	return display;
 }
 
+IMenuPanel *CRadioStyle::MakeRadioDisplay(const char *str, int keys)
+{
+	CRadioDisplay *pPanel = MakeRadioDisplay(NULL);
+
+	pPanel->DirectSet(str, keys);
+
+	return pPanel;
+}
+
 void CRadioStyle::FreeRadioDisplay(CRadioDisplay *display)
 {
 	m_FreeDisplays.push(display);
@@ -330,12 +292,11 @@ void CRadioDisplay::Reset()
 	keys = 0;
 }
 
-bool CRadioDisplay::DirectSet(const char *str)
+void CRadioDisplay::DirectSet(const char *str, int keymap)
 {
 	m_Title.clear();
 	m_BufferText.assign(str);
-	
-	return true;
+	keys = keymap;
 }
 
 unsigned int CRadioDisplay::GetCurrentKey()
@@ -345,7 +306,7 @@ unsigned int CRadioDisplay::GetCurrentKey()
 
 bool CRadioDisplay::SetCurrentKey(unsigned int key)
 {
-	if (key < m_NextPos || m_NextPos > s_RadioMaxPageItems)
+	if (key < m_NextPos || m_NextPos > 10)
 	{
 		return false;
 	}
@@ -381,7 +342,7 @@ void CRadioDisplay::DrawTitle(const char *text, bool onlyIfEmpty/* =false */)
 
 unsigned int CRadioDisplay::DrawItem(const ItemDrawInfo &item)
 {
-	if (m_NextPos > s_RadioMaxPageItems || !CanDrawItem(item.style))
+	if (m_NextPos > 10 || !CanDrawItem(item.style))
 	{
 		return 0;
 	}
@@ -474,8 +435,7 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 
 void CRadioMenuPlayer::Radio_Refresh()
 {
-#if SOURCE_ENGINE != SE_DOTA
-	cell_t players[1] = { (cell_t)m_index };
+	cell_t players[1] = {m_index};
 	char *ptr = display_pkt;
 	char save = 0;
 	size_t len = display_len;
@@ -491,15 +451,6 @@ void CRadioMenuPlayer::Radio_Refresh()
 		time = menuHoldTime - (unsigned int)(gpGlobals->curtime - menuStartTime);
 	}
 
-#ifdef USE_PROTOBUF_USERMESSAGES
-	// If or when we need to support multiple games per engine with this, we can switch to reflection
-	// TODO: find what happens past 240 on CS:GO
-	CCSUsrMsg_ShowMenu *msg = (CCSUsrMsg_ShowMenu *)g_UserMsgs.StartProtobufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
-	msg->set_bits_valid_slots(display_keys);
-	msg->set_display_time(time);
-	msg->set_menu_string(ptr);
-	g_UserMsgs.EndMessage();
-#else
 	while (true)
 	{
 		if (len > 240)
@@ -507,8 +458,7 @@ void CRadioMenuPlayer::Radio_Refresh()
 			save = ptr[240];
 			ptr[240] = '\0';
 		}
-
-		bf_write *buffer = g_UserMsgs.StartBitBufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
+		bf_write *buffer = g_UserMsgs.StartMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
 		buffer->WriteWord(display_keys);
 		buffer->WriteChar(time ? time : -1);
 		buffer->WriteByte( (len > 240) ? 1 : 0 );
@@ -525,10 +475,8 @@ void CRadioMenuPlayer::Radio_Refresh()
 			break;
 		}
 	}
-#endif
 
 	display_last_refresh = gpGlobals->curtime;
-#endif // !DOTA
 }
 
 int CRadioDisplay::GetAmountRemaining()
@@ -562,7 +510,6 @@ unsigned int CRadioDisplay::GetApproxMemUsage()
 CRadioMenu::CRadioMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner) : 
 CBaseMenu(pHandler, &g_RadioMenuStyle, pOwner)
 {
-	m_Pagination = s_RadioMaxPageItems - MAX_PAGINATION_OPTIONS;
 }
 
 bool CRadioMenu::SetExtOption(MenuOption option, const void *valuePtr)
@@ -596,7 +543,6 @@ bool CRadioMenu::DisplayAtItem(int client,
 		return false;
 	}
 
-	AutoHandleRooter ahr(this->GetHandle());
 	return g_RadioMenuStyle.DoClientMenu(client,
 		this,
 		start_item,
@@ -604,17 +550,6 @@ bool CRadioMenu::DisplayAtItem(int client,
 		time);
 }
 
-bool CRadioMenu::SetPagination(unsigned int itemsPerPage)
-{
-	const unsigned int maxPerPage = s_RadioMaxPageItems - MAX_PAGINATION_OPTIONS;
-	if (itemsPerPage > maxPerPage)
-	{
-		return false;
-	}
-
-	return CBaseMenu::SetPagination(itemsPerPage);
-}
-
 void CRadioMenu::Cancel_Finally()
 {
 	g_RadioMenuStyle.CancelMenu(this);

core/MenuStyle_Radio.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -37,12 +37,10 @@
 #include "MenuStyle_Base.h"
 #include "sourcemm_api.h"
 #include <IPlayerHelpers.h>
-#include "UserMessages.h"
+#include <IUserMessages.h>
 #include "sm_fastlink.h"
 #include <sh_stack.h>
 #include <compat_wrappers.h>
-#include "logic/common_logic.h"
-#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
@@ -67,11 +65,7 @@ private:
 class CRadioStyle : 
 	public BaseMenuStyle,
 	public SMGlobalClass,
-#ifdef USE_PROTOBUF_USERMESSAGES
-	public IProtobufUserMessageListener
-#else
-	public IBitBufUserMessageListener
-#endif
+	public IUserMessageListener
 {
 public:
 	CRadioStyle();
@@ -90,11 +84,7 @@ public: //IMenuStyle
 	unsigned int GetMaxPageItems();
 	unsigned int GetApproxMemUsage();
 public: //IUserMessageListener
-#ifdef USE_PROTOBUF_USERMESSAGES
-	void OnUserMessage(int msg_id, protobuf::Message &msg, IRecipientFilter *pFilter);
-#else
 	void OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter);
-#endif
 	void OnUserMessageSent(int msg_id);
 public:
 	bool IsSupported();
@@ -103,6 +93,7 @@ public:
 	CRadioDisplay *MakeRadioDisplay(CRadioMenu *menu=NULL);
 	void FreeRadioDisplay(CRadioDisplay *display);
 	CRadioMenuPlayer *GetRadioMenuPlayer(int client);
+	IMenuPanel *MakeRadioDisplay(const char *str, int keys);
 private:
 	CRadioMenuPlayer *m_players;
 	CStack<CRadioDisplay *> m_FreeDisplays;
@@ -130,7 +121,8 @@ public: //IMenuPanel
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
-	bool DirectSet(const char *str);
+public:
+	void DirectSet(const char *str, int keymap);
 private:
 	String m_BufferText;
 	String m_Title;
@@ -150,7 +142,6 @@ public:
 		unsigned int time,
 		unsigned int start_item,
 		IMenuHandler *alt_handler/* =NULL */);
-	bool SetPagination(unsigned int itemsPerPage);
 	void Cancel_Finally();
 	unsigned int GetApproxMemUsage();
 };

core/MenuStyle_Valve.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,6 +32,7 @@
 #include "sm_stringutil.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
+#include "Translator.h"
 #include "PlayerManager.h"
 #include "ConCmdManager.h"
 
@@ -65,20 +66,16 @@ bool ValveMenuStyle::OnClientCommand(int client, const char *cmdname, const CCom
 
 void ValveMenuStyle::OnSourceModAllInitialized()
 {
-#if SOURCE_ENGINE != SE_DOTA
 	g_Players.AddClientListener(this);
-	SH_ADD_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
+	SH_ADD_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
 	g_pSPHCC = SH_GET_CALLCLASS(serverpluginhelpers);
-#endif
 }
 
 void ValveMenuStyle::OnSourceModShutdown()
 {
-#if SOURCE_ENGINE != SE_DOTA
 	SH_RELEASE_CALLCLASS(g_pSPHCC);
-	SH_REMOVE_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
+	SH_REMOVE_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
 	g_Players.RemoveClientListener(this);
-#endif
 }
 
 void ValveMenuStyle::HookCreateMessage(edict_t *pEdict,
@@ -91,7 +88,7 @@ void ValveMenuStyle::HookCreateMessage(edict_t *pEdict,
 		return;
 	}
 
-	int client = IndexOfEdict(pEdict);
+	int client = engine->IndexOfEdict(pEdict);
 	if (client < 1 || client > 256)
 	{
 		return;
@@ -328,7 +325,7 @@ void CValveMenuDisplay::SendRawDisplay(int client, int priority, unsigned int ti
 	m_pKv->SetInt("time", time ? time : 200);
 
 	SH_CALL(g_pSPHCC, &IServerPluginHelpers::CreateMessage)(
-		PEntityOfEntIndex(client),
+		engine->PEntityOfEntIndex(client),
 		DIALOG_MENU,
 		m_pKv,
 		vsp_interface);
@@ -408,7 +405,6 @@ bool CValveMenu::DisplayAtItem(int client,
 		return false;
 	}
 
-	AutoHandleRooter ahr(this->GetHandle());
 	return g_ValveMenuStyle.DoClientMenu(client, this, start_item, alt_handler ? alt_handler : m_pHandler, time);
 }
 

core/MenuStyle_Valve.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -39,8 +39,6 @@
 #include "KeyValues.h"
 #include "sm_fastlink.h"
 #include <compat_wrappers.h>
-#include "logic/common_logic.h"
-#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
@@ -77,7 +75,6 @@ public: //IMenuStyle
 	IBaseMenu *CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner);
 	unsigned int GetMaxPageItems();
 	unsigned int GetApproxMemUsage();
-	bool IsSupported() { return true; }
 private:
 	void HookCreateMessage(edict_t *pEdict, DIALOG_TYPE type, KeyValues *kv, IServerPluginCallbacks *plugin);
 private:
@@ -108,7 +105,6 @@ public:
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
-	bool DirectSet(const char *str) { return false; }
 private:
 	KeyValues *m_pKv;
 	unsigned int m_NextPos;

core/MenuVoting.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,57 +34,10 @@
 #include "MenuVoting.h"
 #include "PlayerManager.h"
 #include "sourcemm_api.h"
-#include <sourcemod.h>
-#include <Logger.h>
-#include <HalfLife2.h>
-#include <mathlib.h>
-#include <const.h>
-#include <ITranslator.h>
-#include "logic_bridge.h"
 
 float g_next_vote = 0.0f;
 
-#define VOTE_NOT_VOTING -2
-#define VOTE_PENDING -1
-
-ConVar sm_vote_hintbox("sm_vote_progress_hintbox", 
-					   "0", 
-					   0, 
-					   "Show current vote progress in a hint box",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-ConVar sm_vote_chat("sm_vote_progress_chat", 
-					   "0", 
-					   0, 
-					   "Show current vote progress as chat messages",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-ConVar sm_vote_console("sm_vote_progress_console", 
-					   "0", 
-					   0, 
-					   "Show current vote progress as console messages",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-ConVar sm_vote_client_console("sm_vote_progress_client_console", 
-					   "0", 
-					   0, 
-					   "Show current vote progress as console messages to clients",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue);
 #else
 void OnVoteDelayChange(ConVar *cvar, const char *value);
@@ -99,7 +52,7 @@ ConVar sm_vote_delay("sm_vote_delay",
 					 0.0,
 					 OnVoteDelayChange);
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue)
 #else
 void OnVoteDelayChange(ConVar *cvar, const char *value)
@@ -160,19 +113,14 @@ void VoteMenuHandler::OnClientDisconnected(int client)
 		return;
 	}
 
-	/* Wipe out their vote if they had one.  We have to make sure the the the
-	 * newly connected client is not allowed to vote. 
-	 */
+	/* Wipe out their vote if they had one */
 	int item;
-	if ((item = m_ClientVotes[client]) >= VOTE_PENDING)
+	if ((item = m_ClientVotes[client]) >= 0)
 	{
-		if (item >= 0)
-		{
-			assert((unsigned)item < m_Items);
-			assert(m_Votes[item] > 0);
-			m_Votes[item]--;
-		}
-		m_ClientVotes[client] = VOTE_NOT_VOTING;
+		assert((unsigned)item < m_Items);
+		assert(m_Votes[item] > 0);
+		m_Votes[item]--;
+		m_ClientVotes[client] = -1;
 	}
 }
 
@@ -181,28 +129,18 @@ bool VoteMenuHandler::IsVoteInProgress()
 	return (m_pCurMenu != NULL);
 }
 
-bool VoteMenuHandler::StartVote(IBaseMenu *menu,
-								unsigned int num_clients,
-								int clients[],
-								unsigned int max_time,
-								unsigned int flags/* =0 */)
+bool VoteMenuHandler::StartVote(IBaseMenu *menu, unsigned int num_clients, int clients[], unsigned int max_time, unsigned int flags/* =0 */)
 {
 	if (!InitializeVoting(menu, menu->GetHandler(), max_time, flags))
 	{
 		return false;
 	}
 
-	/* Note: we can use game time and not universal time because 
-	 * if we're voting then players are in-game.
-	 */
-
 	float fVoteDelay = sm_vote_delay.GetFloat();
 	if (fVoteDelay < 1.0)
 	{
 		g_next_vote = 0.0;
-	}
-	else
-	{
+	} else {
 		/* This little trick breaks for infinite votes!
 		 * However, we just ignore that since those 1) shouldn't exist and 
 		 * 2) people must be checking IsVoteInProgress() beforehand anyway.
@@ -210,15 +148,8 @@ bool VoteMenuHandler::StartVote(IBaseMenu *menu,
 		g_next_vote = gpGlobals->curtime + fVoteDelay + (float)max_time;
 	}
 
-	m_fStartTime = gpGlobals->curtime;
-	m_nMenuTime = max_time;
-
 	for (unsigned int i=0; i<num_clients; i++)
 	{
-		if (clients[i] < 1 || clients[i] > 256)
-		{
-			continue;
-		}
 		menu->Display(clients[i], max_time, this);
 	}
 
@@ -227,72 +158,6 @@ bool VoteMenuHandler::StartVote(IBaseMenu *menu,
 	return true;
 }
 
-bool VoteMenuHandler::IsClientInVotePool(int client)
-{
-	if (client < 1 
-		|| client > g_Players.MaxClients() 
-		|| m_pCurMenu == NULL)
-	{
-		return false;
-	}
-
-	return (m_ClientVotes[client] > VOTE_NOT_VOTING);
-}
-
-bool VoteMenuHandler::GetClientVoteChoice(int client, unsigned int *pItem)
-{
-	if (!IsClientInVotePool(client)
-		|| m_ClientVotes[client] == VOTE_PENDING)
-	{
-		return false;
-	}
-
-	*pItem = m_ClientVotes[client];
-
-	return true;
-}
-
-bool VoteMenuHandler::RedrawToClient(int client, bool revotes)
-{
-	unsigned int time_limit;
-
-	if (!IsClientInVotePool(client))
-	{
-		return false;
-	}
-
-	if (m_ClientVotes[client] >= 0)
-	{
-		if ((m_VoteFlags & VOTEFLAG_NO_REVOTES) == VOTEFLAG_NO_REVOTES || !revotes)
-		{
-			return false;
-		}
-		assert((unsigned)m_ClientVotes[client] < m_Items);
-		assert(m_Votes[m_ClientVotes[client]] > 0);
-		m_Votes[m_ClientVotes[client]]--;
-		m_ClientVotes[client] = VOTE_PENDING;
-		m_Revoting[client] = true;
-		m_NumVotes--;
-	}
-
-	if (m_nMenuTime == MENU_TIME_FOREVER)
-	{
-		time_limit = m_nMenuTime;
-	}
-	else
-	{
-		time_limit = (int)((float)m_nMenuTime - (gpGlobals->curtime - m_fStartTime));
-		
-		/* Make sure this doesn't round to zero */
-		if (time_limit == MENU_TIME_FOREVER)
-		{
-			time_limit = 1;
-		}
-	}
-
-	return m_pCurMenu->Display(client, time_limit, this);
-}
-
 bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu, 
 									   IMenuHandler *handler,
 									   unsigned int time,
@@ -308,8 +173,7 @@ bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu,
 	/* Mark all clients as not voting */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		m_ClientVotes[i] = VOTE_NOT_VOTING;
-		m_Revoting[i] = false;
+		m_ClientVotes[i] = -2;
 	}
 
 	m_Items = menu->GetItemCount();
@@ -323,9 +187,7 @@ bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu,
 			m_Votes[i] = 0;
 		}
 		m_Votes.resize(m_Items, 0);
-	}
-	else
-	{
+	} else {
 		for (unsigned int i=0; i<m_Items; i++)
 		{
 			m_Votes[i] = 0;
@@ -353,8 +215,6 @@ void VoteMenuHandler::StartVoting()
 
 	m_pHandler->OnMenuVoteStart(m_pCurMenu);
 
-	m_displayTimer = g_Timers.CreateTimer(this, 1.0, NULL, TIMER_FLAG_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
-
 	/* By now we know how many clients were set.  
 	 * If there are none, we should end IMMEDIATELY.
 	 */
@@ -362,8 +222,6 @@ void VoteMenuHandler::StartVoting()
 	{
 		EndVoting();
 	}
-
-	m_TotalClients = m_Clients;
 }
 
 void VoteMenuHandler::DecrementPlayerCount()
@@ -394,17 +252,10 @@ void VoteMenuHandler::EndVoting()
 	if (fVoteDelay < 1.0)
 	{
 		g_next_vote = 0.0;
-	}
-	else
-	{
+	} else {
 		g_next_vote = gpGlobals->curtime + fVoteDelay;
 	}
 
-	if (m_displayTimer)
-	{
-		g_Timers.KillTimer(m_displayTimer);
-	}
-
 	if (m_bCancelled)
 	{
 		/* If we were cancelled, don't bother tabulating anything.
@@ -451,7 +302,7 @@ void VoteMenuHandler::EndVoting()
 	/* Build the client list */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		if (m_ClientVotes[i] >= VOTE_PENDING)
+		if (m_ClientVotes[i] >= -1)
 		{
 			client_vote[vote.num_clients].client = i;
 			client_vote[vote.num_clients].item = m_ClientVotes[i];
@@ -495,7 +346,7 @@ void VoteMenuHandler::OnMenuCancel(IBaseMenu *menu, int client, MenuCancelReason
 
 void VoteMenuHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuPanel *display)
 {
-	m_ClientVotes[client] = VOTE_PENDING;
+	m_ClientVotes[client] = -1;
 	m_pHandler->OnMenuDisplay(menu, client, display);
 }
 
@@ -517,58 +368,6 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 		m_ClientVotes[client] = item;
 		m_Votes[item]++;
 		m_NumVotes++;
-
-		if (sm_vote_chat.GetBool() || sm_vote_console.GetBool() || sm_vote_client_console.GetBool())
-		{
-			static char buffer[1024];
-			ItemDrawInfo dr;
-			menu->GetItemInfo(item, &dr);
-
-			if (sm_vote_console.GetBool())
-			{
-				int target = SOURCEMOD_SERVER_LANGUAGE;
-				logicore.CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Voted For",
-				                       &target, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
-				Engine_LogPrintWrapper(buffer);
-			}
-			
-			if (sm_vote_chat.GetBool() || sm_vote_client_console.GetBool())
-			{
-				int maxclients = g_Players.GetMaxClients();
-				for (int i=1; i<=maxclients; i++)
-				{	
-					CPlayer *pPlayer = g_Players.GetPlayerByIndex(i);
-					assert(pPlayer);
-
-					if (pPlayer->IsInGame() && !pPlayer->IsFakeClient())
-					{
-						if (m_Revoting[client])
-						{
-							logicore.CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Changed Vote",
-							                       &i, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
-						}
-						else
-						{
-							logicore.CoreTranslate(buffer, sizeof(buffer), "[SM] %T", 4, NULL, "Voted For",
-							                       &i, g_Players.GetPlayerByIndex(client)->GetName(), dr.display);
-						}
-
-						if (sm_vote_chat.GetBool())
-						{
-							g_HL2.TextMsg(i, HUD_PRINTTALK, buffer);
-						}
-
-						if (sm_vote_client_console.GetBool())
-						{
-							ClientConsolePrint(pPlayer->GetEdict(), buffer);
-						}		
-					}
-				}
-			}
-		}
-
-		BuildVoteLeaders();
-		DrawHintProgress();
 	}
 
 	m_pHandler->OnMenuSelect(menu, client, item);
@@ -591,9 +390,6 @@ void VoteMenuHandler::InternalReset()
 	m_NumVotes = 0;
 	m_bCancelled = false;
 	m_pHandler = NULL;
-	m_leaderList[0] = '\0';
-	m_displayTimer = NULL;
-	m_TotalClients = 0;
 }
 
 void VoteMenuHandler::CancelVoting()
@@ -615,87 +411,3 @@ bool VoteMenuHandler::IsCancelling()
 {
 	return m_bCancelled;
 }
-
-void VoteMenuHandler::DrawHintProgress()
-{
-	if (!sm_vote_hintbox.GetBool())
-	{
-		return;
-	}
-
-	static char buffer[1024];
-
-	float timeRemaining = (m_fStartTime + m_nMenuTime) - gpGlobals->curtime;
-	if (timeRemaining < 0)
-	{
-		timeRemaining = 0.0;
-	}
-
-	int iTimeRemaining = RoundFloatToInt(timeRemaining);
-	
-	int maxclients = g_Players.GetMaxClients();
-	for (int i=1; i<=maxclients; i++)
-	{
-		if (g_Players.GetPlayerByIndex(i)->IsInGame())
-		{
-			logicore.CoreTranslate(buffer, sizeof(buffer), "%T%s", 6, NULL, "Vote Count",
-			                       &i, &m_NumVotes, &m_TotalClients, &iTimeRemaining, &m_leaderList);
-			g_HL2.HintTextMsg(i, buffer);
-		}
-	}
-}
-
-void VoteMenuHandler::BuildVoteLeaders()
-{
-	if (m_NumVotes == 0 || !sm_vote_hintbox.GetBool())
-	{
-		return;
-	}
-
-	menu_vote_result_t vote;
-	menu_vote_result_t::menu_item_vote_t item_vote[256];
-
-	memset(&vote, 0, sizeof(vote));
-
-	/* Build the item list */
-	for (unsigned int i=0; i<m_Items; i++)
-	{
-		if (m_Votes[i] > 0)
-		{
-			item_vote[vote.num_items].count = m_Votes[i];
-			item_vote[vote.num_items].item = i;
-			vote.num_votes += m_Votes[i];
-			vote.num_items++;
-		}
-	}
-	vote.item_list = item_vote;
-	assert(vote.num_votes);
-
-	/* Sort the item list descending */
-	qsort(item_vote,
-		vote.num_items,
-		sizeof(menu_vote_result_t::menu_item_vote_t),
-		SortVoteItems);
-
-	/* Take the top 3 (if applicable) and draw them */
-	int len = 0;
-	for (unsigned int i=0; i<vote.num_items && i<3; i++)
-	{
-		int curItem = vote.item_list[i].item;
-		ItemDrawInfo dr;
-		m_pCurMenu->GetItemInfo(curItem, &dr);
-		len += g_SourceMod.Format(m_leaderList + len, sizeof(m_leaderList) - len, "\n%i. %s: (%i)", i+1, dr.display, vote.item_list[i].count);
-	}
-}
-
-SourceMod::ResultType VoteMenuHandler::OnTimer(ITimer *pTimer, void *pData)
-{
-	DrawHintProgress();
-
-	return Pl_Continue;
-}
-
-void VoteMenuHandler::OnTimerEnd(ITimer *pTimer, void *pData)
-{
-	m_displayTimer = NULL;
-}

core/MenuVoting.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -36,7 +36,6 @@
 #include <IPlayerHelpers.h>
 #include <sh_vector.h>
 #include "sm_globals.h"
-#include <TimerSys.h>
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -44,8 +43,7 @@ using namespace SourceMod;
 class VoteMenuHandler : 
 	public IMenuHandler, 
 	public SMGlobalClass,
-	public IClientListener,
-	public ITimedEvent
+	public IClientListener
 {
 public: //SMGlobalClass
 	void OnSourceModAllInitialized();
@@ -63,9 +61,6 @@ public: //IMenuHandler
 	void OnMenuEnd(IBaseMenu *menu, MenuEndReason reason);
 	void OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style);
 	unsigned int OnMenuDisplayItem(IBaseMenu *menu, int client, IMenuPanel *panel, unsigned int item, const ItemDrawInfo &dr);
-public: //ITimedEvent
-	ResultType OnTimer(ITimer *pTimer, void *pData);
-	void OnTimerEnd(ITimer *pTimer, void *pData);
 public:
 	bool StartVote(IBaseMenu *menu,
 		unsigned int num_clients,
@@ -77,9 +72,6 @@ public:
 	IBaseMenu *GetCurrentMenu();
 	bool IsCancelling();
 	unsigned int GetRemainingVoteDelay();
-	bool IsClientInVotePool(int client);
-	bool GetClientVoteChoice(int client, unsigned int *pItem);
-	bool RedrawToClient(int client, bool revote);
 private:
 	void Reset(IMenuHandler *mh);
 	void DecrementPlayerCount();
@@ -90,12 +82,9 @@ private:
 		unsigned int time,
 		unsigned int flags);
 	void StartVoting();
-	void DrawHintProgress();
-	void BuildVoteLeaders();
 private:
 	IMenuHandler *m_pHandler;
 	unsigned int m_Clients;
-	unsigned int m_TotalClients;
 	unsigned int m_Items;
 	CVector<unsigned int> m_Votes;
 	IBaseMenu *m_pCurMenu;
@@ -104,13 +93,7 @@ private:
 	unsigned int m_NumVotes;
 	unsigned int m_VoteTime;
 	unsigned int m_VoteFlags;
-	float m_fStartTime;
-	unsigned int m_nMenuTime;
 	int m_ClientVotes[256+1];
-	bool m_Revoting[256+1];
-	char m_leaderList[1024];
-	ITimer *m_displayTimer;
 };
 
 #endif //_INCLUDE_SOURCEMOD_MENUVOTING_H_
-

core/NextMap.cpp

@@ -1,233 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#include "NextMap.h"
-#include "Logger.h"
-#include "HalfLife2.h"
-#include "sourcemm_api.h"
-#include "sm_stringutil.h"
-#include "sourcehook.h"
-#include "sm_srvcmds.h"
-#include "logic_bridge.h"
-
-NextMapManager g_NextMap;
-
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-SH_DECL_HOOK2_void(IVEngineServer, ChangeLevel, SH_NOATTRIB, 0, const char *, const char *);
-#else
-SH_DECL_HOOK4_void(IVEngineServer, ChangeLevel, SH_NOATTRIB, 0, const char *, const char *, const char *, bool);
-#endif
-
-#if SOURCE_ENGINE == SE_DOTA
-SH_DECL_EXTERN2_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommandContext &, const CCommand &);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
-#elif SOURCE_ENGINE == SE_DARKMESSIAH
-SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
-#else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-#endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-#endif
-
-ConCommand *changeLevelCmd = NULL;
-
-ConVar sm_nextmap("sm_nextmap", "", FCVAR_NOTIFY);
-
-bool g_forcedChange = false;
-
-void NextMapManager::OnSourceModAllInitialized_Post()
-{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
-#else
-	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
-#endif
-
-	ConCommand *pCmd = FindCommand("changelevel");
-	if (pCmd != NULL)
-	{
-		SH_ADD_HOOK(ConCommand, Dispatch, pCmd, SH_STATIC(CmdChangeLevelCallback), false);
-		changeLevelCmd = pCmd;
-	}
-}
-
-void NextMapManager::OnSourceModShutdown()
-{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
-#else
-	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
-#endif
-
-	if (changeLevelCmd != NULL)
-	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, changeLevelCmd, SH_STATIC(CmdChangeLevelCallback), false);
-	}
-
-	SourceHook::List<MapChangeData *>::iterator iter;
-	iter = m_mapHistory.begin();
-
-	while (iter != m_mapHistory.end())
-	{
-		delete (MapChangeData *)*iter;
-		iter = m_mapHistory.erase(iter);
-	}
-}
-
-const char *NextMapManager::GetNextMap()
-{
-	return sm_nextmap.GetString();
-}
-
-bool NextMapManager::SetNextMap(const char *map)
-{
-	if (!g_HL2.IsMapValid(map))
-	{
-		return false;
-	}
-
-	sm_nextmap.SetValue(map);
-
-	return true;
-}
-
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-void NextMapManager::HookChangeLevel(const char *map, const char *unknown)
-#else
-void NextMapManager::HookChangeLevel(const char *map, const char *unknown, const char *video, bool bLongLoading)
-#endif
-{
-	if (g_forcedChange)
-	{
-		logger->LogMessage("[SM] Changed map to \"%s\"", map);
-		RETURN_META(MRES_IGNORED);
-	}
-
-	const char *newmap = sm_nextmap.GetString();
-
-	if (newmap[0] == 0 || !g_HL2.IsMapValid(newmap))
-	{
-		RETURN_META(MRES_IGNORED);
-	}
-
-	logger->LogMessage("[SM] Changed map to \"%s\"", newmap);
-
-	UTIL_Format(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), newmap);
-	UTIL_Format(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), "Normal level change");
-
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-	RETURN_META_NEWPARAMS(MRES_IGNORED, &IVEngineServer::ChangeLevel, (newmap, unknown));
-#else
-	RETURN_META_NEWPARAMS(MRES_IGNORED, &IVEngineServer::ChangeLevel, (newmap, unknown, video, bLongLoading));
-#endif
-}
-
-void NextMapManager::OnSourceModLevelChange( const char *mapName )
-{
-	/* Skip the first 'mapchange' when the server starts up */
-	if (m_tempChangeInfo.startTime != 0)
-	{
-		if (strcmp(mapName, m_tempChangeInfo.m_mapName) == 0)
-		{
-			/* The map change was as we expected */
-			m_mapHistory.push_back(new MapChangeData(lastMap, m_tempChangeInfo.m_changeReason, m_tempChangeInfo.startTime));
-		}
-		else
-		{
-			/* Something intercepted the mapchange */
-			char newReason[255];
-			UTIL_Format(newReason, sizeof(newReason), "%s (Map overridden)", m_tempChangeInfo.m_changeReason);
-			m_mapHistory.push_back(new MapChangeData(lastMap, newReason, m_tempChangeInfo.startTime));
-		}
-
-		/* TODO: Should this be customizable? */
-		if (m_mapHistory.size() > 20)
-		{
-			SourceHook::List<MapChangeData *>::iterator iter;
-			iter = m_mapHistory.begin();
-
-			delete (MapChangeData *)*iter;
-
-			m_mapHistory.erase(iter);
-		}
-	}
-
-	m_tempChangeInfo.m_mapName[0] ='\0';
-	m_tempChangeInfo.m_changeReason[0] = '\0';
-	m_tempChangeInfo.startTime = time(NULL);
-	UTIL_Format(lastMap, sizeof(lastMap), "%s", mapName);
-}
-
-void NextMapManager::ForceChangeLevel( const char *mapName, const char* changeReason )
-{
-	/* Store the mapname and reason */
-	UTIL_Format(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), "%s", mapName);
-	UTIL_Format(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), "%s", changeReason);
-
-	/* Change level and skip our hook */
-	g_forcedChange = true;
-	engine->ChangeLevel(mapName, NULL);
-	g_forcedChange = false;
-}
-
-NextMapManager::NextMapManager()
-{
-	m_tempChangeInfo = MapChangeData();
-	m_mapHistory = SourceHook::List<MapChangeData *>();
-}
-
-#if SOURCE_ENGINE == SE_DOTA
-void CmdChangeLevelCallback(const CCommandContext &context, const CCommand &command)
-{
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-void CmdChangeLevelCallback(const CCommand &command)
-{
-#else
-void CmdChangeLevelCallback()
-{
-	CCommand command;
-#endif
-
-	if (command.ArgC() < 2)
-	{
-		return;
-	}
-
-	if (g_NextMap.m_tempChangeInfo.m_mapName[0] == '\0')
-	{
-		UTIL_Format(g_NextMap.m_tempChangeInfo.m_mapName, sizeof(g_NextMap.m_tempChangeInfo.m_mapName), command.Arg(1));
-		UTIL_Format(g_NextMap.m_tempChangeInfo.m_changeReason, sizeof(g_NextMap.m_tempChangeInfo.m_changeReason), "changelevel Command");
-	}
-}

core/NextMap.h

@@ -1,107 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_SOURCEMOD_NEXTMAP_H_
-#define _INCLUDE_SOURCEMOD_NEXTMAP_H_
-
-#include "sm_globals.h"
-#include "eiface.h"
-#include "sh_list.h"
-#include "sm_stringutil.h"
-
-struct MapChangeData
-{
-	MapChangeData(const char *mapName, const char *changeReason, time_t time)
-	{
-		UTIL_Format(m_mapName, sizeof(m_mapName), mapName);
-		UTIL_Format(m_changeReason, sizeof(m_changeReason), changeReason);
-		startTime = time;
-	}
-
-	MapChangeData()
-	{
-		m_mapName[0] = '\0';
-		m_changeReason[0] = '\0';
-		startTime = 0;
-	}
-
-	char m_mapName[PLATFORM_MAX_PATH];
-	char m_changeReason[100];
-	time_t startTime;
-};
-
-#if SOURCE_ENGINE == SE_DOTA
-void CmdChangeLevelCallback(const CCommandContext &context, const CCommand &command);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-void CmdChangeLevelCallback(const CCommand &command);
-#else
-void CmdChangeLevelCallback();
-#endif
-
-class NextMapManager : public SMGlobalClass
-{
-public:
-	NextMapManager();
-
-#if SOURCE_ENGINE == SE_DOTA
-	friend void CmdChangeLevelCallback(const CCommandContext &context, const CCommand &command);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-	friend void CmdChangeLevelCallback(const CCommand &command);
-#else
-	friend void CmdChangeLevelCallback();
-#endif
-
-	void OnSourceModAllInitialized_Post();
-	void OnSourceModShutdown();
-	void OnSourceModLevelChange(const char *mapName);
-
-	const char *GetNextMap();
-	bool SetNextMap(const char *map);
-
-	void ForceChangeLevel(const char *mapName, const char* changeReason);
-
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-	void HookChangeLevel(const char *map, const char *unknown);
-#else
-	void HookChangeLevel(const char *map, const char *unknown, const char *video, bool bLongLoading);
-#endif
-
-public:
-	SourceHook::List<MapChangeData *> m_mapHistory;
-
-private:
-	MapChangeData m_tempChangeInfo;
-	char lastMap[32];
-};
-
-extern NextMapManager g_NextMap;
-
-#endif //_INCLUDE_SOURCEMOD_NEXTMAP_H_

core/PlayerManager.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -41,10 +41,6 @@
 #include <sh_string.h>
 #include <sh_list.h>
 #include <sh_vector.h>
-#include <am-string.h>
-#include "ConVarManager.h"
-
-#include <steam/steamclientpublic.h>
 
 using namespace SourceHook;
 
@@ -54,16 +50,6 @@ using namespace SourceHook;
 
 #define MIN_API_FOR_ADMINCALLS		7
 
-union serial_t
-{
-	uint32_t   value;
-	struct
-	{
-		uint32_t index  :  8;
-		uint32_t serial : 24;
-	} bits;
-};
-
 class CPlayer : public IGamePlayer
 {
 	friend class PlayerManager;
@@ -72,36 +58,24 @@ public:
 public:
 	const char *GetName();
 	const char *GetIPAddress();
-	const char *GetAuthString(bool validated = true);
-	unsigned int GetSteamAccountID(bool validated = true);
-	const CSteamID &GetSteamId(bool validated = true);
-	uint64_t GetSteamId64(bool validated = true) { return GetSteamId(validated).ConvertToUint64(); }
-	const char *GetSteam2Id(bool validated = true);
-	const char *GetSteam3Id(bool validated = true);
+	const char *GetAuthString();
 	edict_t *GetEdict();
 	bool IsInGame();
 	bool WasCountedAsInGame();
 	bool IsConnected();
 	bool IsAuthorized();
 	bool IsFakeClient();
-	bool IsSourceTV() const;
-	bool IsReplay() const;
 	void SetAdminId(AdminId id, bool temporary);
 	AdminId GetAdminId();
 	void Kick(const char *str);
-	bool IsInKickQueue();
 	IPlayerInfo *GetPlayerInfo();
 	unsigned int GetLanguageId();
-	void SetLanguageId(unsigned int id);
 	int GetUserId();
 	bool RunAdminCacheChecks();
 	void NotifyPostAdminChecks();
-	unsigned int GetSerial();
-	int GetIndex() const;
-	void PrintToConsole(const char *pMsg);
-	void ClearAdmin();
 public:
 	void DoBasicAdminChecks();
+	bool IsInKickQueue();
 	void MarkAsBeingKicked();
 	int GetLifeState();
 private:
@@ -110,11 +84,9 @@ private:
 	void Disconnect();
 	void SetName(const char *name);
 	void DumpAdmin(bool deleting);
-	void UpdateAuthIds();
-	void Authorize();
+	void Authorize(const char *auth);
 	void Authorize_Post();
 	void DoPostConnectAuthorization();
-	bool IsAuthStringValidated();
 private:
 	bool m_IsConnected;
 	bool m_IsInGame;
@@ -123,9 +95,7 @@ private:
 	String m_Name;
 	String m_Ip;
 	String m_IpNoPort;
-	ke::AString m_AuthID;
-	ke::AString m_Steam2Id;
-	ke::AString m_Steam3Id;
+	String m_AuthID;
 	AdminId m_Admin;
 	bool m_TempAdmin;
 	edict_t *m_pEdict;
@@ -135,14 +105,6 @@ private:
 	int m_iIndex;
 	unsigned int m_LangId;
 	int m_UserId;
-	bool m_bFakeClient;
-	bool m_bIsSourceTV;
-	bool m_bIsReplay;
-	serial_t m_Serial;
-	CSteamID m_SteamId;
-#if SOURCE_ENGINE == SE_CSGO
-	QueryCvarCookie_t m_LanguageCookie;
-#endif
 };
 
 class PlayerManager : 
@@ -158,35 +120,24 @@ public: //SMGlobalClass
 	void OnSourceModShutdown();
 	void OnSourceModLevelEnd();
 	ConfigResult OnSourceModConfigChanged(const char *key, const char *value, ConfigSource source, char *error, size_t maxlength);
-	void OnSourceModMaxPlayersChanged(int newvalue);
 public:
 	CPlayer *GetPlayerByIndex(int client) const;
 	void RunAuthChecks();
+	void ClearAdminId(AdminId id);
+	void ClearAllAdmins();
 public:
-#if SOURCE_ENGINE == SE_DOTA
-	bool OnClientConnect(CEntityIndex index, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen);
-	bool OnClientConnect_Post(CEntityIndex index, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen);
-	void OnClientPutInServer(CEntityIndex index, char const *playername);
-	void OnClientDisconnect(CEntityIndex index, int reason);
-	void OnClientDisconnect_Post(CEntityIndex index, int reason);
-	void OnClientCommand(CEntityIndex index, const CCommand &args);
-	void OnClientSettingsChanged(CEntityIndex index);
-	//void OnClientSettingsChanged_Pre(CEntityIndex client);
-#else
 	bool OnClientConnect(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen);
 	bool OnClientConnect_Post(edict_t *pEntity, const char *pszName, const char *pszAddress, char *reject, int maxrejectlen);
 	void OnClientPutInServer(edict_t *pEntity, char const *playername);
 	void OnClientDisconnect(edict_t *pEntity);
 	void OnClientDisconnect_Post(edict_t *pEntity);
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 	void OnClientCommand(edict_t *pEntity, const CCommand &args);
 #else
 	void OnClientCommand(edict_t *pEntity);
 #endif
 	void OnClientSettingsChanged(edict_t *pEntity);
 	//void OnClientSettingsChanged_Pre(edict_t *pEntity);
-#endif
-	void OnServerHibernationUpdate(bool bHibernating);
 public: //IPlayerManager
 	void AddClientListener(IClientListener *listener);
 	void RemoveClientListener(IClientListener *listener);
@@ -201,9 +152,6 @@ public: //IPlayerManager
 	void RegisterCommandTargetProcessor(ICommandTargetProcessor *pHandler);
 	void UnregisterCommandTargetProcessor(ICommandTargetProcessor *pHandler);
 	void ProcessCommandTarget(cmd_target_info_t *info);
-	int GetClientFromSerial(unsigned int serial);
-	void ClearAdminId(AdminId id);
-	void RecheckAnyAdmins();
 public:
 	inline int MaxClients()
 	{
@@ -220,23 +168,14 @@ public:
 	bool CheckSetAdmin(int index, CPlayer *pPlayer, AdminId id);
 	bool CheckSetAdminName(int index, CPlayer *pPlayer, AdminId id);
 	const char *GetPassInfoVar();
+	void RecheckAnyAdmins();
 	unsigned int GetReplyTo();
 	unsigned int SetReplyTo(unsigned int reply);
-	void MaxPlayersChanged(int newvalue = -1);
-#if SOURCE_ENGINE == SE_CSGO
-	bool HandleConVarQuery(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue);
-#endif
 private:
-#if SOURCE_ENGINE == SE_DOTA
-	void OnServerActivate();
-#else
 	void OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax);
-#endif
-	void InvalidatePlayer(CPlayer *pPlayer);
 private:
 	List<IClientListener *> m_hooks;
 	IForward *m_clconnect;
-	IForward *m_clconnect_post;
 	IForward *m_cldisconnect;
 	IForward *m_cldisconnect_post;
 	IForward *m_clputinserver;
@@ -249,30 +188,14 @@ private:
 	int *m_UserIdLookUp;
 	int m_maxClients;
 	int m_PlayerCount;
-	int m_PlayersSinceActive;
 	bool m_FirstPass;
 	unsigned int *m_AuthQueue;
 	String m_PassInfoVar;
 	bool m_QueryLang;
-	bool m_bAuthstringValidation; // are we validating admins with steam before authorizing?
 	bool m_bIsListenServer;
 	int m_ListenClient;
-	bool m_bIsSourceTVActive;
-	bool m_bIsReplayActive;
-	int m_SourceTVUserId;
-	int m_ReplayUserId;
 };
 
-#if SOURCE_ENGINE == SE_DOTA
-void CmdMaxplayersCallback(const CCommandContext &context, const CCommand &command);
-#elif SOURCE_ENGINE >= SE_ORANGEBOX
-void CmdMaxplayersCallback(const CCommand &command);
-#else
-void CmdMaxplayersCallback();
-#endif
-
-extern void ClientConsolePrint(edict_t *e, const char *fmt, ...);
-
 extern PlayerManager g_Players;
 extern bool g_OnMapStarted;
 extern const unsigned int *g_NumPlayersToAuth;

core/Profiler.cpp

@@ -0,0 +1,487 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * 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 <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include "Profiler.h"
+#include "PluginSys.h"
+#include "sm_stringutil.h"
+#include "Logger.h"
+#if defined PLATFORM_POSIX
+#include <sys/time.h>
+#include <time.h>
+#endif
+
+ProfileEngine g_Profiler;
+IProfiler *sm_profiler = &g_Profiler;
+
+#if defined PLATFORM_WINDOWS
+double WINDOWS_PERFORMANCE_FREQUENCY;
+#endif
+
+class EmptyProfiler : public IProfiler
+{
+public:
+	void OnNativeBegin(IPluginContext *pContext, sp_native_t *native)
+	{
+	}
+	void OnNativeEnd()
+	{
+	}
+	void OnFunctionBegin(IPluginContext *pContext, const char *name)
+	{
+	}
+	void OnFunctionEnd()
+	{
+	}
+	int OnCallbackBegin(IPluginContext *pContext, sp_public_t *pubfunc)
+	{
+		return 0;
+	}
+	void OnCallbackEnd(int serial)
+	{
+	}
+} s_EmptyProfiler;
+
+inline void InitProfPoint(prof_point_t &pt)
+{
+#if defined PLATFORM_WINDOWS
+	QueryPerformanceCounter(&pt.value);
+#elif defined PLATFORM_POSIX
+	gettimeofday(&pt.value, NULL);
+#endif
+	pt.is_set = true;
+}
+
+ProfileEngine::ProfileEngine()
+{
+	m_serial = 0;
+
+#if defined PLATFORM_WINDOWS
+	LARGE_INTEGER pf;
+
+	if (QueryPerformanceFrequency(&pf))
+	{
+		WINDOWS_PERFORMANCE_FREQUENCY = 1.0 / (double)(pf.QuadPart);
+	}
+	else
+	{
+		WINDOWS_PERFORMANCE_FREQUENCY = -1.0;
+	}
+#endif
+
+	if (IsEnabled())
+	{
+		InitProfPoint(m_ProfStart);
+	}
+	else
+	{
+		sm_profiler = &s_EmptyProfiler;
+	}
+}
+
+bool ProfileEngine::IsEnabled()
+{
+#if defined PLATFORM_WINDOWS
+	return (WINDOWS_PERFORMANCE_FREQUENCY > 0.0);
+#elif defined PLATFORM_POSIX
+	return true;
+#endif
+}
+
+inline double DiffProfPoints(const prof_point_t &start, const prof_point_t &end)
+{
+	double seconds;
+
+#if defined PLATFORM_WINDOWS
+	LONGLONG diff;
+	
+	diff = end.value.QuadPart - start.value.QuadPart;
+	seconds = diff * WINDOWS_PERFORMANCE_FREQUENCY;
+#elif defined PLATFORM_POSIX
+	seconds = (double)(end.value.tv_sec - start.value.tv_sec);
+
+	if (start.value.tv_usec > end.value.tv_usec)
+	{
+		seconds -= 1.0;
+		seconds += (double)(1000000 - (start.value.tv_usec - end.value.tv_usec)) / 1000000.0;
+	}
+	else
+	{
+		seconds += (double)(end.value.tv_usec - start.value.tv_usec) / 1000000.0;
+	}
+#endif
+
+	return seconds;
+}
+
+inline double CalcAtomTime(const prof_atom_t &atom)
+{
+	if (!atom.end.is_set)
+	{
+		return atom.base_time;
+	}
+
+	return atom.base_time + DiffProfPoints(atom.start, atom.end);
+}
+
+void ProfileEngine::OnNativeBegin(IPluginContext *pContext, sp_native_t *native)
+{
+	PushProfileStack(pContext, SP_PROF_NATIVES, native->name);
+}
+
+void ProfileEngine::OnNativeEnd()
+{
+	assert(!m_AtomStack.empty());
+	assert(m_AtomStack.front().atom_type == SP_PROF_NATIVES);
+
+	PopProfileStack(&m_Natives);
+}
+
+void ProfileEngine::OnFunctionBegin(IPluginContext *pContext, const char *name)
+{
+	PushProfileStack(pContext, SP_PROF_FUNCTIONS, name);
+}
+
+void ProfileEngine::OnFunctionEnd()
+{
+	assert(!m_AtomStack.empty());
+	assert(m_AtomStack.front().atom_type == SP_PROF_FUNCTIONS);
+
+	PopProfileStack(&m_Functions);
+}
+
+int ProfileEngine::OnCallbackBegin(IPluginContext *pContext, sp_public_t *pubfunc)
+{
+	PushProfileStack(pContext, SP_PROF_CALLBACKS, pubfunc->name);
+
+	return m_serial;
+}
+
+void ProfileEngine::OnCallbackEnd(int serial)
+{
+	assert(!m_AtomStack.empty());
+
+	/**
+	 * Account for the situation where the JIT discards the 
+	 * stack because there was an RTE of sorts.
+	 */
+	if (m_AtomStack.front().atom_type != SP_PROF_CALLBACKS
+		&& m_AtomStack.front().atom_serial != serial)
+	{
+		prof_atom_t atom;
+		double total_time;
+
+		/* There was an error, and we need to discard things. */
+		total_time = 0.0;
+		while (!m_AtomStack.empty() 
+			&& m_AtomStack.front().atom_type != SP_PROF_CALLBACKS 
+			&& m_AtomStack.front().atom_serial != serial)
+		{
+			total_time += CalcAtomTime(m_AtomStack.front());
+			m_AtomStack.pop();
+		}
+
+		/**
+		 * Now we can end and discard ourselves, without saving the data.
+		 * Since this data is all erroneous anyway, we don't care if it's 
+		 * not totally accurate. 
+		 */
+
+		assert(!m_AtomStack.empty());
+		atom = m_AtomStack.front();
+		m_AtomStack.pop();
+
+		/* Note: We don't need to resume ourselves because end is set by Pause(). */
+		total_time += CalcAtomTime(atom);
+
+		ResumeParent(total_time);
+		return;
+	}
+
+	PopProfileStack(&m_Callbacks);
+}
+
+void ProfileEngine::PushProfileStack(IPluginContext *ctx, int type, const char *name)
+{
+	prof_atom_t atom;
+
+	PauseParent();
+
+	atom.atom_type = type;
+	atom.base_time = 0.0;
+	atom.ctx = ctx->GetContext();
+	atom.name = name;
+	atom.end.is_set = false;
+
+	if (type == SP_PROF_CALLBACKS)
+	{
+		atom.atom_serial = ++m_serial;
+	}
+	else
+	{
+		atom.atom_serial = 0;
+	}
+
+	m_AtomStack.push(atom);
+
+	/* Note: We do this after because the stack could grow and skew results */
+	InitProfPoint(m_AtomStack.front().start);
+}
+
+void ProfileEngine::PopProfileStack(ProfileReport *reporter)
+{
+	double total_time;
+
+	prof_atom_t &atom = m_AtomStack.front();
+
+	/* We're okay to cache our used time. */
+	InitProfPoint(atom.end);
+	total_time = CalcAtomTime(atom);
+
+	/* Now it's time to save this! This may do a lot of computations which 
+	 * is why we've cached the time beforehand.
+	 */
+	reporter->SaveAtom(atom);
+	m_AtomStack.pop();
+
+	/* Finally, tell our parent how much time we used. */
+	ResumeParent(total_time);
+}
+
+void ProfileEngine::PauseParent()
+{
+	if (m_AtomStack.empty())
+	{
+		return;
+	}
+
+	InitProfPoint(m_AtomStack.front().end);
+}
+
+void ProfileEngine::ResumeParent(double addTime)
+{
+	if (m_AtomStack.empty())
+	{
+		return;
+	}
+
+	prof_atom_t &atom = m_AtomStack.front();
+
+	/* Move its "paused time" to its base (known) time, 
+	 * then reset the start/end.  Note that since CalcAtomTime() 
+	 * reads the base time, we SHOULD NOT use += to add.
+	 */
+	atom.base_time = CalcAtomTime(atom);
+	atom.base_time += addTime;
+	InitProfPoint(atom.start);
+	atom.end.is_set = false;
+}
+
+void ProfileEngine::Clear()
+{
+	m_Natives.Clear();
+	m_Callbacks.Clear();
+	m_Functions.Clear();
+	InitProfPoint(m_ProfStart);
+}
+
+void ProfileEngine::OnSourceModAllInitialized()
+{
+	g_RootMenu.AddRootConsoleCommand("profiler", "Profiler commands", this);
+}
+
+void ProfileEngine::OnSourceModShutdown()
+{
+	g_RootMenu.RemoveRootConsoleCommand("profiler", this);
+}
+
+void ProfileEngine::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
+{
+	if (command.ArgC() >= 3)
+	{
+		if (strcmp(command.Arg(2), "flush") == 0)
+		{
+			FILE *fp;
+			char path[256];
+
+			g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "logs/profile_%d.xml", (int)time(NULL));
+
+			if ((fp = fopen(path, "wt")) == NULL)
+			{
+				g_RootMenu.ConsolePrint("Failed, could not open file for writing: %s", path);
+				return;
+			}
+
+			GenerateReport(fp);
+
+			fclose(fp);
+
+			g_RootMenu.ConsolePrint("Profiler report generated as: %s\n", path);
+
+			return;
+		}
+	}
+
+	g_RootMenu.ConsolePrint("Profiler commands:");
+	g_RootMenu.DrawGenericOption("flush", "Flushes statistics to disk and starts over");
+}
+
+bool ProfileEngine::GenerateReport(FILE *fp)
+{
+	time_t t;
+	double total_time;
+	prof_point_t end_time;
+
+	InitProfPoint(end_time);
+	total_time = DiffProfPoints(m_ProfStart, end_time);
+
+	t = time(NULL);
+
+	fprintf(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
+	fprintf(fp, "<profile time=\"%d\" uptime=\"%f\">\n", (int)t, total_time);
+	WriteReport(fp, &m_Natives, "natives");
+	WriteReport(fp, &m_Callbacks, "callbacks");
+	WriteReport(fp, &m_Functions, "functions");
+	fprintf(fp, "</profile>\n");
+
+	return true;
+}
+
+void ProfileEngine::WriteReport(FILE *fp, ProfileReport *report, const char *name)
+{
+	size_t i, num;
+	prof_atom_report_t *ar;
+	char new_name[512];
+
+	fprintf(fp, " <report name=\"%s\">\n", name);
+	
+	num = report->GetNumReports();
+	for (i = 0; i < num; i++)
+	{
+		ar = report->GetReport(i);
+
+		strncopy(new_name, ar->atom_name, sizeof(new_name));
+		UTIL_ReplaceAll(new_name, sizeof(new_name), "<", "&lt;");
+		UTIL_ReplaceAll(new_name, sizeof(new_name), ">", "&gt;");
+
+		fprintf(fp, "  <item name=\"%s\" numcalls=\"%d\" mintime=\"%f\" maxtime=\"%f\" totaltime=\"%f\"/>\n", 
+			new_name,
+			ar->num_calls,
+			ar->min_time,
+			ar->max_time,
+			ar->total_time);
+	}
+
+	fprintf(fp, " </report>\n");
+}
+
+ProfileReport::~ProfileReport()
+{
+	for (size_t i = 0; i < m_Reports.size(); i++)
+	{
+		delete m_Reports[i];
+	}
+}
+
+void ProfileReport::Clear()
+{
+	m_ReportLookup.clear();
+	for (size_t i = 0; i < m_Reports.size(); i++)
+	{
+		delete m_Reports[i];
+	}
+	m_Reports.clear();
+}
+
+size_t ProfileReport::GetNumReports()
+{
+	return m_Reports.size();
+}
+
+prof_atom_report_t *ProfileReport::GetReport(size_t i)
+{
+	return m_Reports[i];
+}
+
+void ProfileReport::SaveAtom(const prof_atom_t &atom)
+{
+	double atom_time;
+	char full_name[256];
+	prof_atom_report_t **pReport, *report;
+
+	if (atom.atom_type == SP_PROF_NATIVES)
+	{
+		strncopy(full_name, atom.name, sizeof(full_name));
+	}
+	else
+	{
+		CPlugin *pl;
+		const char *file;
+
+		file = "unknown";
+		if ((pl = g_PluginSys.GetPluginByCtx(atom.ctx)) != NULL)
+		{
+			file = pl->GetFilename();
+		}
+
+		UTIL_Format(full_name, sizeof(full_name), "%s!%s", file, atom.name);
+	}
+
+	atom_time = CalcAtomTime(atom);
+
+	if ((pReport = m_ReportLookup.retrieve(full_name)) == NULL)
+	{
+		report = new prof_atom_report_t;
+
+		strncopy(report->atom_name, full_name, sizeof(report->atom_name));
+		report->max_time = atom_time;
+		report->min_time = atom_time;
+		report->num_calls = 1;
+		report->total_time = atom_time;
+		
+		m_ReportLookup.insert(full_name, report);
+		m_Reports.push_back(report);
+	}
+	else
+	{
+		report = *pReport;
+
+		if (atom_time > report->max_time)
+		{
+			report->max_time = atom_time;
+		}
+		if (atom_time < report->min_time)
+		{
+			report->min_time = atom_time;
+		}
+		report->num_calls++;
+		report->total_time += atom_time;
+	}
+}

core/Profiler.h

@@ -0,0 +1,131 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * 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 <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_PLUGIN_PROFILER_H_
+#define _INCLUDE_SOURCEMOD_PLUGIN_PROFILER_H_
+
+#include <sp_vm_api.h>
+#include <sm_platform.h>
+#include <sm_trie_tpl.h>
+#include <sh_vector.h>
+#include <sh_stack.h>
+#include <stdio.h>
+#include "sm_globals.h"
+#include "sm_srvcmds.h"
+
+using namespace SourcePawn;
+using namespace SourceHook;
+
+struct prof_point_t
+{
+#if defined PLATFORM_WINDOWS
+	LARGE_INTEGER value;
+#elif defined PLATFORM_POSIX
+	struct timeval value;
+#endif
+	bool is_set;
+};
+
+struct prof_atom_t
+{
+	int atom_type;			/* Type of object we're profiling */
+	int atom_serial;		/* Serial number, if appropriate */
+	sp_context_t *ctx;		/* Plugin context. */
+	const char *name;		/* Name of the function */
+	prof_point_t start;		/* Start time */
+	prof_point_t end;		/* End time */
+	double base_time;		/* Known time from children or pausing. */
+};
+
+struct prof_atom_report_t
+{
+	char atom_name[256];	/* Full name to shove to logs */
+	double total_time;		/* Total time spent executing, in s */
+	unsigned int num_calls;	/* Number of invocations */
+	double min_time;		/* Min time spent in one call, in s */
+	double max_time;		/* Max time spent in one call, in s */
+};
+
+class ProfileReport
+{
+public:
+	~ProfileReport();
+public:
+	void SaveAtom(const prof_atom_t &atom);
+	size_t GetNumReports();
+	prof_atom_report_t *GetReport(size_t i);
+	void Clear();
+private:
+	KTrie<prof_atom_report_t *> m_ReportLookup;
+	CVector<prof_atom_report_t *> m_Reports;
+};
+
+class ProfileEngine :
+	public SMGlobalClass,
+	public IRootConsoleCommand,
+	public IProfiler
+{
+public:
+	ProfileEngine();
+public:
+	bool IsEnabled();
+	bool GenerateReport(FILE *fp);
+	void Clear();
+public: //SMGlobalClass
+	void OnSourceModAllInitialized();
+	void OnSourceModShutdown();
+public: //IRootConsoleCommand
+	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+public: //IProfiler
+	void OnNativeBegin(IPluginContext *pContext, sp_native_t *native);
+	void OnNativeEnd() ;
+	void OnFunctionBegin(IPluginContext *pContext, const char *name);
+	void OnFunctionEnd();
+	int OnCallbackBegin(IPluginContext *pContext, sp_public_t *pubfunc);
+	void OnCallbackEnd(int serial);
+private:
+	void PushProfileStack(IPluginContext *ctx, int type, const char *name);
+	void PopProfileStack(ProfileReport *reporter);
+	void PauseParent();
+	void ResumeParent(double addTime);
+	void WriteReport(FILE *fp, ProfileReport *report, const char *name);
+private:
+	CStack<prof_atom_t> m_AtomStack;
+	ProfileReport m_Callbacks;
+	ProfileReport m_Functions;
+	ProfileReport m_Natives;
+	int m_serial;
+	prof_point_t m_ProfStart;
+};
+
+extern ProfileEngine g_Profiler;
+
+#endif //_INCLUDE_SOURCEMOD_PLUGIN_PROFILER_H_

core/TextParsers.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -36,9 +36,9 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "TextParsers.h"
-//#include "ShareSys.h"
-//#include "sm_stringutil.h"
-//#include "LibrarySys.h"
+#include "ShareSys.h"
+#include "sm_stringutil.h"
+#include "LibrarySys.h"
 
 TextParsers g_TextParser;
 ITextParsers *textparsers = &g_TextParser;
@@ -69,6 +69,11 @@ TextParsers::TextParsers()
 	g_ws_chartable[(unsigned)' '] = 1;
 }
 
+void TextParsers::OnSourceModAllInitialized()
+{
+	g_ShareSys.AddInterface(NULL, this);
+}
+
 unsigned int TextParsers::GetUTF8CharBytes(const char *stream)
 {
 	return _GetUTF8CharBytes(stream);
@@ -169,7 +174,7 @@ SMCError TextParsers::ParseSMCFile(const char *file,
 			states->line = 0;
 			states->col = 0;
 		}
-		//g_LibSys.GetPlatformError(error, sizeof(error));
+		g_LibSys.GetPlatformError(error, sizeof(error));
 		UTIL_Format(buffer, maxsize, "File could not be opened: %s", error);
 		return SMCError_StreamOpen;
 	}

core/TextParsers.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,8 +32,8 @@
 #ifndef _INCLUDE_SOURCEMOD_TEXTPARSERS_H_
 #define _INCLUDE_SOURCEMOD_TEXTPARSERS_H_
 
-#include "ITextParsers.h"
-#include "main.h"
+#include <ITextParsers.h>
+#include "sm_globals.h"
 
 using namespace SourceMod;
 
@@ -46,10 +46,14 @@ using namespace SourceMod;
  */
 typedef bool (*STREAMREADER)(void *, char *, size_t, unsigned int *);
 
-class TextParsers : public ITextParsers
+class TextParsers : 
+	public ITextParsers,
+	public SMGlobalClass
 {
 public:
 	TextParsers();
+public: //SMGlobalClass
+	void OnSourceModAllInitialized();
 public:
 	bool ParseFile_INI(const char *file, 
 		ITextListener_INI *ini_listener,

core/ThreadSupport.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -28,9 +28,10 @@
  *
  * Version: $Id$
  */
-#include <sm_platform.h>
+
 #include "ThreadSupport.h"
-#include "common_logic.h"
+#include "sm_globals.h"
+#include "ShareSys.h"
 
 #if defined PLATFORM_POSIX
 #include "thread/PosixThreads.h"
@@ -46,7 +47,6 @@ class RegThreadStuff : public SMGlobalClass
 public:
 	void OnSourceModAllInitialized()
 	{
-		sharesys->AddInterface(NULL, g_pThreader);
+		g_ShareSys.AddInterface(NULL, g_pThreader);
 	}
 } s_RegThreadStuff;
-

core/ThreadSupport.h

@@ -1,39 +1,41 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod Team Fortress 2 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_TF2TOOLS_UTIL_H_
-#define _INCLUDE_TF2TOOLS_UTIL_H_
-
-#include <compat_wrappers.h>
-
-bool UTIL_ContainsDataTable(SendTable *pTable, const char *name);
-
-#endif  //_INCLUDE_TF2TOOLS_UTIL_H_
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * 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 <http://www.gnu.org/licenses/>.
+ *
+ * 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 <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_THREAD_SUPPORT_H
+#define _INCLUDE_SOURCEMOD_THREAD_SUPPORT_H
+
+#include <IThreader.h>
+
+using namespace SourceMod;
+
+extern IThreader *g_pThreader;
+
+#endif //_INCLUDE_SOURCEMOD_THREAD_SUPPORT_H

core/TimerSys.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -31,10 +31,10 @@
 
 #include <time.h>
 #include "TimerSys.h"
+#include "ForwardSys.h"
 #include "sourcemm_api.h"
 #include "frame_hooks.h"
 #include "ConVarManager.h"
-#include "logic_bridge.h"
 
 #define TIMER_MIN_ACCURACY		0.1
 
@@ -180,9 +180,9 @@ TimerSystem::~TimerSystem()
 
 void TimerSystem::OnSourceModAllInitialized()
 {
-	sharesys->AddInterface(NULL, this);
-	m_pOnGameFrame = forwardsys->CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
-	m_pOnMapTimeLeftChanged = forwardsys->CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
+	g_ShareSys.AddInterface(NULL, this);
+	m_pOnGameFrame = g_Forwards.CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
+	m_pOnMapTimeLeftChanged = g_Forwards.CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
 }
 
 void TimerSystem::OnSourceModGameInitialized()
@@ -198,8 +198,8 @@ void TimerSystem::OnSourceModGameInitialized()
 void TimerSystem::OnSourceModShutdown()
 {
 	SetMapTimer(NULL);
-	forwardsys->ReleaseForward(m_pOnGameFrame);
-	forwardsys->ReleaseForward(m_pOnMapTimeLeftChanged);
+	g_Forwards.ReleaseForward(m_pOnGameFrame);
+	g_Forwards.ReleaseForward(m_pOnMapTimeLeftChanged);
 }
 
 void TimerSystem::OnSourceModLevelEnd()

core/TimerSys.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,11 +32,11 @@
 #ifndef _INCLUDE_SOURCEMOD_CTIMERSYS_H_
 #define _INCLUDE_SOURCEMOD_CTIMERSYS_H_
 
+#include "ShareSys.h"
 #include <ITimerSystem.h>
 #include <sh_stack.h>
 #include <sh_list.h>
 #include "sourcemm_api.h"
-#include "sm_globals.h"
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -78,11 +78,11 @@ public: //ITimerSystem
 	float GetTickedTime();
 	void NotifyOfGameStart(float offset /* = 0.0f */);
 	bool GetMapTimeLeft(float *pTime);
-	IMapTimer *GetMapTimer();
 public:
 	void RunFrame();
 	void RemoveMapChangeTimers();
 	void GameFrame(bool simulating);
+	IMapTimer *GetMapTimer();
 private:
 	List<ITimer *> m_SingleTimers;
 	List<ITimer *> m_LoopTimers;

core/Translator.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet:
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -29,24 +29,20 @@
  * Version: $Id$
  */
 
-#include "common_logic.h"
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <sm_platform.h>
 #include "Translator.h"
-#include <IPlayerHelpers.h>
-#include <ISourceMod.h>
-#include <ILibrarySys.h>
-#include "PhraseCollection.h"
-#include "stringutil.h"
+#include "Logger.h"
+#include "LibrarySys.h"
+#include "sm_stringutil.h"
+#include "sourcemod.h"
+#include "PlayerManager.h"
 
 Translator g_Translator;
-IPhraseCollection *g_pCorePhrases = NULL;
+CPhraseFile *g_pCorePhrases = NULL;
 unsigned int g_pCorePhraseID = 0;
 
-using namespace SourceMod;
-
 struct trans_t
 {
 	int stridx;
@@ -69,10 +65,15 @@ CPhraseFile::CPhraseFile(Translator *pTranslator, const char *file)
 	m_LangCount = pTranslator->GetLanguageCount();
 	m_File.assign(file);
 	m_pTranslator = pTranslator;
+	m_pPhraseLookup = NULL;
 }
 
 CPhraseFile::~CPhraseFile()
 {
+	if (m_pPhraseLookup)
+	{
+		sm_trie_destroy(m_pPhraseLookup);
+	}
 }
 
 void CPhraseFile::ParseError(const char *message, ...)
@@ -96,16 +97,20 @@ void CPhraseFile::ParseWarning(const char *message, ...)
 
 	if (!m_FileLogged)
 	{
-		logger->LogError("[SM] Warning(s) encountered in translation file \"%s\"", m_File.c_str());
+		g_Logger.LogError("[SM] Warning(s) encountered in translation file \"%s\"", m_File.c_str());
 		m_FileLogged = true;
 	}
 
-	logger->LogError("[SM] %s", buffer);
+	g_Logger.LogError("[SM] %s", message);
 }
 
 void CPhraseFile::ReparseFile()
 {
-	m_PhraseLookup.clear();
+	if (m_pPhraseLookup)
+	{
+		sm_trie_destroy(m_pPhraseLookup);
+	}
+	m_pPhraseLookup = sm_trie_create();
 
 	m_LangCount = m_pTranslator->GetLanguageCount();
 
@@ -116,19 +121,19 @@ void CPhraseFile::ReparseFile()
 
 	SMCError err;
 	char path[PLATFORM_MAX_PATH];
-	g_pSM->BuildPath(Path_SM, path, PLATFORM_MAX_PATH, "translations/%s", m_File.c_str());
+	g_SourceMod.BuildPath(Path_SM, path, PLATFORM_MAX_PATH, "translations/%s", m_File.c_str());
 
 	//backwards compatibility shim
 	/* :HACKHACK: Change .cfg/.txt and vice versa for compatibility */
-	if (!libsys->PathExists(path))
+	if (!g_LibSys.PathExists(path))
 	{
 		if (m_File.compare("common.cfg") == 0)
 		{
-			UTIL_ReplaceAll(path, sizeof(path), "common.cfg", "common.phrases.txt", true);
+			UTIL_ReplaceAll(path, sizeof(path), "common.cfg", "common.phrases.txt");
 		} else if (strstr(path, ".cfg")) {
-			UTIL_ReplaceAll(path, sizeof(path), ".cfg", ".txt", true);
+			UTIL_ReplaceAll(path, sizeof(path), ".cfg", ".txt");
 		} else if (strstr(path, ".txt")) {
-			UTIL_ReplaceAll(path, sizeof(path), ".txt", ".cfg", true);
+			UTIL_ReplaceAll(path, sizeof(path), ".txt", ".cfg");
 		}
 	}
 
@@ -142,47 +147,8 @@ void CPhraseFile::ReparseFile()
 			msg = m_ParseError.c_str();
 		}
 
-		logger->LogError("[SM] Fatal error encountered parsing translation file \"%s\"", m_File.c_str());
-		logger->LogError("[SM] Error (line %d, column %d): %s", states.line, states.col, msg);
-	}
-
-	const char *code;
-	for (unsigned int i = 1; i < m_LangCount; i++)
-	{
-		if (!m_pTranslator->GetLanguageInfo(i, &code, NULL))
-		{
-			continue;
-		}
-
-		g_pSM->BuildPath(Path_SM, 
-			path,
-			PLATFORM_MAX_PATH,
-			"translations/%s/%s",
-			code,
-			m_File.c_str());
-
-		/* Speculatively load these. */
-		if (!libsys->PathExists(path))
-		{
-			continue;
-		}
-
-		if ((err=textparsers->ParseFile_SMC(path, this, &states)) != SMCError_Okay)
-		{
-			const char *msg = textparsers->GetSMCErrorString(err);
-			if (!msg)
-			{
-				msg = m_ParseError.c_str();
-			}
-
-			logger->LogError("[SM] Fatal error encountered parsing translation file \"%s/%s\"", 
-				code, 
-				m_File.c_str());
-			logger->LogError("[SM] Error (line %d, column %d): %s",
-				states.line,
-				states.col,
-				msg);
-		}
+		g_Logger.LogError("[SM] Fatal error encountered parsing translation file \"%s\"", m_File.c_str());
+		g_Logger.LogError("[SM] Error (line %d, column %d): %s", states.line, states.col, msg);
 	}
 }
 
@@ -210,16 +176,21 @@ SMCResult CPhraseFile::ReadSMC_NewSection(const SMCStates *states, const char *n
 		m_ParseState = PPS_InPhrase;
 		recognized = true;
 
-		if (!m_PhraseLookup.retrieve(name, &m_CurPhrase))
+		phrase_t *pPhrase;
+		m_CurPhrase = m_pMemory->CreateMem(sizeof(phrase_t), (void **)&pPhrase);
+
+		/* Create the reverse lookup */
+		if (!sm_trie_insert(m_pPhraseLookup, name, reinterpret_cast<void *>(m_CurPhrase)))
+		{
+			ParseWarning("Skipping duplicate phrase \"%s\" on line %d.", name, states->line);
+			/* :IDEA: prevent memory waste by seeking backwards in memtable? */
+			m_CurPhrase = -1;
+		} 
+		else 
 		{
-			phrase_t *pPhrase;
-
-			m_CurPhrase = m_pMemory->CreateMem(sizeof(phrase_t), (void **)&pPhrase);
-			m_PhraseLookup.insert(name, m_CurPhrase);
-
 			/* Initialize new phrase */
 			trans_t *pTrans;
-
+	
 			pPhrase->fmt_count = 0;
 			pPhrase->fmt_list = -1;
 
@@ -229,14 +200,13 @@ SMCResult CPhraseFile::ReadSMC_NewSection(const SMCStates *states, const char *n
 
 			pPhrase->translations = 0;
 			pPhrase->fmt_bytes = 0;
-
+	
 			for (unsigned int i=0; i<m_LangCount; i++)
 			{
 				pTrans[i].stridx = -1;
 			}
+			m_LastPhraseString.assign(name);
 		}
-
-		m_LastPhraseString.assign(name);
 	} 
 	else if (m_ParseState == PPS_InPhrase) 
 	{
@@ -261,12 +231,15 @@ SMCResult CPhraseFile::ReadSMC_KeyValue(const SMCStates *states, const char *key
 	}
 
 	phrase_t *pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase);
-
-	/* Duplicate format keys get silently ignored. */
-	if (key[0] == '#' 
-		&& strcmp(key, "#format") == 0
-		&& pPhrase->fmt_list == -1)
+	
+	if (key[0] == '#' && strcmp(key, "#format") == 0)
 	{
+		if (pPhrase->fmt_list != -1)
+		{
+			ParseWarning("Ignoring duplicated #format property on line %d", states->line);
+			return SMCResult_Continue;
+		}
+
 		if (pPhrase->translations > 0)
 		{
 			ParseWarning("#format property should come before translations on line %d, ignoring", states->line);
@@ -474,6 +447,13 @@ SMCResult CPhraseFile::ReadSMC_KeyValue(const SMCStates *states, const char *key
 	} 
 	else 
 	{
+		size_t len = strlen(key);
+		if (len != 2)
+		{
+			ParseWarning("Ignoring translation to invalid language \"%s\" on line %d.", key, states->line);
+			return SMCResult_Continue;
+		}
+
 		unsigned int lang;
 		if (!m_pTranslator->GetLanguageByCode(key, &lang))
 		{
@@ -486,7 +466,7 @@ SMCResult CPhraseFile::ReadSMC_KeyValue(const SMCStates *states, const char *key
 		/* See how many bytes we need for this string, then allocate.
 		 * NOTE: THIS SHOULD GUARANTEE THAT WE DO NOT NEED TO NEED TO SIZE CHECK 
 		 */
-		size_t len = strlen(value) + pPhrase->fmt_bytes + 1;
+		len = strlen(value) + pPhrase->fmt_bytes + 1;
 		char *out_buf;
 		int out_idx;
 
@@ -620,7 +600,9 @@ SMCResult CPhraseFile::ReadSMC_LeavingSection(const SMCStates *states)
 	if (m_ParseState == PPS_InPhrase)
 	{
 		if (m_CurPhrase == -1 && m_LastPhraseString.size())
-			m_PhraseLookup.remove(m_LastPhraseString.c_str());
+		{
+			sm_trie_delete(m_pPhraseLookup, m_LastPhraseString.c_str());
+		}
 		m_CurPhrase = -1;
 		m_ParseState = PPS_Phrases;
 		m_LastPhraseString.assign("");
@@ -637,7 +619,9 @@ void CPhraseFile::ReadSMC_ParseEnd(bool halted, bool failed)
 {
 	/* Check to see if we have any dangling phrases that weren't completed, and scrap them */
 	if ((halted || failed) && m_LastPhraseString.size())
-		m_PhraseLookup.remove(m_LastPhraseString.c_str());
+	{
+		sm_trie_delete(m_pPhraseLookup, m_LastPhraseString.c_str());
+	}
 }
 
 TransError CPhraseFile::GetTranslation(const char *szPhrase, unsigned int lang_id, Translation *pTrans)
@@ -647,11 +631,13 @@ TransError CPhraseFile::GetTranslation(const char *szPhrase, unsigned int lang_i
 		return Trans_BadLanguage;
 	}
 
-	int address;
-	if (!m_PhraseLookup.retrieve(szPhrase, &address))
+	void *object;
+	if (!sm_trie_retrieve(m_pPhraseLookup, szPhrase, &object))
+	{
 		return Trans_BadPhrase;
+	}
 
-	phrase_t *pPhrase = (phrase_t *)m_pMemory->GetAddress(address);
+	phrase_t *pPhrase = (phrase_t *)m_pMemory->GetAddress(reinterpret_cast<int>(object));
 	trans_t *trans = (trans_t *)m_pMemory->GetAddress(pPhrase->trans_tbl);
 
 	trans = &trans[lang_id];
@@ -677,9 +663,10 @@ const char *CPhraseFile::GetFilename()
  ** MAIN TRANSLATOR CODE **
  **************************/
 
-Translator::Translator() : m_ServerLang(SOURCEMOD_LANGUAGE_ENGLISH)
+Translator::Translator() : m_ServerLang(LANGUAGE_ENGLISH)
 {
 	m_pStringTab = new BaseStringTable(2048);
+	m_pLCodeLookup = sm_trie_create();
 	strncopy(m_InitialLang, "en", sizeof(m_InitialLang));
 }
 
@@ -695,6 +682,8 @@ Translator::~Translator()
 		delete m_Languages[i];
 	}
 
+	sm_trie_destroy(m_pLCodeLookup);
+
 	delete m_pStringTab;
 }
 
@@ -711,13 +700,13 @@ ConfigResult Translator::OnSourceModConfigChanged(const char *key,
 			unsigned int index;
 			if (!GetLanguageByCode(value, &index))
 			{
-				smcore.Format(error, maxlength, "Language code \"%s\" is not registered", value);
+				UTIL_Format(error, maxlength, "Language code \"%s\" is not registered", value);
 				return ConfigResult_Reject;
 			}
 
 			m_ServerLang = index;
 		} else {
-			smcore.strncopy(m_InitialLang, value, sizeof(m_InitialLang));
+			strncopy(m_InitialLang, value, sizeof(m_InitialLang));
 		}
 
 		return ConfigResult_Accept;
@@ -728,50 +717,64 @@ ConfigResult Translator::OnSourceModConfigChanged(const char *key,
 
 void Translator::OnSourceModLevelChange(const char *mapName)
 {
-	RebuildLanguageDatabase();
+	/* Refresh language stuff */
+	char path[PLATFORM_MAX_PATH];
+	g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "configs/languages.cfg");
+	RebuildLanguageDatabase(path);
 }
 
 void Translator::OnSourceModAllInitialized()
 {
 	AddLanguage("en", "English");
 
-	const char* lang = smcore.GetCoreConfigValue("ServerLang");
-	if (lang)
-	{
-		strncpy(m_InitialLang, lang, sizeof(m_InitialLang));
-	}
+	unsigned int id;
 
-	g_pCorePhrases = CreatePhraseCollection();
-	g_pCorePhrases->AddPhraseFile("core.phrases");
-
-	sharesys->AddInterface(NULL, this);
-}
-
-void Translator::OnSourceModShutdown()
-{
-	g_pCorePhrases->Destroy();
+	id = FindOrAddPhraseFile("core.phrases.txt");
+	g_pCorePhraseID = id;
+	g_pCorePhrases = GetFileByIndex(id);
 }
 
 bool Translator::GetLanguageByCode(const char *code, unsigned int *index)
 {
-	return m_LCodeLookup.retrieve(code, index);
+	void *_index;
+
+	if (!sm_trie_retrieve(m_pLCodeLookup, code, &_index))
+	{
+		return false;
+	}
+
+	if (index)
+	{
+		*index = reinterpret_cast<unsigned int>(_index);
+	}
+
+	return true;
 }
 
 bool Translator::GetLanguageByName(const char *name, unsigned int *index)
 {
-	char lower[256];
-	size_t len = strlen(name);
-	if (len > 255) len = 255;
-	for (size_t i = 0; i < len; i++)
-	{
-		if (name[i] >= 'A' && name[i] <= 'Z')
-			lower[i] = tolower(name[i]);
-		else
-			lower[i] = name[i];
-	}
-	lower[len] = '\0';
+	CVector<Language *>::iterator iter;
+	unsigned int id = 0;
 
-	return m_LAliases.retrieve(lower, index);
+	for (iter=m_Languages.begin(); iter!=m_Languages.end(); iter++, id++)
+	{
+		if (strcasecmp(m_pStringTab->GetString((*iter)->m_FullName), name) == 0)
+		{
+			break;
+		}
+	}
+
+	if (iter == m_Languages.end())
+	{
+		return false;
+	}
+
+	if (index)
+	{
+		*index = id;
+	}
+
+	return true;
 }
 
 unsigned int Translator::GetLanguageCount()
@@ -804,11 +807,11 @@ unsigned int Translator::FindOrAddPhraseFile(const char *phrase_file)
 	return idx;
 }
 
-void Translator::RebuildLanguageDatabase()
+void Translator::RebuildLanguageDatabase(const char *lang_header_file)
 {
 	/* Erase everything we have */
-	m_LCodeLookup.clear();
-	m_LAliases.clear();
+	sm_trie_destroy(m_pLCodeLookup);
+	m_pLCodeLookup = sm_trie_create();
 	m_pStringTab->Reset();
 
 	for (size_t i=0; i<m_Languages.size(); i++)
@@ -818,12 +821,9 @@ void Translator::RebuildLanguageDatabase()
 	m_Languages.clear();
 
 	/* Start anew */
-	char path[PLATFORM_MAX_PATH];
-	g_pSM->BuildPath(Path_SM, path, sizeof(path), "configs/languages.cfg");
-
 	SMCError err;
 	SMCStates states;
-	if ((err=textparsers->ParseFile_SMC(path, this, &states)) != SMCError_Okay)
+	if ((err=textparsers->ParseFile_SMC(lang_header_file, this, &states)) != SMCError_Okay)
 	{
 		const char *str_err = textparsers->GetSMCErrorString(err);
 		if (!str_err)
@@ -831,21 +831,25 @@ void Translator::RebuildLanguageDatabase()
 			str_err = m_CustomError.c_str();
 		}
 
-		logger->LogError("[SM] Failed to parse language header file: \"%s\"", path);
-		logger->LogError("[SM] Parse error (line %d, column %d): %s", states.line, states.col, str_err);
+		g_Logger.LogError("[SM] Failed to parse language header file: \"%s\"", lang_header_file);
+		g_Logger.LogError("[SM] Parse error (line %d, column %d): %s", states.line, states.col, str_err);
 	}
 
-	if (!m_LCodeLookup.retrieve(m_InitialLang, &m_ServerLang))
+	void *serverLang;
+
+	if (!sm_trie_retrieve(m_pLCodeLookup, m_InitialLang, &serverLang))
 	{
-		logger->LogError("Server language was set to bad language \"%s\" -- reverting to English", m_InitialLang);
+		g_Logger.LogError("Server language was set to bad language \"%s\" -- reverting to English", m_InitialLang);
 
-		smcore.strncopy(m_InitialLang, "en", sizeof(m_InitialLang));
-		m_ServerLang = SOURCEMOD_LANGUAGE_ENGLISH;
+		strncopy(m_InitialLang, "en", sizeof(m_InitialLang));
+		m_ServerLang = LANGUAGE_ENGLISH;
 	}
 
+	m_ServerLang = reinterpret_cast<unsigned int>(serverLang);
+
 	if (!m_Languages.size())
 	{
-		logger->LogError("[SM] Fatal error, no languages found! Translation will not work.");
+		g_Logger.LogError("[SM] Fatal error, no languages found! Translation will not work.");
 	}
 
 	for (size_t i=0; i<m_Files.size(); i++)
@@ -872,7 +876,7 @@ SMCResult Translator::ReadSMC_NewSection(const SMCStates *states, const char *na
 
 	if (!m_InLanguageSection)
 	{
-		logger->LogError("[SM] Warning: Unrecognized section \"%s\" in languages.cfg", name);
+		g_Logger.LogError("[SM] Warning: Unrecognized section \"%s\" in languages.cfg", name);
 	}
 
 	return SMCResult_Continue;
@@ -889,10 +893,10 @@ SMCResult Translator::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 {
 	size_t len = strlen(key);
 
-	if (len >= sizeof(((Language *)0)->m_code2))
+	if (len != 2)
 	{
-		logger->LogError("[SM] Warning encountered parsing languages.cfg file.");
-		logger->LogError("[SM] Invalid language code \"%s\" is too long.", key);
+		g_Logger.LogError("[SM] Warning encountered parsing languages.cfg file.");
+		g_Logger.LogError("[SM] Invalid language code \"%s\" is being ignored.", key);
 	}
 
 	AddLanguage(key, value);
@@ -902,36 +906,22 @@ SMCResult Translator::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 
 bool Translator::AddLanguage(const char *langcode, const char *description)
 {
-	char lower[256];
-	size_t len = strlen(description);
-	if (len > 255) len = 255;
-	for (size_t i = 0; i < len; i++)
+	if (sm_trie_retrieve(m_pLCodeLookup, langcode, NULL))
 	{
-		if (description[i] >= 'A' && description[i] <= 'Z')
-			lower[i] = tolower(description[i]);
-		else
-			lower[i] = description[i];
-	}
-	lower[len] = '\0';
-
-	if (m_LAliases.contains(lower))
 		return false;
-
-	unsigned int idx;
-	if (!m_LCodeLookup.retrieve(langcode, &idx))
-	{
-		Language *pLanguage = new Language;
-		idx = m_Languages.size();
-
-		smcore.Format(pLanguage->m_code2, sizeof(pLanguage->m_code2), "%s", langcode);
-		pLanguage->m_CanonicalName = m_pStringTab->AddString(lower);
-
-		m_LCodeLookup.insert(langcode, idx);
-
-		m_Languages.push_back(pLanguage);
 	}
-	
-	m_LAliases.insert(lower, idx);
+
+	Language *pLanguage = new Language;
+	unsigned int idx = m_Languages.size();
+
+	pLanguage->m_code2[0] = langcode[0];
+	pLanguage->m_code2[1] = langcode[1];
+	pLanguage->m_code2[2] = langcode[2];
+	pLanguage->m_FullName = m_pStringTab->AddString(description);
+
+	sm_trie_insert(m_pLCodeLookup, langcode, reinterpret_cast<void *>(idx));
+
+	m_Languages.push_back(pLanguage);
 
 	return true;
 }
@@ -946,6 +936,61 @@ CPhraseFile *Translator::GetFileByIndex(unsigned int index)
 	return m_Files[index];
 }
 
+size_t Translator::Translate(char *buffer, size_t maxlength, void **params, const Translation *pTrans)
+{
+	void *new_params[MAX_TRANSLATE_PARAMS];
+
+	/* Rewrite the parameter order */
+	for (unsigned int i=0; i<pTrans->fmt_count; i++)
+	{
+		new_params[i] = params[pTrans->fmt_order[i]];
+	}
+
+	return gnprintf(buffer, maxlength, pTrans->szPhrase, new_params);
+}
+
+TransError Translator::CoreTransEx(CPhraseFile *pFile,
+								   int client, 
+								   char *buffer, 
+								   size_t maxlength, 
+								   const char *phrase, 
+								   void **params, 
+								   size_t *outlen)
+{
+	Translation trans;
+	TransError err;
+
+	/* Using server lang temporarily until client lang stuff is implemented */
+	if ((err = pFile->GetTranslation(phrase, m_ServerLang, &trans)) != Trans_Okay)
+	{
+		return err;
+	}
+
+	size_t len = Translate(buffer, maxlength, params, &trans);
+
+	if (outlen)
+	{
+		*outlen = len;
+	}
+
+	return Trans_Okay;
+}
+
+TransError Translator::CoreTrans(int client, 
+								  char *buffer, 
+								  size_t maxlength, 
+								  const char *phrase, 
+								  void **params, 
+								  size_t *outlen)
+{
+	if (!g_pCorePhrases)
+	{
+		return Trans_BadPhraseFile;
+	}
+
+	return CoreTransEx(g_pCorePhrases, client, buffer, maxlength, phrase, params, outlen);
+}
+
 unsigned int Translator::GetServerLanguage()
 {
 	return m_ServerLang;
@@ -953,7 +998,7 @@ unsigned int Translator::GetServerLanguage()
 
 unsigned int Translator::GetClientLanguage(int client)
 {
-	IGamePlayer *pPlayer = playerhelpers->GetGamePlayer(client);
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
 	return pPlayer->GetLanguageId();
 }
 
@@ -971,105 +1016,7 @@ bool Translator::GetLanguageInfo(unsigned int number, const char **code, const c
 	}
 	if (name)
 	{
-		*name = m_pStringTab->GetString(l->m_CanonicalName);
-	}
-
-	return true;
-}
-
-const char *Translator::GetInterfaceName()
-{
-	return SMINTERFACE_TRANSLATOR_NAME;
-}
-
-unsigned int Translator::GetInterfaceVersion()
-{
-	return SMINTERFACE_TRANSLATOR_VERSION;
-}
-
-IPhraseCollection *Translator::CreatePhraseCollection()
-{
-	return new CPhraseCollection();
-}
-
-int Translator::SetGlobalTarget(int index)
-{
-	return g_pSM->SetGlobalTarget(index);
-}
-
-int Translator::GetGlobalTarget() const
-{
-	return g_pSM->GetGlobalTarget();
-}
-
-bool CoreTranslate(char *buffer,  size_t maxlength, const char *format, unsigned int numparams,
-                   size_t *pOutLength, ...)
-{
-	va_list ap;
-	unsigned int i;
-	const char *fail_phrase;
-	void *params[MAX_TRANSLATE_PARAMS];
-
-	if (numparams > MAX_TRANSLATE_PARAMS)
-	{
-		assert(false);
-		return false;
-	}
-
-	va_start(ap, pOutLength);
-	for (i = 0; i < numparams; i++)
-	{
-		params[i] = va_arg(ap, void *);
-	}
-	va_end(ap);
-
-	if (!g_pCorePhrases->FormatString(buffer,
-		maxlength, 
-		format, 
-		params,
-		numparams,
-		pOutLength,
-		&fail_phrase))
-	{
-		if (fail_phrase != NULL)
-		{
-			logger->LogError("[SM] Could not find core phrase: %s", fail_phrase);
-		}
-		else
-		{
-			logger->LogError("[SM] Unknown fatal error while translating a core phrase.");
-		}
-
-		return false;
-	}
-
-	return true;
-}
-
-bool Translator::FormatString(char *buffer,
-							  size_t maxlength,
-							  const char *format,
-							  IPhraseCollection *pPhrases,
-							  void **params,
-							  unsigned int numparams,
-							  size_t *pOutLength,
-							  const char **pFailPhrase)
-{
-	unsigned int arg;
-
-	arg = 0;
-	if (!smcore.gnprintf(buffer, maxlength, format, pPhrases, params, numparams, arg, pOutLength, pFailPhrase))
-	{
-		return false;
-	}
-
-	if (arg != numparams)
-	{
-		if (pFailPhrase != NULL)
-		{
-			*pFailPhrase = NULL;
-		}
-		return false;
+		*name = m_pStringTab->GetString(l->m_FullName);
 	}
 
 	return true;

core/Translator.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,13 +32,15 @@
 #ifndef _INCLUDE_SOURCEMOD_TRANSLATOR_H_
 #define _INCLUDE_SOURCEMOD_TRANSLATOR_H_
 
-#include "common_logic.h"
-#include <sm_stringhashmap.h>
+#include "sm_trie.h"
 #include <sh_string.h>
 #include <sh_vector.h>
+#include "sm_globals.h"
 #include "sm_memtable.h"
 #include "ITextParsers.h"
-#include <ITranslator.h>
+
+#define MAX_TRANSLATE_PARAMS		32
+#define CORELANG_ENGLISH			0
 
 /* :TODO: write a templatized version of tries? */
 
@@ -54,13 +56,29 @@ enum PhraseParseState
 
 struct Language
 {
-	char m_code2[32];
-	int m_CanonicalName;
+	char m_code2[3];
+	int m_FullName;
 };
 
-class CPhraseFile : 
-	public ITextListener_SMC,
-	public IPhraseFile
+struct Translation
+{
+	const char *szPhrase;		/**< Translated phrase. */
+	unsigned int fmt_count;		/**< Number of format parameters. */
+	int *fmt_order;				/**< Format phrase order. */
+};
+
+#define LANGUAGE_ENGLISH			0
+
+enum TransError
+{
+	Trans_Okay = 0,
+	Trans_BadLanguage = 1,
+	Trans_BadPhrase = 2,
+	Trans_BadPhraseLanguage = 3,
+	Trans_BadPhraseFile = 4,
+};
+
+class CPhraseFile : public ITextListener_SMC
 {
 public:
 	CPhraseFile(Translator *pTranslator, const char *file);
@@ -79,7 +97,7 @@ private:
 	void ParseError(const char *message, ...);
 	void ParseWarning(const char *message, ...);
 private:
-	StringHashMap<int> m_PhraseLookup;
+	Trie *m_pPhraseLookup;
 	String m_File;
 	Translator *m_pTranslator;
 	PhraseParseState m_ParseState;
@@ -94,8 +112,7 @@ private:
 
 class Translator : 
 	public ITextListener_SMC,
-	public SMGlobalClass,
-	public ITranslator
+	public SMGlobalClass
 {
 public:
 	Translator();
@@ -108,69 +125,51 @@ public: // SMGlobalClass
 		size_t maxlength);
 	void OnSourceModAllInitialized();
 	void OnSourceModLevelChange(const char *mapName);
-	void OnSourceModShutdown();
 public: // ITextListener_SMC
 	void ReadSMC_ParseStart();
 	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
 	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
 	SMCResult ReadSMC_LeavingSection(const SMCStates *states);
 public:
+	void RebuildLanguageDatabase(const char *lang_header_file);
 	unsigned int FindOrAddPhraseFile(const char *phrase_file);
 	BaseStringTable *GetStringTable();
 	unsigned int GetLanguageCount();
+	bool GetLanguageInfo(unsigned int number, const char **code, const char **name);
 	bool GetLanguageByCode(const char *code, unsigned int *index);
 	bool GetLanguageByName(const char *name, unsigned int *index);
+	size_t Translate(char *buffer, size_t maxlength, void **params, const Translation *pTrans);
 	CPhraseFile *GetFileByIndex(unsigned int index);
-public: //ITranslator
-	unsigned int GetServerLanguage();
-	unsigned int GetClientLanguage(int client);
-	const char *GetInterfaceName();
-	unsigned int GetInterfaceVersion();
-	IPhraseCollection *CreatePhraseCollection();
-	int SetGlobalTarget(int index);
-	int GetGlobalTarget() const;
-	size_t FormatString(
+	TransError CoreTransEx(CPhraseFile *pFile,
+		int client, 
 		char *buffer, 
 		size_t maxlength, 
-		SourcePawn::IPluginContext *pContext,
-		const cell_t *params,
-		unsigned int param);
-	bool FormatString(
-		char *buffer,
-		size_t maxlength,
-		const char *format,
-		IPhraseCollection *pPhrases,
-		void **params,
-		unsigned int numparams,
-		size_t *pOutLength,
-		const char **pFailPhrase);
-	bool GetLanguageInfo(unsigned int number, const char **code, const char **name);
-	void RebuildLanguageDatabase();
+		const char *phrase, 
+		void **params, 
+		size_t *outlen=NULL);
+	TransError CoreTrans(int client, 
+						 char *buffer, 
+						 size_t maxlength, 
+						 const char *phrase, 
+						 void **params, 
+						 size_t *outlen=NULL);
+	unsigned int GetServerLanguage();
+	unsigned int GetClientLanguage(int client);
 private:
 	bool AddLanguage(const char *langcode, const char *description);
 private:
 	CVector<Language *> m_Languages;
 	CVector<CPhraseFile *> m_Files;
 	BaseStringTable *m_pStringTab;
-	StringHashMap<unsigned int> m_LCodeLookup;
-	StringHashMap<unsigned int> m_LAliases;
+	Trie *m_pLCodeLookup;
 	bool m_InLanguageSection;
 	String m_CustomError;
 	unsigned int m_ServerLang;
-	char m_InitialLang[4];
+	char m_InitialLang[3];
 };
 
-/* Nice little wrapper to handle error logging and whatnot */
-bool CoreTranslate(char *buffer, 
-				   size_t maxlength,
-				   const char *format,
-				   unsigned int numparams,
-				   size_t *pOutLength,
-				   ...);
-
-extern IPhraseCollection *g_pCorePhrases;
+extern CPhraseFile *g_pCorePhrases;
 extern unsigned int g_pCorePhraseID;
 extern Translator g_Translator;
 
 #endif //_INCLUDE_SOURCEMOD_TRANSLATOR_H_
-

core/UserMessages.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -31,35 +31,15 @@
 
 #include "UserMessages.h"
 #include "sm_stringutil.h"
-#include "logic_bridge.h"
-
-#if SOURCE_ENGINE == SE_DOTA
-#include <dota_usermessage_helpers.h>
-#elif SOURCE_ENGINE == SE_CSGO
-#include <cstrike15_usermessage_helpers.h>
-#endif
 
 UserMessages g_UserMsgs;
 
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-SH_DECL_HOOK3_void(IVEngineServer, SendUserMessage, SH_NOATTRIB, 0, IRecipientFilter &, int, const protobuf::Message &);
-#else
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-SH_DECL_HOOK3(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int, const char *);
-#else
 SH_DECL_HOOK2(IVEngineServer, UserMessageBegin, SH_NOATTRIB, 0, bf_write *, IRecipientFilter *, int);
-#endif
 SH_DECL_HOOK0_void(IVEngineServer, MessageEnd, SH_NOATTRIB, 0);
-#endif // ==SE_CSGO
 
-UserMessages::UserMessages()
-#ifndef USE_PROTOBUF_USERMESSAGES
-	: m_InterceptBuffer(m_pBase, 2500)
+UserMessages::UserMessages() : m_InterceptBuffer(m_pBase, 2500)
 {
-#else
-	: m_InterceptBuffer(NULL)
-{
-#endif
+	m_Names = sm_trie_create();
 	m_HookCount = 0;
 	m_InExec = false;
 	m_InHook = false;
@@ -69,6 +49,8 @@ UserMessages::UserMessages()
 
 UserMessages::~UserMessages()
 {
+	sm_trie_destroy(m_Names);
+
 	CStack<ListenerInfo *>::iterator iter;
 	for (iter=m_FreeListeners.begin(); iter!=m_FreeListeners.end(); iter++)
 	{
@@ -79,46 +61,32 @@ UserMessages::~UserMessages()
 
 void UserMessages::OnSourceModStartup(bool late)
 {
-#ifndef USE_PROTOBUF_USERMESSAGES
 	/* -1 means SourceMM was unable to get the user message list */
 	m_FallbackSearch = (g_SMAPI->GetUserMessageCount() == -1);
-#endif
 }
 
 void UserMessages::OnSourceModAllInitialized()
 {
-	sharesys->AddInterface(NULL, this);
+	g_ShareSys.AddInterface(NULL, this);
 }
 
 void UserMessages::OnSourceModAllShutdown()
 {
 	if (m_HookCount)
 	{
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Pre), false);
-		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Post), true);
-#else
-		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Pre), false);
-		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Post), true);
-		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Pre), false);
-		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Post), true);
-#endif
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
 	}
 	m_HookCount = 0;
 }
 
 int UserMessages::GetMessageIndex(const char *msg)
 {
-#if SOURCE_ENGINE == SE_DOTA
-	// Can split this per engine and/or game later
-	return g_DotaUsermessageHelpers.GetIndex(msg);
-#elif SOURCE_ENGINE == SE_CSGO
-	// Can split this per engine and/or game later
-	return g_Cstrike15UsermessageHelpers.GetIndex(msg);
-#else
-
 	int msgid;
-	if (!m_Names.retrieve(msg, &msgid))
+
+	if (!sm_trie_retrieve(m_Names, msg, reinterpret_cast<void **>(&msgid)))
 	{
 		if (m_FallbackSearch)
 		{
@@ -130,7 +98,7 @@ int UserMessages::GetMessageIndex(const char *msg)
 			{
 				if (strcmp(msgbuf, msg) == 0)
 				{
-					m_Names.insert(msg, msgid);
+					sm_trie_insert(m_Names, msg, reinterpret_cast<void *>(msgid));
 					return msgid;
 				}
 				msgid++;
@@ -140,27 +108,16 @@ int UserMessages::GetMessageIndex(const char *msg)
 		msgid = g_SMAPI->FindUserMessage(msg);
 
 		if (msgid != INVALID_MESSAGE_ID)
-			m_Names.insert(msg, msgid);
+		{
+			sm_trie_insert(m_Names, msg, reinterpret_cast<void *>(msgid));
+		}
 	}
 
 	return msgid;
-#endif
 }
 
 bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) const
 {
-#ifdef USE_PROTOBUF_USERMESSAGES
-#if SOURCE_ENGINE == SE_DOTA
-	const char *pszName = g_DotaUsermessageHelpers.GetName(msgid);
-#elif SOURCE_ENGINE == SE_CSGO
-	const char *pszName = g_Cstrike15UsermessageHelpers.GetName(msgid);
-#endif
-	if (!pszName)
-		return false;
-
-	strncopy(buffer, pszName, maxlength);
-	return true;
-#else
 	if (m_FallbackSearch)
 	{
 		int size;
@@ -176,14 +133,10 @@ bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) con
 	}
 
 	return false;
-#endif
 }
 
-bf_write *UserMessages::StartBitBufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
+bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
 {
-#ifdef USE_PROTOBUF_USERMESSAGES
-	return NULL;
-#else
 	bf_write *buffer;
 
 	if (m_InExec || m_InHook)
@@ -211,89 +164,12 @@ bf_write *UserMessages::StartBitBufMessage(int msg_id, const cell_t players[], u
 
 	if (m_CurFlags & USERMSG_BLOCKHOOKS)
 	{
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-		buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
-#else
 		buffer = ENGINE_CALL(UserMessageBegin)(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
-#endif
 	} else {
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-		buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
-#else
 		buffer = engine->UserMessageBegin(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id);
-#endif
 	}
 
 	return buffer;
-#endif // USE_PROTOBUF_USERMESSAGES
-}
-
-google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
-{
-#ifndef USE_PROTOBUF_USERMESSAGES
-	return NULL;
-#else
-	protobuf::Message *buffer;
-
-	if (m_InExec || m_InHook)
-	{
-		return NULL;
-	}
-	if (msg_id < 0 || msg_id >= 255)
-	{
-		return NULL;
-	}
-
-	m_CurId = msg_id;
-	m_CellRecFilter.Initialize(players, playersNum);
-
-	m_CurFlags = flags;
-	if (m_CurFlags & USERMSG_INITMSG)
-	{
-		m_CellRecFilter.SetToInit(true);
-	}
-	if (m_CurFlags & USERMSG_RELIABLE)
-	{
-		m_CellRecFilter.SetToReliable(true);
-	}
-
-	m_InExec = true;
-
-	if (m_CurFlags & USERMSG_BLOCKHOOKS)
-	{
-		// direct message creation, return buffer "from engine". keep track
-		m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
-		buffer = m_FakeEngineBuffer;
-	} else {
-		char messageName[32];
-		if (!GetMessageName(msg_id, messageName, sizeof(messageName)))
-		{
-			m_InExec = false;
-			return NULL;
-		}
-
-		protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
-		switch (m_FakeMetaRes)
-		{
-		case MRES_IGNORED:
-		case MRES_HANDLED:
-			m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
-			buffer = m_FakeEngineBuffer;
-			break;		
-
-		case MRES_OVERRIDE:
-			m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
-		// fallthrough
-		case MRES_SUPERCEDE:
-			buffer = msg;
-			break;
-		}
-		
-		OnStartMessage_Post(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
-	}
-
-	return buffer;
-#endif // USE_PROTOBUF_USERMESSAGES
 }
 
 bool UserMessages::EndMessage()
@@ -303,37 +179,12 @@ bool UserMessages::EndMessage()
 		return false;
 	}
 
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-	if (m_CurFlags & USERMSG_BLOCKHOOKS)
-	{
-		ENGINE_CALL(SendUserMessage)(static_cast<IRecipientFilter &>(m_CellRecFilter), m_CurId, *m_FakeEngineBuffer);
-		delete m_FakeEngineBuffer;
-		m_FakeEngineBuffer = NULL;
-	} else {
-		OnMessageEnd_Pre();
-
-		switch (m_FakeMetaRes)
-		{
-		case MRES_IGNORED:
-		case MRES_HANDLED:
-		case MRES_OVERRIDE:
-			engine->SendUserMessage(static_cast<IRecipientFilter &>(m_CellRecFilter), m_CurId, *m_FakeEngineBuffer);
-			delete m_FakeEngineBuffer;
-			m_FakeEngineBuffer = NULL;
-			break;
-		//case MRES_SUPERCEDE:
-		}
-
-		OnMessageEnd_Post();
-	}
-#else
 	if (m_CurFlags & USERMSG_BLOCKHOOKS)
 	{
 		ENGINE_CALL(MessageEnd)();
 	} else {
 		engine->MessageEnd();
 	}
-#endif // SE_CSGO || SE_DOTA
 
 	m_InExec = false;
 	m_CurFlags = 0;
@@ -342,60 +193,7 @@ bool UserMessages::EndMessage()
 	return true;
 }
 
-UserMessageType UserMessages::GetUserMessageType() const
-{
-#ifdef USE_PROTOBUF_USERMESSAGES
-	return UM_Protobuf;
-#else
-	return UM_BitBuf;
-#endif
-}
-
-bool UserMessages::HookUserMessage2(int msg_id,
-									IUserMessageListener *pListener,
-									bool intercept)
-{
-#ifdef USE_PROTOBUF_USERMESSAGES
-	return InternalHook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, true);
-#else
-	return InternalHook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, true);
-#endif
-}
-
-bool UserMessages::UnhookUserMessage2(int msg_id,
-									  IUserMessageListener *pListener,
-									  bool intercept)
-{
-#ifdef USE_PROTOBUF_USERMESSAGES
-	return InternalUnhook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, true);
-#else
-	return InternalUnhook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, true);
-#endif
-}
-
 bool UserMessages::HookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
-{
-#ifdef USE_PROTOBUF_USERMESSAGES
-	return InternalHook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, false);
-#else
-	return InternalHook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, false);
-#endif
-}
-
-bool UserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
-{	
-#ifdef USE_PROTOBUF_USERMESSAGES
-	return InternalUnhook(msg_id, (IProtobufUserMessageListener *)pListener, intercept, false);
-#else
-	return InternalUnhook(msg_id, (IBitBufUserMessageListener *)pListener, intercept, false);
-#endif
-}
-
-#ifdef USE_PROTOBUF_USERMESSAGES
-bool UserMessages::InternalHook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew)
-#else
-bool UserMessages::InternalHook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew)
-#endif
 {
 	if (msg_id < 0 || msg_id >= 255)
 	{
@@ -414,19 +212,13 @@ bool UserMessages::InternalHook(int msg_id, IBitBufUserMessageListener *pListene
 	pInfo->Callback = pListener;
 	pInfo->IsHooked = false;
 	pInfo->KillMe = false;
-	pInfo->IsNew = isNew;
 
 	if (!m_HookCount++)
 	{
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-		SH_ADD_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Pre), false);
-		SH_ADD_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Post), true);
-#else
-		SH_ADD_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Pre), false);
-		SH_ADD_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Post), true);
-		SH_ADD_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Pre), false);
-		SH_ADD_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Post), true);
-#endif
+		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
+		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
+		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
+		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
 	}
 
 	if (intercept)
@@ -439,23 +231,8 @@ bool UserMessages::InternalHook(int msg_id, IBitBufUserMessageListener *pListene
 	return true;
 }
 
-#ifdef USE_PROTOBUF_USERMESSAGES
-const protobuf::Message *UserMessages::GetMessagePrototype(int msg_type)
-{
-#if SOURCE_ENGINE == SE_DOTA
-	return g_DotaUsermessageHelpers.GetPrototype(msg_type);
-#elif SOURCE_ENGINE == SE_CSGO
-	return g_Cstrike15UsermessageHelpers.GetPrototype(msg_type);
-#endif
-}
-#endif
-
-#ifdef USE_PROTOBUF_USERMESSAGES
-bool UserMessages::InternalUnhook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew)
-#else
-bool UserMessages::InternalUnhook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew)
-#endif
-{
+bool UserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
+{	
 	MsgList *pList;
 	MsgIter iter;
 	ListenerInfo *pInfo;
@@ -470,7 +247,7 @@ bool UserMessages::InternalUnhook(int msg_id, IBitBufUserMessageListener *pListe
 	for (iter=pList->begin(); iter!=pList->end(); iter++)
 	{
 		pInfo = (*iter);
-		if (pInfo->Callback == pListener && pInfo->IsNew == isNew)
+		if (pInfo->Callback == pListener)
 		{
 			if (pInfo->IsHooked)
 			{
@@ -495,81 +272,14 @@ void UserMessages::_DecRefCounter()
 {
 	if (--m_HookCount == 0)
 	{
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Pre), false);
-		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Post), true);
-#else
-		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Pre), false);
-		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Post), true);
-		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Pre), false);
-		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Post), true);
-#endif
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
+		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
 	}
 }
 
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
-{
-#if SOURCE_ENGINE == SE_DOTA
-	OnStartMessage_Pre(&filter, msg_type, g_DotaUsermessageHelpers.GetName(msg_type));
-#elif SOURCE_ENGINE == SE_CSGO
-	OnStartMessage_Pre(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
-#endif
-	if (m_FakeMetaRes == MRES_SUPERCEDE)
-	{
-		int size = msg.ByteSize();
-		uint8 *data = (uint8 *)stackalloc(size);
-		msg.SerializePartialToArray(data, size);
-		m_InterceptBuffer->ParsePartialFromArray(data, size);
-	}
-	else
-	{
-		m_FakeEngineBuffer = &const_cast<protobuf::Message &>(msg);
-	}
-
-#if SOURCE_ENGINE == SE_DOTA
-	OnStartMessage_Post(&filter, msg_type, g_DotaUsermessageHelpers.GetName(msg_type));
-#elif SOURCE_ENGINE == SE_CSGO
-	OnStartMessage_Post(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
-#endif
-
-	OnMessageEnd_Pre();
-	if (m_FakeMetaRes == MRES_SUPERCEDE)
-		RETURN_META(MRES_SUPERCEDE);
-
-	RETURN_META(MRES_IGNORED);
-}
-
-void UserMessages::OnSendUserMessage_Post(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
-{
-	OnMessageEnd_Post();
-	RETURN_META(MRES_IGNORED);
-}
-#endif
-
-#ifdef USE_PROTOBUF_USERMESSAGES
-#define UM_RETURN_META_VALUE(res, val) \
-	m_FakeMetaRes = res;               \
-	return val;
-
-#define UM_RETURN_META(res)            \
-	m_FakeMetaRes = res;               \
-	return;
-#else
-#define UM_RETURN_META_VALUE(res, val) \
-	RETURN_META_VALUE(res, val)
-
-#define UM_RETURN_META(res)            \
-	RETURN_META(res)
-#endif
-
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-protobuf::Message *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name)
-#elif SOURCE_ENGINE >= SE_LEFT4DEAD
-bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name)
-#else
 bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_type)
-#endif
 {
 	bool is_intercept_empty = m_msgIntercepts[msg_type].empty();
 	bool is_hook_empty = m_msgHooks[msg_type].empty();
@@ -578,7 +288,7 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 		|| (m_InExec && (m_CurFlags & USERMSG_BLOCKHOOKS)))
 	{
 		m_InHook = false;
-		UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
+		RETURN_META_VALUE(MRES_IGNORED, NULL);
 	}
 
 	m_CurId = msg_type;
@@ -588,73 +298,42 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 
 	if (!is_intercept_empty)
 	{
-#ifdef USE_PROTOBUF_USERMESSAGES
-		if (m_InterceptBuffer)
-			delete m_InterceptBuffer;
-		m_InterceptBuffer = GetMessagePrototype(msg_type)->New();
-
-		UM_RETURN_META_VALUE(MRES_SUPERCEDE, m_InterceptBuffer);
-#else
 		m_InterceptBuffer.Reset();
-		UM_RETURN_META_VALUE(MRES_SUPERCEDE, &m_InterceptBuffer);
-#endif
+		RETURN_META_VALUE(MRES_SUPERCEDE, &m_InterceptBuffer);
 	}
 
-	UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
+	RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-protobuf::Message *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name)
-#elif SOURCE_ENGINE >= SE_LEFT4DEAD
-bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name)
-#else
 bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_type)
-#endif
 {
 	if (!m_InHook)
 	{
-		UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
+		RETURN_META_VALUE(MRES_IGNORED, NULL);
 	}
 
-#ifdef USE_PROTOBUF_USERMESSAGES
-	if (m_FakeMetaRes == MRES_SUPERCEDE)
-		m_OrigBuffer = m_InterceptBuffer;
-	else
-		m_OrigBuffer = m_FakeEngineBuffer;
-#else
 	m_OrigBuffer = META_RESULT_ORIG_RET(bf_write *);
-#endif
 
-	UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
+	RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
 void UserMessages::OnMessageEnd_Post()
 {
-	if (!m_InHook)
+	if (!m_InHook || m_BlockEndPost)
 	{
-		UM_RETURN_META(MRES_IGNORED);
+		RETURN_META(MRES_IGNORED);
 	}
 
 	MsgList *pList;
 	MsgIter iter;
 	ListenerInfo *pInfo;
 
-	m_InHook = false;
-
 	pList = &m_msgIntercepts[m_CurId];
 	for (iter=pList->begin(); iter!=pList->end(); )
 	{
 		pInfo = (*iter);
-		if (m_BlockEndPost && !pInfo->IsNew)
-		{
-			continue;
-		}
 		pInfo->IsHooked = true;
 		pInfo->Callback->OnUserMessageSent(m_CurId);
-		if (pInfo->IsNew)
-		{
-			pInfo->Callback->OnPostUserMessage(m_CurId, !m_BlockEndPost);
-		}
 
 		if (pInfo->KillMe)
 		{
@@ -668,20 +347,14 @@ void UserMessages::OnMessageEnd_Post()
 		iter++;
 	}
 
+	m_InHook = false;
+
 	pList = &m_msgHooks[m_CurId];
 	for (iter=pList->begin(); iter!=pList->end(); )
 	{
 		pInfo = (*iter);
-		if (m_BlockEndPost && !pInfo->IsNew)
-		{
-			continue;
-		}
 		pInfo->IsHooked = true;
 		pInfo->Callback->OnUserMessageSent(m_CurId);
-		if (pInfo->IsNew)
-		{
-			pInfo->Callback->OnPostUserMessage(m_CurId, !m_BlockEndPost);
-		}
 
 		if (pInfo->KillMe)
 		{
@@ -700,7 +373,7 @@ void UserMessages::OnMessageEnd_Pre()
 {
 	if (!m_InHook)
 	{
-		UM_RETURN_META(MRES_IGNORED);
+		RETURN_META(MRES_IGNORED);
 	}
 
 	MsgList *pList;
@@ -716,11 +389,7 @@ void UserMessages::OnMessageEnd_Pre()
 	{
 		pInfo = (*iter);
 		pInfo->IsHooked = true;
-#ifdef USE_PROTOBUF_USERMESSAGES
-		res = pInfo->Callback->InterceptUserMessage(m_CurId, m_InterceptBuffer, m_CurRecFilter);
-#else
 		res = pInfo->Callback->InterceptUserMessage(m_CurId, &m_InterceptBuffer, m_CurRecFilter);
-#endif
 
 		intercepted = true;
 
@@ -766,61 +435,43 @@ void UserMessages::OnMessageEnd_Pre()
 		iter++;
 	}
 
-	if (!handled && intercepted)
+	if (handled)
+	{
+		goto supercede;
+	}
+
+	if (intercepted)
 	{
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-		ENGINE_CALL(SendUserMessage)(static_cast<IRecipientFilter &>(*m_CurRecFilter), m_CurId, *m_InterceptBuffer);
-#else
 		bf_write *engine_bfw;
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-		engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId, g_SMAPI->GetUserMessage(m_CurId));
-#else
+
 		engine_bfw = ENGINE_CALL(UserMessageBegin)(m_CurRecFilter, m_CurId);
-#endif
 		m_ReadBuffer.StartReading(m_InterceptBuffer.GetBasePointer(), m_InterceptBuffer.GetNumBytesWritten());
 		engine_bfw->WriteBitsFromBuffer(&m_ReadBuffer, m_InterceptBuffer.GetNumBitsWritten());
 		ENGINE_CALL(MessageEnd)();
-#endif // SE_CSGO || SE_DOTA
 	}
 
+	pList = &m_msgHooks[m_CurId];
+	for (iter=pList->begin(); iter!=pList->end(); )
 	{
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-		int size = m_OrigBuffer->ByteSize();
-		uint8 *data = (uint8 *)stackalloc(size);
-		m_OrigBuffer->SerializePartialToArray(data, size);
+		pInfo = (*iter);
+		pInfo->IsHooked = true;
+		pInfo->Callback->OnUserMessage(m_CurId, m_OrigBuffer, m_CurRecFilter);
 
-		protobuf::Message *pTempMsg = GetMessagePrototype(m_CurId)->New();
-		pTempMsg->ParsePartialFromArray(data, size);
-#else
-		bf_write *pTempMsg = m_OrigBuffer;
-#endif
-
-		pList = &m_msgHooks[m_CurId];
-		for (iter=pList->begin(); iter!=pList->end(); )
+		if (pInfo->KillMe)
 		{
-			pInfo = (*iter);
-			pInfo->IsHooked = true;
-			pInfo->Callback->OnUserMessage(m_CurId, pTempMsg, m_CurRecFilter);
-
-			if (pInfo->KillMe)
-			{
-				iter = pList->erase(iter);
-				m_FreeListeners.push(pInfo);
-				_DecRefCounter();
-				continue;
-			}
-
-			pInfo->IsHooked = false;
-			iter++;
+			iter = pList->erase(iter);
+			m_FreeListeners.push(pInfo);
+			_DecRefCounter();
+			continue;
 		}
 
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-		delete pTempMsg;
-#endif
+		pInfo->IsHooked = false;
+		iter++;
 	}
 
-	UM_RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
+	RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
 supercede:
+	m_InHook = false;
 	m_BlockEndPost = true;
-	UM_RETURN_META(MRES_SUPERCEDE);
+	RETURN_META(MRES_SUPERCEDE);
 }

core/UserMessages.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,44 +32,22 @@
 #ifndef _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 #define _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 
+#include "ShareSys.h"
 #include <IUserMessages.h>
 #include "sourcemm_api.h"
-#include <sm_stringhashmap.h>
-#include "sm_stringutil.h"
+#include "sm_trie.h"
 #include "CellRecipientFilter.h"
-#include "sm_globals.h"
-#include <sh_list.h>
-#include <sh_stack.h>
 
 using namespace SourceHook;
 using namespace SourceMod;
 
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-#define USE_PROTOBUF_USERMESSAGES
-#endif
-
-#ifdef USE_PROTOBUF_USERMESSAGES
-#include <google/protobuf/message.h>
-#include <google/protobuf/descriptor.h>
-#include <netmessages.pb.h>
-
-using namespace google;
-#else
-#include <bitbuf.h>
-#endif
-
 #define INVALID_MESSAGE_ID -1
 
 struct ListenerInfo
 {
-#ifdef USE_PROTOBUF_USERMESSAGES
-	IProtobufUserMessageListener *Callback;
-#else
-	IBitBufUserMessageListener *Callback;
-#endif
+	IUserMessageListener *Callback;
 	bool IsHooked;
 	bool KillMe;
-	bool IsNew;
 };
 
 typedef List<ListenerInfo *> MsgList;
@@ -91,70 +69,30 @@ public: //IUserMessages
 	bool GetMessageName(int msgid, char *buffer, size_t maxlength) const;
 	bool HookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept=false);
 	bool UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept=false);
-	bf_write *StartBitBufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
-	google::protobuf::Message *StartProtobufMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
+	bf_write *StartMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
 	bool EndMessage();
-	bool HookUserMessage2(int msg_id,
-		IUserMessageListener *pListener,
-		bool intercept=false);
-	bool UnhookUserMessage2(int msg_id,
-		IUserMessageListener *pListener,
-		bool intercept=false);
-	UserMessageType GetUserMessageType() const;
 public:
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-	void OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg);
-	void OnSendUserMessage_Post(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg);
-#endif
-
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
-	protobuf::Message *OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name);
-	protobuf::Message *OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name);
-#elif SOURCE_ENGINE >= SE_LEFT4DEAD
-	bf_write *OnStartMessage_Pre(IRecipientFilter *filter, int msg_type, const char *msg_name);
-	bf_write *OnStartMessage_Post(IRecipientFilter *filter, int msg_type, const char *msg_name);
-#else
 	bf_write *OnStartMessage_Pre(IRecipientFilter *filter, int msg_type);
 	bf_write *OnStartMessage_Post(IRecipientFilter *filter, int msg_type);
-#endif
 	void OnMessageEnd_Pre();
 	void OnMessageEnd_Post();
 private:
-#ifdef USE_PROTOBUF_USERMESSAGES
-	const protobuf::Message *GetMessagePrototype(int msg_type);
-	bool InternalHook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew);
-	bool InternalUnhook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew);
-#else
-	bool InternalHook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew);
-	bool InternalUnhook(int msg_id, IBitBufUserMessageListener *pListener, bool intercept, bool isNew);
-#endif
 	void _DecRefCounter();
 private:
 	List<ListenerInfo *> m_msgHooks[255];
 	List<ListenerInfo *> m_msgIntercepts[255];
 	CStack<ListenerInfo *> m_FreeListeners;
-	IRecipientFilter *m_CurRecFilter;
-#ifndef USE_PROTOBUF_USERMESSAGES
 	unsigned char m_pBase[2500];
+	IRecipientFilter *m_CurRecFilter;
 	bf_write m_InterceptBuffer;
 	bf_write *m_OrigBuffer;
 	bf_read m_ReadBuffer;
-#else
-	// The engine used to provide this. Now we track it.
-	protobuf::Message *m_OrigBuffer;
-	protobuf::Message *m_FakeEngineBuffer;
-	META_RES m_FakeMetaRes;
-
-	protobuf::Message *m_InterceptBuffer;
-#endif
 	size_t m_HookCount;
 	bool m_InHook;
 	bool m_BlockEndPost;
-#ifndef USE_PROTOBUF_USERMESSAGES
 	bool m_FallbackSearch;
 
-	StringHashMap<int> m_Names;
-#endif
+	Trie *m_Names;
 	CellRecipientFilter m_CellRecFilter;
 	bool m_InExec;
 	int m_CurFlags;

core/concmd_cleaner.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,13 +35,9 @@
 #include "concmd_cleaner.h"
 #include "sm_stringutil.h"
 #include "sourcemm_api.h"
-#include "compat_wrappers.h"
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 SH_DECL_HOOK1_void(ICvar, UnregisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
-SH_DECL_HOOK1_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
-#else
-SH_DECL_HOOK1_void(ICvar, RegisterConCommandBase, SH_NOATTRIB, 0, ConCommandBase *);
 #endif
 
 using namespace SourceHook;
@@ -54,55 +50,29 @@ struct ConCommandInfo
 };
 
 List<ConCommandInfo *> tracked_bases;
-IConCommandLinkListener *IConCommandLinkListener::head = NULL;
 
 ConCommandBase *FindConCommandBase(const char *name);
 
 class ConCommandCleaner : public SMGlobalClass
 {
 public:
+#if defined ORANGEBOX_BUILD
 	void OnSourceModAllInitialized()
 	{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-		SH_ADD_HOOK(ICvar, UnregisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false);
-		SH_ADD_HOOK(ICvar, RegisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
-#else
-		SH_ADD_HOOK(ICvar, RegisterConCommandBase, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
-#endif
+		SH_ADD_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
 	}
 
 	void OnSourceModShutdown()
 	{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-		SH_REMOVE_HOOK(ICvar, UnregisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false);
-		SH_REMOVE_HOOK(ICvar, RegisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
-#else
-		SH_REMOVE_HOOK(ICvar, RegisterConCommandBase, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
+		SH_REMOVE_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
+	}
 #endif
-	}
-
-	void LinkConCommandBase(ConCommandBase *pBase)
-	{
-		IConCommandLinkListener *listener = IConCommandLinkListener::head;
-		while (listener)
-		{
-			listener->OnLinkConCommand(pBase);
-			listener = listener->next;
-		}
-	}
 
 	void UnlinkConCommandBase(ConCommandBase *pBase)
 	{
 		ConCommandInfo *pInfo;
 		List<ConCommandInfo *>::iterator iter = tracked_bases.begin();
 
-		IConCommandLinkListener *listener = IConCommandLinkListener::head;
-		while (listener)
-		{
-			listener->OnUnlinkConCommand(pBase);
-			listener = listener->next;
-		}
-
 		if (pBase)
 		{
 			while (iter != tracked_bases.end())
@@ -125,7 +95,7 @@ public:
 			while (iter != tracked_bases.end())
 			{
 				/* This is just god-awful! */
-				if (FindCommandBase((*iter)->name) != (*iter)->pBase)
+				if (FindConCommandBase((*iter)->name) != (*iter)->pBase)
 				{
 					pInfo = (*iter);
 					iter = tracked_bases.erase(iter);
@@ -173,6 +143,22 @@ public:
 	}
 } s_ConCmdTracker;
 
+ConCommandBase *FindConCommandBase(const char *name)
+{
+	const ConCommandBase *pBase = icvar->GetCommands();
+
+	while (pBase != NULL)
+	{
+		if (strcmp(pBase->GetName(), name) == 0)
+		{
+			return const_cast<ConCommandBase *>(pBase);
+		}
+		pBase = pBase->GetNext();
+	}
+
+	return NULL;
+}
+
 void TrackConCommandBase(ConCommandBase *pBase, IConCommandTracker *me)
 {
 	s_ConCmdTracker.AddTarget(pBase, me);

core/concmd_cleaner.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,30 +38,9 @@ public:
 	virtual void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe) = 0;
 };
 
+ConCommandBase *FindConCommandBase(const char *name);
 void TrackConCommandBase(ConCommandBase *pBase, IConCommandTracker *me);
 void UntrackConCommandBase(ConCommandBase *pBase, IConCommandTracker *me);
 void Global_OnUnlinkConCommandBase(ConCommandBase *pBase);
 
-class IConCommandLinkListener
-{
-	friend class ConCommandCleaner;
-
-	static IConCommandLinkListener *head;
-	IConCommandLinkListener *next;
-public:
-	IConCommandLinkListener()
-	{
-		next = head;
-		head = this;
-	}
-
-	virtual void OnLinkConCommand(ConCommandBase *pBase)
-	{
-	}
-
-	virtual void OnUnlinkConCommand(ConCommandBase *pBase)
-	{
-	}
-};
-
 #endif //_INCLUDE_CONCMD_TRACKER_H_

core/convar_sm_l4d.h

@@ -1,718 +0,0 @@
-//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
-//
-// Purpose: 
-//
-// $Workfile:     $
-// $Date:         $
-//
-//-----------------------------------------------------------------------------
-// $NoKeywords: $
-//===========================================================================//
-
-#ifndef CONVAR_H
-#define CONVAR_H
-
-#if _WIN32
-#pragma once
-#endif
-
-#include "tier0/dbg.h"
-#include "tier1/iconvar.h"
-#include "tier1/utlvector.h"
-#include "tier1/utlstring.h"
-#include "icvar.h"
-
-#ifdef _WIN32
-#define FORCEINLINE_CVAR FORCEINLINE
-#elif defined _LINUX || defined __APPLE__
-#define FORCEINLINE_CVAR inline
-#else
-#error "implement me"
-#endif
-
-
-//-----------------------------------------------------------------------------
-// Forward declarations
-//-----------------------------------------------------------------------------
-class ConVar;
-class CCommand;
-class ConCommand;
-class ConCommandBase;
-struct characterset_t;
-
-
-
-//-----------------------------------------------------------------------------
-// Any executable that wants to use ConVars need to implement one of
-// these to hook up access to console variables.
-//-----------------------------------------------------------------------------
-class IConCommandBaseAccessor
-{
-public:
-	// Flags is a combination of FCVAR flags in cvar.h.
-	// hOut is filled in with a handle to the variable.
-	virtual bool RegisterConCommandBase( ConCommandBase *pVar ) = 0;
-};
-
-
-//-----------------------------------------------------------------------------
-// Helper method for console development
-//-----------------------------------------------------------------------------
-#if defined( _X360 ) && !defined( _RETAIL )
-void ConVar_PublishToVXConsole();
-#endif
-
-
-//-----------------------------------------------------------------------------
-// Called when a ConCommand needs to execute
-//-----------------------------------------------------------------------------
-typedef void ( *FnCommandCallbackV1_t )( void );
-typedef void ( *FnCommandCallback_t )( const CCommand &command );
-
-#define COMMAND_COMPLETION_MAXITEMS		64
-#define COMMAND_COMPLETION_ITEM_LENGTH	64
-
-//-----------------------------------------------------------------------------
-// Returns 0 to COMMAND_COMPLETION_MAXITEMS worth of completion strings
-//-----------------------------------------------------------------------------
-typedef int  ( *FnCommandCompletionCallback )( const char *partial, char commands[ COMMAND_COMPLETION_MAXITEMS ][ COMMAND_COMPLETION_ITEM_LENGTH ] );
-
-
-//-----------------------------------------------------------------------------
-// Interface version
-//-----------------------------------------------------------------------------
-class ICommandCallback
-{
-public:
-	virtual void CommandCallback( const CCommand &command ) = 0;
-};
-
-class ICommandCompletionCallback
-{
-public:
-	virtual int  CommandCompletionCallback( const char *pPartial, CUtlVector< CUtlString > &commands ) = 0;
-};
-
-//-----------------------------------------------------------------------------
-// Purpose: The base console invoked command/cvar interface
-//-----------------------------------------------------------------------------
-class ConCommandBase
-{
-	friend class CCvar;
-	friend class ConVar;
-	friend class ConCommand;
-	friend void ConVar_Register( int nCVarFlag, IConCommandBaseAccessor *pAccessor );
-	friend void ConVar_PublishToVXConsole();
-
-	// FIXME: Remove when ConVar changes are done
-	friend class CDefaultCvar;
-
-public:
-								ConCommandBase( void );
-								ConCommandBase( const char *pName, const char *pHelpString = 0, 
-									int flags = 0 );
-
-	virtual						~ConCommandBase( void );
-
-	virtual	bool				IsCommand( void ) const;
-
-	// Check flag
-	virtual bool				IsFlagSet( int flag ) const;
-	// Set flag
-	virtual void				AddFlags( int flags );
-	// Remove flag
-	virtual void				RemoveFlags( int flags );
-	// Get flags
-	virtual int					GetFlags( void ) const;
-
-	// Return name of cvar
-	virtual const char			*GetName( void ) const;
-
-	// Return help text for cvar
-	virtual const char			*GetHelpText( void ) const;
-
-	// Deal with next pointer
-	const ConCommandBase		*GetNext( void ) const;
-	ConCommandBase				*GetNext( void );
-
-	inline void SetNext(ConCommandBase *pBase)
-	{
-		m_pNext = pBase;
-	}
-	
-	virtual bool				IsRegistered( void ) const;
-
-	// Returns the DLL identifier
-	virtual CVarDLLIdentifier_t	GetDLLIdentifier() const;
-
-protected:
-	virtual void				Create( const char *pName, const char *pHelpString = 0, 
-									int flags = 0 );
-
-	// Used internally by OneTimeInit to initialize/shutdown
-	virtual void				Init();
-	void						Shutdown();
-
-	// Internal copy routine ( uses new operator from correct module )
-	char						*CopyString( const char *from );
-
-private:
-	// Next ConVar in chain
-	// Prior to register, it points to the next convar in the DLL.
-	// Once registered, though, m_pNext is reset to point to the next
-	// convar in the global list
-	ConCommandBase				*m_pNext;
-
-	// Has the cvar been added to the global list?
-	bool						m_bRegistered;
-
-	// Static data
-	const char 					*m_pszName;
-	const char 					*m_pszHelpString;
-	
-	// ConVar flags
-	int							m_nFlags;
-
-protected:
-	// ConVars add themselves to this list for the executable. 
-	// Then ConVar_Register runs through  all the console variables 
-	// and registers them into a global list stored in vstdlib.dll
-	static ConCommandBase		*s_pConCommandBases;
-
-	// ConVars in this executable use this 'global' to access values.
-	static IConCommandBaseAccessor	*s_pAccessor;
-public:
-	inline void SetFlags(int flags)	
-	{ 
-		m_nFlags = flags; 
-	}
-};
-
-
-//-----------------------------------------------------------------------------
-// Command tokenizer
-//-----------------------------------------------------------------------------
-class CCommand
-{
-public:
-	CCommand();
-	CCommand( int nArgC, const char **ppArgV );
-	bool Tokenize( const char *pCommand, characterset_t *pBreakSet = NULL );
-	void Reset();
-
-	int ArgC() const;
-	const char **ArgV() const;
-	const char *ArgS() const;					// All args that occur after the 0th arg, in string form
-	const char *GetCommandString() const;		// The entire command in string form, including the 0th arg
-	const char *operator[]( int nIndex ) const;	// Gets at arguments
-	const char *Arg( int nIndex ) const;		// Gets at arguments
-	
-	// Helper functions to parse arguments to commands.
-	const char* FindArg( const char *pName ) const;
-	int FindArgInt( const char *pName, int nDefaultVal ) const;
-
-	static int MaxCommandLength();
-	static characterset_t* DefaultBreakSet();
-
-private:
-	enum
-	{
-		COMMAND_MAX_ARGC = 64,
-		COMMAND_MAX_LENGTH = 512,
-	};
-
-	int		m_nArgc;
-	int		m_nArgv0Size;
-	char	m_pArgSBuffer[ COMMAND_MAX_LENGTH ];
-	char	m_pArgvBuffer[ COMMAND_MAX_LENGTH ];
-	const char*	m_ppArgv[ COMMAND_MAX_ARGC ];
-};
-
-inline int CCommand::MaxCommandLength()
-{
-	return COMMAND_MAX_LENGTH - 1;
-}
-
-inline int CCommand::ArgC() const
-{
-	return m_nArgc;
-}
-
-inline const char **CCommand::ArgV() const
-{
-	return m_nArgc ? (const char**)m_ppArgv : NULL;
-}
-
-inline const char *CCommand::ArgS() const
-{
-	return m_nArgv0Size ? &m_pArgSBuffer[m_nArgv0Size] : "";
-}
-
-inline const char *CCommand::GetCommandString() const
-{
-	return m_nArgc ? m_pArgSBuffer : "";
-}
-
-inline const char *CCommand::Arg( int nIndex ) const
-{
-	// FIXME: Many command handlers appear to not be particularly careful
-	// about checking for valid argc range. For now, we're going to
-	// do the extra check and return an empty string if it's out of range
-	if ( nIndex < 0 || nIndex >= m_nArgc )
-		return "";
-	return m_ppArgv[nIndex];
-}
-
-inline const char *CCommand::operator[]( int nIndex ) const
-{
-	return Arg( nIndex );
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: The console invoked command
-//-----------------------------------------------------------------------------
-class ConCommand : public ConCommandBase
-{
-friend class CCvar;
-
-public:
-	typedef ConCommandBase BaseClass;
-
-	ConCommand( const char *pName, FnCommandCallbackV1_t callback, 
-		const char *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 );
-	ConCommand( const char *pName, FnCommandCallback_t callback, 
-		const char *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 );
-	ConCommand( const char *pName, ICommandCallback *pCallback, 
-		const char *pHelpString = 0, int flags = 0, ICommandCompletionCallback *pCommandCompletionCallback = 0 );
-
-	virtual ~ConCommand( void );
-
-	virtual	bool IsCommand( void ) const;
-
-	virtual int AutoCompleteSuggest( const char *partial, CUtlVector< CUtlString > &commands );
-
-	virtual bool CanAutoComplete( void );
-
-	// Invoke the function
-	virtual void Dispatch( const CCommand &command );
-
-private:
-	// NOTE: To maintain backward compat, we have to be very careful:
-	// All public virtual methods must appear in the same order always
-	// since engine code will be calling into this code, which *does not match*
-	// in the mod code; it's using slightly different, but compatible versions
-	// of this class. Also: Be very careful about adding new fields to this class.
-	// Those fields will not exist in the version of this class that is instanced
-	// in mod code.
-
-	// Call this function when executing the command
-	union
-	{
-		FnCommandCallbackV1_t m_fnCommandCallbackV1;
-		FnCommandCallback_t m_fnCommandCallback;
-		ICommandCallback *m_pCommandCallback; 
-	};
-
-	union
-	{
-		FnCommandCompletionCallback	m_fnCompletionCallback;
-		ICommandCompletionCallback *m_pCommandCompletionCallback;
-	};
-
-	bool m_bHasCompletionCallback : 1;
-	bool m_bUsingNewCommandCallback : 1;
-	bool m_bUsingCommandCallbackInterface : 1;
-public:
-	inline FnCommandCallback_t GetCallback() const
-	{ 
-		return m_fnCommandCallback; 
-	}
-};
-
-
-//-----------------------------------------------------------------------------
-// Purpose: A console variable
-//-----------------------------------------------------------------------------
-class ConVar : public ConCommandBase, public IConVar
-{
-friend class CCvar;
-friend class ConVarRef;
-
-public:
-	typedef ConCommandBase BaseClass;
-
-								ConVar( const char *pName, const char *pDefaultValue, int flags = 0);
-
-								ConVar( const char *pName, const char *pDefaultValue, int flags, 
-									const char *pHelpString );
-								ConVar( const char *pName, const char *pDefaultValue, int flags, 
-									const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax );
-								ConVar( const char *pName, const char *pDefaultValue, int flags, 
-									const char *pHelpString, FnChangeCallback_t callback );
-								ConVar( const char *pName, const char *pDefaultValue, int flags, 
-									const char *pHelpString, bool bMin, float fMin, bool bMax, float fMax,
-									FnChangeCallback_t callback );
-
-	virtual						~ConVar( void );
-
-	virtual	bool				IsCommand( void ) const;
-	virtual bool				IsFlagSet( int flag ) const;
-	virtual void				AddFlags( int flags );
-	virtual int					GetFlags( void ) const;
-	virtual const char			*GetName( void ) const;
-	virtual const char*			GetHelpText( void ) const;
-	virtual bool				IsRegistered( void ) const;
-		
-	// Install a change callback (there shouldn't already be one....)
-	void InstallChangeCallback( FnChangeCallback_t callback );
-
-	// Retrieve value
-	FORCEINLINE_CVAR float			GetFloat( void ) const;
-	FORCEINLINE_CVAR int			GetInt( void ) const;
-	FORCEINLINE_CVAR bool			GetBool() const {  return !!GetInt(); }
-	FORCEINLINE_CVAR char const	   *GetString( void ) const;
-	
-	// Used internally by OneTimeInit to initialize.
-	virtual void				Init();
-	
-	virtual const char 			*GetBaseName( void ) const;
-	virtual int					GetSplitScreenPlayerSlot ( void ) const;
-
-	// Any function that allocates/frees memory needs to be virtual or else you'll have crashes
-	//  from alloc/free across dll/exe boundaries.
-	
-	// These just call into the IConCommandBaseAccessor to check flags and set the var (which ends up calling InternalSetValue).
-	virtual void				SetValue( const char *value );
-	virtual void				SetValue( float value );
-	virtual void				SetValue( int value );
-#if SOURCE_ENGINE >= SE_NUCLEARDAWN
-	virtual void				SetValue( Color value );
-#endif
-	
-	// Reset to default value
-	void						Revert( void );
-
-	// True if it has a min/max setting
-	bool						GetMin( float& minVal ) const;
-	bool						GetMax( float& maxVal ) const;
-	const char					*GetDefault( void ) const;
-
-private:
-	// Called by CCvar when the value of a var is changing.
-	virtual void				InternalSetValue(const char *value);
-	// For CVARs marked FCVAR_NEVER_AS_STRING
-	virtual void				InternalSetFloatValue( float fNewValue );
-	virtual void				InternalSetIntValue( int nValue );
-#if SOURCE_ENGINE >= SE_LEFT4DEAD2
-	virtual void				InternalSetColorValue( Color value );
-#endif
-
-	virtual bool				ClampValue( float& value );
-	virtual void				ChangeStringValue( const char *tempVal, float flOldValue );
-
-	virtual void				Create( const char *pName, const char *pDefaultValue, int flags = 0,
-									const char *pHelpString = 0, bool bMin = false, float fMin = 0.0,
-									bool bMax = false, float fMax = false, FnChangeCallback_t callback = 0 );
-
-private:
-
-	// This either points to "this" or it points to the original declaration of a ConVar.
-	// This allows ConVars to exist in separate modules, and they all use the first one to be declared.
-	// m_pParent->m_pParent must equal m_pParent (ie: m_pParent must be the root, or original, ConVar).
-	ConVar						*m_pParent;
-
-	// Static data
-	const char					*m_pszDefaultValue;
-	
-	// Value
-	// Dynamically allocated
-	char						*m_pszString;
-	int							m_StringLength;
-
-	// Values
-	float						m_fValue;
-	int							m_nValue;
-
-	// Min/Max values
-	bool						m_bHasMin;
-	float						m_fMinVal;
-	bool						m_bHasMax;
-	float						m_fMaxVal;
-	
-	// Call this function when ConVar changes
-	FnChangeCallback_t			m_fnChangeCallback;
-public:
-	inline FnChangeCallback_t GetCallback() const
-	{
-		return m_fnChangeCallback;
-	}
-	inline void SetMin(bool set, float min=0.0)
-	{ 
-		m_bHasMin = set; 
-		m_fMinVal = min; 
-	}
-	inline void SetMax(bool set, float max=0.0)
-	{
-		m_bHasMax = set;
-		m_fMaxVal = max; 
-	}
-};
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Return ConVar value as a float
-// Output : float
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR float ConVar::GetFloat( void ) const
-{
-	return m_pParent->m_fValue;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Return ConVar value as an int
-// Output : int
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR int ConVar::GetInt( void ) const 
-{
-	return m_pParent->m_nValue;
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Return ConVar value as a string, return "" for bogus string pointer, etc.
-// Output : const char *
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR const char *ConVar::GetString( void ) const 
-{
-	if ( m_nFlags & FCVAR_NEVER_AS_STRING )
-		return "FCVAR_NEVER_AS_STRING";
-
-	return ( m_pParent->m_pszString ) ? m_pParent->m_pszString : "";
-}
-
-
-//-----------------------------------------------------------------------------
-// Used to read/write convars that already exist (replaces the FindVar method)
-//-----------------------------------------------------------------------------
-class ConVarRef
-{
-public:
-	ConVarRef( const char *pName );
-	ConVarRef( const char *pName, bool bIgnoreMissing );
-	ConVarRef( IConVar *pConVar );
-
-	void Init( const char *pName, bool bIgnoreMissing );
-	bool IsValid() const;
-	bool IsFlagSet( int nFlags ) const;
-	IConVar *GetLinkedConVar();
-
-	// Get/Set value
-	float GetFloat( void ) const;
-	int GetInt( void ) const;
-	bool GetBool() const { return !!GetInt(); }
-	const char *GetString( void ) const;
-
-	void SetValue( const char *pValue );
-	void SetValue( float flValue );
-	void SetValue( int nValue );
-	void SetValue( bool bValue );
-
-	const char *GetName() const;
-
-	const char *GetDefault() const;
-
-private:
-	// High-speed method to read convar data
-	IConVar *m_pConVar;
-	ConVar *m_pConVarState;
-};
-
-
-//-----------------------------------------------------------------------------
-// Did we find an existing convar of that name?
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR bool ConVarRef::IsFlagSet( int nFlags ) const
-{
-	return ( m_pConVar->IsFlagSet( nFlags ) != 0 );
-}
-
-FORCEINLINE_CVAR IConVar *ConVarRef::GetLinkedConVar()
-{
-	return m_pConVar;
-}
-
-FORCEINLINE_CVAR const char *ConVarRef::GetName() const
-{
-	return m_pConVar->GetName();
-}
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Return ConVar value as a float
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR float ConVarRef::GetFloat( void ) const
-{
-	return m_pConVarState->m_fValue;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Return ConVar value as an int
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR int ConVarRef::GetInt( void ) const 
-{
-	return m_pConVarState->m_nValue;
-}
-
-//-----------------------------------------------------------------------------
-// Purpose: Return ConVar value as a string, return "" for bogus string pointer, etc.
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR const char *ConVarRef::GetString( void ) const 
-{
-	Assert( !IsFlagSet( FCVAR_NEVER_AS_STRING ) );
-	return m_pConVarState->m_pszString;
-}
-
-
-FORCEINLINE_CVAR void ConVarRef::SetValue( const char *pValue )
-{
-	m_pConVar->SetValue( pValue );
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue( float flValue )
-{
-	m_pConVar->SetValue( flValue );
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue( int nValue )
-{
-	m_pConVar->SetValue( nValue );
-}
-
-FORCEINLINE_CVAR void ConVarRef::SetValue( bool bValue )
-{
-	m_pConVar->SetValue( bValue ? 1 : 0 );
-}
-
-FORCEINLINE_CVAR const char *ConVarRef::GetDefault() const
-{
-	return m_pConVarState->m_pszDefaultValue;
-}
-
-
-//-----------------------------------------------------------------------------
-// Called by the framework to register ConCommands with the ICVar
-//-----------------------------------------------------------------------------
-void ConVar_Register( int nCVarFlag = 0, IConCommandBaseAccessor *pAccessor = NULL );
-void ConVar_Unregister( );
-
-
-//-----------------------------------------------------------------------------
-// Utility methods 
-//-----------------------------------------------------------------------------
-void ConVar_PrintFlags( const ConCommandBase *var );
-void ConVar_PrintDescription( const ConCommandBase *pVar );
-
-
-//-----------------------------------------------------------------------------
-// Purpose: Utility class to quickly allow ConCommands to call member methods
-//-----------------------------------------------------------------------------
-#ifdef _MSC_VER
-#pragma warning (disable : 4355 )
-#endif
-
-template< class T >
-class CConCommandMemberAccessor : public ConCommand, public ICommandCallback, public ICommandCompletionCallback
-{
-	typedef ConCommand BaseClass;
-	typedef void ( T::*FnMemberCommandCallback_t )( const CCommand &command );
-	typedef int  ( T::*FnMemberCommandCompletionCallback_t )( const char *pPartial, CUtlVector< CUtlString > &commands );
-
-public:
-	CConCommandMemberAccessor( T* pOwner, const char *pName, FnMemberCommandCallback_t callback, const char *pHelpString = 0,
-		int flags = 0, FnMemberCommandCompletionCallback_t completionFunc = 0 ) :
-		BaseClass( pName, this, pHelpString, flags, ( completionFunc != 0 ) ? this : NULL )
-	{
-		m_pOwner = pOwner;
-		m_Func = callback;
-		m_CompletionFunc = completionFunc;
-	}
-
-	~CConCommandMemberAccessor()
-	{
-		Shutdown();
-	}
-
-	void SetOwner( T* pOwner )
-	{
-		m_pOwner = pOwner;
-	}
-
-	virtual void CommandCallback( const CCommand &command )
-	{
-		Assert( m_pOwner && m_Func );
-		(m_pOwner->*m_Func)( command );
-	}
-
-	virtual int  CommandCompletionCallback( const char *pPartial, CUtlVector< CUtlString > &commands )
-	{
-		Assert( m_pOwner && m_CompletionFunc );
-		return (m_pOwner->*m_CompletionFunc)( pPartial, commands );
-	}
-
-private:
-	T* m_pOwner;
-	FnMemberCommandCallback_t m_Func;
-	FnMemberCommandCompletionCallback_t m_CompletionFunc;
-};
-
-#ifdef _MSC_VER
-#pragma warning ( default : 4355 )
-#endif
-
-//-----------------------------------------------------------------------------
-// Purpose: Utility macros to quicky generate a simple console command
-//-----------------------------------------------------------------------------
-#define CON_COMMAND( name, description ) \
-   static void name( const CCommand &args ); \
-   static ConCommand name##_command( #name, name, description ); \
-   static void name( const CCommand &args )
-
-#define CON_COMMAND_F( name, description, flags ) \
-   static void name( const CCommand &args ); \
-   static ConCommand name##_command( #name, name, description, flags ); \
-   static void name( const CCommand &args )
-
-#define CON_COMMAND_F_COMPLETION( name, description, flags, completion ) \
-	static void name( const CCommand &args ); \
-	static ConCommand name##_command( #name, name, description, flags, completion ); \
-	static void name( const CCommand &args )
-
-#define CON_COMMAND_EXTERN( name, _funcname, description ) \
-	void _funcname( const CCommand &args ); \
-	static ConCommand name##_command( #name, _funcname, description ); \
-	void _funcname( const CCommand &args )
-
-#define CON_COMMAND_EXTERN_F( name, _funcname, description, flags ) \
-	void _funcname( const CCommand &args ); \
-	static ConCommand name##_command( #name, _funcname, description, flags ); \
-	void _funcname( const CCommand &args )
-
-#define CON_COMMAND_MEMBER_F( _thisclass, name, _funcname, description, flags ) \
-	void _funcname( const CCommand &args );						\
-	friend class CCommandMemberInitializer_##_funcname;			\
-	class CCommandMemberInitializer_##_funcname					\
-	{															\
-	public:														\
-		CCommandMemberInitializer_##_funcname() : m_ConCommandAccessor( NULL, name, &_thisclass::_funcname, description, flags )	\
-		{														\
-			m_ConCommandAccessor.SetOwner( GET_OUTER( _thisclass, m_##_funcname##_register ) );	\
-		}														\
-	private:													\
-		CConCommandMemberAccessor< _thisclass > m_ConCommandAccessor;	\
-	};															\
-																\
-	CCommandMemberInitializer_##_funcname m_##_funcname##_register;		\
-
-
-#endif // CONVAR_H

core/convar_sm_ob.h

@@ -24,7 +24,7 @@
 
 #ifdef _WIN32
 #define FORCEINLINE_CVAR FORCEINLINE
-#elif defined _LINUX || defined __APPLE__
+#elif _LINUX
 #define FORCEINLINE_CVAR inline
 #else
 #error "implement me"

core/frame_hooks.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,79 +30,20 @@
  */
 #include "frame_hooks.h"
 #include "TimerSys.h"
+#include "Database.h"
 #include "HalfLife2.h"
 #include "MenuStyle_Valve.h"
 #include "MenuStyle_Radio.h"
 #include "PlayerManager.h"
-#include "CoreConfig.h"
-#include <sm_queue.h>
-#include <IThreader.h>
-#include "sourcemod.h"
 
-static IMutex *frame_mutex;
-static Queue<FrameAction> *frame_queue;
-static Queue<FrameAction> *frame_actions;
-static float g_LastMenuTime = 0.0f;
-static float g_LastAuthCheck = 0.0f;
-bool g_PendingInternalPush = false;
-
-class FrameActionInit : public SMGlobalClass
-{
-public:
-	void OnSourceModAllInitialized()
-	{
-		frame_queue = new Queue<FrameAction>();
-		frame_actions = new Queue<FrameAction>();
-		frame_mutex = g_pThreader->MakeMutex();
-	}
-
-	void OnSourceModShutdown()
-	{
-		delete frame_queue;
-		delete frame_actions;
-		frame_mutex->DestroyThis();
-	}
-} s_FrameActionInit;
-
-void AddFrameAction(const FrameAction & action)
-{
-	frame_mutex->Lock();
-	frame_queue->push(action);
-	frame_mutex->Unlock();
-}
+float g_LastMenuTime = 0.0f;
+float g_LastAuthCheck = 0.0f;
 
 void RunFrameHooks(bool simulating)
 {
-	/* It's okay if this check races. */
-	if (frame_queue->size())
-	{
-		Queue<FrameAction> *temp;
-
-		/* Very quick lock to move queue/actions back and forth */
-		frame_mutex->Lock();
-		temp = frame_queue;
-		frame_queue = frame_actions;
-		frame_actions = temp;
-		frame_mutex->Unlock();
-
-		/* The server will now be adding to the other queue, so we can process events. */
-		while (!frame_actions->empty())
-		{
-			FrameAction &item = frame_actions->first();
-			frame_actions->pop();
-			item.action(item.data);
-		}
-	}
-
 	/* Frame based hooks */
+	g_DBMan.RunFrame();
 	g_HL2.ProcessFakeCliCmdQueue();
-	g_HL2.ProcessDelayedKicks();
-
-    if (g_PendingInternalPush)
-    {
-        SM_InternalCmdTrigger();
-    }
-
 	g_SourceMod.ProcessGameFrameHooks(simulating);
 
 	float curtime = *g_pUniversalTime;

core/frame_hooks.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,22 +32,6 @@
 #ifndef _INCLUDE_SOURCEMOD_FRAME_HOOKS_H_
 #define _INCLUDE_SOURCEMOD_FRAME_HOOKS_H_
 
-#include <ISourceMod.h>
-
-using namespace SourceMod;
-
-struct FrameAction
-{
-	FrameAction(FRAMEACTION a, void *d) : data(d), action(a)
-	{
-	}
-	void *data;
-	FRAMEACTION action;
-};
-
-extern bool g_PendingInternalPush;
-
-void AddFrameAction(const FrameAction & action);
 void RunFrameHooks(bool simulating);
 
 #endif //_INCLUDE_SOURCEMOD_FRAME_HOOKS_H_

core/logic/AMBuilder

@@ -1,84 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import os
-
-binary = SM.Library(builder, 'sourcemod.logic')
-binary.compiler.cxxincludes += [
-  os.path.join(builder.sourcePath, 'core', 'logic'),
-  os.path.join(builder.sourcePath, 'public'),
-  os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
-  os.path.join(builder.sourcePath, 'public', 'amtl'),
-  os.path.join(SM.mms_root, 'core', 'sourcehook')
-]
-binary.compiler.defines += [
-  'SM_DEFAULT_THREADER',
-  'SM_LOGIC'
-]
-  
-if builder.target_platform == 'linux':
-  binary.compiler.postlink += ['-lpthread', '-lrt']
-elif builder.target_platform == 'mac':
-  binary.compiler.cflags += ['-Wno-deprecated-declarations']
-  binary.compiler.postlink += ['-framework', 'CoreServices']
-
-if binary.compiler.vendor == 'gcc' or binary.compiler.vendor == 'clang':
-  binary.compiler.cxxflags += ['-fno-rtti']
-elif binary.compiler.vendor == 'msvc':
-  binary.compiler.cxxflags += ['/GR-']
-
-binary.sources += [
-  'common_logic.cpp',
-  'smn_adt_array.cpp',
-  'smn_sorting.cpp',
-  'smn_maplists.cpp',
-  'ADTFactory.cpp',
-  'smn_adt_stack.cpp',
-  'thread/ThreadWorker.cpp',
-  'thread/BaseWorker.cpp',
-  'ThreadSupport.cpp',
-  'smn_float.cpp',
-  'TextParsers.cpp',
-  'smn_textparse.cpp',
-  'smn_adt_trie.cpp',
-  'smn_functions.cpp',
-  'smn_timers.cpp',
-  'smn_players.cpp',
-  'MemoryUtils.cpp',
-  'smn_admin.cpp',
-  'smn_banning.cpp',
-  'smn_filesystem.cpp',
-  'stringutil.cpp',
-  'Translator.cpp',
-  'PhraseCollection.cpp',
-  'smn_lang.cpp',
-  'smn_string.cpp',
-  'smn_handles.cpp',
-  'smn_datapacks.cpp',
-  'smn_gameconfigs.cpp',
-  'smn_fakenatives.cpp',
-  'GameConfigs.cpp',
-  'sm_crc32.cpp',
-  'smn_profiler.cpp',
-  'ShareSys.cpp',
-  'PluginSys.cpp',
-  'HandleSys.cpp',
-  'NativeOwner.cpp',
-  'NativeInvoker.cpp',
-  'ExtensionSys.cpp',
-  'DebugReporter.cpp',
-  'Database.cpp',
-  'smn_database.cpp',
-  'ForwardSys.cpp',
-  'AdminCache.cpp',
-  'sm_trie.cpp',
-  'smn_console.cpp',
-  'ProfileTools.cpp',
-  'Logger.cpp',
-  'smn_core.cpp',
-  'smn_menus.cpp',
-]
-if builder.target_platform == 'windows':
-  binary.sources += ['thread/WinThreads.cpp']
-else:
-  binary.sources += ['thread/PosixThreads.cpp']
-
-SM.binaries += [builder.Add(binary)]

core/logic/Logger.cpp

@@ -1,551 +0,0 @@
-/**
- * vim: set ts=4 sw=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2009 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#include <time.h>
-#include <cstdarg>
-#include "Logger.h"
-#include <sourcemod_version.h>
-#include <ISourceMod.h>
-
-Logger g_Logger;
-
-/**
- * :TODO: This should be creating the log folder if it doesn't exist
- */
-
-ConfigResult Logger::OnSourceModConfigChanged(const char *key, 
-									  const char *value, 
-									  ConfigSource source,
-									  char *error, 
-									  size_t maxlength)
-{
-	if (strcasecmp(key, "Logging") == 0)
-	{
-		bool state;
-
-		if (strcasecmp(value, "on") == 0)
-		{
-			state = true;
-		} else if (strcasecmp(value, "off") == 0) {
-			state = false;
-		} else {
-			smcore.Format(error, maxlength, "Invalid value: must be \"on\" or \"off\"");
-			return ConfigResult_Reject;
-		}
-
-		if (source == ConfigSource_Console)
-		{
-			state ? EnableLogging() : DisableLogging();
-		} else {
-			m_InitialState = state;
-		}
-
-		return ConfigResult_Accept;
-	} else if (strcasecmp(key, "LogMode") == 0) {
-		if (strcasecmp(value, "daily") == 0) 
-		{
-			m_Mode = LoggingMode_Daily;
-		} else if (strcasecmp(value, "map") == 0) {
-			m_Mode = LoggingMode_PerMap;
-		} else if (strcasecmp(value, "game") == 0) {
-			m_Mode = LoggingMode_Game;
-		} else {
-			smcore.Format(error, maxlength, "Invalid value: must be [daily|map|game]");
-			return ConfigResult_Reject;
-		}
-
-		return ConfigResult_Accept;
-	}
-
-	return ConfigResult_Ignore;
-}
-
-void Logger::OnSourceModStartup(bool late)
-{
-	InitLogger(m_Mode);
-}
-
-void Logger::OnSourceModAllShutdown()
-{
-	CloseLogger();
-}
-
-void Logger::OnSourceModLevelChange(const char *mapName)
-{
-	MapChange(mapName);
-}
-
-void Logger::_NewMapFile()
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	/* Append "Log file closed" to previous log file */
-	_CloseFile();
-	
-	char _filename[256];
-	int i = 0;
-
-	time_t t = g_pSM->GetAdjustedTime();
-	tm *curtime = localtime(&t);
-
-	while (true)
-	{
-		g_pSM->BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%02d%02d%03d.log", curtime->tm_mon + 1, curtime->tm_mday, i);
-		FILE *fp = fopen(_filename, "r");
-		if (!fp)
-		{
-			break;
-		}
-		fclose(fp);
-		i++;
-	}
-	m_NrmFileName.assign(_filename);
-
-	FILE *fp = fopen(m_NrmFileName.c_str(), "w");
-	if (!fp)
-	{
-		char error[255];
-		libsys->GetPlatformError(error, sizeof(error));
-		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
-		LogFatal("[SM] Platform returned error: \"%s\"", error);
-		LogFatal("[SM] Logging has been disabled.");
-		m_Active = false;
-		return;
-	} else {
-		char date[32];
-		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SOURCEMOD_VERSION);
-		fclose(fp);
-	}
-}
-
-void Logger::_CloseFile()
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	FILE *fp = NULL;
-	if (!m_NrmFileName.empty())
-	{
-		fp = fopen(m_NrmFileName.c_str(), "r+");
-		if (fp)
-		{
-			fseek(fp, 0, SEEK_END);
-			LogMessage("Log file closed.");
-			fclose(fp);
-		}
-		m_NrmFileName.clear();
-	}
-
-	if (!m_ErrMapStart)
-	{
-		return;
-	}
-	fp = fopen(m_ErrFileName.c_str(), "r+");
-	if (fp)
-	{
-		fseek(fp, 0, SEEK_END);
-		LogError("Error log file session closed.");
-		fclose(fp);
-	}
-	m_ErrFileName.clear();
-}
-
-void Logger::InitLogger(LoggingMode mode)
-{
-	m_Mode = mode;
-	m_Active = m_InitialState;
-
-	time_t t = g_pSM->GetAdjustedTime();
-	tm *curtime = localtime(&t);
-	m_NrmCurDay = curtime->tm_mday;
-	m_ErrCurDay = curtime->tm_mday;
-
-	char _filename[256];
-	g_pSM->BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
-	m_ErrFileName.assign(_filename);
-
-	switch (m_Mode)
-	{
-	case LoggingMode_PerMap:
-		{
-			if (!m_Active)
-			{
-				m_DelayedStart = true;
-			}
-			break;
-		}
-	case LoggingMode_Daily:
-		{
-			g_pSM->BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
-			m_NrmFileName.assign(_filename);
-			m_DailyPrintHdr = true;
-			break;
-		}
-	default:
-		{
-			/* do nothing... */
-			break;
-		}
-	}
-}
-
-void Logger::CloseLogger()
-{
-	_CloseFile();
-}
-
-void Logger::LogToOpenFile(FILE *fp, const char *msg, ...)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	va_list ap;
-	va_start(ap, msg);
-	LogToOpenFileEx(fp, msg, ap);
-	va_end(ap);
-}
-
-void Logger::LogToFileOnly(FILE *fp, const char *msg, ...)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	va_list ap;
-	va_start(ap, msg);
-	LogToFileOnlyEx(fp, msg, ap);
-	va_end(ap);
-}
-
-void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	static ConVar *sv_logecho = smcore.FindConVar("sv_logecho");
-
-	char buffer[3072];
-	smcore.FormatArgs(buffer, sizeof(buffer), msg, ap);
-
-	char date[32];
-	time_t t = g_pSM->GetAdjustedTime();
-	tm *curtime = localtime(&t);
-	strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-
-	fprintf(fp, "L %s: %s\n", date, buffer);
-
-	if (!sv_logecho || smcore.GetCvarBool(sv_logecho))
-	{
-		static char conBuffer[4096];
-		smcore.Format(conBuffer, sizeof(conBuffer), "L %s: %s\n", date, buffer);
-		smcore.ConPrint(conBuffer);
-	}
-}
-
-void Logger::LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	char buffer[3072];
-	smcore.FormatArgs(buffer, sizeof(buffer), msg, ap);
-
-	char date[32];
-	time_t t = g_pSM->GetAdjustedTime();
-	tm *curtime = localtime(&t);
-	strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-
-	fprintf(fp, "L %s: %s\n", date, buffer);
-	fflush(fp);
-}
-
-void Logger::LogMessage(const char *vafmt, ...)
-{
-	va_list ap;
-	va_start(ap, vafmt);
-	LogMessageEx(vafmt, ap);
-	va_end(ap);
-}
-
-void Logger::LogMessageEx(const char *vafmt, va_list ap)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	if (m_Mode == LoggingMode_Game)
-	{
-		_PrintToGameLog(vafmt, ap);
-		return;
-	}
-
-	if (m_DelayedStart)
-	{
-		m_DelayedStart = false;
-		_NewMapFile();
-	}
-
-	time_t t = g_pSM->GetAdjustedTime();
-	tm *curtime = localtime(&t);
-
-	FILE *fp = NULL;
-	if (m_Mode == LoggingMode_PerMap)
-	{
-		fp = fopen(m_NrmFileName.c_str(), "a+");
-		if (!fp)
-		{
-			_NewMapFile();
-			fp = fopen(m_NrmFileName.c_str(), "a+");
-			if (!fp)
-			{
-				goto print_error;
-			}
-		}
-	} else {
-		if (m_NrmCurDay != curtime->tm_mday)
-		{
-			char _filename[256];
-			g_pSM->BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
-			m_NrmFileName.assign(_filename);
-			m_NrmCurDay = curtime->tm_mday;
-			m_DailyPrintHdr = true;
-		}
-		fp = fopen(m_NrmFileName.c_str(), "a+");
-	}
-
-	if (fp)
-	{
-		if (m_DailyPrintHdr)
-		{
-			char date[32];
-			m_DailyPrintHdr = false;
-			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SOURCEMOD_VERSION);
-	 	}
-		LogToOpenFileEx(fp, vafmt, ap);
-		fclose(fp);
-	} else {
-		goto print_error;
-	}
-
-	return;
-print_error:
-	char error[255];
-	libsys->GetPlatformError(error, sizeof(error));
-	LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
-	LogFatal("[SM] Platform returned error: \"%s\"", error);
-	LogFatal("[SM] Logging has been disabled.");
-	m_Active = false;
-}
-
-void Logger::LogError(const char *vafmt, ...)
-{
-	va_list ap;
-	va_start(ap, vafmt);
-	LogErrorEx(vafmt, ap);
-	va_end(ap);
-}
-
-void Logger::LogErrorEx(const char *vafmt, va_list ap)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	time_t t = g_pSM->GetAdjustedTime();
-	tm *curtime = localtime(&t);
-
-	if (curtime->tm_mday != m_ErrCurDay)
-	{
-		char _filename[256];
-		g_pSM->BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
-		m_ErrFileName.assign(_filename);
-		m_ErrCurDay = curtime->tm_mday;
-		m_ErrMapStart = false;
-	}
-
-	FILE *fp = fopen(m_ErrFileName.c_str(), "a+");
-	if (fp)
-	{
-		if (!m_ErrMapStart)
-		{
-			char date[32];
-			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
-			fprintf(fp, "L %s: SourceMod error session started\n", date);
-			fprintf(fp, "L %s: Info (map \"%s\") (file \"errors_%04d%02d%02d.log\")\n", date, m_CurMapName.c_str(), curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
-			m_ErrMapStart = true;
-		}
-		LogToOpenFileEx(fp, vafmt, ap);
-		fclose(fp);
-	}
-	else
-	{
-		char error[255];
-		libsys->GetPlatformError(error, sizeof(error));
-		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
-		LogFatal("[SM] Platform returned error: \"%s\"", error);
-		LogFatal("[SM] Logging has been disabled.");
-		m_Active = false;
-		return;
-	}
-}
-
-void Logger::MapChange(const char *mapname)
-{
-	m_CurMapName.assign(mapname);
-
-	switch (m_Mode)
-	{
-	case LoggingMode_Daily:
-		{
-			LogMessage("-------- Mapchange to %s --------", mapname);
-			break;
-		}
-	case LoggingMode_PerMap:
-		{
-			_NewMapFile();
-			break;
-		}
-	default:
-		{
-			/* Do nothing... */
-			break;
-		}
-	}
-
-	if (m_ErrMapStart)
-	{
-		LogError("Error log file session closed.");
-	}
-	m_ErrMapStart = false;
-}
-
-void Logger::_PrintToGameLog(const char *fmt, va_list ap)
-{
-	char msg[3072];
-	size_t len;
-
-	len = vsnprintf(msg, sizeof(msg)-2, fmt, ap);
-	len = (len >= sizeof(msg)) ? (sizeof(msg) - 2) : len;
-
-	msg[len++] = '\n';
-	msg[len] = '\0';
-
-	smcore.LogToGame(msg);
-}
-
-const char *Logger::GetLogFileName(LogType type) const
-{
-	switch (type)
-	{
-	case LogType_Normal:
-		{
-			return m_NrmFileName.c_str();
-		}
-	case LogType_Error:
-		{
-			return m_ErrFileName.c_str();
-		}
-	default:
-		{
-			return "";
-		}
-	}
-}
-
-LoggingMode Logger::GetLoggingMode() const
-{
-	return m_Mode;
-}
-
-void Logger::EnableLogging()
-{
-	if (m_Active)
-	{
-		return;
-	}
-	m_Active = true;
-	LogMessage("[SM] Logging enabled manually by user.");
-}
-
-void Logger::DisableLogging()
-{
-	if (!m_Active)
-	{
-		return;
-	}
-	LogMessage("[SM] Logging disabled manually by user.");
-	m_Active = false;
-}
-
-void Logger::LogFatal(const char *msg, ...)
-{
-	va_list ap;
-	va_start(ap, msg);
-	LogFatalEx(msg, ap);
-	va_end(ap);
-}
-
-void Logger::LogFatalEx(const char *msg, va_list ap)
-{
-	/* :TODO: make this print all pretty-like
-	 * In fact, the pretty log printing function should be abstracted. 
-	 * It's already implemented twice which is bad.
-	 */
-
-	char path[PLATFORM_MAX_PATH];
-
-	g_pSM->BuildPath(Path_Game, path, sizeof(path), "sourcemod_fatal.log");
-
-	FILE *fp = fopen(path, "at");
-	if (fp)
-	{
-		m_Active = true;
-		LogToOpenFileEx(fp, msg, ap);
-		m_Active = false;
-		fclose(fp);
-	}
-}

core/logic/Logger.h

@@ -1,111 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_SOURCEMOD_CLOGGER_H_
-#define _INCLUDE_SOURCEMOD_CLOGGER_H_
-
-#include <stdio.h>
-#include <sh_string.h>
-
-#include "common_logic.h"
-
-using namespace SourceHook;
-
-enum LogType
-{
-	LogType_Normal,
-	LogType_Error
-};
-
-enum LoggingMode
-{
-	LoggingMode_Daily,
-	LoggingMode_PerMap,
-	LoggingMode_Game
-};
-
-class Logger : public SMGlobalClass, public ILogger
-{
-public:
-	Logger() : m_Mode(LoggingMode_Daily), m_ErrMapStart(false), 
-		m_Active(false), m_DelayedStart(false), m_DailyPrintHdr(false), 
-		m_InitialState(true)
-	{
-	}
-public: //SMGlobalClass
-	ConfigResult OnSourceModConfigChanged(const char *key, 
-		const char *value, 
-		ConfigSource source,
-		char *error, 
-		size_t maxlength);
-	void OnSourceModStartup(bool late);
-	void OnSourceModAllShutdown();
-	void OnSourceModLevelChange(const char *mapName);
-public:
-	void InitLogger(LoggingMode mode);
-	void CloseLogger();
-	void EnableLogging();
-	void DisableLogging();
-	void LogMessage(const char *msg, ...);
-	void LogMessageEx(const char *msg, va_list ap);
-	void LogError(const char *msg, ...);
-	void LogErrorEx(const char *msg, va_list ap); 
-	void LogFatal(const char *msg, ...);
-	void LogFatalEx(const char *msg, va_list ap);
-	void LogToOpenFile(FILE *fp, const char *msg, ...);
-	void LogToOpenFileEx(FILE *fp, const char *msg, va_list ap);
-	/* This version does not print to console, and is thus thread-safe */
-	void LogToFileOnly(FILE *fp, const char *msg, ...);
-	void LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap);
-	void MapChange(const char *mapname);
-	const char *GetLogFileName(LogType type) const;
-	LoggingMode GetLoggingMode() const;
-private:
-	void _CloseFile();
-	void _NewMapFile();
-	void _PrintToGameLog(const char *fmt, va_list ap);
-private:
-	String m_NrmFileName;
-	String m_ErrFileName;
-	String m_CurMapName;
-	LoggingMode m_Mode;
-	int m_NrmCurDay;
-	int m_ErrCurDay;
-	bool m_ErrMapStart;
-	bool m_Active;
-	bool m_DelayedStart;
-	bool m_DailyPrintHdr;
-	bool m_InitialState;
-};
-
-extern Logger g_Logger;
-
-#endif // _INCLUDE_SOURCEMOD_CLOGGER_H_

core/logic/Makefile

@@ -1,108 +0,0 @@
-# (C)2004-2008 SourceMod Development Team
-# Makefile written by David "BAILOPAN" Anderson
-
-SMSDK = ../..
-MMSOURCE17 = ../../../mmsource-1.7
-
-#####################################
-### EDIT BELOW FOR OTHER PROJECTS ###
-#####################################
-
-BINARY = sourcemod.logic.so
-
-OBJECTS = \
-	common_logic.cpp	\
-	smn_adt_array.cpp	\
-	smn_sorting.cpp		\
-	smn_maplists.cpp	\
-	smn_adt_stack.cpp	\
-	thread/ThreadWorker.cpp \
-	thread/BaseWorker.cpp 	\
-	thread/PosixThreads.cpp \
-	ThreadSupport.cpp	\
-	smn_float.cpp		\
-	TextParsers.cpp		\
-	smn_textparse.cpp	\
-	smn_adt_trie.cpp	\
-	Profiler.cpp		\
-	smn_functions.cpp   \
-	sm_crc32.cpp		\
-	smn_timers.cpp		\
-	MemoryUtils.cpp		\
-	smn_admin.cpp		\
-	smn_banning.cpp		\
-	stringutil.cpp		\
-	Translator.cpp		\
-	PhraseCollection.cpp \
-	smn_lang.cpp		\
-	smn_string.cpp		\
-	smn_handles.cpp		\
-	smn_datapacks.cpp	\
-	smn_gameconfigs.cpp	\
-	GameConfigs.cpp		\
-	smn_players.cpp 	\
-	smn_profiler.cpp
-
-##############################################
-### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
-##############################################
-
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
-C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
-C_GCC4_FLAGS = -fvisibility=hidden
-CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
-CPP = gcc
-
-LINK += -lpthread -static-libgcc
-	
-INCLUDE += -I. -I$(MMSOURCE17)/core/sourcehook -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
-
-CFLAGS += -D_LINUX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
-	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror \
-	-Wno-uninitialized -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H -DSM_DEFAULT_THREADER -m32 \
-	-DSM_LOGIC
-CPPFLAGS += -Wno-non-virtual-dtor -fno-exceptions -fno-rtti
-
-################################################
-### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
-################################################
-
-ifeq "$(DEBUG)" "true"
-	BIN_DIR = Debug
-	CFLAGS += $(C_DEBUG_FLAGS)
-else
-	BIN_DIR = Release
-	CFLAGS += $(C_OPT_FLAGS)
-endif
-
-GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
-ifeq "$(GCC_VERSION)" "4"
-	CFLAGS += $(C_GCC4_FLAGS)
-	CPPFLAGS += $(CPP_GCC4_FLAGS)
-endif
-
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
-OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
-
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-
-$(BIN_DIR)/%.o: %.c
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
-
-all: 
-	mkdir -p $(BIN_DIR)/thread
-	$(MAKE) -f Makefile sourcemod
-
-sourcemod: $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o $(BIN_DIR)/$(BINARY)
-
-debug:
-	$(MAKE) -f Makefile all DEBUG=true
-
-default: all
-
-clean: 
-	rm -rf $(BIN_DIR)/*.o
-	rm -rf $(BIN_DIR)/thread/*.o
-	rm -rf $(BIN_DIR)/$(BINARY)

core/logic/MemoryUtils.cpp

@@ -1,612 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2011 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 <http://www.gnu.org/licenses/>.
- *
- * 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 <http://www.sourcemod.net/license.php>.
- */
-
-#include "MemoryUtils.h"
-#ifdef PLATFORM_LINUX
-#include <fcntl.h>
-#include <link.h>
-#include <sys/mman.h>
-
-#define PAGE_SIZE			4096
-#define PAGE_ALIGN_UP(x)	((x + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1))
-#endif
-
-#ifdef PLATFORM_APPLE
-#include <AvailabilityMacros.h>
-#include <mach/task.h>
-#include <mach-o/dyld_images.h>
-#include <mach-o/loader.h>
-#include <mach-o/nlist.h>
-
-/* Define things from 10.6 SDK for older SDKs */
-#ifndef MAC_OS_X_VERSION_10_6
-struct task_dyld_info
-{
-	mach_vm_address_t all_image_info_addr;
-	mach_vm_size_t all_image_info_size;
-};
-typedef struct task_dyld_info task_dyld_info_data_t;
-#define TASK_DYLD_INFO 17
-#define TASK_DYLD_INFO_COUNT (sizeof(task_dyld_info_data_t) / sizeof(natural_t))
-#endif // MAC_OS_X_VERSION_10_6
-#endif // PLATFORM_APPLE
-
-MemoryUtils g_MemUtils;
-
-MemoryUtils::MemoryUtils()
-{
-#ifdef PLATFORM_APPLE
-
-	Gestalt(gestaltSystemVersionMajor, &m_OSXMajor);
-	Gestalt(gestaltSystemVersionMinor, &m_OSXMinor);
-
-	/* Get pointer to struct that describes all loaded mach-o images in process */
-	if ((m_OSXMajor == 10 && m_OSXMinor >= 6) || m_OSXMajor > 10)
-	{
-		task_dyld_info_data_t dyld_info;
-		mach_msg_type_number_t count = TASK_DYLD_INFO_COUNT;
-		task_info(mach_task_self(), TASK_DYLD_INFO, (task_info_t)&dyld_info, &count);
-		m_ImageList = (struct dyld_all_image_infos *)dyld_info.all_image_info_addr;
-	}
-	else
-	{
-		struct nlist list[2];
-		memset(list, 0, sizeof(list));
-		list[0].n_un.n_name = (char *)"_dyld_all_image_infos";
-		nlist("/usr/lib/dyld", list);
-		m_ImageList = (struct dyld_all_image_infos *)list[0].n_value;
-	}
-
-#endif
-}
-
-MemoryUtils::~MemoryUtils()
-{
-#if defined PLATFORM_LINUX || defined PLATFORM_APPLE
-	for (size_t i = 0; i < m_SymTables.size(); i++)
-	{
-		delete m_SymTables[i];
-	}
-	m_SymTables.clear();
-#endif
-}
-
-void MemoryUtils::OnSourceModAllInitialized()
-{
-	sharesys->AddInterface(NULL, this);
-}
-
-void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t len)
-{
-	DynLibInfo lib;
-	bool found;
-	char *ptr, *end;
-
-	memset(&lib, 0, sizeof(DynLibInfo));
-
-	if (!GetLibraryInfo(libPtr, lib))
-	{
-		return NULL;
-	}
-
-	ptr = reinterpret_cast<char *>(lib.baseAddress);
-	end = ptr + lib.memorySize - len;
-
-	while (ptr < end)
-	{
-		found = true;
-		for (register size_t i = 0; i < len; i++)
-		{
-			if (pattern[i] != '\x2A' && pattern[i] != ptr[i])
-			{
-				found = false;
-				break;
-			}
-		}
-
-		if (found)
-			return ptr;
-
-		ptr++;
-	}
-
-	return NULL;
-}
-
-void *MemoryUtils::ResolveSymbol(void *handle, const char *symbol)
-{
-#ifdef PLATFORM_WINDOWS
-
-	return GetProcAddress((HMODULE)handle, symbol);
-	
-#elif defined PLATFORM_LINUX
-
-	struct link_map *dlmap;
-	struct stat dlstat;
-	int dlfile;
-	uintptr_t map_base;
-	Elf32_Ehdr *file_hdr;
-	Elf32_Shdr *sections, *shstrtab_hdr, *symtab_hdr, *strtab_hdr;
-	Elf32_Sym *symtab;
-	const char *shstrtab, *strtab;
-	uint16_t section_count;
-	uint32_t symbol_count;
-	LibSymbolTable *libtable;
-	SymbolTable *table;
-	Symbol *symbol_entry;
-
-	dlmap = (struct link_map *)handle;
-	symtab_hdr = NULL;
-	strtab_hdr = NULL;
-	table = NULL;
-	
-	/* See if we already have a symbol table for this library */
-	for (size_t i = 0; i < m_SymTables.size(); i++)
-	{
-		libtable = m_SymTables[i];
-		if (libtable->lib_base == dlmap->l_addr)
-		{
-			table = &libtable->table;
-			break;
-		}
-	}
-
-	/* If we don't have a symbol table for this library, then create one */
-	if (table == NULL)
-	{
-		libtable = new LibSymbolTable();
-		libtable->table.Initialize();
-		libtable->lib_base = dlmap->l_addr;
-		libtable->last_pos = 0;
-		table = &libtable->table;
-		m_SymTables.push_back(libtable);
-	}
-
-	/* See if the symbol is already cached in our table */
-	symbol_entry = table->FindSymbol(symbol, strlen(symbol));
-	if (symbol_entry != NULL)
-	{
-		return symbol_entry->address;
-	}
-
-	/* If symbol isn't in our table, then we have open the actual library */
-	dlfile = open(dlmap->l_name, O_RDONLY);
-	if (dlfile == -1 || fstat(dlfile, &dlstat) == -1)
-	{
-		close(dlfile);
-		return NULL;
-	}
-
-	/* Map library file into memory */
-	file_hdr = (Elf32_Ehdr *)mmap(NULL, dlstat.st_size, PROT_READ, MAP_PRIVATE, dlfile, 0);
-	map_base = (uintptr_t)file_hdr;
-	if (file_hdr == MAP_FAILED)
-	{
-		close(dlfile);
-		return NULL;
-	}
-	close(dlfile);
-
-	if (file_hdr->e_shoff == 0 || file_hdr->e_shstrndx == SHN_UNDEF)
-	{
-		munmap(file_hdr, dlstat.st_size);
-		return NULL;
-	}
-
-	sections = (Elf32_Shdr *)(map_base + file_hdr->e_shoff);
-	section_count = file_hdr->e_shnum;
-	/* Get ELF section header string table */
-	shstrtab_hdr = &sections[file_hdr->e_shstrndx];
-	shstrtab = (const char *)(map_base + shstrtab_hdr->sh_offset);
-
-	/* Iterate sections while looking for ELF symbol table and string table */
-	for (uint16_t i = 0; i < section_count; i++)
-	{
-		Elf32_Shdr &hdr = sections[i];
-		const char *section_name = shstrtab + hdr.sh_name;
-
-		if (strcmp(section_name, ".symtab") == 0)
-		{
-			symtab_hdr = &hdr;
-		}
-		else if (strcmp(section_name, ".strtab") == 0)
-		{
-			strtab_hdr = &hdr;
-		}
-	}
-
-	/* Uh oh, we don't have a symbol table or a string table */
-	if (symtab_hdr == NULL || strtab_hdr == NULL)
-	{
-		munmap(file_hdr, dlstat.st_size);
-		return NULL;
-	}
-
-	symtab = (Elf32_Sym *)(map_base + symtab_hdr->sh_offset);
-	strtab = (const char *)(map_base + strtab_hdr->sh_offset);
-	symbol_count = symtab_hdr->sh_size / symtab_hdr->sh_entsize;
-
-	/* Iterate symbol table starting from the position we were at last time */
-	for (uint32_t i = libtable->last_pos; i < symbol_count; i++)
-	{
-		Elf32_Sym &sym = symtab[i];
-		unsigned char sym_type = ELF32_ST_TYPE(sym.st_info);
-		const char *sym_name = strtab + sym.st_name;
-		Symbol *cur_sym;
-
-		/* Skip symbols that are undefined or do not refer to functions or objects */
-		if (sym.st_shndx == SHN_UNDEF || (sym_type != STT_FUNC && sym_type != STT_OBJECT))
-		{
-			continue;
-		}
-
-		/* Caching symbols as we go along */
-		cur_sym = table->InternSymbol(sym_name, strlen(sym_name), (void *)(dlmap->l_addr + sym.st_value));
-		if (strcmp(symbol, sym_name) == 0)
-		{
-			symbol_entry = cur_sym;
-			libtable->last_pos = ++i;
-			break;
-		}
-	}
-
-	munmap(file_hdr, dlstat.st_size);
-	return symbol_entry ? symbol_entry->address : NULL;
-
-#elif defined PLATFORM_APPLE
-	
-	uintptr_t dlbase, linkedit_addr;
-	uint32_t image_count;
-	struct mach_header *file_hdr;
-	struct load_command *loadcmds;
-	struct segment_command *linkedit_hdr;
-	struct symtab_command *symtab_hdr;
-	struct nlist *symtab;
-	const char *strtab;
-	uint32_t loadcmd_count;
-	uint32_t symbol_count;
-	LibSymbolTable *libtable;
-	SymbolTable *table;
-	Symbol *symbol_entry;
-	
-	dlbase = 0;
-	image_count = m_ImageList->infoArrayCount;
-	linkedit_hdr = NULL;
-	symtab_hdr = NULL;
-	table = NULL;
-	
-	/* Loop through mach-o images in process.
-	 * We can skip index 0 since that is just the executable.
-	 */
-	for (uint32_t i = 1; i < image_count; i++)
-	{
-		const struct dyld_image_info &info = m_ImageList->infoArray[i];
-		
-		/* "Load" each one until we get a matching handle */
-		void *h = dlopen(info.imageFilePath, RTLD_NOLOAD);
-		if (h == handle)
-		{
-			dlbase = (uintptr_t)info.imageLoadAddress;
-			dlclose(h);
-			break;
-		}
-		
-		dlclose(h);
-	}
-	
-	if (!dlbase)
-	{
-		/* Uh oh, we couldn't find a matching handle */
-		return NULL;
-	}
-	
-	/* See if we already have a symbol table for this library */
-	for (size_t i = 0; i < m_SymTables.size(); i++)
-	{
-		libtable = m_SymTables[i];
-		if (libtable->lib_base == dlbase)
-		{
-			table = &libtable->table;
-			break;
-		}
-	}
-	
-	/* If we don't have a symbol table for this library, then create one */
-	if (table == NULL)
-	{
-		libtable = new LibSymbolTable();
-		libtable->table.Initialize();
-		libtable->lib_base = dlbase;
-		libtable->last_pos = 0;
-		table = &libtable->table;
-		m_SymTables.push_back(libtable);
-	}
-	
-	/* See if the symbol is already cached in our table */
-	symbol_entry = table->FindSymbol(symbol, strlen(symbol));
-	if (symbol_entry != NULL)
-	{
-		return symbol_entry->address;
-	}
-	
-	/* If symbol isn't in our table, then we have to locate it in memory */
-	
-	file_hdr = (struct mach_header *)dlbase;
-	loadcmds = (struct load_command *)(dlbase + sizeof(struct mach_header));
-	loadcmd_count = file_hdr->ncmds;
-	
-	/* Loop through load commands until we find the ones for the symbol table */
-	for (uint32_t i = 0; i < loadcmd_count; i++)
-	{
-		if (loadcmds->cmd == LC_SEGMENT && !linkedit_hdr)
-		{
-			struct segment_command *seg = (struct segment_command *)loadcmds;
-			if (strcmp(seg->segname, "__LINKEDIT") == 0)
-			{
-				linkedit_hdr = seg;
-				if (symtab_hdr)
-				{
-					break;
-				}
-			}
-		}
-		else if (loadcmds->cmd == LC_SYMTAB)
-		{
-			symtab_hdr = (struct symtab_command *)loadcmds;
-			if (linkedit_hdr)
-			{
-				break;
-			}
-		}
-
-		/* Load commands are not of a fixed size which is why we add the size */
-		loadcmds = (struct load_command *)((uintptr_t)loadcmds + loadcmds->cmdsize);
-	}
-	
-	if (!linkedit_hdr || !symtab_hdr || !symtab_hdr->symoff || !symtab_hdr->stroff)
-	{
-		/* Uh oh, no symbol table */
-		return NULL;
-	}
-
-	linkedit_addr = dlbase + linkedit_hdr->vmaddr;
-	symtab = (struct nlist *)(linkedit_addr + symtab_hdr->symoff - linkedit_hdr->fileoff);
-	strtab = (const char *)(linkedit_addr + symtab_hdr->stroff - linkedit_hdr->fileoff);
-	symbol_count = symtab_hdr->nsyms;
-	
-	/* Iterate symbol table starting from the position we were at last time */
-	for (uint32_t i = libtable->last_pos; i < symbol_count; i++)
-	{
-		struct nlist &sym = symtab[i];
-		/* Ignore the prepended underscore on all symbols, so +1 here */
-		const char *sym_name = strtab + sym.n_un.n_strx + 1;
-		Symbol *cur_sym;
-		
-		/* Skip symbols that are undefined */
-		if (sym.n_sect == NO_SECT)
-		{
-			continue;
-		}
-		
-		/* Caching symbols as we go along */
-		cur_sym = table->InternSymbol(sym_name, strlen(sym_name), (void *)(dlbase + sym.n_value));
-		if (strcmp(symbol, sym_name) == 0)
-		{
-			symbol_entry = cur_sym;
-			libtable->last_pos = ++i;
-			break;
-		}
-	}
-	
-	return symbol_entry ? symbol_entry->address : NULL;
-
-#endif
-}
-
-bool MemoryUtils::GetLibraryInfo(const void *libPtr, DynLibInfo &lib)
-{
-	uintptr_t baseAddr;
-
-	if (libPtr == NULL)
-	{
-		return false;
-	}
-
-#ifdef PLATFORM_WINDOWS
-
-	MEMORY_BASIC_INFORMATION info;
-	IMAGE_DOS_HEADER *dos;
-	IMAGE_NT_HEADERS *pe;
-	IMAGE_FILE_HEADER *file;
-	IMAGE_OPTIONAL_HEADER *opt;
-
-	if (!VirtualQuery(libPtr, &info, sizeof(MEMORY_BASIC_INFORMATION)))
-	{
-		return false;
-	}
-
-	baseAddr = reinterpret_cast<uintptr_t>(info.AllocationBase);
-
-	/* All this is for our insane sanity checks :o */
-	dos = reinterpret_cast<IMAGE_DOS_HEADER *>(baseAddr);
-	pe = reinterpret_cast<IMAGE_NT_HEADERS *>(baseAddr + dos->e_lfanew);
-	file = &pe->FileHeader;
-	opt = &pe->OptionalHeader;
-
-	/* Check PE magic and signature */
-	if (dos->e_magic != IMAGE_DOS_SIGNATURE || pe->Signature != IMAGE_NT_SIGNATURE || opt->Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC)
-	{
-		return false;
-	}
-
-	/* Check architecture, which is 32-bit/x86 right now
-	 * Should change this for 64-bit if Valve gets their act together
-	 */
-	if (file->Machine != IMAGE_FILE_MACHINE_I386)
-	{
-		return false;
-	}
-
-	/* For our purposes, this must be a dynamic library */
-	if ((file->Characteristics & IMAGE_FILE_DLL) == 0)
-	{
-		return false;
-	}
-
-	/* Finally, we can do this */
-	lib.memorySize = opt->SizeOfImage;
-
-#elif defined PLATFORM_LINUX
-
-	Dl_info info;
-	Elf32_Ehdr *file;
-	Elf32_Phdr *phdr;
-	uint16_t phdrCount;
-
-	if (!dladdr(libPtr, &info))
-	{
-		return false;
-	}
-
-	if (!info.dli_fbase || !info.dli_fname)
-	{
-		return false;
-	}
-
-	/* This is for our insane sanity checks :o */
-	baseAddr = reinterpret_cast<uintptr_t>(info.dli_fbase);
-	file = reinterpret_cast<Elf32_Ehdr *>(baseAddr);
-
-	/* Check ELF magic */
-	if (memcmp(ELFMAG, file->e_ident, SELFMAG) != 0)
-	{
-		return false;
-	}
-
-	/* Check ELF version */
-	if (file->e_ident[EI_VERSION] != EV_CURRENT)
-	{
-		return false;
-	}
-
-	/* Check ELF architecture, which is 32-bit/x86 right now
-	 * Should change this for 64-bit if Valve gets their act together
-	 */
-	if (file->e_ident[EI_CLASS] != ELFCLASS32 || file->e_machine != EM_386 || file->e_ident[EI_DATA] != ELFDATA2LSB)
-	{
-		return false;
-	}
-
-	/* For our purposes, this must be a dynamic library/shared object */
-	if (file->e_type != ET_DYN)
-	{
-		return false;
-	}
-
-	phdrCount = file->e_phnum;
-	phdr = reinterpret_cast<Elf32_Phdr *>(baseAddr + file->e_phoff);
-
-	for (uint16_t i = 0; i < phdrCount; i++)
-	{
-		Elf32_Phdr &hdr = phdr[i];
-
-		/* We only really care about the segment with executable code */
-		if (hdr.p_type == PT_LOAD && hdr.p_flags == (PF_X|PF_R))
-		{
-			/* From glibc, elf/dl-load.c:
-			 * c->mapend = ((ph->p_vaddr + ph->p_filesz + GLRO(dl_pagesize) - 1) 
-			 *             & ~(GLRO(dl_pagesize) - 1));
-			 *
-			 * In glibc, the segment file size is aligned up to the nearest page size and
-			 * added to the virtual address of the segment. We just want the size here.
-			 */
-			lib.memorySize = PAGE_ALIGN_UP(hdr.p_filesz);
-			break;
-		}
-	}
-
-#elif defined PLATFORM_APPLE
-
-	Dl_info info;
-	struct mach_header *file;
-	struct segment_command *seg;
-	uint32_t cmd_count;
-
-	if (!dladdr(libPtr, &info))
-	{
-		return false;
-	}
-
-	if (!info.dli_fbase || !info.dli_fname)
-	{
-		return false;
-	}
-
-	/* This is for our insane sanity checks :o */
-	baseAddr = (uintptr_t)info.dli_fbase;
-	file = (struct mach_header *)baseAddr;
-
-	/* Check Mach-O magic */
-	if (file->magic != MH_MAGIC)
-	{
-		return false;
-	}
-
-	/* Check architecture (32-bit/x86) */
-	if (file->cputype != CPU_TYPE_I386 || file->cpusubtype != CPU_SUBTYPE_I386_ALL)
-	{
-		return false;
-	}
-
-	/* For our purposes, this must be a dynamic library */
-	if (file->filetype != MH_DYLIB)
-	{
-		return false;
-	}
-
-	cmd_count = file->ncmds;
-	seg = (struct segment_command *)(baseAddr + sizeof(struct mach_header));
-	
-	/* Add up memory sizes of mapped segments */
-	for (uint32_t i = 0; i < cmd_count; i++)
-	{		
-		if (seg->cmd == LC_SEGMENT)
-		{
-			lib.memorySize += seg->vmsize;
-		}
-		
-		seg = (struct segment_command *)((uintptr_t)seg + seg->cmdsize);
-	}
-
-#endif
-
-	lib.baseAddress = reinterpret_cast<void *>(baseAddr);
-
-	return true;
-}