Added hack to make plugins open a menu with all possible targets on ReplyToTargetError COMMAND_TARGET_AMBIGUOUS.

Explanation:
There are two clients in the server, one named gene, the other one "Ene ~special characters~".
An admin issues "sm_slay Ene" and gets following error message: More than one client matched the given pattern.
What this hack will do is: Use GetCmdArg(0, ...); to get the command name "sm_slay".
Use GetCmdArgString(...); to get the arguments supplied to the command.
Use GetLastProcessTargetString(...); (which was implemented in this commit) to retrieve the arguments that were passed to the last ProcessTargetString call.
It will then pass this data to the DynamicTargeting plugin through its AmbiguousMenu native.
The plugin will open up a menu on the client and list all targets which match the pattern that was supplied to ProcessTargetString.
If the client selects a menu entry, FakeClientCommand will be used to re-execute the command with the correct target.

.arcconfig

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

.github/CONTRIBUTING.md

@@ -0,0 +1,74 @@
+# Contributing to SourceMod
+
+## Issue reports
+
+Please consider the following guidelines when reporting an issue.
+
+#### Not for general support
+This is not the right place to get help with using or installing SourceMod, or for issues with specific, third-party SourceMod plugins or extensions.
+
+For help with SourceMod, please consult the [AlliedModders forums](https://forums.alliedmods.net/forumdisplay.php?f=52). Similarly, for assistance with, or to report issues with, third-party SourceMod plugins or extensions, you should post in the existing thread for that plugin or extension on the [AlliedModders forums](https://forums.alliedmods.net/forumdisplay.php?f=52).
+
+#### Details, details, details
+Provide as much detail as possible when reporting an issue.
+
+For bugs or other undesired behavior, answers to the following questions are a great start:
+* What is the issue?
+* What behavior are you expecting instead?
+* On what operating system is the game server running?
+* What game is the game server running?
+* What exact version (full x.y.z.a version number) of Metamod:Source and SourceMod are installed on the game server?
+* What is the specific, shortest path to reproducing this issue? If this issue can be reproduced with plugin code, please try to shorten it to the minimum required to trigger the problem.
+ 
+If this is a feature request, the following are helpful. Generally, not all will apply, but whatever you can answer ahead of time will shorten back and forth conversation.
+* What is your end goal, or what are you trying to accomplish?
+* Why is this necessary, or what benefit do you see with it?
+* Will this be useful to others?
+
+#### Issues with security implications
+Please report any security bugs to [[email protected]](mailto:[email protected]) rather than to this public issue tracker.
+
+#### We're only human
+Please keep in mind that we maintain this project in our spare time, at no cost. There is no SLA, and you are not owed a response or a fix.
+
+#### Conduct
+Please refer to the [AlliedModders forum rules.](https://forums.alliedmods.net/misc.php?do=showrules)
+
+## Pull Requests
+
+Firstly, thank you for considering contributing changes to the project!
+
+However, if this is anything more than a small fix such as a gamedata update, a glaring code flaw, or a simple typo in a file like this one, please file an issue first so that it can be discussed, unless you have already spoken to multiple members of the development team about it on IRC or the AlliedModders forums.
+
+We don't like to have to reject pull requests, so we want to avoid those scenarios. We wouldn't want you to feel like you wasted your time writing something only for us to shoot it down.
+
+#### Rejection
+*Copied from Phabricator's [Contributing Code guidelines](https://secure.phabricator.com/book/phabcontrib/article/contributing_code/#rejecting-patches), as we largely feel the same way about this.*
+
+> If you send us a patch without coordinating it with us first, it will probably be immediately rejected, or sit in limbo for a long time and eventually be rejected. The reasons we do this vary from patch to patch, but some of the most common reasons are:
+>
+> **Unjustifiable Costs**: We support code in the upstream forever. Support is enormously expensive and takes up a huge amount of our time. The cost to support a change over its lifetime is often 10x or 100x or 1000x greater than the cost to write the first version of it. Many uncoordinated patches we receive are "white elephants", which would cost much more to maintain than the value they provide.
+> 
+> As an author, it may look like you're giving us free work and we're rejecting it as too expensive, but this viewpoint doesn't align with the reality of a large project which is actively supported by a small, experienced team. Writing code is cheap; maintaining it is expensive.
+>
+> By coordinating with us first, you can make sure the patch is something we consider valuable enough to put long-term support resources behind, and that you're building it in a way that we're comfortable taking over.
+> 
+> **Not a Good Fit**: Many patches aren't good fits for the upstream: they implement features we simply don't want. You can find more information in Contributing Feature Requests. Coordinating with us first helps make sure we're on the same page and interested in a feature.
+>
+> The most common type of patch along these lines is a patch which adds new configuration options. We consider additional configuration options to have an exceptionally high lifetime support cost and are very unlikely to accept them. Coordinate with us first.
+> 
+> **Not a Priority**: If you send us a patch against something which isn't a priority, we probably won't have time to look at it. We don't give special treatment to low-priority issues just because there's code written: we'd still be spending time on something lower-priority when we could be spending it on something higher-priority instead.
+> 
+> If you coordinate with us first, you can make sure your patch is in an area of the codebase that we can prioritize.
+> 
+> **Overly Ambitious Patches**: Sometimes we'll get huge patches from new contributors. These can have a lot of fundamental problems and require a huge amount of our time to review and correct. If you're interested in contributing, you'll have more success if you start small and learn as you go.
+> 
+> We can help you break a large change into smaller pieces and learn how the codebase works as you proceed through the implementation, but only if you coordinate with us first.
+> 
+> **Generality**: We often receive several feature requests which ask for similar features, and can come up with a general approach which covers all of the use cases. If you send us a patch for your use case only, the approach may be too specific. When a cleaner and more general approach is available, we usually prefer to pursue it.
+> 
+> By coordinating with us first, we can make you aware of similar use cases and opportunities to generalize an approach. These changes are often small, but can have a big impact on how useful a piece of code is.
+> 
+> **Infrastructure and Sequencing**: Sometimes patches are written against a piece of infrastructure with major planned changes. We don't want to accept these because they'll make the infrastructure changes more difficult to implement.
+> 
+> Coordinate with us first to make sure a change doesn't need to wait on other pieces of infrastructure. We can help you identify technical blockers and possibly guide you through resolving them if you're interested.

.github/FUNDING.yml

@@ -0,0 +1,8 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+custom: https://www.sourcemod.net/donate.php

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,26 @@
+# Help us help you
+  - [ ] I have checked that my issue [doesn't exist yet](https://github.com/alliedmodders/sourcemod/issues).
+  - [ ] I have tried my absolute best to reduce the problem-space and have provided the absolute smallest test-case possible.
+  - [ ] I can always reproduce the issue with the provided description below.
+
+# Environment
+  * Operating System version: 
+  * Game/AppID (with version if applicable): 
+  * Current SourceMod version: 
+  * Current SourceMod snapshot: 
+  * Current Metamod: Source snapshot:
+  - [ ] I have updated SourceMod to the [latest version](https://www.sourcemod.net/downloads.php) and it still happens.
+  - [ ] I have updated SourceMod to the [latest snapshot](https://www.sourcemod.net/downloads.php?branch=dev) and it still happens.
+  - [ ] I have updated SourceMM to the [latest snapshot](https://sourcemm.net/downloads.php?branch=dev) and it still happens.
+
+# Description
+
+
+# Problematic Code (or Steps to Reproduce)
+  ```
+  // TODO(you): code here to reproduce the problem
+  ```
+
+# Logs
+* Please attach in separate files: game output, library logs, kernel logs, and any other supporting information.
+* In case of a crash, please attach minidump or dump analyze output.

.gitignore

@@ -0,0 +1,38 @@
+# 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
+*.gdb_history

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "public/amtl"]
+	path = public/amtl
+	url = https://github.com/alliedmodders/amtl
+[submodule "sourcepawn"]
+	path = sourcepawn
+	url = https://github.com/alliedmodders/sourcepawn

.travis.yml

@@ -0,0 +1,118 @@
+git:
+  depth: 3
+
+sudo: false
+language: cpp
+os: linux
+dist: trusty
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-trusty-3.9
+      - llvm-toolchain-trusty-4.0
+      - llvm-toolchain-trusty-5.0
+    packages:
+      - lib32stdc++6
+      - lib32z1-dev
+      - libc6-dev-i386
+      - linux-libc-dev
+      - g++-multilib
+#      - clang-3.6
+#      - clang-3.8
+#      - clang-4.0
+#      - clang-5.0
+#      - g++-6
+#      - g++-6-multilib
+      - clang-3.9
+      - g++-4.8-multilib
+      - g++-4.8
+      - g++-4.9-multilib
+      - g++-4.9
+      - g++-5-multilib
+      - g++-5
+      - g++-7-multilib
+      - g++-7
+    cache:
+      directories:
+        - ../mysql-5.0
+env:
+ - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
+ - MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
+ - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+ - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+ - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+
+matrix:
+  fast_finish: true
+  include:
+    - os: linux
+      sudo: false
+      language: cpp
+      addons:
+        apt:
+          packages: ['clang-3.6', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
+        cache:
+          directories: ['../mysql-5.0']
+      env: ['MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6"']
+
+    - os: linux
+      sudo: false
+      language: cpp
+      addons:
+        apt:
+          packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
+        cache:
+          directories: ['../mysql-5.0']
+      env: ['MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"']
+
+    - os: linux
+      sudo: false
+      language: cpp
+      addons:
+        apt:
+          sources: ['llvm-toolchain-trusty-4.0']
+          packages: ['clang-4.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
+        cache:
+          directories: ['../mysql-5.0']
+      env: ['MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"']
+
+    - os: linux
+      sudo: false
+      language: cpp
+      addons:
+        apt:
+          sources: ['llvm-toolchain-trusty-5.0']
+          packages: ['clang-5.0', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
+        cache:
+          directories: ['../mysql-5.0']
+      env: ['MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"']
+
+    - os: linux
+      sudo: false
+      language: cpp
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-6', 'g++-6-multilib', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev', 'g++-multilib']
+        cache:
+          directories: ['../mysql-5.0']
+      env: ['MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"']
+
+  allow_failures:
+    - env: MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7"
+    - env: MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9"
+    - env: MATRIX_EVAL="CC=gcc-4.8 && CXX=g++-4.8"
+    - env: MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
+    - env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
+    - env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+
+
+before_script:
+  - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh && cd $CHECKOUT_DIR
+script:
+  - mkdir build && cd build
+  - PATH="~/.local/bin:$PATH"
+  - eval "${MATRIX_EVAL}"
+  - python ../configure.py --enable-optimize --sdks=episode1,css,tf2,l4d2,csgo,dota
+  - ambuild

AMBuildScript

@@ -0,0 +1,671 @@
+# 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
+    self.platformSpec = platform
+
+    # By default, nothing supports x64.
+    if type(platform) is list:
+      self.platformSpec = {p: ['x86'] for p in platform}
+    else:
+      self.platformSpec = platform
+
+  def shouldBuild(self, target, archs):
+    if target.platform not in self.platformSpec:
+      return False
+    if not len([i for i in self.platformSpec[target.platform] if i in archs]):
+      return False
+    return True
+
+WinOnly = ['windows']
+WinLinux = ['windows', 'linux']
+WinLinuxMac = ['windows', 'linux', 'mac']
+CSGO = {
+  'windows': ['x86'],
+  'linux': ['x86', 'x64'],
+  'mac': ['x64']
+}
+
+PossibleSDKs = {
+  'episode1':  SDK('HL2SDK', '2.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', '11', 'TF2', WinLinuxMac, 'tf2'),
+  'l4d':  SDK('HL2SDKL4D', '2.l4d', '12', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
+  'nucleardawn': SDK('HL2SDKND', '2.nd', '13', 'NUCLEARDAWN', WinLinuxMac, 'nucleardawn'),
+  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '15', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
+  'darkm':  SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
+  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '16', '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', '21', 'CSGO', CSGO, 'csgo'),
+  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '17', 'PORTAL2', [], 'portal2'),
+  'blade':  SDK('HL2SDKBLADE', '2.blade', '18', 'BLADE', WinLinux, 'blade'),
+  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
+  'contagion':  SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
+  'bms':  SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
+  'doi':  SDK('HL2SDKDOI', '2.doi', '20', 'DOI', WinLinuxMac, 'doi'),
+}
+
+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))
+  
+def SetArchFlags(compiler, arch, platform):
+  if compiler.behavior == 'gcc':
+    if arch == 'x86':
+      compiler.cflags += ['-m32']
+      compiler.linkflags += ['-m32']
+      if platform == 'mac':
+        compiler.linkflags += ['-arch', 'i386']
+    elif arch == 'x64':
+      compiler.cflags += ['-m64', '-fPIC']
+      compiler.linkflags += ['-m64']
+      if platform == 'mac':
+        compiler.linkflags += ['-arch', 'x86_64']
+  elif compiler.like('msvc'):
+    if builder.target.arch == 'x86':
+      compiler.linkflags += ['/MACHINE:X86']
+    elif builder.target.arch == 'x64':
+      compiler.linkflags += ['/MACHINE:X64']
+
+def AppendArchSuffix(binary, name, arch):
+  if arch == 'x64':
+    binary.localFolder = name + '.x64'
+
+class SMConfig(object):
+  def __init__(self):
+    self.sdks = {}
+    self.binaries = []
+    self.extensions = []
+    self.generated_headers = None
+    self.mms_root = None
+    self.mysql_root = {}
+    self.spcomp = None
+    self.spcomp_bins = None
+    self.smx_files = {}
+    self.versionlib = None
+    self.archs = builder.target.arch.replace('x86_64', 'x64').split(',')
+
+  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 sdk.shouldBuild(builder.target, self.archs):
+        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 and len(sdk_list):
+      raise Exception('No SDKs were found that build on {0}-{1}, nothing to do.'.format(
+        builder.target.platform, builder.target.arch))
+
+    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['x86'] = builder.options.mysql_path
+      else:
+        for i in range(10):
+          self.mysql_root['x86'] = ResolveEnvPath('MYSQL55', 'mysql-5.' + str(i))
+          if self.mysql_root['x86']:
+            break
+      if not self.mysql_root['x86'] or not os.path.isdir(self.mysql_root['x86']):
+        raise Exception('Could not find a path to MySQL!')
+      self.mysql_root['x86'] = Normalize(self.mysql_root['x86'])
+
+      # For now, ignore 64-bit MySQL on Windows
+      if 'x64' in self.archs and builder.target.platform != 'windows':
+        if builder.options.mysql64_path:
+          self.mysql_root['x64'] = builder.options.mysql64_path
+        else:
+          for i in range(10):
+            self.mysql_root['x64'] = ResolveEnvPath('MYSQL55_64', 'mysql-5.' + str(i) + '-x86_64')
+            if self.mysql_root['x64']:
+              break
+        if not self.mysql_root['x64'] or not os.path.isdir(self.mysql_root['x64']):
+          raise Exception('Could not find a path to 64-bit MySQL!')
+        self.mysql_root['x64'] = Normalize(self.mysql_root['x64'])
+
+  def configure(self):
+    builder.AddConfigureFile('pushbuild.txt')
+    
+    if not set(self.archs).issubset(['x86', 'x64']):
+      raise Exception('Unknown target architecture: {0}'.format(builder.target.arch))
+
+    cxx = builder.DetectCxx()
+    
+    if cxx.like('msvc') and len(self.archs) > 1:
+      raise Exception('Building multiple archs with MSVC is not currently supported')
+
+    if cxx.like('gcc'):
+      self.configure_gcc(cxx)
+    elif cxx.family == 'msvc':
+      self.configure_msvc(cxx)
+
+    # Optimizaiton
+    if builder.options.opt == '1':
+      cxx.defines += ['NDEBUG']
+
+    # Debugging
+    if builder.options.debug == '1':
+      cxx.defines += ['DEBUG', '_DEBUG']
+
+    # Platform-specifics
+    if builder.target.platform == 'linux':
+      self.configure_linux(cxx)
+    elif builder.target.platform == 'mac':
+      self.configure_mac(cxx)
+    elif builder.target.platform == 'windows':
+      self.configure_windows(cxx)
+
+    # Finish up.
+    cxx.defines += [
+      'SOURCEMOD_BUILD',
+      'SM_USE_VERSIONLIB',
+    ]
+    cxx.includes += [
+      os.path.join(builder.sourcePath, 'public'),
+    ]
+    if self.use_auto_versioning():
+      cxx.defines += ['SM_GENERATED_BUILD']
+      cxx.includes += [
+        os.path.join(builder.buildPath, 'includes'),
+        os.path.join(builder.sourcePath, 'versionlib'),
+      ]
+
+  def configure_gcc(self, cxx):
+    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',
+      '-fvisibility=hidden',
+    ]
+    cxx.cxxflags += [
+      '-std=c++11',
+      '-fno-exceptions',
+      '-fno-threadsafe-statics',
+      '-Wno-non-virtual-dtor',
+      '-Wno-overloaded-virtual',
+      '-fvisibility-inlines-hidden',
+    ]
+
+    have_gcc = cxx.family == 'gcc'
+    have_clang = cxx.family == 'clang'
+    if cxx.version >= 'clang-3.9':
+      cxx.cxxflags += ['-Wno-expansion-to-defined']
+    if cxx.version == 'clang-3.9' or cxx.version == 'apple-clang-8.0':
+      cxx.cflags += ['-Wno-varargs']
+    if cxx.version >= 'clang-3.6' or cxx.version >= 'apple-clang-7.0':
+      cxx.cxxflags += ['-Wno-inconsistent-missing-override']
+    if cxx.version >= 'clang-2.9' or cxx.version >= 'apple-clang-3.0':
+      cxx.cxxflags += ['-Wno-null-dereference']
+    if have_clang or (cxx.version >= 'gcc-4.6'):
+      cxx.cflags += ['-Wno-narrowing']
+    if have_clang or (cxx.version >= 'gcc-4.7'):
+      cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
+    if cxx.version >= 'gcc-4.8':
+      cxx.cflags += ['-Wno-unused-result']
+    if cxx.version >= 'gcc-9.0':
+      cxx.cxxflags += ['-Wno-class-memaccess', '-Wno-packed-not-aligned']
+    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']
+
+    if have_gcc:
+      cxx.cflags += ['-mfpmath=sse']
+      cxx.cflags += ['-Wno-maybe-uninitialized']
+
+    if builder.options.opt == '1':
+      cxx.cflags += ['-O3']
+
+  def configure_msvc(self, cxx):
+    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',
+    ]
+    cxx.cflags += [
+      '/W3',
+    ]
+    cxx.cxxflags += [
+      '/EHsc',
+      '/GR-',
+      '/TP',
+    ]
+    cxx.linkflags += [
+      'kernel32.lib',
+      'user32.lib',
+      'gdi32.lib',
+      'winspool.lib',
+      'comdlg32.lib',
+      'advapi32.lib',
+      'shell32.lib',
+      'ole32.lib',
+      'oleaut32.lib',
+      'uuid.lib',
+      'odbc32.lib',
+      'odbccp32.lib',
+    ]
+
+    if builder.options.opt == '1':
+      cxx.cflags += ['/Ox', '/Zo']
+      cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
+
+    if builder.options.debug == '1':
+      cxx.cflags += ['/Od', '/RTC1']
+
+    # This needs to be after our optimization flags which could otherwise disable it.
+    # Don't omit the frame pointer.
+    cxx.cflags += ['/Oy-']
+
+  def configure_linux(self, cxx):
+    cxx.defines += ['_LINUX', 'POSIX', '_FILE_OFFSET_BITS=64']
+    cxx.linkflags += ['-lm']
+    if cxx.family == 'gcc':
+      cxx.linkflags += ['-static-libgcc']
+    elif cxx.family == 'clang':
+      cxx.linkflags += ['-lgcc_eh']
+
+  def configure_mac(self, cxx):
+    cxx.defines += ['OSX', '_OSX', 'POSIX', 'KE_ABSOLUTELY_NO_STL']
+    cxx.cflags += ['-mmacosx-version-min=10.5']
+    cxx.linkflags += [
+      '-mmacosx-version-min=10.5',
+      '-lstdc++',
+      '-stdlib=libstdc++',
+    ]
+    cxx.cxxflags += ['-stdlib=libstdc++']
+
+  def configure_windows(self, cxx):
+    cxx.defines += ['WIN32', '_WINDOWS']
+
+  def AddVersioning(self, binary, arch):
+    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[arch]]
+      binary.compiler.sourcedeps += SM.generated_headers
+    return binary
+    
+  def LibraryBuilder(self, compiler, name, arch):
+    binary = compiler.Library(name)
+    AppendArchSuffix(binary, name, arch)
+    self.AddVersioning(binary, arch)
+    if binary.compiler.like('msvc'):
+      binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS']
+    return binary
+
+  def ProgramBuilder(self, compiler, name, arch):
+    binary = compiler.Program(name)
+    AppendArchSuffix(binary, name, arch)
+    self.AddVersioning(binary, arch)
+    if '-static-libgcc' in binary.compiler.linkflags:
+      binary.compiler.linkflags.remove('-static-libgcc')
+    if '-lgcc_eh' in binary.compiler.linkflags:
+      binary.compiler.linkflags.remove('-lgcc_eh')
+    if binary.compiler.like('gcc'):
+      binary.compiler.linkflags += ['-lstdc++', '-lpthread']
+    if binary.compiler.like('msvc'):
+      binary.compiler.linkflags += ['/SUBSYSTEM:CONSOLE']
+    return binary
+    
+  def StaticLibraryBuilder(self, compiler, name, arch):
+    binary = compiler.StaticLibrary(name)
+    AppendArchSuffix(binary, name, arch)
+    return binary;
+
+  def Library(self, context, name, arch):
+    compiler = context.cxx.clone()
+    SetArchFlags(compiler, arch, builder.target.platform)
+    return self.LibraryBuilder(compiler, name, arch)
+
+  def Program(self, context, name, arch):
+    compiler = context.cxx.clone()
+    SetArchFlags(compiler, arch, builder.target.platform)
+    return self.ProgramBuilder(compiler, name, arch)
+    
+  def StaticLibrary(self, context, name, arch):
+    compiler = context.cxx.clone()
+    SetArchFlags(compiler, arch, builder.target.platform)
+    return self.StaticLibraryBuilder(compiler, name, arch)
+
+  def ConfigureForExtension(self, context, compiler):
+    compiler.cxxincludes += [
+      os.path.join(context.currentSourcePath),
+      os.path.join(context.currentSourcePath, 'sdk'),
+      os.path.join(builder.sourcePath, 'public', 'extensions'),
+      os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
+      os.path.join(builder.sourcePath, 'public', 'amtl', 'amtl'),
+      os.path.join(builder.sourcePath, 'public', 'amtl'),
+    ]
+    return compiler
+
+  def ExtLibrary(self, context, name, arch):
+    binary = self.Library(context, name, arch)
+    self.ConfigureForExtension(context, binary.compiler)
+    return binary
+
+  def ConfigureForHL2(self, binary, sdk, arch):
+    compiler = binary.compiler
+    
+    SetArchFlags(compiler, arch, builder.target.platform)
+
+    compiler.cxxincludes += [
+      os.path.join(self.mms_root, 'core'),
+      os.path.join(self.mms_root, 'core', '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 in ['sdk2013', 'bms'] 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']
+      if compiler.version >= 1900:
+        compiler.linkflags += ['legacy_stdio_definitions.lib']
+    else:
+      compiler.defines += ['COMPILER_GCC']
+
+    if arch == 'x64':
+      compiler.defines += ['X64BITS', 'PLATFORM_64BITS']
+
+    # 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', 'doi', 'csgo']:
+      compiler.defines += ['NETWORK_VARS_ENABLED']
+
+    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']:
+      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++']
+      compiler.defines += ['_GLIBCXX_USE_CXX11_ABI=0']
+
+    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 in ['sdk2013', 'bms']:
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
+      elif arch == 'x64':
+        lib_folder = os.path.join(sdk.path, 'lib', 'linux64')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'linux')
+    elif builder.target.platform == 'mac':
+      if sdk.name in ['sdk2013', 'bms']:
+        lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32')
+      elif arch == 'x64':
+        lib_folder = os.path.join(sdk.path, 'lib', 'osx64')
+      else:
+        lib_folder = os.path.join(sdk.path, 'lib', 'mac')
+
+    if builder.target.platform in ['linux', 'mac']:
+      if sdk.name in ['sdk2013', 'bms'] or arch == 'x64':
+        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', 'doi', 'csgo']:
+        if arch == 'x64':
+          compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces.a'))]
+        else:
+          compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
+
+    dynamic_libs = []
+    if builder.target.platform == 'linux':
+      if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
+        dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
+      elif arch == 'x64' and sdk.name == 'csgo':
+        dynamic_libs = ['libtier0_client.so', 'libvstdlib_client.so']
+      elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']:
+        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', 'doi', 'csgo']:
+        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, arch):
+    binary = self.Library(context, name, arch)
+    self.ConfigureForExtension(context, binary.compiler)
+    return self.ConfigureForHL2(binary, sdk, arch)
+
+  def HL2Project(self, context, name):
+    project = context.cxx.LibraryProject(name)
+    self.ConfigureForExtension(context, project.compiler)
+    return project
+
+  def HL2Config(self, project, name, sdk, arch):
+    binary = project.Configure(name, '{0} - {1}'.format(self.tag, sdk.name))
+    AppendArchSuffix(binary, name, arch)
+    self.AddVersioning(binary, arch)
+    return self.ConfigureForHL2(binary, sdk, arch)
+
+SM = SMConfig()
+SM.detectProductVersion()
+SM.detectSDKs()
+SM.configure()
+
+if SM.use_auto_versioning():
+  SM.generated_headers = builder.Build(
+    'tools/buildbot/Versioning',
+    { 'SM': SM }
+  )
+  SM.versionlib = builder.Build(
+    'versionlib/AMBuilder',
+    { 'SM': SM }
+  )
+
+# Build SourcePawn externally.
+SP = builder.Build('sourcepawn/AMBuildScript', {
+  'external_root': SM,
+  'external_amtl': os.path.join(builder.sourcePath, 'public', 'amtl'),
+  'external_build': ['core'],
+})
+if len(SP.spcomp) > 1:
+  SM.spcomp = SP.spcomp['x86']
+else:
+  SM.spcomp = SP.spcomp[list(SP.spcomp.keys())[0]]
+SM.spcomp_bins = list(SP.spcomp.values())
+for arch in SM.archs:
+  SM.binaries += [
+     SP.libsourcepawn[arch]
+  ]
+
+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',
+]
+
+if builder.backend == 'amb2':
+  BuildScripts += [
+    'plugins/AMBuilder',
+    'tools/buildbot/PackageScript',
+  ]
+
+builder.Build(BuildScripts, { 'SM': SM })
+
+if builder.options.breakpad_dump:
+  builder.Build('tools/buildbot/BreakpadSymbols', { 'SM': SM })

NOTICE.txt

@@ -1,21 +0,0 @@
-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

