version bump

--HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402166
Removed GiveNamedItem/GivePlayerItem offset due to crashes
2008-05-21 03:48:47 +00:00 · 2008-05-21 03:39:00 +00:00 · 2008-05-21 03:31:42 +00:00 · 2008-05-20 09:44:30 +00:00 · 2008-05-14 22:40:03 +00:00 · 2008-05-13 08:22:21 +00:00
3573 changed files with 204547 additions and 1096763 deletions
@@ -1,5 +0,0 @@
-{
-	"project_id" : "sourcemod",
-	"conduit_uri" : "https://phabricator.alliedmods.net/",
-	"history.immutable" : false
-}
@@ -1,12 +0,0 @@
-# GitHub views all .h files as C, let's assume it's C++
-*.h linguist-language=c++
-
-# Internal tools overriding
-tools/* linguist-vendored
-editor/* linguist-vendored
-
-# Third-party overriding 
-extensions/curl/curl-src/* linguist-vendored
-extensions/geoip/GeoIP.c linguist-vendored
-extensions/geoip/GeoIP.h linguist-vendored
-extensions/sqlite/sqlite-source/* linguist-vendored
@@ -1,74 +0,0 @@
-# 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.
@@ -1,8 +0,0 @@
-# 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
@@ -1,26 +0,0 @@
-# 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.
@@ -1,8 +0,0 @@
-version: 2
-updates:
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      # Check for updates to GitHub Actions every week
-      interval: "weekly"
@@ -1,98 +0,0 @@
-name: Continuous Integration
-on: 
-  push:
-    branches:
-     - master
-     - '[0-9]+.[0-9]+-dev'
-  pull_request:
-    branches:
-     - master
-     - '[0-9]+.[0-9]+-dev'
-jobs:
-  test:
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-latest, windows-latest]
-        include:
-          - os: windows-latest
-            os_short: win
-            compiler_cc: msvc
-          - os: ubuntu-latest
-            os_short: linux
-            compiler_cc: clang
-            compiler_cxx: clang++
-          - os: ubuntu-20.04
-            os_short: linux
-            compiler_cc: clang-8
-            compiler_cxx: clang++-8
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os_short }}-${{ matrix.compiler_cc }}
-    env:
-      SDKS: '["episode1","css","tf2","l4d2","csgo"]'
-      ARCH: x86,x86_64
-      DEPENDENCIES_FOLDER: dependencies
-      DEPENDENCIES_ROOT: ${{ github.workspace }}/dependencies
-      MYSQL_VERSION: '5.5'
-      MMSOURCE_VERSION: '1.12'
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          path: sourcemod
-
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        env:
-          cache-name: hl2sdk-mysql-mmsource
-        with:
-          path: ${{ env.DEPENDENCIES_ROOT }}
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-mysql${{ env.MYSQL_VERSION }}-mmsource${{ env.MMSOURCE_VERSION }}-${{ join(fromJSON(env.SDKS), '') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-mysql${{ env.MYSQL_VERSION }}-mmsource${{ env.MMSOURCE_VERSION }}-
-            ${{ runner.os }}-build-${{ env.cache-name }}-mysql${{ env.MYSQL_VERSION }}-
-
-      # Setup Python for AMBuild
-      - uses: actions/setup-python@v5
-        name: Setup Python 3.8
-        with:
-          python-version: 3.8
-      - name: Install Python dependencies
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-
-      - name: Install dependencies
-        shell: bash
-        run: |
-          mkdir -p ${{ env.DEPENDENCIES_FOLDER }}
-          cd ${{ env.DEPENDENCIES_FOLDER }}
-
-          # Satisfy checkout-deps requirement for a "sourcemod" folder.
-          mkdir -p sourcemod
-          ../sourcemod/tools/checkout-deps.sh -s ${{ join(fromJSON(env.SDKS)) }}
-
-      - name: Install Linux dependencies
-        if: startsWith(runner.os, 'Linux')
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-            gcc-multilib g++-multilib libstdc++6 lib32stdc++6 \
-            libc6-dev libc6-dev-i386 linux-libc-dev \
-            linux-libc-dev:i386 lib32z1-dev ${{ matrix.compiler_cc }}
-
-      - name: Select clang compiler
-        if: startsWith(runner.os, 'Linux')
-        run: |
-          echo "CC=${{ matrix.compiler_cc }}" >> $GITHUB_ENV
-          echo "CXX=${{ matrix.compiler_cxx }}" >> $GITHUB_ENV
-          ${{ matrix.compiler_cc }} --version
-          ${{ matrix.compiler_cxx }} --version
-
-      - name: Build
-        working-directory: sourcemod
-        run: |
-          mkdir build
-          cd build
-          python ../configure.py --enable-optimize --sdks=${{ join(fromJSON(env.SDKS)) }} --targets=${{ env.ARCH }} --mms-path=${{ env.DEPENDENCIES_ROOT }}/mmsource-${{ env.MMSOURCE_VERSION }} --hl2sdk-root=${{ env.DEPENDENCIES_ROOT }} --mysql-path=${{ env.DEPENDENCIES_ROOT }}/mysql-${{ env.MYSQL_VERSION }} --mysql64-path=${{ env.DEPENDENCIES_ROOT }}/mysql-${{ env.MYSQL_VERSION }}-x86_64
-          ambuild
@@ -1,104 +0,0 @@
-name: hl2sdk-mock tests
-on: 
-  push:
-    branches:
-     - master
-     - '[0-9]+.[0-9]+-dev'
-  pull_request:
-    branches:
-     - master
-     - '[0-9]+.[0-9]+-dev'
-jobs:
-  mock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        name: Clone sourcemod
-        with:
-          submodules: recursive
-          path: sourcemod
-      
-      - uses: actions/checkout@v4
-        name: Clone metamod-source
-        with:
-          repository: alliedmodders/metamod-source
-          submodules: recursive
-          path: metamod-source
-      
-      - uses: actions/checkout@v4
-        name: Clone hl2sdk-mock
-        with:
-          repository: alliedmodders/hl2sdk-mock
-          submodules: recursive
-          path: hl2sdk-mock
-      
-      - uses: actions/setup-python@v5
-        name: Setup Python 3.10
-        with:
-          python-version: "3.10"
-      
-      - name: Install AMBuild
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install git+https://github.com/alliedmodders/ambuild
-
-      - name: Build MetaMod:Source
-        working-directory: metamod-source
-        run: |
-          python configure.py --enable-optimize --sdks=mock --targets=x86_64
-          ambuild objdir
-
-      - name: Build SourceMod
-        working-directory: sourcemod
-        run: |
-          python configure.py --no-mysql --enable-optimize --sdks=mock --targets=x86_64
-          ambuild objdir
-      
-      - name: Build hl2sdk-mock
-        working-directory: hl2sdk-mock
-        run: |
-          python configure.py --enable-optimize --targets=x86_64
-          ambuild objdir
-      
-      - name: Setup gamedir
-        working-directory: hl2sdk-mock
-        shell: bash
-        run: |
-          mkdir ../gamedir
-          ./build_gamedir.sh ../gamedir ../metamod-source/objdir/package
-          ./build_gamedir.sh ../gamedir ../sourcemod/objdir/package
-      
-      - name: Compile testsuite
-        working-directory: hl2sdk-mock
-        shell: bash
-        run: |
-          mkdir ../gamedir/addons/sourcemod/plugins/optional
-
-          for f in ../sourcemod/plugins/testsuite/mock/*.sp; do
-            echo "Compiling $(basename $f)"
-            ../gamedir/addons/sourcemod/scripting/spcomp64 -i ../gamedir/addons/sourcemod/scripting/include -o "../gamedir/addons/sourcemod/plugins/optional/$(basename $f .sp).smx" -E "$f"
-          done
-      
-      - name: Test
-        working-directory: hl2sdk-mock
-        shell: bash
-        run: |
-          for f in ../gamedir/addons/sourcemod/plugins/optional/*.smx; do
-            echo "==================================="
-            echo "Running $(basename $f)..."
-            echo "==================================="
-            timeout 60 ./objdir/dist/x86_64/srcds -game_dir ../gamedir +map de_thunder -command "sm plugins load optional/$(basename $f)" -run -run-ticks 20 |
-            {
-              failed=0
-              while IFS= read -r line; do
-                echo "$line"
-                if [[ "$line" == *"FAIL"* ]]; then
-                  failed=1
-                fi
-              done
-              if [ "$failed" = "1" ]; then
-                echo "$(basename $f) failed."
-                exit 1
-              fi
-            }
-          done
@@ -1,79 +0,0 @@
-name: SourcePawn scripting
-on: 
-  push:
-    branches:
-      - master
-      - '[0-9]+.[0-9]+-dev'
-    paths:
-      - 'plugins/include/*'
-      - 'sourcepawn/**'
-  workflow_dispatch:
-  schedule:
-    - cron: '53 05 01 */3 *' # Artifacts expire every 3 months
-jobs:
-  build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        include:
-          - os: ubuntu-latest
-            os_short: linux
-          - os: windows-latest
-            os_short: win
-          - os: macos-latest
-            os_short: mac
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    env:
-      ARCH: x86,x86_64
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      # Setup Python for AMBuild
-      - uses: actions/setup-python@v5
-        name: Setup Python 3.8
-        with:
-          python-version: 3.8
-      - name: Install AMBuild
-        run: |
-          python -m pip install --upgrade pip setuptools wheel
-          pip install git+https://github.com/alliedmodders/ambuild
-
-      - name: Build universal x64/arm64 on macOS
-        if: startsWith(runner.os, 'macOS')
-        run: echo "ARCH=x86_64,arm64" >> $GITHUB_ENV
-
-      - name: Install Linux dependencies
-        if: startsWith(runner.os, 'Linux')
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends \
-            gcc-multilib g++-multilib libstdc++6 lib32stdc++6 \
-            libc6-dev libc6-dev-i386 linux-libc-dev \
-            linux-libc-dev:i386 lib32z1-dev ${{ matrix.compiler_cc }}
-
-      - name: Select clang compiler
-        if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
-        run: |
-          echo "CC=clang" >> $GITHUB_ENV
-          echo "CXX=clang++" >> $GITHUB_ENV
-          clang --version
-          clang++ --version
-
-      - name: Build
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          python ../configure.py --enable-optimize --scripting-only --targets=${{ env.ARCH }}
-          ambuild
-          echo "SM_VERSION=$(cat ../product.version)" >> $GITHUB_ENV
-
-      - name: Archive tooling
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcemod-tooling-${{ env.SM_VERSION }}-${{ matrix.os_short }}
-          path: build/package
@@ -1,42 +0,0 @@
-name: Update translation project
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'translations/**'
-  workflow_dispatch:
-jobs:
-  update_translations:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: actions/setup-python@v5
-        name: Setup Python 3.10
-        with:
-          python-version: "3.10"
-
-      - name: Install Python dependencies
-        working-directory: tools/language_check
-        run: |
-          python -m pip install --upgrade -r requirements.txt
-
-      - name: Generate token
-        id: generate_token
-        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PEM }}
-
-      - name: Update translation project
-        working-directory: tools/language_check
-        env:
-          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
-          ORGANIZATION: alliedmodders
-          PROJECT_NUMBER: 1
-        run: |
-          python ./compare_translation_phrases.py 
-
@@ -1,29 +0,0 @@
-name: Sanity check translation phrases
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'translations/**'
-  pull_request:
-    branches:
-     - master
-    paths:
-      - 'translations/**'
-  workflow_dispatch:
-jobs:
-  check_translations:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        name: Setup Python 3.10
-        with:
-          python-version: "3.10"
-
-      - name: Check translation phrases syntax
-        working-directory: tools/language_check
-        run: |
-          python ./sanity_check.py 
-
@@ -1,43 +0,0 @@
-# Binaries
-*.dll
-*.dylib
-*.exe
-*.so
-
-# Files generated by Visual Studio
-*.aps
-*.ipch
-*.ncb
-*.opensdf
-*.sdf
-*.suo
-*.user
-
-# Build directories
-CrazyDebug*/
-Debug*/
-Release*/
-LIB-Release/
-LIB-Debug/
-
-# Files generated by Mac OS X Finder
-.DS_Store
-
-# Files generated by Windows Explorer
-[Dd]esktop.ini
-[Tt]humbs.db
-
-# AMBuild build directories
-obj-*/
-*~
-*.rej
-*.orig
-*.smx
-*.swp
-*.gdb_history
-objdir
-# Not standardized, but common name for build directories
-build*/
-
-.vs/*
-.vscode/*
@@ -1,14 +0,0 @@
-[submodule "public/amtl"]
-	path = public/amtl
-	url = https://github.com/alliedmodders/amtl
-	shallow = true
-[submodule "sourcepawn"]
-	path = sourcepawn
-	url = https://github.com/alliedmodders/sourcepawn
-	shallow = true
-[submodule "hl2sdk-manifests"]
-	path = hl2sdk-manifests
-	url = https://github.com/alliedmodders/hl2sdk-manifests.git
-[submodule "public/safetyhook"]
-	path = public/safetyhook
-	url = https://github.com/alliedmodders/safetyhook
@@ -1,86 +0,0 @@
-git:
-  depth: 3
-
-language: cpp
-os: linux
-dist: xenial
-
-jobs:
-  fast_finish: true
-  include:
-    - os: linux
-      dist: trusty
-      language: cpp
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages: ['clang-3.8', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib', 'python3-pip']
-      env:
-        - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
-        - SDKS=episode1,css,tf2,l4d2,csgo
-        - MODE=optimize
-        - ARCH=x86,x86_64
-
-    - os: linux
-      dist: trusty
-      language: cpp
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages: ['clang-3.4', 'lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-4.9-multilib', 'python3-pip']
-      env:
-        - MATRIX_EVAL="CC=clang && CXX=clang++"
-        - SDKS=episode1,css,tf2,l4d2,csgo
-        - MODE=optimize
-        - ARCH=x86,x86_64
-
-    - os: osx
-      osx_image: xcode7.2
-      language: cpp
-      env:
-        - MATRIX_EVAL="CC=clang && CXX=clang++"
-        - SDKS=episode1,css,tf2,l4d2,csgo
-        - MODE=optimize
-        - ARCH=x86_64,x86
-
-    # # This is a faster test for the latest g++.
-    # - os: linux
-    #   dist: bionic
-    #   sudo: false
-    #   language: cpp
-    #   addons:
-    #     apt:
-    #       packages: ['lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-multilib', 'g++']
-    #     cache:
-    #       directories: ['../mysql-5.0']
-    #   env:
-    #     - MATRIX_EVAL="CC=gcc && CXX=g++"
-    #     - SDKS=csgo
-    #     # GCC currently fails in opt builds trying to inline stuff in sqlite3.c.
-    #     - MODE=debug
-
-    # This is a faster test for the latest clang.
-    - os: linux
-      dist: bionic
-      language: cpp
-      addons:
-        apt:
-          packages: ['lib32stdc++6', 'lib32z1-dev', 'libc6-dev-i386', 'linux-libc-dev:i386', 'g++-multilib', 'clang']
-      env:
-        - MATRIX_EVAL="CC=clang && CXX=clang++"
-        - SDKS=csgo
-        - MODE=optimize
-        - ARCH=x86
-
-before_script:
-  - CHECKOUT_DIR=$PWD && cd .. && $CHECKOUT_DIR/tools/checkout-deps.sh -s ${SDKS} && cd $CHECKOUT_DIR
-script:
-  - mkdir build && cd build
-  - PATH="~/.local/bin:$PATH"
-  - eval "${MATRIX_EVAL}"
-  - eval "${CC} --version"
-  - eval "${CXX} --version"
-  - python3 ../configure.py --enable-${MODE} --sdks=${SDKS} --targets=${ARCH}
-  - ambuild
@@ -1,685 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import collections
-import os, sys
-import subprocess
-
-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):
-  if compiler.behavior == 'gcc':
-    if compiler.target.arch == 'x86_64':
-      compiler.cflags += ['-fPIC']
-  elif compiler.like('msvc'):
-    if compiler.target.arch == 'x86_64':
-      compiler.defines += ['WIN64']
-
-SdkHelpers = builder.Eval('hl2sdk-manifests/SdkHelpers.ambuild', {
-    'Project': 'sourcemod'
-})
-
-class SMConfig(object):
-  def __init__(self):
-    self.sdk_manifests = []
-    self.sdks = {}
-    self.sdk_targets = []
-    self.binaries = []
-    self.spvm = []
-    self.extensions = []
-    self.generated_headers = None
-    self.mms_root = None
-    self.mysql_root = {}
-    self.spcomp = None
-    self.spcomp_bins = []
-    self.smx_files = {}
-    self.versionlib = None
-    self.all_targets = []
-    self.target_archs = set()
-    self.enable_asan = getattr(builder.options, 'enable_asan', False)
-    self.asan_libs = {}
-    self.libsafetyhook = {}
-
-    if builder.options.targets:
-      target_archs = builder.options.targets.split(',')
-    else:
-      target_archs = ['x86']
-      if builder.backend != 'amb2':
-        target_archs.append('x86_64')
-
-    for arch in target_archs:
-        try:
-            cxx = builder.DetectCxx(target_arch = arch)
-            self.target_archs.add(cxx.target.arch)
-        except Exception as e:
-            # Error if archs were manually overridden.
-            if builder.options.targets:
-                raise
-            print('Skipping target {}: {}'.format(arch, e))
-            continue
-        self.all_targets.append(cxx)
-
-    if not self.all_targets:
-        raise Exception('No suitable C/C++ compiler was found.')
-
-  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(r'(\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 findSdkPath(self, sdk_name):
-    dir_name = 'hl2sdk-{}'.format(sdk_name)
-    if builder.options.hl2sdk_root:
-      sdk_path = os.path.join(builder.options.hl2sdk_root, dir_name)
-      if os.path.exists(sdk_path):
-        return sdk_path
-    return ResolveEnvPath('HL2SDK{}'.format(sdk_name.upper()), dir_name)
-
-  def shouldIncludeSdk(self, sdk):
-    return not sdk.get('source2', False)
-
-  def detectSDKs(self):
-    sdk_list = [s for s in builder.options.sdks.split(',') if s]
-    SdkHelpers.sdk_filter = self.shouldIncludeSdk
-    SdkHelpers.find_sdk_path = self.findSdkPath
-    SdkHelpers.findSdks(builder, self.all_targets, sdk_list)
-
-    self.sdks = SdkHelpers.sdks
-    self.sdk_manifests = SdkHelpers.sdk_manifests
-    self.sdk_targets = SdkHelpers.sdk_targets
-
-    if builder.options.mms_path:
-      self.mms_root = builder.options.mms_path
-    else:
-      self.mms_root = ResolveEnvPath('MMSOURCE112', 'mmsource-1.12')
-      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 'x86' in self.target_archs:
-        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. Configure with --no-mysql to disable it.')
-        self.mysql_root['x86'] = Normalize(self.mysql_root['x86'])
-
-      if 'x86_64' in self.target_archs:
-        if builder.options.mysql64_path:
-          self.mysql_root['x86_64'] = builder.options.mysql64_path
-        else:
-          for i in range(10):
-            self.mysql_root['x86_64'] = ResolveEnvPath('MYSQL55_64', 'mysql-5.' + str(i) + '-x86_64')
-            if self.mysql_root['x86_64']:
-              break
-        if not self.mysql_root['x86_64'] or not os.path.isdir(self.mysql_root['x86_64']):
-          raise Exception('Could not find a path to 64-bit MySQL!')
-        self.mysql_root['x86_64'] = Normalize(self.mysql_root['x86_64'])
-
-  def configure(self):
-    builder.AddConfigureFile('pushbuild.txt')
-    
-    allowed_archs = ['x86_64']
-    if builder.host.platform == 'mac':
-        if getattr(builder.options, 'scripting_only', False):
-            allowed_archs += ['arm64']
-    else:
-        allowed_archs += ['x86']
-
-    if not set(self.target_archs).issubset(allowed_archs):
-      raise Exception('Unknown target architecture: {0}'.format(self.target_archs))
-
-    for cxx in self.all_targets:
-        self.configure_cxx(cxx)
-
-  def configure_cxx(self, cxx):
-    if cxx.family == 'msvc':
-      if cxx.version < 1914 and builder.options.generator != 'vs':
-        raise Exception(f'Only MSVC 2017 15.7 and later are supported, full C++17 support is required. ({str(cxx.version)} < 1914)')
-    elif cxx.family == 'gcc':
-      if cxx.version < 'gcc-9':
-        raise Exception('Only GCC versions 9 or later are supported, full C++17 support is required.')
-    elif cxx.family == 'clang':
-      if cxx.version < 'clang-5':
-        raise Exception('Only clang versions 5 or later are supported, full C++17 support is required.')
-
-    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 cxx.target.platform == 'linux':
-      self.configure_linux(cxx)
-    elif cxx.target.platform == 'mac':
-      self.configure_mac(cxx)
-    elif cxx.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',
-      '-fvisibility=hidden',
-    ]
-    if cxx.target.arch in ['x86', 'x86_64']:
-      cxx.cflags += ['-msse']
-
-    cxx.cxxflags += ['-std=c++17']
-
-    cxx.cxxflags += [
-      '-fno-threadsafe-statics',
-      '-Wno-non-virtual-dtor',
-      '-Wno-overloaded-virtual',
-      '-Wno-register',
-      '-fvisibility-inlines-hidden',
-    ]
-
-    have_gcc = cxx.family == 'gcc'
-    have_clang = cxx.family == 'clang'
-    if cxx.version >= 'clang-3.9' or cxx.version == 'clang-3.4' or cxx.version > 'apple-clang-6.0':
-      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.4' 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 self.enable_asan:
-      if not have_clang:
-        raise Exception('--enable-asan only supported when using Clang')
-      self.configure_asan(cxx)
-
-    # Work around SDK warnings.
-    if cxx.version >= 'clang-10.0' or cxx.version >= 'apple-clang-12.0':
-        cxx.cflags += [
-            '-Wno-implicit-int-float-conversion',
-            '-Wno-tautological-overlap-compare',
-        ]
-
-    if have_gcc:
-      cxx.cflags += ['-mfpmath=sse']
-      cxx.cflags += ['-Wno-maybe-uninitialized']
-
-    if builder.options.opt == '1':
-      if self.enable_asan:
-        cxx.cflags += ['-O1']
-      else:
-        cxx.cflags += ['-O3']
-
-    # Don't omit the frame pointer.
-    cxx.cflags += ['-fno-omit-frame-pointer']
-
-  def configure_msvc(self, cxx):
-    if self.enable_asan:
-      raise Exception('--enable-asan only supported when using Clang')
-
-    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',
-      '/std:c++17',
-    ]
-    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_asan(self, cxx):
-    if cxx.target.platform != 'linux':
-      raise Exception('--enable-asan only supported on Linux')
-    cxx.cflags += ['-fsanitize=address']
-    cxx.linkflags += ['-fsanitize=address']
-    if cxx.target.arch == 'x86':
-      libclang_rt = 'libclang_rt.asan-i386.so'
-    else:
-      libclang_rt = 'libclang_rt.asan-x86_64.so'
-
-    try:
-      argv = cxx.cxx_argv + ['--print-file-name', libclang_rt]
-      output = subprocess.check_output(argv)
-      output = output.decode('utf-8')
-      output = output.strip()
-    except:
-      raise Exception('Could not find {}'.format(libclang_rt))
-
-    print('ASAN library for {}: {}'.format(cxx.target.arch, output))
-    print('You will need to LD_PRELOAD this into srcds.')
-
-    self.asan_libs[cxx.target.arch] = os.path.dirname(output)
-
-  def configure_linux(self, cxx):
-    cxx.defines += ['LINUX', '_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']
-    cxx.linkflags += ['-static-libstdc++']
-
-  def configure_mac(self, cxx):
-    cxx.defines += ['OSX', '_OSX', 'POSIX', 'KE_ABSOLUTELY_NO_STL']
-    cxx.cflags += ['-mmacosx-version-min=10.15']
-    cxx.linkflags += [
-      '-mmacosx-version-min=10.15',
-      '-stdlib=libc++',
-      '-lc++',
-    ]
-    cxx.cxxflags += ['-stdlib=libc++']
-
-  def configure_windows(self, cxx):
-    cxx.defines += ['WIN32', '_WINDOWS']
-
-  def add_libamtl(self):
-    # Add libamtl.
-    self.libamtl = {}
-    for cxx in self.all_targets:
-      def get_configure_fn(cxx):
-        return lambda builder, name: self.StaticLibrary(builder, cxx, name)
-      extra_vars = {'Configure': get_configure_fn(cxx)}
-      libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars)
-      self.libamtl[cxx.target.arch] = libamtl.binary
-
-  def AddVersioning(self, binary):
-    if binary.compiler.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 binary.compiler.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.postlink += [self.versionlib[binary.compiler.target.arch]]
-      binary.compiler.sourcedeps += SM.generated_headers
-    return binary
-    
-  def LibraryBuilder(self, compiler, name):
-    binary = compiler.Library(name)
-    self.AddVersioning(binary)
-    if binary.compiler.like('msvc'):
-      binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS']
-    self.AddCxxCompat(binary)
-
-    # Dumb clang behavior means we have to manually find libclang_rt.
-    if self.enable_asan:
-      binary.compiler.linkflags += [
-        '-shared-libsan',
-        '-Wl,-rpath={}'.format(self.asan_libs[binary.compiler.target.arch]),
-      ]
-    return binary
-
-  def ProgramBuilder(self, compiler, name):
-    binary = compiler.Program(name)
-    self.AddVersioning(binary)
-    if '-static-libgcc' in binary.compiler.linkflags:
-      binary.compiler.linkflags.remove('-static-libgcc')
-    if self.enable_asan:
-      binary.compiler.linkflags.append('-static-libsan')
-    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):
-    return compiler.StaticLibrary(name)
-
-  def Library(self, context, compiler, name):
-    compiler = compiler.clone()
-    SetArchFlags(compiler)
-    return self.LibraryBuilder(compiler, name)
-
-  def Program(self, context, compiler, name):
-    compiler = compiler.clone()
-    SetArchFlags(compiler)
-    return self.ProgramBuilder(compiler, name)
-    
-  def StaticLibrary(self, context, compiler, name):
-    compiler = compiler.clone()
-    SetArchFlags(compiler)
-    return self.StaticLibraryBuilder(compiler, name)
-
-  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, compiler, name):
-    binary = self.Library(context, compiler, name)
-    SetArchFlags(compiler)
-    self.ConfigureForExtension(context, binary.compiler)
-    return binary
-
-  def AddCxxCompat(self, binary):
-    if binary.compiler.target.platform == 'linux':
-      binary.sources += [
-        os.path.join(builder.sourcePath, 'public', 'amtl', 'compat', 'stdcxx.cpp'),
-      ]
-
-  def ConfigureForHL2(self, context, binary, sdk):
-    compiler = binary.compiler
-    SetArchFlags(compiler)
-
-    compiler.cxxincludes += [
-      os.path.join(self.mms_root, 'core'),
-      os.path.join(self.mms_root, 'core', 'sourcehook'),
-    ]
-
-    for other_sdk in self.sdk_manifests:
-      compiler.defines += ['SE_{}={}'.format(other_sdk['define'], other_sdk['code'])]
-
-    SdkHelpers.configureCxx(context, binary, sdk)
-
-    return binary
-
-  def AddCDetour(self, binary):
-    public_path = os.path.join(builder.sourcePath, 'public')
-    binary.sources += [ os.path.join(public_path, 'CDetour', 'detours.cpp') ]
-    binary.compiler.cxxincludes += [ os.path.join(public_path, 'safetyhook', 'include') ]
-
-    for task in self.libsafetyhook:
-      if task.target.arch == binary.compiler.target.arch:
-        binary.compiler.linkflags += [task.binary]
-        return
-    raise Exception('No suitable build of safetyhook was found.')
-
-  def HL2Library(self, context, compiler, name, sdk):
-    binary = self.Library(context, compiler, name)
-    self.ConfigureForExtension(context, binary.compiler)
-    return self.ConfigureForHL2(context, binary, sdk)
-
-  def HL2Config(self, project, context, compiler, name, sdk):
-    binary = project.Configure(compiler, name,
-                               '{0} - {1} {2}'.format(self.tag, sdk['name'], compiler.target.arch))
-    self.AddCxxCompat(binary)
-    self.AddVersioning(binary)
-    return self.ConfigureForHL2(context, binary, sdk)
-
-  def HL2ExtConfig(self, project, context, compiler, name, sdk):
-    binary = project.Configure(compiler, name,
-                               '{0} - {1} {2}'.format(self.tag, sdk['name'], compiler.target.arch))
-    self.AddCxxCompat(binary)
-    self.AddVersioning(binary)
-    self.ConfigureForHL2(context, binary, sdk)
-    self.ConfigureForExtension(context, binary.compiler)
-    return binary
-
-if getattr(builder, 'target', None) is not None:
-    sys.stderr.write("Your output folder was configured for AMBuild 2.1, and SourceMod is now\n")
-    sys.stderr.write("configured to use AMBuild 2.2. Please remove your output folder and\n")
-    sys.stderr.write("reconfigure to continue.\n")
-    os._exit(1)
-
-SM = SMConfig()
-SM.detectProductVersion()
-if not getattr(builder.options, 'scripting_only', False):
-  SM.detectSDKs()
-SM.configure()
-SM.add_libamtl()
-
-# This will clone the list and each cxx object as we recurse, preventing child
-# scripts from messing up global state.
-builder.targets = builder.CloneableList(SM.all_targets)
-
-if SM.use_auto_versioning():
-  SM.generated_headers = builder.Build(
-    'tools/buildbot/Versioning',
-    { 'SM': SM }
-  )
-  SM.versionlib = builder.Build(
-    'versionlib/AMBuilder',
-    { 'SM': SM }
-  )
-
-class SafetyHookShim(object):
-  def __init__(self):
-    self.all_targets = {}
-    self.libsafetyhook = {}
-
-SafetyHook = SafetyHookShim()
-SafetyHook.all_targets = SM.all_targets
-builder.Build('public/safetyhook/AMBuilder', {'SafetyHook': SafetyHook })
-SM.libsafetyhook = SafetyHook.libsafetyhook
-
-class SPRoot(object):
-  def __init__(self):
-    self.generated_headers = SM.generated_headers
-  # SourcePawn's build scripts are always one-offs, and attach the current target
-  # to the builder, so we have to provide a shim to our StaticLibrary() method.
-  def StaticLibrary(self, builder, name):
-    return SM.StaticLibrary(builder, builder.cxx, name)
-  def Program(self, builder, name):
-    return SM.Program(builder, builder.cxx, name)
-  def Library(self, builder, name):
-    return SM.Library(builder, builder.cxx, name)
-
-  @property
-  def targets(self):
-    return SM.all_targets
-
-  @property
-  def libamtl(self):
-    return SM.libamtl
-
-SP_build_parts = ['core']
-if getattr(builder.options, 'scripting_only', False):
-  SP_build_parts = ['spcomp']
-
-# Build SourcePawn externally.
-SP = builder.Build('sourcepawn/AMBuildScript', {
-  'external_root': SPRoot(),
-  'external_amtl': os.path.join(builder.sourcePath, 'public', 'amtl'),
-  'external_build': SP_build_parts,
-})
-
-def IsBetterDefaultSpcomp(spcomp, other):
-    if other is None:
-        return True
-    if spcomp.target.arch == 'universal':
-        return True
-    if other.target.arch == 'universal':
-        return False
-    return spcomp.target.arch == 'x86'
-
-for spcomp in SP.spcomp:
-    if IsBetterDefaultSpcomp(spcomp, SM.spcomp):
-        SM.spcomp = spcomp
-    SM.spcomp_bins.append(spcomp)
-
-# If we have a universal binary, ignore all other spcomps.
-if SM.spcomp.target.arch == 'universal':
-    SM.spcomp_bins = [SM.spcomp]
-
-if not getattr(builder.options, 'scripting_only', False):
-  for cxx in SM.all_targets:
-    SM.spvm += [
-      SP.libsourcepawn[cxx.target.arch]
-    ]
-
-if getattr(builder.options, 'scripting_only', False):
-  BuildScripts = [
-    'tools/buildbot/PackageHelpers',
-    'tools/buildbot/ToolsPackageScript',
-  ]
-else:
-  BuildScripts = [
-    'loader/AMBuilder',
-    'core/AMBuilder',
-    'core/logic/AMBuilder',
-    'extensions/bintools/AMBuilder',
-    'extensions/clientprefs/AMBuilder',
-    'extensions/curl/AMBuilder',
-    'extensions/cstrike/AMBuilder',
-    'extensions/dhooks/AMBuilder',
-    'extensions/geoip/AMBuilder',
-    'extensions/mysql/AMBuilder',
-    'extensions/pgsql/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/PackageHelpers',
-      'tools/buildbot/PackageScript',
-    ]
-
-builder.Build(BuildScripts, { 'SM': SM })
-
-if builder.options.breakpad_dump:
-  builder.Build('tools/buildbot/BreakpadSymbols', { 'SM': SM })
@@ -0,0 +1,21 @@
+We now use svn:keywords "Id" on all .c/.cpp/.h/.sp/.inc files.  Please make sure your client is configured properly.  
+
+WINDOWS:
+ Open your Application Data folder.  
+ Windows XP/2000:	C:\Documents and Settings\<user>\Application Data
+ Windows Vista:		C:\Users\<user>\AppData\Roaming
+
+ Now go to Subversion.  Open the "config" file with a text editor.
+
+LINUX: 
+ Open ~/.subversion/config with your favorite text editor.
+
+Under [miscellany], uncomment this line:
+# enable-auto-props = yes
+
+Under [auto-props], add these lines:
+*.c = svn:keywords=Id
+*.cpp = svn:keywords=Id
+*.h = svn:keywords=Id
+*.sp = svn:keywords=Id
+*.inc = svn:keywords=Id
@@ -1,28 +0,0 @@
-SourceMod
-=========
-
-General
-------
- [SourceMod website](http://www.sourcemod.net): Source Engine scripting and server administration
- [Forum](https://forums.alliedmods.net/forumdisplay.php?f=52): Discussion forum including plugin/extension development
- [General documentation](https://wiki.alliedmods.net/Category:SourceMod_Documentation): Miscellaneous information about SourceMod
- [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
- [Translation project](https://github.com/orgs/alliedmodders/projects/1): Help [translate SourceMod](https://wiki.alliedmods.net/Translations_(SourceMod_Scripting)) into your language
-
-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.
@@ -1,17 +0,0 @@
-version: 1.0.{build}
-image: Visual Studio 2015
-clone_folder: c:/projects/sourcemod
-clone_depth: 1
-install:
- cmd: set PATH=C:\Python38;C:\Python38\Scripts;%PATH%
- cmd: git submodule update --init --recursive
- cmd: git pull --recurse-submodules
- cmd: cd ..
- ps: sourcemod/tools/checkout-deps.ps1 -SDKs episode1,css,tf2,l4d2,csgo
- cmd: cd sourcemod
-build_script:
- cmd: call "%VS140COMNTOOLS%/vsvars32.bat"
- cmd: mkdir build
- cmd: cd build
- cmd: python.exe ../configure.py --enable-optimize --no-mysql --sdks=episode1,css,tf2,l4d2,csgo
- cmd: ambuild
@@ -1,46 +0,0 @@
-// 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_
@@ -1,139 +0,0 @@
-// 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::Function<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;
-	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;
-
-	virtual void FormatSourceBinaryName(const char *basename, char *buffer, size_t maxlength) = 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_
@@ -1,81 +0,0 @@
-// 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_
@@ -1,65 +0,0 @@
-// 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(FileHandle_t file) = 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;
-	virtual int GetSearchPath(const char* pathID, bool bGetPackFiles, char* pPath, int nMaxLen) = 0;
-};
-
-} // namespace SourceMod
-
-#endif // _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_
@@ -1,43 +0,0 @@
-// 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_
-
@@ -1,55 +0,0 @@
-// 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_
-
@@ -1,45 +0,0 @@
-// 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_
@@ -1,112 +0,0 @@
-// 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_
@@ -1,48 +0,0 @@
-// 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_
@@ -1,95 +0,0 @@
-// 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);
-	void			(*SetEntityLumpWritable)(bool writable);
-	bool			(*ParseEntityLumpString)(const char *entityString, int &status, size_t &position);
-	const char *	(*GetEntityLumpString)();
-	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_
-
@@ -1,472 +0,0 @@
-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.
@@ -1,12 +0,0 @@
-// Custom admin menu commands.
-// For more information:
-//
-// http://wiki.alliedmods.net/Custom_Admin_Menu_%28SourceMod%29
-//
-// Note: This file must be in Valve KeyValues format (no multiline comments)
-//
-
-"Commands"
-{
-
-}
@@ -1,20 +0,0 @@
-/* Add group options to be added to 'group' or 'groupplayer' type submenus
- * The left side is the name that will show in the menu, right is the command that will be fired
- *
- * For more information: http://wiki.alliedmods.net/Custom_Admin_Menu_%28SourceMod%29
- */	
-
-Groups
-{
-	"All"					"@all"
-	"Bots"					"@bots"
-	"Alive"					"@alive"
-	"Dead"					"@dead"
-	"Humans"				"@humans"
-	"Current aim"			"@aim"
-
-	/* You can enable these if you are using Counter-Strike Source and running the cstrike extension */
-//	"Terrorists"			"@t"
-//	"Counter-Terrorists"	"@ct"
-
-}
@@ -16,7 +16,7 @@
 //  "@Full Admins"
 //
 //	You can also specify immunity values.  Two examples:
-//	"83:abcdefgh"			//Immunity is 83, flags are abcdefgh
+//	"83:abcdefg"			//Immunity is 83, flags are abcefgh
 //	"6:@Full Admins"		//Immunity is 6, group is "Full Admins"
 //
 //	Immunity values can be any number.  An admin cannot target an admin with 
@@ -37,9 +37,9 @@
 ////////////////////////////////
 // Examples: (do not put // in front of real lines, as // means 'comment')
 //
-//   "STEAM_0:1:16"		"bce"				//generic, kick, unban for this steam ID, no immunity
+//   "STEAM_0:1:16"		"bce"				//kick, ban, slay for this steam ID, no immunity
 //   "!127.0.0.1"		"99:z"				//all permissions for this ip, immunity value is 99