@@ -0,0 +1,27 @@
+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
+- [Stable builds](http://www.sourcemod.net/downloads.php?branch=stable): The latest stable SourceMod releases
+- [Dev builds](http://www.sourcemod.net/downloads.php?branch=dev): Builds of recent development versions
+ 
+Development
+-----------
+- [Issue tracker](https://github.com/alliedmodders/sourcemod/issues): 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 plugin API](https://sm.alliedmods.net/new-api): Online SourceMod plugin API reference generated from the include files
+- [SourceMod extension development](https://wiki.alliedmods.net/Category:SourceMod_Development): C++ examples and introduction to various extension interfaces
+
+Contact
+-------
+- Connect with us on [GameSurge](https://gamesurge.net) IRC in #sourcemod
+- Alternatively feel free to join our [Discord](https://discord.gg/HgZctSS) server
+
+License
+-------
+SourceMod is licensed under the GNU General Public License version 3. Special exceptions are outlined in the LICENSE.txt file inside of the licenses folder.

bridge/include/BridgeAPI.h

@@ -0,0 +1,46 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_API_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_API_H_
+
+#include <bridge/include/CoreProvider.h>
+#include <bridge/include/LogicProvider.h>
+#include <stdint.h>
+
+namespace SourceMod {
+
+// Add 1 to the RHS of this expression to bump the intercom file
+// This is to prevent mismatching core/logic binaries
+static const uint32_t SM_LOGIC_MAGIC = 0x0F47C0DE - 57;
+
+} // namespace SourceMod
+
+typedef void (*LogicInitFunction)(SourceMod::CoreProvider *core, SourceMod::sm_logic_t *logic);
+typedef LogicInitFunction (*LogicLoadFunction)(uint32_t magic);
+typedef SourceMod::ITextParsers *(*GetITextParsers)();
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_API_H_

bridge/include/CoreProvider.h

@@ -0,0 +1,140 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_CORE_PROVIDER_API_H_
+#define _INCLUDE_SOURCEMOD_CORE_PROVIDER_API_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <IAdminSystem.h>
+#include <amtl/am-function.h>
+
+namespace SourcePawn {
+class ISourcePawnEngine;
+class ISourcePawnEngine2;
+} // namespace SourcePawn
+
+// SDK types.
+#if defined(SM_LOGIC)
+class ConCommandBase {};
+class ConVar : public ConCommandBase {};
+#else
+class ConCommandBase;
+class ConVar;
+#endif
+class KeyValues;
+
+struct ServerGlobals
+{
+	const double *universalTime;
+	float *interval_per_tick;
+	float *frametime;
+};
+
+namespace SourceMod {
+
+class ISourceMod;
+class IVEngineServerBridge;
+class IFileSystemBridge;
+class ITimerSystem;
+class IPlayerManager;
+class IGameHelpers;
+class IMenuManager;
+struct DatabaseInfo;
+class IPlayerInfoBridge;
+class ICommandArgs;
+
+typedef ke::Lambda<bool(int client, const ICommandArgs*)> CommandFunc;
+
+class CoreProvider
+{
+public:
+	/* Objects */
+	ISourceMod		*sm;
+	IVEngineServerBridge *engine;
+	IFileSystemBridge *filesystem;
+	IPlayerInfoBridge *playerInfo;
+	ITimerSystem    *timersys;
+	IPlayerManager  *playerhelpers;
+	IGameHelpers    *gamehelpers;
+	IMenuManager	*menus;
+	SourcePawn::ISourcePawnEngine **spe1;
+	SourcePawn::ISourcePawnEngine2 **spe2;
+	const char		*gamesuffix;
+	/* Data */
+	ServerGlobals   *serverGlobals;
+	void *          serverFactory;
+	void *          engineFactory;
+	void *          matchmakingDSFactory;
+	SMGlobalClass *	listeners;
+
+	// ConVar functions.
+	virtual ConVar *FindConVar(const char *name) = 0;
+	virtual const char *GetCvarString(ConVar *cvar) = 0;
+	virtual bool GetCvarBool(ConVar* cvar) = 0;
+
+	// Command functions.
+	virtual void DefineCommand(const char *cmd, const char *help, const CommandFunc &callback) = 0;
+
+	// Game description functions.
+	virtual bool GetGameName(char *buffer, size_t maxlength) = 0;
+	virtual const char *GetGameDescription() = 0;
+	virtual const char *GetSourceEngineName() = 0;
+	virtual bool SymbolsAreHidden() = 0;
+
+	// Game state and helper functions.
+	virtual bool IsMapLoading() = 0;
+	virtual bool IsMapRunning() = 0;
+	virtual int MaxClients() = 0;
+	virtual bool DescribePlayer(int index, const char **namep, const char **authp, int *useridp) = 0;
+	virtual void LogToGame(const char *message) = 0;
+	virtual void ConPrint(const char *message) = 0;
+	virtual void ConsolePrint(const char *fmt, ...) = 0;
+	virtual void ConsolePrintVa(const char *fmt, va_list ap) = 0;
+
+	// Game engine helper functions.
+	virtual bool IsClientConVarQueryingSupported() = 0;
+	virtual int QueryClientConVar(int client, const char *cvar) = 0;
+
+	// Metamod:Source functions.
+	virtual int LoadMMSPlugin(const char *file, bool *ok, char *error, size_t maxlength) = 0;
+	virtual void UnloadMMSPlugin(int id) = 0;
+
+	const char *	(*GetCoreConfigValue)(const char*);
+	void			(*DoGlobalPluginLoads)();
+	bool			(*AreConfigsExecuted)();
+	void			(*ExecuteConfigs)(IPluginContext *ctx);
+	void			(*GetDBInfoFromKeyValues)(KeyValues *, DatabaseInfo *);
+	int				(*GetActivityFlags)();
+	int				(*GetImmunityMode)();
+	void			(*UpdateAdminCmdFlags)(const char *cmd, OverrideType type, FlagBits bits, bool remove);
+	bool			(*LookForCommandAdminFlags)(const char *cmd, FlagBits *pFlags);
+	int             (*GetGlobalTarget)();
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_CORE_PROVIDER_API_H_

bridge/include/IExtensionBridge.h

@@ -0,0 +1,81 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IEXTBRIDGE_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IEXTBRIDGE_H_
+
+#include <sp_vm_api.h>
+#include <IExtensionSys.h>
+#include <sh_vector.h>
+
+struct edict_t;
+
+namespace SourceMod {
+
+using namespace SourceHook;
+using namespace SourcePawn;
+class SMPlugin;
+
+class IExtensionSys : public IExtensionManager
+{
+public:
+	virtual IExtension *LoadAutoExtension(const char *name, bool bErrorOnMissing=true) = 0;
+	virtual void TryAutoload() = 0;
+	virtual void Shutdown() = 0;
+	virtual IExtension *FindExtensionByFile(const char *name) = 0;
+	virtual bool LibraryExists(const char *name) = 0;
+	virtual void CallOnCoreMapStart(edict_t *edictList, int edictCount, int maxClients) = 0;
+	virtual IExtension *GetExtensionFromIdent(IdentityToken_t *token) = 0;
+	virtual void BindChildPlugin(IExtension *ext, SMPlugin *plugin) = 0;
+	virtual void AddRawDependency(IExtension *myself, IdentityToken_t *token, void *iface) = 0;
+	virtual const CVector<IExtension *> *ListExtensions() = 0;
+	virtual void FreeExtensionList(const CVector<IExtension *> *list) = 0;
+	virtual void CallOnCoreMapEnd() = 0;
+};
+
+class AutoExtensionList
+{
+public:
+	AutoExtensionList(IExtensionSys *extensions)
+		: extensions_(extensions), list_(extensions_->ListExtensions())
+	{
+	}
+	~AutoExtensionList()
+	{
+		extensions_->FreeExtensionList(list_);
+	}
+	const CVector<IExtension *> *operator ->()
+	{
+		return list_;
+	}
+private:
+	IExtensionSys *extensions_;
+	const CVector<IExtension *> *list_;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IEXTBRIDGE_H_

bridge/include/IFileSystemBridge.h

@@ -0,0 +1,63 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_
+
+typedef void * FileHandle_t;
+typedef int FileFindHandle_t; 
+
+namespace SourceMod {
+
+class IFileSystemBridge
+{
+public:
+	virtual const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle) = 0;
+	virtual const char *FindNext(FileFindHandle_t handle) = 0;
+	virtual bool FindIsDirectory(FileFindHandle_t handle) = 0;
+	virtual void FindClose(FileFindHandle_t handle) = 0;
+	virtual FileHandle_t Open(const char *pFileName, const char *pOptions, const char *pathID = 0) = 0;
+	virtual void Close(FileHandle_t file) = 0;
+	virtual char *ReadLine(char *pOutput, int maxChars, FileHandle_t file) = 0;
+	virtual bool EndOfFile(FileHandle_t file) = 0;
+	virtual bool FileExists(const char *pFileName, const char *pPathID = 0) = 0;
+	virtual unsigned int Size(const char *pFileName, const char *pPathID = 0) = 0;
+	virtual int Read(void* pOutput, int size, FileHandle_t file) = 0;
+	virtual int Write(void const* pInput, int size, FileHandle_t file) = 0;
+	virtual void Seek(FileHandle_t file, int post, int seekType) = 0;
+	virtual unsigned int Tell(FileHandle_t file) = 0;
+	virtual int FPrint(FileHandle_t file, const char *pData) = 0;
+	virtual void Flush(FileHandle_t file) = 0;
+	virtual bool IsOk(FileHandle_t file) = 0;
+	virtual void RemoveFile(const char *pRelativePath, const char *pathID = 0) = 0;
+	virtual void RenameFile(char const *pOldPath, char const *pNewPath, const char *pathID = 0) = 0;
+	virtual bool IsDirectory(const char *pFileName, const char *pathID = 0) = 0;
+	virtual void CreateDirHierarchy(const char *path, const char *pathID = 0) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_

bridge/include/ILogger.h

@@ -0,0 +1,43 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_LOGGER_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_LOGGER_H_
+
+namespace SourceMod {
+
+class ILogger
+{
+public:
+	virtual void LogMessage(const char *msg, ...) = 0;
+	virtual void LogError(const char *msg, ...) = 0;
+	virtual void LogFatal(const char *msg, ...) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_LOGGER_H_
+

bridge/include/IPlayerInfoBridge.h

@@ -0,0 +1,55 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPLAYERINFO_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPLAYERINFO_H_
+
+class IPlayerInfo;
+
+namespace SourceMod {
+
+class IPlayerInfoBridge
+{
+public:
+	virtual bool IsObserver(IPlayerInfo *pInfo) = 0;
+	virtual int GetTeamIndex(IPlayerInfo *pInfo) = 0;
+	virtual int GetFragCount(IPlayerInfo *pInfo) = 0;
+	virtual int GetDeathCount(IPlayerInfo *pInfo) = 0;
+	virtual int GetArmorValue(IPlayerInfo *pInfo) = 0;
+	virtual void GetAbsOrigin(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual void GetAbsAngles(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual void GetPlayerMins(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual void GetPlayerMaxs(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual const char *GetWeaponName(IPlayerInfo *pInfo) = 0;
+	virtual const char *GetModelName(IPlayerInfo *pInfo) = 0;
+	virtual int GetHealth(IPlayerInfo *pInfo) = 0;
+	virtual void ChangeTeam(IPlayerInfo *pInfo, int iTeamNum) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPLAYERINFO_H_
+

bridge/include/IProviderCallbacks.h

@@ -0,0 +1,45 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPROVIDERCALLBACK_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPROVIDERCALLBACK_H_
+
+namespace SourceMod {
+
+// Global callbacks provided to Core.
+class IProviderCallbacks
+{
+public:
+	// Called when a log message is printed. Return true to supercede.
+	virtual bool OnLogPrint(const char *msg) = 0;
+
+	// Called each frame tick.
+	virtual void OnThink(bool simulating) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPROVIDERCALLBACK_H_

bridge/include/IScriptManager.h

@@ -0,0 +1,112 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_ISCRIPTMANAGER_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_ISCRIPTMANAGER_H_
+
+#include <sp_vm_api.h>
+#include <IPluginSys.h>
+#include <sh_vector.h>
+#include <sh_string.h>
+
+namespace SourceMod {
+
+using namespace SourceHook;
+using namespace SourcePawn;
+
+class IChangeableForward;
+
+enum LibraryAction
+{
+	LibraryAction_Removed,
+	LibraryAction_Added
+};
+
+struct AutoConfig
+{
+	SourceHook::String autocfg;
+	SourceHook::String folder;
+	bool create;
+};
+
+class SMPlugin : public IPlugin
+{
+public:
+	virtual size_t GetConfigCount() = 0;
+	virtual AutoConfig *GetConfig(size_t i) = 0;
+	virtual void AddLibrary(const char *name) = 0;
+	virtual void AddConfig(bool create, const char *cfg, const char *folder) = 0;
+	virtual void EvictWithError(PluginStatus status, const char *fmt, ...) = 0;
+};
+
+class IScriptManager
+{
+public:
+	virtual void LoadAll(const char *config_path, const char *plugins_path) = 0;
+	virtual void RefreshAll() = 0;
+	virtual void Shutdown() = 0;
+	virtual IdentityToken_t *GetIdentity() = 0;
+	virtual void SyncMaxClients(int maxClients) = 0;
+	virtual void AddPluginsListener(IPluginsListener *listener) = 0;
+	virtual void RemovePluginsListener(IPluginsListener *listener) = 0;
+	virtual IPluginIterator *GetPluginIterator() = 0;
+	virtual void OnLibraryAction(const char *name, LibraryAction action) = 0;
+	virtual bool LibraryExists(const char *name) = 0;
+	virtual SMPlugin *FindPluginByOrder(unsigned num) = 0;
+	virtual SMPlugin *FindPluginByIdentity(IdentityToken_t *ident) = 0;
+	virtual SMPlugin *FindPluginByContext(IPluginContext *ctx) = 0;
+	virtual SMPlugin *FindPluginByContext(sp_context_t *ctx) = 0;
+	virtual SMPlugin *FindPluginByConsoleArg(const char *text) = 0;
+	virtual SMPlugin *FindPluginByHandle(Handle_t hndl, HandleError *errp) = 0;
+	virtual bool UnloadPlugin(IPlugin *plugin) = 0;
+	virtual const CVector<SMPlugin *> *ListPlugins() = 0;
+	virtual void FreePluginList(const CVector<SMPlugin *> *list) = 0;
+	virtual void AddFunctionsToForward(const char *name, IChangeableForward *fwd) = 0;
+};
+
+class AutoPluginList
+{
+public:
+	AutoPluginList(IScriptManager *scripts)
+		: scripts_(scripts), list_(scripts->ListPlugins())
+	{
+	}
+	~AutoPluginList()
+	{
+		scripts_->FreePluginList(list_);
+	}
+	const CVector<SMPlugin *> *operator ->()
+	{
+		return list_;
+	}
+private:
+	IScriptManager *scripts_;
+	const CVector<SMPlugin *> *list_;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_ISCRIPTMANAGER_H_

bridge/include/IVEngineServerBridge.h

@@ -0,0 +1,48 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_IVENGINESERVER_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_IVENGINESERVER_H_
+
+struct edict_t;
+
+namespace SourceMod {
+
+class IVEngineServerBridge
+{
+public:
+	virtual bool IsDedicatedServer() = 0;
+	virtual void InsertServerCommand(const char *cmd) = 0;
+	virtual void ServerCommand(const char *cmd) = 0;
+	virtual void ServerExecute() = 0;
+	virtual const char *GetClientConVarValue(int clientIndex, const char *name) = 0;
+	virtual void ClientCommand(edict_t *pEdict, const char *szCommand) = 0;
+	virtual void FakeClientCommand(edict_t *pEdict, const char *szCommand) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_IVENGINESERVER_H_

bridge/include/LogicProvider.h

@@ -0,0 +1,92 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_LOGIC_PROVIDER_API_H_
+#define _INCLUDE_SOURCEMOD_LOGIC_PROVIDER_API_H_
+
+#include <sp_vm_api.h>
+
+class SMGlobalClass;
+
+namespace SourceMod {
+
+using namespace SourcePawn;
+
+class CoreProvider;
+class IThreader;
+class ITranslator;
+class IGameConfig;
+class IScriptManager;
+class IShareSys;
+class IHandleSys;
+class ICommandArgs;
+class IForwardManager;
+class IAdminSystem;
+class IRootConsole;
+class IProviderCallbacks;
+class IExtensionSys;
+class ITextParsers;
+class ILogger;
+class ICellArray;
+
+struct sm_logic_t
+{
+	SMGlobalClass	*head;
+	IThreader		*threader;
+	ITranslator		*translator;
+	const char      *(*stristr)(const char *, const char *);
+	size_t			(*atcprintf)(char *, size_t, const char *, IPluginContext *, const cell_t *, int *);
+	bool			(*CoreTranslate)(char *,  size_t, const char *, unsigned int, size_t *, ...);
+	void            (*AddCorePhraseFile)(const char *filename);
+	unsigned int	(*ReplaceAll)(char*, size_t, const char *, const char *, bool);
+	char            *(*ReplaceEx)(char *, size_t, const char *, size_t, const char *, size_t, bool);
+	size_t          (*DecodeHexString)(unsigned char *, size_t, const char *);
+	IGameConfig *   (*GetCoreGameConfig)();
+	IDebugListener   *debugger;
+	void			(*GenerateError)(IPluginContext *, cell_t, int, const char *, ...);
+	void			(*AddNatives)(sp_nativeinfo_t *natives);
+	void            (*RegisterProfiler)(IProfilingTool *tool);
+	ICellArray *    (*CreateCellArray)(size_t blocksize);
+	void            (*FreeCellArray)(ICellArray *arr);
+	void *			(*FromPseudoAddress)(uint32_t pseudoAddr);
+	uint32_t		(*ToPseudoAddress)(void *addr);
+	IScriptManager	*scripts;
+	IShareSys		*sharesys;
+	IExtensionSys	*extsys;
+	IHandleSys		*handlesys;
+	IForwardManager	*forwardsys;
+	IAdminSystem	*adminsys;
+	IdentityToken_t *core_ident;
+	ILogger			*logger;
+	IRootConsole	*rootmenu;
+	IProviderCallbacks *callbacks;
+	float			sentinel;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_LOGIC_PROVIDER_API_H_
+

changelog.txt

@@ -0,0 +1,472 @@
+SourceMod Changelog
+
+----------------------------
+
+SourceMod 1.3.6 [2010-10-31]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.6_Release_Notes
+
+User Changes:
+
+ - Updated support for latest Left 4 Dead 1 (bug 4681).
+
+Developer Changes:
+
+ - Updated TF2 custom kill defines (bug 4682).
+
+----------------------------
+
+SourceMod 1.3.5 [2010-10-17]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.5_Release_Notes
+
+User Changes:
+
+ - Updated support for CS:S, Garry's Mod, DoD:S, TF2, HL2DM.
+ - Added support for Firearms: Source (bug 4537).
+ - Added support for Fistful of Frags (bug 3883).
+ - Added support for Alien Swarm (bug 4530).
+ - Fixed living players hearing dead players if alltalk is disabled while deadtalk is on (bug 4533, thanks Zach Callear).
+ - Fixed timeleft not getting reset on Game_Commencing in CS:S (bug 4557).
+ - Fixed PlayerRunCmd being hooked when not used (bug 3990).
+ - Fixed errors and missing effects caused by missing sprites on L4D2 (bug 4512).
+ - Fixed 'sm plugins' public command skipping plugins in recommended listing (bug 4501).
+ - Fixed corruption with large database.cfg files (bug 4286).
+
+Developer Changes:
+
+ - Added TF2 object stocks (bug 4536).
+ - Added TF2_MakeBleed native to TF2 ext (bug 4542).
+ - Added support for logical entities in Synergy (bug 4534).
+ - Updated TF2 conditions enum and defines (bug 4526).
+ - Fixed potential crash with IMemUtils::FindPattern on Linux (bug 4554).
+
+----------------------------
+
+SourceMod 1.3.4 [2010-07-18]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.4_Release_Notes
+
+User Changes:
+
+ - Support for latest TF update (bug 4506).
+ - Support for latest L4D2 update (bug 4509).
+
+Developer Changes:
+
+ - Added FindFlagChar native (bug 3776).
+ - Added GetConVarDefault native (bug 4502).
+ - Added forward for TF's GetHoliday function (bug 4462). 
+
+----------------------------
+
+SourceMod 1.3.3 [2010-06-23]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.3_Release_Notes
+
+User Changes:
+
+ - Added support for CS:S on Orange Box
+ - Added gamedata for Resistance and Liberation (bug 4418).
+ - Updated gamedata for SourceForts, Empires, Obsidian Conflict, Zombie Master.
+ - Fixed memory corruption and leaks with some voice functionality (bug 4415).
+ - Fixed UI bug in sm_motd (bug 4460). 
+
+Developer Changes:
+
+ - Added new player condition (TFCond_CritCola, bug 4447).
+ - Fixed clientprefs deleting cookies twice in rare cases (bug 4412).
+ - Fixed OnClientConnected forward not firing for bots (bug 4443).
+ - Fixed sm_dump_datamaps crash (bug 4424).
+ - Fixed switch case comparisons failing with large numbers (bug 4457).
+ - Fixed rare crash in output hooks (bug 4422).
+ - Fixed bug with dynamically sized arrays being sliced (bug 4428).
+ - Fixed SendConVarValue() on TF2, DOD:S, L4D, and L4D2 (bug 4273).
+ - Fixed TF2 natives not being marked optional (bug 4389). 
+
+----------------------------
+
+SourceMod 1.3.2 [2010-05-02]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.2_Release_Notes
+
+User Changes:
+
+ - Support for recent TF, DoD, and L4D2 updates (bug 4356, bug 4361, bug 4371, bug 4374, bug 4375).
+ - Fixed rare crash when replicating cvars to clients (bug 4315).
+ - Lots of extra game support for Insurgency, ZPS, CSProMod, PVKII, and FortressForever (thanks
+   Nicholas "psychonic" hastings). 
+
+Developer Changes:
+
+ - Added TF functions for stunning, conditions, regeneration, and power play (bug 4166, bug 4331).
+
+----------------------------
+
+SourceMod 1.3.1 [2010-02-09]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.1_Release_Notes
+
+User Changes:
+
+ - Added extended support for CSProMod (bug 4255).
+ - Fixed client disconnect crash on many third party games (bug 4231).
+ - Improved support for Battlegrounds 2 (bug 4146).
+ - Improved support for Insurgency (bug 4180).
+ - Improved support for Garry's Mod (bug 4230, bug 4268).
+ - Improved support for Synergy (bug 4235).
+ - Updated Day of Defeat support for 20010123 update (bug 4262).
+ - Fixed Webternet extension not loading on Windows 2000 (bug 4234). 
+
+Developer Changes:
+
+ - Fixed compiler complaints when using |any| tag on array arguments (bug 4274).
+ - Fixed GetClientCookieTime not being exported (bug 4237).
+ - Fixed potential crash in entity handling code (bug 4249). 
+
+----------------------------
+
+SourceMod 1.3.0 [2010-01-15]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.3.0_Release_Notes
+
+Major Features:
+ * Left 4 Dead 2 support
+ * Non-networked entity support
+
+User Changes:
+
+ - Added Left 4 Dead 2 support (bug 4075).
+ - Added much richer voting progress feedback (bug 1997).
+ - Improved support for various third-party games (Nicholas "psychonic" Hastings).
+ - Added @spec target (bug 2718).
+ - Added sm_resetcvar command (bug 3636).
+ - Added "motd" chat trigger (bug 2694).
+ - Updated GeoIP to OCT-2009.
+ - Fixed rare map vote error (bug 3905).
+ - Fixed small leak in the nominations plugin (bug 4104).
+ - Fixed last client being excluded from some command effects (bug 3984).
+ - Fixed crashes in plugin [|un|re]loading (bug 4034, bug 4038, bug 4044, bug 4153).
+ - Special target "@me" is now filtered for certain statuses properly (bug 4000).
+ - Improved non-admin to admin chat (bug 3844).
+ - Removed "auto.*" extension folders (bug 3949). 
+
+Developer Changes:
+
+ - Added non-networked entity support (bug 2459).
+ - Added improved random number generator (bug 3831).
+ - Added GetClientCookieTime native (bug 3736).
+ - Added AskPluginLoad2 callback (bug 3716).
+ - Added PlayerRunCmd callback (bug 3289).
+ - Added PointOutsideWorld native (bug 3906).
+ - Added API for "blanket" command hooks (bug 4015).
+ - Added ability to test for SourceMod features (bug 4021).
+ - Added ability to change broadcast status on hooked events (bug 3886).
+ - OnClientCommand no longer receives unconnected clients (bug 3732).
+ - Fixed various bugs in client listening API (bug 3818).
+ - Fixed crash in BanClient (bug 3912).
+ - Fixed various crashes in self-removing callbacks (bug 4059).
+ - Fixed rare HUD text crash on TF (bug 4016).
+ - Fixed OnConfigsExecuted not running on EP1 games with large configs (bug 3828).
+ - Fixed entity output hooks not working (bug 3988).
+ - Gamedata folder matches are now case-insensitive (bug 3913).
+ - Blocked plugins from hooking "sm" command (bug 4013). 
+
+----------------------------
+
+SourceMod 1.2.4 [2009-10-03]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.4_Release_Notes
+
+ - Updated for L4D changes (bugs 4032, 4033, 4035).
+ - Updated GeoLite Country database for GeoIP extension.
+ - Fixed crash when block-loading more than eight plugins (bug 4034).
+ - Fixed rare crash in hudtext code on TF (bug 4016).
+ - Fixed crash when reloading a blocked plugin failed (bug 4038).
+ - Fixed Huntsman not firing critical callback on TF (bug 3927).
+ - Registering the "sm" command no longer has any effect (bug 4013).
+ - Fixed translation bug in extension API (bug 4010).
+
+----------------------------
+
+SourceMod 1.2.3 [2009-08-28]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.3_Release_Notes
+
+ - Fix extension filename lookup. (bug 3975).
+
+----------------------------
+
+SourceMod 1.2.2 [2009-08-28]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.2_Release_Notes
+
+ - Removed auto folders. (bug 3949).
+ - Added PointOutsideWorld native to sdktools. (bug 3906).
+ - Added "motd" chat trigger to basetriggers. (bug 2694).
+ - Added manual extension reloading command to root console menu. (bug 3934)
+ - Fixed 'list' type custom menu entries overwriting admin restrictions. (bug 3783).
+ - Added sm_resetcvar command to basecommands. (bug 3636).
+ - Updated gamedata for DOD:S. (bug 3948).
+ - Updated gamedata for TF2. (bug 3948).
+ - Added new .ep2v build config for valve OB based games. (bug 3948).
+ - Fixed incorrect escaping in clientprefs SQLite queries. (bug 3904)
+ - Updated gamedata for Synergy. (bug 3315).
+ - Upgraded to pcre-7.9 (bug 3923).
+ - Switched Insurgency chat printing to SayText. (bug 3738).
+ - Updated gamedata for Insurgency. (bug 3511).
+ - Updated gamedata for ZM. (bug 3746).
+ - Updated gamedata for Empires. (bug 3500).
+ - Updated gamedata for ZPS. (bug 3877).
+ - Updated gamedata for AoC. (bug 3891).
+ - Fixed RemovePlayerDisguise signature for TF2. (bug 3892). 
+
+----------------------------
+
+SourceMod 1.2.1 [2009-05-31]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.1_Release_Notes
+
+ - Updated SDKTools for latest Team Fortress update.
+ - Added L4D handling to GuessSDKVersion() (bug 3842).
+ - Updated Zombie Panic Source offsets (bug 3632).
+ - Fixed crash when clientprefs saw disconnect from 64th client (bug 3821).
+ - Fixed Plugin_Handled acting like a Stop in usermsg hooks (bug 3685).
+ - Fixed early tv_enable causing crashes (bug 3766).
+ - Fixed unhook event crash (bug 3814).
+ - Fixed compiler reading uninitialized strings while processing varargs (bug 3811).
+ - Fixed compiler choosing whether to emit stradjust.pri on dynamic arrays based on uninitialized memory (bug 3810).
+ - Fixed Windows L4D CreateFakeClient signature (bug 3792).
+ - Fixed sm_slap for EP1 games (bug 3768).
+ - Fixed casting problems in TextParsers breaking TrimString for non-ASCII characters (bug 3800).
+ - Fixed OnClientConnect rejectmsg handling, improved doc (bug 3690).
+ - Fixed clientprefs not loading cookies for clients on late load (bug 3735).
+ - Fixed GetCommandFlags on original engine games (bug 3759).
+ - Fixed compiler asserting when returning a string literal (bug 3836).
+ - Fixed compiler erroring when tagging functions for string return (bug 3837).
+ - Fixed compiler not handling constant chained relational operators correctly (bug 3838).
+ - Fixed revote bug and inflexibilities in RedrawClientVoteMenu (bug 3834).
+ - Fixed auto update URL being set too late (bug 3699).
+ - Disabled nextmap in Synergy and Dystopia (bug 3687, bug 3741).
+ - Removed unnecessary SSE optimizations from msvc9 project files (bug 3756).
+ - Removed short-lived tag system (bug 3751).
+ - Removed the alive check from sm_rename. (bug 3698).
+ - Switched FortressForever to Valve menus (bug 3819). 
+
+----------------------------
+
+SourceMod 1.2.0 [2009-03-05]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.2.0_Release_Notes
+
+Major Features:
+ * Left 4 Dead Support
+ * Dark Messiah Support
+ * New and Improved Updater
+
+Changes:
+
+ - Added Left 4 Dead support (bug 3414).
+ - Added Dark Messiah game support (requires Metamod:Source 1.7.1 or higher).
+ - Added sm_name command (bug 2150).
+ - Added extension-level dynamic hooking to bintools (bug 2616).
+ - Added client validation API to replace passing userids asynchronously.
+ - Added cURL extension, available to other extensions (bug 3560).
+ - Added parsing of custom gamedata files (bug 3644).
+ - Added case insensitivity search to ReplaceString (bug 3639, Fyren).
+ - Added more detail to certain player-oriented menu titles (bug 2740, Fyren).
+ - Added sv_tags API (bug 3677).
+ - Greatly improved admin-sql-prefetch performance for large tables (bug 3354, FLOOR_MASTER).
+ - Exposed IServer address to extensions (bug 3545).
+ - New gamedata organization; files are now smaller and per-game (bug 3546).
+ - Split sound functions into a new plugin, sounds.smx.
+ - Fixed slap and slay on Insurgency (bug 2560).
+ - Fixed blank admins being created from invalid admin file lines (bug 3431).
+ - Fixed basetriggers not working on Insurgency (bug 3497).
+ - Fixed client preferences missing some clients (bug 3616).
+ - Improved database fallback mechanism in clientprefs (bug 3564).
+ - Improved timer handling in funcommands (bug 3498).
+ - Improved compile.sh to take filenames (bug 3550, jonasfietz).
+ - sm_kick now shows the kick reason when available.
+ - Fixed MsgPostHook (ex MsgSentNotify) callbacks not firing on intercept hook (bug 3631).
+ - Note: SourceMod now adds "sourcemod" to the sv_tags cvar.
+
+----------------------------
+
+SourceMod 1.1.2 [2009-02-26]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.1.2_Release_Notes
+
+Changes:
+
+ - Fixed critical hits being permanently disabled (bug 2674)
+
+----------------------------
+
+SourceMod 1.1.1 [2009-02-25]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.1.1_Release_Notes
+
+Changes:
+
+ - Added Age of Chivalry support (bug 3366, IceMatrix).
+ - Added Obsidian Conflict support (bug 2699, The DOO).
+ - Fixed compatibility issues with latest TF2 update.
+ - Fixed crash when an event handler fired an event of the same name (bug 3468).
+ - Fixed rare crash in the event manager on post hooks (bug 3548).
+ - Fixed formatting error with zero precision floats (bug 3447).
+ - Fixed various Insurgency offsets (bug 3544).
+ - Fixed admin menu (topmenu) categories being selectable when not usable (bug 3256).
+ - Fixed sm_sql_addgroup not working (bug 3578).
+ - Fixed memory leak when events were hooked as EventHookMode_Post.
+ - Fixed nextmap trigger showing wrong output with end-of-map voting disabled and sm_trigger_show set to zero (bug 3597, mr.e.unk).
+
+----------------------------
+
+SourceMod 1.1.0 [2008-12-28]
+
+URL: http://wiki.alliedmods.net/SourceMod_1.1.0_Release_Notes
+
+Major features:
+ * New map management plugins.
+ * New reserved slot type.
+ * GameData updates are retrieved remotely
+ * Client Preferences extension for per-client "cookies"
+ * New incremental and independent JIT
+
+Changes:
+
+ - Added new client preferences extension (API in clientprefs.inc, bug 1925).
+ - Added new gamedata auto-update functionality (bug 2602).
+ - Revamped and greatly expanded map management plugins and their functionality (bug 2201).
+ - Debug mode is now always on; as there is no longer a performance loss, there is no non-debug mode.
+ - The timeleft trigger can now handle mp_winlimit, mp_fraglimit, and mp_maxrounds (bug 2344).
+ - Translations can now be in separate files and placed in language-unique folders.
+ - The leading "STEAM_0:" or "STEAM_1:" in SteamIDs can now be omitted from admin files.
+ - Added sm_revote command so clients can participate in a vote that fell off their screen (bug 2156).
+ - Added Core API for creating stack structures (adt_stack.inc, bug 2441).
+ - Added API for extending mapchooser (mapchooser.inc, bug 2201).
+ - Added Core API for map transition control and history (nextmap.inc).
+ - Added TF2 forward for overriding how critical hits are calculated.
+ - Added SetClientInfo() native for modifying how a server sees a client's setinfo properties.
+ - Added CreateDirectory() native (bug 3253).
+ - Added "magic" MaxClients variable to replace slower GetMaxClients() call.
+ - Added support for three-letter language codes (bug 3526).
+ - Functions to control client versus client mic listening now work as described (bug 2498).
+ - Fixed SDKTools not being reloadable, and fixed a related bug in Handle type removal (bug 2753).
+ - Rewrote internal translation handling. Extensions now have access to an ITranslator API (bug 2535).
+ - Rewrote internal handling of dependencies (especially relating to native providers) (bug 2466).
+ - Added user config hooks to IGameConfigManager, for parsing user-defined sections.
+ - Revamped SourcePawn API. Removed and deprecated many structures and functions accidentally exposed publicly.
+ - Revamped SourcePawn structure, it is now separable from SourceMod for other projects.
+ - Renamed basefuncommands.phrases.txt to funcommands.phrases.txt (bug 2485).
+ - Renamed basefunvotes.phrases.txt to funvotes.phrases.txt (bug 2485).
+ - Added IDBDriver API call for extensions to handle IDBDriver dependencies properly.
+ - Usermessage natives now validate clients to prevent crashing.
+ - Fixed OnConfigsExecuted not working on listen servers.
+ - Fixed out-of-handle conditions in CreateTimer() causing crashes (bug 3381).
+ - Fixed accessing invalid Handles causing crashes (bug 3359).
+ - Fixed memory corruption with MySQL + FetchString (bug 3352).
+ - Fixed ReadFileString ignoring its fourth parameter (bug 3459).
+ - Fixed sm_sql_addadmin reading the immunity field as a password (bug 3395).
+ - Fixed ReadFile sign-extending instead of zero-extending (bug 3449). 
+
+----------------------------
+
+SourceMod 1.0.4 [2008-09-14]
+
+Changes:
+
+ - Fixed amb1986: Format() with very long strings could crash if the input and output buffers overlapped.
+ - Fixed amb1938: The compiler ate too many characters in preprocessor macros.
+ - Fixed amb1935: Topmenu child names were not uncached when a category was deleted.
+ - Fixed amb1929: Banning via the console threw a runtime error.
+ - Fixed amb1918: Ban menu should compare userids, not client indexes
+ - Fixed amb1916: Threaded query delay is now 50ms instead of 500ms.
+ - Fixed amb1899: Duplicate maps in auto generated maplists.
+ - Fixed amb1891: Basechat didn't check for blank message in private says.
+ - Fixed amb1853: Ternary operators with string assignments could chop strings off.
+ - Fixed amb1815: Custom admin menu wasn't escaping input.
+ - Fixed amb1808: KickClient() is now delayed to prevent crashes, use KickClientEx for old functionality.
+ - Fixed amb1802: Possible crash when a client disconnected.
+ - Fixed amb1801: Improved bot detection, and fixed bots crashing if inside an OrangeBox server.cfg.
+ - Fixed amb1780: admin-sql-threaded had a debug spew turned on.
+ - Fixed amb1779: Crash in GetTeamName() on mods that don't support it.
+ - Fixed amb1763: Function call status is now cleared on a new function call.
+ - Fixed amb1749: Updated and improved DoD:S SDKTools coverage.
+ - Fixed team native crashes in SDKTools for mods like Insurgency.
+ - Fixed various file handle leaks. 
+
+----------------------------
+
+SourceMod 1.0.3 [2008-06-21]
+
+Changes:
+ 
+ - Fixed SDKTools compatibility for latest TF2 update. 
+ - Fixed amb1750: OnAutoConfigsBuffered() inserted before "exec server.cfg". 
+ - Fixed a logic bug where OnConfigsExecuted() could be executed before "exec server.cfg" finished. 
+ - Fixed a rare crash in the event manager that manifested on Zombie Panic! Source. 
+
+----------------------------
+
+SourceMod 1.0.2 [2008-05-31]
+
+Changes:
+
+ - The admin menu is now user-modifiable (the "Dynamic Admin Menu").
+ - Added a TF2 extension with Team Fortress functions.
+ - Added a RegEx extension with regular expression functions.
+ - Added functions to SDKTools for hooking entity outputs.
+ - Added preliminary support for the DoD:S Orange Box beta.
+ - Added a forward for map config plugins for preventing race conditions.
+ - Added a %b format specifier for binary printing.
+ - Added sm_dump_datamaps command (SDKTools) for enumerating datamap properties.
+ - Added sm_dump_admcache command for debugging the admin cache.
+ - Added amb1715 - TraceHull functions to SDKTools (complementing TraceRay).
+ - Added amb1694 - FindCharInString() function.
+ - Added amb1685 - GetTickInterval() function.
+ - Added amb1620 - ActivateEntity() function to SDKTools (for Orange Box particle system).
+ - Added amb1610 - StripQuotes() function.
+ - Added amb1558 - Compiler now has __BINARY_PATH__ and __BINARY_FILE__ macros.
+ - Fixed amb1686 - ReplaceString* with an empty search string crashed; it now throws an error.
+ - Fixed amb1684 - Blank passwords required an empty but set password.
+ - Fixed amb1595 - Extension load failures did not show a platform error message.
+ - Fixed amb1583 - MySQL string fetch from prepared queries returned corrupted data.
+ - Fixed amb1358 - Timeleft did not reset on TF2 restarts.
+ - Fixed cases where the JIT was too cautious in space optimizations.
+ - Fixed TF2/Cstrike extensions being loadable on incompatible games.
+ - Fixed various documentation inconsistencies and typos.
+ - Fixed internal bugs with file extension handling.
+ 
+Notes:
+ 
+ There is a possible compatibility regression from amb1684.  SetAdminPassword() 
+ has been modified to remove any set password when given an empty string.  Previously, 
+ a blank password ("") would force an admin to use "setinfo" to set an empty password, 
+ but this functionality was deemed unuseful and unintended.  Blank passwords now 
+ remove any set password.  
+ 
+----------------------------
+
+SourceMod 1.0.1 [2008-05-20]
+
+Changes:
+
+ - Fixed SDKTools compatibility for latest TF2 update.
+ - Removed GivePlayerItem from TF2 (TF2 update broke functionality).
+ - Fixed amb1688: GivePlayerItem offset was wrong for DoD:S Linux.
+ - Fixed amb1657: Server console did not see admin version of sm_who.
+ - Fixed amb1648: Stack corruption from GetClientEyeAngles() on Windows.
+ - Fixed amb1646: NetFlow_Both did not work for client network statistics.
+ - Fixed amb1601: Vote FF menu reading from sv_alltalk cvar instead of mp_friendlyfire.
+ - Fixed amb1591: Fixed listen server crashes on mods like IOS:S which pre-add more than one bot.
+ - Fixed amb1586: GetTeamName() could crash the server if called on load.
+ - Fixed mapchooser's round counting for TF2.
+ - Fixed a bug where an RTE on plugin load would throw a message referring to the plugin as "-1".
+ - Symbols are no longer stripped on Linux.
+ - Minor SourceMod SDK fixes.
+
+Notes:
+
+ The extension interface version has been bumped.  Any extensions compiled against 1.0.1 will require 1.0.1 or higher to run.  Extensions against 1.0.0 will continue to run normally.

configs/adminmenu_custom.txt

@@ -0,0 +1,12 @@
+// 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

@@ -0,0 +1,20 @@
+/* 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:abcdefg"			//Immunity is 83, flags are abcefgh
+//	"83:abcdefgh"			//Immunity is 83, flags are abcdefgh
 //	"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"				//kick, ban, slay for this steam ID, no immunity
+//   "STEAM_0:1:16"		"bce"				//generic, kick, unban 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, kick, ban
+//   "BAILOPAN"			"abc"	"Gab3n"		//name BAILOPAN, password "Gab3n": gets reservation, generic, kick
 //
 ////////////////////////////////
  

configs/banreasons.txt

@@ -0,0 +1,16 @@
+"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,6 +1,7 @@
 //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

@@ -65,6 +65,10 @@ sm_flood_time 0.75
 // no reserved slot access (spectator players are selected first) is kicked to make room. Thus, the reserved
 // slots always remains free. The only situation where the reserved slot(s) can become properly occupied is 
 // if the server is full with reserve slot access clients.
+// 2 : The same as sm_reserve_type 1 except once a certain number of admins have been reached, the reserve slot
+// stops kicking people and anyone can join to fill the server. You can use this to simulate having a large
+// number of reserved slots with sm_reserve_type 0 but with only need to have 1 slot unavailable when there are
+// less admins connected.
 // --
 // Requires: reservedslots.smx
 // Default: 0
@@ -80,21 +84,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.
+// Specifies whether or not "timeleft" will automatically be triggered every
+// x seconds. Valid values are 0 (Disabled) to 1800 seconds.
 // --
 // Requires: basetriggers.smx
 // Default: 0
@@ -105,5 +109,30 @@ sm_timeleft_interval 0
 // 1 (Enabled)
 // --
 // Requires: basetriggers.smx
-// Default: 1
-sm_trigger_show 1
+// 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

configs/core.cfg

@@ -4,14 +4,6 @@
  */
 "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.
 	 *
@@ -38,12 +30,12 @@
 	"ServerLang"	"en"
 	
 	/**
-	 * String to use as the public chat trigger.  Set an empty string to disable.
+	 * List of characters to use for public chat triggers.  Set an empty list to disable.
 	 */
 	"PublicChatTrigger"		"!"
 	
 	/**
-	 * String to use as the silent chat trigger.  Set an empty string to disable.
+	 * List of characters to use for silent chat triggers.  Set an empty list to disable.
 	 */
 	"SilentChatTrigger"		"/"
 	
@@ -52,7 +44,7 @@
 	 * but it does not evaluate to an actual command, it will be displayed 
 	 * publicly.  This setting allows you to suppress accidental typings.
 	 *
-	 * The default value is "no".  A value of "yes" will supress.
+	 * The default value is "no".  A value of "yes" will suppress.
 	 */
 	"SilentFailSuppress"	"no"
 	
@@ -88,4 +80,70 @@
 	 * "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"
+	
+	/**
+	 * Per "http://blog.counter-strike.net/index.php/server_guidelines/", certain plugin
+	 * functionality will trigger all of the game server owner's Game Server Login Tokens
+	 * (GSLTs) to get banned when executed on a Counter-Strike: Global Offensive game server.
+	 *
+	 * Enabling this option will block plugins from using functionality that is known to cause this.
+	 * This option only has any effect on CS:GO. Note that this does NOT guarantee that you cannot
+	 * receive a ban.
+	 *
+	 * Disable this option at your own risk.
+	 */
+	"FollowCSGOServerGuidelines"	"yes"
 }
+

configs/databases.cfg

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

configs/languages.cfg

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

configs/maplists.cfg

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

configs/plugin_settings.cfg

@@ -1,38 +0,0 @@
-/**
- *   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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,42 @@
+# vim: set ts=2 sw=2 tw=99 noet:
+import sys
+try:
+	from ambuild2 import run, util
+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)
+
+def make_objdir_name(p):
+    return 'obj-' + util.Platform() + '-' + p.target_arch
+
+parser = run.BuildParser(sourcePath=sys.path[0], api='2.1')
+parser.default_arch = 'x86'
+parser.default_build_folder = make_objdir_name
+parser.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
+		                   help='Root search folder for HL2SDKs')
+parser.options.add_option('--mysql-path', type=str, dest='mysql_path', default=None,
+		                   help='Path to MySQL 5')
+parser.options.add_option('--mysql64-path', type=str, dest='mysql64_path', default=None,
+		                   help='Path to 64-bit MySQL 5')
+parser.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
+                       help='Path to Metamod:Source')
+parser.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
+                       help='Enable debugging symbols')
+parser.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
+                       help='Enable optimization')
+parser.options.add_option('--no-mysql', action='store_false', default=True, dest='hasMySql',
+                       help='Disable building MySQL extension')
+parser.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)')
+parser.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump',
+											 default=False, help='Dump and upload breakpad symbols')
+parser.options.add_option('--disable-auto-versioning', action='store_true', dest='disable_auto_versioning',
+                       default=False, help='Disable the auto versioning script')
+parser.Configure()

core/AMBuilder

@@ -0,0 +1,113 @@
+# 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',
+  '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',
+  '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',
+  'ConsoleDetours.cpp',
+  'vprof_tool.cpp',
+  'smn_commandline.cpp',
+  'GameHooks.cpp',
+]
+
+for sdk_name in SM.sdks:
+  sdk = SM.sdks[sdk_name]
+  for arch in SM.archs:
+    if not arch in sdk.platformSpec[builder.target.platform]:
+      continue
+
+    binary_name = 'sourcemod.' + sdk.ext
+
+    binary = SM.HL2Config(project, binary_name, sdk, arch)
+    compiler = binary.compiler
+
+    compiler.cxxincludes += [
+      builder.sourcePath
+    ]
+
+    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')
+      ]
+
+    if compiler.like('msvc'):
+      compiler.defines += ['_ALLOW_KEYWORD_MACROS']
+    if builder.target.platform == 'linux':
+      compiler.postlink += ['-lpthread', '-lrt']
+
+    if sdk.name == 'csgo':
+      if builder.target.platform == 'linux':
+        if arch == 'x86':
+          lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a')
+        elif arch == 'x64':
+          lib_path = os.path.join(sdk.path, 'lib', 'linux64', 'release', 'libprotobuf.a')
+        compiler.linkflags += ['-Wl,--exclude-libs=libprotobuf.a']
+      elif builder.target.platform == 'mac':
+        if arch == 'x86':
+          lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
+        elif arch == 'x64':
+          lib_path = os.path.join(sdk.path, 'lib', 'osx64', 'release', 'libprotobuf.a')
+      elif builder.target.platform == 'windows':
+        msvc_ver = compiler.version
+        vs_year = ''
+        if msvc_ver == 1800:
+          vs_year = '2013'
+        elif 1900 <= msvc_ver < 2000:
+          vs_year = '2015'
+        else:
+          raise Exception('Cannot find libprotobuf for MSVC version "' + str(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 == 'csgo':
+      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'),
+      ]
+
+SM.binaries += builder.Add(project)
+

core/CDataPack.cpp

@@ -1,259 +0,0 @@
-/**
- * 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 <malloc.h>
-#include <string.h>
-#include "CDataPack.h"
-
-#define DATAPACK_INITIAL_SIZE		512
-
-CDataPack::CDataPack()
-{
-	m_pBase = (char *)malloc(DATAPACK_INITIAL_SIZE);
-	m_capacity = DATAPACK_INITIAL_SIZE;
-	Initialize();
-}
-
-CDataPack::~CDataPack()
-{
-	free(m_pBase);
-}
-
-void CDataPack::Initialize()
-{
-	m_curptr = m_pBase;
-	m_size = 0;
-}
-
-void CDataPack::CheckSize(size_t typesize)
-{
-	if (m_curptr - m_pBase + typesize <= m_capacity)
-	{
-		return;
-	}
-
-	size_t pos = m_curptr - m_pBase;
-	do
-	{
-		m_capacity *= 2;
-		m_pBase = (char *)realloc(m_pBase, m_capacity);
-		m_curptr = m_pBase + pos;
-	} while (m_curptr - m_pBase + typesize > m_capacity);
-}
-
-void CDataPack::ResetSize()
-{
-	m_size = 0;
-}
-
-size_t CDataPack::CreateMemory(size_t size, void **addr)
-{
-	CheckSize(sizeof(size_t) + size);
-	size_t pos = m_curptr - m_pBase;
-
-	*(size_t *)m_curptr = size;
-	m_curptr += sizeof(size_t);
-
-	if (addr)
-	{
-		*addr = m_curptr;
-	}
-
-	m_curptr += size;
-	m_size += sizeof(size_t) + size;
-
-	return pos;
-}
-
-void CDataPack::PackCell(cell_t cell)
-{
-	CheckSize(sizeof(size_t) + sizeof(cell_t));
-
-	*(size_t *)m_curptr = sizeof(cell_t);
-	m_curptr += sizeof(size_t);
-
-	*(cell_t *)m_curptr = cell;
-	m_curptr += sizeof(cell_t);
-
-	m_size += sizeof(size_t) + sizeof(cell_t);
-}
-
-void CDataPack::PackFloat(float val)
-{
-	CheckSize(sizeof(size_t) + sizeof(float));
-
-	*(size_t *)m_curptr = sizeof(float);
-	m_curptr += sizeof(size_t);
-
-	*(float *)m_curptr = val;
-	m_curptr += sizeof(float);
-
-	m_size += sizeof(size_t) + sizeof(float);
-}
-
-void CDataPack::PackString(const char *string)
-{
-	size_t len = strlen(string);
-	size_t maxsize = sizeof(size_t) + len + 1;
-	CheckSize(maxsize);
-
-	// Pack the string length first for buffer overrun checking.
-	*(size_t *)m_curptr = len;
-	m_curptr += sizeof(size_t);
-
-	// Now pack the string.
-	memcpy(m_curptr, string, len);
-	m_curptr[len] = '\0';
-	m_curptr += len + 1;
-
-	m_size += maxsize;
-}
-
-void CDataPack::Reset() const
-{
-	m_curptr = m_pBase;
-}
-
-size_t CDataPack::GetPosition() const
-{
-	return static_cast<size_t>(m_curptr - m_pBase);
-}
-
-bool CDataPack::SetPosition(size_t pos) const
-{
-	if (pos > m_size-1)
-	{
-		return false;
-	}
-	m_curptr = m_pBase + pos;
-
-	return true;
-}
-
-cell_t CDataPack::ReadCell() const
-{
-	if (!IsReadable(sizeof(size_t) + sizeof(cell_t)))
-	{
-		return 0;
-	}
-	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;
-}
-
-float CDataPack::ReadFloat() const
-{
-	if (!IsReadable(sizeof(size_t) + sizeof(float)))
-	{
-		return 0;
-	}
-	if (*reinterpret_cast<size_t *>(m_curptr) != sizeof(float))
-	{
-		return 0;
-	}
-
-	m_curptr += sizeof(size_t);
-
-	float val = *reinterpret_cast<float *>(m_curptr);
-	m_curptr += sizeof(float);
-	return val;
-}
-
-bool CDataPack::IsReadable(size_t bytes) const
-{
-	return (bytes + (m_curptr - m_pBase) > m_size) ? false : true;
-}
-
-const char *CDataPack::ReadString(size_t *len) const
-{
-	if (!IsReadable(sizeof(size_t)))
-	{
-		return NULL;
-	}
-
-	size_t real_len = *(size_t *)m_curptr;
-
-	m_curptr += sizeof(size_t);
-	char *str = (char *)m_curptr;
-
-	if ((strlen(str) != real_len) || !(IsReadable(real_len+1)))
-	{
-		return NULL;
-	}
-
-	if (len)
-	{
-		*len = real_len;
-	}
-
-	m_curptr += real_len + 1;
-
-	return str;
-}
-
-void *CDataPack::GetMemory() const
-{
-	return m_curptr;
-}
-
-void *CDataPack::ReadMemory(size_t *size) const
-{
-	if (!IsReadable(sizeof(size_t)))
-	{
-		return NULL;
-	}
-
-	size_t bytecount = *(size_t *)m_curptr;
-	m_curptr += sizeof(size_t);
-
-	if (!IsReadable(bytecount))
-	{
-		return NULL;
-	}
-
-	void *ptr = m_curptr;
-
-	if (size)
-	{
-		*size = bytecount;
-	}
-
-	m_curptr += bytecount;
-
-	return ptr;
-}

core/CellRecipientFilter.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -81,11 +81,17 @@ inline int CellRecipientFilter::GetRecipientCount() const
 
 inline int CellRecipientFilter::GetRecipientIndex(int slot) const
 {
+	int ret;
 	if ((slot < 0) || (slot >= GetRecipientCount()))
 	{
-		return -1;
+		ret = -1;
 	}
-	return static_cast<int>(m_Players[slot]);
+	else
+	{
+		ret = static_cast<int>(m_Players[slot]);
+	}
+
+	return ret;
 }
 
 inline void CellRecipientFilter::SetToInit(bool isinitmsg)

core/ChatTriggers.cpp

@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * 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
@@ -34,67 +34,71 @@
 #include "sm_stringutil.h"
 #include "ConCmdManager.h"
 #include "PlayerManager.h"
-#include "Translator.h"
 #include "HalfLife2.h"
-
-/* :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
-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
+#include "logic_bridge.h"
+#include "sourcemod.h"
+#include "provider.h"
+#include <bridge/include/ILogger.h>
+#include <amtl/am-string.h>
 
 ChatTriggers g_ChatTriggers;
 bool g_bSupressSilentFails = false;
-CPhraseFile *g_pFloodPhrases = NULL;
 
-ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), 
-	m_bTriggerWasSilent(false), m_ReplyTo(SM_REPLY_CONSOLE)
+ChatTriggers::ChatTriggers() : m_bWillProcessInPost(false),
+	m_ReplyTo(SM_REPLY_CONSOLE), m_ArgSBackup(NULL)
 {
-	m_PubTrigger = sm_strdup("!");
-	m_PrivTrigger = sm_strdup("/");
-	m_PubTriggerSize = 1;
-	m_PrivTriggerSize = 1;
+	m_PubTrigger = "!";
+	m_PrivTrigger = "/";
 	m_bIsChatTrigger = false;
+	m_bPluginIgnored = true;
+#if SOURCE_ENGINE == SE_EPISODEONE
+	m_bIsINS = false;
+#endif
 }
 
 ChatTriggers::~ChatTriggers()
 {
-	delete [] m_PubTrigger;
-	m_PubTrigger = NULL;
-	delete [] m_PrivTrigger;
-	m_PrivTrigger = NULL;
+	delete [] m_ArgSBackup;
+	m_ArgSBackup = NULL;
 }
 
-ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, 
-													const char *value, 
+void ChatTriggers::SetChatTrigger(ChatTriggerType type, const char *value)
+{
+	ke::AutoPtr<char[]> filtered(new char[strlen(value) + 1]);
+
+	const char *src = value;
+	char *dest = filtered.get();
+	char c;
+	while ((c = *src++) != '\0') {
+		if (c <= ' ' || c == '"' || c == '\'' || (c >= '0' && c <= '9') || c == ';' || (c >= 'A' && c <= 'Z') || c == '\\' || (c >= 'a' && c <= 'z') || c >= 0x7F) {
+			logger->LogError("Ignoring %s chat trigger character '%c', not in valid set: %s", (type == ChatTrigger_Private ? "silent" : "public"), c, "!#$%&()*+,-./:<=>?@[]^_`{|}~");
+			continue;
+		}
+		*dest++ = c;
+	}
+	*dest = '\0';
+
+	if (type == ChatTrigger_Private) {
+		m_PrivTrigger = filtered.get();
+	} else {
+		m_PubTrigger = filtered.get();
+	}
+}
+
+ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key,
+													const char *value,
 													ConfigSource source,
-													char *error, 
+													char *error,
 													size_t maxlength)
 {
 	if (strcmp(key, "PublicChatTrigger") == 0)
 	{
-		delete [] m_PubTrigger;
-		m_PubTrigger = sm_strdup(value);
-		m_PubTriggerSize = strlen(m_PubTrigger);
+		SetChatTrigger(ChatTrigger_Public, value);
 		return ConfigResult_Accept;
 	}
 	else if (strcmp(key, "SilentChatTrigger") == 0)
 	{
-		delete [] m_PrivTrigger;
-		m_PrivTrigger = sm_strdup(value);
-		m_PrivTriggerSize = strlen(m_PrivTrigger);
+		SetChatTrigger(ChatTrigger_Private, value);
 		return ConfigResult_Accept;
 	}
 	else if (strcmp(key, "SilentFailSuppress") == 0)
@@ -108,231 +112,238 @@ ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key,
 
 void ChatTriggers::OnSourceModAllInitialized()
 {
-	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);
+	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);
 }
 
 void ChatTriggers::OnSourceModAllInitialized_Post()
 {
-	unsigned int file_id;
-	
-	file_id = g_Translator.FindOrAddPhraseFile("antiflood.phrases.txt");
-	g_pFloodPhrases = g_Translator.GetFileByIndex(file_id);
+	logicore.AddCorePhraseFile("antiflood.phrases");
 }
 
 void ChatTriggers::OnSourceModGameInitialized()
 {
-	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());
+	ConCommand *say_team = FindCommand("say_team");
+
+	CommandHook::Callback pre_hook = [this] (int client, const ICommandArgs *args) -> bool {
+		return this->OnSayCommand_Pre(client, args);
+	};
+	CommandHook::Callback post_hook = [this] (int client, const ICommandArgs *args) -> bool {
+		return this->OnSayCommand_Post(client, args);
+	};
+
+	if (ConCommand *say = FindCommand("say")) {
+		hooks_.append(sCoreProviderImpl.AddCommandHook(say, pre_hook));
+		hooks_.append(sCoreProviderImpl.AddPostCommandHook(say, post_hook));
+	}
+	if (ConCommand *say_team = FindCommand("say_team")) {
+		hooks_.append(sCoreProviderImpl.AddCommandHook(say_team, pre_hook));
+		hooks_.append(sCoreProviderImpl.AddPostCommandHook(say_team, post_hook));
 	}
 
-	if (m_pSayCmd)
-	{
-		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 SOURCE_ENGINE == SE_EPISODEONE
+	m_bIsINS = (strcmp(g_SourceMod.GetGameFolderName(), "insurgency") == 0);
+	if (m_bIsINS) {
+		if (ConCommand *say2 = FindCommand("say2")) {
+			hooks_.append(sCoreProviderImpl.AddCommandHook(say2, pre_hook));
+			hooks_.append(sCoreProviderImpl.AddPostCommandHook(say2, post_hook));
+		}
 	}
-	if (m_pSayTeamCmd)
-	{
-		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);
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	if (ConCommand *say_squad = FindCommand("say_squad")) {
+		hooks_.append(sCoreProviderImpl.AddCommandHook(say_squad, pre_hook));
+		hooks_.append(sCoreProviderImpl.AddPostCommandHook(say_squad, post_hook));
 	}
+#endif
 }
 
 void ChatTriggers::OnSourceModShutdown()
 {
-	if (m_pSayTeamCmd)
-	{
-		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);
-	}
+	hooks_.clear();
 
-	g_Forwards.ReleaseForward(m_pShouldFloodBlock);
-	g_Forwards.ReleaseForward(m_pDidFloodBlock);
+	forwardsys->ReleaseForward(m_pShouldFloodBlock);
+	forwardsys->ReleaseForward(m_pDidFloodBlock);
+	forwardsys->ReleaseForward(m_pOnClientSayCmd);
+	forwardsys->ReleaseForward(m_pOnClientSayCmd_Post);
 }
 
-#if defined ORANGEBOX_BUILD
-void ChatTriggers::OnSayCommand_Pre(const CCommand &command)
+bool ChatTriggers::OnSayCommand_Pre(int client, const ICommandArgs *command)
 {
-#else
-void ChatTriggers::OnSayCommand_Pre()
-{
-	CCommand command;
-#endif
-	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 false;
+
+	/* 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 true;
+	}
+#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 true;
+
+		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 || (pPlayer = g_Players.GetPlayerByIndex(client)) == NULL)
+	if (client == 0)
 	{
-		RETURN_META(MRES_IGNORED);
+		if (CallOnClientSayCommand(client) >= Pl_Handled)
+			return true;
+
+		return false;
 	}
 
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+
 	/* We guarantee the client is connected */
-	if (!pPlayer->IsConnected())
-	{
-		RETURN_META(MRES_IGNORED);
-	}
-
-	const char *args = command.ArgS();
-	
-	if (!args)
-	{
-		RETURN_META(MRES_IGNORED);
-	}
+	if (!pPlayer || !pPlayer->IsConnected())
+		return false;
 
 	/* Check if we need to block this message from being sent */
 	if (ClientIsFlooding(client))
 	{
 		char buffer[128];
 
-		/* :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!");
-		}
+		if (!logicore.CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "Flooding the server", &client))
+			ke::SafeSprintf(buffer, sizeof(buffer), "You are flooding the server!");
 
 		/* :TODO: we should probably kick people who spam too much. */
 
 		char fullbuffer[192];
-		UTIL_Format(fullbuffer, sizeof(fullbuffer), "[SM] %s", buffer);
+		ke::SafeSprintf(fullbuffer, sizeof(fullbuffer), "[SM] %s", buffer);
 		g_HL2.TextMsg(client, HUD_PRINTTALK, fullbuffer);
 
 		m_bWasFloodedMessage = true;
-
-		RETURN_META(MRES_SUPERCEDE);
-	}
-
-	/* Handle quoted string sets */
-	bool is_quoted = false;
-	if (args[0] == '"')
-	{
-		args++;
-		is_quoted = true;
+		return true;
 	}
 
 	bool is_trigger = false;
 	bool is_silent = false;
 
-	/* Check for either trigger */
-	if (m_PubTriggerSize && strncmp(args, m_PubTrigger, m_PubTriggerSize) == 0)
-	{
-		is_trigger = true;
-		args = &args[m_PubTriggerSize];
-	} 
-	else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) 
-	{
+	// Prefer the silent trigger in case of clashes.
+	if (strchr(m_PrivTrigger.chars(), m_ArgSBackup[0])) {
 		is_trigger = true;
 		is_silent = true;
-		args = &args[m_PrivTriggerSize];
+	} else if (strchr(m_PubTrigger.chars(), m_ArgSBackup[0])) {
+		is_trigger = true;
 	}
 
-	if (!is_trigger)
-	{
-		RETURN_META(MRES_IGNORED);
+	if (is_trigger) {
+		// Bump the args past the chat trigger - we only support single-character triggers now.
+		args = &m_ArgSBackup[1];
 	}
 
 	/**
 	 * Test if this is actually a command!
 	 */
-	if (!PreProcessTrigger(engine->PEntityOfEntIndex(client), args, is_quoted))
+	if (is_trigger && PreProcessTrigger(PEntityOfEntIndex(client), args))
 	{
-		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);
+		m_bIsChatTrigger = true;
+
+		/**
+		 * We'll execute it in post.
+		 */
+		m_bWillProcessInPost = true;
 	}
 
-	m_bIsChatTrigger = true;
+	if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)))
+		return true;
 
-	/**
-	 * 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);
-	}
+	if (CallOnClientSayCommand(client) >= Pl_Handled)
+		return true;
 
 	/* Otherwise, let the command continue */
-	RETURN_META(MRES_IGNORED);
+	return false;
 }
 
-#if defined ORANGEBOX_BUILD
-void ChatTriggers::OnSayCommand_Post(const CCommand &command)
-#else
-void ChatTriggers::OnSayCommand_Post()
-#endif
+bool ChatTriggers::OnSayCommand_Post(int client, const ICommandArgs *command)
 {
-	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);
-		serverpluginhelpers->ClientCommand(engine->PEntityOfEntIndex(client), m_ToExecute);
+		serverpluginhelpers->ClientCommand(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;
+	return false;
 }
 
-bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted)
+bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
 {
-	/* Extract a command.  This is kind of sloppy. */
+	/* Extract a command. This is kind of sloppy. */
 	char cmd_buf[64];
 	size_t cmd_len = 0;
 	const char *inptr = args;
-	while (*inptr != '\0' 
-			&& !textparsers->IsWhitespace(inptr) 
+	while (*inptr != '\0'
+			&& !textparsers->IsWhitespace(inptr)
 			&& *inptr != '"'
 			&& cmd_len < sizeof(cmd_buf) - 1)
 	{
@@ -355,50 +366,57 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_
 			return false;
 		}
 
-		/* Now, prepend.  Don't worry about the buffers.  This will 
+		/* Now, prepend.  Don't worry about the buffers.  This will
 		 * work because the sizes are limited from earlier.
 		 */
 		char new_buf[80];
 		strcpy(new_buf, "sm_");
-		strncopy(&new_buf[3], cmd_buf, sizeof(new_buf)-3);
+		ke::SafeStrcpy(&new_buf[3], sizeof(new_buf)-3, cmd_buf);
 
 		/* Recheck */
 		if (!g_ConCmds.LookForSourceModCommand(new_buf))
 		{
 			return false;
 		}
-		
+
 		prepended = true;
 	}
 
 	/* See if we need to do extra string manipulation */
-	if (is_quoted || prepended)
+	if (prepended)
 	{
 		size_t len;
 
 		/* Check if we need to prepend sm_ */
 		if (prepended)
 		{
-			len = UTIL_Format(m_ToExecute, sizeof(m_ToExecute), "sm_%s", args);
+			len = ke::SafeSprintf(m_ToExecute, sizeof(m_ToExecute), "sm_%s", 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';
-			}
+			len = ke::SafeStrcpy(m_ToExecute, sizeof(m_ToExecute), args);
 		}
 	} else {
-		strncopy(m_ToExecute, args, sizeof(m_ToExecute));
+		ke::SafeStrcpy(m_ToExecute, sizeof(m_ToExecute), 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

@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * 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
@@ -34,9 +34,11 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
+#include "GameHooks.h"
 #include <IGameHelpers.h>
 #include <compat_wrappers.h>
 #include <IForwardSys.h>
+#include <amtl/am-string.h>
 
 class ChatTriggers : public SMGlobalClass
 {
@@ -48,42 +50,47 @@ public: //SMGlobalClass
 	void OnSourceModAllInitialized_Post();
 	void OnSourceModGameInitialized();
 	void OnSourceModShutdown();
-	ConfigResult OnSourceModConfigChanged(const char *key, 
-		const char *value, 
+	ConfigResult OnSourceModConfigChanged(const char *key,
+		const char *value,
 		ConfigSource source,
-		char *error, 
+		char *error,
 		size_t maxlength);
 private: //ConCommand
-#if defined ORANGEBOX_BUILD
-	void OnSayCommand_Pre(const CCommand &command);
-	void OnSayCommand_Post(const CCommand &command);
-#else
-	void OnSayCommand_Pre();
-	void OnSayCommand_Post();
-#endif
+	bool OnSayCommand_Pre(int client, const ICommandArgs *args);
+	bool OnSayCommand_Post(int client, const ICommandArgs *args);
 public:
 	unsigned int GetReplyTo();
 	unsigned int SetReplyTo(unsigned int reply);
 	bool IsChatTrigger();
 	bool WasFloodedMessage();
 private:
-	bool PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted);
+	enum ChatTriggerType {
+		ChatTrigger_Public,
+		ChatTrigger_Private,
+	};
+	void SetChatTrigger(ChatTriggerType type, const char *value);
+	bool PreProcessTrigger(edict_t *pEdict, const char *args);
 	bool ClientIsFlooding(int client);
+	cell_t CallOnClientSayCommand(int client);
 private:
-	ConCommand *m_pSayCmd;
-	ConCommand *m_pSayTeamCmd;
-	char *m_PubTrigger;
-	size_t m_PubTriggerSize;
-	char *m_PrivTrigger;
-	size_t m_PrivTriggerSize;
+	ke::Vector<ke::RefPtr<CommandHook>> hooks_;
+	ke::AString m_PubTrigger;
+	ke::AString m_PrivTrigger;
 	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 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,75 +34,93 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include "ForwardSys.h"
-#include "sm_trie.h"
-#include "sm_memtable.h"
+#include <IForwardSys.h>
 #include <sh_list.h>
 #include <sh_string.h>
 #include <IRootConsoleMenu.h>
 #include <IAdminSystem.h>
 #include "concmd_cleaner.h"
+#include "GameHooks.h"
+#include <am-autoptr.h>
+#include <sm_stringhashmap.h>
+#include <am-utility.h>
+#include <am-inlinelist.h>
+#include <am-linkedlist.h>
+#include <am-refcounting.h>
 
 using namespace SourceHook;
 
-enum CmdType
+struct CmdHook;
+struct ConCmdInfo;
+
+struct CommandGroup : public ke::Refcounted<CommandGroup>
 {
-	Cmd_Server,
-	Cmd_Console,
-	Cmd_Admin,
+	ke::LinkedList<CmdHook *> hooks;
 };
 
 struct AdminCmdInfo
 {
-	AdminCmdInfo()
+	AdminCmdInfo(const ke::RefPtr<CommandGroup> &group, FlagBits flags)
+		: group(group),
+		  flags(flags),
+		  eflags(0)
 	{
-		cmdGrpId = -1;
-		flags = 0;
-		eflags = 0;
 	}
-	int cmdGrpId;			/* index into cmdgroup string table */
+	ke::RefPtr<CommandGroup> group;
 	FlagBits flags;			/* default flags */
 	FlagBits eflags;		/* effective flags */
 };
 
-struct CmdHook
+struct CmdHook : public ke::InlineListNode<CmdHook>
 {
-	CmdHook()
+	enum Type {
+		Server,
+		Client
+	};
+
+	CmdHook(Type type, ConCmdInfo *cmd, IPluginFunction *fun, const char *description)
+		: type(type),
+		  info(cmd),
+		  pf(fun),
+		  helptext(description)
 	{
-		pf = NULL;
-		pAdmin = NULL;
 	}
-	IPluginFunction *pf;	/* function hook */
-	String helptext;		/* help text */
-	AdminCmdInfo *pAdmin;	/* admin requirements, if any */
+
+	Type type;
+	ConCmdInfo *info;
+	IPluginFunction *pf;				/* function hook */
+	ke::AString helptext;				/* help text */
+	ke::AutoPtr<AdminCmdInfo> admin;	/* admin requirements, if any */
 };
 
+typedef ke::InlineList<CmdHook> CmdHookList;
+
 struct ConCmdInfo
 {
 	ConCmdInfo()
 	{
+		pPlugin = nullptr;
 		sourceMod = false;
-		pCmd = NULL;
+		pCmd = nullptr;
+		eflags = 0;
 	}
 	bool sourceMod;					/**< Determines whether or not concmd was created by a SourceMod plugin */
 	ConCommand *pCmd;				/**< Pointer to the command itself */
-	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 */
+	CmdHookList hooks;				/**< Hook list */
+	FlagBits eflags;				/**< Effective admin flags */
+	ke::RefPtr<CommandHook> sh_hook;   /**< SourceHook hook, if any. */
+	IPlugin *pPlugin; 				/**< Owning plugin handle. */
 };
 
+typedef List<ConCmdInfo *> ConCmdList;
+
 class ConCmdManager :
 	public SMGlobalClass,
 	public IRootConsoleCommand,
 	public IPluginsListener,
 	public IConCommandTracker
 {
-#if defined ORANGEBOX_BUILD
-	friend void CommandCallback(const CCommand &command);
-#else
-	friend void CommandCallback();
-#endif
+	friend void CommandCallback(DISPATCH_ARGS);
 public:
 	ConCmdManager();
 	~ConCmdManager();
@@ -112,50 +130,49 @@ public: //SMGlobalClass
 public: //IPluginsListener
 	void OnPluginDestroyed(IPlugin *plugin);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
 public: //IConCommandTracker
-	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
+	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) override;
 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 AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags, IPlugin *pPlugin);
 	bool AddAdminCommand(IPluginFunction *pFunction, 
 						 const char *name, 
 						 const char *group,
 						 int adminflags,
 						 const char *description, 
-						 int flags);
+						 int flags,
+						 IPlugin *pPlugin);
 	ResultType DispatchClientCommand(int client, const char *cmd, int args, ResultType type);
 	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);
+	bool InternalDispatch(int client, const ICommandArgs *args);
 	ResultType RunAdminCommand(ConCmdInfo *pInfo, int client, int args);
-	ConCmdInfo *AddOrFindCommand(const char *name, const char *description, int flags);
-	void SetCommandClient(int client);
+	ConCmdInfo *AddOrFindCommand(const char *name, const char *description, int flags, IPlugin *pPlugin);
 	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);
+	void RemoveConCmd(ConCmdInfo *info, const char *cmd, bool untrack);
 	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()
-	{
-		return m_CmdClient;
-	}
 	inline const List<ConCmdInfo *> & GetCommandList()
 	{
 		return m_CmdList;
 	}
 private:
-	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 */
+	typedef StringHashMap<ke::RefPtr<CommandGroup> > GroupMap;
+
+	StringHashMap<ConCmdInfo *> m_Cmds; /* command lookup */
+	GroupMap m_CmdGrps;				/* command group map */
+	ConCmdList m_CmdList;			/* command list */
 };
 
 extern ConCmdManager g_ConCmds;
 
 #endif // _INCLUDE_SOURCEMOD_CONCMDMANAGER_H_
+

core/ConCommandBaseIterator.h

@@ -0,0 +1,89 @@
+/**
+ * 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 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -25,40 +25,59 @@
  * 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_trie_tpl.h>
+#include <sm_namehashset.h>
+#include "logic_bridge.h"
+#include "sourcemod.h"
+#include "provider.h"
+#include <bridge/include/IScriptManager.h>
 
 ConVarManager g_ConVarManager;
 
-#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
-
-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 *);
-
 const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
 typedef List<const ConVar *> ConVarList;
-KTrie<ConVarInfo *> convar_cache;
+NameHashSet<ConVarInfo *> convar_cache;
 
-ConVarManager::ConVarManager() : m_ConVarType(0), m_bIsDLLQueryHooked(false), m_bIsVSPQueryHooked(false)
+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;
+
+ConVarManager::ConVarManager() : m_ConVarType(0)
 {
 }
 
@@ -76,26 +95,17 @@ void ConVarManager::OnSourceModStartup(bool late)
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 	/* Create the 'ConVar' handle type */
-	m_ConVarType = g_HandleSys.CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_ConVarType = handlesys->CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void ConVarManager::OnSourceModAllInitialized()
 {
-	/**
-	 * Episode 2 has this function by default, but the older versions do not.
-	 */
-#if !defined ORANGEBOX_BUILD
-	if (g_SMAPI->GetGameDLLVersion() >= 6)
-	{
-		SH_ADD_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
-		m_bIsDLLQueryHooked = true;
-	}
-#endif
+	g_Players.AddClientListener(this);
 
-	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
+	scripts->AddPluginsListener(this);
 
 	/* Add the 'convars' option to the 'sm' console command */
-	g_RootMenu.AddRootConsoleCommand("cvars", "View convars created by a plugin", this);
+	rootmenu->AddRootConsoleCommand3("cvars", "View convars created by a plugin", this);
 }
 
 void ConVarManager::OnSourceModShutdown()
@@ -110,10 +120,10 @@ void ConVarManager::OnSourceModShutdown()
 
 		iter = m_ConVars.erase(iter);
 
-		g_HandleSys.FreeHandle(pInfo->handle, &sec);
+		handlesys->FreeHandle(pInfo->handle, &sec);
 		if (pInfo->pChangeForward != NULL)
 		{
-			g_Forwards.ReleaseForward(pInfo->pChangeForward);
+			forwardsys->ReleaseForward(pInfo->pChangeForward);
 		}
 		if (pInfo->sourceMod)
 		{
@@ -141,73 +151,23 @@ void ConVarManager::OnSourceModShutdown()
 	}
 	convar_cache.clear();
 
-	/* Unhook things */
-	if (m_bIsDLLQueryHooked)
-	{
-		SH_REMOVE_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
-		m_bIsDLLQueryHooked = false;
-	}
-	else if (m_bIsVSPQueryHooked)
-	{
-		SH_REMOVE_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
-		m_bIsVSPQueryHooked = false;
-	}
-
-	SH_REMOVE_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
+	g_Players.RemoveClientListener(this);
 
 	/* Remove the 'convars' option from the 'sm' console command */
-	g_RootMenu.RemoveRootConsoleCommand("cvars", this);
+	rootmenu->RemoveRootConsoleCommand("cvars", this);
+
+	scripts->RemovePluginsListener(this);
 
 	/* Remove the 'ConVar' handle type */
-	g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent);
-}
-
-/**
- * Orange Box will never use this.
- */
-void ConVarManager::OnSourceModVSPReceived()
-{
-	/**
-	 * Don't bother if the DLL is already hooked.
-	 */
-	if (m_bIsDLLQueryHooked)
-	{
-		return;
-	}
-
-	/* For later MM:S versions, use the updated API, since it's cleaner. */
-#if defined METAMOD_PLAPI_VERSION
-	int engine = g_SMAPI->GetSourceEngineBuild();
-	if (engine == SOURCE_ENGINE_ORIGINAL || vsp_version < 2)
-	{
-		return;
-	}
-#else
-	if (g_HL2.IsOriginalEngine() || vsp_version < 2)
-	{
-		return;
-	}
-#endif
-
-	SH_ADD_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
-	m_bIsVSPQueryHooked = true;
+	handlesys->RemoveType(m_ConVarType, g_pCoreIdent);
 }
 
 bool convar_cache_lookup(const char *name, ConVarInfo **pVar)
 {
-	ConVarInfo **pLookup = convar_cache.retrieve(name);
-	if (pLookup != NULL)
-	{
-		*pVar = *pLookup;
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+	return convar_cache.retrieve(name, pVar);
 }
 
-void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe)
+void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name)
 {
 	/* Only check convars that have not been created by SourceMod's core */
 	ConVarInfo *pInfo;
@@ -223,7 +183,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 = g_PluginSys.GetPluginIterator();
+	IPluginIterator *pl_iter = scripts->GetPluginIterator();
 	while (pl_iter->MorePlugins())
 	{
 		IPlugin *pl = pl_iter->GetPlugin();
@@ -239,19 +199,51 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	}
 
 	/* Free resources */
-	g_HandleSys.FreeHandle(pInfo->handle, &sec);
+	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)
@@ -264,20 +256,27 @@ bool ConVarManager::GetHandleApproxSize(HandleType_t type, void *object, unsigne
 	return true;
 }
 
-void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
+void ConVarManager::OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command)
 {
-	int argcount = command.ArgC();
+	int argcount = command->ArgC();
 	if (argcount >= 3)
 	{
+		bool wantReset = false;
+		
 		/* Get plugin index that was passed */
-		const char *arg = command.Arg(2);
+		const char *arg = command->Arg(2);
+		if (argcount >= 4 && strcmp(arg, "reset") == 0)
+		{
+			wantReset = true;
+			arg = command->Arg(3);
+		}
 		
 		/* Get plugin object */
-		CPlugin *plugin = g_PluginSys.FindPluginByConsoleArg(arg);
+		IPlugin *plugin = scripts->FindPluginByConsoleArg(arg);
 
 		if (!plugin)
 		{
-			g_RootMenu.ConsolePrint("[SM] Plugin \"%s\" was not found.", arg);
+			UTIL_ConsolePrint("[SM] Plugin \"%s\" was not found.", arg);
 			return;
 		}
 
@@ -291,25 +290,38 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 		/* If no convar list... */
 		if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
 		{
-			g_RootMenu.ConsolePrint("[SM] No convars found for: %s", plname);
+			UTIL_ConsolePrint("[SM] No convars found for: %s", plname);
 			return;
 		}
 
-		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 */
+		if (!wantReset)
+		{
+			UTIL_ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
+			UTIL_ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
+		}
+		
+		/* Iterate convar list and display/reset each one */
 		for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
 		{
-			const ConVar *pConVar = (*iter);
-			g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
+			/*const */ConVar *pConVar = const_cast<ConVar *>(*iter);
+			if (!wantReset)
+			{
+				UTIL_ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
+			} else {
+				pConVar->Revert();
+			}
+		}
+		
+		if (wantReset)
+		{
+			UTIL_ConsolePrint("[SM] Reset %d convars for: %s", pConVarList->size(), plname);
 		}
 
 		return;
 	}
 
 	/* Display usage of subcommand */
-	g_RootMenu.ConsolePrint("[SM] Usage: sm convars <plugin #>");
+	UTIL_ConsolePrint("[SM] Usage: sm cvars [reset] <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)
@@ -341,7 +353,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 = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+			hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 			if (hndl == BAD_HANDLE)
 			{
 				delete pInfo;
@@ -359,17 +371,10 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 		}
 	}
 
-	/* To prevent creating a convar that has the same name as a console command... ugh */
-	ConCommandBase *pBase = icvar->GetCommands();
-
-	while (pBase)
+	/* Prevent creating a convar that has the same name as a console command */
+	if (FindCommand(name))
 	{
-		if (pBase->IsCommand() && strcmp(pBase->GetName(), name) == 0)
-		{
-			return BAD_HANDLE;
-		}
-
-		pBase = const_cast<ConCommandBase *>(pBase->GetNext());
+		return BAD_HANDLE;
 	}
 
 	/* Create and initialize ConVarInfo structure */
@@ -379,7 +384,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	pInfo->pChangeForward = NULL;
 
 	/* Create a handle from the new convar */
-	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -408,7 +413,13 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	ConVarInfo *pInfo;
 	Handle_t hndl;
 
-	/* Search for convar */
+	/* 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 */
 	pConVar = icvar->FindVar(name);
 
 	/* If it doesn't exist, then return an invalid handle */
@@ -417,12 +428,6 @@ 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;
@@ -430,7 +435,7 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	pInfo->pVar = pConVar;
 
 	/* If we don't have a handle, then create a new one */
-	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -488,7 +493,7 @@ void ConVarManager::HookConVarChange(ConVar *pConVar, IPluginFunction *pFunction
 		/* If forward does not exist, create it */
 		if (!pForward)
 		{
-			pForward = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
+			pForward = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
 			pInfo->pChangeForward = pForward;
 		}
 
@@ -524,10 +529,11 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 		}
 
 		/* If the forward now has 0 functions in it... */
-		if (pForward->GetFunctionCount() == 0)
+		if (pForward->GetFunctionCount() == 0 &&
+			!ConVarReentrancyGuard::IsCvarInChain(pConVar))
 		{
 			/* Free this forward */
-			g_Forwards.ReleaseForward(pForward);
+			forwardsys->ReleaseForward(pForward);
 			pInfo->pChangeForward = NULL;
 		}
 	}
@@ -535,24 +541,13 @@ 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;
+	QueryCvarCookie_t cookie = sCoreProviderImpl.QueryClientConVar(IndexOfEdict(pPlayer), name);
 
-	/* Call StartQueryCvarValue() in either the IVEngineServer or IServerPluginHelpers depending on situation */
-	if (m_bIsDLLQueryHooked)
+	if (pCallback != NULL)
 	{
-		cookie = engine->StartQueryCvarValue(pPlayer, name);	
+		ConVarQuery query = { cookie, pCallback, (cell_t) hndl, IndexOfEdict(pPlayer) };
+		m_ConVarQueries.push_back(query);
 	}
-	else if (m_bIsVSPQueryHooked)
-	{
-		cookie = serverpluginhelpers->StartQueryCvarValue(pPlayer, name);
-	}
-	else
-	{
-		return InvalidQueryCvarCookie;
-	}
-
-	ConVarQuery query = {cookie, pCallback, hndl};
-	m_ConVarQueries.push_back(query);
 
 	return cookie;
 }
@@ -564,7 +559,7 @@ void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar
 	bool inserted = false;
 	const char *orig = pConVar->GetName();
 
-	IPlugin *plugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+	IPlugin *plugin = scripts->FindPluginByContext(pContext->GetContext());
 
 	/* Check plugin for an existing convar list */
 	if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
@@ -595,11 +590,7 @@ void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar
 	}
 }
 
-#if defined ORANGEBOX_BUILD
 void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue)
-#else
-void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
-#endif
 {
 	/* If the values are the same, exit early in order to not trigger callbacks */
 	if (strcmp(pConVar->GetString(), oldValue) == 0)
@@ -619,20 +610,14 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 
 	if (pInfo->changeListeners.size() != 0)
 	{
-		for (List<IConVarChangeListener *>::iterator i = pInfo->changeListeners.begin();
-			 i != pInfo->changeListeners.end();
-			 i++)
-		{
-#if defined ORANGEBOX_BUILD
+		for (auto i = pInfo->changeListeners.begin(); i != pInfo->changeListeners.end(); i++)
 			(*i)->OnConVarChanged(pConVar, oldValue, flOldValue);
-#else
-			(*i)->OnConVarChanged(pConVar, oldValue, atof(oldValue));
-#endif
-		}
 	}
 
 	if (pForward != NULL)
 	{
+		ConVarReentrancyGuard guard(pConVar);
+
 		/* Now call forwards in plugins that have hooked this */
 		pForward->PushCell(pInfo->handle);
 		pForward->PushString(oldValue);
@@ -643,10 +628,15 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 
 bool ConVarManager::IsQueryingSupported()
 {
-	return (m_bIsDLLQueryHooked || m_bIsVSPQueryHooked);
+	return sCoreProviderImpl.IsClientConVarQueryingSupported();
 }
 
-void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue)
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
+                                          int client,
+                                          EQueryCvarValueStatus result,
+										  const char *cvarName,
+										  const char *cvarValue)
 {
 	IPluginFunction *pCallback = NULL;
 	cell_t value = 0;
@@ -668,7 +658,7 @@ void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *
 		cell_t ret;
 
 		pCallback->PushCell(cookie);
-		pCallback->PushCell(engine->IndexOfEdict(pPlayer));
+		pCallback->PushCell(client);
 		pCallback->PushCell(result);
 		pCallback->PushString(cvarName);
 
@@ -687,13 +677,14 @@ 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 = g_HandleSys.ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
+	if ((error = handlesys->ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
 	{
 		return error;
 	}

core/ConVarManager.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -39,8 +39,11 @@
 #include <IForwardSys.h>
 #include <IHandleSys.h>
 #include <IRootConsoleMenu.h>
+#include <IPlayerHelpers.h>
 #include <compat_wrappers.h>
 #include "concmd_cleaner.h"
+#include "PlayerManager.h"
+#include <sm_stringhashmap.h>
 
 using namespace SourceHook;
 
@@ -60,6 +63,15 @@ 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;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
 };
 
 /**
@@ -70,6 +82,7 @@ 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 :
@@ -77,7 +90,8 @@ class ConVarManager :
 	public IHandleTypeDispatch,
 	public IPluginsListener,
 	public IRootConsoleCommand,
-	public IConCommandTracker
+	public IConCommandTracker,
+	public IClientListener
 {
 public:
 	ConVarManager();
@@ -86,16 +100,17 @@ public: // SMGlobalClass
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
-	void OnSourceModVSPReceived();
 public: // IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize);
 public: // IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
 public: //IConCommandTracker
-	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
+	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) override;
+public: //IClientListener
+	void OnClientDisconnected(int client);
 public:
 	/**
 	 * Create a convar and return a handle to it.
@@ -131,32 +146,26 @@ public:
 
 	HandleError ReadConVarHandle(Handle_t hndl, ConVar **pVar);
 
+	// Called via game hooks.
+	void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	void OnClientQueryFinished(
+	  QueryCvarCookie_t cookie,
+	  int client,
+	  EQueryCvarValueStatus result,
+	  const char *cvarName,
+	  const char *cvarValue);
+#endif
+
 private:
 	/**
 	 * Adds a convar to a plugin's list.
 	 */
 	static void AddConVarToPluginList(IPluginContext *pContext, const ConVar *pConVar);
-
-	/**
-	 * Static callback that Valve's ConVar object executes when the convar's value changes.
-	 */
-#if defined ORANGEBOX_BUILD
-	static void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
-#else
-	static void OnConVarChanged(ConVar *pConVar, const char *oldValue);
-#endif
-
-	/**
-	 * Callback for when StartQueryCvarValue() has finished.
-	 */
-	void OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result,
-	                              const char *cvarName, const char *cvarValue);
 private:
 	HandleType_t m_ConVarType;
 	List<ConVarInfo *> m_ConVars;
 	List<ConVarQuery> m_ConVarQueries;
-	bool m_bIsDLLQueryHooked;
-	bool m_bIsVSPQueryHooked;
 };
 
 extern ConVarManager g_ConVarManager;

core/ConsoleDetours.cpp

@@ -0,0 +1,409 @@
+/**
+ * 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 "command_args.h"
+#include "provider.h"
+#include <am-utility.h>
+#include <bridge/include/ILogger.h>
+
+#if defined PLATFORM_POSIX
+# include <dlfcn.h>
+# include <sys/mman.h>
+# include <stdint.h>
+# include <unistd.h>
+#endif
+
+#if 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
+
+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_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);
+	}
+};
+
+/**
+ * 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::AutoPtr<char[]> str(UTIL_ToLowerCase(command));
+		IChangeableForward *forward;
+		if (!m_Listeners.retrieve(str.get(), &forward))
+		{
+			forward = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
+			                                     Param_String, Param_Cell);
+			m_Listeners.insert(str.get(), forward);
+		}
+		forward->AddFunction(fun);
+	}
+
+	return true;
+}
+
+bool ConsoleDetours::RemoveListener(IPluginFunction *fun, const char *command)
+{
+	if (command == NULL)
+	{
+		return m_pForward->RemoveFunction(fun);
+	}
+	else
+	{
+		ke::AutoPtr<char[]> str(UTIL_ToLowerCase(command));
+		IChangeableForward *forward;
+		if (!m_Listeners.retrieve(str.get(), &forward))
+			return false;
+		return forward->RemoveFunction(fun);
+	}
+}
+
+cell_t ConsoleDetours::InternalDispatch(int client, const ICommandArgs *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
+	EngineArgs cargs(args);
+	cell_t res;
+	{
+		AutoEnterCommand autoEnterCommand(&cargs);
+		res = g_ConsoleDetours.InternalDispatch(sCoreProviderImpl.CommandClient(), &cargs);
+	}
+
+	return res;
+}

core/ConsoleDetours.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -28,61 +28,55 @@
  *
  * Version: $Id$
  */
+#ifndef _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
+#define _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
 
-#ifndef _INCLUDE_SOURCEMOD_SERVERCOMMANDS_H_
-#define _INCLUDE_SOURCEMOD_SERVERCOMMANDS_H_
-
-#include "sourcemod.h"
-#include <IRootConsoleMenu.h>
-#include "PluginSys.h"
+#include "sm_globals.h"
 #include "sourcemm_api.h"
-#include <sh_list.h>
-#include <sh_string.h>
-#include <compat_wrappers.h>
-#include "sm_trie.h"
+#include <IForwardSys.h>
+#include <sm_stringhashmap.h>
 
-using namespace SourceMod;
-using namespace SourceHook;
+namespace SourceMod {
+class ICommandArgs;
+} // namespace SourceMod
 
-struct ConsoleEntry
-{
-	String command;
-	String description;
-};
-
-class RootConsoleMenu : 
-	public IConCommandBaseAccessor,
+class ConsoleDetours :
 	public SMGlobalClass,
-	public IRootConsoleCommand,
-	public IRootConsole
+	public IFeatureProvider
 {
+	friend class PlayerManager;
+	friend class GenericCommandHooker;
+
 public:
-	RootConsoleMenu();
-	~RootConsoleMenu();
-public:
-	const char *GetInterfaceName();
-	unsigned int GetInterfaceVersion();
-public: //IConCommandBaseAccessor
-	bool RegisterConCommandBase(ConCommandBase *pCommand);
+	ConsoleDetours();
 public: //SMGlobalClass
-	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
-public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
-public: //IRootConsole
-	bool AddRootConsoleCommand(const char *cmd, const char *text, IRootConsoleCommand *pHandler);
-	bool RemoveRootConsoleCommand(const char *cmd, IRootConsoleCommand *pHandler);
-	void ConsolePrint(const char *fmt, ...);
-	void DrawGenericOption(const char *cmd, const char *text);
+public: //IFeatureProvider
+	FeatureStatus GetFeatureStatus(FeatureType type, const char *name);
 public:
-	void GotRootCmd(const CCommand &cmd);
+	bool AddListener(IPluginFunction *fun, const char *command);
+	bool RemoveListener(IPluginFunction *fun, const char *command);
 private:
-	bool m_CfgExecDone;
-	Trie *m_pCommands;
-	List<ConsoleEntry *> m_Menu;
+	cell_t InternalDispatch(int client, const SourceMod::ICommandArgs *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 RootConsoleMenu g_RootMenu;
+extern ConsoleDetours g_ConsoleDetours;
+
+#endif /* _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_ */
 
-#endif //_INCLUDE_SOURCEMOD_SERVERCOMMANDS_H_

core/CoreConfig.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -33,69 +33,189 @@
 #include "CoreConfig.h"
 #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 "PluginSys.h"
-#include "ForwardSys.h"
+#include "frame_hooks.h"
+#include "logic_bridge.h"
+#include "compat_wrappers.h"
+#include <sourcemod_version.h>
+#include <amtl/os/am-path.h>
+#include <amtl/os/am-fsutil.h>
+#include <sh_list.h>
+#include <IForwardSys.h>
+#include <bridge/include/IScriptManager.h>
+#include <bridge/include/ILogger.h>
+
+using namespace SourceHook;
 
 #ifdef PLATFORM_WINDOWS
 ConVar sm_corecfgfile("sm_corecfgfile", "addons\\sourcemod\\configs\\core.cfg", 0, "SourceMod core configuration file");
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE
 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_ORANGEBOX
+SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
+void Hook_ExecDispatchPre(const CCommand &cmd)
+#else
+SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+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_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 = g_Forwards.CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
-	g_pOnConfigsExecuted = g_Forwards.CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
+	rootmenu->AddRootConsoleCommand3("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()
+{
 }
 
 void CoreConfig::OnSourceModShutdown()
 {
-	g_RootMenu.RemoveRootConsoleCommand("config", this);
-	g_Forwards.ReleaseForward(g_pOnServerCfg);
-	g_Forwards.ReleaseForward(g_pOnConfigsExecuted);
+	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;
+	}
 }
 
 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)
+void CoreConfig::OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command)
 {
-	int argcount = command.ArgC();
+	int argcount = command->ArgC();
 	if (argcount >= 4)
 	{
-		const char *option = command.Arg(2);
-		const char *value = command.Arg(3);
+		const char *option = command->Arg(2);
+		const char *value = command->Arg(3);
 
 		char error[255];
-
 		ConfigResult res = SetConfigOption(option, value, ConfigSource_Console, error, sizeof(error));
 
 		if (res == ConfigResult_Reject)
 		{
-			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);
+			UTIL_ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\". (%s)", option, value, error);
 		} else {
-			g_RootMenu.ConsolePrint("Config option \"%s\" successfully set to \"%s.\"", option, value);
+			if (res == ConfigResult_Ignore) {
+				UTIL_ConsolePrint("[SM] WARNING: Config option \"%s\" is not registered.", option);
+			}
+
+			UTIL_ConsolePrint("[SM] Config option \"%s\" set to \"%s\".", option, value);
 		}
 
+		return;
+	} else if (argcount >= 3) {
+		const char *option = command->Arg(2);
+		
+		const char *value = GetCoreConfigValue(option);
+		
+		if (value == NULL)
+		{
+			UTIL_ConsolePrint("[SM] No such config option \"%s\" exists.", option);
+		} else {
+			UTIL_ConsolePrint("[SM] Config option \"%s\" is set to \"%s\".", option, value);
+		}
+		
 		return;
 	}
 
-	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> <value>");
+	UTIL_ConsolePrint("[SM] Usage: sm config <option> [value]");
 }
 
 void CoreConfig::Initialize()
@@ -106,21 +226,38 @@ void CoreConfig::Initialize()
 	/* Try to get command line value of core config convar */
 	const char *corecfg = icvar->GetCommandLineValue("sm_corecfgfile");
 
-	/* If sm_corecfgfile not specified on command line, use default value */
-	if (!corecfg)
+	/* 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)
 	{
-		corecfg = sm_corecfgfile.GetDefault();
+		ke::path::Format(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
+	}
+	else
+	{
+		const char *basepath = icvar->GetCommandLineValue("sm_basepath");
+
+		/* Format path to config file */
+		if (basepath)
+		{
+			ke::path::Format(filePath, sizeof(filePath), "%s/%s/%s", g_SourceMod.GetGamePath(), basepath, "configs/core.cfg");
+		}
+		else
+		{
+			ke::path::Format(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), sm_corecfgfile.GetDefault());
+		}
 	}
 
-	/* Format path to config file */
-	g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
+	/* Reset cached key values */
+	m_KeyValues.clear();
 
 	/* 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);
-		g_Logger.LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
+		logger->LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
 	}
 }
 
@@ -132,7 +269,7 @@ SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 	if (err == ConfigResult_Reject)
 	{
 		/* This is a fatal error */
-		g_Logger.LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
+		logger->LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
 	}
 
 	return SMCResult_Continue;
@@ -140,7 +277,7 @@ SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 
 ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value, ConfigSource source, char *error, size_t maxlength)
 {
-	ConfigResult result;
+	ConfigResult result = ConfigResult_Ignore;
 
 	/* Notify! */
 	SMGlobalClass *pBase = SMGlobalClass::head;
@@ -148,12 +285,23 @@ ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value,
 	{
 		if ((result = pBase->OnSourceModConfigChanged(option, value, source, error, maxlength)) != ConfigResult_Ignore)
 		{
-			return result;
+			break;
 		}
 		pBase = pBase->m_pGlobalClassNext;
 	}
 
-	return ConfigResult_Ignore;
+	ke::AString vstr(value);
+	m_KeyValues.replace(option, ke::Move(vstr));
+
+	return result;
+}
+
+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()
@@ -165,12 +313,12 @@ inline bool IsPathSepChar(char c)
 {
 #if defined PLATFORM_WINDOWS
 	return (c == '\\' || c == '/');
-#elif defined PLATFORM_LINUX
+#elif defined PLATFORM_LINUX || defined PLATFORM_POSIX
 	return (c == '/');
 #endif
 }
 
-bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
+bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 {
 	bool will_create = false;
 	
@@ -188,12 +336,12 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 
 		g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "cfg/%s", folder);
 
-		if (!g_LibSys.IsPathDirectory(path))
+		if (!ke::file::IsDirectory(path))
 		{
 			char *cur_ptr = path;
 			size_t len;
 			
-			g_LibSys.PathFormat(path, sizeof(path), "%s", folder);
+			ke::path::Format(path, sizeof(path), "%s", folder);
 			len = g_SourceMod.BuildPath(Path_Game, build, sizeof(build), "cfg");
 
 			do
@@ -214,14 +362,12 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 				{
 					next_ptr = NULL;
 				}
-				len += g_LibSys.PathFormat(&build[len], 
+				len += ke::path::Format(&build[len],
 					sizeof(build)-len,
 					"/%s",
 					cur_ptr);
-				if (!g_LibSys.CreateFolder(build))
-				{
+				if (!ke::file::CreateDirectory(build))
 					break;
-				}
 				cur_ptr = next_ptr;
 			} while (cur_ptr);
 		}
@@ -233,13 +379,13 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 
 	if (cfg->folder.size())
 	{
-		g_LibSys.PathFormat(local, 
-			sizeof(local), 
+		ke::path::Format(local,
+			sizeof(local),
 			"%s/%s.cfg",
 			cfg->folder.c_str(),
 			cfg->autocfg.c_str());
 	} else {
-		g_LibSys.PathFormat(local,
+		ke::path::Format(local,
 			sizeof(local),
 			"%s.cfg",
 			cfg->autocfg.c_str());
@@ -247,7 +393,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 	
 	g_SourceMod.BuildPath(Path_Game, file, sizeof(file), "cfg/%s", local);
 
-	bool file_exists = g_LibSys.IsPathFile(file);
+	bool file_exists = ke::file::IsFile(file);
 	if (!file_exists && will_create)
 	{
 		List<const ConVar *> *convars = NULL;
@@ -257,7 +403,7 @@ bool SM_ExecuteConfig(CPlugin *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", SVN_FULL_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SOURCEMOD_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 
@@ -266,8 +412,11 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 				for (iter = convars->begin(); iter != convars->end(); iter++)
 				{
 					const ConVar *cvar = (*iter);
-
-					if ((cvar->GetFlags() & FCVAR_DONTRECORD) == FCVAR_DONTRECORD)
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+					if (cvar->IsFlagSet(FCVAR_DONTRECORD))
+#else
+					if (cvar->IsBitSet(FCVAR_DONTRECORD))
+#endif
 					{
 						continue;
 					}
@@ -276,7 +425,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 					char *dptr = descr;
 
 					/* Print comments until there is no more */
-					strncopy(descr, cvar->GetHelpText(), sizeof(descr));
+					ke::SafeStrcpy(descr, sizeof(descr), cvar->GetHelpText());
 					while (*dptr != '\0')
 					{
 						/* Find the next line */
@@ -314,13 +463,18 @@ bool SM_ExecuteConfig(CPlugin *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;
+			}
 		}
 	}
 
 	if (file_exists)
 	{
 		char cmd[255];
-		UTIL_Format(cmd, sizeof(cmd), "exec %s\n", local);
+		ke::SafeSprintf(cmd, sizeof(cmd), "exec %s\n", local);
 		engine->ServerCommand(cmd);
 	}
 
@@ -344,10 +498,10 @@ void SM_DoSingleExecFwds(IPluginContext *ctx)
 
 void SM_ConfigsExecuted_Plugin(unsigned int serial)
 {
-	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
+	IPluginIterator *iter = scripts->GetPluginIterator();
 	while (iter->MorePlugins())
 	{
-		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
+		IPlugin *plugin = iter->GetPlugin();
 		if (plugin->GetSerial() == serial)
 		{
 			SM_DoSingleExecFwds(plugin->GetBaseContext());
@@ -360,7 +514,7 @@ void SM_ConfigsExecuted_Plugin(unsigned int serial)
 
 void SM_ExecuteForPlugin(IPluginContext *ctx)
 {
-	CPlugin *plugin = (CPlugin *)g_PluginSys.GetPluginByCtx(ctx->GetContext());
+	SMPlugin *plugin = scripts->FindPluginByContext(ctx->GetContext());
 
 	unsigned int num = plugin->GetConfigCount();
 	if (!num)
@@ -375,35 +529,34 @@ void SM_ExecuteForPlugin(IPluginContext *ctx)
 			can_create = SM_ExecuteConfig(plugin, plugin->GetConfig(i), can_create);
 		}
 		char cmd[255];
-		UTIL_Format(cmd, sizeof(cmd), "sm internal 2 %d\n", plugin->GetSerial());
+		ke::SafeSprintf(cmd, sizeof(cmd), "sm_internal 2 %d\n", plugin->GetSerial());
 		engine->ServerCommand(cmd);
 	}
 }
 
 void SM_ExecuteAllConfigs()
 {
-	if (g_bConfigsExecd)
+	if (g_bGotServerStart)
 	{
 		return;
 	}
 
 	engine->ServerCommand("exec sourcemod/sourcemod.cfg\n");
 
-	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
-	while (iter->MorePlugins())
+	AutoPluginList plugins(scripts);
+	for (size_t i = 0; i < plugins->size(); i++)
 	{
-		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
+		SMPlugin *plugin = plugins->at(i);
 		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();
 
-	engine->ServerCommand("sm internal 1\n");
+	g_bGotServerStart = true;
+	CheckAndFinalizeConfigs();
 }
 
 void SM_ConfigsExecuted_Global()
@@ -418,3 +571,29 @@ 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;
+}
+
+CON_COMMAND(sm_internal, "")
+{
+#if SOURCE_ENGINE <= SE_DARKMESSIAH
+	CCommand args;
+#endif
+
+	if (args.ArgC() < 1)
+		return;
+
+	const char *arg = args.Arg(1);
+	if (strcmp(arg, "1") == 0) {
+		SM_ConfigsExecuted_Global();
+	} else if (strcmp(arg, "2") == 0) {
+		if (args.ArgC() >= 3)
+			SM_ConfigsExecuted_Plugin(atoi(args.Arg(2)));
+	}
+}

core/CoreConfig.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,6 +35,8 @@
 #include "sm_globals.h"
 #include <ITextParsers.h>
 #include <IRootConsoleMenu.h>
+#include <am-string.h>
+#include <sm_stringhashmap.h>
 
 using namespace SourceMod;
 
@@ -43,6 +45,9 @@ class CoreConfig :
 	public ITextListener_SMC,
 	public IRootConsoleCommand
 {
+public:
+	CoreConfig();
+	~CoreConfig();
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
@@ -50,17 +55,20 @@ public: // SMGlobalClass
 public: // ITextListener_SMC
 	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
 public: // IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
 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();
@@ -68,6 +76,7 @@ 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

@@ -1,145 +0,0 @@
-/**
- * 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$
- */
-
-#if 0
-#include "sm_globals.h"
-#include "sourcemm_api.h"
-#include "Tlhelp32.h"
-#include "LibrarySys.h"
-#include "minidump.h"
-
-BOOL
-WINAPI
-MiniDumpWriteDump2(
-				  IN HANDLE hProcess,
-				  IN DWORD ProcessId,
-				  IN HANDLE hFile,
-				  IN MINIDUMP_TYPE DumpType,
-				  IN CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, OPTIONAL
-				  IN CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, OPTIONAL
-				  IN CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam OPTIONAL
-				  )
-{
-	DumpType = (MINIDUMP_TYPE)((int)DumpType|MiniDumpWithFullMemory|MiniDumpWithHandleData);
-	return MiniDumpWriteDump(hProcess, ProcessId, hFile, DumpType, ExceptionParam, UserStreamParam, CallbackParam);
-}
-
-FARPROC WINAPI GetProcAddress2(HMODULE hModule, LPCSTR lpProcName)
-{
-	if (strcmp(lpProcName, "MiniDumpWriteDump") == 0)
-	{
-		return (FARPROC)MiniDumpWriteDump2;
-	}
-
-	return GetProcAddress(hModule, lpProcName);
-}
-
-class CrazyWindowsDebugger : public SMGlobalClass
-{
-public:
-	void OnSourceModAllInitialized()
-	{
-		HANDLE hModuleList = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
-		MODULEENTRY32 me32;
-
-		me32.dwSize = sizeof(MODULEENTRY32);
-
-		if (!Module32First(hModuleList, &me32))
-		{
-			Error("Could not initialize crazy debugger!");
-		}
-
-		bool found = false;
-
-		do
-		{
-			if (strcasecmp(me32.szModule, "steam.dll") == 0)
-			{
-				IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)me32.modBaseAddr;
-				if (dos->e_magic != IMAGE_DOS_SIGNATURE)
-				{
-					Error("[SM] Could not detect steam.dll with valid DOS signature");
-				}
-				char *base = (char *)dos;
-				IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)(base + dos->e_lfanew);
-				if (nt->Signature != IMAGE_NT_SIGNATURE)
-				{
-					Error("[SM] Could not detect steam.dll with valid NT signature");
-				}
-				IMAGE_IMPORT_DESCRIPTOR *desc = 
-					(IMAGE_IMPORT_DESCRIPTOR *)
-					(base + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
-				if (base == (char *)desc)
-				{
-					Error("[SM] Could not find the steam.dll IAT");
-				}
-				while (desc->Name)
-				{
-					if (desc->FirstThunk != 0)
-					{
-						IMAGE_THUNK_DATA *data = (IMAGE_THUNK_DATA *)(base + desc->OriginalFirstThunk);
-						DWORD *iat = (DWORD *)(base + desc->FirstThunk);
-						while (data->u1.Function)
-						{
-							if ((data->u1.Ordinal & IMAGE_ORDINAL_FLAG32) != IMAGE_ORDINAL_FLAG32)
-							{
-								IMAGE_IMPORT_BY_NAME *import = (IMAGE_IMPORT_BY_NAME *)(base + data->u1.AddressOfData);
-								if (strcmp((char *)import->Name, "GetProcAddress") == 0)
-								{
-									DWORD oldprot, oldprot2;
-									VirtualProtect(iat, 4, PAGE_READWRITE, &oldprot);
-									*iat = (DWORD)GetProcAddress2;
-									VirtualProtect(iat, 4, oldprot, &oldprot2);
-									found = true;
-									goto _end;
-								}
-							}
-							data++;
-							iat++;
-						}
-					}
-					desc++;
-				}
-				break;
-			}
-		} while  (Module32Next(hModuleList, &me32));
-
-_end:
-
-		if (!found)
-		{
-			Error("Could not find steam.dll's GetProcAddress IAT entry");
-		}
-
-		CloseHandle(hModuleList);
-	}
-} s_CrazyDebugger;
-#endif

core/EventManager.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,10 +30,11 @@
  */
 
 #include "EventManager.h"
-#include "ForwardSys.h"
-#include "HandleSys.h"
-#include "PluginSys.h"
 #include "sm_stringutil.h"
+#include "PlayerManager.h"
+
+#include "logic_bridge.h"
+#include <bridge/include/IScriptManager.h>
 
 EventManager g_EventManager;
 
@@ -42,16 +43,26 @@ 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++)
@@ -65,8 +76,8 @@ EventManager::~EventManager()
 void EventManager::OnSourceModAllInitialized()
 {
 	/* Add a hook for IGameEventManager2::FireEvent() */
-	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
-	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
+	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);
 
 	HandleAccess sec;
 
@@ -76,17 +87,17 @@ void EventManager::OnSourceModAllInitialized()
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 	/* Create the 'GameEvent' handle type */
-	m_EventType = g_HandleSys.CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_EventType = handlesys->CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void EventManager::OnSourceModShutdown()
 {
 	/* Remove hook for IGameEventManager2::FireEvent() */
-	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
-	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
+	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);
 
 	/* Remove the 'GameEvent' handle type */
-	g_HandleSys.RemoveType(m_EventType, g_pCoreIdent);
+	handlesys->RemoveType(m_EventType, g_pCoreIdent);
 
 	/* Remove ourselves as listener for events */
 	gameevents->RemoveListener(this);
@@ -124,12 +135,12 @@ void EventManager::OnPluginUnloaded(IPlugin *plugin)
 			{
 				if (pHook->pPreHook)
 				{
-					g_Forwards.ReleaseForward(pHook->pPreHook);
+					forwardsys->ReleaseForward(pHook->pPreHook);
 				}
 
 				if (pHook->pPostHook)
 				{
-					g_Forwards.ReleaseForward(pHook->pPostHook);
+					forwardsys->ReleaseForward(pHook->pPostHook);
 				}
 
 				delete pHook;
@@ -147,6 +158,13 @@ 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
+int EventManager::GetEventDebugID()
+{
+	return EVENT_DEBUG_ID_INIT;
+}
+#endif
+
 EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunction, EventHookMode mode)
 {
 	EventHook *pHook;
@@ -163,10 +181,10 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 	}
 
 	/* If a hook structure does not exist... */
-	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
+	if (!m_EventHooks.retrieve(name, &pHook))
 	{
 		EventHookList *pHookList;
-		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
 
 		/* Check plugin for an existing EventHook list */
 		if (!plugin->GetProperty("EventHooks", (void **)&pHookList))
@@ -181,24 +199,27 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		if (mode == EventHookMode_Pre)
 		{
 			/* Create forward for a pre hook */
-			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
 			/* Add to forward list */
 			pHook->pPreHook->AddFunction(pFunction);
 		} else {
 			/* Create forward for a post hook */
-			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = forwardsys->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);
-		sm_trie_insert(m_EventHooks, name, pHook);
+		m_EventHooks.insert(name, pHook);
 
 		return EventHookErr_Okay;
 	}
@@ -210,7 +231,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create pre hook forward if necessary */
 		if (!pHook->pPreHook)
 		{
-			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
 		}
 
 		/* Add plugin function to forward list */
@@ -219,7 +240,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create post hook forward if necessary */
 		if (!pHook->pPostHook)
 		{
-			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 		}
 
 		/* If postCopy is false, then we may want to set it to true */
@@ -244,7 +265,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	IChangeableForward **pEventForward;
 
 	/* If hook does not exist at all */
-	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
+	if (!m_EventHooks.retrieve(name, &pHook))
 	{
 		return EventHookErr_NotActive;
 	}
@@ -266,7 +287,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	/* If forward's list contains 0 functions now, free it */
 	if ((*pEventForward)->GetFunctionCount() == 0)
 	{
-		g_Forwards.ReleaseForward(*pEventForward);
+		forwardsys->ReleaseForward(*pEventForward);
 		*pEventForward = NULL;
 	}
 
@@ -276,7 +297,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		/* If reference count is now 0, free hook structure */
 
 		EventHookList *pHookList;
-		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
 
 		/* Get plugin's event hook list */
 		if (!plugin->GetProperty("EventHooks", (void**)&pHookList))
@@ -294,7 +315,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		pHookList->remove(pHook);
 
 		/* Delete entry in trie */
-		sm_trie_delete(m_EventHooks, name);
+		m_EventHooks.remove(name);
 
 		/* And finally free structure memory */
 		delete pHook;
@@ -321,6 +342,7 @@ EventInfo *EventManager::CreateEvent(IPluginContext *pContext, const char *name,
 
 		pInfo->pEvent = pEvent;
 		pInfo->pOwner = pContext->GetIdentity();
+		pInfo->bDontBroadcast = false;
 
 		return pInfo;
 	}
@@ -340,6 +362,13 @@ void EventManager::FireEvent(EventInfo *pInfo, bool bDontBroadcast)
 	m_FreeEvents.push(pInfo);
 }
 
+void EventManager::FireEventToClient(EventInfo *pInfo, IClient *pClient)
+{
+	// The IClient vtable is +sizeof(void *) from the IGameEventListener2 (CBaseClient) vtable due to multiple inheritance.
+	IGameEventListener2 *pGameClient = (IGameEventListener2 *)((intptr_t)pClient - sizeof(void *));
+	pGameClient->FireGameEvent(pInfo->pEvent);
+}
+
 void EventManager::CancelCreatedEvent(EventInfo *pInfo)
 {
 	/* Free event from IGameEventManager2 */
@@ -359,41 +388,64 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 	IChangeableForward *pForward;
 	const char *name;
 	cell_t res = Pl_Continue;
-	
-	/* Get the event name, we're going to need this for passing to post hooks */
-	name = pEvent->GetName();
+	bool broadcast = bDontBroadcast;
 
-	m_EventNames.push(name);
-
-	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
+	/* 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);
+
 		pForward = pHook->pPreHook;
 
 		if (pForward)
 		{
-			EventInfo info = { pEvent, NULL };
+			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);
 
-			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, NULL);
+			pForward->Execute(&res, &filter);
 
-			HandleSecurity sec(NULL, g_pCoreIdent);
-			g_HandleSys.FreeHandle(hndl, &sec);
+			broadcast = info.bDontBroadcast;
+
+			handlesys->FreeHandle(hndl, &sec);
 		}
 
 		if (pHook->postCopy)
 		{
-			pHook->pEventCopy = gameevents->DuplicateEvent(pEvent);
+			m_EventCopies.push(gameevents->DuplicateEvent(pEvent));
 		}
 
-		if (res)
+		if (res >= Pl_Handled)
 		{
 			gameevents->FreeEvent(pEvent);
 			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);
 }
@@ -401,32 +453,38 @@ 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;
 
-	name = m_EventNames.front();
+	/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
+	if (!pEvent)
+	{
+		RETURN_META_VALUE(MRES_IGNORED, false);
+	}
 
-	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
+	pHook = m_EventStack.front();
+
+	if (pHook != NULL)
 	{
 		pForward = pHook->pPostHook;
 
 		if (pForward)
 		{
-			EventInfo info = { pHook->pEventCopy, NULL };
-
 			if (pHook->postCopy)
 			{
-				hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
+				info.bDontBroadcast = bDontBroadcast;
+				info.pEvent = m_EventCopies.front();
+				info.pOwner = NULL;
+				hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 
 				pForward->PushCell(hndl);
 			} else {
 				pForward->PushCell(BAD_HANDLE);
 			}
 
-			pForward->PushString(name);
+			pForward->PushString(pHook->name.chars());
 			pForward->PushCell(bDontBroadcast);
 			pForward->Execute(NULL);
 
@@ -434,16 +492,25 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 			{
 				/* Free handle */
 				HandleSecurity sec(NULL, g_pCoreIdent);
-				g_HandleSys.FreeHandle(hndl, &sec);
+				handlesys->FreeHandle(hndl, &sec);
 
 				/* Free event structure */
-				gameevents->FreeEvent(pEventCopy);
-				pHook->pEventCopy = NULL;
+				gameevents->FreeEvent(info.pEvent);
+				m_EventCopies.pop();
 			}
 		}
+
+		/* 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_EventNames.pop();
+	m_EventStack.pop();
 
 	RETURN_META_VALUE(MRES_IGNORED, true);
 }

core/EventManager.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,19 +34,28 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include "sm_trie.h"
+#include <sm_namehashset.h>
 #include <sh_list.h>
 #include <sh_stack.h>
 #include <IHandleSys.h>
 #include <IForwardSys.h>
 #include <IPluginSys.h>
 
+class IClient;
+
 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
@@ -56,14 +65,22 @@ 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;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
 };
 
 enum EventHookMode
@@ -99,6 +116,9 @@ public: // IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public: // IGameEventListener2
 	void FireGameEvent(IGameEvent *pEvent);
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	int GetEventDebugID();
+#endif
 public:
 	/**
 	 * Get the 'GameEvent' handle type ID.
@@ -112,15 +132,17 @@ public:
 	EventHookError UnhookEvent(const char *name, IPluginFunction *pFunction, EventHookMode mode=EventHookMode_Post);
 	EventInfo *CreateEvent(IPluginContext *pContext, const char *name, bool force=false);
 	void FireEvent(EventInfo *pInfo, bool bDontBroadcast=false);
+	void FireEventToClient(EventInfo *pInfo, IClient *pClient);
 	void CancelCreatedEvent(EventInfo *pInfo);
 private: // IGameEventManager2 hooks
 	bool OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast);
 	bool OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast);
 private:
 	HandleType_t m_EventType;
-	Trie *m_EventHooks;
+	NameHashSet<EventHook *> m_EventHooks;
 	CStack<EventInfo *> m_FreeEvents;
-	CStack<const char *> m_EventNames;
+	CStack<EventHook *> m_EventStack;
+	CStack<IGameEvent *> m_EventCopies;
 };
 
 extern EventManager g_EventManager;

core/GameHooks.cpp

@@ -0,0 +1,171 @@
+// vim: set ts=4 sw=4 tw=99 noet :
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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 "GameHooks.h"
+#include "sourcemod.h"
+#include "ConVarManager.h"
+#include "command_args.h"
+#include "provider.h"
+
+#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 *);
+#endif
+
+#if 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
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
+#else
+SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+#endif
+
+SH_DECL_HOOK1_void(IServerGameClients, SetCommandClient, SH_NOATTRIB, false, int);
+
+GameHooks::GameHooks()
+	: client_cvar_query_mode_(ClientCvarQueryMode::Unavailable),
+	  last_command_client_(-1)
+{
+}
+
+void GameHooks::Start()
+{
+	// Hook ICvar::CallGlobalChangeCallbacks.
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	hooks_ += SH_ADD_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
+#else
+	hooks_ += SH_ADD_HOOK(ICvar, CallGlobalChangeCallback, icvar, SH_STATIC(OnConVarChanged), false);
+#endif
+
+	// Episode 2 has this function by default, but the older versions do not.
+#if SOURCE_ENGINE == SE_EPISODEONE
+	if (g_SMAPI->GetGameDLLVersion() >= 6) {
+		hooks_ += SH_ADD_HOOK(IServerGameDLL, OnQueryCvarValueFinished, gamedll, SH_MEMBER(this, &GameHooks::OnQueryCvarValueFinished), false);
+		client_cvar_query_mode_ = ClientCvarQueryMode::DLL;
+	}
+#endif
+
+	hooks_ += SH_ADD_HOOK(IServerGameClients, SetCommandClient, serverClients, SH_MEMBER(this, &GameHooks::SetCommandClient), false);
+}
+
+void GameHooks::OnVSPReceived()
+{
+	if (client_cvar_query_mode_ != ClientCvarQueryMode::Unavailable)
+		return;
+
+	if (g_SMAPI->GetSourceEngineBuild() == SOURCE_ENGINE_ORIGINAL || vsp_version < 2)
+		return;
+
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	hooks_ += SH_ADD_HOOK(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, SH_MEMBER(this, &GameHooks::OnQueryCvarValueFinished), false);
+	client_cvar_query_mode_ = ClientCvarQueryMode::VSP;
+#endif
+}
+
+void GameHooks::Shutdown()
+{
+	for (size_t i = 0; i < hooks_.length(); i++)
+		SH_REMOVE_HOOK_ID(hooks_[i]);
+	hooks_.clear();
+
+	client_cvar_query_mode_ = ClientCvarQueryMode::Unavailable;
+}
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+void GameHooks::OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue)
+#else
+void GameHooks::OnConVarChanged(ConVar *pConVar, const char *oldValue)
+#endif
+{
+#if SOURCE_ENGINE < SE_ORANGEBOX
+  float flOldValue = atof(oldValue);
+#endif
+  g_ConVarManager.OnConVarChanged(pConVar, oldValue, flOldValue);
+}
+
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+void GameHooks::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result,
+                                         const char *cvarName, const char *cvarValue){
+	int client = IndexOfEdict(pPlayer);
+
+# if SOURCE_ENGINE == SE_CSGO
+	if (g_Players.HandleConVarQuery(cookie, client, result, cvarName, cvarValue))
+		return;
+# endif
+	g_ConVarManager.OnClientQueryFinished(cookie, client, result, cvarName, cvarValue);
+}
+#endif
+
+ke::RefPtr<CommandHook>
+GameHooks::AddCommandHook(ConCommand *cmd, const CommandHook::Callback &callback)
+{
+	return new CommandHook(cmd, callback, false);
+}
+
+ke::RefPtr<CommandHook>
+GameHooks::AddPostCommandHook(ConCommand *cmd, const CommandHook::Callback &callback)
+{
+	return new CommandHook(cmd, callback, true);
+}
+
+void GameHooks::SetCommandClient(int client)
+{
+	last_command_client_ = client + 1;
+}
+
+CommandHook::CommandHook(ConCommand *cmd, const Callback &callback, bool post)
+ : hook_id_(0),
+   callback_(callback)
+{
+	hook_id_ = SH_ADD_HOOK(ConCommand, Dispatch, cmd, SH_MEMBER(this, &CommandHook::Dispatch), post);
+}
+
+CommandHook::~CommandHook()
+{
+	if (hook_id_)
+	  SH_REMOVE_HOOK_ID(hook_id_);
+}
+
+void CommandHook::Dispatch(DISPATCH_ARGS)
+{
+	DISPATCH_PROLOGUE;
+	EngineArgs args(command);
+
+	AddRef();
+	bool rval = callback_(sCoreProviderImpl.CommandClient(), &args);
+	Release();
+	if (rval)
+		RETURN_META(MRES_SUPERCEDE);
+}
+
+void CommandHook::Zap()
+{
+	hook_id_ = 0;
+}

core/GameHooks.h

@@ -0,0 +1,133 @@
+// vim: set ts=4 sw=4 tw=99 noet :
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_
+#define _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_
+
+// Needed for CEntityIndex, edict_t, etc.
+#include <stdint.h>
+#include <stddef.h>
+#include <eiface.h>
+#include <iserverplugin.h>
+#include <amtl/am-refcounting.h>
+#include <amtl/am-vector.h>
+#include <amtl/am-function.h>
+
+class ConVar;
+class CCommand;
+struct CCommandContext;
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+# define DISPATCH_ARGS      const CCommand &command
+# define DISPATCH_PROLOGUE
+#else
+# define DISPATCH_ARGS
+# define DISPATCH_PROLOGUE  CCommand command
+#endif
+
+namespace SourceMod {
+
+// Describes the mechanism in which client cvar queries are implemented.
+enum class ClientCvarQueryMode {
+	Unavailable,
+	DLL,
+	VSP
+};
+
+class ICommandArgs;
+
+class CommandHook : public ke::Refcounted<CommandHook>
+{
+public:
+	// return false to RETURN_META(MRES_IGNORED), or true to SUPERCEDE.
+	typedef ke::Lambda<bool(int, const ICommandArgs *)> Callback;
+
+public:
+	CommandHook(ConCommand *cmd, const Callback &callback, bool post);
+	~CommandHook();
+	void Dispatch(DISPATCH_ARGS);
+	void Zap();
+
+private:
+	int hook_id_;
+	Callback callback_;
+};
+
+class GameHooks
+{
+public:
+	GameHooks();
+
+	void Start();
+	void Shutdown();
+	void OnVSPReceived();
+
+	ClientCvarQueryMode GetClientCvarQueryMode() const {
+		return client_cvar_query_mode_;
+	}
+
+public:
+	ke::RefPtr<CommandHook> AddCommandHook(ConCommand *cmd, const CommandHook::Callback &callback);
+	ke::RefPtr<CommandHook> AddPostCommandHook(ConCommand *cmd, const CommandHook::Callback &callback);
+
+	int CommandClient() const {
+		return last_command_client_;
+	}
+
+private:
+	// Static callback that Valve's ConVar object executes when the convar's value changes.
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	static void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
+#else
+	static void OnConVarChanged(ConVar *pConVar, const char *oldValue);
+#endif
+
+	// Callback for when StartQueryCvarValue() has finished.
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	void OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result,
+	                              const char *cvarName, const char *cvarValue);
+#endif
+
+	void SetCommandClient(int client);
+
+private:
+	class HookList : public ke::Vector<int>
+	{
+	public:
+		HookList &operator += (int hook_id) {
+			this->append(hook_id);
+			return *this;
+		}
+	};
+	HookList hooks_;
+
+	ClientCvarQueryMode client_cvar_query_mode_;
+	int last_command_client_;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_

core/HalfLife2.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2016 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,14 +35,24 @@
 #include <sh_list.h>
 #include <sh_string.h>
 #include <sh_tinyhash.h>
-#include <sm_trie_tpl.h>
-#include "sm_trie.h"
+#include <am-utility.h>
+#include <am-hashset.h>
+#include <am-hashmap.h>
+#include <sm_stringhashmap.h>
+#include <sm_namehashset.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>
+#include <string_t.h>
 
-class CCommand;
+namespace SourceMod {
+class ICommandArgs;
+} // namespace SourceMod
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -50,18 +60,79 @@ using namespace SourceMod;
 #define HUD_PRINTTALK		3
 #define HUD_PRINTCENTER		4
 
+#if defined _WIN32
+#define SOURCE_BIN_PREFIX ""
+#define SOURCE_BIN_SUFFIX ""
+#define SOURCE_BIN_EXT ".dll"
+#elif defined __APPLE__
+#define SOURCE_BIN_PREFIX ""
+#define SOURCE_BIN_SUFFIX ""
+#define SOURCE_BIN_EXT ".dylib"
+#elif defined __linux__
+#if SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_TF2 \
+	|| SOURCE_ENGINE == SE_SDK2013 || SOURCE_ENGINE == SE_LEFT4DEAD2 || SOURCE_ENGINE == SE_NUCLEARDAWN \
+	|| SOURCE_ENGINE == SE_BMS || SOURCE_ENGINE == SE_INSURGENCY || SOURCE_ENGINE == SE_DOI
+#define SOURCE_BIN_PREFIX "lib"
+#define SOURCE_BIN_SUFFIX "_srv"
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
+#define SOURCE_BIN_PREFIX "lib"
+#define SOURCE_BIN_SUFFIX ""
+#else
+#define SOURCE_BIN_PREFIX ""
+#define SOURCE_BIN_SUFFIX "_i486"
+#endif
+#define SOURCE_BIN_EXT ".so"
+#endif
+
+#define FORMAT_SOURCE_BIN_NAME(basename) \
+	(SOURCE_BIN_PREFIX basename SOURCE_BIN_SUFFIX SOURCE_BIN_EXT)
+
 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 uint32_t hash(const detail::CharsAndLength &key)
+		{
+			return key.hash();
+		}
+	};
+
+	static inline bool matches(const char *name, const DataTableInfo *info)
+	{
+		return strcmp(name, info->sc->GetName()) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
+	
+	DataTableInfo(ServerClass *sc)
+		: sc(sc)
+	{
+	}
+
 	ServerClass *sc;
-	KTrie<sm_sendprop_info_t> lookup;
+	NameHashSet<sm_sendprop_info_t, SendPropPolicy> lookup;
 };
 
-struct DataMapTrie
+struct DataMapCachePolicy
 {
-	DataMapTrie() : trie(NULL) {}
-	Trie *trie;
+	static inline bool matches(const char *name, const sm_datatable_info_t &info)
+	{
+		return strcmp(name, info.prop->fieldName) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
 };
 
+typedef NameHashSet<sm_datatable_info_t, DataMapCachePolicy> DataMapCache;
+
 struct DelayedFakeCliCmd
 {
 	String cmd;
@@ -71,59 +142,153 @@ struct DelayedFakeCliCmd
 
 struct CachedCommandInfo
 {
-	const CCommand *args;
-#if !defined ORANGEBOX_BUILD
+	const ICommandArgs *args;
+#if SOURCE_ENGINE <= SE_DARKMESSIAH
 	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
+	string_t		m_iName;
+	string_t		m_iClassName;
+#endif
+};
+
+// Corresponds to TF2's eFindMapResult in eiface.h
+// Not yet in other games, but eventually in others on same branch.
+enum class SMFindMapResult : cell_t {
+	Found,
+	NotFound,
+	FuzzyMatch,
+	NonCanonical,
+	PossiblyAvailable
+};
+
 class CHalfLife2 : 
 	public SMGlobalClass,
 	public IGameHelpers
 {
+	friend class AutoEnterCommand;
 public:
 	CHalfLife2();
 	~CHalfLife2();
 public:
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
+	void OnSourceModAllInitialized_Post();
 	/*void OnSourceModAllShutdown();*/
+	ConfigResult OnSourceModConfigChanged(const char *key, const char *value,
+		ConfigSource source, char *error, size_t maxlength) override;
 public: //IGameHelpers
 	SendProp *FindInSendTable(const char *classname, const char *offset);
 	bool FindSendPropInfo(const char *classname, const char *offset, sm_sendprop_info_t *info);
 	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);
+	SMFindMapResult FindMap(char *pMapName, size_t nMapNameMax);
+	SMFindMapResult FindMap(const char *pMapName, char *pFoundMap = NULL, size_t nMapNameMax = 0);
+	bool GetMapDisplayName(const char *pMapName, char *pDisplayname, size_t nMapNameMax);
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	string_t AllocPooledString(const char *pszValue);
+#endif
+	bool GetServerSteam3Id(char *pszOut, size_t len) const override;
+	uint64_t GetServerSteamId64() const override;
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
 public:
-	void PushCommandStack(const CCommand *cmd);
-	void PopCommandStack();
-	const CCommand *PeekCommandStack();
+	const ICommandArgs *PeekCommandStack();
 	const char *CurrentCommandName();
-#if !defined METAMOD_PLAPI_VERSION
-	bool IsOriginalEngine();
-#endif
+	void AddDelayedKick(int client, int userid, const char *msg);
+	void ProcessDelayedKicks();
 private:
+	void PushCommandStack(const ICommandArgs *cmd);
+	void PopCommandStack();
 	DataTableInfo *_FindServerClass(const char *classname);
 private:
-	Trie *m_pClasses;
-	List<DataTableInfo *> m_Tables;
-	THash<datamap_t *, DataMapTrie> m_Maps;
+	void InitLogicalEntData();
+	void InitCommandLine();
+private:
+	typedef ke::HashMap<datamap_t *, DataMapCache *, ke::PointerPolicy<datamap_t> > DataTableMap;
+
+	NameHashSet<DataTableInfo *> m_Classes;
+	DataTableMap 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;
+#if SOURCE_ENGINE == SE_CSGO
+public:
+	bool CanSetCSGOEntProp(const char *pszPropName)
+	{
+		return !m_bFollowCSGOServerGuidelines || !m_CSGOBadList.has(pszPropName);
+	}
+private:
+	ke::HashSet<ke::AString, detail::StringHashMapPolicy> m_CSGOBadList;
+	bool m_bFollowCSGOServerGuidelines = true;
+#endif
 };
 
 extern CHalfLife2 g_HL2;
 
+bool IndexToAThings(cell_t, CBaseEntity **pEntData, edict_t **pEdictData);
+
+class AutoEnterCommand
+{
+public:
+	AutoEnterCommand(const ICommandArgs *args) {
+		g_HL2.PushCommandStack(args);
+	}
+	~AutoEnterCommand() {
+		g_HL2.PopCommandStack();
+	}
+};
+
 #endif //_INCLUDE_SOURCEMOD_CHALFLIFE2_H_

core/Logger.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,479 +34,37 @@
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "Logger.h"
-#include "systems/LibrarySys.h"
 #include "TimerSys.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);
-	}
-}
+#include "logic_bridge.h"
+#include <sourcemod_version.h>
+#include <bridge/include/IProviderCallbacks.h>
 
 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.callbacks->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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,69 +38,13 @@
 
 using namespace SourceHook;
 
-enum LogType
+class LoggerCore : public SMGlobalClass
 {
-	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,133 +0,0 @@
-#(C)2004-2008 Metamod:Source Development Team
-# Makefile written by David "BAILOPAN" Anderson
-
-#Local paths
-HL2SDK_ORIG = ../../hl2sdk
-HL2SDK_OB = ../../hl2sdk-ob
-SOURCEMM14 = ../../sourcemm-1.4
-SOURCEMM16 = ../../sourcemm-1.6
-SRCDS_BASE = ~/srcds
-SMSDK = ..
-
-#Project options
-OPT_FLAGS = -O3 -funroll-loops -s -pipe -fno-strict-aliasing
-GCC4_FLAGS = -fvisibility=hidden 
-GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
-DEBUG_FLAGS = -g -ggdb3
-CPP = gcc-4.1
-
-
-OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreConfig.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 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
-	METAMOD = $(SOURCEMM14)
-	INCLUDE += -I$(HL2PUB)/dlls
-	SRCDS = $(SRCDS_BASE)
-	BINARY = sourcemod.1.ep1.so
-endif
-ifeq "$(ENGINE)" "orangebox"
-	HL2SDK = $(HL2SDK_OB)
-	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 "$(BINARY)" ""
-	echo "You must supply ENGINE=orangebox or ENGINE=original"
-	false
-endif
-
-LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
-	tier0_i486.so -lpthread -static-libgcc
-
-INCLUDE_SMSDK = -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions 
-
-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)
-
-SM16_INCLUDE = -I. -I.. -I$(SOURCEMM16)/sourcehook $(INCLUDE_SMSDK)
-
-ifeq "$(DEBUG)" "true"
-	BIN_DIR = Debug.$(ENGINE)
-	CFLAGS += $(DEBUG_FLAGS)
-else
-	BIN_DIR = Release.$(ENGINE)
-	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 += $(GCC4_FLAGS)
-	CPPFLAGS += $(GCC4_CPP_FLAGS)
-endif
-
-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)/%.ox: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-
-$(BIN_DIR)/%.oc: %.c
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
-
-$(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
-
-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:
-	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

@@ -1,220 +0,0 @@
-/**
- * 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/MenuManager.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,9 +38,8 @@
 #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;
@@ -55,24 +54,24 @@ MenuManager::MenuManager()
 
 void MenuManager::OnSourceModAllInitialized()
 {
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 
 	HandleAccess access;
-	g_HandleSys.InitAccessDefaults(NULL, &access);
+	handlesys->InitAccessDefaults(NULL, &access);
 
 	/* Deny cloning to menus */
 	access.access[HandleAccess_Clone] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_MenuType = g_HandleSys.CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_MenuType = 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 = g_HandleSys.CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_StyleType = handlesys->CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
 }
 
 void MenuManager::OnSourceModAllShutdown()
 {
-	g_HandleSys.RemoveType(m_MenuType, g_pCoreIdent);
-	g_HandleSys.RemoveType(m_StyleType, g_pCoreIdent);
+	handlesys->RemoveType(m_MenuType, g_pCoreIdent);
+	handlesys->RemoveType(m_StyleType, g_pCoreIdent);
 }
 
 void MenuManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -111,7 +110,7 @@ Handle_t MenuManager::CreateMenuHandle(IBaseMenu *menu, IdentityToken_t *pOwner)
 		return BAD_HANDLE;
 	}
 
-	return g_HandleSys.CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
 }
 
 Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
@@ -121,7 +120,7 @@ Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
 		return BAD_HANDLE;
 	}
 
-	return g_HandleSys.CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
 }
 
 HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
@@ -131,7 +130,7 @@ HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = NULL;
 
-	return g_HandleSys.ReadHandle(handle, m_MenuType, &sec, (void **)menu);
+	return handlesys->ReadHandle(handle, m_MenuType, &sec, (void **)menu);
 }
 
 HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
@@ -141,7 +140,7 @@ HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = g_pCoreIdent;
 
-	return g_HandleSys.ReadHandle(handle, m_StyleType, &sec, (void **)style);
+	return handlesys->ReadHandle(handle, m_StyleType, &sec, (void **)style);
 }
 
 bool MenuManager::SetDefaultStyle(IMenuStyle *style)
@@ -230,6 +229,7 @@ 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,6 +240,11 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 		maxItems--;
 	}
 
+	if (novoteButton)
+	{
+		maxItems--;
+	}
+
 	/* This is very not allowed! */
 	if (maxItems < 2)
 	{
@@ -435,6 +440,20 @@ 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))
+		{
+			ke::SafeStrcpy(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;
@@ -551,7 +570,7 @@ skip_search:
 			/* If there are no control options,
 			 * Instead just pad with invisible slots.
 			 */
-			if (!displayPrev && !displayPrev)
+			if (!displayNext && !displayPrev)
 			{
 				padItem.style = ITEMDRAW_NOTEXT;
 			}
@@ -585,14 +604,20 @@ skip_search:
 				{
 					if (exitBackButton)
 					{
-						CorePlayerTranslate(client, text, sizeof(text), "Back", NULL);
+						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Back", &client))
+						{
+							ke::SafeStrcpy(text, sizeof(text), "Back");
+						}
 						dr.style = ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
 						slots[position].type = ItemSel_ExitBack;
 					}
 					else
 					{
-						CorePlayerTranslate(client, text, sizeof(text), "Previous", NULL);
+						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Previous", &client))
+						{
+							ke::SafeStrcpy(text, sizeof(text), "Previous");
+						}
 						dr.style = (displayPrev ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
 						slots[position].type = ItemSel_Back;
@@ -610,7 +635,10 @@ skip_search:
 				/* NEXT */
 				if (displayNext || canDrawDisabled)
 				{
-					CorePlayerTranslate(client, text, sizeof(text), "Next", NULL);
+					if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Next", &client))
+					{
+						ke::SafeStrcpy(text, sizeof(text), "Next");
+					}
 					dr.style = (displayNext ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 					position = panel->DrawItem(dr);
 					slots[position].type = ItemSel_Next;
@@ -638,7 +666,10 @@ skip_search:
 		/* EXIT */
 		if (exitButton)
 		{
-			CorePlayerTranslate(client, text, sizeof(text), "Exit", NULL);
+			if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Exit", &client))
+			{
+				ke::SafeStrcpy(text, sizeof(text), "Exit");
+			}
 			dr.style = ITEMDRAW_CONTROL;
 			position = panel->DrawItem(dr);
 			slots[position].type = ItemSel_Exit;
@@ -777,3 +808,19 @@ 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -37,7 +37,6 @@
 #include <sh_stack.h>
 #include <sh_list.h>
 #include <sh_string.h>
-#include "sm_memtable.h"
 #include "sm_globals.h"
 
 using namespace SourceMod;
@@ -89,6 +88,9 @@ 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 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,11 +34,12 @@
 #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)
 {
@@ -314,7 +315,7 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 
 			if (sound != NULL)
 			{
-				edict_t *pEdict = engine->PEntityOfEntIndex(client);
+				edict_t *pEdict = PEntityOfEntIndex(client);
 				if (pEdict)
 				{
 					ICollideable *pCollideable = pEdict->GetCollideable();
@@ -322,15 +323,25 @@ 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_BMS || SOURCE_ENGINE == SE_TF2
+							0,
+#endif
 							&pos);
 					}
 				}
@@ -377,6 +388,9 @@ 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);
@@ -591,7 +605,7 @@ bool BaseMenuStyle::RedoClientMenu(int client, ItemOrder order)
 }
 
 CBaseMenu::CBaseMenu(IMenuHandler *pHandler, IMenuStyle *pStyle, IdentityToken_t *pOwner) : 
-m_pStyle(pStyle), m_Strings(512), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false), 
+m_pStyle(pStyle), 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)
 {
@@ -614,94 +628,74 @@ Handle_t CBaseMenu::GetHandle()
 bool CBaseMenu::AppendItem(const char *info, const ItemDrawInfo &draw)
 {
 	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
-		&& m_items.size() >= m_pStyle->GetMaxPageItems())
+		&& m_items.length() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}
 
 	CItem item;
 
-	item.infoString = m_Strings.AddString(info);
+	item.info = info;
 	if (draw.display)
-	{
-		item.displayString = m_Strings.AddString(draw.display);
-	}
+		item.display = new ke::AString(draw.display);
 	item.style = draw.style;
 
-	m_items.push_back(item);
-
+	m_items.append(ke::Move(item));
 	return true;
 }
 
 bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDrawInfo &draw)
 {
-	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
-		&& m_items.size() >= m_pStyle->GetMaxPageItems())
+	if (m_Pagination == (unsigned)MENU_NO_PAGINATION &&
+	    m_items.length() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}
 
-	if (position >= m_items.size())
-	{
+	if (position >= m_items.length())
 		return false;
-	}
 
 	CItem item;
-	item.infoString = m_Strings.AddString(info);
+	item.info = info;
 	if (draw.display)
-	{
-		item.displayString = m_Strings.AddString(draw.display);
-	}
+		item.display = new ke::AString(draw.display);
 	item.style = draw.style;
 
-	CVector<CItem>::iterator iter = m_items.iterAt(position);
-	m_items.insert(iter, item);
-
+	m_items.insert(position, ke::Move(item));
 	return true;
 }
 
 bool CBaseMenu::RemoveItem(unsigned int position)
 {
-	if (position >= m_items.size())
-	{
+	if (position >= m_items.length())
 		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.size())
-	{
+	if (position >= m_items.length())
 		return NULL;
-	}
 
 	if (draw)
 	{
-		draw->display = m_Strings.GetString(m_items[position].displayString);
+		draw->display = m_items[position].display->chars();
 		draw->style = m_items[position].style;
 	}
 
-	return m_Strings.GetString(m_items[position].infoString);
+	return m_items[position].info.chars();
 }
 
 unsigned int CBaseMenu::GetItemCount()
 {
-	return m_items.size();
+	return m_items.length();
 }
 
 bool CBaseMenu::SetPagination(unsigned int itemsPerPage)
@@ -734,12 +728,12 @@ IMenuStyle *CBaseMenu::GetDrawStyle()
 
 void CBaseMenu::SetDefaultTitle(const char *message)
 {
-	m_Title.assign(message);
+	m_Title = message;
 }
 
 const char *CBaseMenu::GetDefaultTitle()
 {
-	return m_Title.c_str();
+	return m_Title.chars();
 }
 
 void CBaseMenu::Cancel()
@@ -806,7 +800,7 @@ void CBaseMenu::InternalDelete()
 
 		m_hHandle = BAD_HANDLE;
 		m_bDeleting = true;
-		g_HandleSys.FreeHandle(hndl, &sec);
+		handlesys->FreeHandle(hndl, &sec);
 	}
 
 	m_pHandler->OnMenuDestroy(this);