-//   "BAILOPAN"			"abc"	"Gab3n"		//name BAILOPAN, password "Gab3n": gets reservation, generic, kick
+//   "BAILOPAN"			"abc"	"Gab3n"		//name BAILOPAN, password "Gab3n": gets reservation, kick, ban
 //
 ////////////////////////////////
 
@@ -1,16 +0,0 @@
-"banreasons"
-{
-	"Abusive"			"Abusive"
-	"Racism"			"Racism"
-	"General cheating/exploits"	"General cheating/exploits"
-	"Wallhack"			"Wallhack"
-	"Aimbot"			"Aimbot"
-	"Speedhacking"			"Speedhacking"
-	"Mic spamming"			"Mic spamming"
-	"Admin disrespect"		"Admin disrespect"
-	"Camping"			"Camping"
-	"Team killing"			"Team killing"
-	"Unacceptable Spray"		"Unacceptable Spray"
-	"Breaking Server Rules"		"Breaking Server Rules"
-	"Other"				"Other"
-}
@@ -1,7 +1,6 @@
 //This file unloads all plugins, re-loads a few "safe" ones, and then prevents 
 //any more plugins from being loaded.
 sm plugins unload_all
-sm plugins load_unlock
 sm plugins load basebans.smx
 sm plugins load basecommands.smx
 sm plugins load admin-flatfile.smx
@@ -65,10 +65,6 @@ 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
@@ -84,21 +80,21 @@ sm_reserve_type 0
 sm_reserved_slots 0

 // Specifies whether or not reserved slots will be hidden (subtracted from max
-// slot count). Valid values are 0 (Visible) or 1 (Hidden).
+// slot count). Valid values are 0 (visible) or 1 (hidden).
 // --
 // Requires: reservedslots.smx
 // Default: 0
 sm_hide_slots 0

 // Specifies whether or not non-admins can send messages to admins using
-// say_team @<message>. Valid values are 0 (Disabled) or 1 (Enabled)
+// say_team @<message>. Valid values are 0 (disabled) or 1 (enabled)
 // --
 // Requires: basechat.smx
 // Default: 1
 sm_chat_mode 1

-// Specifies whether or not "timeleft" will automatically be triggered every
-// x seconds. Valid values are 0 (Disabled) to 1800 seconds.
+// Specifies whether or not "timeleft" will automaticly be triggered every
+// x seconds. Valid values are 0 (disabled) to 1800 seconds.
 // --
 // Requires: basetriggers.smx
 // Default: 0
@@ -109,30 +105,5 @@ sm_timeleft_interval 0
 // 1 (Enabled)
 // --
 // Requires: basetriggers.smx
-// Default: 0
-sm_trigger_show 0
-
-// Specifies whether or not to display vote progress to clients in the
-// "hint" box (near the bottom of the screen in most games).
-// Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_hintbox 0
-
-// Specifies whether or not to display vote progress to clients in the
-// chat area. Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_chat 0
-
-// Specifies whether or not to display vote progress in the server console.
-// Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_console 0
-
-// Specifies whether or not to display vote progress to clients in the
-// client console. Valid values are 0 (Disabled) or 1 (Enabled).
-// --
-// Default: 0
-sm_vote_progress_client_console 0
+// Default: 1
+sm_trigger_show 1
@@ -4,6 +4,14 @@
 */
 "Core"
 {
+	/**
+	 * Relative path to SourceMod's base directory. This is relative to the game/mod directory.
+	 * Only change this if you have installed SourceMod in a non-default location.
+	 *
+	 * The default value is "addons/sourcemod"
+	 */
+	"BasePath"		"addons/sourcemod"
+	
 	/**
 	 * This option determines if SourceMod logging is enabled.
 	 *
@@ -30,12 +38,12 @@
 	"ServerLang"	"en"
 	
 	/**
-	 * List of characters to use for public chat triggers.  Set an empty list to disable.
+	 * String to use as the public chat trigger.  Set an empty string to disable.
 	 */
 	"PublicChatTrigger"		"!"
 	
 	/**
-	 * List of characters to use for silent chat triggers.  Set an empty list to disable.
+	 * String to use as the silent chat trigger.  Set an empty string to disable.
 	 */
 	"SilentChatTrigger"		"/"
 	
@@ -44,7 +52,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 suppress.
+	 * The default value is "no".  A value of "yes" will supress.
 	 */
 	"SilentFailSuppress"	"no"
 	
@@ -53,6 +61,24 @@
 	 * passwords to work, for security reasons.
 	 */
 	"PassInfoVar"			"_password"
+	
+	/**
+	 * Specifies the sound that gets played when an item is selected from a menu.
+	 */
+	"MenuItemSound"			"buttons/button14.wav"
+
+	/**
+	 * Specifies the sound that gets played when an "Exit" button is selected 
+	 * from a menu.
+	 */
+	"MenuExitSound"			"buttons/combine_button7.wav"
+	
+	/**
+	 * Specifies the sound that gets played when an "Exit Back" button is selected 
+	 * from a menu.  This is the special "Back" button that is intended to roll back
+	 * to a previous menu.
+	 */
+	"MenuExitBackSound"		"buttons/combine_button7.wav"

 	/**
 	 * Enables or disables whether SourceMod reads a client's cl_language cvar to set 
@@ -62,80 +88,4 @@
 	 * "off"	- Translate using default server's language
 	 */
 	"AllowClLanguageVar"		"On"
-
-	/**
-	 * Enables or Disables SourceMod's automatic gamedata updating.
-	 *
-	 * The default value is "no". A value of "yes" will block the Auto Updater.
-	 */
-	"DisableAutoUpdate"			"no"
-
-	/**
-	 * If set to yes, a successful gamedata update will attempt to restart SourceMod.
-	 * SourceMod is unloaded and reloaded, and the map is changed to the current map.
-	 * Since gamedata updates occur when the server loads, impact should be minimal.
-	 * But to be safe, this option is disabled by default.
-	 */
-	"ForceRestartAfterUpdate"	"no"
-
-	/**
-	 * URL to use for retrieving update information.
-	 * SSL is not yet supported.
-	 */
-	"AutoUpdateURL"				"http://update.sourcemod.net/update/"
-
-	/**
-	 * Whether to show debug spew.  
-	 * Currently this will log details about the gamedata updating process.
-	 */
-	"DebugSpew"					"no"
-	
-	/**
-	 * If set to yes, SourceMod will validate steamid auth strings with the Steam backend before giving out admin access.
-	 * This can prevent malicious users from impersonating admins with stolen Steam apptickets.
-	 * If Steam is down, admins will not be authenticated until Steam comes back up.
-	 * This option increases the security of your server, but is still experimental.
-	 */
-	"SteamAuthstringValidation"	"yes"
-	
-	/**
-	 * Enables or disables whether SourceMod blocks known or potentially malicious plugins from loading.
-	 * It is STRONGLY advised that this is left enabled, there have been cases in the past with plugins that
-	 * allow anyone to delete files on the server, gain full rcon control, etc.
-	 *
-	 * "yes"	- Block malware or illegal plugins from loading (default)
-	 * "no"		- Warn about malware or illegal plugins loading
-	 */
-	"BlockBadPlugins"	"yes"
-
-	/**
-	 * If a plugin takes too long to execute, hanging or freezing the game server in the process, 
-	 * SourceMod will attempt to terminate that plugin after the specified timeout length has
-	 * passed. You can disable this feature by setting the value to "0".
-	 */
-	"SlowScriptTimeout"	"8"
-	
-	/**
-	 * 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"
-
-	/**
-	 * Controls whether the SourcePawn runtime will generate additional metadata about
-	 * JIT-compiled functions for performance profiling or debugging purposes.
-	 *
-	 * "none"    - Don't generate any additional JIT metadata
-	 * "default" - Generate basic perf metadata (on Linux) and delete it automatically on quit
-	 * "perf"    - Generate basic perf metadata (Linux only - function names)
-	 * "jitdump" - Generate extended perf metadata (Linux only - function names, bytecode, and source information)
-	 */
-	"JITMetadata"	"default"
 }
@@ -2,8 +2,6 @@
 {
 	"driver_default"		"mysql"
 	
-	// When specifying "host", you may use an IP address, a hostname, or a socket file path
-	
 	"default"
 	{
 		"driver"			"default"
@@ -20,15 +18,4 @@
 		"driver"			"sqlite"
 		"database"			"sourcemod-local"
 	}
-
-	"clientprefs"
-	{
-		"driver"			"sqlite"
-		"host"				"localhost"
-		"database"			"clientprefs-sqlite"
-		"user"				"root"
-		"pass"				""
-		//"timeout"			"0"
-		//"port"			"0"
-	}
 }
@@ -1,38 +1,6 @@
 "Languages"
 {
-	"ar"		"Arabic"		// Arabic
-	"bg"		"Bulgarian"		// Bulgarian
-	"chi"		"SChinese"		// Chinese (Simplified)
-	"cze"		"Czech"			// Czech
-	"da"		"Danish"		// Danish
-	"de"		"German"		// German
-	"el"		"Greek"			// Greek
-	"en"		"English"		// English
-	"es"		"Spanish"		// Spanish
-	"fi"		"Finnish"		// Finnish
-	"fr"		"French"		// French
-	"he"		"Hebrew"		// Hebrew
-	"hu"		"Hungarian"		// Hungarian
-	"it"		"Italian"		// Italian
-	"jp"		"Japanese"		// Japanese
-	"ko"		"Korean"		// Korean
- 	"ko"		"KoreanA"		// Korean (https://bugs.alliedmods.net/show_bug.cgi?id=4667)
-	"las"		"LatAm"			// Latin American Spanish
-	"lt"		"Lithuanian"		// Lithuanian
-	"lv"		"Latvian"		// Latvian
-	"nl"		"Dutch"			// Dutch
-	"no"		"Norwegian"		// Norwegian
-	"pl"		"Polish"		// Polish
-	"pt"		"Brazilian"		// Brazilian Portuguese
-	"pt_p"		"Portuguese"		// Portuguese
-	"ro"		"Romanian"		// Romanian
-	"ru"		"Russian"		// Russian
-	"sk"		"Slovak"		// Slovak
-	"sv"		"Swedish"		// Swedish
-	"th"		"Thai"			// Thai
-	"tr"		"Turkish"		// Turkish
-	"ua"		"Ukrainian"		// Ukrainian
-	"vi"		"Vietnamese"		// Vietnamese
-	"zho"		"TChinese"		// Chinese (Traditional)
-
+	"en"			"English"
+	"es"			"Español"
 }
+
@@ -51,8 +51,8 @@
 		"target"		"default"
 	}
 	
-	/* For the "nominations" plugin */
-	"nominations"
+	/* For the "randomcycle" plugin */
+	"rockthevote"
 	{
 		"target"		"default"
 	}
@@ -0,0 +1,38 @@
+/**
+ *   Each sub-section of "Plugins" should have a title which specifies a plugin filename.
+ * Filenames have a wildcard of *.  Appending .smx is not required.
+ * If the filename has no explicit path, it will be patched to any sub-path in the plugins folder.
+ *
+ *   Available properties for plugins are:
+ * "pause"			- Whether or not the plugin should load paused - "yes" or "no" (default)
+ * "lifetime"		- Lifetime of the plugin.  Options:
+ *		  "mapsync"	 - Plugins should be reloaded on mapchange if changed (default)
+ *		  "global"	 - Plugin will never be unloaded or updated
+ * "blockload" 		- Plugin will always be blocked from loading.  Implicit (automatic) loads 
+ *					  produce no error, but explicit (manual) loads will show an error message.
+ *					  (Options are one of "yes" or "no")
+ *
+ * You can also have an "Options" section declaring options to pass onto the JIT:
+ * "debug"		- Whether or not to load the plugin in debug mode
+ * "profile"	- Bit flags for profiling level.  Add flags together to reach a value.
+ *				  WARNING: Profiler is _ALPHA_ software!  Use it at your own risk for 
+ *				  development cycles only (not production setups).
+ *				  See the wiki article "SourceMod Profiler" for more information.
+ *				  1 - Profile natives
+ *				  2 - Profile callbacks
+ *				  4 - Profile internal plugin function calls
+ */
+	
+"Plugins"
+{
+	"*"
+	{
+		"pause"			"no"
+		"lifetime"		"mapsync"
+		
+		"Options"
+		{
+			"debug"		"no"
+		}
+	}
+}
@@ -1,17 +0,0 @@
-CREATE TABLE sm_cookies
-(
-	id INTEGER unsigned NOT NULL auto_increment,
-	name varchar(30) NOT NULL UNIQUE,
-	description varchar(255),
-	access INTEGER,
-	PRIMARY KEY (id)
-);
-
-CREATE TABLE sm_cookie_cache
-(
-	player varchar(65) NOT NULL,
-	cookie_id int(10) NOT NULL,
-	value varchar(100),
-	timestamp int NOT NULL,
-	PRIMARY KEY (player, cookie_id)
-);
@@ -1,41 +0,0 @@
-CREATE TABLE IF NOT EXISTS sm_cookies
-(
-	id serial,
-	name varchar(30) NOT NULL UNIQUE,
-	description varchar(255),
-	access INTEGER,
-	PRIMARY KEY (id)
-);
-
-CREATE TABLE IF NOT EXISTS sm_cookie_cache
-(
-	player varchar(65) NOT NULL,
-	cookie_id int NOT NULL,
-	value varchar(100),
-	timestamp int NOT NULL,
-	PRIMARY KEY (player, cookie_id)
-);
-
-CREATE LANGUAGE plpgsql;
-
-CREATE OR REPLACE FUNCTION add_or_update_cookie(in_player VARCHAR(65), in_cookie INT, in_value VARCHAR(100), in_time INT) RETURNS VOID AS
-$$
-BEGIN
-  LOOP
-    -- first try to update the it.
-    UPDATE sm_cookie_cache SET value = in_value, timestamp = in_time WHERE player = in_player AND cookie_id = in_cookie;
-    IF found THEN
-      RETURN;
-    END IF;
-    -- not there, so try to insert.
-    -- if someone else inserts the same key concurrently, we could get a unique-key failure.
-    BEGIN
-      INSERT INTO sm_cookie_cache (player, cookie_id, value, timestamp) VALUES (in_player, in_cookie, in_value, in_time);
-      RETURN;
-    EXCEPTION WHEN unique_violation THEN
-      -- do nothing...  loop again, and we'll update.
-    END;
-  END LOOP;
-END;
-$$
-LANGUAGE plpgsql;
@@ -1,65 +0,0 @@
-CREATE TABLE sm_admins (
-  id serial,
-  authtype varchar(6) NOT NULL,
-  CHECK (authtype in ('steam', 'name', 'ip')),
-  identity varchar(65) NOT NULL,
-  password varchar(65),
-  flags varchar(30) NOT NULL,
-  name varchar(65) NOT NULL,
-  immunity int NOT NULL,
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE sm_groups (
-  id serial,
-  flags varchar(30) NOT NULL,
-  name varchar(120) NOT NULL,
-  immunity_level int NOT NULL,
-  PRIMARY KEY (id)
-);
-
-CREATE TABLE sm_group_immunity (
-  group_id int NOT NULL,
-  other_id int NOT NULL,
-  FOREIGN KEY (group_id) REFERENCES sm_groups(id) ON DELETE CASCADE,
-  FOREIGN KEY (other_id) REFERENCES sm_groups(id) ON DELETE CASCADE,
-  PRIMARY KEY (group_id, other_id)
-);
-
-CREATE TABLE sm_group_overrides (
-  group_id int NOT NULL,
-  FOREIGN KEY (group_id) REFERENCES sm_groups(id) ON DELETE CASCADE,
-  type varchar(10) NOT NULL,
-  CHECK (type in ('command', 'group')),
-  name varchar(32) NOT NULL,
-  access varchar(5) NOT NULL,
-  CHECK (access in ('allow', 'deny')),
-  PRIMARY KEY (group_id, type, name)
-);
-
-CREATE TABLE sm_overrides (
-  type varchar(10) NOT NULL,
-  CHECK (type in ('command', 'group')),
-  name varchar(32) NOT NULL,
-  flags varchar(30) NOT NULL,
-  PRIMARY KEY (type,name)
-);
-
-CREATE TABLE sm_admins_groups (
-  admin_id int NOT NULL,
-  group_id int NOT NULL,
-  FOREIGN KEY (admin_id) REFERENCES sm_admins(id) ON DELETE CASCADE,
-  FOREIGN KEY (group_id) REFERENCES sm_groups(id) ON DELETE CASCADE,
-  inherit_order int NOT NULL,
-  PRIMARY KEY (admin_id, group_id)
-);
-
-- side note, this is pgsql module, sm_config will not exist if the above stuff exists... and it's being left to the admin
-- to figure out if it exists.
-CREATE TABLE sm_config (
-  cfg_key varchar(32) NOT NULL,
-  cfg_value varchar(255) NOT NULL,
-  PRIMARY KEY (cfg_key)
-);
-
-INSERT INTO sm_config (cfg_key, cfg_value) VALUES ('admin_version', '1.0.0.1409');
@@ -1,16 +0,0 @@
-CREATE TABLE sm_cookies
-(
-	id INTEGER PRIMARY KEY AUTOINCREMENT,
-	name varchar(30) NOT NULL UNIQUE,
-	description varchar(255),
-	access INTEGER
-);
-
-CREATE TABLE sm_cookie_cache
-(
-	player varchar(65) NOT NULL,
-	cookie_id int(10) NOT NULL,
-	value varchar(100),
-	timestamp int,
-	PRIMARY KEY (player, cookie_id)
-);
@@ -1,49 +0,0 @@
-# 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)
-
-# Hack to show a decent upgrade message, which wasn't done until 2.2.
-ambuild_version = getattr(run, 'CURRENT_API', '2.1')
-if ambuild_version.startswith('2.1'):
-  sys.stderr.write("AMBuild 2.2 or higher is required; please update\n")
-  sys.exit(1)
-
-parser = run.BuildParser(sourcePath=sys.path[0], api='2.2')
-parser.options.add_argument('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
-                       help='Root search folder for HL2SDKs')
-parser.options.add_argument('--mysql-path', type=str, dest='mysql_path', default=None,
-                       help='Path to MySQL 5')
-parser.options.add_argument('--mysql64-path', type=str, dest='mysql64_path', default=None,
-                       help='Path to 64-bit MySQL 5')
-parser.options.add_argument('--mms-path', type=str, dest='mms_path', default=None,
-                       help='Path to Metamod:Source')
-parser.options.add_argument('--enable-debug', action='store_const', const='1', dest='debug',
-                       help='Enable debugging symbols')
-parser.options.add_argument('--enable-optimize', action='store_const', const='1', dest='opt',
-                       help='Enable optimization')
-parser.options.add_argument('--no-mysql', action='store_false', default=True, dest='hasMySql',
-                       help='Disable building MySQL extension')
-parser.options.add_argument('-s', '--sdks', default='present', dest='sdks',
-                       help='Build against specified SDKs; valid args are "none", "all", "present",'
-                            ' or comma-delimited list of engine names')
-parser.options.add_argument('--breakpad-dump', action='store_true', dest='breakpad_dump',
-                       default=False, help='Dump and upload breakpad symbols')
-parser.options.add_argument('--disable-auto-versioning', action='store_true', dest='disable_auto_versioning',
-                       default=False, help='Disable the auto versioning script')
-parser.options.add_argument('--targets', type=str, dest='targets', default=None,
-                          help="Override the target architecture (use commas to separate multiple targets).")
-parser.options.add_argument('--scripting-only', action='store_true', dest='scripting_only', default=False,
-                          help="Only build and package the files required for scripting in SourcePawn.")
-parser.options.add_argument('--enable-asan', action='store_true', dest='enable_asan',
-                            default=False, help='Enable ASAN (clang only)')
-parser.Configure()
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -30,6 +30,7 @@
 */

 #include "ADTFactory.h"
+#include "sm_globals.h"
 #include "ShareSys.h"

 ADTFactory g_AdtFactory;
@@ -56,30 +57,32 @@ IBasicTrie *ADTFactory::CreateBasicTrie()

 BaseTrie::BaseTrie()
 {
+	m_pTrie = sm_trie_create();
 }

 BaseTrie::~BaseTrie()
 {
+	sm_trie_destroy(m_pTrie);
 }

 bool BaseTrie::Insert(const char *key, void *value)
 {
-	return map_.insert(key, value);
+	return sm_trie_insert(m_pTrie, key, value);
 }

 bool BaseTrie::Retrieve(const char *key, void **value)
 {
-	return map_.retrieve(key, value);
+	return sm_trie_retrieve(m_pTrie, key, value);
 }

 bool BaseTrie::Delete(const char *key)
 {
-	return map_.remove(key);
+	return sm_trie_delete(m_pTrie, key);
 }

 void BaseTrie::Clear()
 {
-	map_.clear();
+	sm_trie_clear(m_pTrie);
 }

 void BaseTrie::Destroy()
@@ -89,5 +92,5 @@ void BaseTrie::Destroy()

 bool BaseTrie::Replace(const char *key, void *value)
 {
-	return map_.replace(key, value);
+	return sm_trie_replace(m_pTrie, key, value);
 }
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -33,8 +33,8 @@
 #define _INCLUDE_SOURCEMOD_ADTFACTORY_H_

 #include <IADTFactory.h>
-#include "common_logic.h"
-#include <sm_stringhashmap.h>
+#include "sm_globals.h"
+#include "sm_trie.h"

 using namespace SourceMod;

@@ -50,7 +50,7 @@ public:
 	virtual void Clear();
 	virtual void Destroy();
 private:
-	StringHashMap<void *> map_;
+	Trie *m_pTrie;
 };

 class ADTFactory : 
@@ -1,141 +0,0 @@
-# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
-import os
-
-project = builder.LibraryProject('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',
-  'smn_commandline.cpp',
-  'GameHooks.cpp',
-]
-
-# SDK name to shipping gamedir
-pb_gamedir_map = {
-  'csgo': 'csgo',
-  'blade': 'berimbau',
-  'mcv': 'vietnam',
-}
-
-# SDK name to source code gamedir
-pb_gamesrcdir_map = {
-  'csgo': 'cstrike15',
-  'blade': 'berimbau',
-  'mcv': 'vietnam',
-}
-
-for sdk_target in SM.sdk_targets:
-  sdk = sdk_target.sdk
-  cxx = sdk_target.cxx
-
-  binary_name = 'sourcemod.' + sdk['extension']
-  needs_protobuf = sdk['name'] in ['csgo', 'blade', 'mcv']
-
-  binary = SM.HL2Config(project, builder, cxx, binary_name, sdk)
-  SM.ConfigureForExtension(builder, binary.compiler)
-
-  compiler = binary.compiler
-  compiler.cxxincludes += [
-    builder.sourcePath
-  ]
-
-  if needs_protobuf:
-    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', pb_gamedir_map[sdk['name']], 'protobuf')
-    ]
-  
-  if compiler.like('msvc'):
-    compiler.defines += ['_ALLOW_KEYWORD_MACROS']
-  if cxx.target.platform == 'linux':
-    compiler.postlink += ['-lpthread', '-lrt']
-
-  if needs_protobuf:
-    if compiler.target.platform == 'linux':
-      if compiler.target.arch == 'x86':
-        lib_path = os.path.join(sdk['path'], 'lib', 'linux32', 'release', 'libprotobuf.a')
-      elif compiler.target.arch == 'x86_64':
-        lib_path = os.path.join(sdk['path'], 'lib', 'linux64', 'release', 'libprotobuf.a')
-      compiler.linkflags += ['-Wl,--exclude-libs=libprotobuf.a']
-    elif compiler.target.platform == 'mac':
-      if compiler.target.arch == 'x86':
-        lib_path = os.path.join(sdk['path'], 'lib', 'osx32', 'release', 'libprotobuf.a')
-      elif compiler.target.arch == 'x86_64':
-        lib_path = os.path.join(sdk['path'], 'lib', 'osx64', 'release', 'libprotobuf.a')
-    elif compiler.target.platform == 'windows':
-      msvc_ver = compiler.version
-      vs_year = ''
-      platform = ''
-      if compiler.target.arch == 'x86':
-        platform = 'win32'
-      elif compiler.target.arch == 'x86_64':
-        platform = 'win64'
-      
-      if 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', platform, 'debug', 'vs' + vs_year, 'libprotobuf.lib')
-      else:
-        lib_path = os.path.join(sdk['path'], 'lib', platform, 'release', 'vs' + vs_year, 'libprotobuf.lib')
-    compiler.linkflags.insert(0, lib_path)
-
-  if needs_protobuf:
-    binary.sources += ['smn_protobuf.cpp']
-  else:
-    binary.sources += ['smn_bitbuffer.cpp']
-
-  if sdk['name'] != 'blade':
-    binary.sources += [
-      'vprof_tool.cpp',
-    ]
-
-  if needs_protobuf:
-    binary.sources += [
-      os.path.join(sdk['path'], 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
-      os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf', pb_gamesrcdir_map[sdk['name']] + '_usermessages.pb.cc'),
-      os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf', pb_gamesrcdir_map[sdk['name']] + '_usermessage_helpers.cpp'),
-    ]
-    if sdk['name'] == 'mcv':
-      binary.sources += [
-        os.path.join(sdk['path'], 'public', 'game', 'shared', pb_gamedir_map[sdk['name']], 'protobuf', pb_gamesrcdir_map[sdk['name']] + '_gcmessages.pb.cc'),
-        os.path.join(sdk['path'], 'public', 'engine', 'protobuf', 'engine_gcmessages.pb.cc'),
-      ]
-
-SM.binaries += builder.Add(project)
-
@@ -1,231 +1,201 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_SOURCEMOD_ADMINCACHE_H_
-#define _INCLUDE_SOURCEMOD_ADMINCACHE_H_
-
-#include "common_logic.h"
-#include <IAdminSystem.h>
-#include "sm_memtable.h"
-#include <sm_trie.h>
-#include <sh_list.h>
-#include <sh_string.h>
-#include <IForwardSys.h>
-#include <sm_stringhashmap.h>
-#include <sm_namehashset.h>
-
-using namespace SourceHook;
-
-#define GRP_MAGIC_SET		0xDEADFADE
-#define GRP_MAGIC_UNSET		0xFACEFACE
-#define USR_MAGIC_SET		0xDEADFACE
-#define USR_MAGIC_UNSET		0xFADEDEAD
-
-typedef StringHashMap<OverrideRule> OverrideMap;
-
-struct AdminGroup
-{
-	uint32_t magic;					/* Magic flag, for memory validation (ugh) */
-	unsigned int immunity_level;	/* Immunity level */
-	/* Immune from target table (-1 = nonexistent)
-	 * [0] = number of entries
-	 * [1...N] = immune targets
-	 */
-	int immune_table;			
-	OverrideMap *pCmdTable;			/* Command override table (can be NULL) */
-	OverrideMap *pCmdGrpTable;		/* Command group override table (can be NULL) */
-	int next_grp;					/* Next group in the chain */
-	int prev_grp;					/* Previous group in the chain */
-	int nameidx;					/* Name */
-	FlagBits addflags;				/* Additive flags */
-};
-
-struct AuthMethod
-{
-	String name;
-	StringHashMap<AdminId> identities;
-
-	AuthMethod(const char *name)
-		: name(name)
-	{
-	}
-
-	static inline bool matches(const char *name, const AuthMethod *method)
-	{
-		return strcmp(name, method->name.c_str()) == 0;
-	}
-	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_
+/**
+ * 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_
@@ -0,0 +1,259 @@
+/**
+ * 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;
+}
@@ -0,0 +1,71 @@
+/**
+ * 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_CDATAPACK_H_
+#define _INCLUDE_SOURCEMOD_CDATAPACK_H_
+
+#include <IDataPack.h>
+
+using namespace SourceMod;
+
+class CDataPack : public IDataPack
+{
+public:
+	CDataPack();
+	~CDataPack();
+public: //IDataReader
+	void Reset() const;
+	size_t GetPosition() const;
+	bool SetPosition(size_t pos) const;
+	cell_t ReadCell() const;
+	float ReadFloat() const;
+	bool IsReadable(size_t bytes) const;
+	const char *ReadString(size_t *len) const;
+	void *GetMemory() const;
+	void *ReadMemory(size_t *size) const;
+public: //IDataPack
+	void ResetSize();
+	void PackCell(cell_t cell);
+	void PackFloat(float val);
+	void PackString(const char *string);
+	size_t CreateMemory(size_t size, void **addr);
+public:
+	void Initialize();
+private:
+	void CheckSize(size_t sizetype);
+private:
+	char *m_pBase;
+	mutable char *m_curptr;
+	size_t m_capacity;
+	size_t m_size;
+};
+
+#endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_
@@ -0,0 +1,196 @@
+/**
+ * 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>
+
+extern HandleType_t htCellArray;
+
+class CellArray
+{
+public:
+	CellArray(size_t blocksize) : m_Data(NULL), m_BlockSize(blocksize), m_AllocSize(0), m_Size(0)
+	{
+	}
+	~CellArray()
+	{
+		free(m_Data);
+	}
+	size_t size() const
+	{
+		return m_Size;
+	}
+	cell_t *push()
+	{
+		if (!GrowIfNeeded(1))
+		{
+			return NULL;
+		}
+		cell_t *arr = &m_Data[m_Size * m_BlockSize];
+		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 */
+		if (!GrowIfNeeded(1))
+		{
+			return false;
+		}
+
+		cell_t *pri = at(item1);
+		cell_t *alt = at(item2);
+
+		/* Get our temporary array 1 after the limit */
+		cell_t *temp = &m_Data[m_Size * m_BlockSize];
+
+		memcpy(temp, pri, sizeof(cell_t) * m_BlockSize);
+		memcpy(pri, alt, sizeof(cell_t) * m_BlockSize);
+		memcpy(alt, temp, sizeof(cell_t) * m_BlockSize);
+
+		return true;
+	}
+	void remove(size_t index)
+	{
+		/* If we're at the end, take the easy way out */
+		if (index == m_Size - 1)
+		{
+			m_Size--;
+			return;
+		}
+
+		/* Otherwise, it's time to move stuff! */
+		size_t remaining_indexes = (m_Size - 1) - index;
+		cell_t *src = at(index + 1);
+		cell_t *dest = at(index);
+		memmove(dest, src, sizeof(cell_t) * m_BlockSize * remaining_indexes);
+
+		m_Size--;
+	}
+	cell_t *insert_at(size_t index)
+	{
+		/* Make sure it'll fit */
+		if (!GrowIfNeeded(1))
+		{
+			return NULL;
+		}
+
+		/* move everything up */
+		cell_t *src = at(index);
+		cell_t *dst = at(index + 1);
+		memmove(dst, src, sizeof(cell_t) * m_BlockSize * (m_Size-index));
+
+		m_Size++;
+
+		return src;
+	}
+	bool resize(size_t count)
+	{
+		if (count <= m_Size)
+		{
+			m_Size = count;
+			return true;
+		}
+
+		if(!GrowIfNeeded(count - m_Size))
+		{
+			return false;
+		}
+
+		m_Size = count;
+		return true;
+	}
+
+	CellArray *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);
+		memcpy(array->m_Data, m_Data, sizeof(cell_t) * m_BlockSize * m_Size);
+		return array;
+	}
+
+	cell_t *base()
+	{
+		return m_Data;
+	}
+
+	size_t mem_usage()
+	{
+		return m_AllocSize * m_BlockSize * sizeof(cell_t);
+	}
+
+private:
+	bool GrowIfNeeded(size_t count)
+	{
+		/* Shortcut out if we can store this */
+		if (m_Size + count <= m_AllocSize)
+		{
+			return true;
+		}
+		/* Set a base allocation size of 8 items */
+		if (!m_AllocSize)
+		{
+			m_AllocSize = 8;
+		}
+		/* If it's not enough, keep doubling */
+		while (m_Size + count > m_AllocSize)
+		{
+			m_AllocSize *= 2;
+		}
+		/* finally, allocate the new block */
+		if (m_Data)
+		{
+			m_Data = (cell_t *)realloc(m_Data, sizeof(cell_t) * m_BlockSize * m_AllocSize);
+		} else {
+			m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize);
+		}
+		return (m_Data != NULL);
+	}
+private:
+	cell_t *m_Data;
+	size_t m_BlockSize;
+	size_t m_AllocSize;
+	size_t m_Size;
+};
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -81,17 +81,11 @@ inline int CellRecipientFilter::GetRecipientCount() const

 inline int CellRecipientFilter::GetRecipientIndex(int slot) const
 {
-	int ret;
 	if ((slot < 0) || (slot >= GetRecipientCount()))
 	{
-		ret = -1;
+		return -1;
 	}
-	else
-	{
-		ret = static_cast<int>(m_Players[slot]);
-	}
-
-	return ret;
+	return static_cast<int>(m_Players[slot]);
 }

 inline void CellRecipientFilter::SetToInit(bool isinitmsg)
@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
 * 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
@@ -29,78 +29,72 @@
 * Version: $Id$
 */

-#include <memory>
-
 #include <ITextParsers.h>
 #include "ChatTriggers.h"
 #include "sm_stringutil.h"
 #include "ConCmdManager.h"
 #include "PlayerManager.h"
+#include "Translator.h"
 #include "HalfLife2.h"
-#include "logic_bridge.h"
-#include "sourcemod.h"
-#include "provider.h"
-#include <bridge/include/ILogger.h>
-#include <amtl/am-string.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

 ChatTriggers g_ChatTriggers;
 bool g_bSupressSilentFails = false;
+CPhraseFile *g_pFloodPhrases = NULL;

-ChatTriggers::ChatTriggers() : m_bWillProcessInPost(false),
-	m_ReplyTo(SM_REPLY_CONSOLE), m_ArgSBackup(NULL)
+ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), 
+	m_bTriggerWasSilent(false), m_ReplyTo(SM_REPLY_CONSOLE)
 {
-	m_PubTrigger = "!";
-	m_PrivTrigger = "/";
+	m_PubTrigger = sm_strdup("!");
+	m_PrivTrigger = sm_strdup("/");
+	m_PubTriggerSize = 1;
+	m_PrivTriggerSize = 1;
 	m_bIsChatTrigger = false;
-	m_bPluginIgnored = true;
-#if SOURCE_ENGINE == SE_EPISODEONE
-	m_bIsINS = false;
-#endif
 }

 ChatTriggers::~ChatTriggers()
 {
-	delete [] m_ArgSBackup;
-	m_ArgSBackup = NULL;
+	delete [] m_PubTrigger;
+	m_PubTrigger = NULL;
+	delete [] m_PrivTrigger;
+	m_PrivTrigger = NULL;
 }

-void ChatTriggers::SetChatTrigger(ChatTriggerType type, const char *value)
-{
-	std::unique_ptr<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,
+ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, 
+													const char *value, 
 													ConfigSource source,
-													char *error,
+													char *error, 
 													size_t maxlength)
 {
 	if (strcmp(key, "PublicChatTrigger") == 0)
 	{
-		SetChatTrigger(ChatTrigger_Public, value);
+		delete [] m_PubTrigger;
+		m_PubTrigger = sm_strdup(value);
+		m_PubTriggerSize = strlen(m_PubTrigger);
 		return ConfigResult_Accept;
 	}
 	else if (strcmp(key, "SilentChatTrigger") == 0)
 	{
-		SetChatTrigger(ChatTrigger_Private, value);
+		delete [] m_PrivTrigger;
+		m_PrivTrigger = sm_strdup(value);
+		m_PrivTriggerSize = strlen(m_PrivTrigger);
 		return ConfigResult_Accept;
 	}
 	else if (strcmp(key, "SilentFailSuppress") == 0)
@@ -114,238 +108,231 @@ ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key,

 void ChatTriggers::OnSourceModAllInitialized()
 {
-	m_pShouldFloodBlock = forwardsys->CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
-	m_pDidFloodBlock = forwardsys->CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
-	m_pOnClientSayCmd = forwardsys->CreateForward("OnClientSayCommand", ET_Event, 3, NULL, Param_Cell, Param_String, Param_String);
-	m_pOnClientSayCmd_Post = forwardsys->CreateForward("OnClientSayCommand_Post", ET_Ignore, 3, NULL, Param_Cell, Param_String, Param_String);
+	m_pShouldFloodBlock = g_Forwards.CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
+	m_pDidFloodBlock = g_Forwards.CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
 }

 void ChatTriggers::OnSourceModAllInitialized_Post()
 {
-	logicore.AddCorePhraseFile("antiflood.phrases");
+	unsigned int file_id;
+	
+	file_id = g_Translator.FindOrAddPhraseFile("antiflood.phrases.txt");
+	g_pFloodPhrases = g_Translator.GetFileByIndex(file_id);
 }

 void ChatTriggers::OnSourceModGameInitialized()
 {
-	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_.push_back(sCoreProviderImpl.AddCommandHook(say, pre_hook));
-		hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say, post_hook));
-	}
-	if (ConCommand *say_team = FindCommand("say_team")) {
-		hooks_.push_back(sCoreProviderImpl.AddCommandHook(say_team, pre_hook));
-		hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say_team, post_hook));
-	}
-
-#if SOURCE_ENGINE == SE_EPISODEONE
-	m_bIsINS = (strcmp(g_SourceMod.GetGameFolderName(), "insurgency") == 0);
-	if (m_bIsINS) {
-		if (ConCommand *say2 = FindCommand("say2")) {
-			hooks_.push_back(sCoreProviderImpl.AddCommandHook(say2, pre_hook));
-			hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say2, post_hook));
+	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());
 	}
-#elif SOURCE_ENGINE == SE_NUCLEARDAWN
-	if (ConCommand *say_squad = FindCommand("say_squad")) {
-		hooks_.push_back(sCoreProviderImpl.AddCommandHook(say_squad, pre_hook));
-		hooks_.push_back(sCoreProviderImpl.AddPostCommandHook(say_squad, 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 (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);
 	}
-#endif
 }

 void ChatTriggers::OnSourceModShutdown()
 {
-	hooks_.clear();
+	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);
+	}

-	forwardsys->ReleaseForward(m_pShouldFloodBlock);
-	forwardsys->ReleaseForward(m_pDidFloodBlock);
-	forwardsys->ReleaseForward(m_pOnClientSayCmd);
-	forwardsys->ReleaseForward(m_pOnClientSayCmd_Post);
+	g_Forwards.ReleaseForward(m_pShouldFloodBlock);
+	g_Forwards.ReleaseForward(m_pDidFloodBlock);
 }

-bool ChatTriggers::OnSayCommand_Pre(int client, const ICommandArgs *command)
+#if defined ORANGEBOX_BUILD
+void ChatTriggers::OnSayCommand_Pre(const CCommand &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)
+	if (client == 0 || (pPlayer = g_Players.GetPlayerByIndex(client)) == NULL)
 	{
-		if (CallOnClientSayCommand(client) >= Pl_Handled)
-			return true;
-
-		return false;
+		RETURN_META(MRES_IGNORED);
 	}

-	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
-
 	/* We guarantee the client is connected */
-	if (!pPlayer || !pPlayer->IsConnected())
-		return false;
+	if (!pPlayer->IsConnected())
+	{
+		RETURN_META(MRES_IGNORED);
+	}
+
+	const char *args = command.ArgS();
+	
+	if (!args)
+	{
+		RETURN_META(MRES_IGNORED);
+	}

 	/* Check if we need to block this message from being sent */
 	if (ClientIsFlooding(client))
 	{
 		char buffer[128];

-		if (!logicore.CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "Flooding the server", &client))
-			ke::SafeSprintf(buffer, sizeof(buffer), "You are flooding the server!");
+		/* :TODO: log an error? */
+		if (g_Translator.CoreTransEx(g_pFloodPhrases, 
+			client, 
+			buffer, 
+			sizeof(buffer),
+			"Flooding the server",
+			NULL,
+			NULL)
+			!= Trans_Okay)
+		{
+			UTIL_Format(buffer, sizeof(buffer), "You are flooding the server!");
+		}

 		/* :TODO: we should probably kick people who spam too much. */

 		char fullbuffer[192];
-		ke::SafeSprintf(fullbuffer, sizeof(fullbuffer), "[SM] %s", buffer);
+		UTIL_Format(fullbuffer, sizeof(fullbuffer), "[SM] %s", buffer);
 		g_HL2.TextMsg(client, HUD_PRINTTALK, fullbuffer);

 		m_bWasFloodedMessage = true;
-		return true;
+
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	/* Handle quoted string sets */
+	bool is_quoted = false;
+	if (args[0] == '"')
+	{
+		args++;
+		is_quoted = true;
 	}

 	bool is_trigger = false;
 	bool is_silent = false;

-	// Prefer the silent trigger in case of clashes.
-	if (strchr(m_PrivTrigger.c_str(), m_ArgSBackup[0])) {
+	/* 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) 
+	{
 		is_trigger = true;
 		is_silent = true;
-	} else if (strchr(m_PubTrigger.c_str(), m_ArgSBackup[0])) {
-		is_trigger = true;
+		args = &args[m_PrivTriggerSize];
 	}

-	if (is_trigger) {
-		// Bump the args past the chat trigger - we only support single-character triggers now.
-		args = &m_ArgSBackup[1];
+	if (!is_trigger)
+	{
+		RETURN_META(MRES_IGNORED);
 	}

 	/**
 	 * Test if this is actually a command!
 	 */
-	if (is_trigger && PreProcessTrigger(PEntityOfEntIndex(client), args))
+	if (!PreProcessTrigger(engine->PEntityOfEntIndex(client), args, is_quoted))
 	{
-		m_bIsChatTrigger = true;
-
-		/**
-		 * We'll execute it in post.
-		 */
-		m_bWillProcessInPost = true;
+		CPlayer *pPlayer;
+		if (is_silent 
+			&& g_bSupressSilentFails 
+			&& client != 0
+			&& (pPlayer = g_Players.GetPlayerByIndex(client)) != NULL
+			&& pPlayer->GetAdminId() != INVALID_ADMIN_ID)
+		{
+			RETURN_META(MRES_SUPERCEDE);
+		}
+		RETURN_META(MRES_IGNORED);
 	}

-	if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)))
-		return true;
+	m_bIsChatTrigger = true;

-	if (CallOnClientSayCommand(client) >= Pl_Handled)
-		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);
+	}

 	/* Otherwise, let the command continue */
-	return false;
+	RETURN_META(MRES_IGNORED);
 }

-bool ChatTriggers::OnSayCommand_Post(int client, const ICommandArgs *command)
+#if defined ORANGEBOX_BUILD
+void ChatTriggers::OnSayCommand_Post(const CCommand &command)
+#else
+void ChatTriggers::OnSayCommand_Post()
+#endif
 {
+	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(PEntityOfEntIndex(client), m_ToExecute);
+		serverpluginhelpers->ClientCommand(engine->PEntityOfEntIndex(client), m_ToExecute);
 		SetReplyTo(old);
 	}
-
-	if (!m_bPluginIgnored && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
-	{
-		m_pOnClientSayCmd_Post->PushCell(client);
-		m_pOnClientSayCmd_Post->PushString(m_Arg0Backup);
-		m_pOnClientSayCmd_Post->PushString(m_ArgSBackup);
-		m_pOnClientSayCmd_Post->Execute(NULL);
-	}
-
-	m_bIsChatTrigger = false;
-	m_bWasFloodedMessage = false;
-	return false;
 }

-bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
+bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted)
 {
-	/* Extract a command. This is kind of sloppy. */
+	/* 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)
 	{
@@ -363,54 +350,55 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
 	if (!g_ConCmds.LookForSourceModCommand(cmd_buf))
 	{
 		/* Check if we had an "sm_" prefix */
-		if (strncasecmp(cmd_buf, "sm_", 3) == 0)
+		if (strncmp(cmd_buf, "sm_", 3) == 0)
 		{
 			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_");
-		ke::SafeStrcpy(&new_buf[3], sizeof(new_buf)-3, cmd_buf);
+		strncopy(&new_buf[3], cmd_buf, sizeof(new_buf)-3);

 		/* Recheck */
 		if (!g_ConCmds.LookForSourceModCommand(new_buf))
 		{
 			return false;
 		}
-
+		
 		prepended = true;
 	}

 	/* See if we need to do extra string manipulation */
-	if (prepended)
+	if (is_quoted || prepended)
 	{
-		ke::SafeSprintf(m_ToExecute, sizeof(m_ToExecute), "sm_%s", args);
+		size_t len;
+
+		/* Check if we need to prepend sm_ */
+		if (prepended)
+		{
+			len = UTIL_Format(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';
+			}
+		}
 	} else {
-		ke::SafeStrcpy(m_ToExecute, sizeof(m_ToExecute), args);
+		strncopy(m_ToExecute, args, sizeof(m_ToExecute));
 	}

 	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;
@@ -461,23 +449,3 @@ bool ChatTriggers::WasFloodedMessage()
 {
 	return m_bWasFloodedMessage;
 }
-
-const char *ChatTriggers::GetPublicChatTrigger()
-{
-	if (!m_PubTrigger.length())
-	{
-		return NULL;
-	}
-
-	return m_PubTrigger.c_str();
-}
-
-const char *ChatTriggers::GetPrivateChatTrigger()
-{
-	if (!m_PrivTrigger.length())
-	{
-		return NULL;
-	}
-
-	return m_PrivTrigger.c_str();
-}
@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
 * 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,11 +34,9 @@

 #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
 {
@@ -50,49 +48,42 @@ 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
-	bool OnSayCommand_Pre(int client, const ICommandArgs *args);
-	bool OnSayCommand_Post(int client, const ICommandArgs *args);
+#if defined ORANGEBOX_BUILD
+	void OnSayCommand_Pre(const CCommand &command);
+	void OnSayCommand_Post(const CCommand &command);
+#else
+	void OnSayCommand_Pre();
+	void OnSayCommand_Post();
+#endif
 public:
 	unsigned int GetReplyTo();
 	unsigned int SetReplyTo(unsigned int reply);
 	bool IsChatTrigger();
 	bool WasFloodedMessage();
-	const char *GetPublicChatTrigger();
-	const char *GetPrivateChatTrigger();
 private:
-	enum ChatTriggerType {
-		ChatTrigger_Public,
-		ChatTrigger_Private,
-	};
-	void SetChatTrigger(ChatTriggerType type, const char *value);
-	bool PreProcessTrigger(edict_t *pEdict, const char *args);
+	bool PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted);
 	bool ClientIsFlooding(int client);
-	cell_t CallOnClientSayCommand(int client);
 private:
-	std::vector<ke::RefPtr<CommandHook>> hooks_;
-	std::string m_PubTrigger;
-	std::string m_PrivTrigger;
+	ConCommand *m_pSayCmd;
+	ConCommand *m_pSayTeamCmd;
+	char *m_PubTrigger;
+	size_t m_PubTriggerSize;
+	char *m_PrivTrigger;
+	size_t m_PrivTriggerSize;
 	bool m_bWillProcessInPost;
+	bool m_bTriggerWasSilent;
 	bool m_bIsChatTrigger;
 	bool m_bWasFloodedMessage;
-	bool m_bPluginIgnored;
 	unsigned int m_ReplyTo;
 	char m_ToExecute[300];
-	const char *m_Arg0Backup;
-	char *m_ArgSBackup;
 	IForward *m_pShouldFloodBlock;
 	IForward *m_pDidFloodBlock;
-	IForward *m_pOnClientSayCmd;
-	IForward *m_pOnClientSayCmd_Post;
-#if SOURCE_ENGINE == SE_EPISODEONE
-	bool m_bIsINS;
-#endif
 };

 extern ChatTriggers g_ChatTriggers;
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,120 +32,77 @@
 #ifndef _INCLUDE_SOURCEMOD_CONCMDMANAGER_H_
 #define _INCLUDE_SOURCEMOD_CONCMDMANAGER_H_

-#include <list>
-#include <memory>
-
-#include <am-inlinelist.h>
-#include <am-refcounting.h>
-#include <am-utility.h>
-#include <sm_stringhashmap.h>
-
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include <IForwardSys.h>
+#include "ForwardSys.h"
+#include "sm_trie.h"
+#include "sm_memtable.h"
 #include <sh_list.h>
 #include <sh_string.h>
 #include <IRootConsoleMenu.h>
 #include <IAdminSystem.h>
 #include "concmd_cleaner.h"
-#include "GameHooks.h"
-#include <sm_namehashset.h>

 using namespace SourceHook;

-struct CmdHook;
-struct ConCmdInfo;
-
-struct CommandGroup : public ke::Refcounted<CommandGroup>
+enum CmdType
 {
-	std::list<CmdHook *> hooks;
+	Cmd_Server,
+	Cmd_Console,
+	Cmd_Admin,
 };

 struct AdminCmdInfo
 {
-	AdminCmdInfo(const ke::RefPtr<CommandGroup> &group, FlagBits flags)
-		: group(group),
-		  flags(flags),
-		  eflags(0)
+	AdminCmdInfo()
 	{
+		cmdGrpId = -1;
+		flags = 0;
+		eflags = 0;
 	}
-	ke::RefPtr<CommandGroup> group;
+	int cmdGrpId;			/* index into cmdgroup string table */
 	FlagBits flags;			/* default flags */
 	FlagBits eflags;		/* effective flags */
 };

-struct CmdHook : public ke::InlineListNode<CmdHook>
+struct CmdHook
 {
-	enum Type {
-		Server,
-		Client
-	};
-
-	CmdHook(Type type, ConCmdInfo *cmd, IPluginFunction *fun, const char *description, IPlugin *plugin)
-		: type(type),
-		  info(cmd),
-		  pf(fun),
-		  plugin(plugin),
-		  helptext(description)
+	CmdHook()
 	{
+		pf = NULL;
+		pAdmin = NULL;
 	}
-
-	Type type;
-	ConCmdInfo *info;
-	IPluginFunction *pf;				/* function hook */
-	IPlugin *plugin;					/* owning plugin */
-	std::string helptext;				/* help text */
-	std::unique_ptr<AdminCmdInfo> admin;	/* admin requirements, if any */
+	IPluginFunction *pf;	/* function hook */
+	String helptext;		/* help text */
+	AdminCmdInfo *pAdmin;	/* admin requirements, if any */
 };

-typedef ke::InlineList<CmdHook> CmdHookList;
-
 struct ConCmdInfo
 {
 	ConCmdInfo()
 	{
-		pPlugin = nullptr;
 		sourceMod = false;
-		pCmd = nullptr;
-		eflags = 0;
+		pCmd = NULL;
 	}
-
 	bool sourceMod;					/**< Determines whether or not concmd was created by a SourceMod plugin */
 	ConCommand *pCmd;				/**< Pointer to the command itself */
-	CmdHookList hooks;				/**< Hook list */
-	FlagBits eflags;				/**< Effective admin flags */
-	ke::RefPtr<CommandHook> sh_hook;   /**< SourceHook hook, if any. */
-	IPlugin *pPlugin; 				/**< Owning plugin handle. */
-
-	struct ConCmdPolicy
-	{
-		static inline bool matches(const char *name, ConCmdInfo *info)
-		{
-			const char *conCmdChars = info->pCmd->GetName();
-
-			std::string concmdName = ke::Lowercase(conCmdChars);
-			std::string input = ke::Lowercase(name);
-
-			return concmdName == input;
-		}
-
-		static inline uint32_t hash(const detail::CharsAndLength &key)
-		{
-			std::string lower = ke::Lowercase(key.c_str());
-			return detail::CharsAndLength(lower.c_str()).hash();
-		}
-	};
+	List<CmdHook *> srvhooks;		/**< Hooks as a server command */
+	List<CmdHook *> conhooks;		/**< Hooks as a console command */
+	AdminCmdInfo admin;				/**< Admin info, if any */
+	bool is_admin_set;				/**< Whether or not admin info is set */
 };

-typedef List<ConCmdInfo *> ConCmdList;
-
 class ConCmdManager :
 	public SMGlobalClass,
 	public IRootConsoleCommand,
 	public IPluginsListener,
 	public IConCommandTracker
 {
-	friend void CommandCallback(DISPATCH_ARGS);
+#if defined ORANGEBOX_BUILD
+	friend void CommandCallback(const CCommand &command);
+#else
+	friend void CommandCallback();
+#endif
 public:
 	ConCmdManager();
 	~ConCmdManager();
@@ -155,44 +112,50 @@ public: //SMGlobalClass
 public: //IPluginsListener
 	void OnPluginDestroyed(IPlugin *plugin);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
+	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public: //IConCommandTracker
-	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) override;
+	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
 public:
-	bool AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags, IPlugin *pPlugin);
+	bool AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
+	bool AddConsoleCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
 	bool AddAdminCommand(IPluginFunction *pFunction, 
 						 const char *name, 
 						 const char *group,
 						 int adminflags,
 						 const char *description, 
-						 int flags,
-						 IPlugin *pPlugin);
+						 int flags);
 	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:
-	bool InternalDispatch(int client, const ICommandArgs *args);
+	void InternalDispatch(const CCommand &command);
 	ResultType RunAdminCommand(ConCmdInfo *pInfo, int client, int args);
-	ConCmdInfo *AddOrFindCommand(const char *name, const char *description, int flags, IPlugin *pPlugin);
+	ConCmdInfo *AddOrFindCommand(const char *name, const char *description, int flags);
+	void SetCommandClient(int client);
 	void AddToCmdList(ConCmdInfo *info);
-	void RemoveConCmd(ConCmdInfo *info, const char *cmd, bool untrack);
+	void RemoveConCmd(ConCmdInfo *info, const char *cmd, bool is_read_safe, bool untrack);
+	void RemoveConCmds(List<CmdHook *> &cmdlist);
+	void RemoveConCmds(List<CmdHook *> &cmdlist, IPluginContext *pContext);
 	bool CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin);
-	ConCmdInfo *FindInTrie(const char *name);
 public:
+	inline int GetCommandClient()
+	{
+		return m_CmdClient;
+	}
 	inline const List<ConCmdInfo *> & GetCommandList()
 	{
 		return m_CmdList;
 	}
 private:
-	typedef StringHashMap<ke::RefPtr<CommandGroup> > GroupMap;
-
-	NameHashSet<ConCmdInfo *, ConCmdInfo::ConCmdPolicy> m_Cmds; /* command lookup */
-	GroupMap m_CmdGrps;				/* command group map */
-	ConCmdList m_CmdList;			/* command list */
+	Trie *m_pCmds;					/* command lookup */
+	Trie *m_pCmdGrps;				/* command group lookup */
+	List<ConCmdInfo *> m_CmdList;	/* command list */
+	int m_CmdClient;				/* current client */
+	BaseStringTable m_Strings;		/* string table */
 };

 extern ConCmdManager g_ConCmds;

 #endif // _INCLUDE_SOURCEMOD_CONCMDMANAGER_H_
-
@@ -1,89 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-#ifndef _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
-#define _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_
-
-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-class ConCommandBaseIterator
-{
-public:
-	inline ConCommandBaseIterator() : iter(icvar)
-	{
-		iter.SetFirst();
-	}
-
-	inline bool IsValid()
-	{
-		return iter.IsValid();
-	}
-
-	inline void Next()
-	{
-		iter.Next();
-	}
-
-	inline ConCommandBase *Get()
-	{
-		return iter.Get();
-	}
-private:
-	ICvar::Iterator iter;
-};
-#else
-class ConCommandBaseIterator
-{
-public:
-	inline ConCommandBaseIterator()
-	{
-		iter = icvar->GetCommands();
-	}
-
-	inline bool IsValid()
-	{
-		return iter != NULL;
-	}
-
-	inline void Next()
-	{
-		iter = const_cast<ConCommandBase *>(iter->GetNext());
-	}
-
-	inline ConCommandBase *Get()
-	{
-		return iter;
-	}
-private:
-	ConCommandBase *iter;
-};
-#endif
-
-#endif /* _INCLUDE_SOURCEMOD_CON_COMMAND_BASE_ITERATOR_H_ */
-
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -25,63 +25,40 @@
 * this exception to all derivative works.  AlliedModders LLC defines further
 * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
 * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
 */

 #include "ConVarManager.h"
 #include "HalfLife2.h"
+#include "PluginSys.h"
+#include "ForwardSys.h"
+#include "HandleSys.h"
+#include "sm_srvcmds.h"
 #include "sm_stringutil.h"
 #include <sh_vector.h>
-#include <sm_namehashset.h>
-#include "logic_bridge.h"
-#include "sourcemod.h"
-#include "provider.h"
-#include <bridge/include/IScriptManager.h>
+#include <sm_trie_tpl.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;
-NameHashSet<ConVarInfo *, ConVarInfo::ConVarPolicy> convar_cache;
+KTrie<ConVarInfo *> convar_cache;

-enum {
-	eQueryCvarValueStatus_Cancelled = -1,
-};
-
-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)
+ConVarManager::ConVarManager() : m_ConVarType(0), m_bIsDLLQueryHooked(false), m_bIsVSPQueryHooked(false)
 {
 }

@@ -99,17 +76,26 @@ void ConVarManager::OnSourceModStartup(bool late)
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;

 	/* Create the 'ConVar' handle type */
-	m_ConVarType = handlesys->CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_ConVarType = g_HandleSys.CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }

 void ConVarManager::OnSourceModAllInitialized()
 {
-	g_Players.AddClientListener(this);
+	/**
+	 * 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

-	scripts->AddPluginsListener(this);
+	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);

 	/* Add the 'convars' option to the 'sm' console command */
-	rootmenu->AddRootConsoleCommand3("cvars", "View convars created by a plugin", this);
+	g_RootMenu.AddRootConsoleCommand("cvars", "View convars created by a plugin", this);
 }

 void ConVarManager::OnSourceModShutdown()
@@ -124,10 +110,10 @@ void ConVarManager::OnSourceModShutdown()

 		iter = m_ConVars.erase(iter);

-		handlesys->FreeHandle(pInfo->handle, &sec);
+		g_HandleSys.FreeHandle(pInfo->handle, &sec);
 		if (pInfo->pChangeForward != NULL)
 		{
-			forwardsys->ReleaseForward(pInfo->pChangeForward);
+			g_Forwards.ReleaseForward(pInfo->pChangeForward);
 		}
 		if (pInfo->sourceMod)
 		{
@@ -155,23 +141,73 @@ void ConVarManager::OnSourceModShutdown()
 	}
 	convar_cache.clear();

-	g_Players.RemoveClientListener(this);
+	/* 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);

 	/* Remove the 'convars' option from the 'sm' console command */
-	rootmenu->RemoveRootConsoleCommand("cvars", this);
-
-	scripts->RemovePluginsListener(this);
+	g_RootMenu.RemoveRootConsoleCommand("cvars", this);

 	/* Remove the 'ConVar' handle type */
-	handlesys->RemoveType(m_ConVarType, g_pCoreIdent);
+	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;
 }

 bool convar_cache_lookup(const char *name, ConVarInfo **pVar)
 {
-	return convar_cache.retrieve(name, pVar);
+	ConVarInfo **pLookup = convar_cache.retrieve(name);
+	if (pLookup != NULL)
+	{
+		*pVar = *pLookup;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
 }

-void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name)
+void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe)
 {
 	/* Only check convars that have not been created by SourceMod's core */
 	ConVarInfo *pInfo;
@@ -187,7 +223,7 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	convar_cache.remove(name);

 	/* Now make sure no plugins are referring to this pointer */
-	IPluginIterator *pl_iter = scripts->GetPluginIterator();
+	IPluginIterator *pl_iter = g_PluginSys.GetPluginIterator();
 	while (pl_iter->MorePlugins())
 	{
 		IPlugin *pl = pl_iter->GetPlugin();
@@ -203,73 +239,19 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	}

 	/* Free resources */
-	handlesys->FreeHandle(pInfo->handle, &sec);
+	g_HandleSys.FreeHandle(pInfo->handle, &sec);
 	delete pInfo;
 }

 void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 {
 	ConVarList *pConVarList;
+
 	/* If plugin has a convar list, free its memory */
 	if (plugin->GetProperty("ConVarList", (void **)&pConVarList, true))
 	{
 		delete pConVarList;
 	}
-
-	/* Clear any references to this plugin as the convar creator */
-	for (List<ConVarInfo *>::iterator iter = m_ConVars.begin(); iter != m_ConVars.end(); ++iter)
-	{
-		ConVarInfo *pInfo = (*iter);
-
-		if (pInfo->pPlugin == plugin)
-		{
-			pInfo->pPlugin = nullptr;
-		}
-	}
-
-	const IPluginRuntime * pRuntime = plugin->GetRuntime();
-
-	/* Remove convar queries for this plugin that haven't returned results yet */
-	for (List<ConVarQuery>::iterator 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)
-		{
-			IPluginFunction *pCallback = query.pCallback;
-			if (pCallback)
-			{
-				cell_t ret;
-
-				pCallback->PushCell(query.cookie);
-				pCallback->PushCell(client);
-				pCallback->PushCell(eQueryCvarValueStatus_Cancelled);
-				pCallback->PushString("");
-				pCallback->PushString("");
-				pCallback->PushCell(query.value);
-				pCallback->Execute(&ret);
-			}
-			iter = m_ConVarQueries.erase(iter);
-			continue;
-		}
-
-		++iter;
-	}
 }

 void ConVarManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -282,27 +264,20 @@ bool ConVarManager::GetHandleApproxSize(HandleType_t type, void *object, unsigne
 	return true;
 }

-void ConVarManager::OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command)
+void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &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);
-		if (argcount >= 4 && strcmp(arg, "reset") == 0)
-		{
-			wantReset = true;
-			arg = command->Arg(3);
-		}
+		const char *arg = command.Arg(2);
 		
 		/* Get plugin object */
-		IPlugin *plugin = scripts->FindPluginByConsoleArg(arg);
+		CPlugin *plugin = g_PluginSys.FindPluginByConsoleArg(arg);

 		if (!plugin)
 		{
-			UTIL_ConsolePrint("[SM] Plugin \"%s\" was not found.", arg);
+			g_RootMenu.ConsolePrint("[SM] Plugin \"%s\" was not found.", arg);
 			return;
 		}

@@ -316,38 +291,25 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const ICommandArgs
 		/* If no convar list... */
 		if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
 		{
-			UTIL_ConsolePrint("[SM] No convars found for: %s", plname);
+			g_RootMenu.ConsolePrint("[SM] No convars found for: %s", plname);
 			return;
 		}

-		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 */
+		g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
+		g_RootMenu.ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
+
+		/* Iterate convar list and display each one */
 		for (iter = pConVarList->begin(); iter != pConVarList->end(); iter++)
 		{
-			/*const */ConVar *pConVar = const_cast<ConVar *>(*iter);
-			if (!wantReset)
-			{
-				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);
+			const ConVar *pConVar = (*iter);
+			g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
 		}

 		return;
 	}

 	/* Display usage of subcommand */
-	UTIL_ConsolePrint("[SM] Usage: sm cvars [reset] <plugin #>");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm convars <plugin #>");
 }

 Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *description, int flags, bool hasMin, float min, bool hasMax, float max)
@@ -356,8 +318,6 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	ConVarInfo *pInfo = NULL;
 	Handle_t hndl = 0;

-	IPlugin *plugin = scripts->FindPluginByContext(pContext->GetContext());
-
 	/* Find out if the convar exists already */
 	pConVar = icvar->FindVar(name);

@@ -365,16 +325,11 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	if (pConVar)
 	{
 		/* Add convar to plugin's list */
-		AddConVarToPluginList(plugin, pConVar);
+		AddConVarToPluginList(pContext, pConVar);

 		/* First find out if we already have a handle to it */
 		if (convar_cache_lookup(name, &pInfo))
 		{
-			/* If the convar doesn't have an owning plugin, but SM created it, adopt it */
-			if (pInfo->sourceMod && pInfo->pPlugin == nullptr) {
-				pInfo->pPlugin = plugin;
-			}
-
 			return pInfo->handle;
 		}
 		else
@@ -386,7 +341,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 			pInfo->pVar = pConVar;

 			/* If we don't, then create a new handle from the convar */
-			hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+			hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 			if (hndl == BAD_HANDLE)
 			{
 				delete pInfo;
@@ -404,10 +359,17 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 		}
 	}

-	/* Prevent creating a convar that has the same name as a console command */
-	if (FindCommand(name))
+	/* To prevent creating a convar that has the same name as a console command... ugh */
+	ConCommandBase *pBase = icvar->GetCommands();
+
+	while (pBase)
 	{
-		return BAD_HANDLE;
+		if (pBase->IsCommand() && strcmp(pBase->GetName(), name) == 0)
+		{
+			return BAD_HANDLE;
+		}
+
+		pBase = const_cast<ConCommandBase *>(pBase->GetNext());
 	}

 	/* Create and initialize ConVarInfo structure */
@@ -415,10 +377,9 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	pInfo->handle = hndl;
 	pInfo->sourceMod = true;
 	pInfo->pChangeForward = NULL;
-	pInfo->pPlugin = plugin;

 	/* Create a handle from the new convar */
-	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -432,7 +393,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	pInfo->pVar = pConVar;

 	/* Add convar to plugin's list */
-	AddConVarToPluginList(plugin, pConVar);
+	AddConVarToPluginList(pContext, pConVar);

 	/* Insert struct into caches */
 	m_ConVars.push_back(pInfo);
@@ -447,13 +408,7 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	ConVarInfo *pInfo;
 	Handle_t hndl;

-	/* Check convar cache to find out if we already have a handle */
-	if (convar_cache_lookup(name, &pInfo))
-	{
-		return pInfo->handle;
-	}
-
-	/* Couldn't find it in cache, so search for it */
+	/* Search for convar */
 	pConVar = icvar->FindVar(name);

 	/* If it doesn't exist, then return an invalid handle */
@@ -462,6 +417,12 @@ Handle_t ConVarManager::FindConVar(const char *name)
 		return BAD_HANDLE;
 	}

+	/* At this point, the convar exists. So, find out if we already have a handle */
+	if (convar_cache_lookup(name, &pInfo))
+	{
+		return pInfo->handle;
+	}
+
 	/* Create and initialize ConVarInfo structure */
 	pInfo = new ConVarInfo();
 	pInfo->sourceMod = false;
@@ -469,7 +430,7 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	pInfo->pVar = pConVar;

 	/* If we don't have a handle, then create a new one */
-	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -527,7 +488,7 @@ void ConVarManager::HookConVarChange(ConVar *pConVar, IPluginFunction *pFunction
 		/* If forward does not exist, create it */
 		if (!pForward)
 		{
-			pForward = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
+			pForward = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
 			pInfo->pChangeForward = pForward;
 		}

@@ -563,11 +524,10 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 		}

 		/* If the forward now has 0 functions in it... */
-		if (pForward->GetFunctionCount() == 0 &&
-			!ConVarReentrancyGuard::IsCvarInChain(pConVar))
+		if (pForward->GetFunctionCount() == 0)
 		{
 			/* Free this forward */
-			forwardsys->ReleaseForward(pForward);
+			g_Forwards.ReleaseForward(pForward);
 			pInfo->pChangeForward = NULL;
 		}
 	}
@@ -575,24 +535,37 @@ 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 = sCoreProviderImpl.QueryClientConVar(IndexOfEdict(pPlayer), name);
+	QueryCvarCookie_t cookie;

-	if (pCallback != NULL)
+	/* Call StartQueryCvarValue() in either the IVEngineServer or IServerPluginHelpers depending on situation */
+	if (m_bIsDLLQueryHooked)
 	{
-		ConVarQuery query = { cookie, pCallback, (cell_t) hndl, IndexOfEdict(pPlayer) };
-		m_ConVarQueries.push_back(query);
+		cookie = engine->StartQueryCvarValue(pPlayer, name);	
 	}
+	else if (m_bIsVSPQueryHooked)
+	{
+		cookie = serverpluginhelpers->StartQueryCvarValue(pPlayer, name);
+	}
+	else
+	{
+		return InvalidQueryCvarCookie;
+	}
+
+	ConVarQuery query = {cookie, pCallback, hndl};
+	m_ConVarQueries.push_back(query);

 	return cookie;
 }

-void ConVarManager::AddConVarToPluginList(IPlugin *plugin, const ConVar *pConVar)
+void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar *pConVar)
 {
 	ConVarList *pConVarList;
 	ConVarList::iterator iter;
 	bool inserted = false;
 	const char *orig = pConVar->GetName();

+	IPlugin *plugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+
 	/* Check plugin for an existing convar list */
 	if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
 	{
@@ -622,7 +595,11 @@ void ConVarManager::AddConVarToPluginList(IPlugin *plugin, const ConVar *pConVar
 	}
 }

+#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)
@@ -642,14 +619,20 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue, float

 	if (pInfo->changeListeners.size() != 0)
 	{
-		for (auto i = pInfo->changeListeners.begin(); i != pInfo->changeListeners.end(); i++)
+		for (List<IConVarChangeListener *>::iterator i = pInfo->changeListeners.begin();
+			 i != pInfo->changeListeners.end();
+			 i++)
+		{
+#if defined ORANGEBOX_BUILD
 			(*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);
@@ -660,15 +643,10 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue, float

 bool ConVarManager::IsQueryingSupported()
 {
-	return sCoreProviderImpl.IsClientConVarQueryingSupported();
+	return (m_bIsDLLQueryHooked || m_bIsVSPQueryHooked);
 }

-#if SOURCE_ENGINE != SE_DARKMESSIAH
-void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
-                                          int client,
-                                          EQueryCvarValueStatus result,
-										  const char *cvarName,
-										  const char *cvarValue)
+void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue)
 {
 	IPluginFunction *pCallback = NULL;
 	cell_t value = 0;
@@ -690,7 +668,7 @@ void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
 		cell_t ret;

 		pCallback->PushCell(cookie);
-		pCallback->PushCell(client);
+		pCallback->PushCell(engine->IndexOfEdict(pPlayer));
 		pCallback->PushCell(result);
 		pCallback->PushString(cvarName);

@@ -709,14 +687,13 @@ void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
 		m_ConVarQueries.erase(iter);
 	}
 }
-#endif

-HandleError ConVarManager::ReadConVarHandle(Handle_t hndl, ConVar **pVar, IPlugin **ppPlugin)
+HandleError ConVarManager::ReadConVarHandle(Handle_t hndl, ConVar **pVar)
 {
 	ConVarInfo *pInfo;
 	HandleError error;
 	
-	if ((error = handlesys->ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
+	if ((error = g_HandleSys.ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
 	{
 		return error;
 	}
@@ -726,10 +703,5 @@ HandleError ConVarManager::ReadConVarHandle(Handle_t hndl, ConVar **pVar, IPlugi
 		*pVar = pInfo->pVar;
 	}

-	if (ppPlugin)
-	{
-		*ppPlugin = pInfo->pPlugin;
-	}
-
 	return error;
 }
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -39,11 +39,8 @@
 #include <IForwardSys.h>
 #include <IHandleSys.h>
 #include <IRootConsoleMenu.h>
-#include <IPlayerHelpers.h>
 #include <compat_wrappers.h>
 #include "concmd_cleaner.h"
-#include "PlayerManager.h"
-#include <sm_stringhashmap.h>

 using namespace SourceHook;

@@ -62,27 +59,7 @@ struct ConVarInfo
 	bool sourceMod;						/**< Determines whether or not convar was created by a SourceMod plugin */
 	IChangeableForward *pChangeForward;	/**< Forward associated with convar */
 	ConVar *pVar;						/**< The actual convar */
-	IPlugin *pPlugin; 					/**< Originally owning plugin */
 	List<IConVarChangeListener *> changeListeners;
-
-	struct ConVarPolicy
-	{
-		static inline bool matches(const char *name, ConVarInfo *info)
-		{
-			const char *conVarChars = info->pVar->GetName();
-
-			std::string convarName = ke::Lowercase(conVarChars);
-			std::string input = ke::Lowercase(name);
-
-			return convarName == input;
-		}
-
-		static inline uint32_t hash(const detail::CharsAndLength &key)
-		{
-			std::string lower = ke::Lowercase(key.c_str());
-			return detail::CharsAndLength(lower.c_str()).hash();
-		}
-	};
 };

 /**
@@ -93,7 +70,6 @@ struct ConVarQuery
 	QueryCvarCookie_t cookie;			/**< Cookie that identifies query */
 	IPluginFunction *pCallback;			/**< Function that will be called when query is finished */
 	cell_t value;						/**< Optional value passed to query function */
-	cell_t client;						/**< Only used for cleaning up on client disconnection */
 };

 class ConVarManager :
@@ -101,8 +77,7 @@ class ConVarManager :
 	public IHandleTypeDispatch,
 	public IPluginsListener,
 	public IRootConsoleCommand,
-	public IConCommandTracker,
-	public IClientListener
+	public IConCommandTracker
 {
 public:
 	ConVarManager();
@@ -111,17 +86,16 @@ 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 ICommandArgs *command) override;
+	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 public: //IConCommandTracker
-	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) override;
-public: //IClientListener
-	void OnClientDisconnected(int client);
+	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
 public:
 	/**
 	 * Create a convar and return a handle to it.
@@ -155,28 +129,34 @@ public:

 	bool IsQueryingSupported();

-	HandleError ReadConVarHandle(Handle_t hndl, ConVar **pVar, IPlugin **ppPlugin = nullptr);
-
-	// 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
+	HandleError ReadConVarHandle(Handle_t hndl, ConVar **pVar);

 private:
 	/**
 	 * Adds a convar to a plugin's list.
 	 */
-	static void AddConVarToPluginList(IPlugin *plugin, const ConVar *pConVar);
+	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;
@@ -1,409 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-/**
- * On SourceHook v4.3 or lower, there are no DVP hooks. Very sad, right?
- * Only do this on newer versions. For the older code, we'll do an incredibly
- * hacky detour.
- *
- * The idea of the "non-hacky" (yeah... no) code is that every unique
- * ConCommand vtable gets its own DVP hook. We watch for unloading and
- * loading commands to remove stale hooks from SH.
- */
-
-#include "sourcemod.h"
-#include "sourcemm_api.h"
-#include "Logger.h"
-#include "compat_wrappers.h"
-#include "ConsoleDetours.h"
-#include <IGameConfigs.h>
-#include "sm_stringutil.h"
-#include "ConCmdManager.h"
-#include "HalfLife2.h"
-#include "ConCommandBaseIterator.h"
-#include "logic_bridge.h"
-#include "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
-	{
-		std::unique_ptr<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
-	{
-		std::unique_ptr<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;
-}
@@ -1,82 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-#ifndef _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
-#define _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_
-
-#include "sm_globals.h"
-#include "sourcemm_api.h"
-#include <IForwardSys.h>
-#include <sm_stringhashmap.h>
-
-namespace SourceMod {
-class ICommandArgs;
-} // namespace SourceMod
-
-class ConsoleDetours :
-	public SMGlobalClass,
-	public IFeatureProvider
-{
-	friend class PlayerManager;
-	friend class GenericCommandHooker;
-
-public:
-	ConsoleDetours();
-public: //SMGlobalClass
-	void OnSourceModAllInitialized();
-	void OnSourceModShutdown();
-public: //IFeatureProvider
-	FeatureStatus GetFeatureStatus(FeatureType type, const char *name);
-public:
-	bool AddListener(IPluginFunction *fun, const char *command);
-	bool RemoveListener(IPluginFunction *fun, const char *command);
-private:
-	cell_t InternalDispatch(int client, const 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 ConsoleDetours g_ConsoleDetours;
-
-#endif /* _INCLUDE_SOURCEMOD_CONSOLE_DETOURS_H_ */
-
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -33,189 +33,69 @@
 #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 "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;
+#include "PluginSys.h"
+#include "ForwardSys.h"

 #ifdef PLATFORM_WINDOWS
 ConVar sm_corecfgfile("sm_corecfgfile", "addons\\sourcemod\\configs\\core.cfg", 0, "SourceMod core configuration file");
-#elif defined PLATFORM_LINUX || defined PLATFORM_APPLE
+#elif defined PLATFORM_LINUX
 ConVar sm_corecfgfile("sm_corecfgfile", "addons/sourcemod/configs/core.cfg", 0, "SourceMod core configuration file");
 #endif

 IForward *g_pOnServerCfg = NULL;
 IForward *g_pOnConfigsExecuted = NULL;
-IForward *g_pOnAutoConfigsBuffered = NULL;
 CoreConfig g_CoreConfig;
 bool g_bConfigsExecd = false;
-bool g_bServerExecd = false;
-bool g_bGotServerStart = false;
-bool g_bGotTrigger = false;
-ConCommand *g_pExecPtr = NULL;
-ConVar *g_ServerCfgFile = NULL;
-
-void CheckAndFinalizeConfigs();
-
-#if SOURCE_ENGINE >= SE_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()
 {
-	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()
-{
+	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);
 }

 void CoreConfig::OnSourceModShutdown()
 {
-	rootmenu->RemoveRootConsoleCommand("config", this);
-	forwardsys->ReleaseForward(g_pOnServerCfg);
-	forwardsys->ReleaseForward(g_pOnConfigsExecuted);
-	forwardsys->ReleaseForward(g_pOnAutoConfigsBuffered);
-
-	if (g_pExecPtr != NULL)
-	{
-		SH_REMOVE_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPre), false);
-		SH_REMOVE_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPost), true);
-		g_pExecPtr = NULL;
-	}
+	g_RootMenu.RemoveRootConsoleCommand("config", this);
+	g_Forwards.ReleaseForward(g_pOnServerCfg);
+	g_Forwards.ReleaseForward(g_pOnConfigsExecuted);
 }

 void CoreConfig::OnSourceModLevelChange(const char *mapName)
 {
-	static bool already_checked = false;
-
-	if (!already_checked)
-	{
-		if (engine->IsDedicatedServer())
-		{
-			g_ServerCfgFile = icvar->FindVar("servercfgfile");
-		}
-		else
-		{
-			g_ServerCfgFile = icvar->FindVar("lservercfgfile");
-		}
-
-		if (g_ServerCfgFile != NULL)
-		{
-			g_pExecPtr = FindCommand("exec");
-			if (g_pExecPtr != NULL)
-			{
-				SH_ADD_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPre), false);
-				SH_ADD_HOOK(ConCommand, Dispatch, g_pExecPtr, SH_STATIC(Hook_ExecDispatchPost), true);
-			}
-			else
-			{
-				g_ServerCfgFile = NULL;
-			}
-		}
-		already_checked = true;
-	}
-
 	g_bConfigsExecd = false;