@@ -831,7 +825,5 @@ IMenuHandler *CBaseMenu::GetHandler()
 
 unsigned int CBaseMenu::GetBaseMemUsage()
 {
-	return m_Title.size() 
-		+ m_Strings.GetMemTable()->GetMemUsage()
-		+ (m_items.size() * sizeof(CItem));
+	return m_Title.length() + (m_items.length() * sizeof(CItem));
 }

core/MenuStyle_Base.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,29 +34,46 @@
 
 #include <IMenuManager.h>
 #include <IPlayerHelpers.h>
-#include <sh_string.h>
-#include <sh_vector.h>
-#include "sm_memtable.h"
+#include <am-autoptr.h>
+#include <am-string.h>
+#include <am-vector.h>
 #include "sm_fastlink.h"
 
 using namespace SourceMod;
-using namespace SourceHook;
 
 class CItem
 {
 public:
 	CItem()
 	{
-		infoString = -1;
-		displayString = -1;
 		style = 0;
 		access = 0;
 	}
+	CItem(CItem &&other)
+	: info(ke::Move(other.info)),
+	  display(ke::Move(other.display))
+	{
+		style = other.style;
+		access = other.access;
+	}
+	CItem & operator =(CItem &&other)
+	{
+		info = ke::Move(other.info);
+		display = ke::Move(other.display);
+		style = other.style;
+		access = other.access;
+		return *this;
+	}
+
 public:
-	int infoString;
-	int displayString;
+	ke::AString info;
+	ke::AutoPtr<ke::AString> display;
 	unsigned int style;
 	unsigned int access;
+
+private:
+	CItem(const CItem &other) = delete;
+	CItem &operator =(const CItem &other) = delete;
 };
 
 class CBaseMenuPlayer
@@ -139,11 +156,10 @@ public:
 private:
 	void InternalDelete();
 protected:
-	String m_Title;
+	ke::AString m_Title;
 	IMenuStyle *m_pStyle;
-	BaseStringTable m_Strings;
 	unsigned int m_Pagination;
-	CVector<CItem> m_items;
+	ke::Vector<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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,11 +32,20 @@
 #include "MenuStyle_Radio.h"
 #include "sm_stringutil.h"
 #include "UserMessages.h"
-#include "GameConfigs.h"
+#include <IGameConfigs.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;
@@ -44,6 +53,14 @@ 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];
@@ -66,6 +83,10 @@ 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')
 	{
@@ -89,7 +110,18 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 		g_RadioMenuTimeout = 0;
 	}
 
-	g_Menus.AddStyle(this);
+	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.SetDefaultStyle(this);
 
 	g_UserMsgs.HookUserMessage(g_ShowMenuId, this, false);
@@ -134,13 +166,22 @@ 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
 {
 	int count = pFilter->GetRecipientCount();
+
+#if SOURCE_ENGINE == SE_CSGO
+	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;
 
@@ -188,7 +229,7 @@ IBaseMenu *CRadioStyle::CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwn
 
 unsigned int CRadioStyle::GetMaxPageItems()
 {
-	return 10;
+	return s_RadioMaxPageItems;
 }
 
 const char *CRadioStyle::GetStyleName()
@@ -217,15 +258,6 @@ 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);
@@ -292,11 +324,12 @@ void CRadioDisplay::Reset()
 	keys = 0;
 }
 