-	g_bServerExecd = false;
-	g_bGotServerStart = false;
-	g_bGotTrigger = false;
 }

-void CoreConfig::OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command)
+void CoreConfig::OnRootConsoleCommand(const char *cmdname, const CCommand &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)
 		{
-			UTIL_ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\". (%s)", option, value, error);
+			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\" (%s)", option, value, error);
+		} else if (res == ConfigResult_Ignore) {
+			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
 		} else {
-			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);
+			g_RootMenu.ConsolePrint("Config option \"%s\" successfully set to \"%s.\"", option, value);
 		}

-		return;
-	} else if (argcount >= 3) {
-		const char *option = command->Arg(2);
-		
-		const char *value = GetCoreConfigValue(option);
-		
-		if (value == NULL)
-		{
-			UTIL_ConsolePrint("[SM] No such config option \"%s\" exists.", option);
-		} else {
-			UTIL_ConsolePrint("[SM] Config option \"%s\" is set to \"%s\".", option, value);
-		}
-		
 		return;
 	}

-	UTIL_ConsolePrint("[SM] Usage: sm config <option> [value]");
+	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> <value>");
 }

 void CoreConfig::Initialize()
@@ -226,38 +106,21 @@ void CoreConfig::Initialize()
 	/* Try to get command line value of core config convar */
 	const char *corecfg = icvar->GetCommandLineValue("sm_corecfgfile");

-	/* If sm_corecfgfile is on the command line, use that
-	 * If sm_corecfgfile isn't there, check sm_basepath on the command line and build the path off that
-	 * If sm_basepath isn't there, just use the default path for the cfg
-	 */
-	if (corecfg)
+	/* If sm_corecfgfile not specified on command line, use default value */
+	if (!corecfg)
 	{
-		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());
-		}
+		corecfg = sm_corecfgfile.GetDefault();
 	}

-	/* Reset cached key values */
-	m_KeyValues.clear();
+	/* Format path to config file */
+	g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);

 	/* Parse config file */
 	if ((err=textparsers->ParseFile_SMC(filePath, this, NULL)) != SMCError_Okay)
 	{
 		/* :TODO: This won't actually log or print anything :( - So fix that somehow */
 		const char *error = textparsers->GetSMCErrorString(err);
-		logger->LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
+		g_Logger.LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
 	}
 }

@@ -269,7 +132,7 @@ SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 	if (err == ConfigResult_Reject)
 	{
 		/* This is a fatal error */
-		logger->LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
+		g_Logger.LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
 	}

 	return SMCResult_Continue;
@@ -277,7 +140,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_Ignore;
+	ConfigResult result;

 	/* Notify! */
 	SMGlobalClass *pBase = SMGlobalClass::head;
@@ -285,23 +148,12 @@ ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value,
 	{
 		if ((result = pBase->OnSourceModConfigChanged(option, value, source, error, maxlength)) != ConfigResult_Ignore)
 		{
-			break;
+			return result;
 		}
 		pBase = pBase->m_pGlobalClassNext;
 	}

-	std::string vstr(value);
-	m_KeyValues.replace(option, std::move(vstr));
-
-	return result;
-}
-
-const char *CoreConfig::GetCoreConfigValue(const char *key)
-{
-	StringHashMap<std::string>::Result r = m_KeyValues.find(key);
-	if (!r.found())
-		return NULL;
-	return r->value.c_str();
+	return ConfigResult_Ignore;
 }

 bool SM_AreConfigsExecuted()
@@ -313,12 +165,12 @@ inline bool IsPathSepChar(char c)
 {
 #if defined PLATFORM_WINDOWS
 	return (c == '\\' || c == '/');
-#elif defined PLATFORM_LINUX || defined PLATFORM_POSIX
+#elif defined PLATFORM_LINUX
 	return (c == '/');
 #endif
 }

-bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
+bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 {
 	bool will_create = false;
 	
@@ -336,12 +188,12 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)

 		g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "cfg/%s", folder);

-		if (!ke::file::IsDirectory(path))
+		if (!g_LibSys.IsPathDirectory(path))
 		{
 			char *cur_ptr = path;
 			size_t len;
 			
-			ke::path::Format(path, sizeof(path), "%s", folder);
+			g_LibSys.PathFormat(path, sizeof(path), "%s", folder);
 			len = g_SourceMod.BuildPath(Path_Game, build, sizeof(build), "cfg");

 			do
@@ -362,12 +214,14 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 				{
 					next_ptr = NULL;
 				}
-				len += ke::path::Format(&build[len],
+				len += g_LibSys.PathFormat(&build[len], 
 					sizeof(build)-len,
 					"/%s",
 					cur_ptr);
-				if (!ke::file::CreateDirectory(build))
+				if (!g_LibSys.CreateFolder(build))
+				{
 					break;
+				}
 				cur_ptr = next_ptr;
 			} while (cur_ptr);
 		}
@@ -379,13 +233,13 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)

 	if (cfg->folder.size())
 	{
-		ke::path::Format(local,
-			sizeof(local),
+		g_LibSys.PathFormat(local, 
+			sizeof(local), 
 			"%s/%s.cfg",
 			cfg->folder.c_str(),
 			cfg->autocfg.c_str());
 	} else {
-		ke::path::Format(local,
+		g_LibSys.PathFormat(local,
 			sizeof(local),
 			"%s.cfg",
 			cfg->autocfg.c_str());
@@ -393,7 +247,7 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 	
 	g_SourceMod.BuildPath(Path_Game, file, sizeof(file), "cfg/%s", local);

-	bool file_exists = ke::file::IsFile(file);
+	bool file_exists = g_LibSys.IsPathFile(file);
 	if (!file_exists && will_create)
 	{
 		List<const ConVar *> *convars = NULL;
@@ -403,7 +257,7 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 			FILE *fp = fopen(file, "wt");
 			if (fp)
 			{
-				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SOURCEMOD_VERSION);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SVN_FULL_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");

@@ -412,11 +266,8 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 				for (iter = convars->begin(); iter != convars->end(); iter++)
 				{
 					const ConVar *cvar = (*iter);
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-					if (cvar->IsFlagSet(FCVAR_DONTRECORD))
-#else
-					if (cvar->IsBitSet(FCVAR_DONTRECORD))
-#endif
+
+					if ((cvar->GetFlags() & FCVAR_DONTRECORD) == FCVAR_DONTRECORD)
 					{
 						continue;
 					}
@@ -425,7 +276,7 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 					char *dptr = descr;

 					/* Print comments until there is no more */
-					ke::SafeStrcpy(descr, sizeof(descr), cvar->GetHelpText());
+					strncopy(descr, cvar->GetHelpText(), sizeof(descr));
 					while (*dptr != '\0')
 					{
 						/* Find the next line */
@@ -463,18 +314,13 @@ bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 				can_create = false;
 				fclose(fp);
 			}
-			else
-			{
-				logger->LogError("Failed to auto generate config for %s, make sure the directory has write permission.", pl->GetFilename());
-				return can_create;
-			}
 		}
 	}

 	if (file_exists)
 	{
 		char cmd[255];
-		ke::SafeSprintf(cmd, sizeof(cmd), "exec %s\n", local);
+		UTIL_Format(cmd, sizeof(cmd), "exec %s\n", local);
 		engine->ServerCommand(cmd);
 	}

@@ -498,10 +344,10 @@ void SM_DoSingleExecFwds(IPluginContext *ctx)

 void SM_ConfigsExecuted_Plugin(unsigned int serial)
 {
-	IPluginIterator *iter = scripts->GetPluginIterator();
+	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
 	while (iter->MorePlugins())
 	{
-		IPlugin *plugin = iter->GetPlugin();
+		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
 		if (plugin->GetSerial() == serial)
 		{
 			SM_DoSingleExecFwds(plugin->GetBaseContext());
@@ -514,7 +360,7 @@ void SM_ConfigsExecuted_Plugin(unsigned int serial)

 void SM_ExecuteForPlugin(IPluginContext *ctx)
 {
-	SMPlugin *plugin = scripts->FindPluginByContext(ctx->GetContext());
+	CPlugin *plugin = (CPlugin *)g_PluginSys.GetPluginByCtx(ctx->GetContext());

 	unsigned int num = plugin->GetConfigCount();
 	if (!num)
@@ -529,34 +375,35 @@ void SM_ExecuteForPlugin(IPluginContext *ctx)
 			can_create = SM_ExecuteConfig(plugin, plugin->GetConfig(i), can_create);
 		}
 		char cmd[255];
-		ke::SafeSprintf(cmd, sizeof(cmd), "sm_internal 2 %d\n", plugin->GetSerial());
+		UTIL_Format(cmd, sizeof(cmd), "sm internal 2 %d\n", plugin->GetSerial());
 		engine->ServerCommand(cmd);
 	}
 }

 void SM_ExecuteAllConfigs()
 {
-	if (g_bGotServerStart)
+	if (g_bConfigsExecd)
 	{
 		return;
 	}

 	engine->ServerCommand("exec sourcemod/sourcemod.cfg\n");

-	AutoPluginList plugins(scripts);
-	for (size_t i = 0; i < plugins->size(); i++)
+	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
+	while (iter->MorePlugins())
 	{
-		SMPlugin *plugin = plugins->at(i);
+		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
 		unsigned int num = plugin->GetConfigCount();
 		bool can_create = true;
 		for (unsigned int i=0; i<num; i++)
 		{
 			can_create = SM_ExecuteConfig(plugin, plugin->GetConfig(i), can_create);
 		}
+		iter->NextPlugin();
 	}
+	iter->Release();

-	g_bGotServerStart = true;
-	CheckAndFinalizeConfigs();
+	engine->ServerCommand("sm internal 1\n");
 }

 void SM_ConfigsExecuted_Global()
@@ -571,29 +418,3 @@ void SM_ConfigsExecuted_Global()
 	g_pOnServerCfg->Execute(NULL);
 	g_pOnConfigsExecuted->Execute(NULL);
 }
-
-void SM_InternalCmdTrigger()
-{
-	/* Order is important here.  We need to buffer things before we send the command out. */
-	g_pOnAutoConfigsBuffered->Execute(NULL);
-	engine->ServerCommand("sm_internal 1\n");
-    g_PendingInternalPush = false;
-}
-
-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)));
-	}
-}
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -35,8 +35,6 @@
 #include "sm_globals.h"
 #include <ITextParsers.h>
 #include <IRootConsoleMenu.h>
-#include <am-string.h>
-#include <sm_stringhashmap.h>

 using namespace SourceMod;

@@ -45,9 +43,6 @@ class CoreConfig :
 	public ITextListener_SMC,
 	public IRootConsoleCommand
 {
-public:
-	CoreConfig();
-	~CoreConfig();
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
@@ -55,20 +50,17 @@ 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 ICommandArgs *command) override;
+	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
 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<std::string> m_KeyValues;
 };

 extern bool SM_AreConfigsExecuted();
@@ -76,7 +68,6 @@ extern void SM_ExecuteAllConfigs();
 extern void SM_ExecuteForPlugin(IPluginContext *ctx);
 extern void SM_ConfigsExecuted_Global();
 extern void SM_ConfigsExecuted_Plugin(unsigned int serial);
-extern void SM_InternalCmdTrigger();

 extern CoreConfig g_CoreConfig;

@@ -0,0 +1,201 @@
+/**
+ * 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 "sm_globals.h"
+#include "sourcemm_api.h"
+#include "Tlhelp32.h"
+#include "LibrarySys.h"
+#include "minidump.h"
+#include "sm_stringutil.h"
+
+bool HookImportAddrTable(BYTE *base, const char *func, DWORD hookfunc, char *err, size_t maxlength)
+{
+	IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *)base;
+	if (dos->e_magic != IMAGE_DOS_SIGNATURE)
+	{
+		UTIL_Format(err, maxlength, "%s", "Could not detect valid DOS signature");
+		return false;
+	}
+
+	IMAGE_NT_HEADERS *nt = (IMAGE_NT_HEADERS *)(base + dos->e_lfanew);
+	if (nt->Signature != IMAGE_NT_SIGNATURE)
+	{
+		UTIL_Format(err, maxlength, "%s", "Could not detect valid NT signature");
+		return false;
+	}
+
+	IMAGE_IMPORT_DESCRIPTOR *desc = 
+		(IMAGE_IMPORT_DESCRIPTOR *)
+		(base + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].VirtualAddress);
+	if (base == (BYTE *)desc)
+	{
+		UTIL_Format(err, maxlength, "%s", "Could not find IAT");
+		return false;
+	}
+
+	bool entryFound = false;
+	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, func) == 0)
+					{
+						DWORD oldprot, oldprot2;
+						VirtualProtect(iat, 4, PAGE_READWRITE, &oldprot);
+						*iat = hookfunc;
+						VirtualProtect(iat, 4, oldprot, &oldprot2);
+						entryFound = true;
+					}
+				}
+				data++;
+				iat++;
+			}
+		}
+		desc++;
+	}
+
+	if (!entryFound)
+	{
+		UTIL_Format(err, maxlength, "Could not find IAT entry for %s", func);
+		return false;
+	}
+
+	return true;
+}
+
+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);
+}
+
+HMODULE WINAPI LoadLibraryEx2(LPCTSTR lpFileName, HANDLE hFile, DWORD dwFlags)
+{
+	HMODULE lib = LoadLibraryEx(lpFileName, hFile, dwFlags);
+
+	/* Steam.dll seems to get loaded using an abs path, thus the use of stristr() */
+	if (stristr(lpFileName, "steam.dll"))
+	{
+		char err[64];
+		if (!HookImportAddrTable((BYTE *)lib, "GetProcAddress", (DWORD)GetProcAddress2, err, sizeof(err)))
+		{
+			Error("[SM] %s in steam.dll\n", err);
+			return NULL;
+		}
+	}
+
+	return lib;
+}
+
+class CrazyWindowsDebugger : public SMGlobalClass
+{
+public:
+	void OnSourceModAllInitialized()
+	{
+		HANDLE hModuleList = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
+		MODULEENTRY32 me32;
+		BYTE *engine = NULL;
+		BYTE *steam = NULL;
+		char err[64];
+
+		me32.dwSize = sizeof(MODULEENTRY32);
+
+		if (!Module32First(hModuleList, &me32))
+		{
+			Error("Could not initialize crazy debugger!");
+		}
+
+		do
+		{
+			if (strcasecmp(me32.szModule, "engine.dll") == 0)
+			{
+				engine = me32.modBaseAddr;
+			}
+			else if (strcasecmp(me32.szModule, "steam.dll") == 0)
+			{
+				/* Steam.dll is loaded by engine.dll, so we can exit the loop here */
+				steam = me32.modBaseAddr;
+				break;
+			}
+		} while  (Module32Next(hModuleList, &me32));
+
+		CloseHandle(hModuleList);
+
+		/* This really should not happen, but ... */
+		if (!engine)
+		{
+			Error("[SM] Could not find engine.dll\n");
+		}
+
+		/* Steam.dll isn't loaded yet */
+		if (!steam)
+		{
+			if (!HookImportAddrTable(engine, "LoadLibraryExA", (DWORD)LoadLibraryEx2, err, sizeof(err)))
+			{
+				Error("[SM] %s in engine.dll)\n", err);
+			}
+		}
+		else
+		{
+			if (!HookImportAddrTable(steam, "GetProcAddress", (DWORD)GetProcAddress2, err, sizeof(err)))
+			{
+				Error("[SM] %s in steam.dll)\n", err);
+			}
+		}
+	}
+} s_CrazyDebugger;
@@ -0,0 +1,719 @@
+/**
+ * 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 "Database.h"
+#include "HandleSys.h"
+#include "ShareSys.h"
+#include "sourcemod.h"
+#include "sm_stringutil.h"
+#include "Logger.h"
+#include "ExtensionSys.h"
+#include <stdlib.h>
+#include "ThreadSupport.h"
+
+#define DBPARSE_LEVEL_NONE		0
+#define DBPARSE_LEVEL_MAIN		1
+#define DBPARSE_LEVEL_DATABASE	2
+
+DBManager g_DBMan;
+static bool s_OneTimeThreaderErrorMsg = false;
+
+DBManager::DBManager() 
+: m_StrTab(512), m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
+{
+}
+
+void DBManager::OnSourceModAllInitialized()
+{
+	HandleAccess sec;
+
+	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_PluginSys.AddPluginsListener(this);
+}
+
+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();
+}
+
+void DBManager::OnSourceModShutdown()
+{
+	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);
+}
+
+unsigned int DBManager::GetInterfaceVersion()
+{
+	return SMINTERFACE_DBI_VERSION;
+}
+
+const char *DBManager::GetInterfaceName()
+{
+	return SMINTERFACE_DBI_NAME;
+}
+
+void DBManager::OnHandleDestroy(HandleType_t type, void *object)
+{
+	if (type == m_DriverType)
+	{
+		/* Ignore */
+		return;
+	}
+
+	if (g_HandleSys.TypeCheck(type, m_DatabaseType))
+	{
+		IDatabase *pdb = (IDatabase *)object;
+		pdb->Close();
+	}
+}
+
+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);
+
+	if (!pInfo)
+	{
+		if (pdr)
+		{
+			*pdr = NULL;
+		}
+		*pdb = NULL;
+		UTIL_Format(error, maxlength, "Configuration \"%s\" not found", name);
+		return false;
+	}
+
+	const char *dname = pInfo->info.driver;
+	if (!pInfo->realDriver)
+	{
+		/* Try to assign a real driver pointer */
+		if (pInfo->info.driver[0] == '\0')
+		{
+			if (!m_pDefault && m_DefDriver.size() > 0)
+			{
+				m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
+			}
+			dname = m_DefDriver.size() ? m_DefDriver.c_str() : "default";
+			pInfo->realDriver = m_pDefault;
+		} else {
+			pInfo->realDriver = FindOrLoadDriver(pInfo->info.driver);
+		}
+	}
+
+	if (pInfo->realDriver)
+	{
+		if (pdr)
+		{
+			*pdr = pInfo->realDriver;
+		}
+		*pdb = pInfo->realDriver->Connect(&pInfo->info, persistent, error, maxlength);
+		return (*pdb != NULL);
+	}
+
+	if (pdr)
+	{
+		*pdr = NULL;
+	}
+	*pdb = NULL;
+
+	UTIL_Format(error, maxlength, "Driver \"%s\" not found", dname);
+
+	return false;
+}
+
+void DBManager::AddDriver(IDBDriver *pDriver)
+{
+	 /* Let's kill the worker.  Join the thread and let the queries flush.
+	  * This is kind of stupid but we just want to unload safely.
+	  * Rather than recreate the worker, we'll wait until someone throws 
+	  * another query through.
+	  */
+	KillWorkerThread();
+
+	 m_drivers.push_back(pDriver);
+}
+
+void DBManager::RemoveDriver(IDBDriver *pDriver)
+{
+	/* Again, we're forced to kill the worker.  How rude!
+	 * Doing this flushes the queue, and thus we don't need to 
+	 * clean anything else.  
+	 */
+	KillWorkerThread();
+
+	for (size_t i=0; i<m_drivers.size(); i++)
+	{
+		if (m_drivers[i] == pDriver)
+		{
+			m_drivers.erase(m_drivers.iterAt(i));
+			break;
+		}
+	}
+
+	/* Make sure NOTHING references this! */
+	List<ConfDbInfo>::iterator iter;
+	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
+	{
+		ConfDbInfo &db = (*iter);
+		if (db.realDriver == pDriver)
+		{
+			db.realDriver = NULL;
+		}
+	}
+
+	/* Now that the driver is gone, we have to test the think queue.
+	 * Whatever happens therein is up to the db op!
+	 */
+	Queue<IDBThreadOperation *>::iterator qiter = m_ThinkQueue.begin();
+	Queue<IDBThreadOperation *> templist;
+	while (qiter != m_ThinkQueue.end())
+	{
+		IDBThreadOperation *op = (*qiter);
+		if (op->GetDriver() == pDriver)
+		{
+			templist.push(op);
+			qiter = m_ThinkQueue.erase(qiter);
+		} else {
+			qiter++;
+		}
+	}
+
+	for (qiter = templist.begin();
+		 qiter != templist.end();
+		 qiter++)
+	{
+		IDBThreadOperation *op = (*qiter);
+		op->CancelThinkPart();
+		op->Destroy();
+	}
+}
+
+IDBDriver *DBManager::GetDefaultDriver()
+{
+	if (!m_pDefault && m_DefDriver.size() > 0)
+	{
+		m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
+	}
+
+	return m_pDefault;
+}
+
+Handle_t DBManager::CreateHandle(DBHandleType dtype, void *ptr, IdentityToken_t *pToken)
+{
+	HandleType_t type = 0;
+
+	if (dtype == DBHandle_Driver)
+	{
+		type = m_DriverType;
+	} else if (dtype == DBHandle_Database) {
+		type = m_DatabaseType;
+	} else {
+		return BAD_HANDLE;
+	}
+
+	return g_HandleSys.CreateHandle(type, ptr, pToken, g_pCoreIdent, NULL);
+}
+
+HandleError DBManager::ReadHandle(Handle_t hndl, DBHandleType dtype, void **ptr)
+{
+	HandleType_t type = 0;
+
+	if (dtype == DBHandle_Driver)
+	{
+		type = m_DriverType;
+	} else if (dtype == DBHandle_Database) {
+		type = m_DatabaseType;
+	} else {
+		return HandleError_Type;
+	}
+
+	HandleSecurity sec(NULL, g_pCoreIdent);
+
+	return g_HandleSys.ReadHandle(hndl, type, &sec, ptr);
+}
+
+HandleError DBManager::ReleaseHandle(Handle_t hndl, DBHandleType type, IdentityToken_t *token)
+{
+	HandleSecurity sec(token, g_pCoreIdent);
+	return g_HandleSys.FreeHandle(hndl, &sec);
+}
+
+unsigned int DBManager::GetDriverCount()
+{
+	return (unsigned int)m_drivers.size();
+}
+
+IDBDriver *DBManager::GetDriver(unsigned int index)
+{
+	if (index >= m_drivers.size())
+	{
+		return NULL;
+	}
+
+	return m_drivers[index];
+}
+
+const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
+{
+	ConfDbInfo *info = GetDatabaseConf(name);
+	if (!info)
+	{
+		return NULL;
+	}
+
+	return &info->info;
+}
+
+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;
+}
+
+IDBDriver *DBManager::FindOrLoadDriver(const char *name)
+{
+	size_t last_size = m_drivers.size();
+	for (size_t i=0; i<last_size; i++)
+	{
+		if (strcmp(m_drivers[i]->GetIdentifier(), name) == 0)
+		{
+			return m_drivers[i];
+		}
+	}
+
+	char filename[PLATFORM_MAX_PATH];
+	UTIL_Format(filename, sizeof(filename), "dbi.%s.ext", name);
+
+	IExtension *pExt = g_Extensions.LoadAutoExtension(filename);
+	if (!pExt || !pExt->IsLoaded() || m_drivers.size() <= last_size)
+	{
+		return NULL;
+	}
+
+	/* last_size is now gauranteed to be a valid index.
+	 * The identifier must match the name.
+	 */
+	if (strcmp(m_drivers[last_size]->GetIdentifier(), name) == 0)
+	{
+		return m_drivers[last_size];
+	}
+
+	return NULL;
+}
+
+void DBManager::KillWorkerThread()
+{
+	if (m_pWorker)
+	{
+		m_pWorker->Stop(false);
+		g_pThreader->DestroyWorker(m_pWorker);
+		m_pWorker = NULL;
+		s_OneTimeThreaderErrorMsg = false;
+	}
+}
+
+static IdentityToken_t *s_pAddBlock = NULL;
+
+bool DBManager::AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio)
+{
+	if (s_pAddBlock && op->GetOwner() == s_pAddBlock)
+	{
+		return false;
+	}
+
+	if (!m_pWorker)
+	{
+		m_pWorker = g_pThreader->MakeWorker(this, true);
+		if (!m_pWorker)
+		{
+			if (!s_OneTimeThreaderErrorMsg)
+			{
+				g_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;
+			return false;
+		}
+	}
+
+	/* Add to the queue */
+	{
+		m_pQueueLock->Lock();
+		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetQueue(prio);
+		queue.push(op);
+		m_pQueueLock->Unlock();
+	}
+
+	/* Make the thread */
+	m_pWorker->MakeThread(this);
+
+	return true;
+}
+
+void DBManager::OnWorkerStart(IThreadWorker *pWorker)
+{
+	m_drSafety.clear();
+	for (size_t i=0; i<m_drivers.size(); i++)
+	{
+		if (m_drivers[i]->IsThreadSafe())
+		{
+			m_drSafety.push_back(m_drivers[i]->InitializeThreadSafety());
+		} else {
+			m_drSafety.push_back(false);
+		}
+	}
+}
+
+void DBManager::OnWorkerStop(IThreadWorker *pWorker)
+{
+	for (size_t i=0; i<m_drivers.size(); i++)
+	{
+		if (m_drSafety[i])
+		{
+			m_drivers[i]->ShutdownThreadSafety();
+		}
+	}
+	m_drSafety.clear();
+}
+
+void DBManager::RunThread(IThreadHandle *pThread)
+{
+	IDBThreadOperation *op = NULL;
+
+	/* Get something from the queue */
+	{
+		m_pQueueLock->Lock();
+		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
+		if (!queue.empty())
+		{
+			op = queue.first();
+			queue.pop();
+		}
+		m_pQueueLock->Unlock();
+	}
+
+	/* whoa.  hi.  did we get something? we should have. */
+	if (!op)
+	{
+		/* wtf? */
+		return;
+	}
+
+	op->RunThreadPart();
+
+	m_pThinkLock->Lock();
+	m_ThinkQueue.push(op);
+	m_pThinkLock->Unlock();
+}
+
+void DBManager::RunFrame()
+{
+	/* Don't bother if we're empty */
+	if (!m_ThinkQueue.size())
+	{
+		return;
+	}
+
+	/* Dump one thing per-frame so the server stays sane. */
+	m_pThinkLock->Lock();
+	IDBThreadOperation *op = m_ThinkQueue.first();
+	m_ThinkQueue.pop();
+	m_pThinkLock->Unlock();
+	op->RunThinkPart();
+	op->Destroy();
+}
+
+void DBManager::OnTerminate(IThreadHandle *pThread, bool cancel)
+{
+	/* Do nothing */
+}
+
+void DBManager::OnSourceModIdentityDropped(IdentityToken_t *pToken)
+{
+	s_pAddBlock = pToken;
+
+	/* Kill the thread so we can flush everything into the think queue... */
+	KillWorkerThread();
+
+	/* Run all of the think operations.
+ 	 * Unlike the driver unloading example, we'll let these calls go through, 
+	 * since a plugin unloading is far more normal.
+	 */
+	Queue<IDBThreadOperation *>::iterator iter = m_ThinkQueue.begin();
+	Queue<IDBThreadOperation *> templist;
+	while (iter != m_ThinkQueue.end())
+	{
+		IDBThreadOperation *op = (*iter);
+		if (op->GetOwner() == pToken)
+		{
+			templist.push(op);
+			iter = m_ThinkQueue.erase(iter);
+		} else {
+			iter++;
+		}
+	}
+
+	for (iter = templist.begin();
+		iter != templist.end();
+		iter++)
+	{
+		IDBThreadOperation *op = (*iter);
+		op->RunThinkPart();
+		op->Destroy();
+	}
+
+	s_pAddBlock = NULL;
+}
+
+void DBManager::OnPluginUnloaded(IPlugin *plugin)
+{
+	/* Kill the thread so we can flush everything into the think queue... */
+	KillWorkerThread();
+
+	/* Mark the plugin as being unloaded so future database calls will ignore threading... */
+	plugin->SetProperty("DisallowDBThreads", NULL);
+
+	/* Run all of the think operations.
+	 * Unlike the driver unloading example, we'll let these calls go through, 
+	 * since a plugin unloading is far more normal.
+	 */
+	Queue<IDBThreadOperation *>::iterator iter = m_ThinkQueue.begin();
+	Queue<IDBThreadOperation *> templist;
+	while (iter != m_ThinkQueue.end())
+	{
+		IDBThreadOperation *op = (*iter);
+		if (op->GetOwner() == plugin->GetIdentity())
+		{
+			templist.push(op);
+			iter = m_ThinkQueue.erase(iter);
+		} else {
+			iter++;
+		}
+	}
+
+	for (iter = templist.begin();
+		 iter != templist.end();
+		 iter++)
+	{
+		IDBThreadOperation *op = (*iter);
+		op->RunThinkPart();
+		op->Destroy();
+	}
+}
+
+void DBManager::LockConfig()
+{
+	m_pConfigLock->Lock();
+}
+
+void DBManager::UnlockConfig()
+{
+	m_pConfigLock->Unlock();
+}
+
+const char *DBManager::GetDefaultDriverName()
+{
+	return m_DefDriver.c_str();
+}
@@ -0,0 +1,149 @@
+/**
+ * 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_DATABASE_MANAGER_H_
+#define _INCLUDE_DATABASE_MANAGER_H_
+
+#include <IDBDriver.h>
+#include "sm_globals.h"
+#include <sh_vector.h>
+#include <sh_string.h>
+#include <sh_list.h>
+#include <ITextParsers.h>
+#include "sm_memtable.h"
+#include <IThreader.h>
+#include "sm_simple_prioqueue.h"
+#include "PluginSys.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:
+	DBManager();
+public:
+	const char *GetInterfaceName();
+	unsigned int GetInterfaceVersion();
+public: //SMGlobalClass
+	void OnSourceModAllInitialized();
+	void OnSourceModLevelChange(const char *mapName);
+	void OnSourceModIdentityDropped(IdentityToken_t *pToken);
+	void OnSourceModShutdown();
+public: //IHandleTypeDispatch
+	void OnHandleDestroy(HandleType_t type, void *object);
+public: //IDBManager
+	void AddDriver(IDBDriver *pDrivera);
+	void RemoveDriver(IDBDriver *pDriver);
+	const DatabaseInfo *FindDatabaseConf(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);
+public: //IPluginsListener
+	void OnPluginUnloaded(IPlugin *plugin);
+public:
+	ConfDbInfo *GetDatabaseConf(const char *name);
+	IDBDriver *FindOrLoadDriver(const char *name);
+	IDBDriver *GetDefaultDriver();
+	const char *GetDefaultDriverName();
+	bool AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio);
+	void LockConfig();
+	void UnlockConfig();
+	void RunFrame();
+	inline HandleType_t GetDatabaseType()
+	{
+		return m_DatabaseType;
+	}
+private:
+	void KillWorkerThread();
+private:
+	CVector<IDBDriver *> m_drivers;
+
+	/* Threading stuff */
+	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 */
+
+	List<ConfDbInfo> m_confs;
+	HandleType_t m_DriverType;
+	HandleType_t m_DatabaseType;
+	String m_DefDriver;
+	BaseStringTable m_StrTab;
+	char m_Filename[PLATFORM_MAX_PATH];
+	unsigned int m_ParseLevel;
+	unsigned int m_ParseState;
+	IDBDriver *m_pDefault;
+};
+
+extern DBManager g_DBMan;
+
+#endif //_INCLUDE_DATABASE_MANAGER_H_
@@ -0,0 +1,189 @@
+/**
+ * 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 "DebugReporter.h"
+#include "Logger.h"
+#include "PluginSys.h"
+#include "sm_stringutil.h"
+
+DebugReport g_DbgReporter;
+
+/* I'm really lazy.  This should probably be exported to ISourcePawnEngine someday,
+ * but we need to make sure the JIT will deal with the version bump.
+ */
+extern const char *GetSourcePawnErrorMessage(int error);
+
+void DebugReport::OnSourceModAllInitialized()
+{
+	g_pSourcePawn->SetDebugListener(this);
+}
+
+void DebugReport::GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...)
+{
+	va_list ap;
+	char buffer[512];
+
+	va_start(ap, message);
+	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
+	va_end(ap);
+
+	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
+	const char *error = GetSourcePawnErrorMessage(err);
+
+	if (error)
+	{
+		g_Logger.LogError("[SM] Plugin \"%s\" encountered error %d: %s", plname, err, error);
+	} else {
+		g_Logger.LogError("[SM] Plugin \"%s\" encountered unknown error %d", plname, err);
+	}
+
+	g_Logger.LogError("[SM] %s", buffer);
+
+	if (func_idx != -1)
+	{
+		if (func_idx & 1)
+		{
+			func_idx >>= 1;
+			sp_public_t *function;
+			if (ctx->GetPublicByIndex(func_idx, &function) == SP_ERROR_NONE)
+			{
+				g_Logger.LogError("[SM] Unable to call function \"%s\" due to above error(s).", function->name);
+			}
+		}
+	}
+}
+
+void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t code_addr, int err, const char *message, ...)
+{
+	va_list ap;
+	char buffer[512];
+
+	va_start(ap, message);
+	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
+	va_end(ap);
+
+	const char *plname = g_PluginSys.FindPluginByContext(pContext->GetContext())->GetFilename();
+	const char *error = GetSourcePawnErrorMessage(err);
+
+	if (error)
+	{
+		g_Logger.LogError("[SM] Plugin \"%s\" encountered error %d: %s", plname, err, error);
+	} else {
+		g_Logger.LogError("[SM] Plugin \"%s\" encountered unknown error %d", plname, err);
+	}
+
+	g_Logger.LogError("[SM] %s", buffer);
+
+	IPluginDebugInfo *pDebug;
+	if ((pDebug = pContext->GetDebugInfo()) == NULL)
+	{
+		g_Logger.LogError("[SM] Debug mode is not enabled for \"%s\"", plname);
+		g_Logger.LogError("[SM] To enable debug mode, edit plugin_settings.cfg, or type: sm plugins debug %d on",
+			_GetPluginIndex(pContext));
+		return;
+	}
+
+	const char *name;
+	if (pDebug->LookupFunction(code_addr, &name) == SP_ERROR_NONE)
+	{
+		g_Logger.LogError("[SM] Unable to call function \"%s\" due to above error(s).", name);
+	} else {
+		g_Logger.LogError("[SM] Unable to call function (name unknown, address \"%x\").", code_addr);
+	}
+}
+
+void DebugReport::OnContextExecuteError(IPluginContext *ctx, IContextTrace *error)
+{
+	const char *lastname;
+	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
+	int n_err = error->GetErrorCode();
+
+	if (n_err != SP_ERROR_NATIVE)
+	{
+		g_Logger.LogError("[SM] Plugin encountered error %d: %s",
+			n_err,
+			error->GetErrorString());
+	}
+
+	if ((lastname=error->GetLastNative(NULL)) != NULL)
+	{
+		const char *custerr;
+		if ((custerr=error->GetCustomErrorString()) != NULL)
+		{
+			g_Logger.LogError("[SM] Native \"%s\" reported: %s", lastname, custerr);
+		} else {
+			g_Logger.LogError("[SM] Native \"%s\" encountered a generic error.", lastname);
+		}
+	}
+
+	if (!error->DebugInfoAvailable())
+	{
+		g_Logger.LogError("[SM] Debug mode is not enabled for \"%s\"", plname);
+		g_Logger.LogError("[SM] To enable debug mode, edit plugin_settings.cfg, or type: sm plugins debug %d on",
+			_GetPluginIndex(ctx));
+		return;
+	}
+
+	CallStackInfo stk_info;
+	int i = 0;
+	g_Logger.LogError("[SM] Displaying call stack trace for plugin \"%s\":", plname);
+	while (error->GetTraceInfo(&stk_info))
+	{
+		g_Logger.LogError("[SM]   [%d]  Line %d, %s::%s()",
+			i++,
+			stk_info.line,
+			stk_info.filename,
+			stk_info.function);
+	}
+}
+
+int DebugReport::_GetPluginIndex(IPluginContext *ctx)
+{
+	int id = 1;
+	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
+
+	for (; iter->MorePlugins(); iter->NextPlugin(), id++)
+	{
+		IPlugin *pl = iter->GetPlugin();
+		if (pl->GetBaseContext() == ctx)
+		{
+			iter->Release();
+			return id;
+		}
+	}
+
+	iter->Release();
+
+	/* If we don't know which plugin this is, it's one being loaded.  Fake its index for now. */
+
+	return g_PluginSys.GetPluginCount() + 1;
+}
+
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -33,9 +33,7 @@
 #define _INCLUDE_SOURCEMOD_CDBGREPORTER_H_

 #include "sp_vm_api.h"
-#include "common_logic.h"
-#include <am-vector.h>
-#include <am-string.h>
+#include "sm_globals.h"

 class DebugReport : 
 	public SMGlobalClass, 