-void CRadioDisplay::DirectSet(const char *str, int keymap)
+bool CRadioDisplay::DirectSet(const char *str)
 {
 	m_Title.clear();
 	m_BufferText.assign(str);
-	keys = keymap;
+	
+	return true;
 }
 
 unsigned int CRadioDisplay::GetCurrentKey()
@@ -306,7 +339,7 @@ unsigned int CRadioDisplay::GetCurrentKey()
 
 bool CRadioDisplay::SetCurrentKey(unsigned int key)
 {
-	if (key < m_NextPos || m_NextPos > 10)
+	if (key < m_NextPos || m_NextPos > s_RadioMaxPageItems)
 	{
 		return false;
 	}
@@ -342,7 +375,7 @@ void CRadioDisplay::DrawTitle(const char *text, bool onlyIfEmpty/* =false */)
 
 unsigned int CRadioDisplay::DrawItem(const ItemDrawInfo &item)
 {
-	if (m_NextPos > 10 || !CanDrawItem(item.style))
+	if (m_NextPos > s_RadioMaxPageItems || !CanDrawItem(item.style))
 	{
 		return 0;
 	}
@@ -417,7 +450,7 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 {
 	if (title[0] != '\0')
 	{
-		display_len = UTIL_Format(display_pkt, 
+		display_len = ke::SafeSprintf(display_pkt, 
 			sizeof(display_pkt), 
 			"%s\n%s", 
 			title,
@@ -425,9 +458,8 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 	}
 	else
 	{
-		display_len = UTIL_Format(display_pkt, 
+		display_len = ke::SafeStrcpy(display_pkt, 
 			sizeof(display_pkt), 
-			"%s", 
 			text);
 	}
 	display_keys = keys;
@@ -435,7 +467,7 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 
 void CRadioMenuPlayer::Radio_Refresh()
 {
-	cell_t players[1] = {m_index};
+	cell_t players[1] = { (cell_t)m_index };
 	char *ptr = display_pkt;
 	char save = 0;
 	size_t len = display_len;
@@ -451,6 +483,14 @@ void CRadioMenuPlayer::Radio_Refresh()
 		time = menuHoldTime - (unsigned int)(gpGlobals->curtime - menuStartTime);
 	}
 
+#if SOURCE_ENGINE == SE_CSGO
+	// 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)
@@ -458,7 +498,8 @@ void CRadioMenuPlayer::Radio_Refresh()
 			save = ptr[240];
 			ptr[240] = '\0';
 		}
-		bf_write *buffer = g_UserMsgs.StartMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
+
+		bf_write *buffer = g_UserMsgs.StartBitBufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
 		buffer->WriteWord(display_keys);
 		buffer->WriteChar(time ? time : -1);
 		buffer->WriteByte( (len > 240) ? 1 : 0 );
@@ -475,6 +516,7 @@ void CRadioMenuPlayer::Radio_Refresh()
 			break;
 		}
 	}
+#endif
 
 	display_last_refresh = gpGlobals->curtime;
 }
@@ -510,6 +552,7 @@ 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)
@@ -543,6 +586,7 @@ bool CRadioMenu::DisplayAtItem(int client,
 		return false;
 	}
 
+	AutoHandleRooter ahr(this->GetHandle());
 	return g_RadioMenuStyle.DoClientMenu(client,
 		this,
 		start_item,
@@ -550,6 +594,17 @@ 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -37,10 +37,12 @@
 #include "MenuStyle_Base.h"
 #include "sourcemm_api.h"
 #include <IPlayerHelpers.h>
-#include <IUserMessages.h>
+#include "UserMessages.h"
 #include "sm_fastlink.h"
 #include <sh_stack.h>
 #include <compat_wrappers.h>
+#include "logic/common_logic.h"
+#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
@@ -65,7 +67,11 @@ private:
 class CRadioStyle : 
 	public BaseMenuStyle,
 	public SMGlobalClass,
-	public IUserMessageListener
+#ifdef USE_PROTOBUF_USERMESSAGES
+	public IProtobufUserMessageListener
+#else
+	public IBitBufUserMessageListener
+#endif
 {
 public:
 	CRadioStyle();
@@ -84,7 +90,11 @@ 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();
@@ -93,7 +103,6 @@ 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;
@@ -121,8 +130,7 @@ public: //IMenuPanel
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
-public:
-	void DirectSet(const char *str, int keymap);
+	bool DirectSet(const char *str);
 private:
 	String m_BufferText;
 	String m_Title;
@@ -142,6 +150,7 @@ 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

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,7 +32,6 @@
 #include "sm_stringutil.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
-#include "Translator.h"
 #include "PlayerManager.h"
 #include "ConCmdManager.h"
 
@@ -67,14 +66,14 @@ bool ValveMenuStyle::OnClientCommand(int client, const char *cmdname, const CCom
 void ValveMenuStyle::OnSourceModAllInitialized()
 {
 	g_Players.AddClientListener(this);
-	SH_ADD_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
+	SH_ADD_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
 	g_pSPHCC = SH_GET_CALLCLASS(serverpluginhelpers);
 }
 
 void ValveMenuStyle::OnSourceModShutdown()
 {
 	SH_RELEASE_CALLCLASS(g_pSPHCC);
-	SH_REMOVE_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
+	SH_REMOVE_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
 	g_Players.RemoveClientListener(this);
 }
 
@@ -88,7 +87,7 @@ void ValveMenuStyle::HookCreateMessage(edict_t *pEdict,
 		return;
 	}
 
-	int client = engine->IndexOfEdict(pEdict);
+	int client = IndexOfEdict(pEdict);
 	if (client < 1 || client > 256)
 	{
 		return;
@@ -294,7 +293,7 @@ unsigned int CValveMenuDisplay::DrawItem(const ItemDrawInfo &item)
 	}
 
 	char buffer[255];
-	UTIL_Format(buffer, sizeof(buffer), "%d. %s", m_NextPos, item.display);
+	ke::SafeSprintf(buffer, sizeof(buffer), "%d. %s", m_NextPos, item.display);
 
 	KeyValues *ki = m_pKv->FindKey(g_OptionNumTable[m_NextPos], true);
 	ki->SetString("command", g_OptionCmdTable[m_NextPos]);
@@ -325,7 +324,7 @@ void CValveMenuDisplay::SendRawDisplay(int client, int priority, unsigned int ti
 	m_pKv->SetInt("time", time ? time : 200);
 
 	SH_CALL(g_pSPHCC, &IServerPluginHelpers::CreateMessage)(
-		engine->PEntityOfEntIndex(client),
+		PEntityOfEntIndex(client),
 		DIALOG_MENU,
 		m_pKv,
 		vsp_interface);
@@ -379,7 +378,7 @@ bool CValveMenu::SetExtOption(MenuOption option, const void *valuePtr)
 {
 	if (option == MenuOption_IntroMessage)
 	{
-		strncopy(m_IntroMsg, (const char *)valuePtr, sizeof(m_IntroMsg));
+		ke::SafeStrcpy(m_IntroMsg, sizeof(m_IntroMsg), (const char *)valuePtr);
 		return true;
 	} else if (option == MenuOption_IntroColor) {
 		unsigned int *array = (unsigned int *)valuePtr;
@@ -405,6 +404,7 @@ 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -39,6 +39,8 @@
 #include "KeyValues.h"
 #include "sm_fastlink.h"
 #include <compat_wrappers.h>
+#include "logic/common_logic.h"
+#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
@@ -75,6 +77,7 @@ 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:
@@ -105,6 +108,7 @@ 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 :
+ * vim: set ts=4 sw=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -34,10 +34,57 @@
 #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;
 
-#if defined ORANGEBOX_BUILD
+#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
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue);
 #else
 void OnVoteDelayChange(ConVar *cvar, const char *value);
@@ -52,7 +99,7 @@ ConVar sm_vote_delay("sm_vote_delay",
 					 0.0,
 					 OnVoteDelayChange);
 
-#if defined ORANGEBOX_BUILD
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue)
 #else
 void OnVoteDelayChange(ConVar *cvar, const char *value)
@@ -113,14 +160,19 @@ void VoteMenuHandler::OnClientDisconnected(int client)
 		return;
 	}
 
-	/* Wipe out their vote if they had one */
+	/* Wipe out their vote if they had one.  We have to make sure the the the
+	 * newly connected client is not allowed to vote. 
+	 */
 	int item;
-	if ((item = m_ClientVotes[client]) >= 0)
+	if ((item = m_ClientVotes[client]) >= VOTE_PENDING)
 	{
-		assert((unsigned)item < m_Items);
-		assert(m_Votes[item] > 0);
-		m_Votes[item]--;
-		m_ClientVotes[client] = -1;
+		if (item >= 0)
+		{
+			assert((unsigned)item < m_Items);
+			assert(m_Votes[item] > 0);
+			m_Votes[item]--;
+		}
+		m_ClientVotes[client] = VOTE_NOT_VOTING;
 	}
 }
 
@@ -129,18 +181,28 @@ 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.
@@ -148,8 +210,15 @@ bool VoteMenuHandler::StartVote(IBaseMenu *menu, unsigned int num_clients, int c
 		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);
 	}
 
@@ -158,6 +227,72 @@ bool VoteMenuHandler::StartVote(IBaseMenu *menu, unsigned int num_clients, int c
 	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,
@@ -173,7 +308,8 @@ bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu,
 	/* Mark all clients as not voting */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		m_ClientVotes[i] = -2;
+		m_ClientVotes[i] = VOTE_NOT_VOTING;
+		m_Revoting[i] = false;
 	}
 
 	m_Items = menu->GetItemCount();
@@ -187,7 +323,9 @@ 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;
@@ -215,6 +353,8 @@ 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.
 	 */
@@ -222,6 +362,8 @@ void VoteMenuHandler::StartVoting()
 	{
 		EndVoting();
 	}
+
+	m_TotalClients = m_Clients;
 }
 
 void VoteMenuHandler::DecrementPlayerCount()
@@ -252,10 +394,17 @@ 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.
@@ -302,7 +451,7 @@ void VoteMenuHandler::EndVoting()
 	/* Build the client list */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		if (m_ClientVotes[i] >= -1)
+		if (m_ClientVotes[i] >= VOTE_PENDING)
 		{
 			client_vote[vote.num_clients].client = i;
 			client_vote[vote.num_clients].item = m_ClientVotes[i];
@@ -346,7 +495,7 @@ void VoteMenuHandler::OnMenuCancel(IBaseMenu *menu, int client, MenuCancelReason
 
 void VoteMenuHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuPanel *display)
 {
-	m_ClientVotes[client] = -1;
+	m_ClientVotes[client] = VOTE_PENDING;
 	m_pHandler->OnMenuDisplay(menu, client, display);
 }
 
@@ -368,6 +517,58 @@ 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);
@@ -390,6 +591,9 @@ 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()
@@ -411,3 +615,87 @@ 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -36,6 +36,7 @@
 #include <IPlayerHelpers.h>
 #include <sh_vector.h>
 #include "sm_globals.h"
+#include <TimerSys.h>
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -43,7 +44,8 @@ using namespace SourceMod;
 class VoteMenuHandler : 
 	public IMenuHandler, 
 	public SMGlobalClass,
-	public IClientListener
+	public IClientListener,
+	public ITimedEvent
 {
 public: //SMGlobalClass
 	void OnSourceModAllInitialized();
@@ -61,6 +63,9 @@ 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,
@@ -72,6 +77,9 @@ 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();
@@ -82,9 +90,12 @@ 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;
@@ -93,7 +104,13 @@ 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

@@ -0,0 +1,227 @@
+/**
+ * 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 "logic_bridge.h"
+#include "compat_wrappers.h"
+#include <time.h>
+#include <bridge/include/ILogger.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_ORANGEBOX
+SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
+#else
+SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+#endif
+
+ConCommand *changeLevelCmd = NULL;
+
+ConVar sm_nextmap("sm_nextmap", "", FCVAR_NOTIFY);
+ConVar sm_maphistory_size("sm_maphistory_size", "20");
+
+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);
+
+	ke::SafeStrcpy(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), newmap);
+	ke::SafeStrcpy(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];
+			ke::SafeSprintf(newReason, sizeof(newReason), "%s (Map overridden)", m_tempChangeInfo.m_changeReason);
+			m_mapHistory.push_back(new MapChangeData(lastMap, newReason, m_tempChangeInfo.startTime));
+		}
+
+		int historydiff = sm_maphistory_size.GetInt();
+		if (historydiff > 0)
+		{
+			historydiff -= m_mapHistory.size();
+		} else if (historydiff < 0)
+		{
+			historydiff = (m_mapHistory.size() * -1);
+		}
+
+		for (SourceHook::List<MapChangeData *>::iterator iter = m_mapHistory.begin(); historydiff++ < 0; iter = m_mapHistory.erase(iter))
+		{
+			delete (MapChangeData *)*iter;
+		}
+	}
+
+	m_tempChangeInfo.m_mapName[0] ='\0';
+	m_tempChangeInfo.m_changeReason[0] = '\0';
+	m_tempChangeInfo.startTime = time(NULL);
+	ke::SafeStrcpy(lastMap, sizeof(lastMap), mapName);
+}
+
+void NextMapManager::ForceChangeLevel( const char *mapName, const char* changeReason )
+{
+	/* Store the mapname and reason */
+	ke::SafeStrcpy(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), mapName);
+	ke::SafeStrcpy(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), 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_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')
+	{
+		ke::SafeStrcpy(g_NextMap.m_tempChangeInfo.m_mapName, sizeof(g_NextMap.m_tempChangeInfo.m_mapName), command.Arg(1));
+		ke::SafeStrcpy(g_NextMap.m_tempChangeInfo.m_changeReason, sizeof(g_NextMap.m_tempChangeInfo.m_changeReason), "changelevel Command");
+	}
+}

core/NextMap.h

@@ -0,0 +1,104 @@
+/**
+ * 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"
+#include <amtl/am-string.h>
+
+struct MapChangeData
+{
+	MapChangeData(const char *mapName, const char *changeReason, time_t time)
+	{
+		ke::SafeStrcpy(m_mapName, sizeof(m_mapName), mapName);
+		ke::SafeStrcpy(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_ORANGEBOX
+void CmdChangeLevelCallback(const CCommand &command);
+#else
+void CmdChangeLevelCallback();
+#endif
+
+class NextMapManager : public SMGlobalClass
+{
+public:
+	NextMapManager();
+
+#if 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,18 +38,35 @@
 #include <IForwardSys.h>
 #include <IPlayerHelpers.h>
 #include <IAdminSystem.h>
+#include <ITranslator.h>
 #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;
 
+class IClient;
+
 #define PLAYER_LIFE_UNKNOWN	0
 #define PLAYER_LIFE_ALIVE	1
 #define PLAYER_LIFE_DEAD	2
 
 #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;
@@ -58,53 +75,83 @@ public:
 public:
 	const char *GetName();
 	const char *GetIPAddress();
-	const char *GetAuthString();
+	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);
 	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();
+
+	// This can be NULL for fakeclients due to limitations in our impl
+	IClient *GetIClient() const;
 private:
 	void Initialize(const char *name, const char *ip, edict_t *pEntity);
 	void Connect();
 	void Disconnect();
 	void SetName(const char *name);
 	void DumpAdmin(bool deleting);
-	void Authorize(const char *auth);
+	void UpdateAuthIds();
+	void Authorize();
 	void Authorize_Post();
 	void DoPostConnectAuthorization();
+	bool IsAuthStringValidated();
+	bool SetEngineString();
+	bool SetCSteamID();
 private:
-	bool m_IsConnected;
-	bool m_IsInGame;
-	bool m_IsAuthorized;
-	bool m_bIsInKickQueue;
+	bool m_IsConnected = false;
+	bool m_IsInGame = false;
+	bool m_IsAuthorized = false;
+	bool m_bIsInKickQueue = false;
 	String m_Name;
 	String m_Ip;
 	String m_IpNoPort;
-	String m_AuthID;
-	AdminId m_Admin;
-	bool m_TempAdmin;
-	edict_t *m_pEdict;
-	IPlayerInfo *m_Info;
+	ke::AString m_AuthID;
+	ke::AString m_Steam2Id;
+	ke::AString m_Steam3Id;
+	AdminId m_Admin = INVALID_ADMIN_ID;
+	bool m_TempAdmin = false;
+	edict_t *m_pEdict = nullptr;
+	IPlayerInfo *m_Info = nullptr;
+	IClient *m_pIClient = nullptr;
 	String m_LastPassword;
-	bool m_bAdminCheckSignalled;
+	bool m_bAdminCheckSignalled = false;
 	int m_iIndex;
-	unsigned int m_LangId;
-	int m_UserId;
+	unsigned int m_LangId = SOURCEMOD_LANGUAGE_ENGLISH;
+	int m_UserId = -1;
+	bool m_bFakeClient = false;
+	bool m_bIsSourceTV = false;
+	bool m_bIsReplay = false;
+	serial_t m_Serial;
+	CSteamID m_SteamId;
+#if SOURCE_ENGINE == SE_CSGO
+	QueryCvarCookie_t m_LanguageCookie = InvalidQueryCvarCookie;
+#endif
 };
 
 class PlayerManager : 
@@ -116,28 +163,33 @@ public:
 	PlayerManager();
 	~PlayerManager();
 public: //SMGlobalClass
+	void OnSourceModStartup(bool late) override;
 	void OnSourceModAllInitialized();
 	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:
 	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 defined ORANGEBOX_BUILD
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 	void OnClientCommand(edict_t *pEntity, const CCommand &args);
+#if SOURCE_ENGINE >= SE_EYE
+	void OnClientCommandKeyValues(edict_t *pEntity, KeyValues *pCommand);
+	void OnClientCommandKeyValues_Post(edict_t *pEntity, KeyValues *pCommand);
+#endif
 #else
 	void OnClientCommand(edict_t *pEntity);
 #endif
 	void OnClientSettingsChanged(edict_t *pEntity);
 	//void OnClientSettingsChanged_Pre(edict_t *pEntity);
+	void OnServerHibernationUpdate(bool bHibernating);
 public: //IPlayerManager
 	void AddClientListener(IClientListener *listener);
 	void RemoveClientListener(IClientListener *listener);
@@ -152,6 +204,9 @@ 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()
 	{
@@ -161,21 +216,36 @@ public:
 	{
 		return m_PlayerCount;
 	}
+	inline int ListenClient()
+	{
+		return m_ListenClient;
+	}
 	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);
+	inline bool InClientCommandKeyValuesHook()
+	{
+		return m_bInCCKVHook;
+	}
+#if SOURCE_ENGINE == SE_CSGO
+	bool HandleConVarQuery(QueryCvarCookie_t cookie, int client, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue);
+#endif
 private:
 	void OnServerActivate(edict_t *pEdictList, int edictCount, int clientMax);
+	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;
 	IForward *m_clcommand;
+	IForward *m_clcommandkv;
+	IForward *m_clcommandkv_post;
 	IForward *m_clinfochanged;
 	IForward *m_clauth;
 	IForward *m_onActivate;
@@ -184,12 +254,29 @@ private:
 	int *m_UserIdLookUp;
 	int m_maxClients;
 	int m_PlayerCount;
-	bool m_FirstPass;
+	int m_PlayersSinceActive;
+	bool m_bServerActivated;
 	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;
+	bool m_bInCCKVHook;
 };
 
+#if 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

@@ -1,487 +0,0 @@
-/**
- * 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

@@ -1,131 +0,0 @@
-/**
- * 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/TimerSys.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 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()
 {
-	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);
+	sharesys->AddInterface(NULL, this);
+	m_pOnGameFrame = forwardsys->CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
+	m_pOnMapTimeLeftChanged = forwardsys->CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
 }
 
 void TimerSystem::OnSourceModGameInitialized()
@@ -198,8 +198,8 @@ void TimerSystem::OnSourceModGameInitialized()
 void TimerSystem::OnSourceModShutdown()
 {
 	SetMapTimer(NULL);
-	g_Forwards.ReleaseForward(m_pOnGameFrame);
-	g_Forwards.ReleaseForward(m_pOnMapTimeLeftChanged);
+	forwardsys->ReleaseForward(m_pOnGameFrame);
+	forwardsys->ReleaseForward(m_pOnMapTimeLeftChanged);
 }
 
 void TimerSystem::OnSourceModLevelEnd()

core/TimerSys.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 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/UserMessages.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -31,15 +31,34 @@
 
 #include "UserMessages.h"
 #include "sm_stringutil.h"
+#include "logic_bridge.h"
+
+#if SOURCE_ENGINE == SE_CSGO
+#include <cstrike15_usermessage_helpers.h>
+#endif
+#include <amtl/am-string.h>
 
 UserMessages g_UserMsgs;
 
+#if SOURCE_ENGINE == SE_CSGO
+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() : m_InterceptBuffer(m_pBase, 2500)
+UserMessages::UserMessages()
+#ifndef USE_PROTOBUF_USERMESSAGES
+	: m_InterceptBuffer(m_pBase, 2500)
 {
-	m_Names = sm_trie_create();
+#else
+	: m_InterceptBuffer(NULL)
+{
+#endif
 	m_HookCount = 0;
 	m_InExec = false;
 	m_InHook = false;
@@ -49,8 +68,6 @@ UserMessages::UserMessages() : m_InterceptBuffer(m_pBase, 2500)
 
 UserMessages::~UserMessages()
 {
-	sm_trie_destroy(m_Names);
-
 	CStack<ListenerInfo *>::iterator iter;
 	for (iter=m_FreeListeners.begin(); iter!=m_FreeListeners.end(); iter++)
 	{
@@ -61,32 +78,43 @@ 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()
 {
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 }
 
 void UserMessages::OnSourceModAllShutdown()
 {
 	if (m_HookCount)
 	{
-		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
+		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
 	}
 	m_HookCount = 0;
 }
 
 int UserMessages::GetMessageIndex(const char *msg)
 {
-	int msgid;
+#if SOURCE_ENGINE == SE_CSGO
+	// Can split this per engine and/or game later
+	return g_Cstrike15UsermessageHelpers.GetIndex(msg);
+#else
 
-	if (!sm_trie_retrieve(m_Names, msg, reinterpret_cast<void **>(&msgid)))
+	int msgid;
+	if (!m_Names.retrieve(msg, &msgid))
 	{
 		if (m_FallbackSearch)
 		{
@@ -98,7 +126,7 @@ int UserMessages::GetMessageIndex(const char *msg)
 			{
 				if (strcmp(msgbuf, msg) == 0)
 				{
-					sm_trie_insert(m_Names, msg, reinterpret_cast<void *>(msgid));
+					m_Names.insert(msg, msgid);
 					return msgid;
 				}
 				msgid++;
@@ -108,16 +136,25 @@ int UserMessages::GetMessageIndex(const char *msg)
 		msgid = g_SMAPI->FindUserMessage(msg);
 
 		if (msgid != INVALID_MESSAGE_ID)
-		{
-			sm_trie_insert(m_Names, msg, reinterpret_cast<void *>(msgid));
-		}
+			m_Names.insert(msg, msgid);
 	}
 
 	return msgid;
+#endif
 }
 
 bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) const
 {
+#ifdef USE_PROTOBUF_USERMESSAGES
+#if SOURCE_ENGINE == SE_CSGO
+	const char *pszName = g_Cstrike15UsermessageHelpers.GetName(msgid);
+#endif
+	if (!pszName)
+		return false;
+
+	ke::SafeStrcpy(buffer, maxlength, pszName);
+	return true;
+#else
 	if (m_FallbackSearch)
 	{
 		int size;
@@ -128,15 +165,19 @@ bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) con
 
 	if (msg)
 	{
-		strncopy(buffer, msg, maxlength);
+		ke::SafeStrcpy(buffer, maxlength, msg);
 		return true;
 	}
 
 	return false;
+#endif
 }
 
-bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags)
+bf_write *UserMessages::StartBitBufMessage(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)
@@ -164,12 +205,89 @@ bf_write *UserMessages::StartMessage(int msg_id, const cell_t players[], unsigne
 
 	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()
@@ -179,12 +297,37 @@ bool UserMessages::EndMessage()
 		return false;
 	}
 
+#if SOURCE_ENGINE == SE_CSGO
+	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
 
 	m_InExec = false;
 	m_CurFlags = 0;
@@ -193,7 +336,60 @@ 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)
 	{
@@ -212,13 +408,19 @@ bool UserMessages::HookUserMessage(int msg_id, IUserMessageListener *pListener,
 	pInfo->Callback = pListener;
 	pInfo->IsHooked = false;
 	pInfo->KillMe = false;
+	pInfo->IsNew = isNew;
 
 	if (!m_HookCount++)
 	{
-		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 SOURCE_ENGINE == SE_CSGO
+		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
 	}
 
 	if (intercept)
@@ -231,8 +433,21 @@ bool UserMessages::HookUserMessage(int msg_id, IUserMessageListener *pListener,
 	return true;
 }
 
-bool UserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener, bool intercept)
-{	
+#ifdef USE_PROTOBUF_USERMESSAGES
+const protobuf::Message *UserMessages::GetMessagePrototype(int msg_type)
+{
+#if 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
+{
 	MsgList *pList;
 	MsgIter iter;
 	ListenerInfo *pInfo;
@@ -247,7 +462,7 @@ bool UserMessages::UnhookUserMessage(int msg_id, IUserMessageListener *pListener
 	for (iter=pList->begin(); iter!=pList->end(); iter++)
 	{
 		pInfo = (*iter);
-		if (pInfo->Callback == pListener)
+		if (pInfo->Callback == pListener && pInfo->IsNew == isNew)
 		{
 			if (pInfo->IsHooked)
 			{
@@ -272,14 +487,77 @@ void UserMessages::_DecRefCounter()
 {
 	if (--m_HookCount == 0)
 	{
-		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
+		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
 	}
 }
 
+#if SOURCE_ENGINE == SE_CSGO
+void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
+{
+#if 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_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
+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();
@@ -288,7 +566,7 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 		|| (m_InExec && (m_CurFlags & USERMSG_BLOCKHOOKS)))
 	{
 		m_InHook = false;
-		RETURN_META_VALUE(MRES_IGNORED, NULL);
+		UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 	}
 
 	m_CurId = msg_type;
@@ -298,42 +576,73 @@ 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();
-		RETURN_META_VALUE(MRES_SUPERCEDE, &m_InterceptBuffer);
+		UM_RETURN_META_VALUE(MRES_SUPERCEDE, &m_InterceptBuffer);
+#endif
 	}
 
-	RETURN_META_VALUE(MRES_IGNORED, NULL);
+	UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
+#if SOURCE_ENGINE == SE_CSGO
+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)
 	{
-		RETURN_META_VALUE(MRES_IGNORED, NULL);
+		UM_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
 
-	RETURN_META_VALUE(MRES_IGNORED, NULL);
+	UM_RETURN_META_VALUE(MRES_IGNORED, NULL);
 }
 
 void UserMessages::OnMessageEnd_Post()
 {
-	if (!m_InHook || m_BlockEndPost)
+	if (!m_InHook)
 	{
-		RETURN_META(MRES_IGNORED);
+		UM_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)
 		{
@@ -347,14 +656,20 @@ 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)
 		{
@@ -373,7 +688,7 @@ void UserMessages::OnMessageEnd_Pre()
 {
 	if (!m_InHook)
 	{
-		RETURN_META(MRES_IGNORED);
+		UM_RETURN_META(MRES_IGNORED);
 	}
 
 	MsgList *pList;
@@ -389,7 +704,11 @@ 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;
 
@@ -435,43 +754,61 @@ void UserMessages::OnMessageEnd_Pre()
 		iter++;
 	}
 
-	if (handled)
-	{
-		goto supercede;
-	}
-
-	if (intercepted)
+	if (!handled && intercepted)
 	{
+#if SOURCE_ENGINE == SE_CSGO
+		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
 	}
 
-	pList = &m_msgHooks[m_CurId];
-	for (iter=pList->begin(); iter!=pList->end(); )
 	{
-		pInfo = (*iter);
-		pInfo->IsHooked = true;
-		pInfo->Callback->OnUserMessage(m_CurId, m_OrigBuffer, m_CurRecFilter);
+#if SOURCE_ENGINE == SE_CSGO
+		int size = m_OrigBuffer->ByteSize();
+		uint8 *data = (uint8 *)stackalloc(size);
+		m_OrigBuffer->SerializePartialToArray(data, size);
 
-		if (pInfo->KillMe)
+		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(); )
 		{
-			iter = pList->erase(iter);
-			m_FreeListeners.push(pInfo);
-			_DecRefCounter();
-			continue;
+			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++;
 		}
 
-		pInfo->IsHooked = false;
-		iter++;
+#if SOURCE_ENGINE == SE_CSGO
+		delete pTempMsg;
+#endif
 	}
 
-	RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
+	UM_RETURN_META((intercepted) ? MRES_SUPERCEDE : MRES_IGNORED);
 supercede:
-	m_InHook = false;
 	m_BlockEndPost = true;
-	RETURN_META(MRES_SUPERCEDE);
+	UM_RETURN_META(MRES_SUPERCEDE);
 }

core/UserMessages.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,22 +32,44 @@
 #ifndef _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 #define _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 
-#include "ShareSys.h"
 #include <IUserMessages.h>
 #include "sourcemm_api.h"
-#include "sm_trie.h"
+#include <sm_stringhashmap.h>
+#include "sm_stringutil.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
+#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
 {
-	IUserMessageListener *Callback;
+#ifdef USE_PROTOBUF_USERMESSAGES
+	IProtobufUserMessageListener *Callback;
+#else
+	IBitBufUserMessageListener *Callback;
+#endif
 	bool IsHooked;
 	bool KillMe;
+	bool IsNew;
 };
 
 typedef List<ListenerInfo *> MsgList;
@@ -69,30 +91,70 @@ 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 *StartMessage(int msg_id, const cell_t players[], unsigned int playersNum, int flags);
+	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);
 	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
+	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
+	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;
-	unsigned char m_pBase[2500];
 	IRecipientFilter *m_CurRecFilter;
+#ifndef USE_PROTOBUF_USERMESSAGES
+	unsigned char m_pBase[2500];
 	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;
 
-	Trie *m_Names;
+	StringHashMap<int> m_Names;
+#endif
 	CellRecipientFilter m_CellRecFilter;
 	bool m_InExec;
 	int m_CurFlags;

core/command_args.h

@@ -0,0 +1,77 @@
+// vim: set ts=4 sw=4 tw=99 noet :
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 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>.
+#ifndef _INCLUDE_SOURCEMOD_CCOMMANDARGS_IMPL_H_
+#define _INCLUDE_SOURCEMOD_CCOMMANDARGS_IMPL_H_
+
+#include "sourcemm_api.h"
+#include <IRootConsoleMenu.h>
+#include <compat_wrappers.h>
+
+#if SOURCE_ENGINE==SE_EPISODEONE || SOURCE_ENGINE==SE_DARKMESSIAH
+class EngineArgs : public ICommandArgs
+{
+public:
+	EngineArgs(const CCommand& _cmd)
+	{
+	}
+	const char *Arg(int n) const
+	{
+		return engine->Cmd_Argv(n);
+	}
+	int ArgC() const
+	{
+		return engine->Cmd_Argc();
+	}
+	const char *ArgS() const
+	{
+		return engine->Cmd_Args();
+	}
+};
+#else
+class EngineArgs : public ICommandArgs
+{
+	const CCommand *cmd;
+public:
+	EngineArgs(const CCommand& _cmd) : cmd(&_cmd)
+	{
+	}
+	const char *Arg(int n) const
+	{
+		return cmd->Arg(n);
+	}
+	int ArgC() const
+	{
+		return cmd->ArgC();
+	}
+	const char *ArgS() const
+	{
+		return cmd->ArgS();
+	}
+};
+#endif
+
+#endif // _INCLUDE_SOURCEMOD_CCOMMANDARGS_IMPL_H_

core/concmd_cleaner.cpp

@@ -1,33 +1,29 @@
-/**
- * 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$
- */
+// vim: set ts=4 sw=4 tw=99 et:
+// =============================================================================
+// 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>.
 
 #include "sm_globals.h"
 #include <sh_list.h>