@@ -44,15 +42,9 @@ class DebugReport :
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 public: // IDebugListener
-	void ReportError(const IErrorReport &report, IFrameIterator &iter);
-	void OnDebugSpew(const char *msg, ...);
-public:
-	// If err is -1, caller assumes the automatic reporting by SourcePawn is
-	// good enough, and only wants the supplemental logging provided here.
+	void OnContextExecuteError(IPluginContext *ctx, IContextTrace *error);
 	void GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...);
-	void GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap); 
 	void GenerateCodeError(IPluginContext *ctx, uint32_t code_addr, int err, const char *message, ...);
-	std::vector<std::string> GetStackTrace(IFrameIterator *iter);
 private:
 	int _GetPluginIndex(IPluginContext *ctx);
 };
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -30,11 +30,10 @@
 */

 #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;

@@ -43,26 +42,16 @@ SH_DECL_HOOK2(IGameEventManager2, FireEvent, SH_NOATTRIB, 0, bool, IGameEvent *,
 const ParamType GAMEEVENT_PARAMS[] = {Param_Cell, Param_String, Param_Cell};
 typedef List<EventHook *> EventHookList;

-class EventForwardFilter : public IForwardFilter
-{
-	EventInfo *pEventInfo;
-public:
-	EventForwardFilter(EventInfo *pEventInfo) : pEventInfo(pEventInfo)
-	{
-	}
-
-	void Preprocess(IPluginFunction *fun, FwdParamInfo *params)
-	{
-		params[2].val = pEventInfo->bDontBroadcast ? 1 : 0;
-	}
-};
-
 EventManager::EventManager() : m_EventType(0)
 {
+	/* Create an event lookup trie */
+	m_EventHooks = sm_trie_create();
 }

 EventManager::~EventManager()
 {
+	sm_trie_destroy(m_EventHooks);
+
 	/* Free memory used by EventInfo structs if any */
 	CStack<EventInfo *>::iterator iter;
 	for (iter = m_FreeEvents.begin(); iter != m_FreeEvents.end(); iter++)
@@ -76,8 +65,8 @@ EventManager::~EventManager()
 void EventManager::OnSourceModAllInitialized()
 {
 	/* Add a hook for IGameEventManager2::FireEvent() */
-	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
-	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
+	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
+	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);

 	HandleAccess sec;

@@ -87,17 +76,17 @@ void EventManager::OnSourceModAllInitialized()
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;

 	/* Create the 'GameEvent' handle type */
-	m_EventType = handlesys->CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_EventType = g_HandleSys.CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }

 void EventManager::OnSourceModShutdown()
 {
 	/* Remove hook for IGameEventManager2::FireEvent() */
-	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
-	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
+	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
+	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);

 	/* Remove the 'GameEvent' handle type */
-	handlesys->RemoveType(m_EventType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_EventType, g_pCoreIdent);

 	/* Remove ourselves as listener for events */
 	gameevents->RemoveListener(this);
@@ -135,12 +124,12 @@ void EventManager::OnPluginUnloaded(IPlugin *plugin)
 			{
 				if (pHook->pPreHook)
 				{
-					forwardsys->ReleaseForward(pHook->pPreHook);
+					g_Forwards.ReleaseForward(pHook->pPreHook);
 				}

 				if (pHook->pPostHook)
 				{
-					forwardsys->ReleaseForward(pHook->pPostHook);
+					g_Forwards.ReleaseForward(pHook->pPostHook);
 				}

 				delete pHook;
@@ -158,13 +147,6 @@ void EventManager::FireGameEvent(IGameEvent *pEvent)
 	   Just need to add ourselves as a listener to make our hook on IGameEventManager2::FireEvent work */
 }

-#if SOURCE_ENGINE >= SE_LEFT4DEAD
-int EventManager::GetEventDebugID()
-{
-	return EVENT_DEBUG_ID_INIT;
-}
-#endif
-
 EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunction, EventHookMode mode)
 {
 	EventHook *pHook;
@@ -181,10 +163,10 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 	}

 	/* If a hook structure does not exist... */
-	if (!m_EventHooks.retrieve(name, &pHook))
+	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
 	{
 		EventHookList *pHookList;
-		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());

 		/* Check plugin for an existing EventHook list */
 		if (!plugin->GetProperty("EventHooks", (void **)&pHookList))
@@ -199,27 +181,24 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		if (mode == EventHookMode_Pre)
 		{
 			/* Create forward for a pre hook */
-			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
 			/* Add to forward list */
 			pHook->pPreHook->AddFunction(pFunction);
 		} else {
 			/* Create forward for a post hook */
-			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 			/* Should we copy data from a pre hook to the post hook? */
 			pHook->postCopy = (mode == EventHookMode_Post);
 			/* Add to forward list */
 			pHook->pPostHook->AddFunction(pFunction);
 		}

-		/* Cache the name for post hooks */
-		pHook->name = name;
-
 		/* Increase reference count */
 		pHook->refCount++;

 		/* Add hook structure to hook lists */
 		pHookList->push_back(pHook);
-		m_EventHooks.insert(name, pHook);
+		sm_trie_insert(m_EventHooks, name, pHook);

 		return EventHookErr_Okay;
 	}
@@ -231,7 +210,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create pre hook forward if necessary */
 		if (!pHook->pPreHook)
 		{
-			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
 		}

 		/* Add plugin function to forward list */
@@ -240,7 +219,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create post hook forward if necessary */
 		if (!pHook->pPostHook)
 		{
-			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 		}

 		/* If postCopy is false, then we may want to set it to true */
@@ -265,7 +244,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	IChangeableForward **pEventForward;

 	/* If hook does not exist at all */
-	if (!m_EventHooks.retrieve(name, &pHook))
+	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
 	{
 		return EventHookErr_NotActive;
 	}
@@ -287,7 +266,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	/* If forward's list contains 0 functions now, free it */
 	if ((*pEventForward)->GetFunctionCount() == 0)
 	{
-		forwardsys->ReleaseForward(*pEventForward);
+		g_Forwards.ReleaseForward(*pEventForward);
 		*pEventForward = NULL;
 	}

@@ -297,7 +276,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		/* If reference count is now 0, free hook structure */

 		EventHookList *pHookList;
-		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());

 		/* Get plugin's event hook list */
 		if (!plugin->GetProperty("EventHooks", (void**)&pHookList))
@@ -315,7 +294,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		pHookList->remove(pHook);

 		/* Delete entry in trie */
-		m_EventHooks.remove(name);
+		sm_trie_delete(m_EventHooks, name);

 		/* And finally free structure memory */
 		delete pHook;
@@ -342,7 +321,6 @@ EventInfo *EventManager::CreateEvent(IPluginContext *pContext, const char *name,

 		pInfo->pEvent = pEvent;
 		pInfo->pOwner = pContext->GetIdentity();
-		pInfo->bDontBroadcast = false;

 		return pInfo;
 	}
@@ -362,13 +340,6 @@ 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 */
@@ -388,64 +359,41 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 	IChangeableForward *pForward;
 	const char *name;
 	cell_t res = Pl_Continue;
-	bool broadcast = bDontBroadcast;
-
-	/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
-	if (!pEvent)
-	{
-		RETURN_META_VALUE(MRES_IGNORED, false);
-	}
-
-	name = pEvent->GetName();
 	
-	if (m_EventHooks.retrieve(name, &pHook))
-	{
-		/* Push the event onto the event stack.  The reference count is increased to make sure 
-		 * the structure is not garbage collected in between now and the post hook.
-		 */
-		pHook->refCount++;
-		m_EventStack.push(pHook);
+	/* Get the event name, we're going to need this for passing to post hooks */
+	name = pEvent->GetName();

+	m_EventNames.push(name);
+
+	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
+	{
 		pForward = pHook->pPreHook;

 		if (pForward)
 		{
-			EventInfo info(pEvent, NULL);
-			HandleSecurity sec(NULL, g_pCoreIdent);
-			Handle_t hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
-
-			info.bDontBroadcast = bDontBroadcast;
-
-			EventForwardFilter filter(&info);
+			EventInfo info = { pEvent, NULL };

+			Handle_t hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 			pForward->PushCell(hndl);
 			pForward->PushString(name);
 			pForward->PushCell(bDontBroadcast);
-			pForward->Execute(&res, &filter);
+			pForward->Execute(&res, NULL);

-			broadcast = info.bDontBroadcast;
-
-			handlesys->FreeHandle(hndl, &sec);
+			HandleSecurity sec(NULL, g_pCoreIdent);
+			g_HandleSys.FreeHandle(hndl, &sec);
 		}

 		if (pHook->postCopy)
 		{
-			m_EventCopies.push(gameevents->DuplicateEvent(pEvent));
+			pHook->pEventCopy = gameevents->DuplicateEvent(pEvent);
 		}

-		if (res >= Pl_Handled)
+		if (res)
 		{
 			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);
 }
@@ -453,38 +401,32 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 /* IGameEventManager2::FireEvent post hook */
 bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 {
+	IGameEvent *pEventCopy = NULL;
 	EventHook *pHook;
-	EventInfo info;
 	IChangeableForward *pForward;
+	const char *name;
 	Handle_t hndl = 0;

-	/* The engine accepts NULL without crashing, so to prevent a crash in SM we ignore these */
-	if (!pEvent)
-	{
-		RETURN_META_VALUE(MRES_IGNORED, false);
-	}
+	name = m_EventNames.front();

-	pHook = m_EventStack.front();
-
-	if (pHook != NULL)
+	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
 	{
 		pForward = pHook->pPostHook;

 		if (pForward)
 		{
+			EventInfo info = { pHook->pEventCopy, NULL };
+
 			if (pHook->postCopy)
 			{
-				info.bDontBroadcast = bDontBroadcast;
-				info.pEvent = m_EventCopies.front();
-				info.pOwner = NULL;
-				hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
+				hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);

 				pForward->PushCell(hndl);
 			} else {
 				pForward->PushCell(BAD_HANDLE);
 			}

-			pForward->PushString(pHook->name.c_str());
+			pForward->PushString(name);
 			pForward->PushCell(bDontBroadcast);
 			pForward->Execute(NULL);

@@ -492,25 +434,16 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 			{
 				/* Free handle */
 				HandleSecurity sec(NULL, g_pCoreIdent);
-				handlesys->FreeHandle(hndl, &sec);
+				g_HandleSys.FreeHandle(hndl, &sec);

 				/* Free event structure */
-				gameevents->FreeEvent(info.pEvent);
-				m_EventCopies.pop();
+				gameevents->FreeEvent(pEventCopy);
+				pHook->pEventCopy = NULL;
 			}
 		}
-
-		/* Decrement reference count, check if a delayed delete is needed */
-		if (--pHook->refCount == 0)
-		{
-			assert(pHook->pPostHook == NULL);
-			assert(pHook->pPreHook == NULL);
-			m_EventHooks.remove(pHook->name.c_str());
-			delete pHook;
-		}
 	}

-	m_EventStack.pop();
+	m_EventNames.pop();

 	RETURN_META_VALUE(MRES_IGNORED, true);
 }
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -34,28 +34,19 @@

 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include <sm_namehashset.h>
+#include "sm_trie.h"
 #include <sh_list.h>
 #include <sh_stack.h>
 #include <IHandleSys.h>
 #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
@@ -65,22 +56,14 @@ struct EventHook
 		pPreHook = NULL;
 		pPostHook = NULL;
 		postCopy = false;
+		pEventCopy = NULL;
 		refCount = 0;
 	}
 	IChangeableForward *pPreHook;
 	IChangeableForward *pPostHook;
 	bool postCopy;
+	IGameEvent *pEventCopy;
 	unsigned int refCount;
-	std::string name;
-
-	static inline bool matches(const char *name, const EventHook *hook)
-	{
-		return strcmp(name, hook->name.c_str()) == 0;
-	}
-	static inline uint32_t hash(const detail::CharsAndLength &key)
-	{
-		return key.hash();
-	}
 };

 enum EventHookMode
@@ -116,9 +99,6 @@ 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.
@@ -132,17 +112,15 @@ 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;
-	NameHashSet<EventHook *> m_EventHooks;
+	Trie *m_EventHooks;
 	CStack<EventInfo *> m_FreeEvents;
-	CStack<EventHook *> m_EventStack;
-	CStack<IGameEvent *> m_EventCopies;
+	CStack<const char *> m_EventNames;
 };

 extern EventManager g_EventManager;
@@ -0,0 +1,686 @@
+/**
+ * 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 <string.h>
+#include <stdlib.h>
+#include "GameConfigs.h"
+#include "sm_stringutil.h"
+#include "sourcemod.h"
+#include "sourcemm_api.h"
+#include "HalfLife2.h"
+#include "Logger.h"
+#include "ShareSys.h"
+#include "MemoryUtils.h"
+#include "LibrarySys.h"
+#include "HandleSys.h"
+#include "sm_crc32.h"
+
+#if defined PLATFORM_LINUX
+#include <dlfcn.h>
+#endif
+
+GameConfigManager g_GameConfigs;
+IGameConfig *g_pGameConf = NULL;
+char g_Game[256];
+char g_GameDesc[256] = {'!', '\0'};
+char g_GameName[256] = {'$', '\0'};
+
+#define PSTATE_NONE						0
+#define PSTATE_GAMES					1
+#define PSTATE_GAMEDEFS					2
+#define PSTATE_GAMEDEFS_OFFSETS			3
+#define PSTATE_GAMEDEFS_OFFSETS_OFFSET	4
+#define PSTATE_GAMEDEFS_KEYS			5
+#define PSTATE_GAMEDEFS_SUPPORTED		6
+#define PSTATE_GAMEDEFS_SIGNATURES		7
+#define PSTATE_GAMEDEFS_SIGNATURES_SIG	8
+#define PSTATE_GAMEDEFS_CRC				9
+#define PSTATE_GAMEDEFS_CRC_BINARY		10
+
+#if defined PLATFORM_WINDOWS
+#define PLATFORM_NAME				"windows"
+#define PLATFORM_SERVER_BINARY		"server.dll"
+#elif defined PLATFORM_LINUX
+#define PLATFORM_NAME				"linux"
+#define PLATFORM_SERVER_BINARY		"server_i486.so"
+#endif
+
+struct TempSigInfo
+{
+	void Reset()
+	{
+		library[0] = '\0';
+		sig[0] = '\0';
+	}
+	char sig[512];
+	char library[64];
+} s_TempSig;
+unsigned int s_ServerBinCRC;
+bool s_ServerBinCRC_Ok = false;
+
+CGameConfig::CGameConfig(const char *file)
+{
+	m_pFile = sm_strdup(file);
+	m_pOffsets = sm_trie_create();
+	m_pProps = sm_trie_create();
+	m_pKeys = sm_trie_create();
+	m_pSigs = sm_trie_create();
+	m_pStrings = new BaseStringTable(512);
+	m_RefCount = 0;
+}
+
+CGameConfig::~CGameConfig()
+{
+	sm_trie_destroy(m_pOffsets);
+	sm_trie_destroy(m_pProps);
+	sm_trie_destroy(m_pKeys);
+	sm_trie_destroy(m_pSigs);
+	delete [] m_pFile;
+	delete m_pStrings;
+}
+
+SMCResult CGameConfig::ReadSMC_NewSection(const SMCStates *states, const char *name)
+{
+	if (m_IgnoreLevel)
+	{
+		m_IgnoreLevel++;
+		return SMCResult_Continue;
+	}
+
+	switch (m_ParseState)
+	{
+	case PSTATE_NONE:
+		{
+			if (strcmp(name, "Games") == 0)
+			{
+				m_ParseState = PSTATE_GAMES;
+			} else {
+				m_IgnoreLevel++;
+			}
+			break;
+		}
+	case PSTATE_GAMES:
+		{
+			if ((strcmp(name, "*") == 0)
+				|| (strcmp(name, "#default") == 0)
+				|| (strcasecmp(name, g_Game) == 0)
+				|| (strcasecmp(name, g_GameDesc) == 0)
+				|| (strcasecmp(name, g_GameName) == 0))
+			{
+				bShouldBeReadingDefault = true;
+				m_ParseState = PSTATE_GAMEDEFS;
+				strncopy(m_Game, name, sizeof(m_Game));
+			} else {
+				m_IgnoreLevel++;
+			}
+			break;
+		}
+	case PSTATE_GAMEDEFS:
+		{
+			if (strcmp(name, "Offsets") == 0)
+			{
+				m_ParseState = PSTATE_GAMEDEFS_OFFSETS;
+			}
+			else if (strcmp(name, "Keys") == 0)
+			{
+				m_ParseState = PSTATE_GAMEDEFS_KEYS;
+			}
+			else if ((strcmp(name, "#supported") == 0)
+					 && (strcmp(m_Game, "#default") == 0))
+			{
+				m_ParseState = PSTATE_GAMEDEFS_SUPPORTED;
+				/* Ignore this section unless we get a game. */
+				bShouldBeReadingDefault = false;
+			}
+			else if (strcmp(name, "Signatures") == 0)
+			{
+				m_ParseState = PSTATE_GAMEDEFS_SIGNATURES;
+			}
+			else if (strcmp(name, "CRC") == 0)
+			{
+				m_ParseState = PSTATE_GAMEDEFS_CRC;
+				bShouldBeReadingDefault = false;
+			}
+			else
+			{
+				m_IgnoreLevel++;
+			}
+			break;
+		}
+	case PSTATE_GAMEDEFS_OFFSETS:
+		{
+			m_Prop[0] = '\0';
+			m_Class[0] = '\0';
+			strncopy(m_offset, name, sizeof(m_offset));
+			m_ParseState = PSTATE_GAMEDEFS_OFFSETS_OFFSET;
+			break;
+		}
+	case PSTATE_GAMEDEFS_SIGNATURES:
+		{
+			strncopy(m_offset, name, sizeof(m_offset));
+			s_TempSig.Reset();
+			m_ParseState = PSTATE_GAMEDEFS_SIGNATURES_SIG;
+			break;
+		}
+	case PSTATE_GAMEDEFS_CRC:
+		{
+			char error[255];
+			error[0] = '\0';
+			if (strcmp(name, "server") != 0)
+			{
+				UTIL_Format(error, sizeof(error), "Unrecognized library \"%s\"", name);
+			} 
+			else if (!s_ServerBinCRC_Ok)
+			{
+				FILE *fp;
+				char path[PLATFORM_MAX_PATH];
+
+				g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "bin/" PLATFORM_SERVER_BINARY);
+				if ((fp = fopen(path, "rb")) == NULL)
+				{
+					UTIL_Format(error, sizeof(error), "Could not open binary: %s", path);
+				} else {
+					size_t size;
+					void *buffer;
+
+					fseek(fp, 0, SEEK_END);
+					size = ftell(fp);
+					fseek(fp, 0, SEEK_SET);
+
+					buffer = malloc(size);
+					fread(buffer, size, 1, fp);
+					s_ServerBinCRC = UTIL_CRC32(buffer, size);
+					free(buffer);
+					s_ServerBinCRC_Ok = true;
+				}
+			}
+			if (error[0] != '\0')
+			{
+				m_IgnoreLevel = 1;
+				g_Logger.LogError("[SM] Error while parsing CRC section for \"%s\" (%s):", m_Game, m_pFile);
+				g_Logger.LogError("[SM] %s", error);
+			} else {
+				m_ParseState = PSTATE_GAMEDEFS_CRC_BINARY;
+			}
+			break;
+		}
+	/* No sub-sections allowed:
+	 case PSTATE_GAMEDEFS_OFFSETS_OFFSET:
+	 case PSTATE_GAMEDEFS_KEYS:
+	 case PSTATE_GAMEDEFS_SUPPORTED:
+	 case PSTATE_GAMEDEFS_SIGNATURES_SIG:
+	 case PSTATE_GAMEDEFS_CRC_BINARY:
+	 */
+	default:
+		{
+			/* If we don't know what we got, start ignoring */
+			m_IgnoreLevel++;
+			break;
+		}
+	}
+
+	return SMCResult_Continue;
+}
+
+SMCResult CGameConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
+{
+	if (m_IgnoreLevel)
+	{
+		return SMCResult_Continue;
+	}
+
+	if (m_ParseState == PSTATE_GAMEDEFS_OFFSETS_OFFSET)
+	{
+		if (strcmp(key, "class") == 0)
+		{
+			strncopy(m_Class, value, sizeof(m_Class));
+		} else if (strcmp(key, "prop") == 0) {
+			strncopy(m_Prop, value, sizeof(m_Prop));
+		} else if (strcmp(key, PLATFORM_NAME) == 0) {
+			int val = atoi(value);
+			sm_trie_replace(m_pOffsets, m_offset, (void *)val);
+		}
+	} else if (m_ParseState == PSTATE_GAMEDEFS_KEYS) {
+		int id = m_pStrings->AddString(value);
+		sm_trie_replace(m_pKeys, key, (void *)id);
+	} else if (m_ParseState == PSTATE_GAMEDEFS_SUPPORTED) {
+		if (strcmp(key, "game") == 0
+			&& (strcasecmp(value, g_Game) == 0 
+				|| strcasecmp(value, g_GameDesc) == 0
+				|| strcasecmp(value, g_GameName) == 0)
+				)
+		{
+			bShouldBeReadingDefault = true;
+		}
+	} else if (m_ParseState == PSTATE_GAMEDEFS_SIGNATURES_SIG) {
+		if (strcmp(key, PLATFORM_NAME) == 0)
+		{
+			strncopy(s_TempSig.sig, value, sizeof(s_TempSig.sig));
+		} else if (strcmp(key, "library") == 0) {
+			strncopy(s_TempSig.library, value, sizeof(s_TempSig.library));
+		}
+	} else if (m_ParseState == PSTATE_GAMEDEFS_CRC_BINARY) {
+		if (strcmp(key, PLATFORM_NAME) == 0 
+			&& s_ServerBinCRC_Ok
+			&& !bShouldBeReadingDefault)
+		{
+			unsigned int crc = 0;
+			sscanf(value, "%08X", &crc);
+			if (s_ServerBinCRC == crc)
+			{
+				bShouldBeReadingDefault = true;
+			}
+		}
+	}
+
+	return SMCResult_Continue;
+}
+
+SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
+{
+	if (m_IgnoreLevel)
+	{
+		m_IgnoreLevel--;
+		return SMCResult_Continue;
+	}
+
+	switch (m_ParseState)
+	{
+	case PSTATE_GAMES:
+		{
+			m_ParseState = PSTATE_NONE;
+			break;
+		}
+	case PSTATE_GAMEDEFS:
+		{
+			m_ParseState = PSTATE_GAMES;
+			break;
+		}
+	case PSTATE_GAMEDEFS_KEYS:
+	case PSTATE_GAMEDEFS_OFFSETS:
+		{
+			m_ParseState = PSTATE_GAMEDEFS;
+			break;
+		}
+	case PSTATE_GAMEDEFS_OFFSETS_OFFSET:
+		{
+			/* Parse the offset... */
+			if (m_Class[0] != '\0'
+				&& m_Prop[0] != '\0')
+			{
+				SendProp *pProp = g_HL2.FindInSendTable(m_Class, m_Prop);
+				if (pProp)
+				{
+					int val = pProp->GetOffset();
+					sm_trie_replace(m_pOffsets, m_offset, (void *)val);
+					sm_trie_replace(m_pProps, m_offset, pProp);
+				} else {
+					/* Check if it's a non-default game and no offsets exist */
+					if (((strcmp(m_Game, "*") != 0) && strcmp(m_Game, "#default") != 0)
+						&& (!sm_trie_retrieve(m_pOffsets, m_offset, NULL)))
+					{
+						g_Logger.LogError("[SM] Unable to find property %s.%s (file \"%s\") (mod \"%s\")", 
+							m_Class,
+							m_Prop,
+							m_pFile,
+							m_Game);
+					}
+				}
+			}
+			m_ParseState = PSTATE_GAMEDEFS_OFFSETS;
+			break;
+		}
+	case PSTATE_GAMEDEFS_CRC:
+	case PSTATE_GAMEDEFS_SUPPORTED:
+		{
+			if (!bShouldBeReadingDefault)
+			{
+				/* If we shouldn't read the rest of this section, set the ignore level. */
+				m_IgnoreLevel = 1;
+				m_ParseState = PSTATE_GAMES;
+			} else {
+				m_ParseState = PSTATE_GAMEDEFS;
+			}
+			break;
+		}
+	case PSTATE_GAMEDEFS_CRC_BINARY:
+		{
+			m_ParseState = PSTATE_GAMEDEFS_CRC;
+			break;
+		}
+	case PSTATE_GAMEDEFS_SIGNATURES:
+		{
+			m_ParseState = PSTATE_GAMEDEFS;
+			break;
+		}
+	case PSTATE_GAMEDEFS_SIGNATURES_SIG:
+		{
+			if (s_TempSig.library[0] == '\0')
+			{
+				/* assume server */
+				strncopy(s_TempSig.library, "server", sizeof(s_TempSig.library));
+			}
+			void *addrInBase = NULL;
+			if (strcmp(s_TempSig.library, "server") == 0)
+			{
+				addrInBase = (void *)g_SMAPI->GetServerFactory(false);
+			} else if (strcmp(s_TempSig.library, "engine") == 0) {
+				addrInBase = (void *)g_SMAPI->GetEngineFactory(false);
+			}
+			void *final_addr = NULL;
+			if (addrInBase == NULL)
+			{
+				g_Logger.LogError("[SM] Unrecognized library \"%s\" (gameconf \"%s\")", 
+					s_TempSig.library, 
+					m_pFile);
+			} else {
+#if defined PLATFORM_LINUX
+				if (s_TempSig.sig[0] == '@')
+				{
+					Dl_info info;
+					/* GNU only: returns 0 on error, inconsistent! >:[ */
+					if (dladdr(addrInBase, &info) != 0)
+					{
+						void *handle = dlopen(info.dli_fname, RTLD_NOW);
+						if (handle)
+						{
+							final_addr = dlsym(handle, &s_TempSig.sig[1]);
+							dlclose(handle);
+						} else {
+							g_Logger.LogError("[SM] Unable to load library \"%s\" (gameconf \"%s\")",
+								s_TempSig.library,
+								m_pFile);
+						}
+					} else {
+						g_Logger.LogError("[SM] Unable to find library \"%s\" in memory (gameconf \"%s\")",
+							s_TempSig.library,
+							m_pFile);
+					}
+				}
+				if (final_addr)
+				{
+					goto skip_find;
+				}
+#endif
+				/* First, preprocess the signature */
+				char real_sig[511];
+				size_t real_bytes;
+				size_t length;
+
+				real_bytes = 0;
+				length = strlen(s_TempSig.sig);
+
+				for (size_t i=0; i<length; i++)
+				{
+					if (real_bytes >= sizeof(real_sig))
+					{
+						break;
+					}
+					real_sig[real_bytes++] = s_TempSig.sig[i];
+					if (s_TempSig.sig[i] == '\\'
+						&& s_TempSig.sig[i+1] == 'x')
+					{
+						if (i + 3 >= length)
+						{
+							continue;
+						}
+						/* Get the hex part */
+						char s_byte[3];
+						int r_byte;
+						s_byte[0] = s_TempSig.sig[i+2];
+						s_byte[1] = s_TempSig.sig[i+3];
+						s_byte[2] = '\0';
+						/* Read it as an integer */
+						sscanf(s_byte, "%x", &r_byte);
+						/* Save the value */
+						real_sig[real_bytes-1] = r_byte;
+						/* Adjust index */
+						i += 3;
+					}
+				}
+
+				if (real_bytes >= 1)
+				{
+					final_addr = g_MemUtils.FindPattern(addrInBase, real_sig, real_bytes);
+				}
+			}
+
+#if defined PLATFORM_LINUX
+skip_find:
+#endif
+			sm_trie_replace(m_pSigs, m_offset, final_addr);
+			m_ParseState = PSTATE_GAMEDEFS_SIGNATURES;
+
+			break;
+		}
+	}
+
+	return SMCResult_Continue;
+}
+
+bool CGameConfig::Reparse(char *error, size_t maxlength)
+{
+	SMCError err;
+	SMCStates state = {0, 0};
+
+	char path[PLATFORM_MAX_PATH];
+	g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "gamedata/%s.txt", m_pFile);
+	/* Backwards compatibility */
+	if (!g_LibSys.PathExists(path))
+	{
+		g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "configs/gamedata/%s.txt", m_pFile);
+	}
+
+	/* Initialize parse states */
+	m_IgnoreLevel = 0;
+	bShouldBeReadingDefault = true;
+	m_ParseState = PSTATE_NONE;
+	/* Reset cached data */
+	m_pStrings->Reset();
+	sm_trie_clear(m_pOffsets);
+	sm_trie_clear(m_pProps);
+	sm_trie_clear(m_pKeys);
+
+	if ((err=textparsers->ParseSMCFile(path, this, &state, error, maxlength))
+		!= SMCError_Okay)
+	{
+		const char *msg;
+
+		msg = textparsers->GetSMCErrorString(err);
+
+		g_Logger.LogError("[SM] Error parsing gameconfig file \"%s\":", path);
+		g_Logger.LogError("[SM] Error %d on line %d, col %d: %s", 
+			err,
+			state.line,
+			state.col,
+			msg ? msg : "Unknown error");
+		return false;
+	}
+
+	return true;
+}
+
+bool CGameConfig::GetOffset(const char *key, int *value)
+{
+	void *obj;
+
+	if (!sm_trie_retrieve(m_pOffsets, key, &obj))
+	{
+		return false;
+	}
+
+	*value = (int)obj;
+	
+	return true;
+}
+
+const char *CGameConfig::GetKeyValue(const char *key)
+{
+	void *obj;
+	if (!sm_trie_retrieve(m_pKeys, key, &obj))
+	{
+		return NULL;
+	}
+	return m_pStrings->GetString((int)obj);
+}
+
+SendProp *CGameConfig::GetSendProp(const char *key)
+{
+	SendProp *pProp;
+
+	if (!sm_trie_retrieve(m_pProps, key, (void **)&pProp))
+	{
+		return NULL;
+	}
+
+	return pProp;
+}
+
+bool CGameConfig::GetMemSig(const char *key, void **addr)
+{
+	return sm_trie_retrieve(m_pSigs, key, addr);
+}
+
+void CGameConfig::IncRefCount()
+{
+	m_RefCount++;
+}
+
+unsigned int CGameConfig::DecRefCount()
+{
+	m_RefCount--;
+	return m_RefCount;
+}
+
+GameConfigManager::GameConfigManager()
+{
+	m_pLookup = sm_trie_create();
+}
+
+GameConfigManager::~GameConfigManager()
+{
+	sm_trie_destroy(m_pLookup);
+}
+
+void GameConfigManager::OnSourceModStartup(bool late)
+{
+	LoadGameConfigFile("core.games", &g_pGameConf, NULL, 0);
+
+	strncopy(g_Game, g_SourceMod.GetGameFolderName(), sizeof(g_Game));
+	strncopy(g_GameDesc + 1, SERVER_CALL(GetGameDescription)(), sizeof(g_GameDesc) - 1);
+
+	KeyValues *pGameInfo = new KeyValues("GameInfo");
+	if (pGameInfo->LoadFromFile(basefilesystem, "gameinfo.txt"))
+	{
+		const char *str;
+		if ((str = pGameInfo->GetString("game", NULL)) != NULL)
+		{
+			strncopy(g_GameName + 1, str, sizeof(g_GameName) - 1);
+		}
+	}
+	pGameInfo->deleteThis();
+}
+
+void GameConfigManager::OnSourceModAllInitialized()
+{
+	/* NOW initialize the game file */
+	CGameConfig *pGameConf = (CGameConfig *)g_pGameConf;
+	
+	char error[255];
+	if (!pGameConf->Reparse(error, sizeof(error)))
+	{
+		/* :TODO: log */
+	}
+
+	g_ShareSys.AddInterface(NULL, this);
+}
+
+void GameConfigManager::OnSourceModAllShutdown()
+{
+	CloseGameConfigFile(g_pGameConf);
+}
+
+bool GameConfigManager::LoadGameConfigFile(const char *file, IGameConfig **_pConfig, char *error, size_t maxlength)
+{
+	CGameConfig *pConfig;
+
+	if (sm_trie_retrieve(m_pLookup, file, (void **)&pConfig))
+	{
+		pConfig->IncRefCount();
+		*_pConfig = pConfig;
+		return true;
+	}
+
+	pConfig = new CGameConfig(file);
+
+	/* :HACKHACK: Don't parse the main config file */
+	bool retval = true;
+	if (_pConfig != &g_pGameConf)
+	{
+		retval = pConfig->Reparse(error, maxlength);
+	}
+
+	m_cfgs.push_back(pConfig);
+	sm_trie_insert(m_pLookup, file, pConfig);
+
+	pConfig->IncRefCount();
+
+	*_pConfig = pConfig;
+
+	return retval;
+}
+
+void GameConfigManager::CloseGameConfigFile(IGameConfig *cfg)
+{
+	CGameConfig *pConfig = (CGameConfig *)cfg;
+
+	if (pConfig->DecRefCount() == 0)
+	{
+		sm_trie_delete(m_pLookup, pConfig->m_pFile);
+		delete pConfig;
+	}
+}
+
+extern HandleType_t g_GameConfigsType;
+
+IGameConfig *GameConfigManager::ReadHandle(Handle_t hndl, IdentityToken_t *ident, HandleError *err)
+{
+	HandleSecurity sec(ident, g_pCoreIdent);
+	IGameConfig *conf = NULL;
+	HandleError _err = g_HandleSys.ReadHandle(hndl, g_GameConfigsType, &sec, (void **)&conf);
+
+	if (err)
+	{
+		*err = _err;
+	}
+
+	return conf;
+}
@@ -0,0 +1,112 @@
+/**
+ * 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_CGAMECONFIGS_H_
+#define _INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
+
+#include <IGameConfigs.h>
+#include <ITextParsers.h>
+#include <sh_list.h>
+#include "sm_trie.h"
+#include "sm_globals.h"
+#include "sm_memtable.h"
+
+using namespace SourceMod;
+using namespace SourceHook;
+
+class SendProp;
+
+class CGameConfig : 
+	public ITextListener_SMC,
+	public IGameConfig
+{
+	friend class GameConfigManager;
+public:
+	CGameConfig(const char *file);
+	~CGameConfig();
+public:
+	bool Reparse(char *error, size_t maxlength);
+public: //ITextListener_SMC
+	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
+	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
+	SMCResult ReadSMC_LeavingSection(const SMCStates *states);
+public: //IGameConfig
+	const char *GetKeyValue(const char *key);
+	bool GetOffset(const char *key, int *value);
+	SendProp *GetSendProp(const char *key);
+	bool GetMemSig(const char *key, void **addr);
+public:
+	void IncRefCount();
+	unsigned int DecRefCount();
+private:
+	BaseStringTable *m_pStrings;
+	char *m_pFile;
+	Trie *m_pOffsets;
+	Trie *m_pProps;
+	Trie *m_pKeys;
+	Trie *m_pSigs;
+	unsigned int m_RefCount;
+	/* Parse states */
+	int m_ParseState;
+	unsigned int m_IgnoreLevel;
+	char m_Class[64];
+	char m_Prop[64];
+	char m_offset[64];
+	char m_Game[256];
+	bool bShouldBeReadingDefault;
+};
+
+class GameConfigManager : 
+	public IGameConfigManager,
+	public SMGlobalClass
+{
+public:
+	GameConfigManager();
+	~GameConfigManager();
+public: //IGameConfigManager
+	bool LoadGameConfigFile(const char *file, IGameConfig **pConfig, char *error, size_t maxlength);
+	void CloseGameConfigFile(IGameConfig *cfg);
+	IGameConfig *ReadHandle(Handle_t hndl,
+		IdentityToken_t *ident,
+		HandleError *err);
+public: //SMGlobalClass
+	void OnSourceModStartup(bool late);
+	void OnSourceModAllInitialized();
+	void OnSourceModAllShutdown();
+private:
+	List<CGameConfig *> m_cfgs;
+	Trie *m_pLookup;
+};
+
+extern GameConfigManager g_GameConfigs;
+extern IGameConfig *g_pGameConf;
+
+#endif //_INCLUDE_SOURCEMOD_CGAMECONFIGS_H_
@@ -1,171 +0,0 @@
-// 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_.size(); 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 || SOURCE_ENGINE == SE_BLADE || SOURCE_ENGINE == SE_MCV
-	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;
-}
@@ -1,133 +0,0 @@
-// 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::Function<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 std::vector<int>
-	{
-	public:
-		HookList &operator += (int hook_id) {
-			this->push_back(hook_id);
-			return *this;
-		}
-	};
-	HookList hooks_;
-
-	ClientCvarQueryMode client_cvar_query_mode_;
-	int last_command_client_;
-};
-
-} // namespace SourceMod
-
-#endif // _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2016 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -35,24 +35,16 @@
 #include <sh_list.h>
 #include <sh_string.h>
 #include <sh_tinyhash.h>
-#include <am-utility.h>
-#include <am-hashset.h>
-#include <am-hashmap.h>
-#include <sm_stringhashmap.h>
-#include <sm_namehashset.h>
+#include <sm_trie_tpl.h>
+#include "sm_trie.h"
 #include "sm_globals.h"
 #include "sm_queue.h"
 #include <IGameHelpers.h>
 #include <KeyValues.h>
 #include <server_class.h>
 #include <datamap.h>
-#include <ihandleentity.h>
-#include <tier0/icommandline.h>
-#include <string_t.h>

-namespace SourceMod {
-class ICommandArgs;
-} // namespace SourceMod
+class CCommand;

 using namespace SourceHook;
 using namespace SourceMod;
@@ -60,95 +52,18 @@ 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 || SOURCE_ENGINE == SE_PVKII
-#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 SendPropInfo
-	{
-		static inline bool matches(const char *name, const SendPropInfo &info)
-		{
-			return strcmp(name, info.name.c_str()) == 0;
-		}
-		static inline uint32_t hash(const detail::CharsAndLength &key)
-		{
-			return key.hash();
-		}
-
-		SendPropInfo()
-			: name(), info{nullptr, 0}
-		{
-		}
-
-		std::string name;
-		sm_sendprop_info_t info;
-	};
-
-	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;
-	NameHashSet<SendPropInfo> lookup;
+	KTrie<sm_sendprop_info_t> lookup;
 };

-struct DataMapCacheInfo
+struct DataMapTrie
 {
-	static inline bool matches(const char *name, const DataMapCacheInfo &info)
-	{
-		return strcmp(name, info.name.c_str()) == 0;
-	}
-	static inline uint32_t hash(const detail::CharsAndLength &key)
-	{
-		return key.hash();
-	}
-
-	DataMapCacheInfo()
-		: name(), info{nullptr, 0}
-	{
-	}
-
-	std::string name;
-	sm_datatable_info_t info;
+	DataMapTrie() : trie(NULL) {}
+	Trie *trie;
 };

-typedef NameHashSet<DataMapCacheInfo> DataMapCache;
-
 struct DelayedFakeCliCmd
 {
 	String cmd;
@@ -158,161 +73,59 @@ struct DelayedFakeCliCmd

 struct CachedCommandInfo
 {
-	const ICommandArgs *args;
-#if SOURCE_ENGINE <= SE_DARKMESSIAH
+	const CCommand *args;
+#if !defined ORANGEBOX_BUILD
 	char cmd[300];
 #endif
 };

-struct DelayedKickInfo
-{
-	int userid;
-	int client;
-	char buffer[384];
-};
-
-// copy from game/shared/entitylist_base.h
-class CEntInfo
-{
-public:
-	IHandleEntity	*m_pEntity;
-	int				m_SerialNumber;
-	CEntInfo		*m_pPrev;
-	CEntInfo		*m_pNext;
-#if SOURCE_ENGINE >= SE_PORTAL2
-	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
-};
-
-#if SOURCE_ENGINE >= SE_LEFT4DEAD && defined PLATFORM_WINDOWS
-template< class T, class I = int >
-class CUtlMemoryGlobalMalloc;
-class CUtlString;
-#endif
-
 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);
-	ServerClass *FindEntityServerClass(CBaseEntity *pEntity);
 	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);
-#if SOURCE_ENGINE >= SE_LEFT4DEAD && defined PLATFORM_WINDOWS && SOURCE_ENGINE != SE_MOCK
-	void FreeUtlVectorUtlString(CUtlVector<CUtlString, CUtlMemoryGlobalMalloc<CUtlString>> &vec);
-#endif
-	bool GetMapDisplayName(const char *pMapName, char *pDisplayname, size_t nMapNameMax);
-	string_t AllocPooledString(const char *pszValue);
-	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:
-	const ICommandArgs *PeekCommandStack();
-	const char *CurrentCommandName();
-	void AddDelayedKick(int client, int userid, const char *msg);
-	void ProcessDelayedKicks();
-private:
-	void PushCommandStack(const ICommandArgs *cmd);
+	void PushCommandStack(const CCommand *cmd);
 	void PopCommandStack();
+	const CCommand *PeekCommandStack();
+	const char *CurrentCommandName();
+#if !defined METAMOD_PLAPI_VERSION
+	bool IsOriginalEngine();
+#endif
+private:
 	DataTableInfo *_FindServerClass(const char *classname);
 private:
-	void InitLogicalEntData();
-	void InitCommandLine();
-private:
-	typedef ke::HashMap<datamap_t *, DataMapCache *, ke::PointerPolicy<datamap_t> > DataTableMap;
-
-	NameHashSet<DataTableInfo *> m_Classes;
-	DataTableMap m_Maps;
+	Trie *m_pClasses;
+	List<DataTableInfo *> m_Tables;
+	THash<datamap_t *, DataMapTrie> m_Maps;
 	int m_MsgTextMsg;
 	int m_HinTextMsg;
-	int m_SayTextMsg;
 	int m_VGUIMenu;
 	Queue<DelayedFakeCliCmd *> m_CmdQueue;
 	CStack<DelayedFakeCliCmd *> m_FreeCmds;
 	CStack<CachedCommandInfo> m_CommandStack;
-	Queue<DelayedKickInfo> m_DelayedKicks;
-	void *m_pGetCommandLine;
-#if SOURCE_ENGINE == SE_CSGO
-public:
-	bool CanSetCSGOEntProp(const char *pszPropName)
-	{
-		return !m_bFollowCSGOServerGuidelines || !m_CSGOBadList.has(pszPropName);
-	}
-private:
-	ke::HashSet<std::string, 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_
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -34,37 +34,479 @@
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "Logger.h"
+#include "systems/LibrarySys.h"
 #include "TimerSys.h"
-#include "logic_bridge.h"
-#include <sourcemod_version.h>
-#include <bridge/include/IProviderCallbacks.h>
+#include "sm_version.h"
+
+Logger g_Logger;
+
+/**
+ * :TODO: This should be creating the log folder if it doesn't exist
+ */
+
+ConfigResult Logger::OnSourceModConfigChanged(const char *key, 
+									  const char *value, 
+									  ConfigSource source,
+									  char *error, 
+									  size_t maxlength)
+{
+	if (strcasecmp(key, "Logging") == 0)
+	{
+		bool state;
+
+		if (strcasecmp(value, "on") == 0)
+		{
+			state = true;
+		} else if (strcasecmp(value, "off") == 0) {
+			state = false;
+		} else {
+			UTIL_Format(error, maxlength, "Invalid value: must be \"on\" or \"off\"");
+			return ConfigResult_Reject;
+		}
+
+		if (source == ConfigSource_Console)
+		{
+			state ? EnableLogging() : DisableLogging();
+		} else {
+			m_InitialState = state;
+		}
+
+		return ConfigResult_Accept;
+	} else if (strcasecmp(key, "LogMode") == 0) {
+		if (strcasecmp(value, "daily") == 0) 
+		{
+			m_Mode = LoggingMode_Daily;
+		} else if (strcasecmp(value, "map") == 0) {
+			m_Mode = LoggingMode_PerMap;
+		} else if (strcasecmp(value, "game") == 0) {
+			m_Mode = LoggingMode_Game;
+		} else {
+			UTIL_Format(error, maxlength, "Invalid value: must be [daily|map|game]");
+			return ConfigResult_Reject;
+		}
+
+		return ConfigResult_Accept;
+	}
+
+	return ConfigResult_Ignore;
+}
+
+void Logger::OnSourceModStartup(bool late)
+{
+	InitLogger(m_Mode);
+}
+
+void Logger::OnSourceModAllShutdown()
+{
+	CloseLogger();
+}
+
+void Logger::OnSourceModLevelChange(const char *mapName)
+{
+	MapChange(mapName);
+}
+
+void Logger::_NewMapFile()
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	/* Append "Log file closed" to previous log file */
+	_CloseFile();
+	
+	char _filename[256];
+	int i = 0;
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+
+	while (true)
+	{
+		g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%02d%02d%03d.log", curtime->tm_mon + 1, curtime->tm_mday, i);
+		FILE *fp = fopen(_filename, "r");
+		if (!fp)
+		{
+			break;
+		}
+		fclose(fp);
+		i++;
+	}
+	m_NrmFileName.assign(_filename);
+
+	FILE *fp = fopen(m_NrmFileName.c_str(), "w");
+	if (!fp)
+	{
+		char error[255];
+		g_LibSys.GetPlatformError(error, sizeof(error));
+		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
+		LogFatal("[SM] Platform returned error: \"%s\"", error);
+		LogFatal("[SM] Logging has been disabled.");
+		m_Active = false;
+		return;
+	} else {
+		char date[32];
+		strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+		fprintf(fp, "L %s: SourceMod log file started (file \"L%02d%02d%03d.log\") (Version \"%s\")\n", date, curtime->tm_mon + 1, curtime->tm_mday, i, SVN_FULL_VERSION);
+		fclose(fp);
+	}
+}
+
+void Logger::_CloseFile()
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	FILE *fp = NULL;
+	if (!m_NrmFileName.empty())
+	{
+		fp = fopen(m_NrmFileName.c_str(), "r+");
+		if (fp)
+		{
+			fseek(fp, 0, SEEK_END);
+			LogMessage("Log file closed.");
+			fclose(fp);
+		}
+		m_NrmFileName.clear();
+	}
+
+	if (!m_ErrMapStart)
+	{
+		return;
+	}
+	fp = fopen(m_ErrFileName.c_str(), "r+");
+	if (fp)
+	{
+		fseek(fp, 0, SEEK_END);
+		LogError("Error log file session closed.");
+		fclose(fp);
+	}
+	m_ErrFileName.clear();
+}
+
+void Logger::InitLogger(LoggingMode mode)
+{
+	m_Mode = mode;
+	m_Active = m_InitialState;
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+	m_CurDay = curtime->tm_mday;
+
+	char _filename[256];
+	g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+	m_ErrFileName.assign(_filename);
+
+	switch (m_Mode)
+	{
+	case LoggingMode_PerMap:
+		{
+			if (!m_Active)
+			{
+				m_DelayedStart = true;
+			}
+			break;
+		}
+	case LoggingMode_Daily:
+		{
+			g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+			m_NrmFileName.assign(_filename);
+			m_DailyPrintHdr = true;
+			break;
+		}
+	default:
+		{
+			/* do nothing... */
+			break;
+		}
+	}
+}
+
+void Logger::CloseLogger()
+{
+	_CloseFile();
+}
+
+void Logger::LogToOpenFile(FILE *fp, const char *msg, ...)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	va_list ap;
+	va_start(ap, msg);
+	LogToOpenFileEx(fp, msg, ap);
+	va_end(ap);
+}
+
+void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	char buffer[3072];
+	UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
+
+	char date[32];
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+	strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+
+	fprintf(fp, "L %s: %s\n", date, buffer);
+	g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
+}
+
+void Logger::LogMessage(const char *vafmt, ...)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	if (m_Mode == LoggingMode_Game)
+	{
+		va_list ap;
+		va_start(ap, vafmt);
+		_PrintToGameLog(vafmt, ap);
+		va_end(ap);
+		return;
+	}
+
+	if (m_DelayedStart)
+	{
+		m_DelayedStart = false;
+		_NewMapFile();
+	}
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+
+	FILE *fp = NULL;
+	if (m_Mode == LoggingMode_PerMap)
+	{
+		fp = fopen(m_NrmFileName.c_str(), "a+");
+		if (!fp)
+		{
+			_NewMapFile();
+			fp = fopen(m_NrmFileName.c_str(), "a+");
+			if (!fp)
+			{
+				goto print_error;
+			}
+		}
+	} else {
+		if (m_CurDay != curtime->tm_mday)
+		{
+			char _filename[256];
+			g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/L%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+			m_NrmFileName.assign(_filename);
+			m_CurDay = curtime->tm_mday;
+			m_DailyPrintHdr = true;
+		}
+		fp = fopen(m_NrmFileName.c_str(), "a+");
+	}
+
+	if (fp)
+	{
+		if (m_DailyPrintHdr)
+		{
+			char date[32];
+			m_DailyPrintHdr = false;
+			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+			fprintf(fp, "L %s: SourceMod log file session started (file \"L%04d%02d%02d.log\") (Version \"%s\")\n", date, curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday, SVN_FULL_VERSION);
+	 	}
+		va_list ap;
+		va_start(ap, vafmt);
+		LogToOpenFileEx(fp, vafmt, ap);
+		va_end(ap);
+		fclose(fp);
+	} else {
+		goto print_error;
+	}
+
+	return;
+print_error:
+	char error[255];
+	g_LibSys.GetPlatformError(error, sizeof(error));
+	LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
+	LogFatal("[SM] Platform returned error: \"%s\"", error);
+	LogFatal("[SM] Logging has been disabled.");
+	m_Active = false;
+}
+
+void Logger::LogError(const char *vafmt, ...)
+{
+	if (!m_Active)
+	{
+		return;
+	}
+
+	time_t t;
+	GetAdjustedTime(&t);
+	tm *curtime = localtime(&t);
+
+	if (curtime->tm_mday != m_CurDay)
+	{
+		char _filename[256];
+		g_SourceMod.BuildPath(Path_SM, _filename, sizeof(_filename), "logs/errors_%04d%02d%02d.log", curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+		m_ErrFileName.assign(_filename);
+		m_CurDay = curtime->tm_mday;
+		m_ErrMapStart = false;
+	}
+
+	FILE *fp = fopen(m_ErrFileName.c_str(), "a+");
+	if (fp)
+	{
+		if (!m_ErrMapStart)
+		{
+			char date[32];
+			strftime(date, sizeof(date), "%m/%d/%Y - %H:%M:%S", curtime);
+			fprintf(fp, "L %s: SourceMod error session started\n", date);
+			fprintf(fp, "L %s: Info (map \"%s\") (file \"errors_%04d%02d%02d.log\")\n", date, m_CurMapName.c_str(), curtime->tm_year + 1900, curtime->tm_mon + 1, curtime->tm_mday);
+			m_ErrMapStart = true;
+		}
+		va_list ap;
+		va_start(ap, vafmt);
+		LogToOpenFileEx(fp, vafmt, ap);
+		va_end(ap);
+		fclose(fp);
+	}
+	else
+	{
+		char error[255];
+		g_LibSys.GetPlatformError(error, sizeof(error));
+		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
+		LogFatal("[SM] Platform returned error: \"%s\"", error);
+		LogFatal("[SM] Logging has been disabled.");
+		m_Active = false;
+		return;
+	}
+}
+
+void Logger::MapChange(const char *mapname)
+{
+	m_CurMapName.assign(mapname);
+
+	switch (m_Mode)
+	{
+	case LoggingMode_Daily:
+		{
+			LogMessage("-------- Mapchange to %s --------", mapname);
+			break;
+		}
+	case LoggingMode_PerMap:
+		{
+			_NewMapFile();
+			break;
+		}
+	default:
+		{
+			/* Do nothing... */
+			break;
+		}
+	}
+
+	if (m_ErrMapStart)
+	{
+		LogError("Error log file session closed.");
+	}
+	m_ErrMapStart = false;
+}
+
+void Logger::_PrintToGameLog(const char *fmt, va_list ap)
+{
+	char msg[3072];
+	size_t len;
+
+	len = vsnprintf(msg, sizeof(msg)-2, fmt, ap);
+	len = (len >= sizeof(msg)) ? (sizeof(msg) - 2) : len;
+
+	msg[len++] = '\n';
+	msg[len] = '\0';
+
+	Engine_LogPrintWrapper(msg);
+}
+
+const char *Logger::GetLogFileName(LogType type) const
+{
+	switch (type)
+	{
+	case LogType_Normal:
+		{
+			return m_NrmFileName.c_str();
+		}
+	case LogType_Error:
+		{
+			return m_ErrFileName.c_str();
+		}
+	default:
+		{
+			return "";
+		}
+	}
+}
+
+LoggingMode Logger::GetLoggingMode() const
+{
+	return m_Mode;
+}
+
+void Logger::EnableLogging()
+{
+	if (m_Active)
+	{
+		return;
+	}
+	m_Active = true;
+	LogMessage("[SM] Logging enabled manually by user.");
+}
+
+void Logger::DisableLogging()
+{
+	if (!m_Active)
+	{
+		return;
+	}
+	LogMessage("[SM] Logging disabled manually by user.");
+	m_Active = false;
+}
+
+void Logger::LogFatal(const char *msg, ...)
+{
+	/* :TODO: make this print all pretty-like
+	 * In fact, the pretty log printing function should be abstracted. 
+	 * It's already implemented twice which is bad.
+	 */
+
+	va_list ap;
+	char path[PLATFORM_MAX_PATH];
+
+	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "sourcemod_fatal.log");
+
+	FILE *fp = fopen(path, "at");
+	if (fp)
+	{
+		m_Active = true;
+		va_start(ap, msg);
+		LogToOpenFileEx(fp, msg, ap);
+		va_end(ap);
+		m_Active = false;
+		fclose(fp);
+	}
+}

 bool g_in_game_log_hook = false;

-static LoggerCore g_LoggerCore;
-
-SH_DECL_HOOK1_void(IVEngineServer, LogPrint, SH_NOATTRIB, false, const char *);
-
-static void HookLogPrint(const char *message)
-{
-	g_in_game_log_hook = true;
-	bool stopped = logicore.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)
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -38,13 +38,69 @@

 using namespace SourceHook;

-class LoggerCore : public SMGlobalClass
+enum LogType
 {
+	LogType_Normal,
+	LogType_Error
+};
+
+enum LoggingMode
+{
+	LoggingMode_Daily,
+	LoggingMode_PerMap,
+	LoggingMode_Game
+};
+
+class Logger : public SMGlobalClass
+{
+public:
+	Logger() : m_Mode(LoggingMode_Daily), m_ErrMapStart(false), 
+		m_Active(false), m_DelayedStart(false), m_DailyPrintHdr(false), 
+		m_InitialState(true)
+	{
+	}
 public: //SMGlobalClass
+	ConfigResult OnSourceModConfigChanged(const char *key, 
+		const char *value, 
+		ConfigSource source,
+		char *error, 
+		size_t maxlength);
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllShutdown();
+	void OnSourceModLevelChange(const char *mapName);
+public:
+	void InitLogger(LoggingMode mode);
+	void CloseLogger();
+	void EnableLogging();
+	void DisableLogging();
+	void LogMessage(const char *msg, ...);
+	void LogError(const char *msg, ...);
+	void LogFatal(const char *msg, ...);
+	void LogToOpenFile(FILE *fp, const char *msg, ...);
+	void LogToOpenFileEx(FILE *fp, const char *msg, va_list ap);
+	void MapChange(const char *mapname);
+	const char *GetLogFileName(LogType type) const;
+	LoggingMode GetLoggingMode() const;
+private:
+	void _CloseFile();
+	void _NewMapFile();
+	void _PrintToGameLog(const char *fmt, va_list ap);
+private:
+	String m_NrmFileName;
+	String m_ErrFileName;
+	String m_CurMapName;
+	LoggingMode m_Mode;
+	int m_CurDay;
+	bool m_ErrMapStart;
+	bool m_Active;
+	bool m_DelayedStart;
+	bool m_DailyPrintHdr;
+	bool m_InitialState;
 };

 void Engine_LogPrintWrapper(const char *msg);

+extern bool g_in_game_log_hook;
+extern Logger g_Logger;
+
 #endif // _INCLUDE_SOURCEMOD_CLOGGER_H_
@@ -0,0 +1,133 @@
+#(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 -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)
+
@@ -0,0 +1,220 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include "MemoryUtils.h"
+#include "ShareSys.h"
+#ifdef PLATFORM_LINUX
+#include <string.h>
+#include <elf.h>
+#endif
+
+MemoryUtils g_MemUtils;
+
+#if 0
+MemoryUtils::MemoryUtils()
+{
+#ifdef PLATFORM_WINDOWS
+
+	SYSTEM_INFO info;
+	GetSystemInfo(&info);
+
+	m_PageSize = info.dwPageSize;
+
+#elif defined PLATFORM_POSIX
+
+	m_PageSize = sysconf(_SC_PAGE_SIZE);
+
+#endif
+}
+#endif
+
+void MemoryUtils::OnSourceModAllInitialized()
+{
+	g_ShareSys.AddInterface(NULL, this);
+}
+
+void *MemoryUtils::FindPattern(const void *libPtr, const char *pattern, size_t len)
+{
+	DynLibInfo lib;
+	bool found;
+	char *ptr, *end;
+
+	memset(&lib, 0, sizeof(DynLibInfo));
+
+	if (!GetLibraryInfo(libPtr, lib))
+	{
+		return NULL;
+	}
+
+	ptr = reinterpret_cast<char *>(lib.baseAddress);
+	end = ptr + lib.memorySize;
+
+	while (ptr < end)
+	{
+		found = true;
+		for (register size_t i = 0; i < len; i++)
+		{
+			if (pattern[i] != '\x2A' && pattern[i] != ptr[i])
+			{
+				found = false;
+				break;
+			}
+		}
+
+		if (found)
+			return ptr;
+
+		ptr++;
+	}
+
+	return NULL;
+}
+
+bool MemoryUtils::GetLibraryInfo(const void *libPtr, DynLibInfo &lib)
+{
+	unsigned long baseAddr;
+
+	if (libPtr == NULL)
+	{
+		return false;
+	}
+
+#ifdef PLATFORM_WINDOWS
+
+	MEMORY_BASIC_INFORMATION info;
+	IMAGE_DOS_HEADER *dos;
+	IMAGE_NT_HEADERS *pe;
+	IMAGE_FILE_HEADER *file;
+	IMAGE_OPTIONAL_HEADER *opt;
+
+	if (!VirtualQuery(libPtr, &info, sizeof(MEMORY_BASIC_INFORMATION)))
+	{
+		return false;
+	}
+
+	baseAddr = reinterpret_cast<unsigned long>(info.AllocationBase);
+
+	/* All this is for our insane sanity checks :o */
+	dos = reinterpret_cast<IMAGE_DOS_HEADER *>(baseAddr);
+	pe = reinterpret_cast<IMAGE_NT_HEADERS *>(baseAddr + dos->e_lfanew);
+	file = &pe->FileHeader;
+	opt = &pe->OptionalHeader;
+
+	/* Check PE magic and signature */
+	if (dos->e_magic != IMAGE_DOS_SIGNATURE || pe->Signature != IMAGE_NT_SIGNATURE || opt->Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC)
+	{
+		return false;
+	}
+
+	/* Check architecture, which is 32-bit/x86 right now
+	 * Should change this for 64-bit if Valve gets their act together
+	 */
+	if (file->Machine != IMAGE_FILE_MACHINE_I386)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library */
+	if ((file->Characteristics & IMAGE_FILE_DLL) == 0)
+	{
+		return false;
+	}
+
+	/* Finally, we can do this */
+	lib.memorySize = opt->SizeOfImage;
+
+#elif defined PLATFORM_LINUX
+
+	Dl_info info;
+	Elf32_Ehdr *file;
+	Elf32_Phdr *phdr;
+	uint16_t phdrCount;
+
+	if (!dladdr(libPtr, &info))
+	{
+		return false;
+	}
+
+	if (!info.dli_fbase || !info.dli_fname)
+	{
+		return false;
+	}
+
+	/* This is for our insane sanity checks :o */
+	baseAddr = reinterpret_cast<unsigned long>(info.dli_fbase);
+	file = reinterpret_cast<Elf32_Ehdr *>(baseAddr);
+
+	/* Check ELF magic */
+	if (memcmp(ELFMAG, file->e_ident, SELFMAG) != 0)
+	{
+		return false;
+	}
+
+	/* Check ELF version */
+	if (file->e_ident[EI_VERSION] != EV_CURRENT)
+	{
+		return false;
+	}
+
+	/* Check ELF architecture, which is 32-bit/x86 right now
+	 * Should change this for 64-bit if Valve gets their act together
+	 */
+	if (file->e_ident[EI_CLASS] != ELFCLASS32 || file->e_machine != EM_386 || file->e_ident[EI_DATA] != ELFDATA2LSB)
+	{
+		return false;
+	}
+
+	/* For our purposes, this must be a dynamic library/shared object */
+	if (file->e_type != ET_DYN)
+	{
+		return false;
+	}
+
+	phdrCount = file->e_phnum;
+	phdr = reinterpret_cast<Elf32_Phdr *>(baseAddr + file->e_phoff);
+	
+	/* Add up the memory sizes of segments marked as PT_LOAD as those are the only ones that should be in memory */
+	for (uint16_t i = 0; i < phdrCount; i++)
+	{
+		Elf32_Phdr &hdr = phdr[i];
+
+		if (hdr.p_type == PT_LOAD)
+		{
+			lib.memorySize += hdr.p_memsz;
+		}
+	}
+
+#endif
+
+	lib.baseAddress = reinterpret_cast<void *>(baseAddr);
+
+	return true;
+}
@@ -0,0 +1,60 @@
+/**
+ * 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_MEMORYUTILS_H_
+#define _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
+
+#include <IMemoryUtils.h>
+#include "sm_globals.h"
+
+using namespace SourceMod;
+
+struct DynLibInfo
+{
+	void *baseAddress;
+	size_t memorySize;
+};
+
+class MemoryUtils : 
+	public IMemoryUtils,
+	public SMGlobalClass
+{
+public: // SMGlobalClass
+	void OnSourceModAllInitialized();
+public: // IMemoryUtils
+	void *FindPattern(const void *libPtr, const char *pattern, size_t len);
+private:
+	bool GetLibraryInfo(const void *libPtr, DynLibInfo &lib);
+};
+
+extern MemoryUtils g_MemUtils;
+
+#endif // _INCLUDE_SOURCEMOD_MEMORYUTILS_H_
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -38,9 +38,9 @@
 #include "sourcemm_api.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
-#include <IGameConfigs.h>
+#include "ShareSys.h"
+#include "HandleSys.h"
 #include "sourcemm_api.h"
-#include "logic_bridge.h"

 MenuManager g_Menus;
 VoteMenuHandler s_VoteHandler;
@@ -55,47 +55,24 @@ MenuManager::MenuManager()

 void MenuManager::OnSourceModAllInitialized()
 {
-	sharesys->AddInterface(NULL, this);
+	g_ShareSys.AddInterface(NULL, this);

 	HandleAccess access;
-	handlesys->InitAccessDefaults(NULL, &access);
+	g_HandleSys.InitAccessDefaults(NULL, &access);

 	/* Deny cloning to menus */
 	access.access[HandleAccess_Clone] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_MenuType = handlesys->CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_MenuType = g_HandleSys.CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);

 	/* Also deny deletion to styles */
 	access.access[HandleAccess_Delete] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_StyleType = handlesys->CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
-}
-
-void MenuManager::OnSourceModAllInitialized_Post()
-{
-	const char* pTmp;
-	
-	pTmp = g_pGameConf->GetKeyValue("MenuItemSound");
-	if (nullptr != pTmp)
-	{
-		m_SelectSound = pTmp;
-	}
-
-	pTmp = g_pGameConf->GetKeyValue("MenuExitSound");
-	if (nullptr != pTmp)
-	{
-		m_ExitSound = pTmp;
-	}
-
-	pTmp = g_pGameConf->GetKeyValue("MenuExitBackSound");
-	if (nullptr != pTmp)
-	{
-		m_ExitBackSound = pTmp;
-	}
+	m_StyleType = g_HandleSys.CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
 }

 void MenuManager::OnSourceModAllShutdown()
 {
-	handlesys->RemoveType(m_MenuType, g_pCoreIdent);
-	handlesys->RemoveType(m_StyleType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_MenuType, g_pCoreIdent);
+	g_HandleSys.RemoveType(m_StyleType, g_pCoreIdent);
 }

 void MenuManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -134,7 +111,7 @@ Handle_t MenuManager::CreateMenuHandle(IBaseMenu *menu, IdentityToken_t *pOwner)
 		return BAD_HANDLE;
 	}

-	return handlesys->CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
+	return g_HandleSys.CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
 }

 Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
@@ -144,7 +121,7 @@ Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
 		return BAD_HANDLE;
 	}

-	return handlesys->CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
+	return g_HandleSys.CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
 }

 HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
@@ -154,7 +131,7 @@ HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = NULL;

-	return handlesys->ReadHandle(handle, m_MenuType, &sec, (void **)menu);
+	return g_HandleSys.ReadHandle(handle, m_MenuType, &sec, (void **)menu);
 }

 HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
@@ -164,7 +141,7 @@ HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = g_pCoreIdent;

-	return handlesys->ReadHandle(handle, m_StyleType, &sec, (void **)style);
+	return g_HandleSys.ReadHandle(handle, m_StyleType, &sec, (void **)style);
 }

 bool MenuManager::SetDefaultStyle(IMenuStyle *style)
@@ -253,7 +230,6 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 	unsigned int pgn = menu->GetPagination();
 	unsigned int maxItems = style->GetMaxPageItems();
 	bool exitButton = (menu->GetMenuOptionFlags() & MENUFLAG_BUTTON_EXIT) == MENUFLAG_BUTTON_EXIT;
-	bool novoteButton = (menu->GetMenuOptionFlags() & MENUFLAG_BUTTON_NOVOTE) == MENUFLAG_BUTTON_NOVOTE;

 	if (pgn != MENU_NO_PAGINATION)
 	{
@@ -264,11 +240,6 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 		maxItems--;
 	}