@@ -35,9 +31,18 @@
 #include "concmd_cleaner.h"
 #include "sm_stringutil.h"
 #include "sourcemm_api.h"
+#include "compat_wrappers.h"
+#include <amtl/am-string.h>
 
-#if defined ORANGEBOX_BUILD
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 SH_DECL_HOOK1_void(ICvar, UnregisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
+#if SOURCE_ENGINE == SE_CSGO
+SH_DECL_HOOK2_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *, bool);
+#else
+SH_DECL_HOOK1_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
+#endif
+#else
+SH_DECL_HOOK1_void(ICvar, RegisterConCommandBase, SH_NOATTRIB, 0, ConCommandBase *);
 #endif
 
 using namespace SourceHook;
@@ -50,64 +55,73 @@ 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()
 	{
-		SH_ADD_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
+#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
 	}
 
 	void OnSourceModShutdown()
 	{
-		SH_REMOVE_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
-	}
+#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);
 #endif
+	}
+
+#if SOURCE_ENGINE == SE_CSGO
+	void LinkConCommandBase(ConCommandBase *pBase, bool unknown)
+#else
+	void LinkConCommandBase(ConCommandBase *pBase)
+#endif
+	{
+		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();
 
-		if (pBase)
+		IConCommandLinkListener *listener = IConCommandLinkListener::head;
+		while (listener)
 		{
-			while (iter != tracked_bases.end())
-			{
-				if ((*iter)->pBase == pBase)
-				{
-					pInfo = (*iter);
-					iter = tracked_bases.erase(iter);
-					pInfo->cls->OnUnlinkConCommandBase(pBase, pBase->GetName(), true);
-					delete pInfo;
-				}
-				else
-				{
-					iter++;
-				}
-			}
-		}
-		else
-		{
-			while (iter != tracked_bases.end())
-			{
-				/* This is just god-awful! */
-				if (FindConCommandBase((*iter)->name) != (*iter)->pBase)
-				{
-					pInfo = (*iter);
-					iter = tracked_bases.erase(iter);
-					pInfo->cls->OnUnlinkConCommandBase(pBase, pInfo->name, false);
-					delete pInfo;
-				}
-				else
-				{
-					iter++;
-				}
-			}
+			listener->OnUnlinkConCommand(pBase);
+			listener = listener->next;
 		}
+
+        while (iter != tracked_bases.end())
+        {
+            if ((*iter)->pBase == pBase)
+            {
+                pInfo = (*iter);
+                iter = tracked_bases.erase(iter);
+                pInfo->cls->OnUnlinkConCommandBase(pBase, pBase->GetName());
+                delete pInfo;
+            }
+            else
+            {
+                iter++;
+            }
+        }
 	}
 
 	void AddTarget(ConCommandBase *pBase, IConCommandTracker *cls)
@@ -116,7 +130,7 @@ public:
 
 		info->pBase = pBase;
 		info->cls = cls;
-		strncopy(info->name, pBase->GetName(), sizeof(info->name));
+		ke::SafeStrcpy(info->name, sizeof(info->name), pBase->GetName());
 
 		tracked_bases.push_back(info);
 	}
@@ -143,22 +157,6 @@ 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,12 +35,33 @@
 class IConCommandTracker
 {
 public:
-	virtual void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe) = 0;
+	virtual void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) = 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.h

@@ -1,551 +0,0 @@
-//========= Copyright © 1996-2005, Valve Corporation, All rights reserved. ============//
-//
-// Purpose: 
-//
-// $Workfile:     $
-// $Date: 2006-08-13 06:34:30 -0500 (Sun, 13 Aug 2006) $
-//
-//-----------------------------------------------------------------------------
-// $NoKeywords: $
-//=============================================================================//
-
-#ifndef CONVAR_H
-#define CONVAR_H
-#if _WIN32
-#pragma once
-#endif
-
-#include "tier0/dbg.h"
-
-#ifdef _WIN32
-#define FORCEINLINE_CVAR FORCEINLINE
-#elif _LINUX
-#define FORCEINLINE_CVAR __inline__ FORCEINLINE
-#else
-#error "implement me"
-#endif
-
-// The default, no flags at all
-#define FCVAR_NONE				0 
-
-// Command to ConVars and ConCommands
-// ConVar Systems
-#define FCVAR_UNREGISTERED		(1<<0)	// If this is set, don't add to linked list, etc.
-#define FCVAR_LAUNCHER			(1<<1)	// defined by launcher
-#define FCVAR_GAMEDLL			(1<<2)	// defined by the game DLL
-#define FCVAR_CLIENTDLL			(1<<3)  // defined by the client DLL
-#define FCVAR_MATERIAL_SYSTEM	(1<<4)	// Defined by the material system.
-#define FCVAR_DATACACHE			(1<<19)	// Defined by the datacache system.
-#define FCVAR_STUDIORENDER		(1<<15)	// Defined by the studiorender system.
-#define FCVAR_FILESYSTEM		(1<<21)	// Defined by the file system.
-#define FCVAR_PLUGIN			(1<<18)	// Defined by a 3rd party plugin.
-#define FCVAR_TOOLSYSTEM		(1<<20)	// Defined by an IToolSystem library
-#define FCVAR_SOUNDSYSTEM		(1<<23)	// Defined by the soundsystem library
-#define FCVAR_INPUTSYSTEM		(1<<25)	// Defined by the inputsystem dll
-#define FCVAR_NETWORKSYSTEM		(1<<26) // Defined by the network system
-// NOTE!! if you add a cvar system, add it here too!!!!
-// the engine lacks a cvar flag, but needs it for xbox
-// an engine cvar is thus a cvar not marked with any other system
-#define FCVAR_NON_ENGINE		((FCVAR_LAUNCHER|FCVAR_GAMEDLL|FCVAR_CLIENTDLL|FCVAR_MATERIAL_SYSTEM|FCVAR_DATACACHE|FCVAR_STUDIORENDER|FCVAR_FILESYSTEM|FCVAR_PLUGIN|FCVAR_TOOLSYSTEM|FCVAR_SOUNDSYSTEM|FCVAR_INPUTSYSTEM|FCVAR_NETWORKSYSTEM))
-
-// ConVar only
-#define FCVAR_PROTECTED			(1<<5)  // It's a server cvar, but we don't send the data since it's a password, etc.  Sends 1 if it's not bland/zero, 0 otherwise as value
-#define FCVAR_SPONLY			(1<<6)  // This cvar cannot be changed by clients connected to a multiplayer server.
-#define	FCVAR_ARCHIVE			(1<<7)	// set to cause it to be saved to vars.rc
-#define	FCVAR_NOTIFY			(1<<8)	// notifies players when changed
-#define	FCVAR_USERINFO			(1<<9)	// changes the client's info string
-#define FCVAR_CHEAT				(1<<14) // Only useable in singleplayer / debug / multiplayer & sv_cheats
-
-#define FCVAR_PRINTABLEONLY		(1<<10)  // This cvar's string cannot contain unprintable characters ( e.g., used for player name etc ).
-#define FCVAR_UNLOGGED			(1<<11)  // If this is a FCVAR_SERVER, don't log changes to the log file / console if we are creating a log
-#define FCVAR_NEVER_AS_STRING	(1<<12)  // never try to print that cvar
-
-// It's a ConVar that's shared between the client and the server.
-// At signon, the values of all such ConVars are sent from the server to the client (skipped for local
-//  client, of course )
-// If a change is requested it must come from the console (i.e., no remote client changes)
-// If a value is changed while a server is active, it's replicated to all connected clients
-#define FCVAR_REPLICATED		(1<<13)	// server setting enforced on clients, TODO rename to FCAR_SERVER at some time
-#define FCVAR_DEMO				(1<<16)  // record this cvar when starting a demo file
-#define FCVAR_DONTRECORD		(1<<17)  // don't record these command in demofiles
-
-#define FCVAR_NOT_CONNECTED		(1<<22)	// cvar cannot be changed by a client that is connected to a server
-
-#define FCVAR_ARCHIVE_XBOX		(1<<24) // cvar written to config.cfg on the Xbox
-
-
-// #define FCVAR_AVAILABLE			(1<<27)
-// #define FCVAR_AVAILABLE			(1<<28)
-// #define FCVAR_AVAILABLE			(1<<29)
-// #define FCVAR_AVAILABLE			(1<<30)
-// #define FCVAR_AVAILABLE			(1<<31)
-
-
-class ConVar;
-class ConCommand;
-class ConCommandBase;
-
-// 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;
-};
-
-
-// You don't have to instantiate one of these, just call its 
-// OneTimeInit function when your executable is initializing.
-class ConCommandBaseMgr
-{
-public:
-	// Call this ONCE when the executable starts up.
-	static void	OneTimeInit( IConCommandBaseAccessor *pAccessor );
-#ifdef _XBOX
-	static bool Fixup( ConCommandBase* pConCommandBase );
-#ifndef _RETAIL
-	static void PublishCommands( bool bForce );
-#endif
-#endif
-};
-
-// Called when a ConVar changes value
-typedef void ( *FnChangeCallback )( ConVar *var, char const *pOldString );
-
-// Called when a ConCommand needs to execute
-typedef void ( *FnCommandCallback )( void );
-
-#define COMMAND_COMPLETION_MAXITEMS		64
-#define COMMAND_COMPLETION_ITEM_LENGTH	64
-
-// Returns 0 to COMMAND_COMPLETION_MAXITEMS worth of completion strings
-typedef int  ( *FnCommandCompletionCallback )( char const *partial, char commands[ COMMAND_COMPLETION_MAXITEMS ][ COMMAND_COMPLETION_ITEM_LENGTH ] );
-
-//-----------------------------------------------------------------------------
-// Purpose: The base console invoked command/cvar interface
-//-----------------------------------------------------------------------------
-class ConCommandBase
-{
-	friend class ConCommandBaseMgr;
-	friend class CCvar;
-	friend class ConVar;
-	friend class ConCommand;
-
-public:
-								ConCommandBase( void );
-								ConCommandBase( char const *pName, char const *pHelpString = 0, 
-									int flags = 0 );
-
-	virtual						~ConCommandBase( void );
-
-	virtual	bool				IsCommand( void ) const;
-
-	// Check flag
-	virtual bool				IsBitSet( int flag ) const;
-	// Set flag
-	virtual void				AddFlags( int flags );
-
-	// Return name of cvar
-	virtual char const			*GetName( void ) const;
-
-	// Return help text for cvar
-	virtual char const			*GetHelpText( void ) const;
-
-	// Deal with next pointer
-	const ConCommandBase		*GetNext( void ) const;
-	void						SetNext( ConCommandBase *next );
-	
-	virtual bool				IsRegistered( void ) const;
-
-	// Global methods
-	static ConCommandBase const	*GetCommands( void );
-	static void					AddToList( ConCommandBase *var );
-	static void					RemoveFlaggedCommands( int flag );
-	static void					RevertFlaggedCvars( int flag );
-	static ConCommandBase const	*FindCommand( char const *name );
-
-protected:
-	virtual void				Create( char const *pName, char const *pHelpString = 0, 
-									int flags = 0 );
-
-	// Used internally by OneTimeInit to initialize.
-	virtual void				Init();
-
-	// Internal copy routine ( uses new operator from correct module )
-	char						*CopyString( char const *from );
-
-	// Next ConVar in chain
-	ConCommandBase				*m_pNext;
-
-private:
-	// Has the cvar been added to the global list?
-	bool						m_bRegistered;
-
-	// Static data
-	char const 					*m_pszName;
-	char const 					*m_pszHelpString;
-	
-	// ConVar flags
-	int							m_nFlags;
-
-protected:
-
-	// ConVars add themselves to this list for the executable. Then ConVarMgr::Init() runs through 
-	// all the console variables and registers them.
-	static ConCommandBase		*s_pConCommandBases;
-
-	// ConVars in this executable use this 'global' to access values.
-	static IConCommandBaseAccessor	*s_pAccessor;
-	
-public: // Hackalicous
-	inline int GetFlags() const
-	{
-		return m_nFlags;
-	}
-	inline void SetFlags(int flags)	
-	{ 
-		m_nFlags = flags; 
-	}
-};
-
-//-----------------------------------------------------------------------------
-// Purpose: The console invoked command
-//-----------------------------------------------------------------------------
-class ConCommand : public ConCommandBase
-{
-friend class ConCommandBaseMgr;
-friend class CCvar;
-#ifdef _STATIC_LINKED
-friend class G_ConCommand;
-friend class C_ConCommand;
-friend class M_ConCommand;
-friend class S_ConCommand;
-friend class D_ConCommand;
-#endif
-
-public:
-	typedef ConCommandBase BaseClass;
-
-								ConCommand( void );
-								ConCommand( char const *pName, FnCommandCallback callback, 
-									char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 );
-
-	virtual						~ConCommand( void );
-
-	virtual	bool				IsCommand( void ) const;
-
-	virtual int					AutoCompleteSuggest( char const *partial, char commands[ COMMAND_COMPLETION_MAXITEMS ][ COMMAND_COMPLETION_ITEM_LENGTH ] );
-
-	virtual bool				CanAutoComplete( void );
-
-	// Invoke the function
-	virtual void				Dispatch( void );
-private:
-	virtual void				Create( char const *pName, FnCommandCallback callback, 
-									char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 );
-
-	// Call this function when executing the command
-	FnCommandCallback			m_fnCommandCallback;
-
-	FnCommandCompletionCallback	m_fnCompletionCallback;
-	bool						m_bHasCompletionCallback;
-public: // Hackalicous
-	inline FnCommandCallback GetCallback() const
-	{ 
-		return m_fnCommandCallback; 
-	}
-};
-
-//-----------------------------------------------------------------------------
-// Purpose: A console variable
-//-----------------------------------------------------------------------------
-class ConVar : public ConCommandBase
-{
-friend class ConCommandBaseMgr;
-friend class CCvar;
-friend class CDefaultCvar;
-#ifdef _STATIC_LINKED
-friend class G_ConVar;
-friend class C_ConVar;
-friend class M_ConVar;
-friend class S_ConVar;
-friend class D_ConVar;
-#endif
-
-public:
-	typedef ConCommandBase BaseClass;
-
-								ConVar( char const *pName, char const *pDefaultValue, int flags = 0);
-
-								ConVar( char const *pName, char const *pDefaultValue, int flags, 
-									char const *pHelpString );
-								ConVar( char const *pName, char const *pDefaultValue, int flags, 
-									char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax );
-								ConVar( char const *pName, char const *pDefaultValue, int flags, 
-									char const *pHelpString, FnChangeCallback callback );
-								ConVar( char const *pName, char const *pDefaultValue, int flags, 
-									char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax,
-									FnChangeCallback callback );
-
-	virtual						~ConVar( void );
-
-	virtual bool				IsBitSet( int flag ) const;
-	virtual char const*			GetHelpText( void ) const;
-	virtual bool				IsRegistered( void ) const;
-	virtual char const			*GetName( void ) const;
-	virtual void				AddFlags( int flags );
-	virtual	bool				IsCommand( void ) const;
-
-	// Install a change callback (there shouldn't already be one....)
-	void InstallChangeCallback( FnChangeCallback 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;
-
-	// 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( char const *value );
-	virtual void				SetValue( float value );
-	virtual void				SetValue( int value );
-	
-	// 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;
-	char const					*GetDefault( void ) const;
-
-	static void					RevertAll( void );
-private:
-	// Called by CCvar when the value of a var is changing.
-	virtual void				InternalSetValue(char const *value);
-	// For CVARs marked FCVAR_NEVER_AS_STRING
-	virtual void				InternalSetFloatValue( float fNewValue );
-	virtual void				InternalSetIntValue( int nValue );
-
-	virtual bool				ClampValue( float& value );
-	virtual void				ChangeStringValue( char const *tempVal );
-
-	virtual void				Create( char const *pName, char const *pDefaultValue, int flags = 0,
-									char const *pHelpString = 0, bool bMin = false, float fMin = 0.0,
-									bool bMax = false, float fMax = false, FnChangeCallback callback = 0 );
-
-	// Used internally by OneTimeInit to initialize.
-	virtual void				Init();
-
-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
-	char const					*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			m_fnChangeCallback;
-public: // Hackalicous
-	inline FnChangeCallback	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 : char const *
-//-----------------------------------------------------------------------------
-FORCEINLINE_CVAR char const *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 : "";
-}
-
-
-#ifdef _STATIC_LINKED
-// identifies subsystem via piggybacking constructors with flags
-class G_ConCommand : public ConCommand
-{
-public:
-	G_ConCommand(char const *pName, FnCommandCallback callback, char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 ) :	ConCommand(pName, callback, pHelpString, flags|FCVAR_GAMEDLL, completionFunc) {}
-};
-
-class C_ConCommand : public ConCommand
-{
-public:
-	C_ConCommand(char const *pName, FnCommandCallback callback, char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 ) :	ConCommand(pName, callback, pHelpString, flags|FCVAR_CLIENTDLL, completionFunc) {}
-};
-
-class M_ConCommand : public ConCommand
-{
-public:
-	M_ConCommand(char const *pName, FnCommandCallback callback, char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 ) :	ConCommand(pName, callback, pHelpString, flags|FCVAR_MATERIAL_SYSTEM, completionFunc) {}
-};
-
-class S_ConCommand : public ConCommand
-{
-public:
-	S_ConCommand(char const *pName, FnCommandCallback callback, char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 ) :	ConCommand(pName, callback, pHelpString, flags|FCVAR_STUDIORENDER, completionFunc) {}
-};
-
-class D_ConCommand : public ConCommand
-{
-public:
-	D_ConCommand(char const *pName, FnCommandCallback callback, char const *pHelpString = 0, int flags = 0, FnCommandCompletionCallback completionFunc = 0 ) :	ConCommand(pName, callback, pHelpString, flags|FCVAR_DATACACHE, completionFunc) {}
-};
-
-typedef void ( *G_FnChangeCallback )( G_ConVar *var, char const *pOldString );
-typedef void ( *C_FnChangeCallback )( C_ConVar *var, char const *pOldString );
-typedef void ( *M_FnChangeCallback )( M_ConVar *var, char const *pOldString );
-typedef void ( *S_FnChangeCallback )( S_ConVar *var, char const *pOldString );
-typedef void ( *D_FnChangeCallback )( D_ConVar *var, char const *pOldString );
-
-class G_ConVar : public ConVar
-{
-public:
-	G_ConVar( char const *pName, char const *pDefaultValue, int flags = 0) : ConVar(pName, pDefaultValue, flags|FCVAR_GAMEDLL) {}
-	G_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString ) : ConVar(pName, pDefaultValue, flags|FCVAR_GAMEDLL, pHelpString ) {}
-	G_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax ) : ConVar(pName, pDefaultValue, flags|FCVAR_GAMEDLL, pHelpString, bMin, fMin, bMax, fMax) {}
-	G_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, G_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_GAMEDLL, pHelpString, (FnChangeCallback)callback ) {}
-	G_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax, G_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_GAMEDLL, pHelpString, bMin, fMin, bMax, fMax, (FnChangeCallback)callback ) {}
-};
-
-class C_ConVar : public ConVar
-{
-public:
-	C_ConVar( char const *pName, char const *pDefaultValue, int flags = 0) : ConVar(pName, pDefaultValue, flags|FCVAR_CLIENTDLL) {}
-	C_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString ) : ConVar(pName, pDefaultValue, flags|FCVAR_CLIENTDLL, pHelpString ) {}
-	C_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax ) : ConVar(pName, pDefaultValue, flags|FCVAR_CLIENTDLL, pHelpString, bMin, fMin, bMax, fMax) {}
-	C_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, C_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_CLIENTDLL, pHelpString, (FnChangeCallback)callback ) {}
-	C_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax, C_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_CLIENTDLL, pHelpString, bMin, fMin, bMax, fMax, (FnChangeCallback)callback ) {}
-};
-
-class M_ConVar : public ConVar
-{
-public:
-	M_ConVar( char const *pName, char const *pDefaultValue, int flags = 0) : ConVar(pName, pDefaultValue, flags|FCVAR_MATERIAL_SYSTEM) {}
-	M_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString ) : ConVar(pName, pDefaultValue, flags|FCVAR_MATERIAL_SYSTEM, pHelpString ) {}
-	M_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax ) : ConVar(pName, pDefaultValue, flags|FCVAR_MATERIAL_SYSTEM, pHelpString, bMin, fMin, bMax, fMax) {}
-	M_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, M_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_MATERIAL_SYSTEM, pHelpString, (FnChangeCallback)callback ) {}
-	M_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax, M_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_MATERIAL_SYSTEM, pHelpString, bMin, fMin, bMax, fMax, (FnChangeCallback)callback ) {}
-};
-
-class S_ConVar : public ConVar
-{
-public:
-	S_ConVar( char const *pName, char const *pDefaultValue, int flags = 0) : ConVar(pName, pDefaultValue, flags|FCVAR_STUDIORENDER) {}
-	S_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString ) : ConVar(pName, pDefaultValue, flags|FCVAR_STUDIORENDER, pHelpString ) {}
-	S_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax ) : ConVar(pName, pDefaultValue, flags|FCVAR_STUDIORENDER, pHelpString, bMin, fMin, bMax, fMax) {}
-	S_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, M_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_STUDIORENDER, pHelpString, (FnChangeCallback)callback ) {}
-	S_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax, S_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_STUDIORENDER, pHelpString, bMin, fMin, bMax, fMax, (FnChangeCallback)callback ) {}
-};
-
-class D_ConVar : public ConVar
-{
-public:
-	D_ConVar( char const *pName, char const *pDefaultValue, int flags = 0) : ConVar(pName, pDefaultValue, flags|FCVAR_DATACACHE) {}
-	D_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString ) : ConVar(pName, pDefaultValue, flags|FCVAR_DATACACHE, pHelpString ) {}
-	D_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax ) : ConVar(pName, pDefaultValue, flags|FCVAR_DATACACHE, pHelpString, bMin, fMin, bMax, fMax) {}
-	D_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, M_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_DATACACHE, pHelpString, (FnChangeCallback)callback ) {}
-	D_ConVar( char const *pName, char const *pDefaultValue, int flags, char const *pHelpString, bool bMin, float fMin, bool bMax, float fMax, D_FnChangeCallback callback ) : ConVar(pName, pDefaultValue, flags|FCVAR_DATACACHE, pHelpString, bMin, fMin, bMax, fMax, (FnChangeCallback)callback ) {}
-};
-
-// redirect these declarations to their specific subsystem
-#ifdef GAME_DLL
-#define ConCommand	G_ConCommand
-#define ConVar		G_ConVar
-#endif
-#ifdef CLIENT_DLL
-#define ConCommand	C_ConCommand
-#define ConVar		C_ConVar
-#endif
-#ifdef MATERIALSYSTEM_DLL
-#define ConCommand	M_ConCommand
-#define ConVar		M_ConVar
-#endif
-#ifdef STUDIORENDER_DLL
-#define ConCommand	S_ConCommand
-#define ConVar		S_ConVar
-#endif
-#ifdef DATACACHE_DLL
-#define ConCommand	D_ConCommand
-#define ConVar		D_ConVar
-#endif
-#endif // _STATIC_LINKED
-
-//-----------------------------------------------------------------------------
-// Purpose: Utility to quicky generate a simple console command
-//-----------------------------------------------------------------------------
-#define CON_COMMAND( name, description ) \
-   static void name(); \
-   static ConCommand name##_command( #name, name, description ); \
-   static void name()
-
-//-----------------------------------------------------------------------------
-// Purpose: Utility to quicky generate a simple console command
-//-----------------------------------------------------------------------------
-#define CON_COMMAND_F( name, description, flags ) \
-   static void name(); \
-   static ConCommand name##_command( #name, name, description, flags ); \
-   static void name()
-
-
-#endif // CONVAR_H

core/convar_sm_ob.h

@@ -1,709 +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 _LINUX
-#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 );
-
-	// 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 );
-
-	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: // Hackalicous
-	inline int GetFlags() const
-	{
-		return m_nFlags;
-	}
-	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: // Hackalicous
-	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				IsFlagSet( int flag ) const;
-	virtual const char*			GetHelpText( void ) const;
-	virtual bool				IsRegistered( void ) const;
-	virtual const char			*GetName( void ) const;
-	virtual void				AddFlags( int flags );
-	virtual	bool				IsCommand( 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;
-
-	// 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 );
-	
-	// 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 );
-
-	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 );
-
-	// Used internally by OneTimeInit to initialize.
-	virtual void				Init();
-
-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: // Hackalicous
-	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
-//-----------------------------------------------------------------------------
-#if defined _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;
-};
-
-#if defined _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/frame_hooks.cpp

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,20 +30,79 @@
  */
 #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"
 
-float g_LastMenuTime = 0.0f;
-float g_LastAuthCheck = 0.0f;
+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();
+}
 
 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-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,6 +32,22 @@
 #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/ADTFactory.cpp

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

core/logic/ADTFactory.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 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 "sm_globals.h"
-#include "sm_trie.h"
+#include "common_logic.h"
+#include <sm_stringhashmap.h>
 
 using namespace SourceMod;
 
@@ -50,7 +50,7 @@ public:
 	virtual void Clear();
 	virtual void Destroy();
 private:
-	Trie *m_pTrie;
+	StringHashMap<void *> map_;
 };
 
 class ADTFactory : 

core/logic/AMBuilder

@@ -0,0 +1,98 @@
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
+import os
+
+for arch in SM.archs:
+  binary = SM.Library(builder, 'sourcemod.logic', arch)
+  binary.compiler.cxxincludes += [
+    builder.sourcePath,
+    os.path.join(builder.sourcePath, 'core', 'logic'),
+    os.path.join(builder.sourcePath, 'public'),
+    os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
+    os.path.join(builder.sourcePath, 'public', 'amtl', 'amtl'),
+    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.family == 'gcc' or binary.compiler.family == 'clang':
+    binary.compiler.cxxflags += ['-fno-rtti']
+  elif binary.compiler.family == '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',
+    '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',
+    'sprintf.cpp',
+    'LibrarySys.cpp',
+    'RootConsoleMenu.cpp',
+    'CDataPack.cpp',
+    'frame_tasks.cpp',
+    'smn_halflife.cpp',
+    'FrameIterator.cpp',
+    'DatabaseConfBuilder.cpp',
+  ]
+
+  if arch == 'x64':
+    binary.sources += ['PseudoAddrManager.cpp']
+
+  if builder.target.platform == 'windows':
+    binary.sources += ['thread/WinThreads.cpp']
+  else:
+    binary.sources += ['thread/PosixThreads.cpp']
+
+  SM.binaries += [builder.Add(binary)]

core/logic/AdminCache.h

@@ -1,201 +1,231 @@
-/**
- * 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_
+/**
+ * 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;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
+};
+
+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_

core/logic/CDataPack.cpp

@@ -0,0 +1,244 @@
+/**
+ * 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 <stdlib.h>
+#include <string.h>
+#include "CDataPack.h"
+#include <amtl/am-autoptr.h>
+
+CDataPack::CDataPack()
+{
+	Initialize();
+}
+
+CDataPack::~CDataPack()
+{
+	Initialize();
+}
+
+static ke::Vector<ke::AutoPtr<CDataPack>> sDataPackCache;
+
+CDataPack *CDataPack::New()
+{
+  if (sDataPackCache.empty())
+    return new CDataPack();
+
+  CDataPack *pack = sDataPackCache.back().take();
+  sDataPackCache.pop();
+  pack->Initialize();
+  return pack;
+}
+
+void
+CDataPack::Free(CDataPack *pack)
+{
+  sDataPackCache.append(static_cast<CDataPack *>(pack));
+}
+
+void CDataPack::Initialize()
+{
+	do
+	{
+	} while (this->RemoveItem());
+
+	elements.clear();
+	position = 0;
+}
+
+void CDataPack::ResetSize()
+{
+	Initialize();
+}
+
+size_t CDataPack::CreateMemory(size_t size, void **addr)
+{
+	InternalPack val;
+	val.type = CDataPackType::Raw;
+	val.pData.vval = new uint8_t[size + sizeof(size)];
+	reinterpret_cast<size_t *>(val.pData.vval)[0] = size;
+	elements.insert(position, val);
+
+	return position++;
+}
+
+void CDataPack::PackCell(cell_t cell)
+{
+	InternalPack val;
+	val.type = CDataPackType::Cell;
+	val.pData.cval = cell;
+	elements.insert(position++, val);
+}
+
+void CDataPack::PackFunction(cell_t function)
+{
+	InternalPack val;
+	val.type = CDataPackType::Function;
+	val.pData.cval = function;
+	elements.insert(position++, val);
+}
+
+void CDataPack::PackFloat(float floatval)
+{
+	InternalPack val;
+	val.type = CDataPackType::Float;
+	val.pData.fval = floatval;
+	elements.insert(position++, val);
+}
+
+void CDataPack::PackString(const char *string)
+{
+	InternalPack val;
+	val.type = CDataPackType::String;
+	ke::AString *sval = new ke::AString(string);
+	val.pData.sval = sval;
+	elements.insert(position++, val);
+}
+
+void CDataPack::Reset() const
+{
+	position = 0;
+}
+
+size_t CDataPack::GetPosition() const
+{
+	return position;
+}
+
+bool CDataPack::SetPosition(size_t pos) const
+{
+	if (pos > elements.length())
+		return false;
+
+	position = pos;
+	return true;
+}
+
+cell_t CDataPack::ReadCell() const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::Cell)
+		return 0;
+	
+	return elements[position++].pData.cval;
+}
+
+cell_t CDataPack::ReadFunction() const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::Function)
+		return 0;
+	
+	return elements[position++].pData.cval;
+}
+
+float CDataPack::ReadFloat() const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::Float)
+		return 0;
+	
+	return elements[position++].pData.fval;
+}
+
+bool CDataPack::IsReadable(size_t bytes) const
+{
+	return (position < elements.length());
+}
+
+const char *CDataPack::ReadString(size_t *len) const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::String)
+	{
+		if (len)
+			*len = 0;
+
+		return nullptr;
+	}
+
+	const ke::AString &val = *elements[position++].pData.sval;
+	if (len)
+		*len = val.length();
+
+	return val.chars();
+}
+
+void *CDataPack::ReadMemory(size_t *size) const
+{
+	void *ptr = nullptr;
+	if (!IsReadable() || elements[position].type != CDataPackType::Raw)
+		return ptr;
+
+	size_t *val = reinterpret_cast<size_t *>(elements[position].pData.vval);
+	ptr = &(val[1]);
+	++position;
+
+	if (size)
+		*size = val[0]; /* Egor!!!! */
+
+	return ptr;
+}
+
+bool CDataPack::RemoveItem(size_t pos)
+{
+	if (!elements.length())
+	{
+		return false;
+	}
+
+	if (pos == static_cast<size_t>(-1))
+	{
+		pos = position;
+	}
+	if (pos >= elements.length())
+	{
+		return false;
+	}
+
+	if (pos < position) // we're deleting under us, step back
+	{
+		--position;
+	}
+
+	switch (elements[pos].type)
+	{
+		case CDataPackType::Raw:
+		{
+			delete elements[pos].pData.vval;
+			break;
+		}
+
+		case CDataPackType::String:
+		{
+			delete elements[pos].pData.sval;
+			break;
+		}
+	}
+
+	elements.remove(pos);
+	return true;
+}

core/logic/CDataPack.h

@@ -0,0 +1,196 @@
+/**
+ * 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_CDATAPACK_H_
+#define _INCLUDE_SOURCEMOD_CDATAPACK_H_
+
+#include <ISourceMod.h>
+#include <amtl/am-vector.h>
+#include <amtl/am-string.h>
+
+using namespace SourceMod;
+
+enum CDataPackType {
+	Raw,
+	Cell,
+	Float,
+	String,
+	Function
+};
+
+class CDataPack
+{
+public:
+	CDataPack();
+	~CDataPack();
+
+    static CDataPack *New();
+    static void Free(CDataPack *pack);
+
+public: // Originally IDataReader
+	/**
+	 * @brief Resets the position in the data stream to the beginning.
+	 */
+	void Reset() const;
+
+	/**
+	 * @brief Retrieves the current stream position.
+	 *
+	 * @return			Index into the stream.
+	 */
+	size_t GetPosition() const;
+
+	/**
+	 * @brief Sets the current stream position.
+	 *
+	 * @param pos		Index to set the stream at.
+	 * @return			True if succeeded, false if out of bounds.
+	 */
+	bool SetPosition(size_t pos) const;
+
+	/**
+	 * @brief Reads one cell from the data stream.
+	 *
+	 * @return			A cell read from the current position.
+	 */
+	cell_t ReadCell() const;
+
+	/**
+	 * @brief Reads one float from the data stream.
+	 *
+	 * @return			A float read from the current position.
+	 */
+	float ReadFloat() const;
+
+	/**
+	 * @brief Returns whether or not a specified number of bytes from the current stream
+	 *  position to the end can be read.
+	 *
+	 * @param bytes		Number of bytes to simulate reading.
+	 * @return			True if can be read, false otherwise.
+	 */
+	bool IsReadable(size_t bytes = 0) const;
+
+	/**
+	 * @brief Reads a string from the data stream.
+	 *
+	 * @param len		Optional pointer to store the string length.
+	 * @return			Pointer to the string, or NULL if out of bounds.
+	 */
+	const char *ReadString(size_t *len) const;
+
+	/**
+	 * @brief Reads the current position as a generic data type.
+	 *
+	 * @param size		Optional pointer to store the size of the data type.
+	 * @return			Pointer to the data, or NULL if out of bounds.
+	 */
+	void *ReadMemory(size_t *size) const;
+
+	/**
+	 * @brief Reads a function pointer from the data stream.
+	 *
+	 * @return			A function pointer read from the current position.
+	 */
+	cell_t ReadFunction() const;
+
+public: // Originally IDataPack
+	/**
+	 * @brief Resets the used size of the stream back to zero.
+	 */
+	void ResetSize();
+
+	/**
+	 * @brief Packs one cell into the data stream.
+	 *
+	 * @param cell		Cell value to write.
+	 */
+	void PackCell(cell_t cell);
+
+	/**
+	 * @brief Packs one float into the data stream.
+	 *
+	 * @param val		Float value to write.
+	 */
+	void PackFloat(float val);
+
+	/**
+	 * @brief Packs one string into the data stream.
+	 * The length is recorded as well for buffer overrun protection.
+	 *
+	 * @param string	String to write.
+	 */
+	void PackString(const char *string);
+
+	/**
+	 * @brief Creates a generic block of memory in the stream.
+	 *
+	 * Note that the pointer it returns can be invalidated on further
+	 * writing, since the stream size may grow.  You may need to double back
+	 * and fetch the pointer again.
+	 *
+	 * @param size		Size of the memory to create in the stream.
+	 * @param addr		Optional pointer to store the relocated memory address.
+	 * @return			Current position of the stream beforehand.
+	 */
+	size_t CreateMemory(size_t size, void **addr);
+
+	/**
+	 * @brief Packs one function pointer into the data stream.
+	 *
+	 * @param function	The function pointer to write.
+	 */
+	void PackFunction(cell_t function);
+
+public:
+	void Initialize();
+	inline size_t GetCapacity() const { return this->elements.length(); };
+	inline CDataPackType GetCurrentType(void) const { return this->elements[this->position].type; };
+	bool RemoveItem(size_t pos = -1);
+
+private:
+	typedef union {
+		cell_t cval;
+		float fval;
+		uint8_t *vval;
+		ke::AString *sval;
+	} InternalPackValue;
+	
+	typedef struct {
+		InternalPackValue pData;
+		CDataPackType type;
+	} InternalPack;
+
+	ke::Vector<InternalPack> elements;
+	mutable size_t position;
+};
+
+#endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_

core/logic/CellArray.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -29,25 +29,57 @@
  * Version: $Id$
  */
 
-#include <malloc.h>
+#ifndef _INCLUDE_SOURCEMOD_CELLARRAY_H_
+#define _INCLUDE_SOURCEMOD_CELLARRAY_H_
+
+#include <stdlib.h>
 #include <string.h>
+#include <ICellArray.h>
 
 extern HandleType_t htCellArray;
 
-class CellArray
+class CellArray : public ICellArray
 {
 public:
 	CellArray(size_t blocksize) : m_Data(NULL), m_BlockSize(blocksize), m_AllocSize(0), m_Size(0)
 	{
 	}
+
 	~CellArray()
 	{
 		free(m_Data);
 	}
+
+	/**
+	* @brief Creates a cell array object.
+	*
+	* @param blocksize  The number of cells each member of the array can
+	*                   hold.  For example, 32 cells is equivalent to:
+	*                   new Array[X][32]
+	* @return			A new ICellArray object.
+	*/
+	static ICellArray *New(size_t blocksize)
+	{
+		return new CellArray(blocksize);
+	}
+
+	/**
+	* @brief Releases a cell array's resources.
+	*
+	* @param pack		An ICellArray object to release.
+	*/
+	static void Free(ICellArray *arr)
+	{
+		delete arr;
+	}
+
+	// ICellArray
+public:
 	size_t size() const
 	{
 		return m_Size;
 	}
+
 	cell_t *push()
 	{
 		if (!GrowIfNeeded(1))
@@ -58,18 +90,22 @@ 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 */
@@ -90,6 +126,7 @@ public:
 
 		return true;
 	}
+
 	void remove(size_t index)
 	{
 		/* If we're at the end, take the easy way out */
@@ -107,6 +144,7 @@ public:
 
 		m_Size--;
 	}
+
 	cell_t *insert_at(size_t index)
 	{
 		/* Make sure it'll fit */
@@ -124,6 +162,7 @@ public:
 
 		return src;
 	}
+
 	bool resize(size_t count)
 	{
 		if (count <= m_Size)
@@ -132,7 +171,7 @@ public:
 			return true;
 		}
 
-		if(!GrowIfNeeded(count - m_Size))
+		if (!GrowIfNeeded(count - m_Size))
 		{
 			return false;
 		}
@@ -141,12 +180,18 @@ public:
 		return true;
 	}
 
-	CellArray *clone()
+	ICellArray *clone()
 	{
 		CellArray *array = new CellArray(m_BlockSize);
 		array->m_AllocSize = m_AllocSize;
 		array->m_Size = m_Size;
 		array->m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize);
+		if (!array->m_Data)
+		{
+			delete array;
+			return NULL;
+		}
+		
 		memcpy(array->m_Data, m_Data, sizeof(cell_t) * m_BlockSize * m_Size);
 		return array;
 	}
@@ -182,11 +227,17 @@ private:
 		/* finally, allocate the new block */
 		if (m_Data)
 		{
-			m_Data = (cell_t *)realloc(m_Data, sizeof(cell_t) * m_BlockSize * m_AllocSize);
+			cell_t *data = static_cast<cell_t*>(realloc(m_Data, sizeof(cell_t) * m_BlockSize * m_AllocSize));
+			if (!data)  // allocation failure
+			{
+				return false;
+			}
+
+			m_Data = data;
 		} else {
-			m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize);
+			m_Data = static_cast<cell_t*>(malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize));
 		}
-		return (m_Data != NULL);
+		return (m_Data != nullptr);
 	}
 private:
 	cell_t *m_Data;
@@ -194,3 +245,6 @@ private:
 	size_t m_AllocSize;
 	size_t m_Size;
 };
+
+#endif /* _INCLUDE_SOURCEMOD_CELLARRAY_H_ */
+

core/logic/Database.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -30,14 +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 "ThreadSupport.h"
+#include <IThreader.h>
+#include <bridge/include/ILogger.h>
+#include <bridge/include/CoreProvider.h>
 
 #define DBPARSE_LEVEL_NONE		0
 #define DBPARSE_LEVEL_MAIN		1
@@ -47,10 +47,16 @@ DBManager g_DBMan;
 static bool s_OneTimeThreaderErrorMsg = false;
 
 DBManager::DBManager() 
-: m_StrTab(512), m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
+	: m_Terminate(false),
+	  m_pDefault(NULL)
 {
 }
 
+static void FrameHook(bool simulating)
+{
+	g_DBMan.RunFrame();
+}
+
 void DBManager::OnSourceModAllInitialized()
 {
 	HandleAccess sec;
@@ -58,50 +64,36 @@ void DBManager::OnSourceModAllInitialized()
 	g_HandleSys.InitAccessDefaults(NULL, &sec);
 	sec.access[HandleAccess_Delete] |= HANDLE_RESTRICT_IDENTITY;
 	sec.access[HandleAccess_Clone] |= HANDLE_RESTRICT_IDENTITY;
-	
+
 	m_DriverType = g_HandleSys.CreateType("IDriver", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 	m_DatabaseType = g_HandleSys.CreateType("IDatabase", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 
 	g_ShareSys.AddInterface(NULL, this);
 
-	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_pSM->BuildPath(Path_SM, m_Filename, sizeof(m_Filename), "configs/databases.cfg");
+	m_Builder.SetPath(m_Filename);
+	
 	g_PluginSys.AddPluginsListener(this);
+
+	g_pSM->AddGameFrameHook(&FrameHook);
+
+	auto sm_reload_databases = [this] (int client, const ICommandArgs *args) -> bool {
+		m_Builder.StartParse();
+		return true;
+	};
+	bridge->DefineCommand("sm_reload_databases", "Reparse database configurations file", sm_reload_databases);
 }
 
 void DBManager::OnSourceModLevelChange(const char *mapName)
 {
-	SMCError err;
-	SMCStates states = {0, 0};
-
-	/* We lock and don't give up the lock until we're done.
-	 * This way the thread's search won't be searching through a
-	 * potentially empty/corrupt list, which would be very bad.
-	 */
-	m_pConfigLock->Lock();
-	if ((err = textparsers->ParseFile_SMC(m_Filename, this, &states)) != SMCError_Okay)
-	{
-		g_Logger.LogError("[SM] Detected parse error(s) in file \"%s\"", m_Filename);
-		if (err != SMCError_Custom)
-		{
-			const char *txt = textparsers->GetSMCErrorString(err);
-			g_Logger.LogError("[SM] Line %d: %s", states.line, txt);
-		}
-	}
-	m_pConfigLock->Unlock();
+	m_Builder.StartParse();
 }
 
 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);
 }
@@ -131,128 +123,10 @@ void DBManager::OnHandleDestroy(HandleType_t type, void *object)
 	}
 }
 
-void DBManager::ReadSMC_ParseStart()
-{
-	m_confs.clear();
-	m_ParseLevel = 0;
-	m_ParseState = DBPARSE_LEVEL_NONE;
-	m_StrTab.Reset();
-	m_DefDriver.clear();
-}
-
-ConfDbInfo s_CurInfo;
-SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *name)
-{
-	if (m_ParseLevel)
-	{
-		m_ParseLevel++;
-		return SMCResult_Continue;
-	}
-
-	if (m_ParseState == DBPARSE_LEVEL_NONE)
-	{
-		if (strcmp(name, "Databases") == 0)
-		{
-			m_ParseState = DBPARSE_LEVEL_MAIN;
-		} else {
-			m_ParseLevel++;
-		}
-	} else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
-		s_CurInfo = ConfDbInfo();
-		s_CurInfo.name = m_StrTab.AddString(name);
-		m_ParseState = DBPARSE_LEVEL_DATABASE;
-	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
-		m_ParseLevel++;
-	}
-
-	return SMCResult_Continue;
-}
-
-SMCResult DBManager::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
-{
-	if (m_ParseLevel)
-	{
-		return SMCResult_Continue;
-	}
-
-	if (m_ParseState == DBPARSE_LEVEL_MAIN)
-	{
-		if (strcmp(key, "driver_default") == 0)
-		{
-			m_DefDriver.assign(value);
-		}
-	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
-		if (strcmp(key, "driver") == 0)
-		{
-			if (strcmp(value, "default") != 0)
-			{
-				s_CurInfo.driver = m_StrTab.AddString(value);
-			}
-		} else if (strcmp(key, "database") == 0) {
-			s_CurInfo.database = m_StrTab.AddString(value);
-		} else if (strcmp(key, "host") == 0) {
-			s_CurInfo.host = m_StrTab.AddString(value);
-		} else if (strcmp(key, "user") == 0) {
-			s_CurInfo.user = m_StrTab.AddString(value);
-		} else if (strcmp(key, "pass") == 0) {
-			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) {
-			s_CurInfo.info.port = atoi(value);
-		}
-	}
-
-	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)
-	{
-		m_ParseLevel--;
-		return SMCResult_Continue;
-	}
-
-	if (m_ParseState == DBPARSE_LEVEL_DATABASE)
-	{
-		/* 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(s_CurInfo);
-
-		/* Go up one level */
-		m_ParseState = DBPARSE_LEVEL_MAIN;
-	} else if (m_ParseState == DBPARSE_LEVEL_MAIN) {
-		m_ParseState = DBPARSE_LEVEL_NONE;
-		return SMCResult_Halt;
-	}
-
-	return SMCResult_Continue;
-}
-#undef ASSIGN_VAR
-
-void DBManager::ReadSMC_ParseEnd(bool halted, bool failed)
-{
-}
-
 bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool persistent, char *error, size_t maxlength)
 {
-	ConfDbInfo *pInfo = GetDatabaseConf(name);
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::RefPtr<ConfDbInfo> pInfo = list->GetDatabaseConf(name);
 
 	if (!pInfo)
 	{
@@ -261,7 +135,7 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 			*pdr = NULL;
 		}
 		*pdb = NULL;
-		UTIL_Format(error, maxlength, "Configuration \"%s\" not found", name);
+		g_pSM->Format(error, maxlength, "Configuration \"%s\" not found", name);
 		return false;
 	}
 
@@ -271,11 +145,12 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 		/* Try to assign a real driver pointer */
 		if (pInfo->info.driver[0] == '\0')
 		{
-			if (!m_pDefault && m_DefDriver.size() > 0)
+			ke::AString defaultDriver = list->GetDefaultDriver();
+			if (!m_pDefault && defaultDriver.length() > 0)
 			{
-				m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
+				m_pDefault = FindOrLoadDriver(defaultDriver.chars());
 			}
-			dname = m_DefDriver.size() ? m_DefDriver.c_str() : "default";
+			dname = defaultDriver.length() ? defaultDriver.chars() : "default";
 			pInfo->realDriver = m_pDefault;
 		} else {
 			pInfo->realDriver = FindOrLoadDriver(pInfo->info.driver);
@@ -298,8 +173,7 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 	}
 	*pdb = NULL;
 
-	UTIL_Format(error, maxlength, "Driver \"%s\" not found", dname);
-
+	g_pSM->Format(error, maxlength, "Driver \"%s\" not found", dname);
 	return false;
 }
 
@@ -312,7 +186,7 @@ void DBManager::AddDriver(IDBDriver *pDriver)
 	  */
 	KillWorkerThread();
 
-	 m_drivers.push_back(pDriver);
+	m_drivers.push_back(pDriver);
 }
 
 void DBManager::RemoveDriver(IDBDriver *pDriver)
@@ -332,17 +206,23 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
 		}
 	}
 
-	/* Make sure NOTHING references this! */
-	List<ConfDbInfo>::iterator iter;
-	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	for (size_t i = 0; i < list->length(); i++)
 	{
-		ConfDbInfo &db = (*iter);
-		if (db.realDriver == pDriver)
+		ke::RefPtr<ConfDbInfo> current = list->at(i);
+		if (current->realDriver == pDriver)
 		{
-			db.realDriver = NULL;
+			current->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!
 	 */
@@ -372,9 +252,11 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
 
 IDBDriver *DBManager::GetDefaultDriver()
 {
-	if (!m_pDefault && m_DefDriver.size() > 0)
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::AString defaultDriver = list->GetDefaultDriver();
+	if (!m_pDefault && defaultDriver.length() > 0)
 	{
-		m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
+		m_pDefault = FindOrLoadDriver(defaultDriver.chars());
 	}
 
 	return m_pDefault;
@@ -437,10 +319,16 @@ IDBDriver *DBManager::GetDriver(unsigned int index)
 
 const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
 {
-	ConfDbInfo *info = GetDatabaseConf(name);
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::RefPtr<ConfDbInfo> info = list->GetDatabaseConf(name);
 	if (!info)
 	{
-		return NULL;
+		// couldn't find requested conf, return default if exists
+		info = list->GetDefaultConfiguration();
+		if (!info)
+		{
+			return NULL;
+		}
 	}
 
 	return &info->info;
@@ -448,18 +336,9 @@ const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
 
 ConfDbInfo *DBManager::GetDatabaseConf(const char *name)
 {
-	List<ConfDbInfo>::iterator iter;
-
-	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
-	{
-		ConfDbInfo &conf = (*iter);
-		if (strcmp(m_StrTab.GetString(conf.name), name) == 0)
-		{
-			return &conf;
-		}
-	}
-
-	return NULL;
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::RefPtr<ConfDbInfo> info(list->GetDatabaseConf(name));
+	return info;
 }
 
 IDBDriver *DBManager::FindOrLoadDriver(const char *name)
@@ -474,7 +353,7 @@ IDBDriver *DBManager::FindOrLoadDriver(const char *name)
 	}
 
 	char filename[PLATFORM_MAX_PATH];
-	UTIL_Format(filename, sizeof(filename), "dbi.%s.ext", name);
+	g_pSM->Format(filename, sizeof(filename), "dbi.%s.ext", name);
 
 	IExtension *pExt = g_Extensions.LoadAutoExtension(filename);
 	if (!pExt || !pExt->IsLoaded() || m_drivers.size() <= last_size)
@@ -495,12 +374,17 @@ IDBDriver *DBManager::FindOrLoadDriver(const char *name)
 
 void DBManager::KillWorkerThread()
 {
-	if (m_pWorker)
+	if (m_Worker)
 	{
-		m_pWorker->Stop(false);
-		g_pThreader->DestroyWorker(m_pWorker);
-		m_pWorker = NULL;
+		{
+			ke::AutoLock lock(&m_QueueEvent);
+			m_Terminate = true;
+			m_QueueEvent.Notify();
+		}
+		m_Worker->Join();
+		m_Worker = nullptr;
 		s_OneTimeThreaderErrorMsg = false;
+		m_Terminate = false;
 	}
 }
 
@@ -513,99 +397,108 @@ bool DBManager::AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio)
 		return false;
 	}
 
-	if (!m_pWorker)
+	if (!m_Worker)
 	{
-		m_pWorker = g_pThreader->MakeWorker(this, true);
-		if (!m_pWorker)
+		m_Worker = new ke::Thread([this]() -> void {
+			Run();
+		}, "SM SQL Worker");
+		if (!m_Worker->Succeeded())
 		{
 			if (!s_OneTimeThreaderErrorMsg)
 			{
-				g_Logger.LogError("[SM] Unable to create db threader (error unknown)");
+				logger->LogError("[SM] Unable to create db threader (error unknown)");
 				s_OneTimeThreaderErrorMsg = true;
 			}
-			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;
+			m_Worker = nullptr;
 			return false;
 		}
 	}
 
 	/* Add to the queue */
 	{
-		m_pQueueLock->Lock();
+		ke::AutoLock lock(&m_QueueEvent);
 		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetQueue(prio);
 		queue.push(op);
-		m_pQueueLock->Unlock();
+		m_QueueEvent.Notify();
 	}
 
-	/* Make the thread */
-	m_pWorker->MakeThread(this);
-
 	return true;
 }
 
-void DBManager::OnWorkerStart(IThreadWorker *pWorker)
+void DBManager::Run()
 {
-	m_drSafety.clear();
-	for (size_t i=0; i<m_drivers.size(); i++)
+	// Initialize DB threadsafety.
+	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);
-		}
 	}
-}
 
-void DBManager::OnWorkerStop(IThreadWorker *pWorker)
-{
+	// Run actual worker thread logic.
+	ThreadMain();
+
+	// Shutdown DB threadsafety.
 	for (size_t i=0; i<m_drivers.size(); i++)
 	{
 		if (m_drSafety[i])
-		{
 			m_drivers[i]->ShutdownThreadSafety();
-		}
 	}
 	m_drSafety.clear();
 }
 
-void DBManager::RunThread(IThreadHandle *pThread)
+void DBManager::ThreadMain()
 {
-	IDBThreadOperation *op = NULL;
+	ke::AutoLock lock(&m_QueueEvent);
 
-	/* Get something from the queue */
-	{
-		m_pQueueLock->Lock();
-		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
-		if (!queue.empty())
+	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)
 		{
-			op = queue.first();
+			Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
+			if (queue.empty())
+				break;
+
+			IDBThreadOperation *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
+			}
 		}
-		m_pQueueLock->Unlock();
+
+		if (m_Terminate)
+			return;
+
+		// Release the lock and wait for a signal.
+		m_QueueEvent.Wait();
 	}
-
-	/* 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()
@@ -617,19 +510,16 @@ void DBManager::RunFrame()
 	}
 
 	/* Dump one thing per-frame so the server stays sane. */
-	m_pThinkLock->Lock();
-	IDBThreadOperation *op = m_ThinkQueue.first();
-	m_ThinkQueue.pop();
-	m_pThinkLock->Unlock();
+	IDBThreadOperation *op;
+	{
+		ke::AutoLock lock(&m_ThinkLock);
+		op = m_ThinkQueue.first();
+		m_ThinkQueue.pop();
+	}
 	op->RunThinkPart();
 	op->Destroy();
 }
 
-void DBManager::OnTerminate(IThreadHandle *pThread, bool cancel)
-{
-	/* Do nothing */
-}
-
 void DBManager::OnSourceModIdentityDropped(IdentityToken_t *pToken)
 {
 	s_pAddBlock = pToken;
@@ -667,7 +557,7 @@ void DBManager::OnSourceModIdentityDropped(IdentityToken_t *pToken)
 	s_pAddBlock = NULL;
 }
 
-void DBManager::OnPluginUnloaded(IPlugin *plugin)
+void DBManager::OnPluginWillUnload(IPlugin *plugin)
 {
 	/* Kill the thread so we can flush everything into the think queue... */
 	KillWorkerThread();
@@ -693,9 +583,7 @@ void DBManager::OnPluginUnloaded(IPlugin *plugin)
 		}
 	}
 
-	for (iter = templist.begin();
-		 iter != templist.end();
-		 iter++)
+	for (iter = templist.begin(); iter != templist.end(); iter++)
 	{
 		IDBThreadOperation *op = (*iter);
 		op->RunThinkPart();
@@ -703,17 +591,13 @@ void DBManager::OnPluginUnloaded(IPlugin *plugin)
 	}
 }
 
-void DBManager::LockConfig()
+ke::AString DBManager::GetDefaultDriverName()
 {
-	m_pConfigLock->Lock();
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	return list->GetDefaultDriver();
 }
 
-void DBManager::UnlockConfig()
+void DBManager::AddDependency(IExtension *myself, IDBDriver *driver)
 {
-	m_pConfigLock->Unlock();
-}
-
-const char *DBManager::GetDefaultDriverName()
-{
-	return m_DefDriver.c_str();
+	g_Extensions.AddRawDependency(myself, driver->GetIdentity(), driver);
 }

core/logic/Database.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -32,42 +32,24 @@
 #ifndef _INCLUDE_DATABASE_MANAGER_H_
 #define _INCLUDE_DATABASE_MANAGER_H_
 
-#include <IDBDriver.h>
-#include "sm_globals.h"
+#include "common_logic.h"
 #include <sh_vector.h>
-#include <sh_string.h>
+#include <am-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"
+#include <am-refcounting.h>
+#include "DatabaseConfBuilder.h"
 
 using namespace SourceHook;
 
-struct ConfDbInfo
-{
-	ConfDbInfo() : name(-1), driver(-1), host(-1), user(-1), pass(-1), 
-		database(-1), realDriver(NULL)
-	{
-	}
-	int name;
-	int driver;
-	int host;
-	int user;
-	int pass;
-	int database;
-	IDBDriver *realDriver;
-	DatabaseInfo info;
-};
 
 class DBManager : 
 	public IDBManager,
 	public SMGlobalClass,
 	public IHandleTypeDispatch,
-	public ITextListener_SMC,
-	public IThread,
-	public IThreadWorkerCallbacks,
 	public IPluginsListener
 {
 public:
@@ -86,40 +68,31 @@ public: //IDBManager
 	void AddDriver(IDBDriver *pDrivera);
 	void RemoveDriver(IDBDriver *pDriver);
 	const DatabaseInfo *FindDatabaseConf(const char *name);
+	ConfDbInfo *GetDatabaseConf(const char *name);
 	bool Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool persistent, char *error, size_t maxlength);
 	unsigned int GetDriverCount();
 	IDBDriver *GetDriver(unsigned int index);
 	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);
-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: //IThread
-	void RunThread(IThreadHandle *pThread);
-	void OnTerminate(IThreadHandle *pThread, bool cancel);
-public: //IThreadWorkerCallbacks
-	void OnWorkerStart(IThreadWorker *pWorker);
-	void OnWorkerStop(IThreadWorker *pWorker);
+	void AddDependency(IExtension *myself, IDBDriver *driver);
+public: //ke::IRunnable
+	void Run();
+	void ThreadMain();
 public: //IPluginsListener
-	void OnPluginUnloaded(IPlugin *plugin);
+	void OnPluginWillUnload(IPlugin *plugin);
 public:
-	ConfDbInfo *GetDatabaseConf(const char *name);
 	IDBDriver *FindOrLoadDriver(const char *name);
 	IDBDriver *GetDefaultDriver();
-	const char *GetDefaultDriverName();
+	ke::AString GetDefaultDriverName();
 	bool AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio);
-	void LockConfig();
-	void UnlockConfig();
 	void RunFrame();
 	inline HandleType_t GetDatabaseType()
 	{
 		return m_DatabaseType;
 	}
 private:
+	void ClearConfigs();
 	void KillWorkerThread();
 private:
 	CVector<IDBDriver *> m_drivers;
@@ -128,19 +101,15 @@ private:
 	PrioQueue<IDBThreadOperation *> m_OpQueue;
 	Queue<IDBThreadOperation *> m_ThinkQueue;
 	CVector<bool> m_drSafety;			/* which drivers are safe? */
-	IThreadWorker *m_pWorker;			/* Worker thread object */
-	IMutex *m_pConfigLock;				/* Configuration lock */
-	IMutex *m_pQueueLock;				/* Queue safety lock */
-	IMutex *m_pThinkLock;				/* Think-queue lock */
+	ke::AutoPtr<ke::Thread> m_Worker;
+	ke::ConditionVariable m_QueueEvent;
+	ke::Mutex m_ThinkLock;
+	bool m_Terminate;
 
-	List<ConfDbInfo> m_confs;
+	DatabaseConfBuilder m_Builder;
 	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;
 	IDBDriver *m_pDefault;
 };