-	if (novoteButton)
-	{
-		maxItems--;
-	}
-
 	/* This is very not allowed! */
 	if (maxItems < 2)
 	{
@@ -332,7 +303,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 	{
 		ItemDrawInfo &dr = drawItems[foundItems].draw;
 		/* Is the item valid? */
-		if (menu->GetItemInfo(i, &dr, client) != NULL)
+		if (menu->GetItemInfo(i, &dr) != NULL)
 		{
 			/* Ask the user to change the style, if necessary */
 			mh->OnMenuDrawItem(menu, client, i, dr.style);
@@ -422,7 +393,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 			}
 			while (++lastItem < totalItems)
 			{
-				if (menu->GetItemInfo(lastItem, &dr, client) != NULL)
+				if (menu->GetItemInfo(lastItem, &dr) != NULL)
 				{
 					mh->OnMenuDrawItem(menu, client, lastItem, dr.style);
 					if (IsSlotItem(panel, dr.style))
@@ -444,7 +415,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 			lastItem--;
 			while (lastItem != 0)
 			{
-				if (menu->GetItemInfo(lastItem, &dr, client) != NULL)
+				if (menu->GetItemInfo(lastItem, &dr) != NULL)
 				{
 					mh->OnMenuDrawItem(menu, client, lastItem, dr.style);
 					if (IsSlotItem(panel, dr.style))
@@ -464,20 +435,6 @@ skip_search:
 	/* Draw the item according to the order */
 	menu_slots_t *slots = md.slots;
 	unsigned int position = 0;			/* Keep track of the last position */
-
-	if (novoteButton)
-	{
-		char text[50];
-		if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "No Vote", &client))
-		{
-			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;
@@ -594,7 +551,7 @@ skip_search:
 			/* If there are no control options,
 			 * Instead just pad with invisible slots.
 			 */
-			if (!displayNext && !displayPrev)
+			if (!displayPrev && !displayPrev)
 			{
 				padItem.style = ITEMDRAW_NOTEXT;
 			}
@@ -628,20 +585,14 @@ skip_search:
 				{
 					if (exitBackButton)
 					{
-						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Back", &client))
-						{
-							ke::SafeStrcpy(text, sizeof(text), "Back");
-						}
+						CorePlayerTranslate(client, text, sizeof(text), "Back", NULL);
 						dr.style = ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
 						slots[position].type = ItemSel_ExitBack;
 					}
 					else
 					{
-						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Previous", &client))
-						{
-							ke::SafeStrcpy(text, sizeof(text), "Previous");
-						}
+						CorePlayerTranslate(client, text, sizeof(text), "Previous", NULL);
 						dr.style = (displayPrev ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
 						slots[position].type = ItemSel_Back;
@@ -659,10 +610,7 @@ skip_search:
 				/* NEXT */
 				if (displayNext || canDrawDisabled)
 				{
-					if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Next", &client))
-					{
-						ke::SafeStrcpy(text, sizeof(text), "Next");
-					}
+					CorePlayerTranslate(client, text, sizeof(text), "Next", NULL);
 					dr.style = (displayNext ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 					position = panel->DrawItem(dr);
 					slots[position].type = ItemSel_Next;
@@ -690,10 +638,7 @@ skip_search:
 		/* EXIT */
 		if (exitButton)
 		{
-			if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Exit", &client))
-			{
-				ke::SafeStrcpy(text, sizeof(text), "Exit");
-			}
+			CorePlayerTranslate(client, text, sizeof(text), "Exit", NULL);
 			dr.style = ITEMDRAW_CONTROL;
 			position = panel->DrawItem(dr);
 			slots[position].type = ItemSel_Exit;
@@ -723,9 +668,30 @@ bool MenuManager::MenuSoundsEnabled()
 	return (sm_menu_sounds.GetInt() != 0);
 }

-std::string *MenuManager::GetMenuSound(ItemSelection sel)
+ConfigResult MenuManager::OnSourceModConfigChanged(const char *key,
+												   const char *value,
+												   ConfigSource source,
+												   char *error,
+												   size_t maxlength)
 {
-	std::string *sound = nullptr;
+	if (strcmp(key, "MenuItemSound") == 0)
+	{
+		m_SelectSound.assign(value);
+		return ConfigResult_Accept;
+	} else if (strcmp(key, "MenuExitBackSound") == 0) {
+		m_ExitBackSound.assign(value);
+		return ConfigResult_Accept;
+	} else if (strcmp(key, "MenuExitSound") == 0) {
+		m_ExitSound.assign(value);
+		return ConfigResult_Accept;
+	}
+
+	return ConfigResult_Ignore;
+}
+
+const char *MenuManager::GetMenuSound(ItemSelection sel)
+{
+	const char *sound = NULL;

 	switch (sel)
 	{
@@ -735,7 +701,7 @@ std::string *MenuManager::GetMenuSound(ItemSelection sel)
 		{
 			if (m_SelectSound.size() > 0)
 			{
-				sound = &m_SelectSound;
+				sound = m_SelectSound.c_str();
 			}
 			break;
 		}
@@ -743,7 +709,7 @@ std::string *MenuManager::GetMenuSound(ItemSelection sel)
 		{
 			if (m_ExitBackSound.size() > 0)
 			{
-				sound = &m_ExitBackSound;
+				sound = m_ExitBackSound.c_str();
 			}
 			break;
 		}
@@ -751,7 +717,7 @@ std::string *MenuManager::GetMenuSound(ItemSelection sel)
 		{
 			if (m_ExitSound.size() > 0)
 			{
-				sound = &m_ExitSound;
+				sound = m_ExitSound.c_str();
 			}
 			break;
 		}
@@ -811,19 +777,3 @@ unsigned int MenuManager::GetRemainingVoteDelay()
 {
 	return s_VoteHandler.GetRemainingVoteDelay();
 }
-
-bool MenuManager::IsClientInVotePool(int client)
-{
-	return s_VoteHandler.IsClientInVotePool(client);
-}
-
-bool MenuManager::RedrawClientVoteMenu(int client)
-{
-	return RedrawClientVoteMenu2(client, true);
-}
-
-bool MenuManager::RedrawClientVoteMenu2(int client, bool revote)
-{
-	return s_VoteHandler.RedrawToClient(client, revote);
-}
-
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -36,8 +36,9 @@
 #include <sh_vector.h>
 #include <sh_stack.h>
 #include <sh_list.h>
+#include <sh_string.h>
+#include "sm_memtable.h"
 #include "sm_globals.h"
-#include <string>

 using namespace SourceMod;
 using namespace SourceHook;
@@ -55,8 +56,12 @@ public:
 	MenuManager();
 public: //SMGlobalClass
 	void OnSourceModAllInitialized();
-	void OnSourceModAllInitialized_Post();
 	void OnSourceModAllShutdown();
+	ConfigResult OnSourceModConfigChanged(const char *key,
+		const char *value,
+		ConfigSource source,
+		char *error,
+		size_t maxlength);
 	void OnSourceModLevelChange(const char *mapName);
 public: //IMenuManager
 	virtual const char *GetInterfaceName()
@@ -84,9 +89,6 @@ public:
 	bool IsVoteInProgress();
 	void CancelVoting();
 	unsigned int GetRemainingVoteDelay();
-	bool IsClientInVotePool(int client);
-	bool RedrawClientVoteMenu(int client);
-	bool RedrawClientVoteMenu2(int client, bool revote);
 public: //IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize);
@@ -95,7 +97,7 @@ public:
 	HandleError ReadStyleHandle(Handle_t handle, IMenuStyle **style);
 public:
 	bool MenuSoundsEnabled();
-	std::string *GetMenuSound(ItemSelection sel);
+	const char *GetMenuSound(ItemSelection sel);
 protected:
 	Handle_t CreateMenuHandle(IBaseMenu *menu, IdentityToken_t *pOwner);
 	Handle_t CreateStyleHandle(IMenuStyle *style);
@@ -105,9 +107,9 @@ private:
 	CVector<IMenuStyle *> m_Styles;
 	HandleType_t m_StyleType;
 	HandleType_t m_MenuType;
-	std::string m_SelectSound = "";
-	std::string m_ExitBackSound = "";
-	std::string m_ExitSound = "";
+	String m_SelectSound;
+	String m_ExitBackSound;
+	String m_ExitSound;
 };

 extern MenuManager g_Menus;
@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
 * 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,12 +34,11 @@
 #include "MenuStyle_Base.h"
 #include "PlayerManager.h"
 #include "MenuManager.h"
+#include "HandleSys.h"
 #include "CellRecipientFilter.h"
 #if defined MENU_DEBUG
-#include <bridge/include/ILogger.h>
+#include "Logger.h"
 #endif
-#include "logic_bridge.h"
-#include "AutoHandleRooter.h"

 BaseMenuStyle::BaseMenuStyle() : m_WatchList(256), m_hHandle(BAD_HANDLE)
 {
@@ -59,7 +58,7 @@ Handle_t BaseMenuStyle::GetHandle()
 void BaseMenuStyle::AddClientToWatch(int client)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] AddClientToWatch(%d)", client);
+	g_Logger.LogMessage("[SM_MENU] AddClientToWatch(%d)", client);
 #endif
 	m_WatchList.push_back(client);
 }
@@ -67,7 +66,7 @@ void BaseMenuStyle::AddClientToWatch(int client)
 void BaseMenuStyle::RemoveClientFromWatch(int client)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] RemoveClientFromWatch(%d)", client);
+	g_Logger.LogMessage("[SM_MENU] RemoveClientFromWatch(%d)", client);
 #endif
 	m_WatchList.remove(client);
 }
@@ -75,7 +74,7 @@ void BaseMenuStyle::RemoveClientFromWatch(int client)
 void BaseMenuStyle::_CancelClientMenu(int client, MenuCancelReason reason, bool bAutoIgnore/* =false */)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] _CancelClientMenu() (client %d) (bAutoIgnore %d) (reason %d)", client, bAutoIgnore, reason);
+	g_Logger.LogMessage("[SM_MENU] _CancelClientMenu() (client %d) (bAutoIgnore %d) (reason %d)", client, bAutoIgnore, reason);
 #endif
 	CBaseMenuPlayer *player = GetMenuPlayer(client);
 	menu_states_t &states = player->states;
@@ -99,7 +98,7 @@ void BaseMenuStyle::_CancelClientMenu(int client, MenuCancelReason reason, bool

 	/* Fire callbacks */
 	mh->OnMenuCancel(menu, client, reason);
-
+	
 	/* Only fire end if there's a valid menu */
 	if (menu)
 	{
@@ -115,7 +114,7 @@ void BaseMenuStyle::_CancelClientMenu(int client, MenuCancelReason reason, bool
 void BaseMenuStyle::CancelMenu(CBaseMenu *menu)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] CancelMenu() (menu %p)", menu);
+	g_Logger.LogMessage("[SM_MENU] CancelMenu() (menu %p)", menu);
 #endif
 	int maxClients = g_Players.GetMaxClients();
 	for (int i=1; i<=maxClients; i++)
@@ -135,7 +134,7 @@ void BaseMenuStyle::CancelMenu(CBaseMenu *menu)
 bool BaseMenuStyle::CancelClientMenu(int client, bool autoIgnore)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] CancelClientMenu() (client %d) (bAutoIgnore %d)", client, autoIgnore);
+	g_Logger.LogMessage("[SM_MENU] CancelClientMenu() (client %d) (bAutoIgnore %d)", client, autoIgnore);
 #endif
 	if (client < 1 || client > g_Players.MaxClients())
 	{
@@ -191,7 +190,7 @@ MenuSource BaseMenuStyle::GetClientMenu(int client, void **object)
 void BaseMenuStyle::OnClientDisconnected(int client)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] OnClientDisconnected(%d)", client);
+	g_Logger.LogMessage("[SM_MENU] OnClientDisconnected(%d)", client);
 #endif
 	CBaseMenuPlayer *player = GetMenuPlayer(client);
 	if (!player->bInMenu)
@@ -214,7 +213,7 @@ void BaseMenuStyle::ProcessWatchList()
 	}

 #if defined MENU_DEBUG
-	logger->LogMessage("BaseMenuStyle::ProcessWatchList(%d,%d,%d,%d,%d,%p)",
+	g_Logger.LogMessage("BaseMenuStyle::ProcessWatchList(%d,%d,%d,%d,%d,%p)", 
 		m_WatchList.m_Size,
 		m_WatchList.m_FirstLink,
 		m_WatchList.m_FreeNodes,
@@ -232,7 +231,7 @@ void BaseMenuStyle::ProcessWatchList()
 #if defined MENU_DEBUG
 	if (total)
 	{
-		logger->LogMessage("[SM_MENU] ProcessWatchList() found %d clients", total);
+		g_Logger.LogMessage("[SM_MENU] ProcessWatchList() found %d clients", total);
 	}
 #endif

@@ -244,7 +243,7 @@ void BaseMenuStyle::ProcessWatchList()
 		client = do_lookup[i];
 		player = GetMenuPlayer(client);
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] ProcessWatchList() (client %d) (bInMenu %d) (menuHoldTime %d) (curTime %f) (menuStartTime %f)",
+		g_Logger.LogMessage("[SM_MENU] ProcessWatchList() (client %d) (bInMenu %d) (menuHoldTime %d) (curTime %f) (menuStartTime %f)",
 			client,
 			player->bInMenu,
 			player->menuHoldTime,
@@ -254,7 +253,7 @@ void BaseMenuStyle::ProcessWatchList()
 		if (!player->bInMenu || !player->menuHoldTime)
 		{
 #if defined MENU_DEBUG
-			logger->LogMessage("[SM_MENU] ProcessWatchList() removing client %d", client);
+			g_Logger.LogMessage("[SM_MENU] ProcessWatchList() removing client %d", client);
 #endif
 			m_WatchList.remove(client);
 			continue;
@@ -269,7 +268,7 @@ void BaseMenuStyle::ProcessWatchList()
 void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] ClientPressedKey() (client %d) (key_press %d)", client, key_press);
+	g_Logger.LogMessage("[SM_MENU] ClientPressedKey() (client %d) (key_press %d)", client, key_press);
 #endif
 	CBaseMenuPlayer *player = GetMenuPlayer(client);

@@ -302,7 +301,7 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 		ItemSelection type = states.slots[key_press].type;

 		/* Check if we should play a sound about the type */
-		if (g_Menus.MenuSoundsEnabled() &&
+		if (g_Menus.MenuSoundsEnabled() && 
 			(!menu || (menu->GetMenuOptionFlags() & MENUFLAG_NO_SOUND) != MENUFLAG_NO_SOUND))
 		{
 			CellRecipientFilter filter;
@@ -311,11 +310,11 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 			clients[0] = client;
 			filter.Initialize(clients, 1);

-			std::string *sound = g_Menus.GetMenuSound(type);
+			const char *sound = g_Menus.GetMenuSound(type);

-			if (nullptr != sound && !sound->empty())
+			if (sound != NULL)
 			{
-				edict_t *pEdict = PEntityOfEntIndex(client);
+				edict_t *pEdict = engine->PEntityOfEntIndex(client);
 				if (pEdict)
 				{
 					ICollideable *pCollideable = pEdict->GetCollideable();
@@ -323,25 +322,15 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 					if (pCollideable)
 					{
 						const Vector & pos = pCollideable->GetCollisionOrigin();
-						enginesound->EmitSound(filter,
-							client,
-							CHAN_AUTO,
-#if SOURCE_ENGINE >= SE_PORTAL2
-							sound->c_str(),
-							-1,
-#endif
-							sound->c_str(),
-							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 || SOURCE_ENGINE == SE_PVKII
-							0,
-#endif
+		
+						enginesound->EmitSound(filter, 
+							client, 
+							CHAN_AUTO, 
+							sound, 
+							VOL_NORM, 
+							ATTN_NORM, 
+							0, 
+							PITCH_NORM, 
 							&pos);
 					}
 				}
@@ -388,9 +377,6 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 		RemoveClientFromWatch(client);
 	}

-	Handle_t hndl = menu ? menu->GetHandle() : BAD_HANDLE;
-	AutoHandleRooter ahr(hndl);
-
 	if (cancel)
 	{
 		mh->OnMenuCancel(menu, client, reason);
@@ -412,7 +398,7 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 bool BaseMenuStyle::DoClientMenu(int client, IMenuPanel *menu, IMenuHandler *mh, unsigned int time)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] DoClientMenu() (client %d) (panel %p) (mh %p) (time %d)",
+	g_Logger.LogMessage("[SM_MENU] DoClientMenu() (client %d) (panel %p) (mh %p) (time %d)",
 		client,
 		menu,
 		mh,
@@ -475,7 +461,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 								 unsigned int time)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] DoClientMenu() (client %d) (menu %p) (mh %p) (time %d)",
+	g_Logger.LogMessage("[SM_MENU] DoClientMenu() (client %d) (menu %p) (mh %p) (time %d)",
 		client,
 		menu,
 		mh,
@@ -487,7 +473,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 	if (!pPlayer || pPlayer->IsFakeClient() || !pPlayer->IsInGame())
 	{
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] DoClientMenu(): Failed to display to client %d", client);
+		g_Logger.LogMessage("[SM_MENU] DoClientMenu(): Failed to display to client %d", client);
 #endif
 		mh->OnMenuCancel(menu, client, MenuCancel_NoDisplay);
 		mh->OnMenuEnd(menu, MenuEnd_Cancelled);
@@ -498,7 +484,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 	if (player->bAutoIgnore)
 	{
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] DoClientMenu(): Client %d is autoIgnoring", client);
+		g_Logger.LogMessage("[SM_MENU] DoClientMenu(): Client %d is autoIgnoring", client);
 #endif
 		mh->OnMenuCancel(menu, client, MenuCancel_NoDisplay);
 		mh->OnMenuEnd(menu, MenuEnd_Cancelled);
@@ -517,7 +503,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 	if (player->bInMenu)
 	{
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] DoClientMenu(): Cancelling old menu to client %d", client);
+		g_Logger.LogMessage("[SM_MENU] DoClientMenu(): Cancelling old menu to client %d", client);
 #endif
 		_CancelClientMenu(client, MenuCancel_Interrupted, true);
 	}
@@ -532,7 +518,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 	if (!display)
 	{
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] DoClientMenu(): Failed to render to client %d", client);
+		g_Logger.LogMessage("[SM_MENU] DoClientMenu(): Failed to render to client %d", client);
 #endif
 		player->bAutoIgnore = false;
 		player->bInMenu = false;
@@ -562,7 +548,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 	player->bAutoIgnore = false;

 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] DoClientMenu() finished successfully (client %d)", client);
+	g_Logger.LogMessage("[SM_MENU] DoClientMenu() finished successfully (client %d)", client);
 #endif

 	return true;
@@ -571,7 +557,7 @@ bool BaseMenuStyle::DoClientMenu(int client,
 bool BaseMenuStyle::RedoClientMenu(int client, ItemOrder order)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] RedoClientMenu() (client %d) (order %d)", client, order);
+	g_Logger.LogMessage("[SM_MENU] RedoClientMenu() (client %d) (order %d)", client, order);
 #endif
 	CBaseMenuPlayer *player = GetMenuPlayer(client);
 	menu_states_t &states = player->states;
@@ -581,7 +567,7 @@ bool BaseMenuStyle::RedoClientMenu(int client, ItemOrder order)
 	if (!display)
 	{
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] RedoClientMenu(): Failed to render menu");
+		g_Logger.LogMessage("[SM_MENU] RedoClientMenu(): Failed to render menu");
 #endif
 		if (player->menuHoldTime)
 		{
@@ -598,15 +584,15 @@ bool BaseMenuStyle::RedoClientMenu(int client, ItemOrder order)
 	player->bAutoIgnore = false;

 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] RedoClientMenu(): Succeeded to client %d", client);
+	g_Logger.LogMessage("[SM_MENU] RedoClientMenu(): Succeeded to client %d", client);
 #endif

 	return true;
 }

-CBaseMenu::CBaseMenu(IMenuHandler *pHandler, IMenuStyle *pStyle, IdentityToken_t *pOwner) :
-m_pStyle(pStyle), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false),
-m_pOwner(pOwner ? pOwner : g_pCoreIdent), m_bDeleting(false), m_bWillFreeHandle(false),
+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_pOwner(pOwner ? pOwner : g_pCoreIdent), m_bDeleting(false), m_bWillFreeHandle(false), 
 m_hHandle(BAD_HANDLE), m_pHandler(pHandler), m_nFlags(MENUFLAG_BUTTON_EXIT)
 {
 }
@@ -633,181 +619,84 @@ bool CBaseMenu::AppendItem(const char *info, const ItemDrawInfo &draw)
 		return false;
 	}

-	CItem item(m_items.size());
+	CItem item;

-	item.info = info;
+	item.infoString = m_Strings.AddString(info);
 	if (draw.display)
-		item.display = std::make_unique<std::string>(draw.display);
+	{
+		item.displayString = m_Strings.AddString(draw.display);
+	}
 	item.style = draw.style;

-	m_items.push_back(std::move(item));
+	m_items.push_back(item);
+
 	return true;
 }

 bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDrawInfo &draw)
 {
-	if (m_Pagination == (unsigned)MENU_NO_PAGINATION &&
-	    m_items.size() >= m_pStyle->GetMaxPageItems())
+	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
+		&& m_items.size() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}

 	if (position >= m_items.size())
+	{
 		return false;
+	}

-	CItem item(position);
-	item.info = info;
+	CItem item;
+	item.infoString = m_Strings.AddString(info);
 	if (draw.display)
-		item.display = std::make_unique<std::string>(draw.display);
+	{
+		item.displayString = m_Strings.AddString(draw.display);
+	}
 	item.style = draw.style;

-	m_items.emplace(m_items.begin() + position, std::move(item));
+	CVector<CItem>::iterator iter = m_items.iterAt(position);
+	m_items.insert(iter, item);
+
 	return true;
 }

 bool CBaseMenu::RemoveItem(unsigned int position)
 {
 	if (position >= m_items.size())
+	{
 		return false;
+	}
+
+	m_items.erase(m_items.iterAt(position));
+
+	if (m_items.size() == 0)
+	{
+		m_Strings.Reset();
+	}

-	m_items.erase(m_items.begin() + position);
 	return true;
 }

 void CBaseMenu::RemoveAllItems()
 {
 	m_items.clear();
+	m_Strings.Reset();
 }

-const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =NULL */, int client/* =0 */)
+const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =NULL */)
 {
 	if (position >= m_items.size())
-		return NULL;
-
-	if (client > 0 && position < m_RandomMaps[client].size())
 	{
-		position = m_RandomMaps[client][position];
+		return NULL;
 	}

 	if (draw)
 	{
-		draw->display = m_items[position].display->c_str();
+		draw->display = m_Strings.GetString(m_items[position].displayString);
 		draw->style = m_items[position].style;
 	}

-	return m_items[position].info.c_str();
-}
-
-void CBaseMenu::ShufflePerClient(int start, int stop)
-{
-	// limit map len to 255 items since it's using uint8
-	int length = MIN(GetItemCount(), 255);
-	if (stop >= 0)
-		length = MIN(length, stop);
-
-	for (int i = 1; i <= SM_MAXPLAYERS; i++)
-	{
-		// populate per-client map ...
-		m_RandomMaps[i].resize(length);
-		for (int j = 0; j < length; j++)
-			m_RandomMaps[i][j] = j;
-
-		// ... and random shuffle it
-		for (int j = length - 1; j > start; j--)
-		{
-			int x = rand() % (j - start + 1) + start;
-			uint8_t tmp = m_RandomMaps[i][x];
-			m_RandomMaps[i][x] = m_RandomMaps[i][j];
-			m_RandomMaps[i][j] = tmp;
-		}
-	}
-}
-
-void CBaseMenu::SetClientMapping(int client, int *array, int length)
-{
-	length = MIN(length, 255);
-	m_RandomMaps[client].resize(length);
-	for (int i = 0; i < length; i++)
-	{
-		m_RandomMaps[client][i] = array[i];
-	}
-}
-
-bool CBaseMenu::IsPerClientShuffled()
-{
-	for (int i = 1; i <= SM_MAXPLAYERS; i++)
-	{
-		if(m_RandomMaps[i].size() > 0)
-			return true;
-	}
-	return false;
-}
-
-unsigned int CBaseMenu::GetRealItemIndex(int client, unsigned int position)
-{
-	if (client > 0 && position < m_RandomMaps[client].size())
-	{
-		position = m_RandomMaps[client][position];
-		return m_items[position].index;
-	}
-
-	return position;
-}
-
-void CBaseMenu::ShufflePerClient(int start, int stop)
-{
-	// limit map len to 255 items since it's using uint8
-	int length = MIN(GetItemCount(), 255);
-	if (stop >= 0)
-		length = MIN(length, stop);
-
-	for (int i = 1; i < SM_MAXPLAYERS + 1; i++)
-	{
-		// populate per-client map ...
-		m_RandomMaps[i].resize(length);
-		for (int j = 0; j < length; j++)
-			m_RandomMaps[i][j] = j;
-
-		// ... and random shuffle it
-		for (int j = length - 1; j > start; j--)
-		{
-			int x = rand() % (j - start + 1) + start;
-			uint8_t tmp = m_RandomMaps[i][x];
-			m_RandomMaps[i][x] = m_RandomMaps[i][j];
-			m_RandomMaps[i][j] = tmp;
-		}
-	}
-}
-
-void CBaseMenu::SetClientMapping(int client, int *array, int length)
-{
-	length = MIN(length, 255);
-	m_RandomMaps[client].resize(length);
-	for (int i = 0; i < length; i++)
-	{
-		m_RandomMaps[client][i] = array[i];
-	}
-}
-
-bool CBaseMenu::IsPerClientShuffled()
-{
-	for (int i = 1; i < SM_MAXPLAYERS + 1; i++)
-	{
-		if(m_RandomMaps[i].length() > 0)
-			return true;
-	}
-	return false;
-}
-
-unsigned int CBaseMenu::GetRealItemIndex(int client, unsigned int position)
-{
-	if (client > 0 && position < m_RandomMaps[client].length())
-	{
-		position = m_RandomMaps[client][position];
-		return m_items[position].index;
-	}
-
-	return position;
+	return m_Strings.GetString(m_items[position].infoString);
 }

 unsigned int CBaseMenu::GetItemCount()
@@ -845,7 +734,7 @@ IMenuStyle *CBaseMenu::GetDrawStyle()

 void CBaseMenu::SetDefaultTitle(const char *message)
 {
-	m_Title = message;
+	m_Title.assign(message);
 }

 const char *CBaseMenu::GetDefaultTitle()
@@ -861,7 +750,7 @@ void CBaseMenu::Cancel()
 	}

 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] CBaseMenu::Cancel(%p) (m_bShouldDelete %d)",
+	g_Logger.LogMessage("[SM_MENU] CBaseMenu::Cancel(%p) (m_bShouldDelete %d)",
 		this,
 		m_bShouldDelete);
 #endif
@@ -885,7 +774,7 @@ void CBaseMenu::Destroy(bool releaseHandle)
 	}

 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] CBaseMenu::Destroy(%p) (release %d) (m_bCancelling %d) (m_bShouldDelete %d)",
+	g_Logger.LogMessage("[SM_MENU] CBaseMenu::Destroy(%p) (release %d) (m_bCancelling %d) (m_bShouldDelete %d)",
 		this,
 		releaseHandle,
 		m_bCancelling,
@@ -917,7 +806,7 @@ void CBaseMenu::InternalDelete()

 		m_hHandle = BAD_HANDLE;
 		m_bDeleting = true;
-		handlesys->FreeHandle(hndl, &sec);
+		g_HandleSys.FreeHandle(hndl, &sec);
 	}

 	m_pHandler->OnMenuDestroy(this);
@@ -942,5 +831,7 @@ IMenuHandler *CBaseMenu::GetHandler()

 unsigned int CBaseMenu::GetBaseMemUsage()
 {
-	return m_Title.size() + (m_items.size() * sizeof(CItem));
+	return m_Title.size() 
+		+ m_Strings.GetMemTable()->GetMemUsage()
+		+ (m_items.size() * sizeof(CItem));
 }
@@ -1,14 +1,14 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
 * 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
@@ -32,54 +32,31 @@
 #ifndef _INCLUDE_MENUSTYLE_BASE_H
 #define _INCLUDE_MENUSTYLE_BASE_H

-#include <memory>
-#include <utility>
-
 #include <IMenuManager.h>
 #include <IPlayerHelpers.h>
-#include <am-string.h>
-#include <am-vector.h>
+#include <sh_string.h>
+#include <sh_vector.h>
+#include "sm_memtable.h"
 #include "sm_fastlink.h"

 using namespace SourceMod;
+using namespace SourceHook;

 class CItem
 {
 public:
-	CItem(unsigned int index)
+	CItem()
 	{
-		this->index = index;
+		infoString = -1;
+		displayString = -1;
 		style = 0;
 		access = 0;
 	}
-	CItem(CItem &&other)
-	: info(std::move(other.info)),
-	  display(std::move(other.display))
-	{
-		index = other.index;
-		style = other.style;
-		access = other.access;
-	}
-	CItem & operator =(CItem &&other)
-	{
-		index = other.index;
-		info = std::move(other.info);
-		display = std::move(other.display);
-		style = other.style;
-		access = other.access;
-		return *this;
-	}
-
 public:
-	unsigned int index;
-	std::string info;
-	std::unique_ptr<std::string> display;
+	int infoString;
+	int displayString;
 	unsigned int style;
 	unsigned int access;
-
-private:
-	CItem(const CItem &other) = delete;
-	CItem &operator =(const CItem &other) = delete;
 };

 class CBaseMenuPlayer
@@ -98,7 +75,7 @@ public:

 class CBaseMenu;

-class BaseMenuStyle :
+class BaseMenuStyle : 
 	public IMenuStyle,
 	public IClientListener
 {
@@ -113,11 +90,11 @@ public: //IClientListener
 public: //what derived must implement
 	virtual CBaseMenuPlayer *GetMenuPlayer(int client) =0;
 	virtual void SendDisplay(int client, IMenuPanel *display) =0;
-public: //what derived may implement
-	virtual bool DoClientMenu(int client,
-		CBaseMenu *menu,
+public: //what derived may implement 
+	virtual bool DoClientMenu(int client, 
+		CBaseMenu *menu, 
 		unsigned int first_item,
-		IMenuHandler *mh,
+		IMenuHandler *mh, 
 		unsigned int time);
 	virtual bool DoClientMenu(int client, IMenuPanel *menu, IMenuHandler *mh, unsigned int time);
 	virtual void AddClientToWatch(int client);
@@ -144,7 +121,7 @@ public:
 	virtual bool InsertItem(unsigned int position, const char *info, const ItemDrawInfo &draw);
 	virtual bool RemoveItem(unsigned int position);
 	virtual void RemoveAllItems();
-	virtual const char *GetItemInfo(unsigned int position, ItemDrawInfo *draw=NULL, int client=0);
+	virtual const char *GetItemInfo(unsigned int position, ItemDrawInfo *draw=NULL);
 	virtual unsigned int GetItemCount();
 	virtual bool SetPagination(unsigned int itemsPerPage);
 	virtual unsigned int GetPagination();
@@ -158,18 +135,15 @@ public:
 	virtual unsigned int GetMenuOptionFlags();
 	virtual void SetMenuOptionFlags(unsigned int flags);
 	virtual IMenuHandler *GetHandler();
-	virtual void ShufflePerClient(int start, int stop);
-	virtual void SetClientMapping(int client, int *array, int length);
-	virtual bool IsPerClientShuffled();
-	virtual unsigned int GetRealItemIndex(int client, unsigned int position);
 	unsigned int GetBaseMemUsage();
 private:
 	void InternalDelete();
 protected:
-	std::string m_Title;
+	String m_Title;
 	IMenuStyle *m_pStyle;
+	BaseStringTable m_Strings;
 	unsigned int m_Pagination;
-	std::vector<CItem> m_items;
+	CVector<CItem> m_items;
 	bool m_bShouldDelete;
 	bool m_bCancelling;
 	IdentityToken_t *m_pOwner;
@@ -178,7 +152,6 @@ protected:
 	Handle_t m_hHandle;
 	IMenuHandler *m_pHandler;
 	unsigned int m_nFlags;
-	std::vector<uint8_t> m_RandomMaps[SM_MAXPLAYERS+1];
 };

 #endif //_INCLUDE_MENUSTYLE_BASE_H
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,23 +32,10 @@
 #include "MenuStyle_Radio.h"
 #include "sm_stringutil.h"
 #include "UserMessages.h"
-#include <IGameConfigs.h>
+#include "GameConfigs.h"
 #include "PlayerManager.h"
 #if defined MENU_DEBUG
-#include <bridge/include/ILogger.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>
-#elif SOURCE_ENGINE == SE_BLADE
-#include <game/shared/berimbau/protobuf/berimbau_usermessages.pb.h>
-#elif SOURCE_ENGINE == SE_MCV
-#include <game/shared/vietnam/protobuf/vietnam_usermessages.pb.h>
+#include "Logger.h"
 #endif

 extern const char *g_RadioNumTable[];
@@ -57,14 +44,6 @@ int g_ShowMenuId = -1;
 bool g_bRadioInit = false;
 unsigned int g_RadioMenuTimeout = 0;

-// back, next, exit
-#define MAX_PAGINATION_OPTIONS 3
-
-#define MAX_MENUSLOT_KEYS 10
-
-static unsigned int s_RadioMaxPageItems = MAX_MENUSLOT_KEYS;
-static bool s_RadioClosesOnInvalidSlot = false;
-
 CRadioStyle::CRadioStyle()
 {
 	m_players = new CRadioMenuPlayer[256+1];
@@ -87,10 +66,6 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 	}

 	g_bRadioInit = true;
-
-	// Always register the style. Use IsSupported() to check for validity before use.
-	g_Menus.AddStyle(this);
-
 	const char *msg = g_pGameConf->GetKeyValue("HudRadioMenuMsg");
 	if (!msg || msg[0] == '\0')
 	{
@@ -114,24 +89,7 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 		g_RadioMenuTimeout = 0;
 	}

-	const char *items = g_pGameConf->GetKeyValue("RadioMenuMaxPageItems");
-	if (items != NULL)
-	{
-		int value = atoi(items);
-
-		// Only override the mostly-safe default if it's a sane value
-		if (value > MAX_PAGINATION_OPTIONS && value <= MAX_MENUSLOT_KEYS)
-		{
-			s_RadioMaxPageItems = value;
-		}
-	}
-
-	const char *closes = g_pGameConf->GetKeyValue("RadioMenuClosesOnInvalidSlot");
-	if (closes != nullptr && strcmp(closes, "yes") == 0)
-	{
-		s_RadioClosesOnInvalidSlot = true;
-	}
-
+	g_Menus.AddStyle(this);
 	g_Menus.SetDefaultStyle(this);

 	g_UserMsgs.HookUserMessage(g_ShowMenuId, this, false);
@@ -176,22 +134,13 @@ static unsigned int g_last_holdtime = 0;
 static unsigned int g_last_client_count = 0;
 static int g_last_clients[256];

-#ifdef USE_PROTOBUF_USERMESSAGES
-void CRadioStyle::OnUserMessage(int msg_id, protobuf::Message &msg, IRecipientFilter *pFilter)
-#else
 void CRadioStyle::OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter)
-#endif
 {
 	int count = pFilter->GetRecipientCount();
-
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_BLADE || SOURCE_ENGINE == SE_MCV
-	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;

@@ -207,7 +156,7 @@ void CRadioStyle::OnUserMessageSent(int msg_id)
 	{
 		int client = g_last_clients[i];
 #if defined MENU_DEBUG
-		logger->LogMessage("[SM_MENU] CRadioStyle got ShowMenu (client %d) (bInMenu %d)",
+		g_Logger.LogMessage("[SM_MENU] CRadioStyle got ShowMenu (client %d) (bInMenu %d)",
 			client,
 			m_players[client].bInExternMenu);
 #endif
@@ -239,7 +188,7 @@ IBaseMenu *CRadioStyle::CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwn

 unsigned int CRadioStyle::GetMaxPageItems()
 {
-	return s_RadioMaxPageItems;
+	return 10;
 }

 const char *CRadioStyle::GetStyleName()
@@ -268,6 +217,15 @@ CRadioDisplay *CRadioStyle::MakeRadioDisplay(CRadioMenu *menu)
 	return display;
 }

+IMenuPanel *CRadioStyle::MakeRadioDisplay(const char *str, int keys)
+{
+	CRadioDisplay *pPanel = MakeRadioDisplay(NULL);
+
+	pPanel->DirectSet(str, keys);
+
+	return pPanel;
+}
+
 void CRadioStyle::FreeRadioDisplay(CRadioDisplay *display)
 {
 	m_FreeDisplays.push(display);
@@ -334,12 +292,11 @@ void CRadioDisplay::Reset()
 	keys = 0;
 }

-bool CRadioDisplay::DirectSet(const char *str)
+void CRadioDisplay::DirectSet(const char *str, int keymap)
 {
 	m_Title.clear();
 	m_BufferText.assign(str);
-	
-	return true;
+	keys = keymap;
 }

 unsigned int CRadioDisplay::GetCurrentKey()
@@ -349,7 +306,7 @@ unsigned int CRadioDisplay::GetCurrentKey()

 bool CRadioDisplay::SetCurrentKey(unsigned int key)
 {
-	if (key < m_NextPos || m_NextPos > s_RadioMaxPageItems)
+	if (key < m_NextPos || m_NextPos > 10)
 	{
 		return false;
 	}
@@ -385,7 +342,7 @@ void CRadioDisplay::DrawTitle(const char *text, bool onlyIfEmpty/* =false */)

 unsigned int CRadioDisplay::DrawItem(const ItemDrawInfo &item)
 {
-	if (m_NextPos > s_RadioMaxPageItems || !CanDrawItem(item.style))
+	if (m_NextPos > 10 || !CanDrawItem(item.style))
 	{
 		return 0;
 	}
@@ -460,7 +417,7 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 {
 	if (title[0] != '\0')
 	{
-		display_len = ke::SafeSprintf(display_pkt, 
+		display_len = UTIL_Format(display_pkt, 
 			sizeof(display_pkt), 
 			"%s\n%s", 
 			title,
@@ -468,25 +425,17 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 	}
 	else
 	{
-		display_len = ke::SafeStrcpy(display_pkt, 
+		display_len = UTIL_Format(display_pkt, 
 			sizeof(display_pkt), 
+			"%s", 
 			text);
 	}
-
-	// Some games have implemented CHudMenu::SelectMenuItem to close the menu
-	// even if an invalid slot has been selected, which causes us a problem as
-	// we'll never get any notification from the client and we'll keep the menu
-	// alive on our end indefinitely. For these games, pretend that every slot
-	// is valid for selection so we're guaranteed to get a menuselect command.
-	// We don't want to do this for every game as the common SelectMenuItem
-	// implementation ignores invalid selections and keeps the menu open, which
-	// is a much nicer user experience.
-	display_keys = s_RadioClosesOnInvalidSlot ? 0x7ff : keys;
+	display_keys = keys;
 }

 void CRadioMenuPlayer::Radio_Refresh()
 {
-	cell_t players[1] = { (cell_t)m_index };
+	cell_t players[1] = {m_index};
 	char *ptr = display_pkt;
 	char save = 0;
 	size_t len = display_len;
@@ -502,18 +451,6 @@ void CRadioMenuPlayer::Radio_Refresh()
 		time = menuHoldTime - (unsigned int)(gpGlobals->curtime - menuStartTime);
 	}

-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_BLADE || SOURCE_ENGINE == SE_MCV
-	// TODO: find what happens past 240 on CS:GO
-	CCSUsrMsg_ShowMenu *msg = (CCSUsrMsg_ShowMenu *)g_UserMsgs.StartProtobufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
-	if (!msg)
-	{
-		return;
-	}
-	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)
@@ -521,8 +458,7 @@ void CRadioMenuPlayer::Radio_Refresh()
 			save = ptr[240];
 			ptr[240] = '\0';
 		}
-
-		bf_write *buffer = g_UserMsgs.StartBitBufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
+		bf_write *buffer = g_UserMsgs.StartMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
 		buffer->WriteWord(display_keys);
 		buffer->WriteChar(time ? time : -1);
 		buffer->WriteByte( (len > 240) ? 1 : 0 );
@@ -539,7 +475,6 @@ void CRadioMenuPlayer::Radio_Refresh()
 			break;
 		}
 	}
-#endif

 	display_last_refresh = gpGlobals->curtime;
 }
@@ -575,7 +510,6 @@ unsigned int CRadioDisplay::GetApproxMemUsage()
 CRadioMenu::CRadioMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner) : 
 CBaseMenu(pHandler, &g_RadioMenuStyle, pOwner)
 {
-	m_Pagination = s_RadioMaxPageItems - MAX_PAGINATION_OPTIONS;
 }

 bool CRadioMenu::SetExtOption(MenuOption option, const void *valuePtr)
@@ -599,7 +533,7 @@ bool CRadioMenu::DisplayAtItem(int client,
 							   IMenuHandler *alt_handler)
 {
 #if defined MENU_DEBUG
-	logger->LogMessage("[SM_MENU] CRadioMenu::Display(%p) (client %d) (time %d)",
+	g_Logger.LogMessage("[SM_MENU] CRadioMenu::Display(%p) (client %d) (time %d)",
 		this,
 		client,
 		time);
@@ -609,7 +543,6 @@ bool CRadioMenu::DisplayAtItem(int client,
 		return false;
 	}

-	AutoHandleRooter ahr(this->GetHandle());
 	return g_RadioMenuStyle.DoClientMenu(client,
 		this,
 		start_item,
@@ -617,17 +550,6 @@ bool CRadioMenu::DisplayAtItem(int client,
 		time);
 }

-bool CRadioMenu::SetPagination(unsigned int itemsPerPage)
-{
-	const unsigned int maxPerPage = s_RadioMaxPageItems - MAX_PAGINATION_OPTIONS;
-	if (itemsPerPage > maxPerPage)
-	{
-		return false;
-	}
-
-	return CBaseMenu::SetPagination(itemsPerPage);
-}
-
 void CRadioMenu::Cancel_Finally()
 {
 	g_RadioMenuStyle.CancelMenu(this);
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -37,13 +37,10 @@
 #include "MenuStyle_Base.h"
 #include "sourcemm_api.h"
 #include <IPlayerHelpers.h>
-#include "UserMessages.h"
+#include <IUserMessages.h>
 #include "sm_fastlink.h"
 #include <sh_stack.h>
-#include <sh_string.h>
 #include <compat_wrappers.h>
-#include "logic/common_logic.h"
-#include "AutoHandleRooter.h"

 using namespace SourceMod;

@@ -68,11 +65,7 @@ private:
 class CRadioStyle : 
 	public BaseMenuStyle,
 	public SMGlobalClass,
-#ifdef USE_PROTOBUF_USERMESSAGES
-	public IProtobufUserMessageListener
-#else
-	public IBitBufUserMessageListener
-#endif
+	public IUserMessageListener
 {
 public:
 	CRadioStyle();
@@ -91,11 +84,7 @@ public: //IMenuStyle
 	unsigned int GetMaxPageItems();
 	unsigned int GetApproxMemUsage();
 public: //IUserMessageListener
-#ifdef USE_PROTOBUF_USERMESSAGES
-	void OnUserMessage(int msg_id, protobuf::Message &msg, IRecipientFilter *pFilter);
-#else
 	void OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFilter);
-#endif
 	void OnUserMessageSent(int msg_id);
 public:
 	bool IsSupported();
@@ -104,6 +93,7 @@ public:
 	CRadioDisplay *MakeRadioDisplay(CRadioMenu *menu=NULL);
 	void FreeRadioDisplay(CRadioDisplay *display);
 	CRadioMenuPlayer *GetRadioMenuPlayer(int client);
+	IMenuPanel *MakeRadioDisplay(const char *str, int keys);
 private:
 	CRadioMenuPlayer *m_players;
 	CStack<CRadioDisplay *> m_FreeDisplays;
@@ -131,7 +121,8 @@ public: //IMenuPanel
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
-	bool DirectSet(const char *str);
+public:
+	void DirectSet(const char *str, int keymap);
 private:
 	String m_BufferText;
 	String m_Title;
@@ -151,7 +142,6 @@ public:
 		unsigned int time,
 		unsigned int start_item,
 		IMenuHandler *alt_handler/* =NULL */);
-	bool SetPagination(unsigned int itemsPerPage);
 	void Cancel_Finally();
 	unsigned int GetApproxMemUsage();
 };
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -32,6 +32,7 @@
 #include "sm_stringutil.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
+#include "Translator.h"
 #include "PlayerManager.h"
 #include "ConCmdManager.h"

@@ -66,14 +67,14 @@ bool ValveMenuStyle::OnClientCommand(int client, const char *cmdname, const CCom
 void ValveMenuStyle::OnSourceModAllInitialized()
 {
 	g_Players.AddClientListener(this);
-	SH_ADD_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
+	SH_ADD_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
 	g_pSPHCC = SH_GET_CALLCLASS(serverpluginhelpers);
 }

 void ValveMenuStyle::OnSourceModShutdown()
 {
 	SH_RELEASE_CALLCLASS(g_pSPHCC);
-	SH_REMOVE_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
+	SH_REMOVE_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
 	g_Players.RemoveClientListener(this);
 }

@@ -87,7 +88,7 @@ void ValveMenuStyle::HookCreateMessage(edict_t *pEdict,
 		return;
 	}

-	int client = IndexOfEdict(pEdict);
+	int client = engine->IndexOfEdict(pEdict);
 	if (client < 1 || client > 256)
 	{
 		return;
@@ -293,7 +294,7 @@ unsigned int CValveMenuDisplay::DrawItem(const ItemDrawInfo &item)
 	}

 	char buffer[255];
-	ke::SafeSprintf(buffer, sizeof(buffer), "%d. %s", m_NextPos, item.display);
+	UTIL_Format(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]);
@@ -324,7 +325,7 @@ void CValveMenuDisplay::SendRawDisplay(int client, int priority, unsigned int ti
 	m_pKv->SetInt("time", time ? time : 200);

 	SH_CALL(g_pSPHCC, &IServerPluginHelpers::CreateMessage)(
-		PEntityOfEntIndex(client),
+		engine->PEntityOfEntIndex(client),
 		DIALOG_MENU,
 		m_pKv,
 		vsp_interface);
@@ -378,7 +379,7 @@ bool CValveMenu::SetExtOption(MenuOption option, const void *valuePtr)
 {
 	if (option == MenuOption_IntroMessage)
 	{
-		ke::SafeStrcpy(m_IntroMsg, sizeof(m_IntroMsg), (const char *)valuePtr);
+		strncopy(m_IntroMsg, (const char *)valuePtr, sizeof(m_IntroMsg));
 		return true;
 	} else if (option == MenuOption_IntroColor) {
 		unsigned int *array = (unsigned int *)valuePtr;
@@ -404,7 +405,6 @@ bool CValveMenu::DisplayAtItem(int client,
 		return false;
 	}

-	AutoHandleRooter ahr(this->GetHandle());
 	return g_ValveMenuStyle.DoClientMenu(client, this, start_item, alt_handler ? alt_handler : m_pHandler, time);
 }

@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -39,8 +39,6 @@
 #include "KeyValues.h"
 #include "sm_fastlink.h"
 #include <compat_wrappers.h>
-#include "logic/common_logic.h"
-#include "AutoHandleRooter.h"

 using namespace SourceMod;

@@ -77,7 +75,6 @@ public: //IMenuStyle
 	IBaseMenu *CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner);
 	unsigned int GetMaxPageItems();
 	unsigned int GetApproxMemUsage();
-	bool IsSupported() { return true; }
 private:
 	void HookCreateMessage(edict_t *pEdict, DIALOG_TYPE type, KeyValues *kv, IServerPluginCallbacks *plugin);
 private:
@@ -108,7 +105,6 @@ public:
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
-	bool DirectSet(const char *str) { return false; }
 private:
 	KeyValues *m_pKv;
 	unsigned int m_NextPos;
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sw=4 :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -34,57 +34,10 @@
 #include "MenuVoting.h"
 #include "PlayerManager.h"
 #include "sourcemm_api.h"
-#include <sourcemod.h>
-#include <Logger.h>
-#include <HalfLife2.h>
-#include <mathlib.h>
-#include <const.h>
-#include <ITranslator.h>
-#include "logic_bridge.h"

 float g_next_vote = 0.0f;

-#define VOTE_NOT_VOTING -2
-#define VOTE_PENDING -1
-
-ConVar sm_vote_hintbox("sm_vote_progress_hintbox", 
-					   "0", 
-					   0, 
-					   "Show current vote progress in a hint box",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-ConVar sm_vote_chat("sm_vote_progress_chat", 
-					   "0", 
-					   0, 
-					   "Show current vote progress as chat messages",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-ConVar sm_vote_console("sm_vote_progress_console", 
-					   "0", 
-					   0, 
-					   "Show current vote progress as console messages",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-ConVar sm_vote_client_console("sm_vote_progress_client_console", 
-					   "0", 
-					   0, 
-					   "Show current vote progress as console messages to clients",
-					   true,
-					   0.0,
-					   true,
-					   1.0);
-
-
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue);
 #else
 void OnVoteDelayChange(ConVar *cvar, const char *value);
@@ -99,7 +52,7 @@ ConVar sm_vote_delay("sm_vote_delay",
 					 0.0,
 					 OnVoteDelayChange);

-#if SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 void OnVoteDelayChange(IConVar *cvar, const char *value, float flOldValue)
 #else
 void OnVoteDelayChange(ConVar *cvar, const char *value)
@@ -160,19 +113,14 @@ void VoteMenuHandler::OnClientDisconnected(int client)
 		return;
 	}

-	/* Wipe out their vote if they had one.  We have to make sure the the the
-	 * newly connected client is not allowed to vote. 
-	 */
+	/* Wipe out their vote if they had one */
 	int item;
-	if ((item = m_ClientVotes[client]) >= VOTE_PENDING)
+	if ((item = m_ClientVotes[client]) >= 0)
 	{
-		if (item >= 0)
-		{
-			assert((unsigned)item < m_Items);
-			assert(m_Votes[item] > 0);
-			m_Votes[item]--;
-		}
-		m_ClientVotes[client] = VOTE_NOT_VOTING;
+		assert((unsigned)item < m_Items);
+		assert(m_Votes[item] > 0);
+		m_Votes[item]--;
+		m_ClientVotes[client] = -1;
 	}
 }

@@ -181,28 +129,18 @@ bool VoteMenuHandler::IsVoteInProgress()
 	return (m_pCurMenu != NULL);
 }

-bool VoteMenuHandler::StartVote(IBaseMenu *menu,
-								unsigned int num_clients,
-								int clients[],
-								unsigned int max_time,
-								unsigned int flags/* =0 */)
+bool VoteMenuHandler::StartVote(IBaseMenu *menu, unsigned int num_clients, int clients[], unsigned int max_time, unsigned int flags/* =0 */)
 {
 	if (!InitializeVoting(menu, menu->GetHandler(), max_time, flags))
 	{
 		return false;
 	}

-	/* Note: we can use game time and not universal time because 
-	 * if we're voting then players are in-game.
-	 */
-
 	float fVoteDelay = sm_vote_delay.GetFloat();
 	if (fVoteDelay < 1.0)
 	{
 		g_next_vote = 0.0;
-	}
-	else
-	{
+	} else {
 		/* This little trick breaks for infinite votes!
 		 * However, we just ignore that since those 1) shouldn't exist and 
 		 * 2) people must be checking IsVoteInProgress() beforehand anyway.
@@ -210,15 +148,8 @@ bool VoteMenuHandler::StartVote(IBaseMenu *menu,
 		g_next_vote = gpGlobals->curtime + fVoteDelay + (float)max_time;
 	}

-	m_fStartTime = gpGlobals->curtime;
-	m_nMenuTime = max_time;
-
 	for (unsigned int i=0; i<num_clients; i++)
 	{
-		if (clients[i] < 1 || clients[i] > 256)
-		{
-			continue;
-		}
 		menu->Display(clients[i], max_time, this);
 	}

@@ -227,72 +158,6 @@ bool VoteMenuHandler::StartVote(IBaseMenu *menu,
 	return true;
 }

-bool VoteMenuHandler::IsClientInVotePool(int client)
-{
-	if (client < 1 
-		|| client > g_Players.MaxClients() 
-		|| m_pCurMenu == NULL)
-	{
-		return false;
-	}
-
-	return (m_ClientVotes[client] > VOTE_NOT_VOTING);
-}
-
-bool VoteMenuHandler::GetClientVoteChoice(int client, unsigned int *pItem)
-{
-	if (!IsClientInVotePool(client)
-		|| m_ClientVotes[client] == VOTE_PENDING)
-	{
-		return false;
-	}
-
-	*pItem = m_ClientVotes[client];
-
-	return true;
-}
-
-bool VoteMenuHandler::RedrawToClient(int client, bool revotes)
-{
-	unsigned int time_limit;
-
-	if (!IsClientInVotePool(client))
-	{
-		return false;
-	}
-
-	if (m_ClientVotes[client] >= 0)
-	{
-		if ((m_VoteFlags & VOTEFLAG_NO_REVOTES) == VOTEFLAG_NO_REVOTES || !revotes)
-		{
-			return false;
-		}
-		assert((unsigned)m_ClientVotes[client] < m_Items);
-		assert(m_Votes[m_ClientVotes[client]] > 0);
-		m_Votes[m_ClientVotes[client]]--;
-		m_ClientVotes[client] = VOTE_PENDING;
-		m_Revoting[client] = true;
-		m_NumVotes--;
-	}
-
-	if (m_nMenuTime == MENU_TIME_FOREVER)
-	{
-		time_limit = m_nMenuTime;
-	}
-	else
-	{
-		time_limit = (int)((float)m_nMenuTime - (gpGlobals->curtime - m_fStartTime));
-		
-		/* Make sure this doesn't round to zero */
-		if (time_limit == MENU_TIME_FOREVER)
-		{
-			time_limit = 1;
-		}
-	}
-
-	return m_pCurMenu->Display(client, time_limit, this);
-}
-
 bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu, 
 									   IMenuHandler *handler,
 									   unsigned int time,
@@ -308,8 +173,7 @@ bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu,
 	/* Mark all clients as not voting */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		m_ClientVotes[i] = VOTE_NOT_VOTING;
-		m_Revoting[i] = false;
+		m_ClientVotes[i] = -2;
 	}

 	m_Items = menu->GetItemCount();
@@ -323,9 +187,7 @@ bool VoteMenuHandler::InitializeVoting(IBaseMenu *menu,
 			m_Votes[i] = 0;
 		}
 		m_Votes.resize(m_Items, 0);
-	}
-	else
-	{
+	} else {
 		for (unsigned int i=0; i<m_Items; i++)
 		{
 			m_Votes[i] = 0;
@@ -353,8 +215,6 @@ void VoteMenuHandler::StartVoting()

 	m_pHandler->OnMenuVoteStart(m_pCurMenu);

-	m_displayTimer = g_Timers.CreateTimer(this, 1.0, NULL, TIMER_FLAG_REPEAT|TIMER_FLAG_NO_MAPCHANGE);
-
 	/* By now we know how many clients were set.  
 	 * If there are none, we should end IMMEDIATELY.
 	 */
@@ -362,8 +222,6 @@ void VoteMenuHandler::StartVoting()
 	{
 		EndVoting();
 	}
-
-	m_TotalClients = m_Clients;
 }

 void VoteMenuHandler::DecrementPlayerCount()
@@ -394,17 +252,10 @@ void VoteMenuHandler::EndVoting()
 	if (fVoteDelay < 1.0)
 	{
 		g_next_vote = 0.0;
-	}
-	else
-	{
+	} else {
 		g_next_vote = gpGlobals->curtime + fVoteDelay;
 	}

-	if (m_displayTimer)
-	{
-		g_Timers.KillTimer(m_displayTimer);
-	}
-
 	if (m_bCancelled)
 	{
 		/* If we were cancelled, don't bother tabulating anything.
@@ -451,7 +302,7 @@ void VoteMenuHandler::EndVoting()
 	/* Build the client list */
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
-		if (m_ClientVotes[i] >= VOTE_PENDING)
+		if (m_ClientVotes[i] >= -1)
 		{
 			client_vote[vote.num_clients].client = i;
 			client_vote[vote.num_clients].item = m_ClientVotes[i];
@@ -495,7 +346,7 @@ void VoteMenuHandler::OnMenuCancel(IBaseMenu *menu, int client, MenuCancelReason

 void VoteMenuHandler::OnMenuDisplay(IBaseMenu *menu, int client, IMenuPanel *display)
 {
-	m_ClientVotes[client] = VOTE_PENDING;
+	m_ClientVotes[client] = -1;
 	m_pHandler->OnMenuDisplay(menu, client, display);
 }

@@ -514,62 +365,9 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 	/* Check by our item count, NOT the vote array size */
 	if (item < m_Items)
 	{
-		unsigned int index = menu->GetRealItemIndex(client, item);
-		m_ClientVotes[client] = index;
-		m_Votes[index]++;
+		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, client);
-
-			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);
@@ -592,9 +390,6 @@ void VoteMenuHandler::InternalReset()
 	m_NumVotes = 0;
 	m_bCancelled = false;
 	m_pHandler = NULL;
-	m_leaderList[0] = '\0';
-	m_displayTimer = NULL;
-	m_TotalClients = 0;
 }

 void VoteMenuHandler::CancelVoting()
@@ -616,87 +411,3 @@ bool VoteMenuHandler::IsCancelling()
 {
 	return m_bCancelled;
 }
-
-void VoteMenuHandler::DrawHintProgress()
-{
-	if (!sm_vote_hintbox.GetBool())
-	{
-		return;
-	}
-
-	static char buffer[1024];
-
-	float timeRemaining = (m_fStartTime + m_nMenuTime) - gpGlobals->curtime;
-	if (timeRemaining < 0)
-	{
-		timeRemaining = 0.0;
-	}
-
-	int iTimeRemaining = RoundFloatToInt(timeRemaining);
-	
-	int maxclients = g_Players.GetMaxClients();
-	for (int i=1; i<=maxclients; i++)
-	{
-		if (g_Players.GetPlayerByIndex(i)->IsInGame())
-		{
-			logicore.CoreTranslate(buffer, sizeof(buffer), "%T%s", 6, NULL, "Vote Count",
-			                       &i, &m_NumVotes, &m_TotalClients, &iTimeRemaining, &m_leaderList);
-			g_HL2.HintTextMsg(i, buffer);
-		}
-	}
-}
-
-void VoteMenuHandler::BuildVoteLeaders()
-{
-	if (m_NumVotes == 0 || !sm_vote_hintbox.GetBool())
-	{
-		return;
-	}
-
-	menu_vote_result_t vote;
-	menu_vote_result_t::menu_item_vote_t item_vote[256];
-
-	memset(&vote, 0, sizeof(vote));
-
-	/* Build the item list */
-	for (unsigned int i=0; i<m_Items; i++)
-	{
-		if (m_Votes[i] > 0)
-		{
-			item_vote[vote.num_items].count = m_Votes[i];
-			item_vote[vote.num_items].item = i;
-			vote.num_votes += m_Votes[i];
-			vote.num_items++;
-		}
-	}
-	vote.item_list = item_vote;
-	assert(vote.num_votes);
-
-	/* Sort the item list descending */
-	qsort(item_vote,
-		vote.num_items,
-		sizeof(menu_vote_result_t::menu_item_vote_t),
-		SortVoteItems);
-
-	/* Take the top 3 (if applicable) and draw them */
-	int len = 0;
-	for (unsigned int i=0; i<vote.num_items && i<3; i++)
-	{
-		int curItem = vote.item_list[i].item;
-		ItemDrawInfo dr;
-		m_pCurMenu->GetItemInfo(curItem, &dr);
-		len += g_SourceMod.Format(m_leaderList + len, sizeof(m_leaderList) - len, "\n%i. %s: (%i)", i+1, dr.display, vote.item_list[i].count);
-	}
-}
-
-SourceMod::ResultType VoteMenuHandler::OnTimer(ITimer *pTimer, void *pData)
-{
-	DrawHintProgress();
-
-	return Pl_Continue;
-}
-
-void VoteMenuHandler::OnTimerEnd(ITimer *pTimer, void *pData)
-{
-	m_displayTimer = NULL;
-}
@@ -2,7 +2,7 @@
 * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -36,7 +36,6 @@
 #include <IPlayerHelpers.h>
 #include <sh_vector.h>
 #include "sm_globals.h"
-#include <TimerSys.h>

 using namespace SourceHook;
 using namespace SourceMod;
@@ -44,8 +43,7 @@ using namespace SourceMod;
 class VoteMenuHandler : 
 	public IMenuHandler, 
 	public SMGlobalClass,
-	public IClientListener,
-	public ITimedEvent
+	public IClientListener
 {
 public: //SMGlobalClass
 	void OnSourceModAllInitialized();
@@ -63,9 +61,6 @@ public: //IMenuHandler
 	void OnMenuEnd(IBaseMenu *menu, MenuEndReason reason);
 	void OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style);
 	unsigned int OnMenuDisplayItem(IBaseMenu *menu, int client, IMenuPanel *panel, unsigned int item, const ItemDrawInfo &dr);
-public: //ITimedEvent
-	ResultType OnTimer(ITimer *pTimer, void *pData);
-	void OnTimerEnd(ITimer *pTimer, void *pData);
 public:
 	bool StartVote(IBaseMenu *menu,
 		unsigned int num_clients,
@@ -77,9 +72,6 @@ public:
 	IBaseMenu *GetCurrentMenu();
 	bool IsCancelling();
 	unsigned int GetRemainingVoteDelay();
-	bool IsClientInVotePool(int client);
-	bool GetClientVoteChoice(int client, unsigned int *pItem);
-	bool RedrawToClient(int client, bool revote);
 private:
 	void Reset(IMenuHandler *mh);
 	void DecrementPlayerCount();
@@ -90,12 +82,9 @@ private:
 		unsigned int time,
 		unsigned int flags);
 	void StartVoting();
-	void DrawHintProgress();
-	void BuildVoteLeaders();
 private:
 	IMenuHandler *m_pHandler;
 	unsigned int m_Clients;
-	unsigned int m_TotalClients;
 	unsigned int m_Items;
 	CVector<unsigned int> m_Votes;
 	IBaseMenu *m_pCurMenu;
@@ -104,13 +93,7 @@ private:
 	unsigned int m_NumVotes;
 	unsigned int m_VoteTime;
 	unsigned int m_VoteFlags;
-	float m_fStartTime;
-	unsigned int m_nMenuTime;
 	int m_ClientVotes[256+1];
-	bool m_Revoting[256+1];
-	char m_leaderList[1024];
-	ITimer *m_displayTimer;
 };

 #endif //_INCLUDE_SOURCEMOD_MENUVOTING_H_
-
@@ -1,238 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#include "NextMap.h"
-#include "Logger.h"
-#include "HalfLife2.h"
-#include "sourcemm_api.h"
-#include "sm_stringutil.h"
-#include "sourcehook.h"
-#include "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()
-{
-	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
-
-	ConCommand *pCmd = FindCommand("changelevel");
-	if (pCmd != NULL)
-	{
-		SH_ADD_HOOK(ConCommand, Dispatch, pCmd, SH_STATIC(CmdChangeLevelCallback), false);
-		changeLevelCmd = pCmd;
-	}
-}
-
-void NextMapManager::OnSourceModShutdown()
-{
-	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
-
-	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;
-}
-
-static char g_nextMap[PLATFORM_MAX_PATH];
-
-#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') {
-		ke::SafeStrcpy(g_nextMap, sizeof(g_nextMap), newmap);
-		newmap = g_nextMap;
-
-		// Clear the value so that if the map load fails later we don't get stuck in a loop.
-		// This might cause us to go off-cycle for a map, but nextmap will get us back on track.
-		sm_nextmap.SetValue("");
-	}
-
-	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 )
-{
-	// If we were controlling the map change, reset sm_nextmap to be the name of the map we successfully changed to.
-	// This maintains an old API contract on the plugin side. We use the real map name even if it was different from
-	// the expected map name as if the expected map failed to load we let the game take over instead, but the nextmap
-	// plugin compares the sm_nextmap value to the current map to decide if it should advance the mapcycle.
-	if (g_nextMap[0] != '\0') {
-		sm_nextmap.SetValue(mapName);
-		g_nextMap[0] = '\0';
-	}
-
-	/* 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");
-	}
-}
@@ -1,104 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_SOURCEMOD_NEXTMAP_H_
-#define _INCLUDE_SOURCEMOD_NEXTMAP_H_
-
-#include "sm_globals.h"
-#include <eiface.h>
-#include "sh_list.h"
-#include "sm_stringutil.h"
-#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[PLATFORM_MAX_PATH];
-};
-
-extern NextMapManager g_NextMap;
-
-#endif //_INCLUDE_SOURCEMOD_NEXTMAP_H_
@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 sts=8 sw=4 tw=99 noet :
+ * vim: set ts=4 :
 * =============================================================================
 * SourceMod
- * Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
 * =============================================================================
 *
 * This program is free software; you can redistribute it and/or modify it under
@@ -38,36 +38,18 @@
 #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 <am-deque.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;
@@ -76,129 +58,86 @@ public:
 public:
 	const char *GetName();
 	const char *GetIPAddress();
-	const char *GetAuthString(bool validated = true);
-	unsigned int GetSteamAccountID(bool validated = true);
-	const CSteamID &GetSteamId(bool validated = true);
-	uint64_t GetSteamId64(bool validated = true) { return GetSteamId(validated).ConvertToUint64(); }
-	const char *GetSteam2Id(bool validated = true);
-	const char *GetSteam3Id(bool validated = true);
+	const char *GetAuthString();
 	edict_t *GetEdict();
 	bool IsInGame();
 	bool WasCountedAsInGame();
 	bool IsConnected();
 	bool IsAuthorized();
 	bool IsFakeClient();
-	bool IsSourceTV() const;
-	bool IsReplay() const;
 	void SetAdminId(AdminId id, bool temporary);
 	AdminId GetAdminId();
 	void Kick(const char *str);
-	bool IsInKickQueue();
 	IPlayerInfo *GetPlayerInfo();
 	unsigned int GetLanguageId();
-	unsigned int GetOriginalLanguageId();
-	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 UpdateAuthIds();
-	void Authorize();
+	void Authorize(const char *auth);
 	void Authorize_Post();
 	void DoPostConnectAuthorization();
-	bool IsAuthStringValidated();
-	bool SetEngineString();
-	bool SetCSteamID();
-	void ClearNetchannelQueue(void);
 private:
-	bool m_IsConnected = false;
-	bool m_IsInGame = false;
-	bool m_IsAuthorized = false;
-	bool m_bIsInKickQueue = false;
+	bool m_IsConnected;
+	bool m_IsInGame;
+	bool m_IsAuthorized;
+	bool m_bIsInKickQueue;
 	String m_Name;
 	String m_Ip;
 	String m_IpNoPort;
-	std::string m_AuthID;
-	std::string m_Steam2Id;
-	std::string 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_AuthID;
+	AdminId m_Admin;
+	bool m_TempAdmin;
+	edict_t *m_pEdict;
+	IPlayerInfo *m_Info;
 	String m_LastPassword;
-	bool m_bAdminCheckSignalled = false;
+	bool m_bAdminCheckSignalled;
 	int m_iIndex;
-	unsigned int m_LangId = SOURCEMOD_LANGUAGE_ENGLISH;
-	unsigned int m_OriginalLangId = 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 || SOURCE_ENGINE == SE_BLADE || SOURCE_ENGINE == SE_MCV
-	QueryCvarCookie_t m_LanguageCookie = InvalidQueryCvarCookie;
-#endif
-	std::deque<std::string> m_PrintfBuffer;
+	unsigned int m_LangId;
+	int m_UserId;
 };

 class PlayerManager : 
 	public SMGlobalClass,
-	public IPlayerManager,
-	public IGameEventListener2
+	public IPlayerManager
 {
 	friend class CPlayer;
 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 SOURCE_ENGINE >= SE_ORANGEBOX
+#if defined ORANGEBOX_BUILD
 	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 OnClientLanguageChanged(int client, unsigned int language);
-	void OnServerHibernationUpdate(bool bHibernating);
-	void OnClientPrintf(edict_t *pEdict, const char *szMsg);
-	void OnPrintfFrameAction(unsigned int serial);
 public: //IPlayerManager
 	void AddClientListener(IClientListener *listener);
 	void RemoveClientListener(IClientListener *listener);
@@ -206,7 +145,6 @@ public: //IPlayerManager
 	IGamePlayer *GetGamePlayer(edict_t *pEdict);
 	int GetMaxClients();
 	int GetNumPlayers();
-	int GetNumClients();
 	int GetClientOfUserId(int userid);
 	bool IsServerActivated();
 	int FilterCommandTarget(IGamePlayer *pAdmin, IGamePlayer *pTarget, int flags);
@@ -214,11 +152,6 @@ public: //IPlayerManager
 	void RegisterCommandTargetProcessor(ICommandTargetProcessor *pHandler);
 	void UnregisterCommandTargetProcessor(ICommandTargetProcessor *pHandler);
 	void ProcessCommandTarget(cmd_target_info_t *info);
-	int GetClientFromSerial(unsigned int serial);
-	void ClearAdminId(AdminId id);
-	void RecheckAnyAdmins();
-public: // IGameEventListener2
-	void FireGameEvent(IGameEvent *pEvent);
 public:
 	inline int MaxClients()
 	{
@@ -235,65 +168,34 @@ public:
 	bool CheckSetAdmin(int index, CPlayer *pPlayer, AdminId id);
 	bool CheckSetAdminName(int index, CPlayer *pPlayer, AdminId id);
 	const char *GetPassInfoVar();
+	void RecheckAnyAdmins();
 	unsigned int GetReplyTo();
 	unsigned int SetReplyTo(unsigned int reply);
-	void MaxPlayersChanged(int newvalue = -1);
-	inline bool InClientCommandKeyValuesHook()
-	{
-		return m_bInCCKVHook;
-	}
-#if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_BLADE || SOURCE_ENGINE == SE_MCV
-	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_cllang;
 	IForward *m_onActivate;
 	IForward *m_onActivate2;
 	CPlayer *m_Players;
 	int *m_UserIdLookUp;
 	int m_maxClients;
 	int m_PlayerCount;
-	int m_PlayersSinceActive;
-	bool m_bServerActivated;
+	bool m_FirstPass;
 	unsigned int *m_AuthQueue;
 	String m_PassInfoVar;
 	bool m_QueryLang;
-	bool m_bAuthstringValidation; // are we validating admins with steam before authorizing?
 	bool m_bIsListenServer;
 	int m_ListenClient;
-	bool m_bIsSourceTVActive;
-	bool m_bIsReplayActive;
-	int m_SourceTVUserId;
-	int m_ReplayUserId;
-	bool m_bInCCKVHook;
-	int m_ClientCount;
-private:
-	static const int NETMSG_TYPE_BITS = 5; // SVC_Print overhead for netmsg type
-	static const int SVC_Print_BufferSize = 2048 - 1; // -1 for terminating \0
 };

-#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;
@@ -0,0 +1,487 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2007 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include "Profiler.h"
+#include "PluginSys.h"
+#include "sm_stringutil.h"
+#include "Logger.h"
+#if defined PLATFORM_POSIX
+#include <sys/time.h>
+#include <time.h>
+#endif
+
+ProfileEngine g_Profiler;
+IProfiler *sm_profiler = &g_Profiler;
+
+#if defined PLATFORM_WINDOWS
+double WINDOWS_PERFORMANCE_FREQUENCY;
+#endif
+
+class EmptyProfiler : public IProfiler
+{
+public:
+	void OnNativeBegin(IPluginContext *pContext, sp_native_t *native)
+	{
+	}
+	void OnNativeEnd()
+	{
+	}
+	void OnFunctionBegin(IPluginContext *pContext, const char *name)
+	{
+	}
+	void OnFunctionEnd()
+	{
+	}
+	int OnCallbackBegin(IPluginContext *pContext, sp_public_t *pubfunc)
+	{
+		return 0;
+	}
+	void OnCallbackEnd(int serial)
+	{
+	}
+} s_EmptyProfiler;
+
+inline void InitProfPoint(prof_point_t &pt)
+{
+#if defined PLATFORM_WINDOWS
+	QueryPerformanceCounter(&pt.value);
+#elif defined PLATFORM_POSIX
+	gettimeofday(&pt.value, NULL);
+#endif
+	pt.is_set = true;
+}
+
+ProfileEngine::ProfileEngine()
+{
+	m_serial = 0;
+
+#if defined PLATFORM_WINDOWS
+	LARGE_INTEGER pf;
+
+	if (QueryPerformanceFrequency(&pf))
+	{
+		WINDOWS_PERFORMANCE_FREQUENCY = 1.0 / (double)(pf.QuadPart);
+	}
+	else
+	{
+		WINDOWS_PERFORMANCE_FREQUENCY = -1.0;
+	}
+#endif
+
+	if (IsEnabled())
+	{
+		InitProfPoint(m_ProfStart);
+	}
+	else
+	{
+		sm_profiler = &s_EmptyProfiler;
+	}
+}
+
+bool ProfileEngine::IsEnabled()
+{
+#if defined PLATFORM_WINDOWS
+	return (WINDOWS_PERFORMANCE_FREQUENCY > 0.0);
+#elif defined PLATFORM_POSIX
+	return true;
+#endif
+}
+
+inline double DiffProfPoints(const prof_point_t &start, const prof_point_t &end)
+{
+	double seconds;
+
+#if defined PLATFORM_WINDOWS
+	LONGLONG diff;
+	
+	diff = end.value.QuadPart - start.value.QuadPart;
+	seconds = diff * WINDOWS_PERFORMANCE_FREQUENCY;
+#elif defined PLATFORM_POSIX
+	seconds = (double)(end.value.tv_sec - start.value.tv_sec);
+
+	if (start.value.tv_usec > end.value.tv_usec)
+	{
+		seconds -= 1.0;
+		seconds += (double)(1000000 - (start.value.tv_usec - end.value.tv_usec)) / 1000000.0;
+	}
+	else
+	{
+		seconds += (double)(end.value.tv_usec - start.value.tv_usec) / 1000000.0;
+	}
+#endif
+
+	return seconds;
+}
+
+inline double CalcAtomTime(const prof_atom_t &atom)
+{
+	if (!atom.end.is_set)
+	{
+		return atom.base_time;
+	}
+
+	return atom.base_time + DiffProfPoints(atom.start, atom.end);
+}
+
+void ProfileEngine::OnNativeBegin(IPluginContext *pContext, sp_native_t *native)
+{
+	PushProfileStack(pContext, SP_PROF_NATIVES, native->name);
+}
+
+void ProfileEngine::OnNativeEnd()
+{
+	assert(!m_AtomStack.empty());
+	assert(m_AtomStack.front().atom_type == SP_PROF_NATIVES);
+
+	PopProfileStack(&m_Natives);
+}
+
+void ProfileEngine::OnFunctionBegin(IPluginContext *pContext, const char *name)
+{
+	PushProfileStack(pContext, SP_PROF_FUNCTIONS, name);
+}
+
+void ProfileEngine::OnFunctionEnd()
+{
+	assert(!m_AtomStack.empty());
+	assert(m_AtomStack.front().atom_type == SP_PROF_FUNCTIONS);
+
+	PopProfileStack(&m_Functions);
+}
+
+int ProfileEngine::OnCallbackBegin(IPluginContext *pContext, sp_public_t *pubfunc)
+{
+	PushProfileStack(pContext, SP_PROF_CALLBACKS, pubfunc->name);
+
+	return m_serial;
+}
+
+void ProfileEngine::OnCallbackEnd(int serial)
+{
+	assert(!m_AtomStack.empty());
+
+	/**
+	 * Account for the situation where the JIT discards the 
+	 * stack because there was an RTE of sorts.
+	 */
+	if (m_AtomStack.front().atom_type != SP_PROF_CALLBACKS
+		&& m_AtomStack.front().atom_serial != serial)
+	{
+		prof_atom_t atom;
+		double total_time;
+
+		/* There was an error, and we need to discard things. */
+		total_time = 0.0;
+		while (!m_AtomStack.empty() 
+			&& m_AtomStack.front().atom_type != SP_PROF_CALLBACKS 
+			&& m_AtomStack.front().atom_serial != serial)
+		{
+			total_time += CalcAtomTime(m_AtomStack.front());
+			m_AtomStack.pop();
+		}
+
+		/**
+		 * Now we can end and discard ourselves, without saving the data.
+		 * Since this data is all erroneous anyway, we don't care if it's 
+		 * not totally accurate. 
+		 */
+
+		assert(!m_AtomStack.empty());
+		atom = m_AtomStack.front();
+		m_AtomStack.pop();
+
+		/* Note: We don't need to resume ourselves because end is set by Pause(). */
+		total_time += CalcAtomTime(atom);
+
+		ResumeParent(total_time);
+		return;
+	}
+
+	PopProfileStack(&m_Callbacks);
+}
+
+void ProfileEngine::PushProfileStack(IPluginContext *ctx, int type, const char *name)
+{
+	prof_atom_t atom;
+
+	PauseParent();
+
+	atom.atom_type = type;
+	atom.base_time = 0.0;
+	atom.ctx = ctx->GetContext();
+	atom.name = name;
+	atom.end.is_set = false;
+
+	if (type == SP_PROF_CALLBACKS)
+	{
+		atom.atom_serial = ++m_serial;
+	}
+	else
+	{
+		atom.atom_serial = 0;
+	}
+
+	m_AtomStack.push(atom);
+
+	/* Note: We do this after because the stack could grow and skew results */
+	InitProfPoint(m_AtomStack.front().start);
+}
+
+void ProfileEngine::PopProfileStack(ProfileReport *reporter)
+{
+	double total_time;
+
+	prof_atom_t &atom = m_AtomStack.front();
+
+	/* We're okay to cache our used time. */
+	InitProfPoint(atom.end);
+	total_time = CalcAtomTime(atom);
+
+	/* Now it's time to save this! This may do a lot of computations which 
+	 * is why we've cached the time beforehand.
+	 */
+	reporter->SaveAtom(atom);
+	m_AtomStack.pop();
+
+	/* Finally, tell our parent how much time we used. */
+	ResumeParent(total_time);
+}
+
+void ProfileEngine::PauseParent()
+{
+	if (m_AtomStack.empty())
+	{
+		return;
+	}
+
+	InitProfPoint(m_AtomStack.front().end);
+}
+
+void ProfileEngine::ResumeParent(double addTime)
+{
+	if (m_AtomStack.empty())
+	{
+		return;
+	}
+
+	prof_atom_t &atom = m_AtomStack.front();
+
+	/* Move its "paused time" to its base (known) time, 
+	 * then reset the start/end.  Note that since CalcAtomTime() 
+	 * reads the base time, we SHOULD NOT use += to add.
+	 */
+	atom.base_time = CalcAtomTime(atom);
+	atom.base_time += addTime;
+	InitProfPoint(atom.start);
+	atom.end.is_set = false;
+}
+
+void ProfileEngine::Clear()
+{
+	m_Natives.Clear();
+	m_Callbacks.Clear();
+	m_Functions.Clear();
+	InitProfPoint(m_ProfStart);
+}
+
+void ProfileEngine::OnSourceModAllInitialized()
+{
+	g_RootMenu.AddRootConsoleCommand("profiler", "Profiler commands", this);
+}
+
+void ProfileEngine::OnSourceModShutdown()
+{
+	g_RootMenu.RemoveRootConsoleCommand("profiler", this);
+}
+
+void ProfileEngine::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
+{
+	if (command.ArgC() >= 3)
+	{
+		if (strcmp(command.Arg(2), "flush") == 0)
+		{
+			FILE *fp;
+			char path[256];
+
+			g_SourceMod.BuildPath(Path_SM, path, sizeof(path), "logs/profile_%d.xml", (int)time(NULL));
+
+			if ((fp = fopen(path, "wt")) == NULL)
+			{
+				g_RootMenu.ConsolePrint("Failed, could not open file for writing: %s", path);
+				return;
+			}
+
+			GenerateReport(fp);
+
+			fclose(fp);
+
+			g_RootMenu.ConsolePrint("Profiler report generated as: %s\n", path);
+
+			return;
+		}
+	}
+
+	g_RootMenu.ConsolePrint("Profiler commands:");
+	g_RootMenu.DrawGenericOption("flush", "Flushes statistics to disk and starts over");
+}
+
+bool ProfileEngine::GenerateReport(FILE *fp)
+{
+	time_t t;
+	double total_time;
+	prof_point_t end_time;
+
+	InitProfPoint(end_time);
+	total_time = DiffProfPoints(m_ProfStart, end_time);
+
+	t = time(NULL);
+
+	fprintf(fp, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\n");
+	fprintf(fp, "<profile time=\"%d\" uptime=\"%f\">\n", (int)t, total_time);
+	WriteReport(fp, &m_Natives, "natives");
+	WriteReport(fp, &m_Callbacks, "callbacks");
+	WriteReport(fp, &m_Functions, "functions");
+	fprintf(fp, "</profile>\n");
+
+	return true;
+}
+
+void ProfileEngine::WriteReport(FILE *fp, ProfileReport *report, const char *name)
+{
+	size_t i, num;
+	prof_atom_report_t *ar;
+	char new_name[512];
+
+	fprintf(fp, " <report name=\"%s\">\n", name);
+	
+	num = report->GetNumReports();
+	for (i = 0; i < num; i++)
+	{
+		ar = report->GetReport(i);
+
+		strncopy(new_name, ar->atom_name, sizeof(new_name));
+		UTIL_ReplaceAll(new_name, sizeof(new_name), "<", "&lt;");
+		UTIL_ReplaceAll(new_name, sizeof(new_name), ">", "&gt;");
+
+		fprintf(fp, "  <item name=\"%s\" numcalls=\"%d\" mintime=\"%f\" maxtime=\"%f\" totaltime=\"%f\"/>\n", 
+			new_name,
+			ar->num_calls,
+			ar->min_time,
+			ar->max_time,
+			ar->total_time);
+	}
+
+	fprintf(fp, " </report>\n");
+}
+
+ProfileReport::~ProfileReport()
+{
+	for (size_t i = 0; i < m_Reports.size(); i++)
+	{
+		delete m_Reports[i];
+	}
+}
+
+void ProfileReport::Clear()
+{
+	m_ReportLookup.clear();
+	for (size_t i = 0; i < m_Reports.size(); i++)
+	{
+		delete m_Reports[i];
+	}
+	m_Reports.clear();
+}
+
+size_t ProfileReport::GetNumReports()
+{
+	return m_Reports.size();
+}
+
+prof_atom_report_t *ProfileReport::GetReport(size_t i)
+{
+	return m_Reports[i];
+}
+
+void ProfileReport::SaveAtom(const prof_atom_t &atom)
+{
+	double atom_time;
+	char full_name[256];
+	prof_atom_report_t **pReport, *report;
+
+	if (atom.atom_type == SP_PROF_NATIVES)
+	{
+		strncopy(full_name, atom.name, sizeof(full_name));
+	}
+	else
+	{
+		CPlugin *pl;
+		const char *file;
+
+		file = "unknown";
+		if ((pl = g_PluginSys.GetPluginByCtx(atom.ctx)) != NULL)
+		{
+			file = pl->GetFilename();
+		}
+
+		UTIL_Format(full_name, sizeof(full_name), "%s!%s", file, atom.name);
+	}
+
+	atom_time = CalcAtomTime(atom);
+
+	if ((pReport = m_ReportLookup.retrieve(full_name)) == NULL)
+	{
+		report = new prof_atom_report_t;
+
+		strncopy(report->atom_name, full_name, sizeof(report->atom_name));
+		report->max_time = atom_time;
+		report->min_time = atom_time;
+		report->num_calls = 1;
+		report->total_time = atom_time;
+		
+		m_ReportLookup.insert(full_name, report);
+		m_Reports.push_back(report);
+	}
+	else
+	{
+		report = *pReport;
+
+		if (atom_time > report->max_time)
+		{
+			report->max_time = atom_time;
+		}
+		if (atom_time < report->min_time)
+		{
+			report->min_time = atom_time;
+		}
+		report->num_calls++;
+		report->total_time += atom_time;
+	}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Anderson	e47703ee83	version bump --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402166	2008-05-21 03:48:47 +00:00
Scott Ehlert	0c3cc85f6d	Removed GiveNamedItem/GivePlayerItem offset due to crashes --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402165	2008-05-21 03:39:00 +00:00
David Anderson	467663bff5	merged in bug fixes from trunk --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402164	2008-05-21 03:31:42 +00:00
Scott Ehlert	ac862954f1	Fixed amb1688 - Linux GivePlayerItem/GiveNamedItem offset for Day of Defeat was incorrect --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402160	2008-05-20 09:44:30 +00:00
Matt Woodrow	a12f61d463	Fixed amb1657 - Server should see admin version of sm_who --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402146	2008-05-14 22:40:03 +00:00
Scott Ehlert	7d372ceedc	Fixed up IGameHelpers.h such that it no longer requires HL2SDK headers if a function doesn't need them --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402143	2008-05-13 08:22:21 +00:00
Scott Ehlert	bba7ff1c37	Err, fixed Linux build --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402138	2008-05-12 02:05:31 +00:00
Scott Ehlert	6f8fad7784	Symbols no longer stripped on Linux for easier debugging --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402136	2008-05-11 07:49:10 +00:00
Scott Ehlert	22f96dd195	Removed odd debug code, err, in CrazyDebug of all places --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402130	2008-05-09 08:22:22 +00:00
Scott Ehlert	423ad68a6f	CrazyDebug just got crazier! 1) Now works with SrcDS -console + DEP on Windows 2) Updated vcproj files for OB, Episode 1, etc --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402128	2008-05-09 08:04:06 +00:00
Scott Ehlert	f522c531fb	Attempted fix for amb1648 - stack corruption when GetClientEyeAngles() is called on Windows --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402123	2008-05-02 07:47:16 +00:00
Scott Ehlert	fe71d6a5ab	1.0.1 build fixes --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402120	2008-05-01 22:01:23 +00:00
Matt Woodrow	2352b11b18	More bugfixes --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402118	2008-05-01 04:54:37 +00:00
Matt Woodrow	d140bfa8af	Merged bug fixes from 1.0.x branch. --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402117	2008-05-01 04:49:06 +00:00
Scott Ehlert	a41c004d1c	Merged TF2 vfunc offset update into 1.0.1 --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402116	2008-05-01 02:58:20 +00:00
Matt Woodrow	9009c115a5	Missing ! in sample_ext --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402113	2008-05-01 02:43:07 +00:00
Matt Woodrow	b637ab794b	Moved mapchooser tf2 fix into 1.0.1 --HG-- branch : sourcemod-1.0.1 extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/branches/sourcemod-1.0.1%402111	2008-05-01 02:39:19 +00:00
Scott Ehlert	4be098c694	New 1.0.1 branch --HG-- branch : sourcemod-1.0.1	2008-05-01 01:41:12 +00:00