Add "Restart Current Map" to sm_map menu.

Add MenuSetClientMapping native.

.arcconfig

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

.gitattributes

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

.github/CONTRIBUTING.md

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE.md

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

.gitignore

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

.gitmodules

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

.hgignore

@@ -1,28 +0,0 @@
-# Binaries
-\.dll$
-\.dylib$
-\.exe$
-\.so$
-
-# Files generated by Visual Studio
-\.aps$
-\.ipch$
-\.ncb$
-\.opensdf$
-\.sdf$
-\.suo$
-\.user$
-
-# Build directories
-/CrazyDebug.*
-/Debug.*
-/Release.*
-
-# Files generated by Mac OS X Finder
-(^|/)\.DS_Store$
-
-# Files generated by Windows Explorer
-(^|/)[dD]esktop\.ini$
-(^|/)[tT]humbs\.db$
-syntax: glob
-build/*

.hgtags

@@ -1,5 +0,0 @@
-54539fa4e51f98d7841c853c1370dff6ccd3cdf2 sourcemod-1.0.0
-e6ef5ecdf8d75740ca2685a709bf321f8873bc3b sourcemod-1.1.0
-e877885fac80be71822641f7a9122cebc9812521 sourcemod-1.1.1
-b3ffa8a4511c4eadaf533fc790aa6b14f7f0c6ea sourcemod-1.1.2
-3a73bbf60f34befa9b66be03fa5974b394bb3411 sourcemod-1.2.0

.travis.yml

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

NOTICE.txt

@@ -1,5 +0,0 @@
-
-CONFIGURE YOUR IDENTITY FOR MERCURIAL! 
-IF YOU ARE A DEVELOPER WITH PUSH ACCESS, DO IT NOW KPLZTHX.
-
-http://wiki.alliedmods.net/Mercurial_Tutorial#Identity

README.md

@@ -0,0 +1,27 @@
+SourceMod
+=========
+
+General
+-------
+- [SourceMod website](http://www.sourcemod.net): Source Engine scripting and server administration
+- [Forum](https://forums.alliedmods.net/forumdisplay.php?f=52): Discussion forum including plugin/extension development
+- [General documentation](https://wiki.alliedmods.net/Category:SourceMod_Documentation): Miscellaneous information about SourceMod
+- [Stable builds](http://www.sourcemod.net/downloads.php?branch=stable): The latest stable SourceMod releases
+- [Dev builds](http://www.sourcemod.net/downloads.php?branch=dev): Builds of recent development versions
+ 
+Development
+-----------
+- [Issue tracker](https://github.com/alliedmodders/sourcemod/issues): Issues that require back and forth communication
+- [Building SourceMod](https://wiki.alliedmods.net/Building_SourceMod): Instructions on how to build SourceMod itself using [AMBuild](https://github.com/alliedmodders/ambuild)
+- [SourcePawn scripting](https://wiki.alliedmods.net/Category:SourceMod_Scripting): SourcePawn examples and introduction to the language
+- [SourceMod plugin API](https://sm.alliedmods.net/new-api): Online SourceMod plugin API reference generated from the include files
+- [SourceMod extension development](https://wiki.alliedmods.net/Category:SourceMod_Development): C++ examples and introduction to various extension interfaces
+
+Contact
+-------
+- Connect with us on [GameSurge](https://gamesurge.net) IRC in #sourcemod
+- Alternatively feel free to join our [Discord](https://discord.gg/HgZctSS) server
+
+License
+-------
+SourceMod is licensed under the GNU General Public License version 3. Special exceptions are outlined in the LICENSE.txt file inside of the licenses folder.

bridge/include/BridgeAPI.h

@@ -0,0 +1,46 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_API_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_API_H_
+
+#include <bridge/include/CoreProvider.h>
+#include <bridge/include/LogicProvider.h>
+#include <stdint.h>
+
+namespace SourceMod {
+
+// Add 1 to the RHS of this expression to bump the intercom file
+// This is to prevent mismatching core/logic binaries
+static const uint32_t SM_LOGIC_MAGIC = 0x0F47C0DE - 57;
+
+} // namespace SourceMod
+
+typedef void (*LogicInitFunction)(SourceMod::CoreProvider *core, SourceMod::sm_logic_t *logic);
+typedef LogicInitFunction (*LogicLoadFunction)(uint32_t magic);
+typedef SourceMod::ITextParsers *(*GetITextParsers)();
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_API_H_

bridge/include/CoreProvider.h

@@ -0,0 +1,140 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_CORE_PROVIDER_API_H_
+#define _INCLUDE_SOURCEMOD_CORE_PROVIDER_API_H_
+
+#include <stddef.h>
+#include <stdint.h>
+#include <IAdminSystem.h>
+#include <amtl/am-function.h>
+
+namespace SourcePawn {
+class ISourcePawnEngine;
+class ISourcePawnEngine2;
+} // namespace SourcePawn
+
+// SDK types.
+#if defined(SM_LOGIC)
+class ConCommandBase {};
+class ConVar : public ConCommandBase {};
+#else
+class ConCommandBase;
+class ConVar;
+#endif
+class KeyValues;
+
+struct ServerGlobals
+{
+	const double *universalTime;
+	float *interval_per_tick;
+	float *frametime;
+};
+
+namespace SourceMod {
+
+class ISourceMod;
+class IVEngineServerBridge;
+class IFileSystemBridge;
+class ITimerSystem;
+class IPlayerManager;
+class IGameHelpers;
+class IMenuManager;
+struct DatabaseInfo;
+class IPlayerInfoBridge;
+class ICommandArgs;
+
+typedef ke::Lambda<bool(int client, const ICommandArgs*)> CommandFunc;
+
+class CoreProvider
+{
+public:
+	/* Objects */
+	ISourceMod		*sm;
+	IVEngineServerBridge *engine;
+	IFileSystemBridge *filesystem;
+	IPlayerInfoBridge *playerInfo;
+	ITimerSystem    *timersys;
+	IPlayerManager  *playerhelpers;
+	IGameHelpers    *gamehelpers;
+	IMenuManager	*menus;
+	SourcePawn::ISourcePawnEngine **spe1;
+	SourcePawn::ISourcePawnEngine2 **spe2;
+	const char		*gamesuffix;
+	/* Data */
+	ServerGlobals   *serverGlobals;
+	void *          serverFactory;
+	void *          engineFactory;
+	void *          matchmakingDSFactory;
+	SMGlobalClass *	listeners;
+
+	// ConVar functions.
+	virtual ConVar *FindConVar(const char *name) = 0;
+	virtual const char *GetCvarString(ConVar *cvar) = 0;
+	virtual bool GetCvarBool(ConVar* cvar) = 0;
+
+	// Command functions.
+	virtual void DefineCommand(const char *cmd, const char *help, const CommandFunc &callback) = 0;
+
+	// Game description functions.
+	virtual bool GetGameName(char *buffer, size_t maxlength) = 0;
+	virtual const char *GetGameDescription() = 0;
+	virtual const char *GetSourceEngineName() = 0;
+	virtual bool SymbolsAreHidden() = 0;
+
+	// Game state and helper functions.
+	virtual bool IsMapLoading() = 0;
+	virtual bool IsMapRunning() = 0;
+	virtual int MaxClients() = 0;
+	virtual bool DescribePlayer(int index, const char **namep, const char **authp, int *useridp) = 0;
+	virtual void LogToGame(const char *message) = 0;
+	virtual void ConPrint(const char *message) = 0;
+	virtual void ConsolePrint(const char *fmt, ...) = 0;
+	virtual void ConsolePrintVa(const char *fmt, va_list ap) = 0;
+
+	// Game engine helper functions.
+	virtual bool IsClientConVarQueryingSupported() = 0;
+	virtual int QueryClientConVar(int client, const char *cvar) = 0;
+
+	// Metamod:Source functions.
+	virtual int LoadMMSPlugin(const char *file, bool *ok, char *error, size_t maxlength) = 0;
+	virtual void UnloadMMSPlugin(int id) = 0;
+
+	const char *	(*GetCoreConfigValue)(const char*);
+	void			(*DoGlobalPluginLoads)();
+	bool			(*AreConfigsExecuted)();
+	void			(*ExecuteConfigs)(IPluginContext *ctx);
+	void			(*GetDBInfoFromKeyValues)(KeyValues *, DatabaseInfo *);
+	int				(*GetActivityFlags)();
+	int				(*GetImmunityMode)();
+	void			(*UpdateAdminCmdFlags)(const char *cmd, OverrideType type, FlagBits bits, bool remove);
+	bool			(*LookForCommandAdminFlags)(const char *cmd, FlagBits *pFlags);
+	int             (*GetGlobalTarget)();
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_CORE_PROVIDER_API_H_

bridge/include/IExtensionBridge.h

@@ -0,0 +1,81 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IEXTBRIDGE_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IEXTBRIDGE_H_
+
+#include <sp_vm_api.h>
+#include <IExtensionSys.h>
+#include <sh_vector.h>
+
+struct edict_t;
+
+namespace SourceMod {
+
+using namespace SourceHook;
+using namespace SourcePawn;
+class SMPlugin;
+
+class IExtensionSys : public IExtensionManager
+{
+public:
+	virtual IExtension *LoadAutoExtension(const char *name, bool bErrorOnMissing=true) = 0;
+	virtual void TryAutoload() = 0;
+	virtual void Shutdown() = 0;
+	virtual IExtension *FindExtensionByFile(const char *name) = 0;
+	virtual bool LibraryExists(const char *name) = 0;
+	virtual void CallOnCoreMapStart(edict_t *edictList, int edictCount, int maxClients) = 0;
+	virtual IExtension *GetExtensionFromIdent(IdentityToken_t *token) = 0;
+	virtual void BindChildPlugin(IExtension *ext, SMPlugin *plugin) = 0;
+	virtual void AddRawDependency(IExtension *myself, IdentityToken_t *token, void *iface) = 0;
+	virtual const CVector<IExtension *> *ListExtensions() = 0;
+	virtual void FreeExtensionList(const CVector<IExtension *> *list) = 0;
+	virtual void CallOnCoreMapEnd() = 0;
+};
+
+class AutoExtensionList
+{
+public:
+	AutoExtensionList(IExtensionSys *extensions)
+		: extensions_(extensions), list_(extensions_->ListExtensions())
+	{
+	}
+	~AutoExtensionList()
+	{
+		extensions_->FreeExtensionList(list_);
+	}
+	const CVector<IExtension *> *operator ->()
+	{
+		return list_;
+	}
+private:
+	IExtensionSys *extensions_;
+	const CVector<IExtension *> *list_;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IEXTBRIDGE_H_

bridge/include/IFileSystemBridge.h

@@ -0,0 +1,63 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_
+
+typedef void * FileHandle_t;
+typedef int FileFindHandle_t; 
+
+namespace SourceMod {
+
+class IFileSystemBridge
+{
+public:
+	virtual const char *FindFirstEx(const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle) = 0;
+	virtual const char *FindNext(FileFindHandle_t handle) = 0;
+	virtual bool FindIsDirectory(FileFindHandle_t handle) = 0;
+	virtual void FindClose(FileFindHandle_t handle) = 0;
+	virtual FileHandle_t Open(const char *pFileName, const char *pOptions, const char *pathID = 0) = 0;
+	virtual void Close(FileHandle_t file) = 0;
+	virtual char *ReadLine(char *pOutput, int maxChars, FileHandle_t file) = 0;
+	virtual bool EndOfFile(FileHandle_t file) = 0;
+	virtual bool FileExists(const char *pFileName, const char *pPathID = 0) = 0;
+	virtual unsigned int Size(const char *pFileName, const char *pPathID = 0) = 0;
+	virtual int Read(void* pOutput, int size, FileHandle_t file) = 0;
+	virtual int Write(void const* pInput, int size, FileHandle_t file) = 0;
+	virtual void Seek(FileHandle_t file, int post, int seekType) = 0;
+	virtual unsigned int Tell(FileHandle_t file) = 0;
+	virtual int FPrint(FileHandle_t file, const char *pData) = 0;
+	virtual void Flush(FileHandle_t file) = 0;
+	virtual bool IsOk(FileHandle_t file) = 0;
+	virtual void RemoveFile(const char *pRelativePath, const char *pathID = 0) = 0;
+	virtual void RenameFile(char const *pOldPath, char const *pNewPath, const char *pathID = 0) = 0;
+	virtual bool IsDirectory(const char *pFileName, const char *pathID = 0) = 0;
+	virtual void CreateDirHierarchy(const char *path, const char *pathID = 0) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_IFILESYSTEM_H_

bridge/include/ILogger.h

@@ -0,0 +1,43 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_LOGGER_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_LOGGER_H_
+
+namespace SourceMod {
+
+class ILogger
+{
+public:
+	virtual void LogMessage(const char *msg, ...) = 0;
+	virtual void LogError(const char *msg, ...) = 0;
+	virtual void LogFatal(const char *msg, ...) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_LOGGER_H_
+

bridge/include/IPlayerInfoBridge.h

@@ -0,0 +1,55 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPLAYERINFO_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPLAYERINFO_H_
+
+class IPlayerInfo;
+
+namespace SourceMod {
+
+class IPlayerInfoBridge
+{
+public:
+	virtual bool IsObserver(IPlayerInfo *pInfo) = 0;
+	virtual int GetTeamIndex(IPlayerInfo *pInfo) = 0;
+	virtual int GetFragCount(IPlayerInfo *pInfo) = 0;
+	virtual int GetDeathCount(IPlayerInfo *pInfo) = 0;
+	virtual int GetArmorValue(IPlayerInfo *pInfo) = 0;
+	virtual void GetAbsOrigin(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual void GetAbsAngles(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual void GetPlayerMins(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual void GetPlayerMaxs(IPlayerInfo *pInfo, float *x, float *y, float *z) = 0;
+	virtual const char *GetWeaponName(IPlayerInfo *pInfo) = 0;
+	virtual const char *GetModelName(IPlayerInfo *pInfo) = 0;
+	virtual int GetHealth(IPlayerInfo *pInfo) = 0;
+	virtual void ChangeTeam(IPlayerInfo *pInfo, int iTeamNum) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPLAYERINFO_H_
+

bridge/include/IProviderCallbacks.h

@@ -0,0 +1,45 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPROVIDERCALLBACK_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPROVIDERCALLBACK_H_
+
+namespace SourceMod {
+
+// Global callbacks provided to Core.
+class IProviderCallbacks
+{
+public:
+	// Called when a log message is printed. Return true to supercede.
+	virtual bool OnLogPrint(const char *msg) = 0;
+
+	// Called each frame tick.
+	virtual void OnThink(bool simulating) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_IPROVIDERCALLBACK_H_

bridge/include/IScriptManager.h

@@ -0,0 +1,112 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_ISCRIPTMANAGER_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_ISCRIPTMANAGER_H_
+
+#include <sp_vm_api.h>
+#include <IPluginSys.h>
+#include <sh_vector.h>
+#include <sh_string.h>
+
+namespace SourceMod {
+
+using namespace SourceHook;
+using namespace SourcePawn;
+
+class IChangeableForward;
+
+enum LibraryAction
+{
+	LibraryAction_Removed,
+	LibraryAction_Added
+};
+
+struct AutoConfig
+{
+	SourceHook::String autocfg;
+	SourceHook::String folder;
+	bool create;
+};
+
+class SMPlugin : public IPlugin
+{
+public:
+	virtual size_t GetConfigCount() = 0;
+	virtual AutoConfig *GetConfig(size_t i) = 0;
+	virtual void AddLibrary(const char *name) = 0;
+	virtual void AddConfig(bool create, const char *cfg, const char *folder) = 0;
+	virtual void EvictWithError(PluginStatus status, const char *fmt, ...) = 0;
+};
+
+class IScriptManager
+{
+public:
+	virtual void LoadAll(const char *config_path, const char *plugins_path) = 0;
+	virtual void RefreshAll() = 0;
+	virtual void Shutdown() = 0;
+	virtual IdentityToken_t *GetIdentity() = 0;
+	virtual void SyncMaxClients(int maxClients) = 0;
+	virtual void AddPluginsListener(IPluginsListener *listener) = 0;
+	virtual void RemovePluginsListener(IPluginsListener *listener) = 0;
+	virtual IPluginIterator *GetPluginIterator() = 0;
+	virtual void OnLibraryAction(const char *name, LibraryAction action) = 0;
+	virtual bool LibraryExists(const char *name) = 0;
+	virtual SMPlugin *FindPluginByOrder(unsigned num) = 0;
+	virtual SMPlugin *FindPluginByIdentity(IdentityToken_t *ident) = 0;
+	virtual SMPlugin *FindPluginByContext(IPluginContext *ctx) = 0;
+	virtual SMPlugin *FindPluginByContext(sp_context_t *ctx) = 0;
+	virtual SMPlugin *FindPluginByConsoleArg(const char *text) = 0;
+	virtual SMPlugin *FindPluginByHandle(Handle_t hndl, HandleError *errp) = 0;
+	virtual bool UnloadPlugin(IPlugin *plugin) = 0;
+	virtual const CVector<SMPlugin *> *ListPlugins() = 0;
+	virtual void FreePluginList(const CVector<SMPlugin *> *list) = 0;
+	virtual void AddFunctionsToForward(const char *name, IChangeableForward *fwd) = 0;
+};
+
+class AutoPluginList
+{
+public:
+	AutoPluginList(IScriptManager *scripts)
+		: scripts_(scripts), list_(scripts->ListPlugins())
+	{
+	}
+	~AutoPluginList()
+	{
+		scripts_->FreePluginList(list_);
+	}
+	const CVector<SMPlugin *> *operator ->()
+	{
+		return list_;
+	}
+private:
+	IScriptManager *scripts_;
+	const CVector<SMPlugin *> *list_;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_INCLUDE_ISCRIPTMANAGER_H_

bridge/include/IVEngineServerBridge.h

@@ -0,0 +1,48 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_BRIDGE_IVENGINESERVER_H_
+#define _INCLUDE_SOURCEMOD_BRIDGE_IVENGINESERVER_H_
+
+struct edict_t;
+
+namespace SourceMod {
+
+class IVEngineServerBridge
+{
+public:
+	virtual bool IsDedicatedServer() = 0;
+	virtual void InsertServerCommand(const char *cmd) = 0;
+	virtual void ServerCommand(const char *cmd) = 0;
+	virtual void ServerExecute() = 0;
+	virtual const char *GetClientConVarValue(int clientIndex, const char *name) = 0;
+	virtual void ClientCommand(edict_t *pEdict, const char *szCommand) = 0;
+	virtual void FakeClientCommand(edict_t *pEdict, const char *szCommand) = 0;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_BRIDGE_IVENGINESERVER_H_

bridge/include/LogicProvider.h

@@ -0,0 +1,92 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_LOGIC_PROVIDER_API_H_
+#define _INCLUDE_SOURCEMOD_LOGIC_PROVIDER_API_H_
+
+#include <sp_vm_api.h>
+
+class SMGlobalClass;
+
+namespace SourceMod {
+
+using namespace SourcePawn;
+
+class CoreProvider;
+class IThreader;
+class ITranslator;
+class IGameConfig;
+class IScriptManager;
+class IShareSys;
+class IHandleSys;
+class ICommandArgs;
+class IForwardManager;
+class IAdminSystem;
+class IRootConsole;
+class IProviderCallbacks;
+class IExtensionSys;
+class ITextParsers;
+class ILogger;
+class ICellArray;
+
+struct sm_logic_t
+{
+	SMGlobalClass	*head;
+	IThreader		*threader;
+	ITranslator		*translator;
+	const char      *(*stristr)(const char *, const char *);
+	size_t			(*atcprintf)(char *, size_t, const char *, IPluginContext *, const cell_t *, int *);
+	bool			(*CoreTranslate)(char *,  size_t, const char *, unsigned int, size_t *, ...);
+	void            (*AddCorePhraseFile)(const char *filename);
+	unsigned int	(*ReplaceAll)(char*, size_t, const char *, const char *, bool);
+	char            *(*ReplaceEx)(char *, size_t, const char *, size_t, const char *, size_t, bool);
+	size_t          (*DecodeHexString)(unsigned char *, size_t, const char *);
+	IGameConfig *   (*GetCoreGameConfig)();
+	IDebugListener   *debugger;
+	void			(*GenerateError)(IPluginContext *, cell_t, int, const char *, ...);
+	void			(*AddNatives)(sp_nativeinfo_t *natives);
+	void            (*RegisterProfiler)(IProfilingTool *tool);
+	ICellArray *    (*CreateCellArray)(size_t blocksize);
+	void            (*FreeCellArray)(ICellArray *arr);
+	void *			(*FromPseudoAddress)(uint32_t pseudoAddr);
+	uint32_t		(*ToPseudoAddress)(void *addr);
+	IScriptManager	*scripts;
+	IShareSys		*sharesys;
+	IExtensionSys	*extsys;
+	IHandleSys		*handlesys;
+	IForwardManager	*forwardsys;
+	IAdminSystem	*adminsys;
+	IdentityToken_t *core_ident;
+	ILogger			*logger;
+	IRootConsole	*rootmenu;
+	IProviderCallbacks *callbacks;
+	float			sentinel;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_LOGIC_PROVIDER_API_H_
+

configs/banreasons.txt

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

configs/cfg/sourcemod.cfg

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

configs/core.cfg

@@ -30,12 +30,12 @@
 	"ServerLang"	"en"
 	
 	/**
-	 * String to use as the public chat trigger.  Set an empty string to disable.
+	 * List of characters to use for public chat triggers.  Set an empty list to disable.
 	 */
 	"PublicChatTrigger"		"!"
 	
 	/**
-	 * String to use as the silent chat trigger.  Set an empty string to disable.
+	 * List of characters to use for silent chat triggers.  Set an empty list to disable.
 	 */
 	"SilentChatTrigger"		"/"
 	
@@ -44,7 +44,7 @@
 	 * but it does not evaluate to an actual command, it will be displayed 
 	 * publicly.  This setting allows you to suppress accidental typings.
 	 *
-	 * The default value is "no".  A value of "yes" will supress.
+	 * The default value is "no".  A value of "yes" will suppress.
 	 */
 	"SilentFailSuppress"	"no"
 	
@@ -112,7 +112,7 @@
 	 * 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.
-	 * In general, this option should be set to "yes" to increase the security of your server.
+	 * This option increases the security of your server, but is still experimental.
 	 */
 	"SteamAuthstringValidation"	"yes"
 	
@@ -125,4 +125,25 @@
 	 * "no"		- Warn about malware or illegal plugins loading
 	 */
 	"BlockBadPlugins"	"yes"
+
+	/**
+	 * If a plugin takes too long to execute, hanging or freezing the game server in the process, 
+	 * SourceMod will attempt to terminate that plugin after the specified timeout length has
+	 * passed. You can disable this feature by setting the value to "0".
+	 */
+	"SlowScriptTimeout"	"8"
+	
+	/**
+	 * Per "http://blog.counter-strike.net/index.php/server_guidelines/", certain plugin
+	 * functionality will trigger all of the game server owner's Game Server Login Tokens
+	 * (GSLTs) to get banned when executed on a Counter-Strike: Global Offensive game server.
+	 *
+	 * Enabling this option will block plugins from using functionality that is known to cause this.
+	 * This option only has any effect on CS:GO. Note that this does NOT guarantee that you cannot
+	 * receive a ban.
+	 *
+	 * Disable this option at your own risk.
+	 */
+	"FollowCSGOServerGuidelines"	"yes"
 }
+

configs/plugin_settings.cfg

@@ -1,36 +0,0 @@
-/**
- *   Each sub-section of "Plugins" should have a title which specifies a plugin filename.
- * Filenames have a wildcard of *.  Appending .smx is not required.
- * If the filename has no explicit path, it will be patched to any sub-path in the plugins folder.
- *
- *   Available properties for plugins are:
- * "pause"			- Whether or not the plugin should load paused - "yes" or "no" (default)
- * "lifetime"		- Lifetime of the plugin.  Options:
- * "mapsync"	 	- Plugins should be reloaded on mapchange if changed (default)
- * "global"	 		- Plugin will never be unloaded or updated
- * "blockload" 		- Plugin will always be blocked from loading.  Implicit (automatic) loads 
- *					  produce no error, but explicit (manual) loads will show an error message.
- *					  (Options are one of "yes" or "no")
- *
- * You can also have an "Options" section declaring options to pass onto the JIT:
- * "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"
-		{
-		}
-	}
-}

configure.py

@@ -1,10 +1,42 @@
 # vim: set ts=2 sw=2 tw=99 noet:
 import sys
-import ambuild.runner as runner
+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)
 
-run = runner.Runner()
-run.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
+def make_objdir_name(p):
+    return 'obj-' + util.Platform() + '-' + p.target_arch
+
+parser = run.BuildParser(sourcePath=sys.path[0], api='2.1')
+parser.default_arch = 'x86'
+parser.default_build_folder = make_objdir_name
+parser.options.add_option('--hl2sdk-root', type=str, dest='hl2sdk_root', default=None,
+		                   help='Root search folder for HL2SDKs')
+parser.options.add_option('--mysql-path', type=str, dest='mysql_path', default=None,
+		                   help='Path to MySQL 5')
+parser.options.add_option('--mysql64-path', type=str, dest='mysql64_path', default=None,
+		                   help='Path to 64-bit MySQL 5')
+parser.options.add_option('--mms-path', type=str, dest='mms_path', default=None,
+                       help='Path to Metamod:Source')
+parser.options.add_option('--enable-debug', action='store_const', const='1', dest='debug',
                        help='Enable debugging symbols')
-run.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
+parser.options.add_option('--enable-optimize', action='store_const', const='1', dest='opt',
                        help='Enable optimization')
-run.Configure(sys.path[0])
+parser.options.add_option('--no-mysql', action='store_false', default=True, dest='hasMySql',
+                       help='Disable building MySQL extension')
+parser.options.add_option('-s', '--sdks', default='all', dest='sdks',
+                       help='Build against specified SDKs; valid args are "all", "present", or '
+                            'comma-delimited list of engine names (default: %default)')
+parser.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump',
+											 default=False, help='Dump and upload breakpad symbols')
+parser.options.add_option('--disable-auto-versioning', action='store_true', dest='disable_auto_versioning',
+                       default=False, help='Disable the auto versioning script')
+parser.Configure()

core/AMBuilder

@@ -1,127 +1,113 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
-from ambuild.command import SymlinkCommand
 
-for i in SM.sdkInfo:
-	sdk = SM.sdkInfo[i]
-	if AMBuild.target['platform'] not in sdk['platform']:
-		continue
+project = SM.HL2Project(builder, 'sourcemod')
+project.sources += [
+  'MenuStyle_Valve.cpp',
+  'logic_bridge.cpp',
+  'smn_entities.cpp',
+  'sm_stringutil.cpp',
+  'MenuVoting.cpp',
+  'smn_events.cpp',
+  'frame_hooks.cpp',
+  'smn_nextmap.cpp',
+  'sourcemm_api.cpp',
+  'ChatTriggers.cpp',
+  'smn_player.cpp',
+  'sourcemod.cpp',
+  'concmd_cleaner.cpp',
+  'HalfLife2.cpp',
+  'NextMap.cpp',
+  'ConCmdManager.cpp',
+  'ConVarManager.cpp',
+  'PlayerManager.cpp',
+  'TimerSys.cpp',
+  'CoreConfig.cpp',
+  'Logger.cpp',
+  'smn_halflife.cpp',
+  'smn_console.cpp',
+  'UserMessages.cpp',
+  'MenuManager.cpp',
+  'smn_hudtext.cpp',
+  'smn_usermsgs.cpp',
+  'MenuStyle_Base.cpp',
+  'smn_keyvalues.cpp',
+  'smn_vector.cpp',
+  'EventManager.cpp',
+  'MenuStyle_Radio.cpp',
+  'sm_autonatives.cpp',
+  'ConsoleDetours.cpp',
+  'vprof_tool.cpp',
+  'smn_commandline.cpp',
+  'GameHooks.cpp',
+]
 
-	name = 'sourcemod.' + sdk['ext']
+for sdk_name in SM.sdks:
+  sdk = SM.sdks[sdk_name]
+  for arch in SM.archs:
+    if not arch in sdk.platformSpec[builder.target.platform]:
+      continue
 
-	compiler = SM.DefaultHL2Compiler('core', i)
+    binary_name = 'sourcemod.' + sdk.ext
 
-	if i == 'csgo':
-		# Protobuf 2.3 headers have some signed/unsigned compares. I believe that it's fixed in later versions, but Valve.
-		if isinstance(compiler.cxx, Cpp.CompatGCC):
-			compiler.AddToListVar('CFLAGS', '-Wno-sign-compare')
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'common', 'protobuf-2.3.0', 'src'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'engine', 'protobuf'))
-		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'public', 'game', 'shared', 'csgo', 'protobuf'))
+    binary = SM.HL2Config(project, binary_name, sdk, arch)
+    compiler = binary.compiler
 
-	extension = AMBuild.AddJob(name)
-	binary = Cpp.LibraryBuilder(name, AMBuild, extension, compiler)
-	SM.PreSetupHL2Job(extension, binary, i)
+    compiler.cxxincludes += [
+      builder.sourcePath
+    ]
 
-	if i == 'csgo':
-		if AMBuild.target['platform'] == 'linux':
-			link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a')
-			target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'linux32', 'release'), 'libprotobuf.a')
-			try:
-				os.lstat(link)
-			except:
-				extension.AddCommand(SymlinkCommand(link, target))
-		elif AMBuild.target['platform'] == 'darwin':
-			link = os.path.join(os.path.join(AMBuild.outputFolder, extension.workFolder), 'libprotobuf.a')
-			target = os.path.join(os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'osx32', 'release'), 'libprotobuf.a')
-			try:
-				os.lstat(link)
-			except:
-				extension.AddCommand(SymlinkCommand(link, target))
-		elif AMBuild.target['platform'] == 'windows':
-			libPath = os.path.join(AMBuild.cache[sdk['sdk']], 'lib', 'win32', 'release', 'vs2010', 'libprotobuf.lib')
-			binary.RebuildIfNewer(libPath)
-			binary['POSTLINKFLAGS'].append(libPath)
+    if sdk.name == 'csgo':
+      compiler.cxxincludes += [
+        os.path.join(sdk.path, 'common', 'protobuf-2.5.0', 'src'),
+        os.path.join(sdk.path, 'public', 'engine', 'protobuf'),
+        os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf')
+      ]
 
-	files = [
-		'AdminCache.cpp',
-		'ExtensionSys.cpp',
-		'MenuStyle_Valve.cpp',
-		'logic_bridge.cpp',
-		'smn_entities.cpp',
-		'sm_stringutil.cpp',
-		'ADTFactory.cpp',
-		'ForwardSys.cpp',
-		'MenuVoting.cpp',
-		'smn_events.cpp',
-		'smn_menus.cpp',
-		'sm_trie.cpp',
-		'CDataPack.cpp',
-		'frame_hooks.cpp',
-		'NativeInvoker.cpp',
-		'smn_fakenatives.cpp',
-		'smn_nextmap.cpp',
-		'sourcemm_api.cpp',
-		'ChatTriggers.cpp',
-		'NativeOwner.cpp',
-		'smn_filesystem.cpp',
-		'smn_player.cpp',
-		'sourcemod.cpp',
-		'concmd_cleaner.cpp',
-		'HalfLife2.cpp',
-		'NextMap.cpp',
-		'ConCmdManager.cpp',
-		'HandleSys.cpp',
-		'ConVarManager.cpp',
-		'LibrarySys.cpp',
-		'PlayerManager.cpp',
-		'TimerSys.cpp',
-		'CoreConfig.cpp',
-		'Logger.cpp',
-		'PluginInfoDatabase.cpp',
-		'smn_halflife.cpp',
-		'PluginSys.cpp',
-		'smn_console.cpp',
-		'UserMessages.cpp',
-		'Database.cpp',
-		'MenuManager.cpp',
-		'smn_core.cpp',
-		'smn_hudtext.cpp',
-		'smn_usermsgs.cpp',
-		'DebugReporter.cpp',
-		'MenuStyle_Base.cpp',
-		'ShareSys.cpp',
-		'smn_database.cpp',
-		'smn_keyvalues.cpp',
-		'smn_vector.cpp',
-		'EventManager.cpp',
-		'MenuStyle_Radio.cpp',
-		'sm_autonatives.cpp',
-		'sm_srvcmds.cpp',
-		'ConsoleDetours.cpp'
-		]
-	
-	if i == 'csgo':
-		files.append('smn_protobuf.cpp')
-	else:
-		files.append('smn_bitbuffer.cpp')
+    if compiler.like('msvc'):
+      compiler.defines += ['_ALLOW_KEYWORD_MACROS']
+    if builder.target.platform == 'linux':
+      compiler.postlink += ['-lpthread', '-lrt']
 
-	binary.AddSourceFiles('core', files)
+    if sdk.name == 'csgo':
+      if builder.target.platform == 'linux':
+        if arch == 'x86':
+          lib_path = os.path.join(sdk.path, 'lib', 'linux32', 'release', 'libprotobuf.a')
+        elif arch == 'x64':
+          lib_path = os.path.join(sdk.path, 'lib', 'linux64', 'release', 'libprotobuf.a')
+        compiler.linkflags += ['-Wl,--exclude-libs=libprotobuf.a']
+      elif builder.target.platform == 'mac':
+        if arch == 'x86':
+          lib_path = os.path.join(sdk.path, 'lib', 'osx32', 'release', 'libprotobuf.a')
+        elif arch == 'x64':
+          lib_path = os.path.join(sdk.path, 'lib', 'osx64', 'release', 'libprotobuf.a')
+      elif builder.target.platform == 'windows':
+        msvc_ver = compiler.version
+        vs_year = ''
+        if msvc_ver == 1800:
+          vs_year = '2013'
+        elif 1900 <= msvc_ver < 2000:
+          vs_year = '2015'
+        else:
+          raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"')
 
-	if i == 'csgo':
-		files = [
-			os.path.join('public', 'engine', 'protobuf', 'netmessages.pb.cc'),
-			os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
-			os.path.join('public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
-			]
-		binary.AddSourceFiles(AMBuild.cache[sdk['sdk']], files)
+        if 'DEBUG' in compiler.defines:
+          lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs' + vs_year, 'libprotobuf.lib')
+        else:
+          lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs' + vs_year, 'libprotobuf.lib')
+      compiler.linkflags.insert(0, binary.Dep(lib_path))
+  
+    if sdk.name == 'csgo':
+      binary.sources += ['smn_protobuf.cpp']
+    else:
+      binary.sources += ['smn_bitbuffer.cpp']
 
-	SM.PostSetupHL2Job(extension, binary, i)
-	
-	if i == 'csgo':
-		if AMBuild.target['platform'] in ['linux', 'darwin']:
-			binary.AddObjectFiles(['libprotobuf.a'])
-	
-	SM.AutoVersion('core', binary)
-	binary.SendToJob()
+    if sdk.name == 'csgo':
+      binary.sources += [
+        os.path.join(sdk.path, 'public', 'engine', 'protobuf', 'netmessages.pb.cc'),
+        os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessages.pb.cc'),
+        os.path.join(sdk.path, 'public', 'game', 'shared', 'csgo', 'protobuf', 'cstrike15_usermessage_helpers.cpp'),
+      ]
+
+SM.binaries += builder.Add(project)
 

core/CDataPack.cpp

@@ -1,259 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "CDataPack.h"
-
-#define DATAPACK_INITIAL_SIZE		512
-
-CDataPack::CDataPack()
-{
-	m_pBase = (char *)malloc(DATAPACK_INITIAL_SIZE);
-	m_capacity = DATAPACK_INITIAL_SIZE;
-	Initialize();
-}
-
-CDataPack::~CDataPack()
-{
-	free(m_pBase);
-}
-
-void CDataPack::Initialize()
-{
-	m_curptr = m_pBase;
-	m_size = 0;
-}
-
-void CDataPack::CheckSize(size_t typesize)
-{
-	if (m_curptr - m_pBase + typesize <= m_capacity)
-	{
-		return;
-	}
-
-	size_t pos = m_curptr - m_pBase;
-	do
-	{
-		m_capacity *= 2;
-		m_pBase = (char *)realloc(m_pBase, m_capacity);
-		m_curptr = m_pBase + pos;
-	} while (m_curptr - m_pBase + typesize > m_capacity);
-}
-
-void CDataPack::ResetSize()
-{
-	m_size = 0;
-}
-
-size_t CDataPack::CreateMemory(size_t size, void **addr)
-{
-	CheckSize(sizeof(size_t) + size);
-	size_t pos = m_curptr - m_pBase;
-
-	*(size_t *)m_curptr = size;
-	m_curptr += sizeof(size_t);
-
-	if (addr)
-	{
-		*addr = m_curptr;
-	}
-
-	m_curptr += size;
-	m_size += sizeof(size_t) + size;
-
-	return pos;
-}
-
-void CDataPack::PackCell(cell_t cell)
-{
-	CheckSize(sizeof(size_t) + sizeof(cell_t));
-
-	*(size_t *)m_curptr = sizeof(cell_t);
-	m_curptr += sizeof(size_t);
-
-	*(cell_t *)m_curptr = cell;
-	m_curptr += sizeof(cell_t);
-
-	m_size += sizeof(size_t) + sizeof(cell_t);
-}
-
-void CDataPack::PackFloat(float val)
-{
-	CheckSize(sizeof(size_t) + sizeof(float));
-
-	*(size_t *)m_curptr = sizeof(float);
-	m_curptr += sizeof(size_t);
-
-	*(float *)m_curptr = val;
-	m_curptr += sizeof(float);
-
-	m_size += sizeof(size_t) + sizeof(float);
-}
-
-void CDataPack::PackString(const char *string)
-{
-	size_t len = strlen(string);
-	size_t maxsize = sizeof(size_t) + len + 1;
-	CheckSize(maxsize);
-
-	// Pack the string length first for buffer overrun checking.
-	*(size_t *)m_curptr = len;
-	m_curptr += sizeof(size_t);
-
-	// Now pack the string.
-	memcpy(m_curptr, string, len);
-	m_curptr[len] = '\0';
-	m_curptr += len + 1;
-
-	m_size += maxsize;
-}
-
-void CDataPack::Reset() const
-{
-	m_curptr = m_pBase;
-}
-
-size_t CDataPack::GetPosition() const
-{
-	return static_cast<size_t>(m_curptr - m_pBase);
-}
-
-bool CDataPack::SetPosition(size_t pos) const
-{
-	if (pos > m_size-1)
-	{
-		return false;
-	}
-	m_curptr = m_pBase + pos;
-
-	return true;
-}
-
-cell_t CDataPack::ReadCell() const
-{
-	if (!IsReadable(sizeof(size_t) + sizeof(cell_t)))
-	{
-		return 0;
-	}
-	if (*reinterpret_cast<size_t *>(m_curptr) != sizeof(cell_t))
-	{
-		return 0;
-	}
-
-	m_curptr += sizeof(size_t);
-
-	cell_t val = *reinterpret_cast<cell_t *>(m_curptr);
-	m_curptr += sizeof(cell_t);
-	return val;
-}
-
-float CDataPack::ReadFloat() const
-{
-	if (!IsReadable(sizeof(size_t) + sizeof(float)))
-	{
-		return 0;
-	}
-	if (*reinterpret_cast<size_t *>(m_curptr) != sizeof(float))
-	{
-		return 0;
-	}
-
-	m_curptr += sizeof(size_t);
-
-	float val = *reinterpret_cast<float *>(m_curptr);
-	m_curptr += sizeof(float);
-	return val;
-}
-
-bool CDataPack::IsReadable(size_t bytes) const
-{
-	return (bytes + (m_curptr - m_pBase) > m_size) ? false : true;
-}
-
-const char *CDataPack::ReadString(size_t *len) const
-{
-	if (!IsReadable(sizeof(size_t)))
-	{
-		return NULL;
-	}
-
-	size_t real_len = *(size_t *)m_curptr;
-
-	m_curptr += sizeof(size_t);
-	char *str = (char *)m_curptr;
-
-	if ((strlen(str) != real_len) || !(IsReadable(real_len+1)))
-	{
-		return NULL;
-	}
-
-	if (len)
-	{
-		*len = real_len;
-	}
-
-	m_curptr += real_len + 1;
-
-	return str;
-}
-
-void *CDataPack::GetMemory() const
-{
-	return m_curptr;
-}
-
-void *CDataPack::ReadMemory(size_t *size) const
-{
-	if (!IsReadable(sizeof(size_t)))
-	{
-		return NULL;
-	}
-
-	size_t bytecount = *(size_t *)m_curptr;
-	m_curptr += sizeof(size_t);
-
-	if (!IsReadable(bytecount))
-	{
-		return NULL;
-	}
-
-	void *ptr = m_curptr;
-
-	if (size)
-	{
-		*size = bytecount;
-	}
-
-	m_curptr += bytecount;
-
-	return ptr;
-}

core/CellRecipientFilter.h

@@ -81,11 +81,17 @@ inline int CellRecipientFilter::GetRecipientCount() const
 
 inline int CellRecipientFilter::GetRecipientIndex(int slot) const
 {
+	int ret;
 	if ((slot < 0) || (slot >= GetRecipientCount()))
 	{
-		return -1;
+		ret = -1;
 	}
-	return static_cast<int>(m_Players[slot]);
+	else
+	{
+		ret = static_cast<int>(m_Players[slot]);
+	}
+
+	return ret;
 }
 
 inline void CellRecipientFilter::SetToInit(bool isinitmsg)

core/ChatTriggers.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -8,7 +8,7 @@
  * 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
@@ -36,64 +36,69 @@
 #include "PlayerManager.h"
 #include "HalfLife2.h"
 #include "logic_bridge.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 SOURCE_ENGINE >= SE_ORANGEBOX
-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 //SE_ORANGEBOX
+#include "sourcemod.h"
+#include "provider.h"
+#include <bridge/include/ILogger.h>
+#include <amtl/am-string.h>
 
 ChatTriggers g_ChatTriggers;
 bool g_bSupressSilentFails = false;
 
-ChatTriggers::ChatTriggers() : m_pSayCmd(NULL), m_bWillProcessInPost(false), 
-	m_bTriggerWasSilent(false), m_ReplyTo(SM_REPLY_CONSOLE)
+ChatTriggers::ChatTriggers() : m_bWillProcessInPost(false),
+	m_ReplyTo(SM_REPLY_CONSOLE), m_ArgSBackup(NULL)
 {
-	m_PubTrigger = sm_strdup("!");
-	m_PrivTrigger = sm_strdup("/");
-	m_PubTriggerSize = 1;
-	m_PrivTriggerSize = 1;
+	m_PubTrigger = "!";
+	m_PrivTrigger = "/";
 	m_bIsChatTrigger = false;
+	m_bPluginIgnored = true;
+#if SOURCE_ENGINE == SE_EPISODEONE
+	m_bIsINS = false;
+#endif
 }
 
 ChatTriggers::~ChatTriggers()
 {
-	delete [] m_PubTrigger;
-	m_PubTrigger = NULL;
-	delete [] m_PrivTrigger;
-	m_PrivTrigger = NULL;
+	delete [] m_ArgSBackup;
+	m_ArgSBackup = NULL;
 }
 
-ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key, 
-													const char *value, 
+void ChatTriggers::SetChatTrigger(ChatTriggerType type, const char *value)
+{
+	ke::AutoPtr<char[]> filtered(new char[strlen(value) + 1]);
+
+	const char *src = value;
+	char *dest = filtered.get();
+	char c;
+	while ((c = *src++) != '\0') {
+		if (c <= ' ' || c == '"' || c == '\'' || (c >= '0' && c <= '9') || c == ';' || (c >= 'A' && c <= 'Z') || c == '\\' || (c >= 'a' && c <= 'z') || c >= 0x7F) {
+			logger->LogError("Ignoring %s chat trigger character '%c', not in valid set: %s", (type == ChatTrigger_Private ? "silent" : "public"), c, "!#$%&()*+,-./:<=>?@[]^_`{|}~");
+			continue;
+		}
+		*dest++ = c;
+	}
+	*dest = '\0';
+
+	if (type == ChatTrigger_Private) {
+		m_PrivTrigger = filtered.get();
+	} else {
+		m_PubTrigger = filtered.get();
+	}
+}
+
+ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key,
+													const char *value,
 													ConfigSource source,
-													char *error, 
+													char *error,
 													size_t maxlength)
 {
 	if (strcmp(key, "PublicChatTrigger") == 0)
 	{
-		delete [] m_PubTrigger;
-		m_PubTrigger = sm_strdup(value);
-		m_PubTriggerSize = strlen(m_PubTrigger);
+		SetChatTrigger(ChatTrigger_Public, value);
 		return ConfigResult_Accept;
 	}
 	else if (strcmp(key, "SilentChatTrigger") == 0)
 	{
-		delete [] m_PrivTrigger;
-		m_PrivTrigger = sm_strdup(value);
-		m_PrivTriggerSize = strlen(m_PrivTrigger);
+		SetChatTrigger(ChatTrigger_Private, value);
 		return ConfigResult_Accept;
 	}
 	else if (strcmp(key, "SilentFailSuppress") == 0)
@@ -107,8 +112,10 @@ ConfigResult ChatTriggers::OnSourceModConfigChanged(const char *key,
 
 void ChatTriggers::OnSourceModAllInitialized()
 {
-	m_pShouldFloodBlock = g_Forwards.CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
-	m_pDidFloodBlock = g_Forwards.CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
+	m_pShouldFloodBlock = forwardsys->CreateForward("OnClientFloodCheck", ET_Event, 1, NULL, Param_Cell);
+	m_pDidFloodBlock = forwardsys->CreateForward("OnClientFloodResult", ET_Event, 2, NULL, Param_Cell, Param_Cell);
+	m_pOnClientSayCmd = forwardsys->CreateForward("OnClientSayCommand", ET_Event, 3, NULL, Param_Cell, Param_String, Param_String);
+	m_pOnClientSayCmd_Post = forwardsys->CreateForward("OnClientSayCommand_Post", ET_Ignore, 3, NULL, Param_Cell, Param_String, Param_String);
 }
 
 void ChatTriggers::OnSourceModAllInitialized_Post()
@@ -118,71 +125,133 @@ void ChatTriggers::OnSourceModAllInitialized_Post()
 
 void ChatTriggers::OnSourceModGameInitialized()
 {
-	m_pSayCmd = FindCommand("say");
-	m_pSayTeamCmd = FindCommand("say_team");
+	ConCommand *say_team = FindCommand("say_team");
 
-	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);
+	CommandHook::Callback pre_hook = [this] (int client, const ICommandArgs *args) -> bool {
+		return this->OnSayCommand_Pre(client, args);
+	};
+	CommandHook::Callback post_hook = [this] (int client, const ICommandArgs *args) -> bool {
+		return this->OnSayCommand_Post(client, args);
+	};
+
+	if (ConCommand *say = FindCommand("say")) {
+		hooks_.append(sCoreProviderImpl.AddCommandHook(say, pre_hook));
+		hooks_.append(sCoreProviderImpl.AddPostCommandHook(say, post_hook));
 	}
-	if (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);
+	if (ConCommand *say_team = FindCommand("say_team")) {
+		hooks_.append(sCoreProviderImpl.AddCommandHook(say_team, pre_hook));
+		hooks_.append(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_.append(sCoreProviderImpl.AddCommandHook(say2, pre_hook));
+			hooks_.append(sCoreProviderImpl.AddPostCommandHook(say2, post_hook));
+		}
+	}
+#elif SOURCE_ENGINE == SE_NUCLEARDAWN
+	if (ConCommand *say_squad = FindCommand("say_squad")) {
+		hooks_.append(sCoreProviderImpl.AddCommandHook(say_squad, pre_hook));
+		hooks_.append(sCoreProviderImpl.AddPostCommandHook(say_squad, post_hook));
+	}
+#endif
 }
 
 void ChatTriggers::OnSourceModShutdown()
 {
-	if (m_pSayTeamCmd)
-	{
-		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Post, true);
-		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayTeamCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
-	}
-	if (m_pSayCmd)
-	{
-		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Post, true);
-		SH_REMOVE_HOOK_MEMFUNC(ConCommand, Dispatch, m_pSayCmd, this, &ChatTriggers::OnSayCommand_Pre, false);
-	}
+	hooks_.clear();
 
-	g_Forwards.ReleaseForward(m_pShouldFloodBlock);
-	g_Forwards.ReleaseForward(m_pDidFloodBlock);
+	forwardsys->ReleaseForward(m_pShouldFloodBlock);
+	forwardsys->ReleaseForward(m_pDidFloodBlock);
+	forwardsys->ReleaseForward(m_pOnClientSayCmd);
+	forwardsys->ReleaseForward(m_pOnClientSayCmd_Post);
 }
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-void ChatTriggers::OnSayCommand_Pre(const CCommand &command)
+bool ChatTriggers::OnSayCommand_Pre(int client, const ICommandArgs *command)
 {
-#else
-void ChatTriggers::OnSayCommand_Pre()
-{
-	CCommand command;
-#endif
-	int client;
-	CPlayer *pPlayer;
-	
-	client = g_ConCmds.GetCommandClient();
 	m_bIsChatTrigger = false;
 	m_bWasFloodedMessage = false;
+	m_bPluginIgnored = true;
+
+	const char *args = command->ArgS();
+
+	if (!args)
+		return false;
+
+	/* Save these off for post hook as the command data returned from the engine in older engine versions
+	 * can be NULL, despite the data still being there and valid. */
+	m_Arg0Backup = command->Arg(0);
+	size_t len = strlen(args);
+
+#if SOURCE_ENGINE == SE_EPISODEONE
+	if (m_bIsINS)
+	{
+		if (strcmp(m_Arg0Backup, "say2") == 0 && len >= 4)
+		{
+			args += 4;
+			len -= 4;
+		}
+
+		if (len == 0)
+			return true;
+	}
+#endif
+
+	/* The first pair of quotes are stripped from client say commands, but not console ones.
+	 * We do not want the forwards to differ from what is displayed.
+	 * So only strip the first pair of quotes from client say commands. */
+	bool is_quoted = false;
+
+	if (
+#if SOURCE_ENGINE == SE_EPISODEONE
+		!m_bIsINS &&
+#endif
+		client != 0 && args[0] == '"' && args[len-1] == '"')
+	{
+		/* The server normally won't display empty say commands, but in this case it does.
+		 * I don't think it's desired so let's block it. */
+		if (len <= 2)
+			return true;
+
+		args++;
+		len--;
+		is_quoted = true;
+	}
+
+	/* Some? engines strip the last quote when printing the string to chat.
+	 * This results in having a double-quoted message passed to the OnClientSayCommand ("message") forward,
+	 * but losing the last quote in the OnClientSayCommand_Post ("message) forward.
+	 * To compensate this, we copy the args into our own buffer where the engine won't mess with
+	 * and strip the quotes. */
+	delete [] m_ArgSBackup;
+	m_ArgSBackup = new char[CCommand::MaxCommandLength()+1];
+	memcpy(m_ArgSBackup, args, len+1);
+
+	/* Strip the quotes from the argument */
+	if (is_quoted)
+	{
+		if (m_ArgSBackup[len-1] == '"')
+		{
+			m_ArgSBackup[--len] = '\0';
+		}
+	}
 
 	/* The server console cannot do this */
-	if (client == 0 || (pPlayer = g_Players.GetPlayerByIndex(client)) == NULL)
+	if (client == 0)
 	{
-		RETURN_META(MRES_IGNORED);
+		if (CallOnClientSayCommand(client) >= Pl_Handled)
+			return true;
+
+		return false;
 	}
 
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+
 	/* We guarantee the client is connected */
-	if (!pPlayer->IsConnected())
-	{
-		RETURN_META(MRES_IGNORED);
-	}
-
-	const char *args = command.ArgS();
-	
-	if (!args)
-	{
-		RETURN_META(MRES_IGNORED);
-	}
+	if (!pPlayer || !pPlayer->IsConnected())
+		return false;
 
 	/* Check if we need to block this message from being sent */
 	if (ClientIsFlooding(client))
@@ -190,112 +259,91 @@ void ChatTriggers::OnSayCommand_Pre()
 		char buffer[128];
 
 		if (!logicore.CoreTranslate(buffer, sizeof(buffer), "%T", 2, NULL, "Flooding the server", &client))
-			UTIL_Format(buffer, sizeof(buffer), "You are flooding the server!");
+			ke::SafeSprintf(buffer, sizeof(buffer), "You are flooding the server!");
 
 		/* :TODO: we should probably kick people who spam too much. */
 
 		char fullbuffer[192];
-		UTIL_Format(fullbuffer, sizeof(fullbuffer), "[SM] %s", buffer);
+		ke::SafeSprintf(fullbuffer, sizeof(fullbuffer), "[SM] %s", buffer);
 		g_HL2.TextMsg(client, HUD_PRINTTALK, fullbuffer);
 
 		m_bWasFloodedMessage = true;
-
-		RETURN_META(MRES_SUPERCEDE);
-	}
-
-	/* Handle quoted string sets */
-	bool is_quoted = false;
-	if (args[0] == '"')
-	{
-		args++;
-		is_quoted = true;
+		return true;
 	}
 
 	bool is_trigger = false;
 	bool is_silent = false;
 
-	/* Check for either trigger */
-	if (m_PubTriggerSize && strncmp(args, m_PubTrigger, m_PubTriggerSize) == 0)
-	{
-		is_trigger = true;
-		args = &args[m_PubTriggerSize];
-	} 
-	else if (m_PrivTriggerSize && strncmp(args, m_PrivTrigger, m_PrivTriggerSize) == 0) 
-	{
+	// Prefer the silent trigger in case of clashes.
+	if (strchr(m_PrivTrigger.chars(), m_ArgSBackup[0])) {
 		is_trigger = true;
 		is_silent = true;
-		args = &args[m_PrivTriggerSize];
+	} else if (strchr(m_PubTrigger.chars(), m_ArgSBackup[0])) {
+		is_trigger = true;
 	}
 
-	if (!is_trigger)
-	{
-		RETURN_META(MRES_IGNORED);
+	if (is_trigger) {
+		// Bump the args past the chat trigger - we only support single-character triggers now.
+		args = &m_ArgSBackup[1];
 	}
 
 	/**
 	 * Test if this is actually a command!
 	 */
-	if (!PreProcessTrigger(PEntityOfEntIndex(client), args, is_quoted))
+	if (is_trigger && PreProcessTrigger(PEntityOfEntIndex(client), args))
 	{
-		CPlayer *pPlayer;
-		if (is_silent 
-			&& g_bSupressSilentFails 
-			&& client != 0
-			&& (pPlayer = g_Players.GetPlayerByIndex(client)) != NULL
-			&& pPlayer->GetAdminId() != INVALID_ADMIN_ID)
-		{
-			RETURN_META(MRES_SUPERCEDE);
-		}
-		RETURN_META(MRES_IGNORED);
+		m_bIsChatTrigger = true;
+
+		/**
+		 * We'll execute it in post.
+		 */
+		m_bWillProcessInPost = true;
 	}
 
-	m_bIsChatTrigger = true;
+	if (is_silent && (m_bIsChatTrigger || (g_bSupressSilentFails && pPlayer->GetAdminId() != INVALID_ADMIN_ID)))
+		return true;
 
-	/**
-	 * We'll execute it in post.
-	 */
-	m_bWillProcessInPost = true;
-	m_bTriggerWasSilent = is_silent;
-
-	/* If we're silent, block */
-	if (is_silent)
-	{
-		RETURN_META(MRES_SUPERCEDE);
-	}
+	if (CallOnClientSayCommand(client) >= Pl_Handled)
+		return true;
 
 	/* Otherwise, let the command continue */
-	RETURN_META(MRES_IGNORED);
+	return false;
 }
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-void ChatTriggers::OnSayCommand_Post(const CCommand &command)
-#else
-void ChatTriggers::OnSayCommand_Post()
-#endif
+bool ChatTriggers::OnSayCommand_Post(int client, const ICommandArgs *command)
 {
-	m_bIsChatTrigger = false;
-	m_bWasFloodedMessage = false;
 	if (m_bWillProcessInPost)
 	{
 		/* Reset this for re-entrancy */
 		m_bWillProcessInPost = false;
-		
+
 		/* Execute the cached command */
-		int client = g_ConCmds.GetCommandClient();
 		unsigned int old = SetReplyTo(SM_REPLY_CHAT);
 		serverpluginhelpers->ClientCommand(PEntityOfEntIndex(client), m_ToExecute);
 		SetReplyTo(old);
 	}
+
+	if (!m_bPluginIgnored && m_pOnClientSayCmd_Post->GetFunctionCount() != 0)
+	{
+		m_pOnClientSayCmd_Post->PushCell(client);
+		m_pOnClientSayCmd_Post->PushString(m_Arg0Backup);
+		m_pOnClientSayCmd_Post->PushString(m_ArgSBackup);
+		m_pOnClientSayCmd_Post->Execute(NULL);
+	}
+
+	m_bIsChatTrigger = false;
+	m_bWasFloodedMessage = false;
+	return false;
 }
 
-bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted)
+bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args)
 {
-	/* Extract a command.  This is kind of sloppy. */
+	/* Extract a command. This is kind of sloppy. */
 	char cmd_buf[64];
 	size_t cmd_len = 0;
 	const char *inptr = args;
-	while (*inptr != '\0' 
-			&& !textparsers->IsWhitespace(inptr) 
+	while (*inptr != '\0'
+			&& !textparsers->IsWhitespace(inptr)
 			&& *inptr != '"'
 			&& cmd_len < sizeof(cmd_buf) - 1)
 	{
@@ -318,50 +366,57 @@ bool ChatTriggers::PreProcessTrigger(edict_t *pEdict, const char *args, bool is_
 			return false;
 		}
 
-		/* Now, prepend.  Don't worry about the buffers.  This will 
+		/* Now, prepend.  Don't worry about the buffers.  This will
 		 * work because the sizes are limited from earlier.
 		 */
 		char new_buf[80];
 		strcpy(new_buf, "sm_");
-		strncopy(&new_buf[3], cmd_buf, sizeof(new_buf)-3);
+		ke::SafeStrcpy(&new_buf[3], sizeof(new_buf)-3, cmd_buf);
 
 		/* Recheck */
 		if (!g_ConCmds.LookForSourceModCommand(new_buf))
 		{
 			return false;
 		}
-		
+
 		prepended = true;
 	}
 
 	/* See if we need to do extra string manipulation */
-	if (is_quoted || prepended)
+	if (prepended)
 	{
 		size_t len;
 
 		/* Check if we need to prepend sm_ */
 		if (prepended)
 		{
-			len = UTIL_Format(m_ToExecute, sizeof(m_ToExecute), "sm_%s", args);
+			len = ke::SafeSprintf(m_ToExecute, sizeof(m_ToExecute), "sm_%s", args);
 		} else {
-			len = strncopy(m_ToExecute, args, sizeof(m_ToExecute));
-		}
-		
-		/* Check if we need to strip a quote */
-		if (is_quoted)
-		{
-			if (m_ToExecute[len-1] == '"')
-			{
-				m_ToExecute[--len] = '\0';
-			}
+			len = ke::SafeStrcpy(m_ToExecute, sizeof(m_ToExecute), args);
 		}
 	} else {
-		strncopy(m_ToExecute, args, sizeof(m_ToExecute));
+		ke::SafeStrcpy(m_ToExecute, sizeof(m_ToExecute), args);
 	}
 
 	return true;
 }
 
+cell_t ChatTriggers::CallOnClientSayCommand(int client)
+{
+	cell_t res = Pl_Continue;
+	if (m_pOnClientSayCmd->GetFunctionCount() != 0)
+	{
+		m_pOnClientSayCmd->PushCell(client);
+		m_pOnClientSayCmd->PushString(m_Arg0Backup);
+		m_pOnClientSayCmd->PushString(m_ArgSBackup);
+		m_pOnClientSayCmd->Execute(&res);
+	}
+
+	m_bPluginIgnored = (res >= Pl_Stop);
+
+	return res;
+}
+
 unsigned int ChatTriggers::SetReplyTo(unsigned int reply)
 {
 	unsigned int old = m_ReplyTo;

core/ChatTriggers.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -8,7 +8,7 @@
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 3.0, as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
@@ -34,9 +34,11 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
+#include "GameHooks.h"
 #include <IGameHelpers.h>
 #include <compat_wrappers.h>
 #include <IForwardSys.h>
+#include <amtl/am-string.h>
 
 class ChatTriggers : public SMGlobalClass
 {
@@ -48,42 +50,47 @@ public: //SMGlobalClass
 	void OnSourceModAllInitialized_Post();
 	void OnSourceModGameInitialized();
 	void OnSourceModShutdown();
-	ConfigResult OnSourceModConfigChanged(const char *key, 
-		const char *value, 
+	ConfigResult OnSourceModConfigChanged(const char *key,
+		const char *value,
 		ConfigSource source,
-		char *error, 
+		char *error,
 		size_t maxlength);
 private: //ConCommand
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	void OnSayCommand_Pre(const CCommand &command);
-	void OnSayCommand_Post(const CCommand &command);
-#else
-	void OnSayCommand_Pre();
-	void OnSayCommand_Post();
-#endif
+	bool OnSayCommand_Pre(int client, const ICommandArgs *args);
+	bool OnSayCommand_Post(int client, const ICommandArgs *args);
 public:
 	unsigned int GetReplyTo();
 	unsigned int SetReplyTo(unsigned int reply);
 	bool IsChatTrigger();
 	bool WasFloodedMessage();
 private:
-	bool PreProcessTrigger(edict_t *pEdict, const char *args, bool is_quoted);
+	enum ChatTriggerType {
+		ChatTrigger_Public,
+		ChatTrigger_Private,
+	};
+	void SetChatTrigger(ChatTriggerType type, const char *value);
+	bool PreProcessTrigger(edict_t *pEdict, const char *args);
 	bool ClientIsFlooding(int client);
+	cell_t CallOnClientSayCommand(int client);
 private:
-	ConCommand *m_pSayCmd;
-	ConCommand *m_pSayTeamCmd;
-	char *m_PubTrigger;
-	size_t m_PubTriggerSize;
-	char *m_PrivTrigger;
-	size_t m_PrivTriggerSize;
+	ke::Vector<ke::RefPtr<CommandHook>> hooks_;
+	ke::AString m_PubTrigger;
+	ke::AString m_PrivTrigger;
 	bool m_bWillProcessInPost;
-	bool m_bTriggerWasSilent;
 	bool m_bIsChatTrigger;
 	bool m_bWasFloodedMessage;
+	bool m_bPluginIgnored;
 	unsigned int m_ReplyTo;
 	char m_ToExecute[300];
+	const char *m_Arg0Backup;
+	char *m_ArgSBackup;
 	IForward *m_pShouldFloodBlock;
 	IForward *m_pDidFloodBlock;
+	IForward *m_pOnClientSayCmd;
+	IForward *m_pOnClientSayCmd_Post;
+#if SOURCE_ENGINE == SE_EPISODEONE
+	bool m_bIsINS;
+#endif
 };
 
 extern ChatTriggers g_ChatTriggers;

core/ConCmdManager.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -34,60 +34,82 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include "ForwardSys.h"
-#include "sm_trie.h"
-#include "sm_memtable.h"
+#include <IForwardSys.h>
 #include <sh_list.h>
 #include <sh_string.h>
 #include <IRootConsoleMenu.h>
 #include <IAdminSystem.h>
 #include "concmd_cleaner.h"
+#include "GameHooks.h"
+#include <am-autoptr.h>
+#include <sm_stringhashmap.h>
+#include <am-utility.h>
+#include <am-inlinelist.h>
+#include <am-linkedlist.h>
+#include <am-refcounting.h>
 
 using namespace SourceHook;
 
-enum CmdType
+struct CmdHook;
+struct ConCmdInfo;
+
+struct CommandGroup : public ke::Refcounted<CommandGroup>
 {
-	Cmd_Server,
-	Cmd_Admin,
+	ke::LinkedList<CmdHook *> hooks;
 };
 
 struct AdminCmdInfo
 {
-	AdminCmdInfo()
+	AdminCmdInfo(const ke::RefPtr<CommandGroup> &group, FlagBits flags)
+		: group(group),
+		  flags(flags),
+		  eflags(0)
 	{
-		cmdGrpId = -1;
-		flags = 0;
-		eflags = 0;
 	}
-	int cmdGrpId;			/* index into cmdgroup string table */
+	ke::RefPtr<CommandGroup> group;
 	FlagBits flags;			/* default flags */
 	FlagBits eflags;		/* effective flags */
 };
 
-struct CmdHook
+struct CmdHook : public ke::InlineListNode<CmdHook>
 {
-	CmdHook()
+	enum Type {
+		Server,
+		Client
+	};
+
+	CmdHook(Type type, ConCmdInfo *cmd, IPluginFunction *fun, const char *description)
+		: type(type),
+		  info(cmd),
+		  pf(fun),
+		  helptext(description)
 	{
-		pf = NULL;
-		pAdmin = NULL;
 	}
-	IPluginFunction *pf;	/* function hook */
-	String helptext;		/* help text */
-	AdminCmdInfo *pAdmin;	/* admin requirements, if any */
+
+	Type type;
+	ConCmdInfo *info;
+	IPluginFunction *pf;				/* function hook */
+	ke::AString helptext;				/* help text */
+	ke::AutoPtr<AdminCmdInfo> admin;	/* admin requirements, if any */
 };
 
+typedef ke::InlineList<CmdHook> CmdHookList;
+
 struct ConCmdInfo
 {
 	ConCmdInfo()
 	{
+		pPlugin = nullptr;
 		sourceMod = false;
-		pCmd = NULL;
+		pCmd = nullptr;
+		eflags = 0;
 	}
 	bool sourceMod;					/**< Determines whether or not concmd was created by a SourceMod plugin */
 	ConCommand *pCmd;				/**< Pointer to the command itself */
-	List<CmdHook *> srvhooks;		/**< Hooks as a server command */
-	List<CmdHook *> conhooks;		/**< Hooks as a console command */
-	AdminCmdInfo admin;				/**< Admin info, if any */
+	CmdHookList hooks;				/**< Hook list */
+	FlagBits eflags;				/**< Effective admin flags */
+	ke::RefPtr<CommandHook> sh_hook;   /**< SourceHook hook, if any. */
+	IPlugin *pPlugin; 				/**< Owning plugin handle. */
 };
 
 typedef List<ConCmdInfo *> ConCmdList;
@@ -98,11 +120,7 @@ class ConCmdManager :
 	public IPluginsListener,
 	public IConCommandTracker
 {
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	friend void CommandCallback(const CCommand &command);
-#else
-	friend void CommandCallback();
-#endif
+	friend void CommandCallback(DISPATCH_ARGS);
 public:
 	ConCmdManager();
 	~ConCmdManager();
@@ -112,32 +130,28 @@ public: //SMGlobalClass
 public: //IPluginsListener
 	void OnPluginDestroyed(IPlugin *plugin);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
 public: //IConCommandTracker
-	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
+	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) override;
 public:
-	bool AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags);
+	bool AddServerCommand(IPluginFunction *pFunction, const char *name, const char *description, int flags, IPlugin *pPlugin);
 	bool AddAdminCommand(IPluginFunction *pFunction, 
 						 const char *name, 
 						 const char *group,
 						 int adminflags,
 						 const char *description, 
-						 int flags);
+						 int flags,
+						 IPlugin *pPlugin);
 	ResultType DispatchClientCommand(int client, const char *cmd, int args, ResultType type);
 	void UpdateAdminCmdFlags(const char *cmd, OverrideType type, FlagBits bits, bool remove);
 	bool LookForSourceModCommand(const char *cmd);
 	bool LookForCommandAdminFlags(const char *cmd, FlagBits *pFlags);
-	bool CheckClientCommandAccess(int client, const char *cmd, FlagBits flags);
-	bool CheckAdminCommandAccess(AdminId adm, const char *cmd, FlagBits flags);
 private:
-	void InternalDispatch(const CCommand &command);
+	bool InternalDispatch(int client, const ICommandArgs *args);
 	ResultType RunAdminCommand(ConCmdInfo *pInfo, int client, int args);
-	ConCmdInfo *AddOrFindCommand(const char *name, const char *description, int flags);
-	void SetCommandClient(int client);
+	ConCmdInfo *AddOrFindCommand(const char *name, const char *description, int flags, IPlugin *pPlugin);
 	void AddToCmdList(ConCmdInfo *info);
-	void RemoveConCmd(ConCmdInfo *info, const char *cmd, bool is_read_safe, bool untrack);
-	void RemoveConCmds(List<CmdHook *> &cmdlist);
-	void RemoveConCmds(List<CmdHook *> &cmdlist, IPluginContext *pContext);
+	void RemoveConCmd(ConCmdInfo *info, const char *cmd, bool untrack);
 	bool CheckAccess(int client, const char *cmd, AdminCmdInfo *pAdmin);
 
 	// Case insensitive
@@ -146,20 +160,16 @@ private:
 	// Case sensitive
 	ConCmdInfo *FindInTrie(const char *name);
 public:
-	inline int GetCommandClient()
-	{
-		return m_CmdClient;
-	}
 	inline const List<ConCmdInfo *> & GetCommandList()
 	{
 		return m_CmdList;
 	}
 private:
-	Trie *m_pCmds;					/* command lookup */
-	Trie *m_pCmdGrps;				/* command group lookup */
+	typedef StringHashMap<ke::RefPtr<CommandGroup> > GroupMap;
+
+	StringHashMap<ConCmdInfo *> m_Cmds; /* command lookup */
+	GroupMap m_CmdGrps;				/* command group map */
 	ConCmdList m_CmdList;			/* command list */
-	int m_CmdClient;				/* current client */
-	BaseStringTable m_Strings;		/* string table */
 };
 
 extern ConCmdManager g_ConCmds;

core/ConVarManager.cpp

@@ -29,34 +29,19 @@
 
 #include "ConVarManager.h"
 #include "HalfLife2.h"
-#include "PluginSys.h"
-#include "ForwardSys.h"
-#include "HandleSys.h"
-#include "sm_srvcmds.h"
 #include "sm_stringutil.h"
 #include <sh_vector.h>
-#include <sm_trie_tpl.h>
+#include <sm_namehashset.h>
+#include "logic_bridge.h"
+#include "sourcemod.h"
+#include "provider.h"
+#include <bridge/include/IScriptManager.h>
 
 ConVarManager g_ConVarManager;
 
-#if SOURCE_ENGINE <= SE_DARKMESSIAH
-#define CallGlobalChangeCallbacks	CallGlobalChangeCallback
-#endif
-
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-SH_DECL_HOOK3_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *, float);
-#else
-SH_DECL_HOOK2_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *);
-#endif
-
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-SH_DECL_HOOK5_void(IServerGameDLL, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, edict_t *, EQueryCvarValueStatus, const char *, const char *);
-SH_DECL_HOOK5_void(IServerPluginCallbacks, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, edict_t *, EQueryCvarValueStatus, const char *, const char *);
-#endif
-
 const ParamType CONVARCHANGE_PARAMS[] = {Param_Cell, Param_String, Param_String};
 typedef List<const ConVar *> ConVarList;
-KTrie<ConVarInfo *> convar_cache;
+NameHashSet<ConVarInfo *> convar_cache;
 
 class ConVarReentrancyGuard
 {
@@ -92,7 +77,7 @@ public:
 
 ConVarReentrancyGuard *ConVarReentrancyGuard::chain = NULL;
 
-ConVarManager::ConVarManager() : m_ConVarType(0), m_bIsDLLQueryHooked(false), m_bIsVSPQueryHooked(false)
+ConVarManager::ConVarManager() : m_ConVarType(0)
 {
 }
 
@@ -110,28 +95,17 @@ void ConVarManager::OnSourceModStartup(bool late)
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 	/* Create the 'ConVar' handle type */
-	m_ConVarType = g_HandleSys.CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_ConVarType = handlesys->CreateType("ConVar", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void ConVarManager::OnSourceModAllInitialized()
 {
-	/**
-	 * Episode 2 has this function by default, but the older versions do not.
-	 */
-#if SOURCE_ENGINE == SE_EPISODEONE
-	if (g_SMAPI->GetGameDLLVersion() >= 6)
-	{
-		SH_ADD_HOOK_MEMFUNC(IServerGameDLL, OnQueryCvarValueFinished, gamedll, this, &ConVarManager::OnQueryCvarValueFinished, false);
-		m_bIsDLLQueryHooked = true;
-	}
-#endif
+	g_Players.AddClientListener(this);
 
-	SH_ADD_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
-
-	g_PluginSys.AddPluginsListener(this);
+	scripts->AddPluginsListener(this);
 
 	/* Add the 'convars' option to the 'sm' console command */
-	g_RootMenu.AddRootConsoleCommand("cvars", "View convars created by a plugin", this);
+	rootmenu->AddRootConsoleCommand3("cvars", "View convars created by a plugin", this);
 }
 
 void ConVarManager::OnSourceModShutdown()
@@ -146,10 +120,10 @@ void ConVarManager::OnSourceModShutdown()
 
 		iter = m_ConVars.erase(iter);
 
-		g_HandleSys.FreeHandle(pInfo->handle, &sec);
+		handlesys->FreeHandle(pInfo->handle, &sec);
 		if (pInfo->pChangeForward != NULL)
 		{
-			g_Forwards.ReleaseForward(pInfo->pChangeForward);
+			forwardsys->ReleaseForward(pInfo->pChangeForward);
 		}
 		if (pInfo->sourceMod)
 		{
@@ -177,79 +151,23 @@ void ConVarManager::OnSourceModShutdown()
 	}
 	convar_cache.clear();
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-	/* 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;
-	}
-#endif
-
-	SH_REMOVE_HOOK_STATICFUNC(ICvar, CallGlobalChangeCallbacks, icvar, OnConVarChanged, false);
+	g_Players.RemoveClientListener(this);
 
 	/* Remove the 'convars' option from the 'sm' console command */
-	g_RootMenu.RemoveRootConsoleCommand("cvars", this);
+	rootmenu->RemoveRootConsoleCommand("cvars", this);
 
-	g_PluginSys.RemovePluginsListener(this);
+	scripts->RemovePluginsListener(this);
 
 	/* Remove the 'ConVar' handle type */
-	g_HandleSys.RemoveType(m_ConVarType, g_pCoreIdent);
-}
-
-/**
- * Orange Box will never use this.
- */
-void ConVarManager::OnSourceModVSPReceived()
-{
-	/**
-	 * Don't bother if the DLL is already hooked.
-	 */
-	if (m_bIsDLLQueryHooked)
-	{
-		return;
-	}
-
-	/* For later MM:S versions, use the updated API, since it's cleaner. */
-#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
-	int engine = g_SMAPI->GetSourceEngineBuild();
-	if (engine == SOURCE_ENGINE_ORIGINAL || vsp_version < 2)
-	{
-		return;
-	}
-#else
-	if (g_HL2.IsOriginalEngine() || vsp_version < 2)
-	{
-		return;
-	}
-#endif
-
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-	SH_ADD_HOOK_MEMFUNC(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, this, &ConVarManager::OnQueryCvarValueFinished, false);
-	m_bIsVSPQueryHooked = true;
-#endif
+	handlesys->RemoveType(m_ConVarType, g_pCoreIdent);
 }
 
 bool convar_cache_lookup(const char *name, ConVarInfo **pVar)
 {
-	ConVarInfo **pLookup = convar_cache.retrieve(name);
-	if (pLookup != NULL)
-	{
-		*pVar = *pLookup;
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+	return convar_cache.retrieve(name, pVar);
 }
 
-void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe)
+void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name)
 {
 	/* Only check convars that have not been created by SourceMod's core */
 	ConVarInfo *pInfo;
@@ -265,7 +183,7 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	convar_cache.remove(name);
 
 	/* Now make sure no plugins are referring to this pointer */
-	IPluginIterator *pl_iter = g_PluginSys.GetPluginIterator();
+	IPluginIterator *pl_iter = scripts->GetPluginIterator();
 	while (pl_iter->MorePlugins())
 	{
 		IPlugin *pl = pl_iter->GetPlugin();
@@ -281,7 +199,7 @@ void ConVarManager::OnUnlinkConCommandBase(ConCommandBase *pBase, const char *na
 	}
 
 	/* Free resources */
-	g_HandleSys.FreeHandle(pInfo->handle, &sec);
+	handlesys->FreeHandle(pInfo->handle, &sec);
 	delete pInfo;
 }
 
@@ -296,14 +214,35 @@ void ConVarManager::OnPluginUnloaded(IPlugin *plugin)
 		delete pConVarList;
 	}
 
+	const IPluginRuntime * pRuntime = plugin->GetRuntime();
+
 	/* Remove convar queries for this plugin that haven't returned results yet */
-	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end(); iter++)
+	for (iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
 	{
 		ConVarQuery &query = (*iter);
-		if (query.pCallback->GetParentRuntime() == plugin->GetRuntime())
+		if (query.pCallback->GetParentRuntime() == pRuntime)
 		{
-			m_ConVarQueries.erase(iter);
+			iter = m_ConVarQueries.erase(iter);
+			continue;
 		}
+
+		++iter;
+	}
+}
+
+void ConVarManager::OnClientDisconnected(int client)
+{
+	/* Remove convar queries for this client that haven't returned results yet */
+	for (List<ConVarQuery>::iterator iter = m_ConVarQueries.begin(); iter != m_ConVarQueries.end();)
+	{
+		ConVarQuery &query = (*iter);
+		if (query.client == client)
+		{
+			iter = m_ConVarQueries.erase(iter);
+			continue;
+		}
+
+		++iter;
 	}
 }
 
@@ -317,27 +256,27 @@ bool ConVarManager::GetHandleApproxSize(HandleType_t type, void *object, unsigne
 	return true;
 }
 
-void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
+void ConVarManager::OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command)
 {
-	int argcount = command.ArgC();
+	int argcount = command->ArgC();
 	if (argcount >= 3)
 	{
 		bool wantReset = false;
 		
 		/* Get plugin index that was passed */
-		const char *arg = command.Arg(2);
+		const char *arg = command->Arg(2);
 		if (argcount >= 4 && strcmp(arg, "reset") == 0)
 		{
 			wantReset = true;
-			arg = command.Arg(3);
+			arg = command->Arg(3);
 		}
 		
 		/* Get plugin object */
-		CPlugin *plugin = g_PluginSys.FindPluginByConsoleArg(arg);
+		IPlugin *plugin = scripts->FindPluginByConsoleArg(arg);
 
 		if (!plugin)
 		{
-			g_RootMenu.ConsolePrint("[SM] Plugin \"%s\" was not found.", arg);
+			UTIL_ConsolePrint("[SM] Plugin \"%s\" was not found.", arg);
 			return;
 		}
 
@@ -351,14 +290,14 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 		/* If no convar list... */
 		if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
 		{
-			g_RootMenu.ConsolePrint("[SM] No convars found for: %s", plname);
+			UTIL_ConsolePrint("[SM] No convars found for: %s", plname);
 			return;
 		}
 
 		if (!wantReset)
 		{
-			g_RootMenu.ConsolePrint("[SM] Listing %d convars for: %s", pConVarList->size(), plname);
-			g_RootMenu.ConsolePrint("  %-32.31s %s", "[Name]", "[Value]");
+			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 */
@@ -367,7 +306,7 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 			/*const */ConVar *pConVar = const_cast<ConVar *>(*iter);
 			if (!wantReset)
 			{
-				g_RootMenu.ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
+				UTIL_ConsolePrint("  %-32.31s %s", pConVar->GetName(), pConVar->GetString()); 
 			} else {
 				pConVar->Revert();
 			}
@@ -375,14 +314,14 @@ void ConVarManager::OnRootConsoleCommand(const char *cmdname, const CCommand &co
 		
 		if (wantReset)
 		{
-			g_RootMenu.ConsolePrint("[SM] Reset %d convars for: %s", pConVarList->size(), plname);
+			UTIL_ConsolePrint("[SM] Reset %d convars for: %s", pConVarList->size(), plname);
 		}
 
 		return;
 	}
 
 	/* Display usage of subcommand */
-	g_RootMenu.ConsolePrint("[SM] Usage: sm cvars [reset] <plugin #>");
+	UTIL_ConsolePrint("[SM] Usage: sm cvars [reset] <plugin #>");
 }
 
 Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name, const char *defaultVal, const char *description, int flags, bool hasMin, float min, bool hasMax, float max)
@@ -414,7 +353,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 			pInfo->pVar = pConVar;
 
 			/* If we don't, then create a new handle from the convar */
-			hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+			hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 			if (hndl == BAD_HANDLE)
 			{
 				delete pInfo;
@@ -445,7 +384,7 @@ Handle_t ConVarManager::CreateConVar(IPluginContext *pContext, const char *name,
 	pInfo->pChangeForward = NULL;
 
 	/* Create a handle from the new convar */
-	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -474,7 +413,13 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	ConVarInfo *pInfo;
 	Handle_t hndl;
 
-	/* Search for convar */
+	/* Check convar cache to find out if we already have a handle */
+	if (convar_cache_lookup(name, &pInfo))
+	{
+		return pInfo->handle;
+	}
+
+	/* Couldn't find it in cache, so search for it */
 	pConVar = icvar->FindVar(name);
 
 	/* If it doesn't exist, then return an invalid handle */
@@ -483,12 +428,6 @@ Handle_t ConVarManager::FindConVar(const char *name)
 		return BAD_HANDLE;
 	}
 
-	/* At this point, the convar exists. So, find out if we already have a handle */
-	if (convar_cache_lookup(name, &pInfo))
-	{
-		return pInfo->handle;
-	}
-
 	/* Create and initialize ConVarInfo structure */
 	pInfo = new ConVarInfo();
 	pInfo->sourceMod = false;
@@ -496,7 +435,7 @@ Handle_t ConVarManager::FindConVar(const char *name)
 	pInfo->pVar = pConVar;
 
 	/* If we don't have a handle, then create a new one */
-	hndl = g_HandleSys.CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
+	hndl = handlesys->CreateHandle(m_ConVarType, pInfo, NULL, g_pCoreIdent, NULL);
 	if (hndl == BAD_HANDLE)
 	{
 		delete pInfo;
@@ -554,7 +493,7 @@ void ConVarManager::HookConVarChange(ConVar *pConVar, IPluginFunction *pFunction
 		/* If forward does not exist, create it */
 		if (!pForward)
 		{
-			pForward = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
+			pForward = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, CONVARCHANGE_PARAMS);
 			pInfo->pChangeForward = pForward;
 		}
 
@@ -594,7 +533,7 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 			!ConVarReentrancyGuard::IsCvarInChain(pConVar))
 		{
 			/* Free this forward */
-			g_Forwards.ReleaseForward(pForward);
+			forwardsys->ReleaseForward(pForward);
 			pInfo->pChangeForward = NULL;
 		}
 	}
@@ -602,26 +541,13 @@ void ConVarManager::UnhookConVarChange(ConVar *pConVar, IPluginFunction *pFuncti
 
 QueryCvarCookie_t ConVarManager::QueryClientConVar(edict_t *pPlayer, const char *name, IPluginFunction *pCallback, Handle_t hndl)
 {
-	QueryCvarCookie_t cookie = 0;
+	QueryCvarCookie_t cookie = sCoreProviderImpl.QueryClientConVar(IndexOfEdict(pPlayer), name);
 
-#if SOURCE_ENGINE != SE_DARKMESSIAH
-	/* Call StartQueryCvarValue() in either the IVEngineServer or IServerPluginHelpers depending on situation */
-	if (m_bIsDLLQueryHooked)
+	if (pCallback != NULL)
 	{
-		cookie = engine->StartQueryCvarValue(pPlayer, name);	
+		ConVarQuery query = { cookie, pCallback, (cell_t) hndl, IndexOfEdict(pPlayer) };
+		m_ConVarQueries.push_back(query);
 	}
-	else if (m_bIsVSPQueryHooked)
-	{
-		cookie = serverpluginhelpers->StartQueryCvarValue(pPlayer, name);
-	}
-	else
-	{
-		return InvalidQueryCvarCookie;
-	}
-
-	ConVarQuery query = {cookie, pCallback, hndl};
-	m_ConVarQueries.push_back(query);
-#endif
 
 	return cookie;
 }
@@ -633,7 +559,7 @@ void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar
 	bool inserted = false;
 	const char *orig = pConVar->GetName();
 
-	IPlugin *plugin = g_PluginSys.FindPluginByContext(pContext->GetContext());
+	IPlugin *plugin = scripts->FindPluginByContext(pContext->GetContext());
 
 	/* Check plugin for an existing convar list */
 	if (!plugin->GetProperty("ConVarList", (void **)&pConVarList))
@@ -664,11 +590,7 @@ void ConVarManager::AddConVarToPluginList(IPluginContext *pContext, const ConVar
 	}
 }
 
-#if SOURCE_ENGINE >= SE_ORANGEBOX
 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)
@@ -688,16 +610,8 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 
 	if (pInfo->changeListeners.size() != 0)
 	{
-		for (List<IConVarChangeListener *>::iterator i = pInfo->changeListeners.begin();
-			 i != pInfo->changeListeners.end();
-			 i++)
-		{
-#if SOURCE_ENGINE >= SE_ORANGEBOX
+		for (auto i = pInfo->changeListeners.begin(); i != pInfo->changeListeners.end(); i++)
 			(*i)->OnConVarChanged(pConVar, oldValue, flOldValue);
-#else
-			(*i)->OnConVarChanged(pConVar, oldValue, atof(oldValue));
-#endif
-		}
 	}
 
 	if (pForward != NULL)
@@ -714,11 +628,15 @@ void ConVarManager::OnConVarChanged(ConVar *pConVar, const char *oldValue)
 
 bool ConVarManager::IsQueryingSupported()
 {
-	return (m_bIsDLLQueryHooked || m_bIsVSPQueryHooked);
+	return sCoreProviderImpl.IsClientConVarQueryingSupported();
 }
 
 #if SOURCE_ENGINE != SE_DARKMESSIAH
-void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result, const char *cvarName, const char *cvarValue)
+void ConVarManager::OnClientQueryFinished(QueryCvarCookie_t cookie,
+                                          int client,
+                                          EQueryCvarValueStatus result,
+										  const char *cvarName,
+										  const char *cvarValue)
 {
 	IPluginFunction *pCallback = NULL;
 	cell_t value = 0;
@@ -740,7 +658,7 @@ void ConVarManager::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *
 		cell_t ret;
 
 		pCallback->PushCell(cookie);
-		pCallback->PushCell(IndexOfEdict(pPlayer));
+		pCallback->PushCell(client);
 		pCallback->PushCell(result);
 		pCallback->PushString(cvarName);
 
@@ -766,7 +684,7 @@ HandleError ConVarManager::ReadConVarHandle(Handle_t hndl, ConVar **pVar)
 	ConVarInfo *pInfo;
 	HandleError error;
 	
-	if ((error = g_HandleSys.ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
+	if ((error = handlesys->ReadHandle(hndl, m_ConVarType, NULL, (void **)&pInfo)) != HandleError_None)
 	{
 		return error;
 	}

core/ConVarManager.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -39,13 +39,11 @@
 #include <IForwardSys.h>
 #include <IHandleSys.h>
 #include <IRootConsoleMenu.h>
+#include <IPlayerHelpers.h>
 #include <compat_wrappers.h>
 #include "concmd_cleaner.h"
-
-#if SOURCE_ENGINE == SE_DARKMESSIAH
-class EQueryCvarValueStatus;
-typedef int QueryCvarCookie_t;
-#endif
+#include "PlayerManager.h"
+#include <sm_stringhashmap.h>
 
 using namespace SourceHook;
 
@@ -65,6 +63,15 @@ struct ConVarInfo
 	IChangeableForward *pChangeForward;	/**< Forward associated with convar */
 	ConVar *pVar;						/**< The actual convar */
 	List<IConVarChangeListener *> changeListeners;
+
+	static inline bool matches(const char *name, const ConVarInfo *info)
+	{
+		return strcmp(name, info->pVar->GetName()) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
 };
 
 /**
@@ -75,6 +82,7 @@ struct ConVarQuery
 	QueryCvarCookie_t cookie;			/**< Cookie that identifies query */
 	IPluginFunction *pCallback;			/**< Function that will be called when query is finished */
 	cell_t value;						/**< Optional value passed to query function */
+	cell_t client;						/**< Only used for cleaning up on client disconnection */
 };
 
 class ConVarManager :
@@ -82,7 +90,8 @@ class ConVarManager :
 	public IHandleTypeDispatch,
 	public IPluginsListener,
 	public IRootConsoleCommand,
-	public IConCommandTracker
+	public IConCommandTracker,
+	public IClientListener
 {
 public:
 	ConVarManager();
@@ -91,16 +100,17 @@ public: // SMGlobalClass
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
-	void OnSourceModVSPReceived();
 public: // IHandleTypeDispatch
 	void OnHandleDestroy(HandleType_t type, void *object);
 	bool GetHandleApproxSize(HandleType_t type, void *object, unsigned int *pSize);
 public: // IPluginsListener
 	void OnPluginUnloaded(IPlugin *plugin);
 public: //IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
 public: //IConCommandTracker
-	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe);
+	void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) override;
+public: //IClientListener
+	void OnClientDisconnected(int client);
 public:
 	/**
 	 * Create a convar and return a handle to it.
@@ -136,34 +146,26 @@ public:
 
 	HandleError ReadConVarHandle(Handle_t hndl, ConVar **pVar);
 
+	// Called via game hooks.
+	void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	void OnClientQueryFinished(
+	  QueryCvarCookie_t cookie,
+	  int client,
+	  EQueryCvarValueStatus result,
+	  const char *cvarName,
+	  const char *cvarValue);
+#endif
+
 private:
 	/**
 	 * Adds a convar to a plugin's list.
 	 */
 	static void AddConVarToPluginList(IPluginContext *pContext, const ConVar *pConVar);
-
-	/**
-	 * Static callback that Valve's ConVar object executes when the convar's value changes.
-	 */
-#if 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
 private:
 	HandleType_t m_ConVarType;
 	List<ConVarInfo *> m_ConVars;
 	List<ConVarQuery> m_ConVarQueries;
-	bool m_bIsDLLQueryHooked;
-	bool m_bIsVSPQueryHooked;
 };
 
 extern ConVarManager g_ConVarManager;

core/ConsoleDetours.cpp

@@ -49,7 +49,11 @@
 #include "ConCmdManager.h"
 #include "HalfLife2.h"
 #include "ConCommandBaseIterator.h"
-#include "ShareSys.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>
@@ -58,24 +62,12 @@
 # include <unistd.h>
 #endif
 
-#if SH_IMPL_VERSION >= 5
-# if SOURCE_ENGINE >= SE_ORANGEBOX
+#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
 #else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHVPAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>,bool);
- extern int __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
-# endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *, bool, class fastdelegate::FastDelegate0<void>);
+	SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 #endif
 
-#if SH_IMPL_VERSION >= 4
-
 class GenericCommandHooker : public IConCommandLinkListener
 {
 	struct HackInfo
@@ -131,16 +123,16 @@ class GenericCommandHooker : public IConCommandLinkListener
 		}
 	}
 
-# if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 	void Dispatch(const CCommand& args)
-# else
+#else
 	void Dispatch()
-# endif
+#endif
 	{
 		cell_t res = ConsoleDetours::Dispatch(META_IFACEPTR(ConCommand)
-# if SOURCE_ENGINE >= SE_ORANGEBOX
+#if SOURCE_ENGINE >= SE_ORANGEBOX
 			, args
-# endif
+#endif
 			);
 		if (res >= Pl_Handled)
 			RETURN_META(MRES_SUPERCEDE);
@@ -190,7 +182,7 @@ class GenericCommandHooker : public IConCommandLinkListener
 		size_t index;
 		if (!FindVtable(vtable, index))
 		{
-			g_Logger.LogError("Console detour tried to unhook command \"%s\" but it wasn't found", pBase->GetName());
+			logger->LogError("Console detour tried to unhook command \"%s\" but it wasn't found", pBase->GetName());
 			return;
 		}
 
@@ -214,7 +206,7 @@ public:
 
 		if (dispatch.thisptroffs < 0)
 		{
-			g_Logger.LogError("Command filter could not determine ConCommand layout");
+			logger->LogError("Command filter could not determine ConCommand layout");
 			return false;
 		}
 
@@ -223,7 +215,7 @@ public:
 
 		if (!vtables.size())
 		{
-			g_Logger.LogError("Command filter could not find any cvars!");
+			logger->LogError("Command filter could not find any cvars!");
 			return false;
 		}
 
@@ -257,308 +249,6 @@ public:
 	}
 };
 
-/**
- * END DVP HOOK VERSION
- */
-
-#else /* SH_IMPL_VERSION >= 4 */
-
-/**
- * BEGIN ENGINE DETOUR VERSION
- */
-
-# include <jit/jit_helpers.h>
-# include <jit/x86/x86_macros.h>
-
-class GenericCommandHooker
-{
-	struct Patch
-	{
-		Patch() : applied(false)
-		{
-		}
-
-		bool applied;
-		void *base;
-		unsigned char search[16];
-		size_t search_len;
-		size_t offset;
-		size_t saveat;
-		int regparam;
-		void *detour;
-	};
-	
-	Patch ces;
-	Patch cgc;
-
-public:
- 	static void DelayedActivation(void *inparam)
- 	{
- 		GenericCommandHooker *cdtrs = reinterpret_cast<GenericCommandHooker*>(inparam);
- 		/* Safe to re-enter because the frame queue is lock+swapped. */
- 		if ((!cdtrs->ces.applied || !cdtrs->cgc.applied) &&
- 		    g_HL2.PeekCommandStack() != NULL)
- 		{
- 			g_SourceMod.AddFrameAction(GenericCommandHooker::DelayedActivation, cdtrs);
- 			return;
- 		}
- 
- 		if (!cdtrs->ces.applied)
- 			cdtrs->ApplyPatch(&cdtrs->ces);
- 		if (!cdtrs->cgc.applied)
- 			cdtrs->ApplyPatch(&cdtrs->cgc);
- 	}
-
-	bool Enable()
-	{
-		const char *platform = NULL;
-# if defined(PLATFORM_WINDOWS)
-		platform = "Windows";
-# else	
-		void *addrInBase = (void *)g_SMAPI->GetEngineFactory(false);
-		Dl_info info;
-		if (!dladdr(addrInBase, &info))
-		{
-			g_Logger.LogError("Command filter could not find engine name");
-			return false;
-		}
-		if (strstr(info.dli_fname, "engine_i486"))
-		{
-			platform = "Linux_486";
-		}
-		else if (strstr(info.dli_fname, "engine_i686"))
-		{
-			platform = "Linux_686";
-		}
-		else if (strstr(info.dli_fname, "engine_amd"))
-		{
-			platform = "Linux_AMD";
-		}
-		else
-		{
-			g_Logger.LogError("Command filter could not determine engine (%s)", info.dli_fname);
-			return false;
-		}
-# endif
-
-		if (!PrepPatch("Cmd_ExecuteString", "CES", platform, &ces))
-			return false;
-		if (!PrepPatch("CGameClient::ExecuteString", "CGC", platform, &cgc))
-			return false;
-
- 		if (g_HL2.PeekCommandStack() != NULL)
- 		{
- 			g_SourceMod.AddFrameAction(GenericCommandHooker::DelayedActivation, this);
- 			return true;
- 		}
-
-		ApplyPatch(&ces);
-		ApplyPatch(&cgc);
-
-		return true;
-	}
-
-	void Disable()
-	{
-		UndoPatch(&ces);
-		UndoPatch(&cgc);
-	}
-
-private:
-
-# if !defined PLATFORM_WINDOWS
-#  define PAGE_READWRITE     PROT_READ|PROT_WRITE
-#  define PAGE_EXECUTE_READ  PROT_READ|PROT_EXEC
-
-	static inline uintptr_t AddrToPage(uintptr_t address)
-	{
-		return (address & ~(uintptr_t(sysconf(_SC_PAGE_SIZE) - 1)));
-	}
-
-# endif
-
-	void Protect(void *addr, size_t length, int prot)
-	{
-# if defined PLATFORM_WINDOWS
-		DWORD ignore;
-		VirtualProtect(addr, length, prot, &ignore);
-# else
-		uintptr_t startPage = AddrToPage(uintptr_t(addr));
-		length += (uintptr_t(addr) - startPage);
-		mprotect((void*)startPage, length, prot);
-# endif
-	}
-
-	void UndoPatch(Patch *patch)
-	{
-		if (!patch->applied || patch->detour == NULL)
-			return;
-
-		g_pSourcePawn->FreePageMemory(patch->detour);
-
-		unsigned char *source = (unsigned char *)patch->base + patch->offset;
-		Protect(source, patch->search_len, PAGE_READWRITE);
-		for (size_t i = 0; i < patch->search_len; i++)
-			source[i] = patch->search[i];
-		Protect(source, patch->search_len, PAGE_EXECUTE_READ);
-	}
-
-	void ApplyPatch(Patch *patch)
-	{
-		assert(!patch->applied);
-
-		size_t length = 0;
-		void *callback = (void*)&ConsoleDetours::Dispatch;
-
-		/* Bogus assignment to make compiler is doing the right thing. */
-		patch->detour = callback;
-
-		/* Assemgle the detour. */
-		JitWriter writer;
-		writer.outbase = NULL;
-		writer.outptr = NULL;
-		do
-		{
-			/* Need a specific register, or value on stack? */
-			if (patch->regparam != -1)
-				IA32_Push_Reg(&writer, patch->regparam);
-			/* Call real function. */
-			IA32_Write_Jump32_Abs(&writer, IA32_Call_Imm32(&writer, 0), callback);
-			/* Restore stack. */
-			if (patch->regparam != -1)
-				IA32_Pop_Reg(&writer, patch->regparam);
-			/* Copy any saved bytes */
-			if (patch->saveat)
-			{
-				for (size_t i = patch->saveat; i < patch->search_len; i++)
-				{
-					writer.write_ubyte(patch->search[i]);
-				}
-			}
-			/* Jump back to the caller. */
-			unsigned char *target = (unsigned char *)patch->base + patch->offset + patch->search_len;
-			IA32_Jump_Imm32_Abs(&writer, target);
-			/* Assemble, if we can. */
-			if (writer.outbase == NULL)
-			{
-				length = writer.outptr - writer.outbase;
-				patch->detour = g_pSourcePawn->AllocatePageMemory(length);
-				if (patch->detour == NULL)
-				{
-					g_Logger.LogError("Ran out of memory!");
-					return;
-				}
-				g_pSourcePawn->SetReadWrite(patch->detour);
-				writer.outbase = (jitcode_t)patch->detour;
-				writer.outptr = writer.outbase;
-			}
-			else
-			{
-				break;
-			}
-		} while (true);
-
-		g_pSourcePawn->SetReadExecute(patch->detour);
-
-		unsigned char *source = (unsigned char *)patch->base + patch->offset;
-		Protect(source, 6, PAGE_READWRITE);
-		source[0] = 0xFF;
-		source[1] = 0x25;
-		*(void **)&source[2] = &patch->detour;
-		Protect(source, 6, PAGE_EXECUTE_READ);
-
-		patch->applied = true;
-	}
-
-	bool PrepPatch(const char *signature, const char *name, const char *platform, Patch *patch)
-	{
-		/* Get the base address of the function. */
-		if (!g_pGameConf->GetMemSig(signature, &patch->base) || patch->base == NULL)
-		{
-			g_Logger.LogError("Command filter could not find signature: %s", signature);
-			return false;
-		}
-
-		const char *value;
-		char keyname[255];
-
-		/* Get the verification bytes that will be written over. */
-		UTIL_Format(keyname, sizeof(keyname), "%s_Patch_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) == NULL)
-		{
-			g_Logger.LogError("Command filter could not find key: %s", keyname);
-			return false;
-		}
-		patch->search_len = UTIL_DecodeHexString(patch->search, sizeof(patch->search), value);
-		if (patch->search_len < 6)
-		{
-			g_Logger.LogError("Error decoding %s value, or not long enough", keyname);
-			return false;
-		}
-
-		/* Get the offset into the function. */
-		UTIL_Format(keyname, sizeof(keyname), "%s_Offset_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) == NULL)
-		{
-			g_Logger.LogError("Command filter could not find key: %s", keyname);
-			return false;
-		}
-		patch->offset = atoi(value);
-		if (patch->offset > 20000)
-		{
-			g_Logger.LogError("Command filter %s value is bogus", keyname);
-			return false;
-		}
-
-		/* Get the number of bytes to save from what was written over. */
-		patch->saveat = 0;
-		UTIL_Format(keyname, sizeof(keyname), "%s_Save_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) != NULL)
-		{
-			patch->saveat = atoi(value);
-			if (patch->saveat >= patch->search_len)
-			{
-				g_Logger.LogError("Command filter %s value is too large", keyname);
-				return false;
-			}
-		}
-
-		/* Get register for parameter, if any. */
-		patch->regparam = -1;
-		UTIL_Format(keyname, sizeof(keyname), "%s_Reg_%s", name, platform);
-		if ((value = g_pGameConf->GetKeyValue(keyname)) != NULL)
-		{
-			patch->regparam = atoi(value);
-		}
-
-		/* Everything loaded from gamedata, make sure the patch will succeed. */
-		unsigned char *address = (unsigned char *)patch->base + patch->offset;
-		for (size_t i = 0; i < patch->search_len; i++)
-		{
-			if (address[i] != patch->search[i])
-			{
-				g_Logger.LogError("Command filter %s has changed (byte %x is not %x sub-offset %d)",
-				                  name, address[i], patch->search[i], i);
-				return false;
-			}
-		}
-
-		return true;
-	}
-};
-
-static bool dummy_hook_set = false;
-void DummyHook()
-{
-	if (dummy_hook_set)
-	{
-		dummy_hook_set = false;
-		RETURN_META(MRES_SUPERCEDE);
-	}
-}
-
-#endif
-
 /**
  * BEGIN THE ACTUALLY GENERIC CODE.
  */
@@ -574,23 +264,21 @@ ConsoleDetours::ConsoleDetours() : status(FeatureStatus_Unknown)
 
 void ConsoleDetours::OnSourceModAllInitialized()
 {
-	m_pForward = g_Forwards.CreateForwardEx("OnAnyCommand", ET_Hook, 3, NULL, Param_Cell,
+	m_pForward = forwardsys->CreateForwardEx("OnAnyCommand", ET_Hook, 3, NULL, Param_Cell,
 	                                        Param_String, Param_Cell);
-	g_ShareSys.AddCapabilityProvider(NULL, this, FEATURECAP_COMMANDLISTENER);
+	sharesys->AddCapabilityProvider(NULL, this, FEATURECAP_COMMANDLISTENER);
 }
 
 void ConsoleDetours::OnSourceModShutdown()
 {
-	List<Listener*>::iterator iter = m_Listeners.begin();
-	while (iter != m_Listeners.end())
+	for (StringHashMap<IChangeableForward *>::iterator iter = m_Listeners.iter();
+		 !iter.empty();
+		 iter.next())
 	{
-		Listener *listener = (*iter);
-		g_Forwards.ReleaseForward(listener->forward);
-		delete listener;
-		iter = m_Listeners.erase(iter);
+		forwardsys->ReleaseForward(iter->value);
 	}
 
-	g_Forwards.ReleaseForward(m_pForward);
+	forwardsys->ReleaseForward(m_pForward);
 	s_GenericHooker.Disable();
 }
 
@@ -619,22 +307,15 @@ bool ConsoleDetours::AddListener(IPluginFunction *fun, const char *command)
 	}
 	else
 	{
-		const char *str = UTIL_ToLowerCase(command);
-		Listener *listener;
-		Listener **plistener = m_CmdLookup.retrieve(str);
-		if (plistener == NULL)
+		ke::AutoPtr<char[]> str(UTIL_ToLowerCase(command));
+		IChangeableForward *forward;
+		if (!m_Listeners.retrieve(str.get(), &forward))
 		{
-			listener = new Listener;
-			listener->forward = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
-			                                               Param_String, Param_Cell);
-			m_CmdLookup.insert(str, listener);
+			forward = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, NULL, Param_Cell,
+			                                     Param_String, Param_Cell);
+			m_Listeners.insert(str.get(), forward);
 		}
-		else
-		{
-			listener = *plistener;
-		}
-		listener->forward->AddFunction(fun);
-		delete [] str;
+		forward->AddFunction(fun);
 	}
 
 	return true;
@@ -648,21 +329,18 @@ bool ConsoleDetours::RemoveListener(IPluginFunction *fun, const char *command)
 	}
 	else
 	{
-		const char *str = UTIL_ToLowerCase(command);
-		Listener *listener;
-		Listener **plistener = m_CmdLookup.retrieve(str);
-		delete [] str;
-		if (plistener == NULL)
+		ke::AutoPtr<char[]> str(UTIL_ToLowerCase(command));
+		IChangeableForward *forward;
+		if (!m_Listeners.retrieve(str.get(), &forward))
 			return false;
-		listener = *plistener;
-		return listener->forward->RemoveFunction(fun);
+		return forward->RemoveFunction(fun);
 	}
 }
 
-cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
+cell_t ConsoleDetours::InternalDispatch(int client, const ICommandArgs *args)
 {
 	char name[255];
-	const char *realname = args.Arg(0);
+	const char *realname = args->Arg(0);
 	size_t len = strlen(realname);
 
 	// Disallow command strings that are too long, for now.
@@ -681,28 +359,27 @@ cell_t ConsoleDetours::InternalDispatch(int client, const CCommand& args)
 	cell_t result = Pl_Continue;
 	m_pForward->PushCell(client);
 	m_pForward->PushString(name);
-	m_pForward->PushCell(args.ArgC() - 1);
+	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_Stop)
+	if (result >= Pl_Handled)
 		return result;
 	
-	Listener **plistener = m_CmdLookup.retrieve(name);
-	if (plistener == NULL)
+	IChangeableForward *forward;
+	if (!m_Listeners.retrieve(name, &forward))
 		return result;
-	Listener *listener = *plistener;
-	if (listener->forward->GetFunctionCount() == 0)
+	if (forward->GetFunctionCount() == 0)
 		return result;
 
 	cell_t result2 = Pl_Continue;
-	listener->forward->PushCell(client);
-	listener->forward->PushString(name);
-	listener->forward->PushCell(args.ArgC() - 1);
-	listener->forward->Execute(&result2, NULL);
+	forward->PushCell(client);
+	forward->PushString(name);
+	forward->PushCell(args->ArgC() - 1);
+	forward->Execute(&result2, NULL);
 
 	if (result2 > result)
 		result = result2;
@@ -721,27 +398,12 @@ cell_t ConsoleDetours::Dispatch(ConCommand *pBase)
 {
 	CCommand args;
 #endif
-	g_HL2.PushCommandStack(&args);
-	cell_t res = g_ConsoleDetours.InternalDispatch(g_ConCmds.GetCommandClient(), args);
-	g_HL2.PopCommandStack();
-
-#if SH_IMPL_VERSION < 4
-	if (res >= Pl_Handled)
+	EngineArgs cargs(args);
+	cell_t res;
 	{
-		/* See bug 4020 - we can't optimize this because looking at the vtable
-		 * is probably more expensive, since there's no SH_GET_ORIG_VFNPTR_ENTRY.
-		 */
-		SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, pBase, DummyHook, false);
-		dummy_hook_set = true;
-		pBase->Dispatch();
-		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, pBase, DummyHook, false);
+		AutoEnterCommand autoEnterCommand(&cargs);
+		res = g_ConsoleDetours.InternalDispatch(sCoreProviderImpl.CommandClient(), &cargs);
 	}
-	else
-	{
-		/* Make sure the command gets invoked. See bug 4019 on making this better. */
-		pBase->Dispatch();
-	}
-#endif
 
 	return res;
 }

core/ConsoleDetours.h

@@ -33,8 +33,12 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include "ForwardSys.h"
-#include <sm_trie_tpl.h>
+#include <IForwardSys.h>
+#include <sm_stringhashmap.h>
+
+namespace SourceMod {
+class ICommandArgs;
+} // namespace SourceMod
 
 class ConsoleDetours :
 	public SMGlobalClass,
@@ -43,10 +47,6 @@ class ConsoleDetours :
 	friend class PlayerManager;
 	friend class GenericCommandHooker;
 
-	struct Listener
-	{
-		IChangeableForward *forward;
-	};
 public:
 	ConsoleDetours();
 public: //SMGlobalClass
@@ -58,7 +58,7 @@ public:
 	bool AddListener(IPluginFunction *fun, const char *command);
 	bool RemoveListener(IPluginFunction *fun, const char *command);
 private:
-	cell_t InternalDispatch(int client, const CCommand& args);
+	cell_t InternalDispatch(int client, const SourceMod::ICommandArgs *args);
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	static cell_t Dispatch(ConCommand *pBase, const CCommand& args);
 #else
@@ -73,8 +73,7 @@ public:
 private:
 	FeatureStatus status;
 	IChangeableForward *m_pForward;
-	KTrie<Listener*> m_CmdLookup;
-	List<Listener*> m_Listeners;
+	StringHashMap<IChangeableForward *> m_Listeners;
 };
 
 extern ConsoleDetours g_ConsoleDetours;

core/CoreConfig.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -33,14 +33,20 @@
 #include "CoreConfig.h"
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "sm_srvcmds.h"
-#include <sourcemod_version.h>
 #include "sm_stringutil.h"
-#include "LibrarySys.h"
 #include "Logger.h"
-#include "PluginSys.h"
-#include "ForwardSys.h"
 #include "frame_hooks.h"
+#include "logic_bridge.h"
+#include "compat_wrappers.h"
+#include <sourcemod_version.h>
+#include <amtl/os/am-path.h>
+#include <amtl/os/am-fsutil.h>
+#include <sh_list.h>
+#include <IForwardSys.h>
+#include <bridge/include/IScriptManager.h>
+#include <bridge/include/ILogger.h>
+
+using namespace SourceHook;
 
 #ifdef PLATFORM_WINDOWS
 ConVar sm_corecfgfile("sm_corecfgfile", "addons\\sourcemod\\configs\\core.cfg", 0, "SourceMod core configuration file");
@@ -64,16 +70,8 @@ void CheckAndFinalizeConfigs();
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
 void Hook_ExecDispatchPre(const CCommand &cmd)
-#elif SOURCE_ENGINE == SE_DARKMESSIAH
-SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
-void Hook_ExecDispatchPre()
 #else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 void Hook_ExecDispatchPre()
 #endif
 {
@@ -113,13 +111,13 @@ void CheckAndFinalizeConfigs()
 
 void CoreConfig::OnSourceModAllInitialized()
 {
-	g_RootMenu.AddRootConsoleCommand("config", "Set core configuration options", this);
-	g_pOnServerCfg = g_Forwards.CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
-	g_pOnConfigsExecuted = g_Forwards.CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
-	g_pOnAutoConfigsBuffered = g_Forwards.CreateForward("OnAutoConfigsBuffered", ET_Ignore, 0, NULL);
+	rootmenu->AddRootConsoleCommand3("config", "Set core configuration options", this);
+	g_pOnServerCfg = forwardsys->CreateForward("OnServerCfg", ET_Ignore, 0, NULL);
+	g_pOnConfigsExecuted = forwardsys->CreateForward("OnConfigsExecuted", ET_Ignore, 0, NULL);
+	g_pOnAutoConfigsBuffered = forwardsys->CreateForward("OnAutoConfigsBuffered", ET_Ignore, 0, NULL);
 }
 
-CoreConfig::CoreConfig() : m_Strings(512)
+CoreConfig::CoreConfig()
 {
 }
 
@@ -129,15 +127,15 @@ CoreConfig::~CoreConfig()
 
 void CoreConfig::OnSourceModShutdown()
 {
-	g_RootMenu.RemoveRootConsoleCommand("config", this);
-	g_Forwards.ReleaseForward(g_pOnServerCfg);
-	g_Forwards.ReleaseForward(g_pOnConfigsExecuted);
-	g_Forwards.ReleaseForward(g_pOnAutoConfigsBuffered);
+	rootmenu->RemoveRootConsoleCommand("config", this);
+	forwardsys->ReleaseForward(g_pOnServerCfg);
+	forwardsys->ReleaseForward(g_pOnConfigsExecuted);
+	forwardsys->ReleaseForward(g_pOnAutoConfigsBuffered);
 
 	if (g_pExecPtr != NULL)
 	{
-		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_pExecPtr, Hook_ExecDispatchPre, false);
-		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_pExecPtr, Hook_ExecDispatchPost, true);
+		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;
 	}
 }
@@ -162,8 +160,8 @@ void CoreConfig::OnSourceModLevelChange(const char *mapName)
 			g_pExecPtr = FindCommand("exec");
 			if (g_pExecPtr != NULL)
 			{
-				SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_pExecPtr, Hook_ExecDispatchPre, false);
-				SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, g_pExecPtr, Hook_ExecDispatchPost, true);
+				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
 			{
@@ -179,44 +177,45 @@ void CoreConfig::OnSourceModLevelChange(const char *mapName)
 	g_bGotTrigger = false;
 }
 
-void CoreConfig::OnRootConsoleCommand(const char *cmdname, const CCommand &command)
+void CoreConfig::OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command)
 {
-	int argcount = command.ArgC();
+	int argcount = command->ArgC();
 	if (argcount >= 4)
 	{
-		const char *option = command.Arg(2);
-		const char *value = command.Arg(3);
+		const char *option = command->Arg(2);
+		const char *value = command->Arg(3);
 
 		char error[255];
-
 		ConfigResult res = SetConfigOption(option, value, ConfigSource_Console, error, sizeof(error));
 
 		if (res == ConfigResult_Reject)
 		{
-			g_RootMenu.ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\". (%s)", option, value, error);
-		} else if (res == ConfigResult_Ignore) {
-			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
+			UTIL_ConsolePrint("[SM] Could not set config option \"%s\" to \"%s\". (%s)", option, value, error);
 		} else {
-			g_RootMenu.ConsolePrint("[SM] Config option \"%s\" successfully set to \"%s\".", option, value);
+			if (res == ConfigResult_Ignore) {
+				UTIL_ConsolePrint("[SM] WARNING: Config option \"%s\" is not registered.", option);
+			}
+
+			UTIL_ConsolePrint("[SM] Config option \"%s\" set to \"%s\".", option, value);
 		}
 
 		return;
 	} else if (argcount >= 3) {
-		const char *option = command.Arg(2);
+		const char *option = command->Arg(2);
 		
 		const char *value = GetCoreConfigValue(option);
 		
 		if (value == NULL)
 		{
-			g_RootMenu.ConsolePrint("[SM] No such config option \"%s\" exists.", option);
+			UTIL_ConsolePrint("[SM] No such config option \"%s\" exists.", option);
 		} else {
-			g_RootMenu.ConsolePrint("[SM] Config option \"%s\" is set to \"%s\".", option, value);
+			UTIL_ConsolePrint("[SM] Config option \"%s\" is set to \"%s\".", option, value);
 		}
 		
 		return;
 	}
 
-	g_RootMenu.ConsolePrint("[SM] Usage: sm config <option> [value]");
+	UTIL_ConsolePrint("[SM] Usage: sm config <option> [value]");
 }
 
 void CoreConfig::Initialize()
@@ -233,7 +232,7 @@ void CoreConfig::Initialize()
 	 */
 	if (corecfg)
 	{
-		g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
+		ke::path::Format(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), corecfg);
 	}
 	else
 	{
@@ -242,24 +241,23 @@ void CoreConfig::Initialize()
 		/* Format path to config file */
 		if (basepath)
 		{
-			g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s/%s", g_SourceMod.GetGamePath(), basepath, "configs/core.cfg");
+			ke::path::Format(filePath, sizeof(filePath), "%s/%s/%s", g_SourceMod.GetGamePath(), basepath, "configs/core.cfg");
 		}
 		else
 		{
-			g_LibSys.PathFormat(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), sm_corecfgfile.GetDefault());
+			ke::path::Format(filePath, sizeof(filePath), "%s/%s", g_SourceMod.GetGamePath(), sm_corecfgfile.GetDefault());
 		}
 	}
 
 	/* Reset cached key values */
 	m_KeyValues.clear();
-	m_Strings.Reset();
 
 	/* Parse config file */
 	if ((err=textparsers->ParseFile_SMC(filePath, this, NULL)) != SMCError_Okay)
 	{
  		/* :TODO: This won't actually log or print anything :( - So fix that somehow */
 		const char *error = textparsers->GetSMCErrorString(err);
-		g_Logger.LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
+		logger->LogFatal("[SM] Error encountered parsing core config file: %s", error ? error : "");
 	}
 }
 
@@ -271,7 +269,7 @@ SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 	if (err == ConfigResult_Reject)
 	{
 		/* This is a fatal error */
-		g_Logger.LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
+		logger->LogFatal("Config error (key: %s) (value: %s) %s", key, value, error);
 	}
 
 	return SMCResult_Continue;
@@ -279,7 +277,7 @@ SMCResult CoreConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key,
 
 ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value, ConfigSource source, char *error, size_t maxlength)
 {
-	ConfigResult result;
+	ConfigResult result = ConfigResult_Ignore;
 
 	/* Notify! */
 	SMGlobalClass *pBase = SMGlobalClass::head;
@@ -287,24 +285,23 @@ ConfigResult CoreConfig::SetConfigOption(const char *option, const char *value,
 	{
 		if ((result = pBase->OnSourceModConfigChanged(option, value, source, error, maxlength)) != ConfigResult_Ignore)
 		{
-			return result;
+			break;
 		}
 		pBase = pBase->m_pGlobalClassNext;
 	}
 
-	m_KeyValues.replace(option, m_Strings.AddString(value));
+	ke::AString vstr(value);
+	m_KeyValues.replace(option, ke::Move(vstr));
 
-	return ConfigResult_Ignore;
+	return result;
 }
 
 const char *CoreConfig::GetCoreConfigValue(const char *key)
 {
-	int *pKey = m_KeyValues.retrieve(key);
-	if (pKey == NULL)
-	{
+	StringHashMap<ke::AString>::Result r = m_KeyValues.find(key);
+	if (!r.found())
 		return NULL;
-	}
-	return m_Strings.GetString(*pKey);
+	return r->value.chars();
 }
 
 bool SM_AreConfigsExecuted()
@@ -321,7 +318,7 @@ inline bool IsPathSepChar(char c)
 #endif
 }
 
-bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
+bool SM_ExecuteConfig(IPlugin *pl, AutoConfig *cfg, bool can_create)
 {
 	bool will_create = false;
 	
@@ -339,12 +336,12 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 
 		g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "cfg/%s", folder);
 
-		if (!g_LibSys.IsPathDirectory(path))
+		if (!ke::file::IsDirectory(path))
 		{
 			char *cur_ptr = path;
 			size_t len;
 			
-			g_LibSys.PathFormat(path, sizeof(path), "%s", folder);
+			ke::path::Format(path, sizeof(path), "%s", folder);
 			len = g_SourceMod.BuildPath(Path_Game, build, sizeof(build), "cfg");
 
 			do
@@ -365,14 +362,12 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 				{
 					next_ptr = NULL;
 				}
-				len += g_LibSys.PathFormat(&build[len], 
+				len += ke::path::Format(&build[len],
 					sizeof(build)-len,
 					"/%s",
 					cur_ptr);
-				if (!g_LibSys.CreateFolder(build))
-				{
+				if (!ke::file::CreateDirectory(build))
 					break;
-				}
 				cur_ptr = next_ptr;
 			} while (cur_ptr);
 		}
@@ -384,13 +379,13 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 
 	if (cfg->folder.size())
 	{
-		g_LibSys.PathFormat(local, 
-			sizeof(local), 
+		ke::path::Format(local,
+			sizeof(local),
 			"%s/%s.cfg",
 			cfg->folder.c_str(),
 			cfg->autocfg.c_str());
 	} else {
-		g_LibSys.PathFormat(local,
+		ke::path::Format(local,
 			sizeof(local),
 			"%s.cfg",
 			cfg->autocfg.c_str());
@@ -398,7 +393,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 	
 	g_SourceMod.BuildPath(Path_Game, file, sizeof(file), "cfg/%s", local);
 
-	bool file_exists = g_LibSys.IsPathFile(file);
+	bool file_exists = ke::file::IsFile(file);
 	if (!file_exists && will_create)
 	{
 		List<const ConVar *> *convars = NULL;
@@ -408,7 +403,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 			FILE *fp = fopen(file, "wt");
 			if (fp)
 			{
-				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SM_VERSION_STRING);
+				fprintf(fp, "// This file was auto-generated by SourceMod (v%s)\n", SOURCEMOD_VERSION);
 				fprintf(fp, "// ConVars for plugin \"%s\"\n", pl->GetFilename());
 				fprintf(fp, "\n\n");
 
@@ -417,8 +412,11 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 				for (iter = convars->begin(); iter != convars->end(); iter++)
 				{
 					const ConVar *cvar = (*iter);
-
-					if ((cvar->GetFlags() & FCVAR_DONTRECORD) == FCVAR_DONTRECORD)
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+					if (cvar->IsFlagSet(FCVAR_DONTRECORD))
+#else
+					if (cvar->IsBitSet(FCVAR_DONTRECORD))
+#endif
 					{
 						continue;
 					}
@@ -427,7 +425,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 					char *dptr = descr;
 
 					/* Print comments until there is no more */
-					strncopy(descr, cvar->GetHelpText(), sizeof(descr));
+					ke::SafeStrcpy(descr, sizeof(descr), cvar->GetHelpText());
 					while (*dptr != '\0')
 					{
 						/* Find the next line */
@@ -467,7 +465,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 			}
 			else
 			{
-				g_Logger.LogError("Failed to auto generate config for %s, make sure the directory has write permission.", pl->GetFilename());
+				logger->LogError("Failed to auto generate config for %s, make sure the directory has write permission.", pl->GetFilename());
 				return can_create;
 			}
 		}
@@ -476,7 +474,7 @@ bool SM_ExecuteConfig(CPlugin *pl, AutoConfig *cfg, bool can_create)
 	if (file_exists)
 	{
 		char cmd[255];
-		UTIL_Format(cmd, sizeof(cmd), "exec %s\n", local);
+		ke::SafeSprintf(cmd, sizeof(cmd), "exec %s\n", local);
 		engine->ServerCommand(cmd);
 	}
 
@@ -500,10 +498,10 @@ void SM_DoSingleExecFwds(IPluginContext *ctx)
 
 void SM_ConfigsExecuted_Plugin(unsigned int serial)
 {
-	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
+	IPluginIterator *iter = scripts->GetPluginIterator();
 	while (iter->MorePlugins())
 	{
-		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
+		IPlugin *plugin = iter->GetPlugin();
 		if (plugin->GetSerial() == serial)
 		{
 			SM_DoSingleExecFwds(plugin->GetBaseContext());
@@ -516,7 +514,7 @@ void SM_ConfigsExecuted_Plugin(unsigned int serial)
 
 void SM_ExecuteForPlugin(IPluginContext *ctx)
 {
-	CPlugin *plugin = (CPlugin *)g_PluginSys.GetPluginByCtx(ctx->GetContext());
+	SMPlugin *plugin = scripts->FindPluginByContext(ctx->GetContext());
 
 	unsigned int num = plugin->GetConfigCount();
 	if (!num)
@@ -531,7 +529,7 @@ void SM_ExecuteForPlugin(IPluginContext *ctx)
 			can_create = SM_ExecuteConfig(plugin, plugin->GetConfig(i), can_create);
 		}
 		char cmd[255];
-		UTIL_Format(cmd, sizeof(cmd), "sm internal 2 %d\n", plugin->GetSerial());
+		ke::SafeSprintf(cmd, sizeof(cmd), "sm_internal 2 %d\n", plugin->GetSerial());
 		engine->ServerCommand(cmd);
 	}
 }
@@ -545,19 +543,17 @@ void SM_ExecuteAllConfigs()
 
 	engine->ServerCommand("exec sourcemod/sourcemod.cfg\n");
 
-	IPluginIterator *iter = g_PluginSys.GetPluginIterator();
-	while (iter->MorePlugins())
+	AutoPluginList plugins(scripts);
+	for (size_t i = 0; i < plugins->size(); i++)
 	{
-		CPlugin *plugin = (CPlugin *)(iter->GetPlugin());
+		SMPlugin *plugin = plugins->at(i);
 		unsigned int num = plugin->GetConfigCount();
 		bool can_create = true;
 		for (unsigned int i=0; i<num; i++)
 		{
 			can_create = SM_ExecuteConfig(plugin, plugin->GetConfig(i), can_create);
 		}
-		iter->NextPlugin();
 	}
-	iter->Release();
 
 	g_bGotServerStart = true;
 	CheckAndFinalizeConfigs();
@@ -580,7 +576,24 @@ 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");
+	engine->ServerCommand("sm_internal 1\n");
     g_PendingInternalPush = false;
 }
 
+CON_COMMAND(sm_internal, "")
+{
+#if SOURCE_ENGINE <= SE_DARKMESSIAH
+	CCommand args;
+#endif
+
+	if (args.ArgC() < 1)
+		return;
+
+	const char *arg = args.Arg(1);
+	if (strcmp(arg, "1") == 0) {
+		SM_ConfigsExecuted_Global();
+	} else if (strcmp(arg, "2") == 0) {
+		if (args.ArgC() >= 3)
+			SM_ConfigsExecuted_Plugin(atoi(args.Arg(2)));
+	}
+}

core/CoreConfig.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -35,8 +35,8 @@
 #include "sm_globals.h"
 #include <ITextParsers.h>
 #include <IRootConsoleMenu.h>
-#include <sm_trie_tpl.h>
-#include "sm_memtable.h"
+#include <am-string.h>
+#include <sm_stringhashmap.h>
 
 using namespace SourceMod;
 
@@ -55,7 +55,7 @@ public: // SMGlobalClass
 public: // ITextListener_SMC
 	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
 public: // IRootConsoleCommand
-	void OnRootConsoleCommand(const char *cmdname, const CCommand &command);
+	void OnRootConsoleCommand(const char *cmdname, const ICommandArgs *command) override;
 public:
 	/**
 	 * Initializes CoreConfig by reading from core.cfg file
@@ -68,8 +68,7 @@ private:
 	 */
 	ConfigResult SetConfigOption(const char *option, const char *value, ConfigSource, char *Error, size_t maxlength);
 private:
-	BaseStringTable m_Strings;
-	KTrie<int> m_KeyValues;
+	StringHashMap<ke::AString> m_KeyValues;
 };
 
 extern bool SM_AreConfigsExecuted();

core/CrazyDebugger.cpp

@@ -1,199 +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 "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 = me32.modBaseAddr;
-			}
-		} 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;

core/EventManager.cpp

@@ -30,10 +30,11 @@
  */
 
 #include "EventManager.h"
-#include "ForwardSys.h"
-#include "HandleSys.h"
-#include "PluginSys.h"
 #include "sm_stringutil.h"
+#include "PlayerManager.h"
+
+#include "logic_bridge.h"
+#include <bridge/include/IScriptManager.h>
 
 EventManager g_EventManager;
 
@@ -58,14 +59,10 @@ public:
 
 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++)
@@ -79,8 +76,8 @@ EventManager::~EventManager()
 void EventManager::OnSourceModAllInitialized()
 {
 	/* Add a hook for IGameEventManager2::FireEvent() */
-	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
-	SH_ADD_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
+	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
+	SH_ADD_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
 
 	HandleAccess sec;
 
@@ -90,17 +87,17 @@ void EventManager::OnSourceModAllInitialized()
 	sec.access[HandleAccess_Clone] = HANDLE_RESTRICT_IDENTITY | HANDLE_RESTRICT_OWNER;
 
 	/* Create the 'GameEvent' handle type */
-	m_EventType = g_HandleSys.CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
+	m_EventType = handlesys->CreateType("GameEvent", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 }
 
 void EventManager::OnSourceModShutdown()
 {
 	/* Remove hook for IGameEventManager2::FireEvent() */
-	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent, false);
-	SH_REMOVE_HOOK_MEMFUNC(IGameEventManager2, FireEvent, gameevents, this, &EventManager::OnFireEvent_Post, true);
+	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent), false);
+	SH_REMOVE_HOOK(IGameEventManager2, FireEvent, gameevents, SH_MEMBER(this, &EventManager::OnFireEvent_Post), true);
 
 	/* Remove the 'GameEvent' handle type */
-	g_HandleSys.RemoveType(m_EventType, g_pCoreIdent);
+	handlesys->RemoveType(m_EventType, g_pCoreIdent);
 
 	/* Remove ourselves as listener for events */
 	gameevents->RemoveListener(this);
@@ -138,12 +135,12 @@ void EventManager::OnPluginUnloaded(IPlugin *plugin)
 			{
 				if (pHook->pPreHook)
 				{
-					g_Forwards.ReleaseForward(pHook->pPreHook);
+					forwardsys->ReleaseForward(pHook->pPreHook);
 				}
 
 				if (pHook->pPostHook)
 				{
-					g_Forwards.ReleaseForward(pHook->pPostHook);
+					forwardsys->ReleaseForward(pHook->pPostHook);
 				}
 
 				delete pHook;
@@ -184,10 +181,10 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 	}
 
 	/* If a hook structure does not exist... */
-	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
+	if (!m_EventHooks.retrieve(name, &pHook))
 	{
 		EventHookList *pHookList;
-		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
 
 		/* Check plugin for an existing EventHook list */
 		if (!plugin->GetProperty("EventHooks", (void **)&pHookList))
@@ -202,12 +199,12 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		if (mode == EventHookMode_Pre)
 		{
 			/* Create forward for a pre hook */
-			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Hook, 3, GAMEEVENT_PARAMS);
 			/* Add to forward list */
 			pHook->pPreHook->AddFunction(pFunction);
 		} else {
 			/* Create forward for a post hook */
-			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 			/* Should we copy data from a pre hook to the post hook? */
 			pHook->postCopy = (mode == EventHookMode_Post);
 			/* Add to forward list */
@@ -215,14 +212,14 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		}
 
 		/* Cache the name for post hooks */
-		pHook->name = sm_strdup(name);
+		pHook->name = name;
 
 		/* Increase reference count */
 		pHook->refCount++;
 
 		/* Add hook structure to hook lists */
 		pHookList->push_back(pHook);
-		sm_trie_insert(m_EventHooks, name, pHook);
+		m_EventHooks.insert(name, pHook);
 
 		return EventHookErr_Okay;
 	}
@@ -234,7 +231,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create pre hook forward if necessary */
 		if (!pHook->pPreHook)
 		{
-			pHook->pPreHook = g_Forwards.CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
+			pHook->pPreHook = forwardsys->CreateForwardEx(NULL, ET_Event, 3, GAMEEVENT_PARAMS);
 		}
 
 		/* Add plugin function to forward list */
@@ -243,7 +240,7 @@ EventHookError EventManager::HookEvent(const char *name, IPluginFunction *pFunct
 		/* Create post hook forward if necessary */
 		if (!pHook->pPostHook)
 		{
-			pHook->pPostHook = g_Forwards.CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
+			pHook->pPostHook = forwardsys->CreateForwardEx(NULL, ET_Ignore, 3, GAMEEVENT_PARAMS);
 		}
 
 		/* If postCopy is false, then we may want to set it to true */
@@ -268,7 +265,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	IChangeableForward **pEventForward;
 
 	/* If hook does not exist at all */
-	if (!sm_trie_retrieve(m_EventHooks, name, (void **)&pHook))
+	if (!m_EventHooks.retrieve(name, &pHook))
 	{
 		return EventHookErr_NotActive;
 	}
@@ -290,7 +287,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 	/* If forward's list contains 0 functions now, free it */
 	if ((*pEventForward)->GetFunctionCount() == 0)
 	{
-		g_Forwards.ReleaseForward(*pEventForward);
+		forwardsys->ReleaseForward(*pEventForward);
 		*pEventForward = NULL;
 	}
 
@@ -300,7 +297,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		/* If reference count is now 0, free hook structure */
 
 		EventHookList *pHookList;
-		IPlugin *plugin = g_PluginSys.GetPluginByCtx(pFunction->GetParentContext()->GetContext());
+		IPlugin *plugin = scripts->FindPluginByContext(pFunction->GetParentContext()->GetContext());
 
 		/* Get plugin's event hook list */
 		if (!plugin->GetProperty("EventHooks", (void**)&pHookList))
@@ -318,10 +315,7 @@ EventHookError EventManager::UnhookEvent(const char *name, IPluginFunction *pFun
 		pHookList->remove(pHook);
 
 		/* Delete entry in trie */
-		sm_trie_delete(m_EventHooks, name);
-
-		/* Free the cached name */
-		delete pHook->name;
+		m_EventHooks.remove(name);
 
 		/* And finally free structure memory */
 		delete pHook;
@@ -368,6 +362,13 @@ void EventManager::FireEvent(EventInfo *pInfo, bool bDontBroadcast)
 	m_FreeEvents.push(pInfo);
 }
 
+void EventManager::FireEventToClient(EventInfo *pInfo, IClient *pClient)
+{
+	// The IClient vtable is +sizeof(void *) from the IGameEventListener2 (CBaseClient) vtable due to multiple inheritance.
+	IGameEventListener2 *pGameClient = (IGameEventListener2 *)((intptr_t)pClient - sizeof(void *));
+	pGameClient->FireGameEvent(pInfo->pEvent);
+}
+
 void EventManager::CancelCreatedEvent(EventInfo *pInfo)
 {
 	/* Free event from IGameEventManager2 */
@@ -397,7 +398,7 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 
 	name = pEvent->GetName();
 	
-	if (sm_trie_retrieve(m_EventHooks, name, reinterpret_cast<void **>(&pHook)))
+	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.
@@ -411,7 +412,7 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 		{
 			EventInfo info(pEvent, NULL);
 			HandleSecurity sec(NULL, g_pCoreIdent);
-			Handle_t hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
+			Handle_t hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 
 			info.bDontBroadcast = bDontBroadcast;
 
@@ -424,7 +425,7 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 
 			broadcast = info.bDontBroadcast;
 
-			g_HandleSys.FreeHandle(hndl, &sec);
+			handlesys->FreeHandle(hndl, &sec);
 		}
 
 		if (pHook->postCopy)
@@ -432,7 +433,7 @@ bool EventManager::OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast)
 			m_EventCopies.push(gameevents->DuplicateEvent(pEvent));
 		}
 
-		if (res)
+		if (res >= Pl_Handled)
 		{
 			gameevents->FreeEvent(pEvent);
 			RETURN_META_VALUE(MRES_SUPERCEDE, false);
@@ -476,14 +477,14 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 				info.bDontBroadcast = bDontBroadcast;
 				info.pEvent = m_EventCopies.front();
 				info.pOwner = NULL;
-				hndl = g_HandleSys.CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
+				hndl = handlesys->CreateHandle(m_EventType, &info, NULL, g_pCoreIdent, NULL);
 
 				pForward->PushCell(hndl);
 			} else {
 				pForward->PushCell(BAD_HANDLE);
 			}
 
-			pForward->PushString(pHook->name);
+			pForward->PushString(pHook->name.chars());
 			pForward->PushCell(bDontBroadcast);
 			pForward->Execute(NULL);
 
@@ -491,7 +492,7 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 			{
 				/* Free handle */
 				HandleSecurity sec(NULL, g_pCoreIdent);
-				g_HandleSys.FreeHandle(hndl, &sec);
+				handlesys->FreeHandle(hndl, &sec);
 
 				/* Free event structure */
 				gameevents->FreeEvent(info.pEvent);
@@ -504,8 +505,7 @@ bool EventManager::OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast)
 		{
 			assert(pHook->pPostHook == NULL);
 			assert(pHook->pPreHook == NULL);
-			sm_trie_delete(m_EventHooks, pHook->name);
-			delete pHook->name;
+			m_EventHooks.remove(pHook->name.chars());
 			delete pHook;
 		}
 	}

core/EventManager.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
@@ -34,13 +34,15 @@
 
 #include "sm_globals.h"
 #include "sourcemm_api.h"
-#include "sm_trie.h"
+#include <sm_namehashset.h>
 #include <sh_list.h>
 #include <sh_stack.h>
 #include <IHandleSys.h>
 #include <IForwardSys.h>
 #include <IPluginSys.h>
 
+class IClient;
+
 using namespace SourceHook;
 
 struct EventInfo
@@ -69,7 +71,16 @@ struct EventHook
 	IChangeableForward *pPostHook;
 	bool postCopy;
 	unsigned int refCount;
-	char *name;
+	ke::AString name;
+
+	static inline bool matches(const char *name, const EventHook *hook)
+	{
+		return strcmp(name, hook->name.chars()) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
 };
 
 enum EventHookMode
@@ -121,13 +132,14 @@ public:
 	EventHookError UnhookEvent(const char *name, IPluginFunction *pFunction, EventHookMode mode=EventHookMode_Post);
 	EventInfo *CreateEvent(IPluginContext *pContext, const char *name, bool force=false);
 	void FireEvent(EventInfo *pInfo, bool bDontBroadcast=false);
+	void FireEventToClient(EventInfo *pInfo, IClient *pClient);
 	void CancelCreatedEvent(EventInfo *pInfo);
 private: // IGameEventManager2 hooks
 	bool OnFireEvent(IGameEvent *pEvent, bool bDontBroadcast);
 	bool OnFireEvent_Post(IGameEvent *pEvent, bool bDontBroadcast);
 private:
 	HandleType_t m_EventType;
-	Trie *m_EventHooks;
+	NameHashSet<EventHook *> m_EventHooks;
 	CStack<EventInfo *> m_FreeEvents;
 	CStack<EventHook *> m_EventStack;
 	CStack<IGameEvent *> m_EventCopies;

core/ForwardSys.h

@@ -1,211 +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_FORWARDSYSTEM_H_
-#define _INCLUDE_SOURCEMOD_FORWARDSYSTEM_H_
-
-#include <IForwardSys.h>
-#include <IPluginSys.h>
-#include "sm_globals.h"
-#include <sh_list.h>
-#include <sh_stack.h>
-#include "sourcemod.h"
-
-using namespace SourceHook;
-
-typedef List<IPluginFunction *>::iterator FuncIter;
-
-/* :TODO: a global name max define for sourcepawn, should mirror compiler's sNAMEMAX */
-#define FORWARDS_NAME_MAX		64
-
-struct ByrefInfo
-{
-	unsigned int cells;
-	cell_t *orig_addr;
-	int flags;
-	int sz_flags;
-};
-
-struct FwdParamInfo
-{
-	cell_t val;
-	ByrefInfo byref;
-	ParamType pushedas;
-};
-
-class SourceMod::IForwardFilter
-{
-public:
-	virtual void Preprocess(IPluginFunction *fun, FwdParamInfo *params)
-	{
-	}
-};
-
-class FuncIteratorGuard
-{
-	bool triggered;
-	FuncIteratorGuard **pprev;
-	FuncIter *iter;
-	FuncIteratorGuard *next;
-public:
-	FuncIteratorGuard(FuncIteratorGuard **pprev, FuncIter *iter)
-		: triggered(false), pprev(pprev), iter(iter), next(*pprev)
-	{
-		*pprev = this;
-	}
-
-	~FuncIteratorGuard()
-	{
-		*pprev = next;
-	}
-
-	inline bool Triggered()
-	{
-		bool t = triggered;
-		triggered = false;
-		return t;
-	}
-
-	/**
-	 * This should not read from |this| before the NULL check, because FwdSys
-	 * can call (NULL)->FixIteratorChain().
-	 */
-	void FixIteratorChain(FuncIter &other)
-	{
-		FuncIteratorGuard *guard = this;
-		while (guard != NULL)
-		{
-			if (*guard->iter == other)
-			{
-				*(guard->iter) = ++(*(guard->iter));
-				guard->triggered = true;
-			}
-			guard = guard->next;
-		}
-	}
-};
-
-class CForward : public IChangeableForward
-{
-public: //ICallable
-	virtual int PushCell(cell_t cell);
-	virtual int PushCellByRef(cell_t *cell, int flags);
-	virtual int PushFloat(float number);
-	virtual int PushFloatByRef(float *number, int flags);
-	virtual int PushArray(cell_t *inarray, unsigned int cells, int flags);
-	virtual int PushString(const char *string);
-	virtual int PushStringEx(char *buffer, size_t length, int sz_flags, int cp_flags);
-	virtual void Cancel();
-public: //IForward
-	virtual const char *GetForwardName();
-	virtual unsigned int GetFunctionCount();
-	virtual ExecType GetExecType();
-	virtual int Execute(cell_t *result, IForwardFilter *filter);
-public: //IChangeableForward
-	virtual bool RemoveFunction(IPluginFunction *func);
-	virtual unsigned int RemoveFunctionsOfPlugin(IPlugin *plugin);
-	virtual bool AddFunction(IPluginFunction *func);
-	virtual bool AddFunction(IPluginContext *ctx, funcid_t index);
-	virtual bool RemoveFunction(IPluginContext *ctx, funcid_t index);
-public:
-	static CForward *CreateForward(const char *name, 
-								   ExecType et, 
-								   unsigned int num_params, 
-								   const ParamType *types, 
-								   va_list ap);
-private:
-	void _Int_PushArray(cell_t *inarray, unsigned int cells, int flags);
-	void _Int_PushString(cell_t *inarray, unsigned int cells, int sz_flags, int cp_flags);
-	inline int SetError(int err)
-	{
-		m_errstate = err;
-		return err;
-	}
-protected:
-	/* :TODO: I want a caching list type here.
-	 * Destroying these things and using new/delete for their members feels bad.
-	 */
-	mutable List<IPluginFunction *> m_functions;
-	mutable List<IPluginFunction *> m_paused;
-	FuncIteratorGuard *m_IterGuard;
-
-	/* Type and name information */
-	FwdParamInfo m_params[SP_MAX_EXEC_PARAMS];
-	ParamType m_types[SP_MAX_EXEC_PARAMS];
-	char m_name[FORWARDS_NAME_MAX+1];
-	unsigned int m_numparams;
-	unsigned int m_varargs;
-	ExecType m_ExecType;
-
-	/* State information */
-	unsigned int m_curparam;
-	int m_errstate;
-};
-
-class CForwardManager : 
-	public IForwardManager,
-	public IPluginsListener,
-	public SMGlobalClass
-{
-	friend class CForward;
-public:
-	~CForwardManager();
-public: //IForwardManager
-	IForward *CreateForward(const char *name, 
-		ExecType et, 
-		unsigned int num_params, 
-		const ParamType *types, 
-		...);
-	IChangeableForward *CreateForwardEx(const char *name, 
-		ExecType et, 
-		int num_params, 
-		const ParamType *types, 
-		...);
-	IForward *FindForward(const char *name, IChangeableForward **ifchng);
-	void ReleaseForward(IForward *forward);
-public: //IPluginsListener
-	void OnPluginLoaded(IPlugin *plugin);
-	void OnPluginUnloaded(IPlugin *plugin);
-	void OnPluginPauseChange(IPlugin *plugin, bool paused);
-public: //SMGlobalClass
-	void OnSourceModAllInitialized();
-protected:
-	CForward *ForwardMake();
-	void ForwardFree(CForward *fwd);
-private:
-	CStack<CForward *> m_FreeForwards;
-	List<CForward *> m_managed;
-	List<CForward *> m_unmanaged;
-};
-
-extern CForwardManager g_Forwards;
-
-#endif //_INCLUDE_SOURCEMOD_FORWARDSYSTEM_H_

core/GameHooks.cpp

@@ -0,0 +1,171 @@
+// vim: set ts=4 sw=4 tw=99 noet :
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#include "GameHooks.h"
+#include "sourcemod.h"
+#include "ConVarManager.h"
+#include "command_args.h"
+#include "provider.h"
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+SH_DECL_HOOK3_void(ICvar, CallGlobalChangeCallbacks, SH_NOATTRIB, false, ConVar *, const char *, float);
+#else
+SH_DECL_HOOK2_void(ICvar, CallGlobalChangeCallback, SH_NOATTRIB, false, ConVar *, const char *);
+#endif
+
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+SH_DECL_HOOK5_void(IServerGameDLL, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, edict_t *, EQueryCvarValueStatus, const char *, const char *);
+SH_DECL_HOOK5_void(IServerPluginCallbacks, OnQueryCvarValueFinished, SH_NOATTRIB, 0, QueryCvarCookie_t, edict_t *, EQueryCvarValueStatus, const char *, const char *);
+#endif
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
+#else
+SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
+#endif
+
+SH_DECL_HOOK1_void(IServerGameClients, SetCommandClient, SH_NOATTRIB, false, int);
+
+GameHooks::GameHooks()
+	: client_cvar_query_mode_(ClientCvarQueryMode::Unavailable),
+	  last_command_client_(-1)
+{
+}
+
+void GameHooks::Start()
+{
+	// Hook ICvar::CallGlobalChangeCallbacks.
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	hooks_ += SH_ADD_HOOK(ICvar, CallGlobalChangeCallbacks, icvar, SH_STATIC(OnConVarChanged), false);
+#else
+	hooks_ += SH_ADD_HOOK(ICvar, CallGlobalChangeCallback, icvar, SH_STATIC(OnConVarChanged), false);
+#endif
+
+	// Episode 2 has this function by default, but the older versions do not.
+#if SOURCE_ENGINE == SE_EPISODEONE
+	if (g_SMAPI->GetGameDLLVersion() >= 6) {
+		hooks_ += SH_ADD_HOOK(IServerGameDLL, OnQueryCvarValueFinished, gamedll, SH_MEMBER(this, &GameHooks::OnQueryCvarValueFinished), false);
+		client_cvar_query_mode_ = ClientCvarQueryMode::DLL;
+	}
+#endif
+
+	hooks_ += SH_ADD_HOOK(IServerGameClients, SetCommandClient, serverClients, SH_MEMBER(this, &GameHooks::SetCommandClient), false);
+}
+
+void GameHooks::OnVSPReceived()
+{
+	if (client_cvar_query_mode_ != ClientCvarQueryMode::Unavailable)
+		return;
+
+	if (g_SMAPI->GetSourceEngineBuild() == SOURCE_ENGINE_ORIGINAL || vsp_version < 2)
+		return;
+
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	hooks_ += SH_ADD_HOOK(IServerPluginCallbacks, OnQueryCvarValueFinished, vsp_interface, SH_MEMBER(this, &GameHooks::OnQueryCvarValueFinished), false);
+	client_cvar_query_mode_ = ClientCvarQueryMode::VSP;
+#endif
+}
+
+void GameHooks::Shutdown()
+{
+	for (size_t i = 0; i < hooks_.length(); i++)
+		SH_REMOVE_HOOK_ID(hooks_[i]);
+	hooks_.clear();
+
+	client_cvar_query_mode_ = ClientCvarQueryMode::Unavailable;
+}
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+void GameHooks::OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue)
+#else
+void GameHooks::OnConVarChanged(ConVar *pConVar, const char *oldValue)
+#endif
+{
+#if SOURCE_ENGINE < SE_ORANGEBOX
+  float flOldValue = atof(oldValue);
+#endif
+  g_ConVarManager.OnConVarChanged(pConVar, oldValue, flOldValue);
+}
+
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+void GameHooks::OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result,
+                                         const char *cvarName, const char *cvarValue){
+	int client = IndexOfEdict(pPlayer);
+
+# if SOURCE_ENGINE == SE_CSGO
+	if (g_Players.HandleConVarQuery(cookie, client, result, cvarName, cvarValue))
+		return;
+# endif
+	g_ConVarManager.OnClientQueryFinished(cookie, client, result, cvarName, cvarValue);
+}
+#endif
+
+ke::RefPtr<CommandHook>
+GameHooks::AddCommandHook(ConCommand *cmd, const CommandHook::Callback &callback)
+{
+	return new CommandHook(cmd, callback, false);
+}
+
+ke::RefPtr<CommandHook>
+GameHooks::AddPostCommandHook(ConCommand *cmd, const CommandHook::Callback &callback)
+{
+	return new CommandHook(cmd, callback, true);
+}
+
+void GameHooks::SetCommandClient(int client)
+{
+	last_command_client_ = client + 1;
+}
+
+CommandHook::CommandHook(ConCommand *cmd, const Callback &callback, bool post)
+ : hook_id_(0),
+   callback_(callback)
+{
+	hook_id_ = SH_ADD_HOOK(ConCommand, Dispatch, cmd, SH_MEMBER(this, &CommandHook::Dispatch), post);
+}
+
+CommandHook::~CommandHook()
+{
+	if (hook_id_)
+	  SH_REMOVE_HOOK_ID(hook_id_);
+}
+
+void CommandHook::Dispatch(DISPATCH_ARGS)
+{
+	DISPATCH_PROLOGUE;
+	EngineArgs args(command);
+
+	AddRef();
+	bool rval = callback_(sCoreProviderImpl.CommandClient(), &args);
+	Release();
+	if (rval)
+		RETURN_META(MRES_SUPERCEDE);
+}
+
+void CommandHook::Zap()
+{
+	hook_id_ = 0;
+}

core/GameHooks.h

@@ -0,0 +1,133 @@
+// vim: set ts=4 sw=4 tw=99 noet :
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_
+#define _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_
+
+// Needed for CEntityIndex, edict_t, etc.
+#include <stdint.h>
+#include <stddef.h>
+#include <eiface.h>
+#include <iserverplugin.h>
+#include <amtl/am-refcounting.h>
+#include <amtl/am-vector.h>
+#include <amtl/am-function.h>
+
+class ConVar;
+class CCommand;
+struct CCommandContext;
+
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+# define DISPATCH_ARGS      const CCommand &command
+# define DISPATCH_PROLOGUE
+#else
+# define DISPATCH_ARGS
+# define DISPATCH_PROLOGUE  CCommand command
+#endif
+
+namespace SourceMod {
+
+// Describes the mechanism in which client cvar queries are implemented.
+enum class ClientCvarQueryMode {
+	Unavailable,
+	DLL,
+	VSP
+};
+
+class ICommandArgs;
+
+class CommandHook : public ke::Refcounted<CommandHook>
+{
+public:
+	// return false to RETURN_META(MRES_IGNORED), or true to SUPERCEDE.
+	typedef ke::Lambda<bool(int, const ICommandArgs *)> Callback;
+
+public:
+	CommandHook(ConCommand *cmd, const Callback &callback, bool post);
+	~CommandHook();
+	void Dispatch(DISPATCH_ARGS);
+	void Zap();
+
+private:
+	int hook_id_;
+	Callback callback_;
+};
+
+class GameHooks
+{
+public:
+	GameHooks();
+
+	void Start();
+	void Shutdown();
+	void OnVSPReceived();
+
+	ClientCvarQueryMode GetClientCvarQueryMode() const {
+		return client_cvar_query_mode_;
+	}
+
+public:
+	ke::RefPtr<CommandHook> AddCommandHook(ConCommand *cmd, const CommandHook::Callback &callback);
+	ke::RefPtr<CommandHook> AddPostCommandHook(ConCommand *cmd, const CommandHook::Callback &callback);
+
+	int CommandClient() const {
+		return last_command_client_;
+	}
+
+private:
+	// Static callback that Valve's ConVar object executes when the convar's value changes.
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	static void OnConVarChanged(ConVar *pConVar, const char *oldValue, float flOldValue);
+#else
+	static void OnConVarChanged(ConVar *pConVar, const char *oldValue);
+#endif
+
+	// Callback for when StartQueryCvarValue() has finished.
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	void OnQueryCvarValueFinished(QueryCvarCookie_t cookie, edict_t *pPlayer, EQueryCvarValueStatus result,
+	                              const char *cvarName, const char *cvarValue);
+#endif
+
+	void SetCommandClient(int client);
+
+private:
+	class HookList : public ke::Vector<int>
+	{
+	public:
+		HookList &operator += (int hook_id) {
+			this->append(hook_id);
+			return *this;
+		}
+	};
+	HookList hooks_;
+
+	ClientCvarQueryMode client_cvar_query_mode_;
+	int last_command_client_;
+};
+
+} // namespace SourceMod
+
+#endif // _INCLUDE_SOURCEMOD_PROVIDER_GAME_HOOKS_H_

core/HalfLife2.cpp

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2016 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,9 +38,10 @@
 #include <IGameConfigs.h>
 #include <compat_wrappers.h>
 #include <Logger.h>
-#include "LibrarySys.h"
+#include <amtl/os/am-shared-library.h>
 #include "logic_bridge.h"
 #include <tier0/mem.h>
+#include <bridge/include/ILogger.h>
 
 #if SOURCE_ENGINE == SE_CSGO
 #include <cstrike15_usermessages.pb.h>
@@ -49,100 +50,54 @@
 
 typedef ICommandLine *(*FakeGetCommandLine)();
 
-#if defined _WIN32
-#define TIER0_NAME			"tier0.dll"
-#define VSTDLIB_NAME		"vstdlib.dll"
-#elif defined __APPLE__
-#define TIER0_NAME			"libtier0.dylib"
-#define VSTDLIB_NAME		"libvstdlib.dylib"
-#elif defined __linux__
-#if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
-#define TIER0_NAME			"libtier0_srv.so"
-#define VSTDLIB_NAME		"libvstdlib_srv.so"
-#elif SOURCE_ENGINE >= SE_LEFT4DEAD
-#define TIER0_NAME			"libtier0.so"
-#define VSTDLIB_NAME		"libvstdlib.so"
-#else
-#define TIER0_NAME			"tier0_i486.so"
-#define VSTDLIB_NAME		"vstdlib_i486.so"
-#endif
-#endif
+#define TIER0_NAME			FORMAT_SOURCE_BIN_NAME("tier0")
+#define VSTDLIB_NAME		FORMAT_SOURCE_BIN_NAME("vstdlib")
 
 CHalfLife2 g_HL2;
 ConVar *sv_lan = NULL;
 
 static void *g_EntList = NULL;
+static void **g_pEntInfoList = NULL;
 static int entInfoOffset = -1;
 
-namespace SourceHook
+static CEntInfo *EntInfoArray()
 {
-	template<>
-	int HashFunction<datamap_t *>(datamap_t * const &k)
+	if (g_EntList != NULL)
 	{
-		return reinterpret_cast<int>(k);
+		return (CEntInfo *)((intp)g_EntList + entInfoOffset);
 	}
-
-	template<>
-	int Compare<datamap_t *>(datamap_t * const &k1, datamap_t * const &k2)
+	else if (g_pEntInfoList)
 	{
-		return (k1-k2);
+		return *(CEntInfo **)g_pEntInfoList;
 	}
+	
+	return NULL;
 }
 
 CHalfLife2::CHalfLife2()
 {
-	m_pClasses = sm_trie_create();
+	m_Maps.init();
+
+	m_pGetCommandLine = NULL;
 }
 
 CHalfLife2::~CHalfLife2()
 {
-	sm_trie_destroy(m_pClasses);
+	for (NameHashSet<DataTableInfo *>::iterator iter = m_Classes.iter(); !iter.empty(); iter.next())
+		delete *iter;
 
-	List<DataTableInfo *>::iterator iter;
-	DataTableInfo *pInfo;
-	for (iter=m_Tables.begin(); iter!=m_Tables.end(); iter++)
-	{
-		pInfo = (*iter);
-		delete pInfo;
-	}
-
-	m_Tables.clear();
-
-	THash<datamap_t *, DataMapTrie>::iterator h_iter;
-	for (h_iter=m_Maps.begin(); h_iter!=m_Maps.end(); h_iter++)
-	{
-		if (h_iter->val.trie)
-		{
-			sm_trie_destroy(h_iter->val.trie);
-			h_iter->val.trie = NULL;
-		}
-	}
-
-	m_Maps.clear();
+	for (DataTableMap::iterator iter = m_Maps.iter(); !iter.empty(); iter.next())
+		delete iter->value;
 }
 
 #if SOURCE_ENGINE != SE_DARKMESSIAH
 CSharedEdictChangeInfo *g_pSharedChangeInfo = NULL;
 #endif
 
-#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
-bool is_original_engine = false;
-#endif
-
 void CHalfLife2::OnSourceModStartup(bool late)
 {
 #if SOURCE_ENGINE != SE_DARKMESSIAH
-
-	/* The Ship currently is the only known game to use an older version of the engine */
-#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
-	if (g_SMAPI->GetSourceEngineBuild() == SOURCE_ENGINE_ORIGINAL)
-#else
-	if (strcasecmp(g_SourceMod.GetGameFolderName(), "ship") == 0)
-#endif
-	{
-		is_original_engine = true;
-	}
-	else if (g_pSharedChangeInfo == NULL)
+	if (g_SMAPI->GetSourceEngineBuild() != SOURCE_ENGINE_ORIGINAL && !g_pSharedChangeInfo)
 	{
 		g_pSharedChangeInfo = engine->GetSharedEdictChangeInfo();
 	}
@@ -155,17 +110,84 @@ void CHalfLife2::OnSourceModAllInitialized()
 	m_HinTextMsg = g_UserMsgs.GetMessageIndex("HintText");
 	m_SayTextMsg = g_UserMsgs.GetMessageIndex("SayText");
 	m_VGUIMenu = g_UserMsgs.GetMessageIndex("VGUIMenu");
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 }
 
 void CHalfLife2::OnSourceModAllInitialized_Post()
 {
 	InitLogicalEntData();
 	InitCommandLine();
+#if SOURCE_ENGINE == SE_CSGO
+	m_CSGOBadList.init();
+	m_CSGOBadList.add("m_iItemDefinitionIndex");
+	m_CSGOBadList.add("m_iEntityLevel");
+	m_CSGOBadList.add("m_iItemIDHigh");
+	m_CSGOBadList.add("m_iItemIDLow");
+	m_CSGOBadList.add("m_iAccountID");
+	m_CSGOBadList.add("m_iEntityQuality");
+	m_CSGOBadList.add("m_bInitialized");
+	m_CSGOBadList.add("m_szCustomName");
+	m_CSGOBadList.add("m_iAttributeDefinitionIndex");
+	m_CSGOBadList.add("m_iRawValue32");
+	m_CSGOBadList.add("m_iRawInitialValue32");
+	m_CSGOBadList.add("m_nRefundableCurrency");
+	m_CSGOBadList.add("m_bSetBonus");
+	m_CSGOBadList.add("m_OriginalOwnerXuidLow");
+	m_CSGOBadList.add("m_OriginalOwnerXuidHigh");
+	m_CSGOBadList.add("m_nFallbackPaintKit");
+	m_CSGOBadList.add("m_nFallbackSeed");
+	m_CSGOBadList.add("m_flFallbackWear");
+	m_CSGOBadList.add("m_nFallbackStatTrak");
+	m_CSGOBadList.add("m_iCompetitiveRanking");
+	m_CSGOBadList.add("m_iCompetitiveRankType");
+	m_CSGOBadList.add("m_nActiveCoinRank");
+	m_CSGOBadList.add("m_nMusicID");
+#endif
+}
+
+ConfigResult CHalfLife2::OnSourceModConfigChanged(const char *key, const char *value,
+	ConfigSource source, char *error, size_t maxlength)
+{
+	if (strcasecmp(key, "FollowCSGOServerGuidelines") == 0)
+	{
+#if SOURCE_ENGINE == SE_CSGO
+		if (strcasecmp(value, "no") == 0)
+		{
+			m_bFollowCSGOServerGuidelines = false;
+			return ConfigResult_Accept;
+		}
+		else if (strcasecmp(value, "yes") == 0)
+		{
+			m_bFollowCSGOServerGuidelines = true;
+			return ConfigResult_Accept;
+		}
+		else
+		{
+			ke::SafeStrcpy(error, maxlength, "Invalid value: must be \"yes\" or \"no\"");
+			return ConfigResult_Reject;
+		}
+#endif
+	}
+
+	return ConfigResult_Ignore;
 }
 
 void CHalfLife2::InitLogicalEntData()
 {
+#if SOURCE_ENGINE == SE_TF2        \
+	|| SOURCE_ENGINE == SE_DODS    \
+	|| SOURCE_ENGINE == SE_HL2DM   \
+	|| SOURCE_ENGINE == SE_CSS     \
+	|| SOURCE_ENGINE == SE_SDK2013 \
+	|| SOURCE_ENGINE == SE_BMS     \
+	|| SOURCE_ENGINE == SE_NUCLEARDAWN
+
+	if (g_SMAPI->GetServerFactory(false)("VSERVERTOOLS003", nullptr))
+	{
+		g_EntList = servertools->GetEntityList();
+	}
+#endif
+
 	char *addr = NULL;
 
 	/*
@@ -175,108 +197,103 @@ void CHalfLife2::InitLogicalEntData()
 	 * If symbols aren't present (Windows or stripped Linux/Mac), 
 	 * attempt find via LevelShutdown + offset
 	 */
-	if (g_pGameConf->GetMemSig("gEntList", (void **)&addr))
+	if (!g_EntList)
 	{
-#if !defined PLATFORM_WINDOWS
-		if (!addr)
+		if (g_pGameConf->GetMemSig("gEntList", (void **) &addr))
 		{
-			// Key exists so notify if lookup fails, but try other method.
-			g_Logger.LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
-		}
-		else
-		{
-#endif
-			g_EntList = reinterpret_cast<void *>(addr);
 #if !defined PLATFORM_WINDOWS
-		}
+			if (!addr)
+			{
+				// Key exists so notify if lookup fails, but try other method.
+				logger->LogError("Failed lookup of gEntList directly - Reverting to lookup via LevelShutdown");
+			}
+			else
+			{
 #endif
+				g_EntList = reinterpret_cast<void *>(addr);
+#if !defined PLATFORM_WINDOWS
+			}
+#endif
+		}
 	}
 
-
 	if (!g_EntList)
 	{
-		if (!g_pGameConf->GetMemSig("LevelShutdown", (void **)&addr))
+		if (g_pGameConf->GetMemSig("LevelShutdown", (void **) &addr) && addr)
 		{
-			g_Logger.LogError("Logical Entities not supported by this mod (LevelShutdown) - Reverting to networkable entities only");
-			return;
-		}
+			int offset;
+			if (!g_pGameConf->GetOffset("gEntList", &offset))
+			{
+				logger->LogError("Logical Entities not supported by this mod (gEntList) - Reverting to networkable entities only");
+				return;
+			}
 
-		if (!addr)
-		{
-			g_Logger.LogError("Failed lookup of LevelShutdown - Reverting to networkable entities only");
-			return;
-		}
+#ifdef PLATFORM_X86
+			g_EntList = *reinterpret_cast<void **>(addr + offset);
+#elif defined PLATFORM_X64
+			int32_t varOffset = *reinterpret_cast<int32_t *>(addr + offset);
+			g_EntList = reinterpret_cast<void *>(addr + offset + sizeof(int32_t) + varOffset);
+#endif
 
-		int offset;
-		if (!g_pGameConf->GetOffset("gEntList", &offset))
-		{
-			g_Logger.LogError("Logical Entities not supported by this mod (gEntList) - Reverting to networkable entities only");
-			return;
 		}
-
-		g_EntList = *reinterpret_cast<void **>(addr + offset);
 	}
-	
-	if (!g_EntList)
+
+	// If we have g_EntList from either of the above methods, make sure we can get the offset from it to EntInfo as well
+	if (g_EntList && !g_pGameConf->GetOffset("EntInfo", &entInfoOffset))
 	{
-		g_Logger.LogError("Failed lookup of gEntList - Reverting to networkable entities only");
+		logger->LogError("Logical Entities not supported by this mod (EntInfo) - Reverting to networkable entities only");
+		g_EntList = NULL;
 		return;
 	}
 
-	if (!g_pGameConf->GetOffset("EntInfo", &entInfoOffset))
+	// If we don't have g_EntList or have it but don't know where EntInfo is on it, use fallback.
+	if (!g_EntList || entInfoOffset == -1)
 	{
-		g_Logger.LogError("Logical Entities not supported by this mod (EntInfo) - Reverting to networkable entities only");
+		g_pGameConf->GetAddress("EntInfosPtr", (void **)&g_pEntInfoList);
+	}
+	
+	if (!g_EntList && !g_pEntInfoList)
+	{
+		logger->LogError("Failed lookup of gEntList - Reverting to networkable entities only");
 		return;
 	}
 }
 
 void CHalfLife2::InitCommandLine()
 {
-	char path[PLATFORM_MAX_PATH];
 	char error[256];
-	
-	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "../bin/" TIER0_NAME);
-
-	if (!g_LibSys.IsPathFile(path))
+#if SOURCE_ENGINE != SE_DARKMESSIAH
+	if (g_SMAPI->GetSourceEngineBuild() != SOURCE_ENGINE_ORIGINAL)
 	{
-		g_Logger.LogError("Could not find path for: " TIER0_NAME);
-		return;
+		ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(TIER0_NAME, error, sizeof(error));
+		if (!lib) {
+			logger->LogError("Could not load %s: %s", TIER0_NAME, error);
+			return;
+		}
+		
+		m_pGetCommandLine = lib->get<decltype(m_pGetCommandLine)>("CommandLine_Tier0");
+
+		/* '_Tier0' dropped on Alien Swarm version */
+		if (m_pGetCommandLine == NULL)
+		{
+			m_pGetCommandLine = lib->get<decltype(m_pGetCommandLine)>("CommandLine");
+		}
 	}
+	else
+#endif
+	{
+		ke::RefPtr<ke::SharedLib> lib = ke::SharedLib::Open(VSTDLIB_NAME, error, sizeof(error));
+		if (!lib) {
+			logger->LogError("Could not load %s: %s", VSTDLIB_NAME, error);
+			return;
+		}
 
-	ILibrary *lib = g_LibSys.OpenLibrary(path, error, sizeof(error));
-	m_pGetCommandLine = lib->GetSymbolAddress("CommandLine_Tier0");
-
-	/* '_Tier0' dropped on Alien Swarm version */
-	if (m_pGetCommandLine == NULL)
-	{
-		m_pGetCommandLine = lib->GetSymbolAddress("CommandLine");
+		m_pGetCommandLine = lib->get<decltype(m_pGetCommandLine)>("CommandLine");
 	}
-
-	if (m_pGetCommandLine == NULL)
-	{
-		/* We probably have a Ship engine. */
-		lib->CloseLibrary();
-		g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "../bin/" VSTDLIB_NAME);
-		if (!g_LibSys.IsPathFile(path))
-		{
-			g_Logger.LogError("Could not find path for: " VSTDLIB_NAME);
-			return;
-		}
-
-		if ((lib = g_LibSys.OpenLibrary(path, error, sizeof(error))) == NULL)
-		{
-			g_Logger.LogError("Could not load %s: %s", path, error);
-			return;
-		}
-
-		m_pGetCommandLine = lib->GetSymbolAddress("CommandLine");
-
-		if (m_pGetCommandLine == NULL)
-		{
-			g_Logger.LogError("Could not locate any command line functionality");
-		}
-
-		lib->CloseLibrary();
+	
+	if (m_pGetCommandLine == NULL)
+	{
+		logger->LogError("Could not locate any command line functionality");
 	}
 }
 
@@ -288,13 +305,6 @@ ICommandLine *CHalfLife2::GetValveCommandLine()
 	return ((FakeGetCommandLine)((FakeGetCommandLine *)m_pGetCommandLine))();
 }
 
-#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
-bool CHalfLife2::IsOriginalEngine()
-{
-	return is_original_engine;
-}
-#endif
-
 #if SOURCE_ENGINE != SE_DARKMESSIAH
 IChangeInfoAccessor *CBaseEdict::GetChangeAccessor()
 {
@@ -337,11 +347,11 @@ bool UTIL_FindInSendTable(SendTable *pTable,
 	return false;
 }
 
-typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
+bool UTIL_FindDataMapInfo(datamap_t *pMap, const char *name, sm_datatable_info_t *pDataTable)
 {
 	while (pMap)
 	{
-		for (int i=0; i<pMap->dataNumFields; i++)
+		for (int i = 0; i < pMap->dataNumFields; ++i)
 		{
 			if (pMap->dataDesc[i].fieldName == NULL)
 			{
@@ -349,21 +359,23 @@ typedescription_t *UTIL_FindInDataMap(datamap_t *pMap, const char *name)
 			}
 			if (strcmp(name, pMap->dataDesc[i].fieldName) == 0)
 			{
-				return &(pMap->dataDesc[i]);
+				pDataTable->prop = &(pMap->dataDesc[i]);
+				pDataTable->actual_offset = GetTypeDescOffs(pDataTable->prop);
+				return true;
 			}
-			if (pMap->dataDesc[i].td)
+			if (pMap->dataDesc[i].td == NULL || !UTIL_FindDataMapInfo(pMap->dataDesc[i].td, name, pDataTable))
 			{
-				typedescription_t *_td;
-				if ((_td=UTIL_FindInDataMap(pMap->dataDesc[i].td, name)) != NULL)
-				{
-					return _td;
-				}
+				continue;
 			}
+			
+			pDataTable->actual_offset += GetTypeDescOffs(&(pMap->dataDesc[i]));
+			return true;
 		}
+		
 		pMap = pMap->baseMap;
 	}
 
-	return NULL; 
+	return false; 
 }
 
 ServerClass *CHalfLife2::FindServerClass(const char *classname)
@@ -371,9 +383,7 @@ ServerClass *CHalfLife2::FindServerClass(const char *classname)
 	DataTableInfo *pInfo = _FindServerClass(classname);
 
 	if (!pInfo)
-	{
 		return NULL;
-	}
 
 	return pInfo->sc;
 }
@@ -381,26 +391,21 @@ ServerClass *CHalfLife2::FindServerClass(const char *classname)
 DataTableInfo *CHalfLife2::_FindServerClass(const char *classname)
 {
 	DataTableInfo *pInfo = NULL;
-
-	if (!sm_trie_retrieve(m_pClasses, classname, (void **)&pInfo))
+	if (!m_Classes.retrieve(classname, &pInfo))
 	{
 		ServerClass *sc = gamedll->GetAllServerClasses();
 		while (sc)
 		{
 			if (strcmp(classname, sc->GetName()) == 0)
 			{
-				pInfo = new DataTableInfo;
-				pInfo->sc = sc;
-				sm_trie_insert(m_pClasses, classname, pInfo);
-				m_Tables.push_back(pInfo);
+				pInfo = new DataTableInfo(sc);
+				m_Classes.insert(classname, pInfo);
 				break;
 			}
 			sc = sc->m_pNext;
 		}
 		if (!pInfo)
-		{
 			return NULL;
-		}
 	}
 
 	return pInfo;
@@ -409,14 +414,13 @@ DataTableInfo *CHalfLife2::_FindServerClass(const char *classname)
 bool CHalfLife2::FindSendPropInfo(const char *classname, const char *offset, sm_sendprop_info_t *info)
 {
 	DataTableInfo *pInfo;
-	sm_sendprop_info_t *prop;
 
 	if ((pInfo = _FindServerClass(classname)) == NULL)
 	{
 		return false;
 	}
 
-	if ((prop = pInfo->lookup.retrieve(offset)) == NULL)
+	if (!pInfo->lookup.retrieve(offset, info))
 	{
 		sm_sendprop_info_t temp_info;
 
@@ -428,10 +432,6 @@ bool CHalfLife2::FindSendPropInfo(const char *classname, const char *offset, sm_
 		pInfo->lookup.insert(offset, temp_info);
 		*info = temp_info;
 	}
-	else
-	{
-		*info = *prop;
-	}
 	
 	return true;
 }
@@ -450,22 +450,32 @@ SendProp *CHalfLife2::FindInSendTable(const char *classname, const char *offset)
 
 typedescription_t *CHalfLife2::FindInDataMap(datamap_t *pMap, const char *offset)
 {
-	typedescription_t *td = NULL;
-	DataMapTrie &val = m_Maps[pMap];
-
-	if (!val.trie)
+	sm_datatable_info_t dt_info;
+	
+	if (!(this->FindDataMapInfo(pMap, offset, &dt_info)))
 	{
-		val.trie = sm_trie_create();
+		return NULL;
 	}
-	if (!sm_trie_retrieve(val.trie, offset, (void **)&td))
+	
+	return dt_info.prop;
+}
+
+bool CHalfLife2::FindDataMapInfo(datamap_t *pMap, const char *offset, sm_datatable_info_t *pDataTable)
+{
+	DataTableMap::Insert i = m_Maps.findForAdd(pMap);
+	if (!i.found())
+		m_Maps.add(i, pMap, new DataMapCache());
+
+	DataMapCache *cache = i->value;
+
+	if (!cache->retrieve(offset, pDataTable))
 	{
-		if ((td = UTIL_FindInDataMap(pMap, offset)) != NULL)
-		{
-			sm_trie_insert(val.trie, offset, td);
-		}
+		if (!UTIL_FindDataMapInfo(pMap, offset, pDataTable))
+			return false;
+		cache->insert(offset, *pDataTable);
 	}
 
-	return td;
+	return true;
 }
 
 void CHalfLife2::SetEdictStateChanged(edict_t *pEdict, unsigned short offset)
@@ -491,7 +501,7 @@ void CHalfLife2::SetEdictStateChanged(edict_t *pEdict, unsigned short offset)
 
 bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 {
-#if SOURCE_ENGINE != SE_CSGO
+#ifndef USE_PROTOBUF_USERMESSAGES
 	bf_write *pBitBuf = NULL;
 #endif
 	cell_t players[] = {client};
@@ -503,8 +513,8 @@ bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 		/* Use SayText user message instead */
 		if (chat_saytext != NULL && strcmp(chat_saytext, "yes") == 0)
 		{
-			char buffer[192];
-			UTIL_Format(buffer, sizeof(buffer), "%s\1\n", msg);
+			char buffer[253];
+			ke::SafeSprintf(buffer, sizeof(buffer), "%s\1\n", msg);
 
 #if SOURCE_ENGINE == SE_CSGO
 			CCSUsrMsg_SayText *pMsg;
@@ -555,6 +565,10 @@ bool CHalfLife2::TextMsg(int client, int dest, const char *msg)
 
 	pBitBuf->WriteByte(dest);
 	pBitBuf->WriteString(msg);
+	pBitBuf->WriteString("");
+	pBitBuf->WriteString("");
+	pBitBuf->WriteString("");
+	pBitBuf->WriteString("");
 #endif
 
 	g_UserMsgs.EndMessage();
@@ -716,6 +730,7 @@ void CHalfLife2::ProcessFakeCliCmdQueue()
 		}
 
 		m_CmdQueue.pop();
+		m_FreeCmds.push(pFake);
 	}
 }
 
@@ -733,11 +748,7 @@ bool CHalfLife2::IsLANServer()
 
 bool CHalfLife2::KVLoadFromFile(KeyValues *kv, IBaseFileSystem *filesystem, const char *resourceName, const char *pathID)
 {
-#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
 	if (g_SMAPI->GetSourceEngineBuild() == SOURCE_ENGINE_ORIGINAL)
-#else
-	if (strcasecmp(g_SourceMod.GetGameFolderName(), "ship") == 0)
-#endif
 	{
 		Assert(filesystem);
 #ifdef _MSC_VER
@@ -772,19 +783,19 @@ bool CHalfLife2::KVLoadFromFile(KeyValues *kv, IBaseFileSystem *filesystem, cons
 	}
 }
 
-void CHalfLife2::PushCommandStack(const CCommand *cmd)
+void CHalfLife2::PushCommandStack(const ICommandArgs *cmd)
 {
 	CachedCommandInfo info;
 
 	info.args = cmd;
 #if SOURCE_ENGINE <= SE_DARKMESSIAH
-	strncopy(info.cmd, cmd->Arg(0), sizeof(info.cmd));
+	ke::SafeStrcpy(info.cmd, sizeof(info.cmd), cmd->Arg(0));
 #endif
 
 	m_CommandStack.push(info);
 }
 
-const CCommand *CHalfLife2::PeekCommandStack()
+const ICommandArgs *CHalfLife2::PeekCommandStack()
 {
 	if (m_CommandStack.empty())
 	{
@@ -810,11 +821,19 @@ const char *CHalfLife2::CurrentCommandName()
 
 void CHalfLife2::AddDelayedKick(int client, int userid, const char *msg)
 {
+	CPlayer *pPlayer = g_Players.GetPlayerByIndex(client);
+	if (!pPlayer || !pPlayer->IsConnected() || pPlayer->IsInKickQueue())
+	{
+		return;
+	}
+	
+	pPlayer->MarkAsBeingKicked();
+
 	DelayedKickInfo kick;
 
 	kick.client = client;
 	kick.userid = userid;
-	UTIL_Format(kick.buffer, sizeof(kick.buffer), "%s", msg);
+	ke::SafeStrcpy(kick.buffer, sizeof(kick.buffer), msg);
 
 	m_DelayedKicks.push(kick);
 }
@@ -964,7 +983,9 @@ CEntInfo *CHalfLife2::LookupEntity(int entIndex)
 		return NULL;
 	}
 
-	if (!g_EntList || entInfoOffset == -1)
+	CEntInfo *entInfos = EntInfoArray();
+
+	if (!entInfos)
 	{
 		/* Attempt to use engine interface instead */
 		static CEntInfo tempInfo;
@@ -991,8 +1012,7 @@ CEntInfo *CHalfLife2::LookupEntity(int entIndex)
 		return &tempInfo;
 	}
 
-	CEntInfo *pArray = (CEntInfo *)(((unsigned char *)g_EntList) + entInfoOffset);
-	return &pArray[entIndex];
+	return &entInfos[entIndex];
 }
 
 /**
@@ -1124,10 +1144,281 @@ const char *CHalfLife2::GetEntityClassname(CBaseEntity *pEntity)
 	static int offset = -1;
 	if (offset == -1)
 	{
-		datamap_t *pMap = GetDataMap(pEntity);
-		typedescription_t *pDesc = FindInDataMap(pMap, "m_iClassname");
-		offset = GetTypeDescOffs(pDesc);
+		CBaseEntity *pGetterEnt = ReferenceToEntity(0);
+		if (pGetterEnt == NULL)
+		{
+			// If we don't have a world entity yet, we'll have to rely on the given entity
+			pGetterEnt = pEntity;
+		}
+
+		datamap_t *pMap = GetDataMap(pGetterEnt);
+		
+		sm_datatable_info_t info;
+		if (!FindDataMapInfo(pMap, "m_iClassname", &info))
+		{
+			return NULL;
+		}
+		
+		offset = info.actual_offset;
 	}
 
 	return *(const char **)(((unsigned char *)pEntity) + offset);
 }
+
+SMFindMapResult CHalfLife2::FindMap(char *pMapName, size_t nMapNameMax)
+{
+	return this->FindMap(pMapName, pMapName, nMapNameMax);
+}
+
+#ifdef PLATFORM_WINDOWS
+bool CheckReservedFilename(const char *in, const char *reservedName)
+{
+	size_t nameLen = strlen(reservedName);
+	for (size_t i = 0; i < nameLen; ++i)
+	{
+		if (reservedName[i] != tolower(in[i]))
+		{
+			return false;
+		}
+	}
+
+	if (in[nameLen] == '\0' || in[nameLen] == '.')
+	{
+		return true;
+	}
+
+	return false;
+}
+
+bool IsWindowsReservedDeviceName(const char *pMapname)
+{
+	static const char * const reservedDeviceNames[] = {
+		"con", "prn", "aux", "clock$", "nul", "com1",
+		"com2", "com3", "com4", "com5", "com6", "com7",
+		"com8", "com9", "lpt1", "lpt2", "lpt3", "lpt4",
+		"lpt5", "lpt6", "lpt7", "lpt8", "lpt9"
+	};
+	
+	size_t reservedCount = sizeof(reservedDeviceNames) / sizeof(reservedDeviceNames[0]);
+	for (size_t i = 0; i < reservedCount; ++i)
+	{
+		if (CheckReservedFilename(pMapname, reservedDeviceNames[i]))
+		{
+			return true;
+		}
+	}
+	
+	return false;
+}
+#endif 
+
+SMFindMapResult CHalfLife2::FindMap(const char *pMapName, char *pFoundMap, size_t nMapNameMax)
+{
+	/* We need to ensure user input does not contain reserved device names on windows */
+#ifdef PLATFORM_WINDOWS
+	if (IsWindowsReservedDeviceName(pMapName))
+	{
+		return SMFindMapResult::NotFound;
+	}
+#endif
+	
+	ke::SafeStrcpy(pFoundMap, nMapNameMax, pMapName);
+
+#if SOURCE_ENGINE >= SE_LEFT4DEAD
+	static char mapNameTmp[PLATFORM_MAX_PATH];
+	g_SourceMod.Format(mapNameTmp, sizeof(mapNameTmp), "maps%c%s.bsp", PLATFORM_SEP_CHAR, pMapName);
+	if (filesystem->FileExists(mapNameTmp, "GAME"))
+	{
+		// If this is already an exact match, don't attempt to autocomplete it further (de_dust -> de_dust2).
+		// ... but still check that map file is actually valid.
+		// We check FileExists first to avoid console message about IsMapValid with invalid map.
+		return engine->IsMapValid(pMapName) == 0 ? SMFindMapResult::NotFound : SMFindMapResult::Found;
+	}
+
+	static ConCommand *pHelperCmd = g_pCVar->FindCommand("changelevel");
+	
+	// This shouldn't happen.
+	if (!pHelperCmd || !pHelperCmd->CanAutoComplete())
+	{
+		return engine->IsMapValid(pMapName) == 0 ? SMFindMapResult::NotFound : SMFindMapResult::Found;
+	}
+
+	static size_t helperCmdLen = strlen(pHelperCmd->GetName());
+
+	CUtlVector<CUtlString> results;
+	pHelperCmd->AutoCompleteSuggest(pMapName, results);
+	if (results.Count() == 0)
+		return SMFindMapResult::NotFound;
+
+	// Results come back as you'd see in autocomplete. (ie. "changelevel fullmapnamehere"),
+	// so skip ahead to start of map path/name
+
+	// Like the engine, we're only going to deal with the first match.
+
+	bool bExactMatch = Q_strcmp(pMapName, &results[0][helperCmdLen + 1]) == 0;
+	if (bExactMatch)
+	{
+		return SMFindMapResult::Found;
+	}
+	else
+	{
+		ke::SafeStrcpy(pFoundMap, nMapNameMax, &results[0][helperCmdLen + 1]);
+		return SMFindMapResult::FuzzyMatch;
+	}
+
+#elif SOURCE_ENGINE == SE_TF2 || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_HL2DM \
+	|| SOURCE_ENGINE == SE_SDK2013 || SOURCE_ENGINE == SE_BMS
+	static IVEngineServer *engine23 = (IVEngineServer *)(g_SMAPI->GetEngineFactory()("VEngineServer023", nullptr));
+	if (engine23)
+	{
+		static char szTemp[PLATFORM_MAX_PATH];
+		if (pFoundMap == NULL)
+		{
+			ke::SafeStrcpy(szTemp, SM_ARRAYSIZE(szTemp), pMapName);
+			pFoundMap = szTemp;
+			nMapNameMax = 0;
+		}
+
+		return static_cast<SMFindMapResult>(engine->FindMap(pFoundMap, static_cast<int>(nMapNameMax)));
+	}
+	else
+	{
+		static IVEngineServer *engine21 = (IVEngineServer *)(g_SMAPI->GetEngineFactory()("VEngineServer021", nullptr));
+		return engine21->IsMapValid(pMapName) == 0 ? SMFindMapResult::NotFound : SMFindMapResult::Found;
+	}
+#else
+	return engine->IsMapValid(pMapName) == 0 ? SMFindMapResult::NotFound : SMFindMapResult::Found;
+#endif
+}
+
+bool CHalfLife2::GetMapDisplayName(const char *pMapName, char *pDisplayname, size_t nMapNameMax)
+{
+	SMFindMapResult result = FindMap(pMapName, pDisplayname, nMapNameMax);
+
+	if (result == SMFindMapResult::NotFound)
+		return false;
+
+	char *pPos;
+	if ((pPos = strrchr(pDisplayname, '/')) != NULL || (pPos = strrchr(pDisplayname, '\\')) != NULL)
+		ke::SafeStrcpy(pDisplayname, nMapNameMax, &pPos[1]);
+
+	if ((pPos = strstr(pDisplayname, ".ugc")) != NULL)
+		pPos[0] = '\0';
+
+	return true;
+}
+
+bool CHalfLife2::IsMapValid(const char *map)
+{
+	if (!map || !map[0])
+		return false;
+	
+	return FindMap(map) == SMFindMapResult::Found;
+}
+
+// TODO: Add ep1 support for this. (No IServerTools available there)
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+string_t CHalfLife2::AllocPooledString(const char *pszValue)
+{
+	// This is admittedly a giant hack, but it's a relatively safe method for
+	// inserting a string into the game's string pool that isn't likely to break.
+	//
+	// We find the first valid ent (should always be worldspawn), save off it's
+	// current targetname string_t, set it to our string to insert via SetKeyValue,
+	// read back the new targetname value, restore the old value, and return the new one.
+
+	CBaseEntity *pEntity = ((IServerUnknown *) servertools->FirstEntity())->GetBaseEntity();
+	auto *pDataMap = GetDataMap(pEntity);
+	assert(pDataMap);
+
+	static int offset = -1;
+	if (offset == -1)
+	{
+		sm_datatable_info_t info;
+		bool found = FindDataMapInfo(pDataMap, "m_iName", &info);
+		assert(found);
+		offset = info.actual_offset;
+	}
+
+	string_t *pProp = (string_t *) ((intp) pEntity + offset);
+	string_t backup = *pProp;
+	servertools->SetKeyValue(pEntity, "targetname", pszValue);
+	string_t newString = *pProp;
+	*pProp = backup;
+
+	return newString;
+}
+#endif
+
+bool CHalfLife2::GetServerSteam3Id(char *pszOut, size_t len) const
+{
+	CSteamID sid((uint64)GetServerSteamId64());
+
+	switch (sid.GetEAccountType())
+	{
+	case k_EAccountTypeAnonGameServer:
+		ke::SafeSprintf(pszOut, len, "[A:%u:%u:%u]", sid.GetEUniverse(), sid.GetAccountID(), sid.GetUnAccountInstance());
+		break;
+	case k_EAccountTypeGameServer:
+		ke::SafeSprintf(pszOut, len, "[G:%u:%u]", sid.GetEUniverse(), sid.GetAccountID());
+		break;
+	case k_EAccountTypeInvalid:
+		ke::SafeSprintf(pszOut, len, "[I:%u:%u]", sid.GetEUniverse(), sid.GetAccountID());
+		break;
+	default:
+		return false;
+	}
+
+	return true;
+}
+
+#if defined( PLATFORM_WINDOWS )
+#define STEAM_LIB_PREFIX
+#define STEAM_LIB_SUFFIX
+#elif defined( PLATFORM_LINUX )
+#define STEAM_LIB_PREFIX "lib"
+#define STEAM_LIB_SUFFIX ".so"
+#elif defined( PLATFORM_APPLE )
+#define STEAM_LIB_PREFIX "lib"
+#define STEAM_LIB_SUFFIX ".dylib"
+#endif
+
+uint64_t CHalfLife2::GetServerSteamId64() const
+{
+#if SOURCE_ENGINE == SE_BLADE          \
+	|| SOURCE_ENGINE == SE_BMS         \
+	|| SOURCE_ENGINE == SE_CSGO        \
+	|| SOURCE_ENGINE == SE_CSS         \
+	|| SOURCE_ENGINE == SE_DODS        \
+	|| SOURCE_ENGINE == SE_EYE         \
+	|| SOURCE_ENGINE == SE_HL2DM       \
+	|| SOURCE_ENGINE == SE_INSURGENCY  \
+	|| SOURCE_ENGINE == SE_DOI  \
+	|| SOURCE_ENGINE == SE_SDK2013     \
+	|| SOURCE_ENGINE == SE_ALIENSWARM  \
+	|| SOURCE_ENGINE == SE_TF2
+	const CSteamID *sid = engine->GetGameServerSteamID();
+	if (sid)
+	{
+		return sid->ConvertToUint64();
+	}
+#else
+	typedef uint64_t(* GetServerSteamIdFn)(void);
+	static GetServerSteamIdFn fn = nullptr;
+	if (!fn)
+	{
+		ke::SharedLib steam_api(STEAM_LIB_PREFIX "steam_api" STEAM_LIB_SUFFIX);
+		if (steam_api.valid())
+		{
+			fn = (GetServerSteamIdFn)steam_api.lookup("SteamGameServer_GetSteamID");
+		}
+	}
+
+	if (fn)
+	{
+		return fn();
+	}
+#endif
+
+	return 1ULL;
+}

core/HalfLife2.h

@@ -1,8 +1,8 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2016 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -35,8 +35,11 @@
 #include <sh_list.h>
 #include <sh_string.h>
 #include <sh_tinyhash.h>
-#include <sm_trie_tpl.h>
-#include "sm_trie.h"
+#include <am-utility.h>
+#include <am-hashset.h>
+#include <am-hashmap.h>
+#include <sm_stringhashmap.h>
+#include <sm_namehashset.h>
 #include "sm_globals.h"
 #include "sm_queue.h"
 #include <IGameHelpers.h>
@@ -45,11 +48,11 @@
 #include <datamap.h>
 #include <ihandleentity.h>
 #include <tier0/icommandline.h>
-#if SOURCE_ENGINE >= SE_PORTAL2
 #include <string_t.h>
-#endif
 
-class CCommand;
+namespace SourceMod {
+class ICommandArgs;
+} // namespace SourceMod
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -57,18 +60,79 @@ using namespace SourceMod;
 #define HUD_PRINTTALK		3
 #define HUD_PRINTCENTER		4
 
+#if defined _WIN32
+#define SOURCE_BIN_PREFIX ""
+#define SOURCE_BIN_SUFFIX ""
+#define SOURCE_BIN_EXT ".dll"
+#elif defined __APPLE__
+#define SOURCE_BIN_PREFIX ""
+#define SOURCE_BIN_SUFFIX ""
+#define SOURCE_BIN_EXT ".dylib"
+#elif defined __linux__
+#if SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS || SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_TF2 \
+	|| SOURCE_ENGINE == SE_SDK2013 || SOURCE_ENGINE == SE_LEFT4DEAD2 || SOURCE_ENGINE == SE_NUCLEARDAWN \
+	|| SOURCE_ENGINE == SE_BMS || SOURCE_ENGINE == SE_INSURGENCY || SOURCE_ENGINE == SE_DOI
+#define SOURCE_BIN_PREFIX "lib"
+#define SOURCE_BIN_SUFFIX "_srv"
+#elif SOURCE_ENGINE >= SE_LEFT4DEAD
+#define SOURCE_BIN_PREFIX "lib"
+#define SOURCE_BIN_SUFFIX ""
+#else
+#define SOURCE_BIN_PREFIX ""
+#define SOURCE_BIN_SUFFIX "_i486"
+#endif
+#define SOURCE_BIN_EXT ".so"
+#endif
+
+#define FORMAT_SOURCE_BIN_NAME(basename) \
+	(SOURCE_BIN_PREFIX basename SOURCE_BIN_SUFFIX SOURCE_BIN_EXT)
+
 struct DataTableInfo
 {
+	struct SendPropPolicy
+	{
+		static inline bool matches(const char *name, const sm_sendprop_info_t &info)
+		{
+			return strcmp(name, info.prop->GetName()) == 0;
+		}
+		static inline uint32_t hash(const detail::CharsAndLength &key)
+		{
+			return key.hash();
+		}
+	};
+
+	static inline bool matches(const char *name, const DataTableInfo *info)
+	{
+		return strcmp(name, info->sc->GetName()) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
+	
+	DataTableInfo(ServerClass *sc)
+		: sc(sc)
+	{
+	}
+
 	ServerClass *sc;
-	KTrie<sm_sendprop_info_t> lookup;
+	NameHashSet<sm_sendprop_info_t, SendPropPolicy> lookup;
 };
 
-struct DataMapTrie
+struct DataMapCachePolicy
 {
-	DataMapTrie() : trie(NULL) {}
-	Trie *trie;
+	static inline bool matches(const char *name, const sm_datatable_info_t &info)
+	{
+		return strcmp(name, info.prop->fieldName) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
 };
 
+typedef NameHashSet<sm_datatable_info_t, DataMapCachePolicy> DataMapCache;
+
 struct DelayedFakeCliCmd
 {
 	String cmd;
@@ -78,7 +142,7 @@ struct DelayedFakeCliCmd
 
 struct CachedCommandInfo
 {
-	const CCommand *args;
+	const ICommandArgs *args;
 #if SOURCE_ENGINE <= SE_DARKMESSIAH
 	char cmd[300];
 #endif
@@ -105,10 +169,21 @@ public:
 #endif
 };
 
+// Corresponds to TF2's eFindMapResult in eiface.h
+// Not yet in other games, but eventually in others on same branch.
+enum class SMFindMapResult : cell_t {
+	Found,
+	NotFound,
+	FuzzyMatch,
+	NonCanonical,
+	PossiblyAvailable
+};
+
 class CHalfLife2 : 
 	public SMGlobalClass,
 	public IGameHelpers
 {
+	friend class AutoEnterCommand;
 public:
 	CHalfLife2();
 	~CHalfLife2();
@@ -117,12 +192,15 @@ public:
 	void OnSourceModAllInitialized();
 	void OnSourceModAllInitialized_Post();
 	/*void OnSourceModAllShutdown();*/
+	ConfigResult OnSourceModConfigChanged(const char *key, const char *value,
+		ConfigSource source, char *error, size_t maxlength) override;
 public: //IGameHelpers
 	SendProp *FindInSendTable(const char *classname, const char *offset);
 	bool FindSendPropInfo(const char *classname, const char *offset, sm_sendprop_info_t *info);
 	datamap_t *GetDataMap(CBaseEntity *pEntity);
 	ServerClass *FindServerClass(const char *classname);
 	typedescription_t *FindInDataMap(datamap_t *pMap, const char *offset);
+	bool FindDataMapInfo(datamap_t *pMap, const char *offset, sm_datatable_info_t *pDataTable);
 	void SetEdictStateChanged(edict_t *pEdict, unsigned short offset);
 	bool TextMsg(int client, int dest, const char *msg);
 	bool HintTextMsg(int client, const char *msg);
@@ -148,28 +226,35 @@ public: //IGameHelpers
 	ICommandLine *GetValveCommandLine();
 	const char *GetEntityClassname(edict_t *pEdict);
 	const char *GetEntityClassname(CBaseEntity *pEntity);
+	bool IsMapValid(const char *map);
+	SMFindMapResult FindMap(char *pMapName, size_t nMapNameMax);
+	SMFindMapResult FindMap(const char *pMapName, char *pFoundMap = NULL, size_t nMapNameMax = 0);
+	bool GetMapDisplayName(const char *pMapName, char *pDisplayname, size_t nMapNameMax);
+#if SOURCE_ENGINE >= SE_ORANGEBOX
+	string_t AllocPooledString(const char *pszValue);
+#endif
+	bool GetServerSteam3Id(char *pszOut, size_t len) const override;
+	uint64_t GetServerSteamId64() const override;
 public:
 	void AddToFakeCliCmdQueue(int client, int userid, const char *cmd);
 	void ProcessFakeCliCmdQueue();
 public:
-	void PushCommandStack(const CCommand *cmd);
-	void PopCommandStack();
-	const CCommand *PeekCommandStack();
+	const ICommandArgs *PeekCommandStack();
 	const char *CurrentCommandName();
 	void AddDelayedKick(int client, int userid, const char *msg);
 	void ProcessDelayedKicks();
-#if !defined METAMOD_PLAPI_VERSION || PLAPI_VERSION < 11
-	bool IsOriginalEngine();
-#endif
 private:
+	void PushCommandStack(const ICommandArgs *cmd);
+	void PopCommandStack();
 	DataTableInfo *_FindServerClass(const char *classname);
 private:
 	void InitLogicalEntData();
 	void InitCommandLine();
 private:
-	Trie *m_pClasses;
-	List<DataTableInfo *> m_Tables;
-	THash<datamap_t *, DataMapTrie> m_Maps;
+	typedef ke::HashMap<datamap_t *, DataMapCache *, ke::PointerPolicy<datamap_t> > DataTableMap;
+
+	NameHashSet<DataTableInfo *> m_Classes;
+	DataTableMap m_Maps;
 	int m_MsgTextMsg;
 	int m_HinTextMsg;
 	int m_SayTextMsg;
@@ -179,10 +264,31 @@ private:
 	CStack<CachedCommandInfo> m_CommandStack;
 	Queue<DelayedKickInfo> m_DelayedKicks;
 	void *m_pGetCommandLine;
+#if SOURCE_ENGINE == SE_CSGO
+public:
+	bool CanSetCSGOEntProp(const char *pszPropName)
+	{
+		return !m_bFollowCSGOServerGuidelines || !m_CSGOBadList.has(pszPropName);
+	}
+private:
+	ke::HashSet<ke::AString, detail::StringHashMapPolicy> m_CSGOBadList;
+	bool m_bFollowCSGOServerGuidelines = true;
+#endif
 };
 
 extern CHalfLife2 g_HL2;
 
 bool IndexToAThings(cell_t, CBaseEntity **pEntData, edict_t **pEdictData);
 
+class AutoEnterCommand
+{
+public:
+	AutoEnterCommand(const ICommandArgs *args) {
+		g_HL2.PushCommandStack(args);
+	}
+	~AutoEnterCommand() {
+		g_HL2.PopCommandStack();
+	}
+};
+
 #endif //_INCLUDE_SOURCEMOD_CHALFLIFE2_H_

core/Logger.cpp

@@ -34,523 +34,37 @@
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "Logger.h"
-#include "LibrarySys.h"
 #include "TimerSys.h"
+#include "logic_bridge.h"
 #include <sourcemod_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, SM_VERSION_STRING);
-		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::LogToFileOnly(FILE *fp, const char *msg, ...)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	va_list ap;
-	va_start(ap, msg);
-	LogToFileOnlyEx(fp, msg, ap);
-	va_end(ap);
-}
-
-void Logger::LogToOpenFileEx(FILE *fp, const char *msg, va_list ap)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	static ConVar *sv_logecho = icvar->FindVar("sv_logecho");
-
-	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);
-
-	if (!sv_logecho || sv_logecho->GetBool())
-	{
-		g_SMAPI->ConPrintf("L %s: %s\n", date, buffer);
-	}
-}
-
-void Logger::LogToFileOnlyEx(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);
-	fflush(fp);
-}
-
-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, SM_VERSION_STRING);
-	 	}
-		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, ...)
-{
-	va_list ap;
-	va_start(ap, vafmt);
-	LogErrorEx(vafmt, ap);
-	va_end(ap);
-}
-
-void Logger::LogErrorEx(const char *vafmt, va_list ap)
-{
-	if (!m_Active)
-	{
-		return;
-	}
-
-	time_t t;
-	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;
-		}
-		LogToOpenFileEx(fp, vafmt, ap);
-		fclose(fp);
-	}
-	else
-	{
-		char error[255];
-		g_LibSys.GetPlatformError(error, sizeof(error));
-		LogFatal("[SM] Unexpected fatal logging error (file \"%s\")", m_NrmFileName.c_str());
-		LogFatal("[SM] Platform returned error: \"%s\"", error);
-		LogFatal("[SM] Logging has been disabled.");
-		m_Active = false;
-		return;
-	}
-}
-
-void Logger::MapChange(const char *mapname)
-{
-	m_CurMapName.assign(mapname);
-
-	switch (m_Mode)
-	{
-	case LoggingMode_Daily:
-		{
-			LogMessage("-------- Mapchange to %s --------", mapname);
-			break;
-		}
-	case LoggingMode_PerMap:
-		{
-			_NewMapFile();
-			break;
-		}
-	default:
-		{
-			/* Do nothing... */
-			break;
-		}
-	}
-
-	if (m_ErrMapStart)
-	{
-		LogError("Error log file session closed.");
-	}
-	m_ErrMapStart = false;
-}
-
-void Logger::_PrintToGameLog(const char *fmt, va_list ap)
-{
-	char msg[3072];
-	size_t len;
-
-	len = vsnprintf(msg, sizeof(msg)-2, fmt, ap);
-	len = (len >= sizeof(msg)) ? (sizeof(msg) - 2) : len;
-
-	msg[len++] = '\n';
-	msg[len] = '\0';
-
-	Engine_LogPrintWrapper(msg);
-}
-
-const char *Logger::GetLogFileName(LogType type) const
-{
-	switch (type)
-	{
-	case LogType_Normal:
-		{
-			return m_NrmFileName.c_str();
-		}
-	case LogType_Error:
-		{
-			return m_ErrFileName.c_str();
-		}
-	default:
-		{
-			return "";
-		}
-	}
-}
-
-LoggingMode Logger::GetLoggingMode() const
-{
-	return m_Mode;
-}
-
-void Logger::EnableLogging()
-{
-	if (m_Active)
-	{
-		return;
-	}
-	m_Active = true;
-	LogMessage("[SM] Logging enabled manually by user.");
-}
-
-void Logger::DisableLogging()
-{
-	if (!m_Active)
-	{
-		return;
-	}
-	LogMessage("[SM] Logging disabled manually by user.");
-	m_Active = false;
-}
-
-void Logger::LogFatal(const char *msg, ...)
-{
-	/* :TODO: make this print all pretty-like
-	 * In fact, the pretty log printing function should be abstracted. 
-	 * It's already implemented twice which is bad.
-	 */
-
-	va_list ap;
-	char path[PLATFORM_MAX_PATH];
-
-	g_SourceMod.BuildPath(Path_Game, path, sizeof(path), "sourcemod_fatal.log");
-
-	FILE *fp = fopen(path, "at");
-	if (fp)
-	{
-		m_Active = true;
-		va_start(ap, msg);
-		LogToOpenFileEx(fp, msg, ap);
-		va_end(ap);
-		m_Active = false;
-		fclose(fp);
-	}
-}
+#include <bridge/include/IProviderCallbacks.h>
 
 bool g_in_game_log_hook = false;
 
+static LoggerCore g_LoggerCore;
+
+SH_DECL_HOOK1_void(IVEngineServer, LogPrint, SH_NOATTRIB, false, const char *);
+
+static void HookLogPrint(const char *message)
+{
+	g_in_game_log_hook = true;
+	bool stopped = logicore.callbacks->OnLogPrint(message);
+	g_in_game_log_hook = false;
+
+	if (stopped)
+		RETURN_META(MRES_SUPERCEDE);
+}
+
+void LoggerCore::OnSourceModStartup(bool late)
+{
+	SH_ADD_HOOK(IVEngineServer, LogPrint, engine, SH_STATIC(HookLogPrint), false);
+}
+
+void LoggerCore::OnSourceModAllShutdown()
+{
+	SH_REMOVE_HOOK(IVEngineServer, LogPrint, engine, SH_STATIC(HookLogPrint), false);
+}
+
 void Engine_LogPrintWrapper(const char *msg)
 {
 	if (g_in_game_log_hook)

core/Logger.h

@@ -38,73 +38,13 @@
 
 using namespace SourceHook;
 
-enum LogType
+class LoggerCore : public SMGlobalClass
 {
-	LogType_Normal,
-	LogType_Error
-};
-
-enum LoggingMode
-{
-	LoggingMode_Daily,
-	LoggingMode_PerMap,
-	LoggingMode_Game
-};
-
-class Logger : public SMGlobalClass
-{
-public:
-	Logger() : m_Mode(LoggingMode_Daily), m_ErrMapStart(false), 
-		m_Active(false), m_DelayedStart(false), m_DailyPrintHdr(false), 
-		m_InitialState(true)
-	{
-	}
 public: //SMGlobalClass
-	ConfigResult OnSourceModConfigChanged(const char *key, 
-		const char *value, 
-		ConfigSource source,
-		char *error, 
-		size_t maxlength);
 	void OnSourceModStartup(bool late);
 	void OnSourceModAllShutdown();
-	void OnSourceModLevelChange(const char *mapName);
-public:
-	void InitLogger(LoggingMode mode);
-	void CloseLogger();
-	void EnableLogging();
-	void DisableLogging();
-	void LogMessage(const char *msg, ...);
-	void LogError(const char *msg, ...);
-	void LogErrorEx(const char *msg, va_list ap); 
-	void LogFatal(const char *msg, ...);
-	void LogToOpenFile(FILE *fp, const char *msg, ...);
-	void LogToOpenFileEx(FILE *fp, const char *msg, va_list ap);
-	/* This version does not print to console, and is thus thread-safe */
-	void LogToFileOnly(FILE *fp, const char *msg, ...);
-	void LogToFileOnlyEx(FILE *fp, const char *msg, va_list ap);
-	void MapChange(const char *mapname);
-	const char *GetLogFileName(LogType type) const;
-	LoggingMode GetLoggingMode() const;
-private:
-	void _CloseFile();
-	void _NewMapFile();
-	void _PrintToGameLog(const char *fmt, va_list ap);
-private:
-	String m_NrmFileName;
-	String m_ErrFileName;
-	String m_CurMapName;
-	LoggingMode m_Mode;
-	int m_CurDay;
-	bool m_ErrMapStart;
-	bool m_Active;
-	bool m_DelayedStart;
-	bool m_DailyPrintHdr;
-	bool m_InitialState;
 };
 
 void Engine_LogPrintWrapper(const char *msg);
 
-extern bool g_in_game_log_hook;
-extern Logger g_Logger;
-
 #endif // _INCLUDE_SOURCEMOD_CLOGGER_H_

core/Makefile

@@ -1,216 +0,0 @@
-# (C)2004-2008 SourceMod Development Team
-# Makefile written by David "BAILOPAN" Anderson
-
-SMSDK = ..
-HL2SDK_ORIG = ../../hl2sdk
-HL2SDK_OB = ../../hl2sdk-ob
-HL2SDK_CSS = ../../hl2sdk-css
-HL2SDK_OB_VALVE = ../../hl2sdk-ob-valve
-HL2SDK_L4D = ../../hl2sdk-l4d
-HL2SDK_L4D2 = ../../hl2sdk-l4d2
-HL2SDK_CSGO = ../../hl2sdk-csgo
-MMSOURCE = ../../mmsource-central
-
-#####################################
-### EDIT BELOW FOR OTHER PROJECTS ###
-#####################################
-
-OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreConfig.cpp \
-	Database.cpp DebugReporter.cpp EventManager.cpp HalfLife2.cpp Logger.cpp \
-	PlayerManager.cpp TimerSys.cpp UserMessages.cpp \
-	sm_autonatives.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \
-	sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \
-	MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp \
-	frame_hooks.cpp concmd_cleaner.cpp NextMap.cpp \
-	NativeOwner.cpp logic_bridge.cpp ConsoleDetours.cpp
-OBJECTS += smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \
-	smn_database.cpp smn_entities.cpp smn_events.cpp \
-	smn_fakenatives.cpp smn_filesystem.cpp smn_halflife.cpp \
-	smn_keyvalues.cpp smn_player.cpp \
-	smn_usermsgs.cpp smn_menus.cpp smn_vector.cpp \
-	smn_hudtext.cpp smn_nextmap.cpp
-OBJECTS += ExtensionSys.cpp 		\
-		   ForwardSys.cpp 			\
-		   HandleSys.cpp 			\
-		   LibrarySys.cpp 			\
-		   PluginInfoDatabase.cpp 	\
-		   PluginSys.cpp 			\
-		   ShareSys.cpp				\
-		   NativeInvoker.cpp
-
-##############################################
-### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
-##############################################
-
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
-C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
-C_GCC4_FLAGS = -fvisibility=hidden
-CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
-CPP = gcc
-
-override ENGSET = false
-
-ifneq (,$(filter original orangebox css orangeboxvalve left4dead left4dead2 csgo,$(ENGINE)))
-	override ENGSET = true
-endif
-
-ifeq "$(ENGINE)" "original"
-	HL2SDK = $(HL2SDK_ORIG)
-	HL2LIB = $(HL2SDK)/linux_sdk
-	CFLAGS += -DSOURCE_ENGINE=1
-	METAMOD = $(MMSOURCE)/core-legacy
-	INCLUDE += -I$(HL2SDK)/public/dlls
-	BINARY = sourcemod.1.ep1.so
-endif
-ifeq "$(ENGINE)" "orangebox"
-	HL2SDK = $(HL2SDK_OB)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=3
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.ep2.so
-endif
-ifeq "$(ENGINE)" "css"
-	HL2SDK = $(HL2SDK_CSS)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=6
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server 
-	BINARY = sourcemod.2.css.so
-endif
-ifeq "$(ENGINE)" "orangeboxvalve"
-	HL2SDK = $(HL2SDK_OB_VALVE)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=7
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server 
-	BINARY = sourcemod.2.ep2v.so
-endif
-ifeq "$(ENGINE)" "left4dead"
-	HL2SDK = $(HL2SDK_L4D)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=8
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.l4d.so
-endif
-ifeq "$(ENGINE)" "left4dead2"
-	HL2SDK = $(HL2SDK_L4D2)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=9
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.l4d2.so
-endif
-ifeq "$(ENGINE)" "csgo"
-	HL2SDK = $(HL2SDK_CSGO)
-	HL2LIB = $(HL2SDK)/lib/linux
-	CFLAGS += -DSOURCE_ENGINE=12
-	METAMOD = $(MMSOURCE)/core
-	INCLUDE += -I$(HL2SDK)/public/game/server
-	BINARY = sourcemod.2.csgo.so
-endif
-
-HL2PUB = $(HL2SDK)/public
-
-OS := $(shell uname -s)
-
-ifeq "$(OS)" "Darwin"
-	LIB_EXT = dylib
-	HL2LIB = $(HL2SDK)/lib/mac
-else
-	LIB_EXT = so
-	ifeq "$(ENGINE)" "original"
-		HL2LIB = $(HL2SDK)/linux_sdk
-	else
-		HL2LIB = $(HL2SDK)/lib/linux
-	endif
-endif
-
-ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
-	LIB_SUFFIX = _i486.$(LIB_EXT)
-else
-	LIB_PREFIX = lib
-	ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
-		ifneq "$(OS)" "Darwin"
-			LIB_SUFFIX = _srv.$(LIB_EXT)
-		else
-			LIB_SUFFIX = .$(LIB_EXT)
-		endif
-	else
-		LIB_SUFFIX = .$(LIB_EXT)
-	endif
-endif
-
-CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
-	-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
-	-DSE_PORTAL2=11 -DSE_CSGO=12
-
-LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) \
-	$(LIB_PREFIX)tier0$(LIB_SUFFIX) -static-libgcc
-
-ifeq "$(ENGINE)" "csgo"
-	LINK += $(HL2LIB)/interfaces_i486.a
-endif
-	
-INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
-	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I$(METAMOD) -I$(METAMOD)/sourcehook \
-	-I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn
-
-CFLAGS += -D_LINUX -DPOSIX -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp -Dstrnicmp=strncasecmp \
-	-D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca -Dstrcmpi=strcasecmp -Wall -Werror \
-	-Wno-uninitialized -Wno-unused -Wno-switch -mfpmath=sse -msse -DSOURCEMOD_BUILD -DHAVE_STDINT_H \
-	-DSM_DEFAULT_THREADER -m32 -DCOMPILER_GCC
-CPPFLAGS += -Wno-non-virtual-dtor -Wno-overloaded-virtual -fno-threadsafe-statics -fno-exceptions -fno-rtti
-
-################################################
-### DO NOT EDIT BELOW HERE FOR MOST PROJECTS ###
-################################################
-
-ifeq "$(DEBUG)" "true"
-	BIN_DIR = Debug.$(ENGINE)
-	CFLAGS += $(C_DEBUG_FLAGS)
-else
-	BIN_DIR = Release.$(ENGINE)
-	CFLAGS += $(C_OPT_FLAGS)
-endif
-
-GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
-ifeq "$(GCC_VERSION)" "4"
-	CFLAGS += $(C_GCC4_FLAGS)
-	CPPFLAGS += $(CPP_GCC4_FLAGS)
-endif
-
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
-OBJ_LINUX := $(OBJ_LINUX:%.c=$(BIN_DIR)/%.o)
-
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-
-$(BIN_DIR)/%.o: %.c
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
-
-all: check
-	mkdir -p $(BIN_DIR)
-	ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX)
-	ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX)
-	$(MAKE) -f Makefile sourcemod
-
-check:
-	if [ "$(ENGSET)" = "false" ]; then \
-		echo "You must supply one of the following values for ENGINE:"; \
-		echo "csgo, left4dead2, left4dead, orangeboxvalve, css, orangebox, or original"; \
-		exit 1; \
-	fi
-
-sourcemod: check $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(OBJ_LINUX) $(LINK) -m32 -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
-
-debug:
-	$(MAKE) -f Makefile all DEBUG=true
-
-default: all
-
-clean: check
-	rm -rf $(BIN_DIR)/*.o
-	rm -rf $(BIN_DIR)/$(BINARY)

core/MenuManager.cpp

@@ -38,8 +38,6 @@
 #include "sourcemm_api.h"
 #include "PlayerManager.h"
 #include "MenuStyle_Valve.h"
-#include "ShareSys.h"
-#include "HandleSys.h"
 #include "sourcemm_api.h"
 #include "logic_bridge.h"
 
@@ -56,24 +54,24 @@ MenuManager::MenuManager()
 
 void MenuManager::OnSourceModAllInitialized()
 {
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 
 	HandleAccess access;
-	g_HandleSys.InitAccessDefaults(NULL, &access);
+	handlesys->InitAccessDefaults(NULL, &access);
 
 	/* Deny cloning to menus */
 	access.access[HandleAccess_Clone] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_MenuType = g_HandleSys.CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_MenuType = handlesys->CreateType("IBaseMenu", this, 0, NULL, &access, g_pCoreIdent, NULL);
 
 	/* Also deny deletion to styles */
 	access.access[HandleAccess_Delete] = HANDLE_RESTRICT_OWNER|HANDLE_RESTRICT_IDENTITY;
-	m_StyleType = g_HandleSys.CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
+	m_StyleType = handlesys->CreateType("IMenuStyle", this, 0, NULL, &access, g_pCoreIdent, NULL);
 }
 
 void MenuManager::OnSourceModAllShutdown()
 {
-	g_HandleSys.RemoveType(m_MenuType, g_pCoreIdent);
-	g_HandleSys.RemoveType(m_StyleType, g_pCoreIdent);
+	handlesys->RemoveType(m_MenuType, g_pCoreIdent);
+	handlesys->RemoveType(m_StyleType, g_pCoreIdent);
 }
 
 void MenuManager::OnHandleDestroy(HandleType_t type, void *object)
@@ -112,7 +110,7 @@ Handle_t MenuManager::CreateMenuHandle(IBaseMenu *menu, IdentityToken_t *pOwner)
 		return BAD_HANDLE;
 	}
 
-	return g_HandleSys.CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(m_MenuType, menu, pOwner, g_pCoreIdent, NULL);
 }
 
 Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
@@ -122,7 +120,7 @@ Handle_t MenuManager::CreateStyleHandle(IMenuStyle *style)
 		return BAD_HANDLE;
 	}
 
-	return g_HandleSys.CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
+	return handlesys->CreateHandle(m_StyleType, style, g_pCoreIdent, g_pCoreIdent, NULL);
 }
 
 HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
@@ -132,7 +130,7 @@ HandleError MenuManager::ReadMenuHandle(Handle_t handle, IBaseMenu **menu)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = NULL;
 
-	return g_HandleSys.ReadHandle(handle, m_MenuType, &sec, (void **)menu);
+	return handlesys->ReadHandle(handle, m_MenuType, &sec, (void **)menu);
 }
 
 HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
@@ -142,7 +140,7 @@ HandleError MenuManager::ReadStyleHandle(Handle_t handle, IMenuStyle **style)
 	sec.pIdentity = g_pCoreIdent;
 	sec.pOwner = g_pCoreIdent;
 
-	return g_HandleSys.ReadHandle(handle, m_StyleType, &sec, (void **)style);
+	return handlesys->ReadHandle(handle, m_StyleType, &sec, (void **)style);
 }
 
 bool MenuManager::SetDefaultStyle(IMenuStyle *style)
@@ -310,7 +308,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) != NULL)
+		if (menu->GetItemInfo(i, &dr, client) != NULL)
 		{
 			/* Ask the user to change the style, if necessary */
 			mh->OnMenuDrawItem(menu, client, i, dr.style);
@@ -400,7 +398,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 			}
 			while (++lastItem < totalItems)
 			{
-				if (menu->GetItemInfo(lastItem, &dr) != NULL)
+				if (menu->GetItemInfo(lastItem, &dr, client) != NULL)
 				{
 					mh->OnMenuDrawItem(menu, client, lastItem, dr.style);
 					if (IsSlotItem(panel, dr.style))
@@ -422,7 +420,7 @@ IMenuPanel *MenuManager::RenderMenu(int client, menu_states_t &md, ItemOrder ord
 			lastItem--;
 			while (lastItem != 0)
 			{
-				if (menu->GetItemInfo(lastItem, &dr) != NULL)
+				if (menu->GetItemInfo(lastItem, &dr, client) != NULL)
 				{
 					mh->OnMenuDrawItem(menu, client, lastItem, dr.style);
 					if (IsSlotItem(panel, dr.style))
@@ -448,7 +446,7 @@ skip_search:
 		char text[50];
 		if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "No Vote", &client))
 		{
-			UTIL_Format(text, sizeof(text), "No Vote");
+			ke::SafeStrcpy(text, sizeof(text), "No Vote");
 		}
 		ItemDrawInfo dr(text, 0);
 		position = panel->DrawItem(dr);
@@ -572,7 +570,7 @@ skip_search:
 			/* If there are no control options,
 			 * Instead just pad with invisible slots.
 			 */
-			if (!displayPrev && !displayPrev)
+			if (!displayNext && !displayPrev)
 			{
 				padItem.style = ITEMDRAW_NOTEXT;
 			}
@@ -608,7 +606,7 @@ skip_search:
 					{
 						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Back", &client))
 						{
-							UTIL_Format(text, sizeof(text), "Back");
+							ke::SafeStrcpy(text, sizeof(text), "Back");
 						}
 						dr.style = ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
@@ -618,7 +616,7 @@ skip_search:
 					{
 						if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Previous", &client))
 						{
-							UTIL_Format(text, sizeof(text), "Previous");
+							ke::SafeStrcpy(text, sizeof(text), "Previous");
 						}
 						dr.style = (displayPrev ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 						position = panel->DrawItem(dr);
@@ -639,7 +637,7 @@ skip_search:
 				{
 					if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Next", &client))
 					{
-						UTIL_Format(text, sizeof(text), "Next");
+						ke::SafeStrcpy(text, sizeof(text), "Next");
 					}
 					dr.style = (displayNext ? 0 : ITEMDRAW_DISABLED)|ITEMDRAW_CONTROL;
 					position = panel->DrawItem(dr);
@@ -670,7 +668,7 @@ skip_search:
 		{
 			if (!logicore.CoreTranslate(text, sizeof(text), "%T", 2, NULL, "Exit", &client))
 			{
-				UTIL_Format(text, sizeof(text), "Exit");
+				ke::SafeStrcpy(text, sizeof(text), "Exit");
 			}
 			dr.style = ITEMDRAW_CONTROL;
 			position = panel->DrawItem(dr);

core/MenuManager.h

@@ -37,7 +37,6 @@
 #include <sh_stack.h>
 #include <sh_list.h>
 #include <sh_string.h>
-#include "sm_memtable.h"
 #include "sm_globals.h"
 
 using namespace SourceMod;

core/MenuStyle_Base.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -34,11 +34,12 @@
 #include "MenuStyle_Base.h"
 #include "PlayerManager.h"
 #include "MenuManager.h"
-#include "HandleSys.h"
 #include "CellRecipientFilter.h"
 #if defined MENU_DEBUG
 #include "Logger.h"
 #endif
+#include "logic_bridge.h"
+#include "AutoHandleRooter.h"
 
 BaseMenuStyle::BaseMenuStyle() : m_WatchList(256), m_hHandle(BAD_HANDLE)
 {
@@ -337,7 +338,8 @@ void BaseMenuStyle::ClientPressedKey(int client, unsigned int key_press)
 #endif
 							0, 
 							PITCH_NORM, 
-#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_ORANGEBOXVALVE
+#if SOURCE_ENGINE == SE_CSS || SOURCE_ENGINE == SE_HL2DM || SOURCE_ENGINE == SE_DODS \
+	|| SOURCE_ENGINE == SE_SDK2013 || SOURCE_ENGINE == SE_BMS || SOURCE_ENGINE == SE_TF2
 							0,
 #endif
 							&pos);
@@ -603,7 +605,7 @@ bool BaseMenuStyle::RedoClientMenu(int client, ItemOrder order)
 }
 
 CBaseMenu::CBaseMenu(IMenuHandler *pHandler, IMenuStyle *pStyle, IdentityToken_t *pOwner) : 
-m_pStyle(pStyle), m_Strings(512), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false), 
+m_pStyle(pStyle), m_Pagination(7), m_bShouldDelete(false), m_bCancelling(false), 
 m_pOwner(pOwner ? pOwner : g_pCoreIdent), m_bDeleting(false), m_bWillFreeHandle(false), 
 m_hHandle(BAD_HANDLE), m_pHandler(pHandler), m_nFlags(MENUFLAG_BUTTON_EXIT)
 {
@@ -626,94 +628,135 @@ Handle_t CBaseMenu::GetHandle()
 bool CBaseMenu::AppendItem(const char *info, const ItemDrawInfo &draw)
 {
 	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
-		&& m_items.size() >= m_pStyle->GetMaxPageItems())
+		&& m_items.length() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}
 
-	CItem item;
+	CItem item(m_items.length());
 
-	item.infoString = m_Strings.AddString(info);
+	item.info = info;
 	if (draw.display)
-	{
-		item.displayString = m_Strings.AddString(draw.display);
-	}
+		item.display = new ke::AString(draw.display);
 	item.style = draw.style;
 
-	m_items.push_back(item);
-
+	m_items.append(ke::Move(item));
 	return true;
 }
 
 bool CBaseMenu::InsertItem(unsigned int position, const char *info, const ItemDrawInfo &draw)
 {
-	if (m_Pagination == (unsigned)MENU_NO_PAGINATION
-		&& m_items.size() >= m_pStyle->GetMaxPageItems())
+	if (m_Pagination == (unsigned)MENU_NO_PAGINATION &&
+	    m_items.length() >= m_pStyle->GetMaxPageItems())
 	{
 		return false;
 	}
 
-	if (position >= m_items.size())
-	{
+	if (position >= m_items.length())
 		return false;
-	}
 
-	CItem item;
-	item.infoString = m_Strings.AddString(info);
+	CItem item(position);
+	item.info = info;
 	if (draw.display)
-	{
-		item.displayString = m_Strings.AddString(draw.display);
-	}
+		item.display = new ke::AString(draw.display);
 	item.style = draw.style;
 
-	CVector<CItem>::iterator iter = m_items.iterAt(position);
-	m_items.insert(iter, item);
-
+	m_items.insert(position, ke::Move(item));
 	return true;
 }
 
 bool CBaseMenu::RemoveItem(unsigned int position)
 {
-	if (position >= m_items.size())
-	{
+	if (position >= m_items.length())
 		return false;
-	}
-
-	m_items.erase(m_items.iterAt(position));
-
-	if (m_items.size() == 0)
-	{
-		m_Strings.Reset();
-	}
 
+	m_items.remove(position);
 	return true;
 }
 
 void CBaseMenu::RemoveAllItems()
 {
 	m_items.clear();
-	m_Strings.Reset();
 }
 
-const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =NULL */)
+const char *CBaseMenu::GetItemInfo(unsigned int position, ItemDrawInfo *draw/* =NULL */, int client/* =0 */)
 {
-	if (position >= m_items.size())
-	{
+	if (position >= m_items.length())
 		return NULL;
+
+	if (client > 0 && position < m_RandomMaps[client].length())
+	{
+		position = m_RandomMaps[client][position];
 	}
 
 	if (draw)
 	{
-		draw->display = m_Strings.GetString(m_items[position].displayString);
+		draw->display = m_items[position].display->chars();
 		draw->style = m_items[position].style;
 	}
 
-	return m_Strings.GetString(m_items[position].infoString);
+	return m_items[position].info.chars();
+}
+
+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;
 }
 
 unsigned int CBaseMenu::GetItemCount()
 {
-	return m_items.size();
+	return m_items.length();
 }
 
 bool CBaseMenu::SetPagination(unsigned int itemsPerPage)
@@ -746,12 +789,12 @@ IMenuStyle *CBaseMenu::GetDrawStyle()
 
 void CBaseMenu::SetDefaultTitle(const char *message)
 {
-	m_Title.assign(message);
+	m_Title = message;
 }
 
 const char *CBaseMenu::GetDefaultTitle()
 {
-	return m_Title.c_str();
+	return m_Title.chars();
 }
 
 void CBaseMenu::Cancel()
@@ -818,7 +861,7 @@ void CBaseMenu::InternalDelete()
 
 		m_hHandle = BAD_HANDLE;
 		m_bDeleting = true;
-		g_HandleSys.FreeHandle(hndl, &sec);
+		handlesys->FreeHandle(hndl, &sec);
 	}
 
 	m_pHandler->OnMenuDestroy(this);
@@ -843,7 +886,5 @@ IMenuHandler *CBaseMenu::GetHandler()
 
 unsigned int CBaseMenu::GetBaseMemUsage()
 {
-	return m_Title.size() 
-		+ m_Strings.GetMemTable()->GetMemUsage()
-		+ (m_items.size() * sizeof(CItem));
+	return m_Title.length() + (m_items.length() * sizeof(CItem));
 }

core/MenuStyle_Base.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -34,29 +34,50 @@
 
 #include <IMenuManager.h>
 #include <IPlayerHelpers.h>
-#include <sh_string.h>
-#include <sh_vector.h>
-#include "sm_memtable.h"
+#include <am-autoptr.h>
+#include <am-string.h>
+#include <am-vector.h>
 #include "sm_fastlink.h"
 
 using namespace SourceMod;
-using namespace SourceHook;
 
 class CItem
 {
 public:
-	CItem()
+	CItem(unsigned int index)
 	{
-		infoString = -1;
-		displayString = -1;
+		this->index = index;
 		style = 0;
 		access = 0;
 	}
+	CItem(CItem &&other)
+	: info(ke::Move(other.info)),
+	  display(ke::Move(other.display))
+	{
+		index = other.index;
+		style = other.style;
+		access = other.access;
+	}
+	CItem & operator =(CItem &&other)
+	{
+		index = other.index;
+		info = ke::Move(other.info);
+		display = ke::Move(other.display);
+		style = other.style;
+		access = other.access;
+		return *this;
+	}
+
 public:
-	int infoString;
-	int displayString;
+	unsigned int index;
+	ke::AString info;
+	ke::AutoPtr<ke::AString> display;
 	unsigned int style;
 	unsigned int access;
+
+private:
+	CItem(const CItem &other) = delete;
+	CItem &operator =(const CItem &other) = delete;
 };
 
 class CBaseMenuPlayer
@@ -121,7 +142,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);
+	virtual const char *GetItemInfo(unsigned int position, ItemDrawInfo *draw=NULL, int client=0);
 	virtual unsigned int GetItemCount();
 	virtual bool SetPagination(unsigned int itemsPerPage);
 	virtual unsigned int GetPagination();
@@ -135,15 +156,18 @@ 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:
-	String m_Title;
+	ke::AString m_Title;
 	IMenuStyle *m_pStyle;
-	BaseStringTable m_Strings;
 	unsigned int m_Pagination;
-	CVector<CItem> m_items;
+	ke::Vector<CItem> m_items;
 	bool m_bShouldDelete;
 	bool m_bCancelling;
 	IdentityToken_t *m_pOwner;
@@ -152,6 +176,7 @@ protected:
 	Handle_t m_hHandle;
 	IMenuHandler *m_pHandler;
 	unsigned int m_nFlags;
+	ke::Vector<uint8_t> m_RandomMaps[SM_MAXPLAYERS+1];
 };
 
 #endif //_INCLUDE_MENUSTYLE_BASE_H

core/MenuStyle_Radio.cpp

@@ -83,6 +83,10 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 	}
 
 	g_bRadioInit = true;
+
+	// Always register the style. Use IsSupported() to check for validity before use.
+	g_Menus.AddStyle(this);
+
 	const char *msg = g_pGameConf->GetKeyValue("HudRadioMenuMsg");
 	if (!msg || msg[0] == '\0')
 	{
@@ -118,7 +122,6 @@ void CRadioStyle::OnSourceModLevelChange(const char *mapName)
 		}
 	}
 
-	g_Menus.AddStyle(this);
 	g_Menus.SetDefaultStyle(this);
 
 	g_UserMsgs.HookUserMessage(g_ShowMenuId, this, false);
@@ -171,7 +174,7 @@ void CRadioStyle::OnUserMessage(int msg_id, bf_write *bf, IRecipientFilter *pFil
 {
 	int count = pFilter->GetRecipientCount();
 
-#ifdef USE_PROTOBUF_USERMESSAGES
+#if SOURCE_ENGINE == SE_CSGO
 	int c = ((CCSUsrMsg_ShowMenu &)msg).display_time();
 #else
 	bf_read br(bf->GetBasePointer(), 3);
@@ -255,15 +258,6 @@ CRadioDisplay *CRadioStyle::MakeRadioDisplay(CRadioMenu *menu)
 	return display;
 }
 
-IMenuPanel *CRadioStyle::MakeRadioDisplay(const char *str, int keys)
-{
-	CRadioDisplay *pPanel = MakeRadioDisplay(NULL);
-
-	pPanel->DirectSet(str, keys);
-
-	return pPanel;
-}
-
 void CRadioStyle::FreeRadioDisplay(CRadioDisplay *display)
 {
 	m_FreeDisplays.push(display);
@@ -330,11 +324,12 @@ void CRadioDisplay::Reset()
 	keys = 0;
 }
 
-void CRadioDisplay::DirectSet(const char *str, int keymap)
+bool CRadioDisplay::DirectSet(const char *str)
 {
 	m_Title.clear();
 	m_BufferText.assign(str);
-	keys = keymap;
+	
+	return true;
 }
 
 unsigned int CRadioDisplay::GetCurrentKey()
@@ -455,7 +450,7 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 {
 	if (title[0] != '\0')
 	{
-		display_len = UTIL_Format(display_pkt, 
+		display_len = ke::SafeSprintf(display_pkt, 
 			sizeof(display_pkt), 
 			"%s\n%s", 
 			title,
@@ -463,9 +458,8 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 	}
 	else
 	{
-		display_len = UTIL_Format(display_pkt, 
+		display_len = ke::SafeStrcpy(display_pkt, 
 			sizeof(display_pkt), 
-			"%s", 
 			text);
 	}
 	display_keys = keys;
@@ -473,7 +467,7 @@ void CRadioMenuPlayer::Radio_Init(int keys, const char *title, const char *text)
 
 void CRadioMenuPlayer::Radio_Refresh()
 {
-	cell_t players[1] = {m_index};
+	cell_t players[1] = { (cell_t)m_index };
 	char *ptr = display_pkt;
 	char save = 0;
 	size_t len = display_len;
@@ -489,8 +483,7 @@ void CRadioMenuPlayer::Radio_Refresh()
 		time = menuHoldTime - (unsigned int)(gpGlobals->curtime - menuStartTime);
 	}
 
-#ifdef USE_PROTOBUF_USERMESSAGES
-	// If or when we need to support multiple games per engine with this, we can switch to reflection
+#if SOURCE_ENGINE == SE_CSGO
 	// TODO: find what happens past 240 on CS:GO
 	CCSUsrMsg_ShowMenu *msg = (CCSUsrMsg_ShowMenu *)g_UserMsgs.StartProtobufMessage(g_ShowMenuId, players, 1, USERMSG_BLOCKHOOKS);
 	msg->set_bits_valid_slots(display_keys);
@@ -593,6 +586,7 @@ bool CRadioMenu::DisplayAtItem(int client,
 		return false;
 	}
 
+	AutoHandleRooter ahr(this->GetHandle());
 	return g_RadioMenuStyle.DoClientMenu(client,
 		this,
 		start_item,

core/MenuStyle_Radio.h

@@ -41,6 +41,8 @@
 #include "sm_fastlink.h"
 #include <sh_stack.h>
 #include <compat_wrappers.h>
+#include "logic/common_logic.h"
+#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
@@ -101,7 +103,6 @@ public:
 	CRadioDisplay *MakeRadioDisplay(CRadioMenu *menu=NULL);
 	void FreeRadioDisplay(CRadioDisplay *display);
 	CRadioMenuPlayer *GetRadioMenuPlayer(int client);
-	IMenuPanel *MakeRadioDisplay(const char *str, int keys);
 private:
 	CRadioMenuPlayer *m_players;
 	CStack<CRadioDisplay *> m_FreeDisplays;
@@ -129,8 +130,7 @@ public: //IMenuPanel
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
-public:
-	void DirectSet(const char *str, int keymap);
+	bool DirectSet(const char *str);
 private:
 	String m_BufferText;
 	String m_Title;

core/MenuStyle_Valve.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -66,14 +66,14 @@ bool ValveMenuStyle::OnClientCommand(int client, const char *cmdname, const CCom
 void ValveMenuStyle::OnSourceModAllInitialized()
 {
 	g_Players.AddClientListener(this);
-	SH_ADD_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
+	SH_ADD_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
 	g_pSPHCC = SH_GET_CALLCLASS(serverpluginhelpers);
 }
 
 void ValveMenuStyle::OnSourceModShutdown()
 {
 	SH_RELEASE_CALLCLASS(g_pSPHCC);
-	SH_REMOVE_HOOK_MEMFUNC(IServerPluginHelpers, CreateMessage, serverpluginhelpers, this, &ValveMenuStyle::HookCreateMessage, false);
+	SH_REMOVE_HOOK(IServerPluginHelpers, CreateMessage, serverpluginhelpers, SH_MEMBER(this, &ValveMenuStyle::HookCreateMessage), false);
 	g_Players.RemoveClientListener(this);
 }
 
@@ -293,7 +293,7 @@ unsigned int CValveMenuDisplay::DrawItem(const ItemDrawInfo &item)
 	}
 
 	char buffer[255];
-	UTIL_Format(buffer, sizeof(buffer), "%d. %s", m_NextPos, item.display);
+	ke::SafeSprintf(buffer, sizeof(buffer), "%d. %s", m_NextPos, item.display);
 
 	KeyValues *ki = m_pKv->FindKey(g_OptionNumTable[m_NextPos], true);
 	ki->SetString("command", g_OptionCmdTable[m_NextPos]);
@@ -378,7 +378,7 @@ bool CValveMenu::SetExtOption(MenuOption option, const void *valuePtr)
 {
 	if (option == MenuOption_IntroMessage)
 	{
-		strncopy(m_IntroMsg, (const char *)valuePtr, sizeof(m_IntroMsg));
+		ke::SafeStrcpy(m_IntroMsg, sizeof(m_IntroMsg), (const char *)valuePtr);
 		return true;
 	} else if (option == MenuOption_IntroColor) {
 		unsigned int *array = (unsigned int *)valuePtr;
@@ -404,6 +404,7 @@ bool CValveMenu::DisplayAtItem(int client,
 		return false;
 	}
 
+	AutoHandleRooter ahr(this->GetHandle());
 	return g_ValveMenuStyle.DoClientMenu(client, this, start_item, alt_handler ? alt_handler : m_pHandler, time);
 }
 

core/MenuStyle_Valve.h

@@ -39,6 +39,8 @@
 #include "KeyValues.h"
 #include "sm_fastlink.h"
 #include <compat_wrappers.h>
+#include "logic/common_logic.h"
+#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
@@ -75,6 +77,7 @@ public: //IMenuStyle
 	IBaseMenu *CreateMenu(IMenuHandler *pHandler, IdentityToken_t *pOwner);
 	unsigned int GetMaxPageItems();
 	unsigned int GetApproxMemUsage();
+	bool IsSupported() { return true; }
 private:
 	void HookCreateMessage(edict_t *pEdict, DIALOG_TYPE type, KeyValues *kv, IServerPluginCallbacks *plugin);
 private:
@@ -105,6 +108,7 @@ public:
 	bool SetCurrentKey(unsigned int key);
 	int GetAmountRemaining();
 	unsigned int GetApproxMemUsage();
+	bool DirectSet(const char *str) { return false; }
 private:
 	KeyValues *m_pKv;
 	unsigned int m_NextPos;

core/MenuVoting.cpp

@@ -514,15 +514,16 @@ void VoteMenuHandler::OnMenuSelect(IBaseMenu *menu, int client, unsigned int ite
 	/* Check by our item count, NOT the vote array size */
 	if (item < m_Items)
 	{
-		m_ClientVotes[client] = item;
-		m_Votes[item]++;
+		unsigned int index = menu->GetRealItemIndex(client, item);
+		m_ClientVotes[client] = index;
+		m_Votes[index]++;
 		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);
+			menu->GetItemInfo(item, &dr, client);
 
 			if (sm_vote_console.GetBool())
 			{

core/NativeInvoker.cpp

@@ -1,379 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourcePawn
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#include "NativeInvoker.h"
-#include "ShareSys.h"
-
-NativeInterface g_NInvoke;
-
-NativeInvoker::NativeInvoker()
-{
-}
-
-NativeInvoker::~NativeInvoker()
-{
-}
-
-const char *NativeInterface::GetInterfaceName()
-{
-	return SMINTERFACE_NINVOKE_NAME;
-}
-
-unsigned int NativeInterface::GetInterfaceVersion()
-{
-	return SMINTERFACE_NINVOKE_VERSION;
-}
-
-void NativeInterface::OnSourceModAllInitialized()
-{
-	g_ShareSys.AddInterface(NULL, &g_NInvoke);
-}
-
-IPluginRuntime *NativeInterface::CreateRuntime(const char *name, size_t bytes)
-{
-	return g_pSourcePawn2->CreateEmptyRuntime(name, bytes);
-}
-
-INativeInvoker *NativeInterface::CreateInvoker()
-{
-	return new NativeInvoker();
-}
-
-bool NativeInvoker::Start(IPluginContext *pContext, const char *name)
-{
-	NativeEntry *entry;
-	
-	entry = g_ShareSys.FindNative(name);
-	if (entry == NULL)
-	{
-		return false;
-	}
-
-	native = NULL;
-	if (entry->replacement.owner != NULL)
-	{
-		native = entry->replacement.func;
-	}
-	else if (entry->owner != NULL)
-	{
-		native = entry->func;
-	}
-
-	if (native == NULL)
-	{
-		return false;
-	}
-
-	this->pContext = pContext;
-
-	m_curparam = 0;
-	m_errorstate = SP_ERROR_NONE;
-
-	return true;
-}
-
-cell_t NativeInvoker::PushCell(cell_t cell)
-{
-	if (m_curparam >= SP_MAX_EXEC_PARAMS)
-	{
-		return SetError(SP_ERROR_PARAMS_MAX);
-	}
-
-	m_info[m_curparam].marked = false;
-	m_params[m_curparam] = cell;
-	m_curparam++;
-
-	return SP_ERROR_NONE;
-}
-
-int NativeInvoker::PushCellByRef(cell_t *cell, int flags)
-{
-	return PushArray(cell, 1, flags);
-}
-
-int NativeInvoker::PushFloat(float number)
-{
-	cell_t val = *(cell_t *)&number;
-
-	return PushCell(val);
-}
-
-int NativeInvoker::PushFloatByRef(float *number, int flags)
-{
-	return PushCellByRef((cell_t *)number, flags);
-}
-
-int NativeInvoker::PushArray(cell_t *inarray, unsigned int cells, int copyback)
-{
-	if (m_curparam >= SP_MAX_EXEC_PARAMS)
-	{
-		return SetError(SP_ERROR_PARAMS_MAX);
-	}
-
-	ParamInfo *info = &m_info[m_curparam];
-
-	info->flags = inarray ? copyback : 0;
-	info->marked = true;
-	info->size = cells;
-	info->str.is_sz = false;
-	info->orig_addr = inarray;
-
-	m_curparam++;
-
-	return SP_ERROR_NONE;
-}
-
-int NativeInvoker::PushString(const char *string)
-{
-	return _PushString(string, SM_PARAM_STRING_COPY, 0, strlen(string)+1);
-}
-
-int NativeInvoker::PushStringEx(char *buffer, size_t length, int sz_flags, int cp_flags)
-{
-	return _PushString(buffer, sz_flags, cp_flags, length);
-}
-
-int NativeInvoker::_PushString(const char *string, int sz_flags, int cp_flags, size_t len)
-{
-	if (m_curparam >= SP_MAX_EXEC_PARAMS)
-	{
-		return SetError(SP_ERROR_PARAMS_MAX);
-	}
-
-	ParamInfo *info = &m_info[m_curparam];
-
-	info->marked = true;
-	info->orig_addr = (cell_t *)string;
-	info->flags = cp_flags;
-	info->size = len;
-	info->str.sz_flags = sz_flags;
-	info->str.is_sz = true;
-
-	m_curparam++;
-
-	return SP_ERROR_NONE;
-}
-
-void NativeInvoker::Cancel()
-{
-	if (pContext == NULL)
-	{
-		return;
-	}
-
-	m_errorstate = SP_ERROR_NONE;
-	m_curparam = 0;
-	pContext = NULL;
-	native = NULL;
-}
-
-int NativeInvoker::SetError(int err)
-{
-	m_errorstate = err;
-	return err;
-}
-
-int NativeInvoker::Invoke(cell_t *result)
-{
-	int err = SP_ERROR_NONE;
-
-	if (pContext == NULL)
-	{
-		return SP_ERROR_INVALID_NATIVE;
-	}
-
-	if (m_errorstate != SP_ERROR_NONE)
-	{
-		err = m_errorstate;
-		Cancel();
-		return err;
-	}
-
-	cell_t tresult;
-
-	if (result == NULL)
-	{
-		result = &tresult;
-	}
-
-	//This is for re-entrancy!
-	IPluginContext *ctx = pContext;
-	cell_t _temp_params[SP_MAX_EXEC_PARAMS + 1];
-	cell_t *temp_params = &_temp_params[1];
-	ParamInfo temp_info[SP_MAX_EXEC_PARAMS];
-	unsigned int numparams = m_curparam;
-	unsigned int i;
-	bool docopies = true;
-
-	if (numparams)
-	{
-		//Save the info locally, then reset it for re-entrant calls.
-		memcpy(temp_info, m_info, numparams * sizeof(ParamInfo));
-	}
-	m_curparam = 0;
-	pContext = NULL;
-
-	/* Initialize 0th parameter */
-	_temp_params[0] = numparams;
-
-	/* Browse the parameters and build arrays */
-	for (i = 0; i < numparams; i++)
-	{
-		/* Is this marked as an array? */
-		if (temp_info[i].marked)
-		{
-			if (!temp_info[i].str.is_sz)
-			{
-				/* Allocate a normal/generic array */
-				if ((err = ctx->HeapAlloc(temp_info[i].size, 
-										  &temp_info[i].local_addr,
-										  &temp_info[i].phys_addr))
-					!= SP_ERROR_NONE)
-				{
-					break;
-				}
-				if (temp_info[i].orig_addr)
-				{
-					memcpy(temp_info[i].phys_addr, temp_info[i].orig_addr, sizeof(cell_t) * temp_info[i].size);
-				}
-			}
-			else
-			{
-				/* Calculate cells required for the string */
-				size_t cells = (temp_info[i].size + sizeof(cell_t) - 1) / sizeof(cell_t);
-
-				/* Allocate the buffer */
-				if ((err = ctx->HeapAlloc(cells,
-										  &temp_info[i].local_addr,
-										  &temp_info[i].phys_addr))
-					!= SP_ERROR_NONE)
-				{
-					break;
-				}
-				/* Copy original string if necessary */
-				if ((temp_info[i].str.sz_flags & SM_PARAM_STRING_COPY) && (temp_info[i].orig_addr != NULL))
-				{
-					/* Cut off UTF-8 properly */
-					if (temp_info[i].str.sz_flags & SM_PARAM_STRING_UTF8)
-					{
-						if ((err = ctx->StringToLocalUTF8(temp_info[i].local_addr, 
-														  temp_info[i].size, 
-														  (const char *)temp_info[i].orig_addr,
-														  NULL))
-							!= SP_ERROR_NONE)
-						{
-							break;
-						}
-					}
-					/* Copy a binary blob */
-					else if (temp_info[i].str.sz_flags & SM_PARAM_STRING_BINARY)
-					{
-						memmove(temp_info[i].phys_addr, temp_info[i].orig_addr, temp_info[i].size);
-					}
-					/* Copy ASCII characters */
-					else
-					{
-						if ((err = ctx->StringToLocal(temp_info[i].local_addr,
-													  temp_info[i].size,
-													  (const char *)temp_info[i].orig_addr))
-							!= SP_ERROR_NONE)
-						{
-							break;
-						}
-					}
-				}
-			} /* End array/string calculation */
-			/* Update the pushed parameter with the byref local address */
-			temp_params[i] = temp_info[i].local_addr;
-		}
-		else
-		{
-			/* Just copy the value normally */
-			temp_params[i] = m_params[i];
-		}
-	}
-
-	/* Make the call if we can */
-	if (err == SP_ERROR_NONE)
-	{
-		*result = native(ctx, _temp_params);
-		if (ctx->GetLastNativeError() != SP_ERROR_NONE)
-		{
-			docopies = false;
-			ctx->ClearLastNativeError();
-		}
-	}
-	else
-	{
-		docopies = false;
-	}
-
-	/* i should be equal to the last valid parameter + 1 */
-	while (i--)
-	{
-		if (!temp_info[i].marked)
-		{
-			continue;
-		}
-
-		if (docopies && (temp_info[i].flags & SM_PARAM_COPYBACK))
-		{
-			if (temp_info[i].orig_addr)
-			{
-				if (temp_info[i].str.is_sz)
-				{
-					memcpy(temp_info[i].orig_addr, temp_info[i].phys_addr, temp_info[i].size);
-
-				}
-				else
-				{
-					if (temp_info[i].size == 1)
-					{
-						*temp_info[i].orig_addr = *(temp_info[i].phys_addr);
-					}
-					else
-					{
-						memcpy(temp_info[i].orig_addr, 
-							temp_info[i].phys_addr, 
-							temp_info[i].size * sizeof(cell_t));
-					}
-				}
-			}
-		}
-
-		if ((err = ctx->HeapPop(temp_info[i].local_addr)) != SP_ERROR_NONE)
-		{
-			return err;
-		}
-	}
-
-	return err;
-}

core/NativeInvoker.h

@@ -1,98 +0,0 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-2009 AlliedModders LLC.  All rights reserved.
- * =============================================================================
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 3.0, as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, AlliedModders LLC gives you permission to link the
- * code of this program (as well as its derivative works) to "Half-Life 2," the
- * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
- * by the Valve Corporation.  You must obey the GNU General Public License in
- * all respects for all other code used.  Additionally, AlliedModders LLC grants
- * this exception to all derivative works.  AlliedModders LLC defines further
- * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
- * or <http://www.sourcemod.net/license.php>.
- *
- * Version: $Id$
- */
-
-#ifndef _INCLUDE_SOURCEMOD_NATIVE_INVOKER_H_
-#define _INCLUDE_SOURCEMOD_NATIVE_INVOKER_H_
-
-#include "sm_globals.h"
-#include <INativeInvoker.h>
-
-struct ParamInfo
-{
-	int flags;			/* Copy-back flags */
-	bool marked;		/* Whether this is marked as being used */
-	cell_t local_addr;	/* Local address to free */
-	cell_t *phys_addr;	/* Physical address of our copy */
-	cell_t *orig_addr;	/* Original address to copy back to */
-	ucell_t size;		/* Size of array in bytes */
-	struct
-	{
-		bool is_sz;		/* is a string */
-		int sz_flags;	/* has sz flags */
-	} str;
-};
-
-class NativeInvoker : public INativeInvoker
-{
-public:
-	NativeInvoker();
-	~NativeInvoker();
-public: /* ICallable */
-	int PushCell(cell_t cell);
-	int PushCellByRef(cell_t *cell, int flags=SM_PARAM_COPYBACK);
-	int PushFloat(float number);
-	int PushFloatByRef(float *number, int flags=SM_PARAM_COPYBACK);
-	int PushArray(cell_t *inarray, unsigned int cells, int flags=0);
-	int PushString(const char *string);
-	int PushStringEx(char *buffer, size_t length, int sz_flags, int cp_flags);
-	void Cancel();
-public: /* INativeInvoker */
-	bool Start(IPluginContext *pContext, const char *name);
-	int Invoke(cell_t *result);
-private:
-	int _PushString(const char *string, int sz_flags, int cp_flags, size_t len);
-	int SetError(int err);
-private:
-	IPluginContext *pContext;
-	SPVM_NATIVE_FUNC native;
-	cell_t m_params[SP_MAX_EXEC_PARAMS];
-	ParamInfo m_info[SP_MAX_EXEC_PARAMS];
-	unsigned int m_curparam;
-	int m_errorstate;
-};
-
-class NativeInterface : 
-	public INativeInterface,
-	public SMGlobalClass
-{
-public: /* SMGlobalClass */
-	void OnSourceModAllInitialized();
-public: /* SMInterface */
-	unsigned int GetInterfaceVersion();
-	const char *GetInterfaceName();
-public: /* INativeInvoker */
-	IPluginRuntime *CreateRuntime(const char *name, size_t bytes);
-	INativeInvoker *CreateInvoker();
-};
-
-extern NativeInterface g_NInvoke;
-
-#endif /* _INCLUDE_SOURCEMOD_NATIVE_INVOKER_H_ */

core/NativeOwner.cpp

@@ -1,144 +0,0 @@
-#include "NativeOwner.h"
-#include "ShareSys.h"
-#include "PluginSys.h"
-
-CNativeOwner::CNativeOwner() : m_nMarkSerial(0)
-{
-}
-
-void CNativeOwner::SetMarkSerial(unsigned int serial)
-{
-	m_nMarkSerial = serial;
-}
-
-unsigned int CNativeOwner::GetMarkSerial()
-{
-	return m_nMarkSerial;
-}
-
-void CNativeOwner::AddDependent(CPlugin *pPlugin)
-{
-	m_Dependents.push_back(pPlugin);
-}
-
-void CNativeOwner::AddWeakRef(const WeakNative & ref)
-{
-	m_WeakRefs.push_back(ref);
-}
-
-void CNativeOwner::AddNatives(const sp_nativeinfo_t *natives)
-{
-	NativeEntry *pEntry;
-
-	for (unsigned int i = 0; natives[i].func != NULL && natives[i].name != NULL; i++)
-	{
-		if ((pEntry = g_ShareSys.AddNativeToCache(this, &natives[i])) == NULL)
-		{
-			continue;
-		}
-
-		m_Natives.push_back(pEntry);
-	}
-}
-
-void CNativeOwner::PropogateMarkSerial(unsigned int serial)
-{
-	CNativeOwner *pOwner;
-	List<CPlugin *>::iterator iter;
-
-	for (iter = m_Dependents.begin();
-		 iter != m_Dependents.end();
-		 iter++)
-	{
-		pOwner = (*iter);
-		pOwner->SetMarkSerial(serial);
-	}
-}
-
-void CNativeOwner::UnbindWeakRef(const WeakNative & ref)
-{
-	sp_native_t *native;
-	IPluginContext *pContext;
-
-	pContext = ref.pl->GetBaseContext();
-	if ((pContext->GetNativeByIndex(ref.idx, &native)) == SP_ERROR_NONE)
-	{
-		/* If there is no reference, the native must be unbound */
-		if (ref.entry == NULL)
-		{
-			native->status = SP_NATIVE_UNBOUND;
-			native->pfn = NULL;
-		}
-		/* If we've cached a reference, it's a core native we can 
-		 * rebind back to its original (this was a replacement).
-		 */
-		else
-		{
-			native->pfn = ref.entry->func;
-		}
-	}
-}
-
-void CNativeOwner::DropEverything()
-{
-	NativeEntry *pEntry;
-	List<WeakNative>::iterator iter;
-	List<NativeEntry *>::iterator ntv_iter;
-
-	/* Unbind and remove all weak references to us */
-	iter = m_WeakRefs.begin();
-	while (iter != m_WeakRefs.end())
-	{
-		UnbindWeakRef((*iter));
-		iter = m_WeakRefs.erase(iter);
-	}
-
-	/* Unmark our replacement natives */
-	ntv_iter = m_ReplacedNatives.begin();
-	while (ntv_iter != m_ReplacedNatives.end())
-	{
-		pEntry = (*ntv_iter);
-		pEntry->replacement.func = NULL;
-		pEntry->replacement.owner = NULL;
-		ntv_iter = m_ReplacedNatives.erase(ntv_iter);
-	}
-
-	/* Strip all of our natives from the cache */
-	ntv_iter = m_Natives.begin();
-	while (ntv_iter != m_Natives.end())
-	{
-		g_ShareSys.ClearNativeFromCache(this, (*ntv_iter)->name);
-		ntv_iter = m_Natives.erase(ntv_iter);
-	}
-}
-
-void CNativeOwner::DropWeakRefsTo(CPlugin *pPlugin)
-{
-	List<WeakNative>::iterator iter;
-
-	iter = m_WeakRefs.begin();
-	while (iter != m_WeakRefs.end())
-	{
-		WeakNative & ref = (*iter);
-
-		if (ref.pl == pPlugin)
-		{
-			iter = m_WeakRefs.erase(iter);
-		}
-		else
-		{
-			iter++;
-		}
-	}
-}
-
-void CNativeOwner::DropRefsTo(CPlugin *pPlugin)
-{
-	m_Dependents.remove(pPlugin);
-	DropWeakRefsTo(pPlugin);
-}
-
-void CNativeOwner::AddReplacedNative(NativeEntry *pEntry)
-{
-	m_ReplacedNatives.push_back(pEntry);
-}

core/NativeOwner.h

@@ -1,59 +0,0 @@
-#ifndef _INCLUDE_SOURCEMOD_NATIVE_OWNER_H_
-#define _INCLUDE_SOURCEMOD_NATIVE_OWNER_H_
-
-#include <sp_vm_types.h>
-#include <sh_list.h>
-
-class CPlugin;
-struct NativeEntry;
-
-struct WeakNative
-{
-	WeakNative(CPlugin *plugin, uint32_t index) : 
-		pl(plugin), idx(index), entry(NULL)
-	{
-		pl = plugin;
-		idx = index;
-	}
-	WeakNative(CPlugin *plugin, uint32_t index, NativeEntry *pEntry) : 
-		pl(plugin), idx(index), entry(pEntry)
-	{
-		pl = plugin;
-		idx = index;
-	}
-	CPlugin *pl;
-	uint32_t idx;
-	NativeEntry *entry;
-};
-
-using namespace SourceHook;
-
-class CNativeOwner
-{
-public:
-	CNativeOwner();
-public:
-	virtual void DropEverything();
-public:
-	void AddNatives(const sp_nativeinfo_t *info);
-public:
-	void SetMarkSerial(unsigned int serial);
-	unsigned int GetMarkSerial();
-	void PropogateMarkSerial(unsigned int serial);
-public:
-	void AddDependent(CPlugin *pPlugin);
-	void AddWeakRef(const WeakNative & ref);
-	void DropRefsTo(CPlugin *pPlugin);
-	void AddReplacedNative(NativeEntry *pEntry);
-private:
-	void DropWeakRefsTo(CPlugin *pPlugin);
-	void UnbindWeakRef(const WeakNative & ref);
-protected:
-	List<CPlugin *> m_Dependents;
-	unsigned int m_nMarkSerial;
-	List<WeakNative> m_WeakRefs;
-	List<NativeEntry *> m_Natives;
-	List<NativeEntry *> m_ReplacedNatives;
-};
-
-#endif //_INCLUDE_SOURCEMOD_NATIVE_OWNER_H_

core/NextMap.cpp

@@ -31,10 +31,14 @@
 
 #include "NextMap.h"
 #include "Logger.h"
+#include "HalfLife2.h"
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "sourcehook.h"
-#include "sm_srvcmds.h"
+#include "logic_bridge.h"
+#include "compat_wrappers.h"
+#include <time.h>
+#include <bridge/include/ILogger.h>
 
 NextMapManager g_NextMap;
 
@@ -46,20 +50,14 @@ SH_DECL_HOOK4_void(IVEngineServer, ChangeLevel, SH_NOATTRIB, 0, const char *, co
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 SH_DECL_EXTERN1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
-#elif SOURCE_ENGINE == SE_DARKMESSIAH
-SH_DECL_EXTERN0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
 #else
-# if SH_IMPL_VERSION >= 4
- extern int __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-# else
- extern bool __SourceHook_FHAddConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
-#endif
-extern bool __SourceHook_FHRemoveConCommandDispatch(void *,bool,class fastdelegate::FastDelegate0<void>);
+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;
 
@@ -68,13 +66,13 @@ void NextMapManager::OnSourceModAllInitialized_Post()
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
 #else
-	SH_ADD_HOOK_MEMFUNC(IVEngineServer, ChangeLevel, engine, this, &NextMapManager::HookChangeLevel, false);
+	SH_ADD_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
 #endif
 
 	ConCommand *pCmd = FindCommand("changelevel");
 	if (pCmd != NULL)
 	{
-		SH_ADD_HOOK_STATICFUNC(ConCommand, Dispatch, pCmd, CmdChangeLevelCallback, false);
+		SH_ADD_HOOK(ConCommand, Dispatch, pCmd, SH_STATIC(CmdChangeLevelCallback), false);
 		changeLevelCmd = pCmd;
 	}
 }
@@ -84,12 +82,12 @@ void NextMapManager::OnSourceModShutdown()
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
 #else
-	SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, ChangeLevel, engine, this, &NextMapManager::HookChangeLevel, false);
+	SH_REMOVE_HOOK(IVEngineServer, ChangeLevel, engine, SH_MEMBER(this, &NextMapManager::HookChangeLevel), false);
 #endif
 
 	if (changeLevelCmd != NULL)
 	{
-		SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, changeLevelCmd, CmdChangeLevelCallback, false);
+		SH_REMOVE_HOOK(ConCommand, Dispatch, changeLevelCmd, SH_STATIC(CmdChangeLevelCallback), false);
 	}
 
 	SourceHook::List<MapChangeData *>::iterator iter;
@@ -109,7 +107,7 @@ const char *NextMapManager::GetNextMap()
 
 bool NextMapManager::SetNextMap(const char *map)
 {
-	if (!engine->IsMapValid(map))
+	if (!g_HL2.IsMapValid(map))
 	{
 		return false;
 	}
@@ -127,21 +125,21 @@ void NextMapManager::HookChangeLevel(const char *map, const char *unknown, const
 {
 	if (g_forcedChange)
 	{
-		g_Logger.LogMessage("[SM] Changed map to \"%s\"", map);
+		logger->LogMessage("[SM] Changed map to \"%s\"", map);
 		RETURN_META(MRES_IGNORED);
 	}
 
 	const char *newmap = sm_nextmap.GetString();
 
-	if (newmap[0] == 0 || !engine->IsMapValid(newmap))
+	if (newmap[0] == 0 || !g_HL2.IsMapValid(newmap))
 	{
 		RETURN_META(MRES_IGNORED);
 	}
 
-	g_Logger.LogMessage("[SM] Changed map to \"%s\"", newmap);
+	logger->LogMessage("[SM] Changed map to \"%s\"", newmap);
 
-	UTIL_Format(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), newmap);
-	UTIL_Format(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), "Normal level change");
+	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));
@@ -164,33 +162,36 @@ void NextMapManager::OnSourceModLevelChange( const char *mapName )
 		{
 			/* Something intercepted the mapchange */
 			char newReason[255];
-			UTIL_Format(newReason, sizeof(newReason), "%s (Map overridden)", m_tempChangeInfo.m_changeReason);
+			ke::SafeSprintf(newReason, sizeof(newReason), "%s (Map overridden)", m_tempChangeInfo.m_changeReason);
 			m_mapHistory.push_back(new MapChangeData(lastMap, newReason, m_tempChangeInfo.startTime));
 		}
 
-		/* TODO: Should this be customizable? */
-		if (m_mapHistory.size() > 20)
+		int historydiff = sm_maphistory_size.GetInt();
+		if (historydiff > 0)
 		{
-			SourceHook::List<MapChangeData *>::iterator iter;
-			iter = m_mapHistory.begin();
+			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_mapHistory.erase(iter);
 		}
 	}
 
 	m_tempChangeInfo.m_mapName[0] ='\0';
 	m_tempChangeInfo.m_changeReason[0] = '\0';
 	m_tempChangeInfo.startTime = time(NULL);
-	UTIL_Format(lastMap, sizeof(lastMap), mapName);
+	ke::SafeStrcpy(lastMap, sizeof(lastMap), mapName);
 }
 
 void NextMapManager::ForceChangeLevel( const char *mapName, const char* changeReason )
 {
 	/* Store the mapname and reason */
-	UTIL_Format(m_tempChangeInfo.m_mapName, sizeof(m_tempChangeInfo.m_mapName), mapName);
-	UTIL_Format(m_tempChangeInfo.m_changeReason, sizeof(m_tempChangeInfo.m_changeReason), changeReason);
+	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;
@@ -220,7 +221,7 @@ void CmdChangeLevelCallback()
 
 	if (g_NextMap.m_tempChangeInfo.m_mapName[0] == '\0')
 	{
-		UTIL_Format(g_NextMap.m_tempChangeInfo.m_mapName, sizeof(g_NextMap.m_tempChangeInfo.m_mapName), command.Arg(1));
-		UTIL_Format(g_NextMap.m_tempChangeInfo.m_changeReason, sizeof(g_NextMap.m_tempChangeInfo.m_changeReason), "changelevel Command");
+		ke::SafeStrcpy(g_NextMap.m_tempChangeInfo.m_mapName, sizeof(g_NextMap.m_tempChangeInfo.m_mapName), command.Arg(1));
+		ke::SafeStrcpy(g_NextMap.m_tempChangeInfo.m_changeReason, sizeof(g_NextMap.m_tempChangeInfo.m_changeReason), "changelevel Command");
 	}
 }

core/NextMap.h

@@ -33,16 +33,17 @@
 #define _INCLUDE_SOURCEMOD_NEXTMAP_H_
 
 #include "sm_globals.h"
-#include "eiface.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)
 	{
-		UTIL_Format(m_mapName, sizeof(m_mapName), mapName);
-		UTIL_Format(m_changeReason, sizeof(m_changeReason), changeReason);
+		ke::SafeStrcpy(m_mapName, sizeof(m_mapName), mapName);
+		ke::SafeStrcpy(m_changeReason, sizeof(m_changeReason), changeReason);
 		startTime = time;
 	}
 
@@ -53,7 +54,7 @@ struct MapChangeData
 		startTime = 0;
 	}
 
-	char m_mapName[32];
+	char m_mapName[PLATFORM_MAX_PATH];
 	char m_changeReason[100];
 	time_t startTime;
 };

core/PlayerManager.h

@@ -2,7 +2,7 @@
  * vim: set ts=4 :
  * =============================================================================
  * SourceMod
- * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
  * =============================================================================
  *
  * This program is free software; you can redistribute it and/or modify it under
@@ -38,13 +38,20 @@
 #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
@@ -69,15 +76,17 @@ public:
 public:
 	const char *GetName();
 	const char *GetIPAddress();
-	const char *GetAuthString();
+	const char *GetAuthString(bool validated = true);
+	unsigned int GetSteamAccountID(bool validated = true);
+	const CSteamID &GetSteamId(bool validated = true);
+	uint64_t GetSteamId64(bool validated = true) { return GetSteamId(validated).ConvertToUint64(); }
+	const char *GetSteam2Id(bool validated = true);
+	const char *GetSteam3Id(bool validated = true);
 	edict_t *GetEdict();
 	bool IsInGame();
 	bool WasCountedAsInGame();
 	bool IsConnected();
 	bool IsAuthorized();
-#if SOURCE_ENGINE >= SE_ORANGEBOX
-	bool IsAuthedBySteam();
-#endif
 	bool IsFakeClient();
 	bool IsSourceTV() const;
 	bool IsReplay() const;
@@ -92,52 +101,73 @@ public:
 	bool RunAdminCacheChecks();
 	void NotifyPostAdminChecks();
 	unsigned int GetSerial();
+	int GetIndex() const;
+	void PrintToConsole(const char *pMsg);
+	void ClearAdmin();
 public:
 	void DoBasicAdminChecks();
 	void MarkAsBeingKicked();
 	int GetLifeState();
+
+	// This can be NULL for fakeclients due to limitations in our impl
+	IClient *GetIClient() const;
 private:
 	void Initialize(const char *name, const char *ip, edict_t *pEntity);
 	void Connect();
 	void Disconnect();
 	void SetName(const char *name);
 	void DumpAdmin(bool deleting);
-	void Authorize(const char *auth);
+	void UpdateAuthIds();
+	void Authorize();
 	void Authorize_Post();
 	void DoPostConnectAuthorization();
+	bool IsAuthStringValidated();
+	bool SetEngineString();
+	bool SetCSteamID();
+	void ClearNetchannelQueue(void);
 private:
-	bool m_IsConnected;
-	bool m_IsInGame;
-	bool m_IsAuthorized;
-	bool m_bIsInKickQueue;
+	bool m_IsConnected = false;
+	bool m_IsInGame = false;
+	bool m_IsAuthorized = false;
+	bool m_bIsInKickQueue = false;
 	String m_Name;
 	String m_Ip;
 	String m_IpNoPort;
-	String m_AuthID;
-	AdminId m_Admin;
-	bool m_TempAdmin;
-	edict_t *m_pEdict;
-	IPlayerInfo *m_Info;
+	ke::AString m_AuthID;
+	ke::AString m_Steam2Id;
+	ke::AString m_Steam3Id;
+	AdminId m_Admin = INVALID_ADMIN_ID;
+	bool m_TempAdmin = false;
+	edict_t *m_pEdict = nullptr;
+	IPlayerInfo *m_Info = nullptr;
+	IClient *m_pIClient = nullptr;
 	String m_LastPassword;
-	bool m_bAdminCheckSignalled;
+	bool m_bAdminCheckSignalled = false;
 	int m_iIndex;
-	unsigned int m_LangId;
-	int m_UserId;
-	bool m_bFakeClient;
-	bool m_bIsSourceTV;
-	bool m_bIsReplay;
+	unsigned int m_LangId = SOURCEMOD_LANGUAGE_ENGLISH;
+	int m_UserId = -1;
+	bool m_bFakeClient = false;
+	bool m_bIsSourceTV = false;
+	bool m_bIsReplay = false;
 	serial_t m_Serial;
+	CSteamID m_SteamId;
+#if SOURCE_ENGINE == SE_CSGO
+	QueryCvarCookie_t m_LanguageCookie = InvalidQueryCvarCookie;
+#endif
+	ke::Deque<ke::AString> m_PrintfBuffer;
 };
 
 class PlayerManager : 
 	public SMGlobalClass,
-	public IPlayerManager
+	public IPlayerManager,
+	public IGameEventListener2
 {
 	friend class CPlayer;
 public:
 	PlayerManager();
 	~PlayerManager();
 public: //SMGlobalClass
+	void OnSourceModStartup(bool late) override;
 	void OnSourceModAllInitialized();
 	void OnSourceModShutdown();
 	void OnSourceModLevelEnd();
@@ -146,8 +176,6 @@ public: //SMGlobalClass
 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);
@@ -156,11 +184,18 @@ public:
 	void OnClientDisconnect_Post(edict_t *pEntity);
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 	void OnClientCommand(edict_t *pEntity, const CCommand &args);
+#if SOURCE_ENGINE >= SE_EYE
+	void OnClientCommandKeyValues(edict_t *pEntity, KeyValues *pCommand);
+	void OnClientCommandKeyValues_Post(edict_t *pEntity, KeyValues *pCommand);
+#endif
 #else
 	void OnClientCommand(edict_t *pEntity);
 #endif
 	void OnClientSettingsChanged(edict_t *pEntity);
 	//void OnClientSettingsChanged_Pre(edict_t *pEntity);
+	void OnServerHibernationUpdate(bool bHibernating);
+	void OnClientPrintf(edict_t *pEdict, const char *szMsg);
+	void OnPrintfFrameAction(unsigned int serial);
 public: //IPlayerManager
 	void AddClientListener(IClientListener *listener);
 	void RemoveClientListener(IClientListener *listener);
@@ -168,6 +203,7 @@ 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);
@@ -176,6 +212,10 @@ public: //IPlayerManager
 	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()
 	{
@@ -192,10 +232,16 @@ 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
+	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);
@@ -207,6 +253,8 @@ private:
 	IForward *m_cldisconnect_post;
 	IForward *m_clputinserver;
 	IForward *m_clcommand;
+	IForward *m_clcommandkv;
+	IForward *m_clcommandkv_post;
 	IForward *m_clinfochanged;
 	IForward *m_clauth;
 	IForward *m_onActivate;
@@ -216,17 +264,22 @@ private:
 	int m_maxClients;
 	int m_PlayerCount;
 	int m_PlayersSinceActive;
-	bool m_FirstPass;
+	bool m_bServerActivated;
 	unsigned int *m_AuthQueue;
 	String m_PassInfoVar;
 	bool m_QueryLang;
-	bool m_bUseSteamAdminAuth; // are we validating admins with steam before authorizing?
+	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

core/PluginInfoDatabase.cpp

@@ -1,349 +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 <stdarg.h>
-#include <string.h>
-#include "PluginInfoDatabase.h"
-#include "PluginSys.h"
-
-void PluginSettings::Init()
-{
-	name = -1;
-	pause_val = false;
-	type_val = PluginType_MapUpdated;
-	optarray = -1;
-	opts_num = 0;
-	opts_size = 0;
-	blockload_val = false;
-}
-
-/**
- * :TODO: write the logger, make these errors log instead of being static
- * NOTE: once we do that, we will have to change some code to ignore sections
- */
-
-CPluginInfoDatabase::CPluginInfoDatabase()
-{
-	m_strtab = NULL;
-	m_infodb_count = 0;
-	m_infodb_size = 0;
-	m_infodb = -1;
-}
-
-CPluginInfoDatabase::~CPluginInfoDatabase()
-{
-	delete m_strtab;
-}
-
-void CPluginInfoDatabase::ReadSMC_ParseStart()
-{
-	/* Create or reset our string table */
-	if (m_strtab)
-	{
-		m_strtab->Reset();
-	} else {
-		m_strtab = new BaseStringTable(1024);
-	}
-
-	/* Set our internal states to the beginning */
-	in_plugins = false;
-	cur_plugin = -1;
-	in_options = false;
-	m_infodb_size = 0;
-	m_infodb_count = 0;
-	m_infodb = -1;
-}
-
-SMCResult CPluginInfoDatabase::MakeError(const char *fmt, ...)
-{
-	char buffer[512];
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsnprintf(buffer, sizeof(buffer), fmt, ap);
-	va_end(ap);
-
-	m_errmsg = m_strtab->AddString(buffer);
-
-	return SMCResult_HaltFail;
-}
-
-unsigned int CPluginInfoDatabase::GetSettingsNum()
-{
-	return m_infodb_count;
-}
-
-PluginSettings *CPluginInfoDatabase::GetSettingsIfMatch(unsigned int index, const char *filename)
-{
-	BaseMemTable *memtab = m_strtab->GetMemTable();
-	int *table = (int *)memtab->GetAddress(m_infodb);
-
-	if (!table || index >= m_infodb_count)
-	{
-		return NULL;
-	}
-
-	PluginSettings *plugin = (PluginSettings *)memtab->GetAddress(table[index]);
-
-	const char *name = m_strtab->GetString(plugin->name);
-
-	if (!name)
-	{
-		return NULL;
-	}
-
-	if (!g_PluginSys.TestAliasMatch(name, filename))
-	{
-		return NULL;
-	}
-
-	return plugin;
-}
-
-void CPluginInfoDatabase::GetOptionsForPlugin(PluginSettings *settings, unsigned int opt_num, const char **key, const char **val)
-{
-	PluginOpts *table = (PluginOpts *)m_strtab->GetMemTable()->GetAddress(settings->optarray);
-	if (!table)
-	{
-		*key = NULL;
-		*val = NULL;
-		return;
-	}
-
-	if (opt_num >= settings->opts_num)
-	{
-		*key = NULL;
-		*val = NULL;
-		return;
-	}
-
-	*key = m_strtab->GetString(table[opt_num].key);
-	*val = m_strtab->GetString(table[opt_num].val);
-}
-
-SMCResult CPluginInfoDatabase::ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value)
-{
-	if (cur_plugin != -1)
-	{
-		PluginSettings *plugin = (PluginSettings *)m_strtab->GetMemTable()->GetAddress(cur_plugin);
-		if (!in_options)
-		{
-			if (strcmp(key, "pause") == 0)
-			{
-				if (strcasecmp(value, "yes") == 0)
-				{
-					plugin->pause_val = true;
-				} 
-				else 
-				{
-					plugin->pause_val = false;
-				}
-			} 
-			else if (strcmp(key, "lifetime") == 0) 
-			{
-				if (strcasecmp(value, "private") == 0)
-				{
-					plugin->type_val = PluginType_Private;
-				} 
-				else if (strcasecmp(value, "mapsync") == 0) 
-				{
-					plugin->type_val = PluginType_MapUpdated;
-				}
-				else if (strcasecmp(value, "maponly") == 0) 
-				{
-					plugin->type_val = PluginType_MapOnly;
-				}
-				else if (strcasecmp(value, "global") == 0) 
-				{
-					plugin->type_val = PluginType_Global;
-				}
-				else 
-				{
-					return MakeError("Unknown value for key \"lifetime\": \"%s\"", value);
-				}
-			}
-			else if (strcmp(key, "blockload") == 0) 
-			{
-				plugin->blockload_val = true;
-			} 
-			else 
-			{
-				return MakeError("Unknown property key: \"%s\"", key);
-			}
-		}
-		else 
-		{
-			/* Cache every option, valid or not */
-			int keyidx = m_strtab->AddString(key);
-			int validx = m_strtab->AddString(value);
-			PluginOpts *table;
-			BaseMemTable *memtab = m_strtab->GetMemTable();
-			plugin = (PluginSettings *)memtab->GetAddress(cur_plugin);
-			if (plugin->opts_num + 1 > plugin->opts_size)
-			{
-				unsigned int oldsize = plugin->opts_size;
-				if (oldsize == 0)
-				{
-					//right now we don't have many
-					plugin->opts_size = 2;
-				} 
-				else
-				{
-					plugin->opts_size *= 2;
-				}
-				int newidx = memtab->CreateMem(plugin->opts_size * sizeof(PluginOpts), (void **)&table);
-				/* in case it resized */
-				plugin = (PluginSettings *)memtab->GetAddress(cur_plugin);
-				if (plugin->optarray != -1)
-				{
-					void *oldtable = memtab->GetAddress(plugin->optarray);
-					memcpy(table, oldtable, oldsize * sizeof(PluginOpts));
-				}
-				plugin->optarray = newidx;
-			}
-			else
-			{
-				table = (PluginOpts *)memtab->GetAddress(plugin->optarray);
-			}
-			PluginOpts *opt = &table[plugin->opts_num++];
-			opt->key = keyidx;
-			opt->val = validx;
-		}
-	}
-	else if (in_plugins)
-	{
-		return MakeError("Unknown property key: \"%s\"", key);
-	}
-	else 
-	{
-		/* Ignore anything we don't know about! */
-	}
-
-	return SMCResult_Continue;
-}
-
-SMCResult CPluginInfoDatabase::ReadSMC_LeavingSection(const SMCStates *states)
-{
-	if (in_plugins)
-	{
-		if (cur_plugin != -1)
-		{
-			if (in_options)
-			{
-				in_options = false;
-			}
-			else 
-			{
-				/* If the plugin is ending, add it to the table */
-				BaseMemTable *memtab = m_strtab->GetMemTable();
-				int *table;
-				if (m_infodb_count + 1 > m_infodb_size)
-				{
-					unsigned int oldsize = m_infodb_size;
-					if (!m_infodb_size)
-					{
-						m_infodb_size = 8;
-					}
-					else 
-					{
-						m_infodb_size *= 2;
-					}
-					int newidx = memtab->CreateMem(m_infodb_size * sizeof(int), (void **)&table);
-					if (m_infodb != -1)
-					{
-						void *oldtable = (int *)memtab->GetAddress(m_infodb);
-						memcpy(table, oldtable, oldsize * sizeof(int));
-					}
-					m_infodb = newidx;
-				}
-				else 
-				{
-					table = (int *)memtab->GetAddress(m_infodb);
-				}
-				/* Assign to table and scrap the current plugin */
-				table[m_infodb_count++] = cur_plugin;
-				cur_plugin = -1;
-			}
-		}
-		else 
-		{
-			in_plugins = false;
-		}
-	}
-
-	return SMCResult_Continue;
-}
-
-SMCResult CPluginInfoDatabase::ReadSMC_NewSection(const SMCStates *states, const char *name)
-{
-	if (!in_plugins)
-	{
-		/* If we're not in the main Plugins section, and we don't get it for the name, error out */
-		if (strcmp(name, "Plugins") != 0)
-		{
-			return MakeError("Unknown root section: \"%s\"", name);
-		}
-		else 
-		{
-			/* Otherwise set our states */
-			in_plugins = true;
-			cur_plugin = -1;
-			in_options = false;
-		}
-	}
-	else
-	{
-		if (cur_plugin == -1)
-		{
-			/* If we get a plugin node and we don't have a current plugin, create a new one */
-			PluginSettings *plugin;
-			int i_name = m_strtab->AddString(name);
-			cur_plugin = m_strtab->GetMemTable()->CreateMem(sizeof(PluginSettings), (void **)&plugin);
-			plugin->Init();
-			plugin->name = i_name;
-			in_options = false;
-		} 
-		else 
-		{
-			if (!in_options && strcmp(name, "Options") == 0)
-			{
-				in_options = true;
-			}
-			else
-			{
-				return MakeError("Unknown plugin sub-section: \"%s\"", name);
-			}
-		}
-	}
-
-	return SMCResult_Continue;
-}
-

core/PluginInfoDatabase.h

@@ -1,106 +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_CORE_SYSTEM_PLUGININFODATABASE_H_
-#define _INCLUDE_SOURCEMOD_CORE_SYSTEM_PLUGININFODATABASE_H_
-
-/**
- * This file parses plugin_settings.cfg and stores the information in cached memory.
- * It provides simplistic abstraction to retrieving the info.
- * :TODO: currently untested
- */
-
-#include "sm_memtable.h"
-#include "ITextParsers.h"
-#include "IPluginSys.h"
-#include "sm_globals.h"
-
-struct PluginOpts
-{
-	int key;
-	int val;
-};
-
-struct PluginSettings
-{
-	void Init();
-	int name;
-	bool pause_val;
-	PluginType type_val;
-	int optarray;
-	size_t opts_num;
-	size_t opts_size;
-	bool blockload_val;
-};
-
-class CPluginInfoDatabase : public ITextListener_SMC
-{
-public:
-	CPluginInfoDatabase();
-	~CPluginInfoDatabase();
-public: //ITextListener_SMC
-	void ReadSMC_ParseStart();
-	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
-	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
-	SMCResult ReadSMC_LeavingSection(const SMCStates *states);
-public:
-	/**
-	 * Returns the number of plugin settings available.
-	 */
-	unsigned int GetSettingsNum();
-
-	/** 
-	 * Given an index, returns the plugin settings block if the filename matches.
-	 * Otherwise, returns NULL.
-	 */
-	PluginSettings *GetSettingsIfMatch(unsigned int index, const char *filename);
-
-	/** 
-	 *  Given a plugin settings struct and an index,
-	 * returns the given JIT key/value option pair at that index.
-	 * If the input is invalid, key and val will be set to NULL.
-	 */
-	void GetOptionsForPlugin(PluginSettings *settings, unsigned int opt_num, const char **key, const char **val);
-private:
-	SMCResult MakeError(const char *fmt, ...);
-private:
-	BaseStringTable *m_strtab;
-	int m_errmsg;
-	bool in_plugins;
-	bool in_options;
-	int m_infodb;
-	size_t m_infodb_count;
-	size_t m_infodb_size;
-	int cur_plugin;
-};
-
-
-#endif //_INCLUDE_SOURCEMOD_CORE_SYSTEM_PLUGININFODATABASE_H_

core/ShareSys.cpp

@@ -1,611 +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 "ShareSys.h"
-#include "HandleSys.h"
-#include "ExtensionSys.h"
-#include "LibrarySys.h"
-#include "PluginSys.h"
-#include "sm_stringutil.h"
-
-ShareSystem g_ShareSys;
-static unsigned int g_mark_serial = 0;
-
-ShareSystem::ShareSystem()
-{
-	m_IdentRoot.ident = 0;
-	m_TypeRoot = 0;
-	m_IfaceType = 0;
-	m_CoreType = 0;
-}
-
-IdentityToken_t *ShareSystem::CreateCoreIdentity()
-{
-	if (!m_CoreType)
-	{
-		m_CoreType = CreateIdentType("CORE");
-	}
-
-	return CreateIdentity(m_CoreType, this);
-}
-
-void ShareSystem::Initialize()
-{
-	TypeAccess sec;
-
-	g_HandleSys.InitAccessDefaults(&sec, NULL);
-	sec.ident = GetIdentRoot();
-
-	m_TypeRoot = g_HandleSys.CreateType("Identity", this, 0, &sec, NULL, NULL, NULL);
-	m_IfaceType = g_HandleSys.CreateType("Interface", this, 0, NULL, NULL, GetIdentRoot(), NULL);
-
-	/* Initialize our static identity handle */
-	m_IdentRoot.ident = g_HandleSys.CreateHandle(m_TypeRoot, NULL, NULL, GetIdentRoot(), NULL);
-
-	/* Add the Handle System and others... they are too innocent and pure to do it themselves */
-	AddInterface(NULL, &g_HandleSys);
-	AddInterface(NULL, &g_LibSys);
-}
-
-void ShareSystem::OnSourceModShutdown()
-{
-	if (m_CoreType)
-	{
-		g_HandleSys.RemoveType(m_CoreType, GetIdentRoot());
-	}
-
-	g_HandleSys.RemoveType(m_IfaceType, GetIdentRoot());
-	g_HandleSys.RemoveType(m_TypeRoot, GetIdentRoot());
-}
-
-IdentityType_t ShareSystem::FindIdentType(const char *name)
-{
-	HandleType_t type;
-
-	if (g_HandleSys.FindHandleType(name, &type))
-	{
-		if (g_HandleSys.TypeCheck(type, m_TypeRoot))
-		{
-			return type;
-		}
-	}
-
-	return 0;
-}
-
-IdentityType_t ShareSystem::CreateIdentType(const char *name)
-{
-	if (!m_TypeRoot)
-	{
-		return 0;
-	}
-
-	return g_HandleSys.CreateType(name, this, m_TypeRoot, NULL, NULL, GetIdentRoot(), NULL);
-}
-
-void ShareSystem::OnHandleDestroy(HandleType_t type, void *object)
-{
-	/* THIS WILL NEVER BE CALLED FOR ANYTHING WITH THE IDENTITY TYPE */
-}
-
-IdentityToken_t *ShareSystem::CreateIdentity(IdentityType_t type, void *ptr)
-{
-	if (!m_TypeRoot)
-	{
-		return 0;
-	}
-
-	/* :TODO: Cache? */
-	IdentityToken_t *pToken = new IdentityToken_t;
-
-	HandleSecurity sec;
-	sec.pOwner = sec.pIdentity = GetIdentRoot();
-
-	pToken->ident = g_HandleSys.CreateHandleInt(type, NULL, &sec, NULL, NULL, true);
-	pToken->ptr = ptr;
-	pToken->type = type;
-
-	return pToken;
-}
-
-bool ShareSystem::AddInterface(IExtension *myself, SMInterface *iface)
-{
-	if (!iface)
-	{
-		return false;
-	}
-
-	IfaceInfo info;
-
-	info.owner = myself;
-	info.iface = iface;
-	
-	m_Interfaces.push_back(info);
-
-	return true;
-}
-
-bool ShareSystem::RequestInterface(const char *iface_name, 
-								   unsigned int iface_vers, 
-								   IExtension *myself, 
-								   SMInterface **pIface)
-{
-	/* See if the interface exists */
-	List<IfaceInfo>::iterator iter;
-	SMInterface *iface;
-	IExtension *iface_owner;
-	bool found = false;
-	for (iter=m_Interfaces.begin(); iter!=m_Interfaces.end(); iter++)
-	{
-		IfaceInfo &info = (*iter);
-		iface = info.iface;
-		if (strcmp(iface->GetInterfaceName(), iface_name) == 0)
-		{
-			if (iface->GetInterfaceVersion() == iface_vers
-				|| iface->IsVersionCompatible(iface_vers))
-			{
-				iface_owner = info.owner;
-				found = true;
-				break;
-			}
-		}
-	}
-
-	if (!found)
-	{
-		return false;
-	}
-
-	/* Add a dependency node */
-	if (iface_owner)
-	{
-		IfaceInfo info;
-		info.iface = iface;
-		info.owner = iface_owner;
-		g_Extensions.BindDependency(myself, &info);
-	}
-
-	if (pIface)
-	{
-		*pIface = iface;
-	}
-
-	return true;
-}
-
-void ShareSystem::AddNatives(IExtension *myself, const sp_nativeinfo_t *natives)
-{
-	CNativeOwner *pOwner;
-
-	pOwner = g_Extensions.GetNativeOwner(myself);
-
-	pOwner->AddNatives(natives);
-}
-
-void ShareSystem::DestroyIdentity(IdentityToken_t *identity)
-{
-	HandleSecurity sec;
-
-	sec.pOwner = GetIdentRoot();
-	sec.pIdentity = GetIdentRoot();
-
-	g_HandleSys.FreeHandle(identity->ident, &sec);
-	delete identity;
-}
-
-void ShareSystem::DestroyIdentType(IdentityType_t type)
-{
-	g_HandleSys.RemoveType(type, GetIdentRoot());
-}
-
-void ShareSystem::RemoveInterfaces(IExtension *pExtension)
-{
-	List<IfaceInfo>::iterator iter = m_Interfaces.begin();
-
-	while (iter != m_Interfaces.end())
-	{
-		if ((*iter).owner == pExtension)
-		{
-			iter = m_Interfaces.erase(iter);
-		}
-		else
-		{
-			iter++;
-		}
-	}
-}
-
-void ShareSystem::AddDependency(IExtension *myself, const char *filename, bool require, bool autoload)
-{
-	g_Extensions.AddDependency(myself, filename, require, autoload);
-}
-
-void ShareSystem::RegisterLibrary(IExtension *myself, const char *name)
-{
-	g_Extensions.AddLibrary(myself, name);
-}
-
-void ShareSystem::OverrideNatives(IExtension *myself, const sp_nativeinfo_t *natives)
-{
-	unsigned int i;
-	NativeEntry *pEntry;
-	CNativeOwner *pOwner;
-
-	pOwner = g_Extensions.GetNativeOwner(myself);
-
-	for (i = 0; natives[i].func != NULL && natives[i].name != NULL; i++)
-	{
-		if ((pEntry = FindNative(natives[i].name)) == NULL)
-		{
-			continue;
-		}
-
-		if (pEntry->owner != g_pCoreNatives)
-		{
-			continue;
-		}
-
-		if (pEntry->replacement.owner != NULL)
-		{
-			continue;
-		}
-
-		/* Now it's safe to add the override */
-		pEntry->replacement.func = natives[i].func;
-		pEntry->replacement.owner = pOwner;
-		pOwner->AddReplacedNative(pEntry);
-	}
-}
-
-NativeEntry *ShareSystem::FindNative(const char *name)
-{
-	NativeEntry **ppEntry;
-
-	if ((ppEntry = m_NtvCache.retrieve(name)) == NULL)
-	{
-		return NULL;
-	}
-
-	return *ppEntry;
-}
-
-void ShareSystem::BindNativesToPlugin(CPlugin *pPlugin, bool bCoreOnly)
-{
-	NativeEntry *pEntry;
-	sp_native_t *native;
-	uint32_t i, native_count;
-	IPluginContext *pContext;
-
-	pContext = pPlugin->GetBaseContext();
-
-	/* Generate a new serial ID, mark our dependencies with it. */
-	g_mark_serial++;
-	pPlugin->PropogateMarkSerial(g_mark_serial);
-
-	native_count = pContext->GetNativesNum();
-	for (i = 0; i < native_count; i++)
-	{
-		if (pContext->GetNativeByIndex(i, &native) != SP_ERROR_NONE)
-		{
-			continue;
-		}
-
-		/* If we're bound, check if there is a replacement available.  
-		 * If not, this native is totally finalized.
-		 */
-		if (native->status == SP_NATIVE_BOUND)
-		{
-			pEntry = (NativeEntry *)native->user;
-			assert(pEntry != NULL);
-			if (pEntry->replacement.owner == NULL
-				|| (pEntry->replacement.owner != NULL 
-				&&  pEntry->replacement.func == native->pfn))
-			{
-				continue;
-			}
-		}
-		/* Otherwise, the native must be in our cache. */
-		else if ((pEntry = FindNative(native->name)) == NULL)
-		{
-			continue;
-		}
-
-		if (bCoreOnly && pEntry->owner != g_pCoreNatives)
-		{
-			continue;
-		}
-
-		BindNativeToPlugin(pPlugin, native, i, pEntry);
-	}
-}
-
-void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, NativeEntry *pEntry)
-{
-	uint32_t i;
-	sp_native_t *native;
-	IPluginContext *pContext;
-
-	pContext = pPlugin->GetBaseContext();
-
-	if (pContext->FindNativeByName(pEntry->name, &i) != SP_ERROR_NONE)
-	{
-		return;
-	}
-	if (pContext->GetNativeByIndex(i, &native) != SP_ERROR_NONE)
-	{
-		return;
-	}
-
-	if (native->status == SP_NATIVE_BOUND)
-	{
-		return;
-	}
-
-	BindNativeToPlugin(pPlugin, native, i, pEntry);
-}
-
-void ShareSystem::BindNativeToPlugin(CPlugin *pPlugin, 
-									 sp_native_t *native,
-									 uint32_t index,
-									 NativeEntry *pEntry)
-{
-	/* Mark as bound... we do the rest next. */
-	native->status = SP_NATIVE_BOUND;
-	native->user = pEntry;
-
-	/* See if a replacement is available. */
-	if (pEntry->replacement.owner != NULL)
-	{
-		/* Perform a replacement bind. */
-		native->pfn = pEntry->replacement.func;
-		pEntry->replacement.owner->AddWeakRef(WeakNative(pPlugin, index, pEntry));
-	}
-	else
-	{
-		/* Perform a normal bind. */
-		native->pfn = pEntry->func;
-
-		/* We don't bother with dependency crap if the owner is Core. */
-		if (pEntry->owner != g_pCoreNatives)
-		{
-			/* The native is optional, this is a special case */
-			if ((native->flags & SP_NTVFLAG_OPTIONAL) == SP_NTVFLAG_OPTIONAL)
-			{
-				/* Only add if there is a valid owner. */
-				if (pEntry->owner != NULL)
-				{
-					pEntry->owner->AddWeakRef(WeakNative(pPlugin, index));
-				}
-				else
-				{
-					native->status = SP_NATIVE_UNBOUND;
-				}
-			}
-			/* Otherwise, we're a strong dependent and not a weak one */
-			else
-			{
-				/* See if this has already been marked as a dependent.
-				 * If it has, it means this relationship has already occurred, 
-				 * and there is no reason to do it again.
-				 */
-				if (pEntry->owner != pPlugin 
-					&& pEntry->owner->GetMarkSerial() != g_mark_serial)
-				{
-					/* This has not been marked as a dependency yet */
-					//pPlugin->AddDependency(pEntry->owner);
-					pEntry->owner->AddDependent(pPlugin);
-					pEntry->owner->SetMarkSerial(g_mark_serial);
-				}
-			}
-		}
-	}
-}
-
-NativeEntry *ShareSystem::AddNativeToCache(CNativeOwner *pOwner, const sp_nativeinfo_t *ntv)
-{
-	NativeEntry *pEntry;
-
-	if ((pEntry = FindNative(ntv->name)) == NULL)
-	{
-		pEntry = new NativeEntry;
-
-		pEntry->owner = pOwner;
-		pEntry->name = ntv->name;
-		pEntry->func = ntv->func;
-		pEntry->replacement.func = NULL;
-		pEntry->replacement.owner = NULL;
-		pEntry->fake = NULL;
-
-		m_NtvCache.insert(ntv->name, pEntry);
-
-		return pEntry;
-	}
-
-	if (pEntry->owner != NULL)
-	{
-		return NULL;
-	}
-
-	pEntry->owner = pOwner;
-	pEntry->func = ntv->func;
-	pEntry->name = ntv->name;
-
-	return pEntry;
-}
-
-void ShareSystem::ClearNativeFromCache(CNativeOwner *pOwner, const char *name)
-{
-	NativeEntry *pEntry;
-
-	if ((pEntry = FindNative(name)) == NULL)
-	{
-		return;
-	}
-
-	if (pEntry->owner != pOwner)
-	{
-		return;
-	}
-
-	if (pEntry->fake != NULL)
-	{
-		g_pSourcePawn2->DestroyFakeNative(pEntry->func);
-		delete pEntry->fake;
-		pEntry->fake = NULL;
-	}
-
-	pEntry->func = NULL;
-	pEntry->name = NULL;
-	pEntry->owner = NULL;
-	pEntry->replacement.func = NULL;
-	pEntry->replacement.owner = NULL;
-}
-
-NativeEntry *ShareSystem::AddFakeNative(IPluginFunction *pFunc, const char *name, SPVM_FAKENATIVE_FUNC func)
-{
-	FakeNative *pFake;
-	NativeEntry *pEntry;
-	SPVM_NATIVE_FUNC gate;
-
-	if ((pEntry = FindNative(name)) != NULL && pEntry->owner != NULL)
-	{
-		return NULL;
-	}
-
-	pFake = new FakeNative;
-
-	if ((gate = g_pSourcePawn2->CreateFakeNative(func, pFake)) == NULL)
-	{
-		delete pFake;
-		return NULL;
-	}
-
-	if (pEntry == NULL)
-	{
-		pEntry = new NativeEntry;
-		m_NtvCache.insert(name, pEntry);
-	}
-
-	pFake->call = pFunc;
-	pFake->ctx = pFunc->GetParentContext();
-	strncopy(pFake->name, name, sizeof(pFake->name));
-	
-	pEntry->fake = pFake;
-	pEntry->func = gate;
-	pEntry->name = pFake->name;
-	pEntry->owner = g_PluginSys.GetPluginByCtx(pFake->ctx->GetContext());
-	pEntry->replacement.func = NULL;
-	pEntry->replacement.owner = NULL;
-
-	return pEntry;
-}
-
-void ShareSystem::AddCapabilityProvider(IExtension *myself, IFeatureProvider *provider,
-		                                const char *name)
-{
-	if (m_caps.retrieve(name) != NULL)
-		return;
-
-	Capability cap;
-	cap.ext = myself;
-	cap.provider = provider;
-
-	m_caps.insert(name, cap);
-}
-
-void ShareSystem::DropCapabilityProvider(IExtension *myself, IFeatureProvider *provider,
-		                                 const char *name)
-{
-	Capability *pCap = m_caps.retrieve(name);
-	if (pCap == NULL)
-		return;
-
-	if (pCap->ext != myself || pCap->provider != provider)
-		return;
-
-	m_caps.remove(name);
-}
-
-FeatureStatus ShareSystem::TestFeature(IPluginRuntime *pRuntime, FeatureType feature, 
-                                       const char *name)
-{
-	switch (feature)
-	{
-	case FeatureType_Native:
-		return TestNative(pRuntime, name);
-	case FeatureType_Capability:
-		return TestCap(name);
-	default:
-		break;
-	}
-
-	return FeatureStatus_Unknown;
-}
-
-FeatureStatus ShareSystem::TestNative(IPluginRuntime *pRuntime, const char *name)
-{
-	uint32_t index;
-
-	if (pRuntime->FindNativeByName(name, &index) == SP_ERROR_NONE)
-	{
-		sp_native_t *native;
-		if (pRuntime->GetNativeByIndex(index, &native) == SP_ERROR_NONE)
-		{
-			if (native->status == SP_NATIVE_BOUND)
-				return FeatureStatus_Available;
-			else
-				return FeatureStatus_Unknown;
-		}
-	}
-
-	NativeEntry *entry = FindNative(name);
-	if (entry == NULL)
-		return FeatureStatus_Unknown;
-
-	if ((entry->replacement.owner != NULL || entry->owner != NULL) &&
-		(entry->replacement.func != NULL || entry->func != NULL))
-	{
-		return FeatureStatus_Available;
-	}
-	else
-	{
-		return FeatureStatus_Unavailable;
-	}
-}
-
-FeatureStatus ShareSystem::TestCap(const char *name)
-{
-	Capability *cap = m_caps.retrieve(name);
-	if (cap == NULL)
-		return FeatureStatus_Unknown;
-
-	return cap->provider->GetFeatureStatus(FeatureType_Capability, name);
-}

core/TimerSys.cpp

@@ -31,10 +31,10 @@
 
 #include <time.h>
 #include "TimerSys.h"
-#include "ForwardSys.h"
 #include "sourcemm_api.h"
 #include "frame_hooks.h"
 #include "ConVarManager.h"
+#include "logic_bridge.h"
 
 #define TIMER_MIN_ACCURACY		0.1
 
@@ -180,9 +180,9 @@ TimerSystem::~TimerSystem()
 
 void TimerSystem::OnSourceModAllInitialized()
 {
-	g_ShareSys.AddInterface(NULL, this);
-	m_pOnGameFrame = g_Forwards.CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
-	m_pOnMapTimeLeftChanged = g_Forwards.CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
+	sharesys->AddInterface(NULL, this);
+	m_pOnGameFrame = forwardsys->CreateForward("OnGameFrame", ET_Ignore, 0, NULL);
+	m_pOnMapTimeLeftChanged = forwardsys->CreateForward("OnMapTimeLeftChanged", ET_Ignore, 0, NULL);
 }
 
 void TimerSystem::OnSourceModGameInitialized()
@@ -198,8 +198,8 @@ void TimerSystem::OnSourceModGameInitialized()
 void TimerSystem::OnSourceModShutdown()
 {
 	SetMapTimer(NULL);
-	g_Forwards.ReleaseForward(m_pOnGameFrame);
-	g_Forwards.ReleaseForward(m_pOnMapTimeLeftChanged);
+	forwardsys->ReleaseForward(m_pOnGameFrame);
+	forwardsys->ReleaseForward(m_pOnMapTimeLeftChanged);
 }
 
 void TimerSystem::OnSourceModLevelEnd()

core/TimerSys.h

@@ -32,11 +32,11 @@
 #ifndef _INCLUDE_SOURCEMOD_CTIMERSYS_H_
 #define _INCLUDE_SOURCEMOD_CTIMERSYS_H_
 
-#include "ShareSys.h"
 #include <ITimerSystem.h>
 #include <sh_stack.h>
 #include <sh_list.h>
 #include "sourcemm_api.h"
+#include "sm_globals.h"
 
 using namespace SourceHook;
 using namespace SourceMod;

core/UserMessagePBHelpers.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2013 AlliedModders LLC.  All rights reserved.
@@ -34,6 +34,7 @@
 
 #include <sh_list.h>
 #include <google/protobuf/descriptor.h>
+#include <amtl/am-string.h>
 
 #define GETCHECK_FIELD() \
 	const protobuf::FieldDescriptor *field = msg->GetDescriptor()->FindFieldByName(pszFieldName); \
@@ -56,6 +57,15 @@
 		return false; \
 	}
 
+#define CHECK_FIELD_TYPE3(type1, type2, type3) \
+	protobuf::FieldDescriptor::CppType fieldType = field->cpp_type(); \
+	if (fieldType != protobuf::FieldDescriptor::CPPTYPE_##type1       \
+		&& fieldType != protobuf::FieldDescriptor::CPPTYPE_##type2 \
+		&& fieldType != protobuf::FieldDescriptor::CPPTYPE_##type3) \
+	{                 \
+		return false; \
+	}
+
 #define CHECK_FIELD_REPEATED() \
 	if (field->label() != protobuf::FieldDescriptor::LABEL_REPEATED) \
 	{                 \
@@ -93,7 +103,7 @@ public:
 			Handle_t &hndl = (*iter);
 			HandleSecurity sec;
 			sec.pIdentity = g_pCoreIdent;
-			g_HandleSys.FreeHandle(hndl, &sec);
+			handlesys->FreeHandle(hndl, &sec);
 			iter = childHandles.erase(iter);
 		}
 	}
@@ -108,6 +118,13 @@ public:
 		return msg;
 	}
 
+	inline bool HasField(const char *pszFieldName)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_NOT_REPEATED();
+		return msg->GetReflection()->HasField(*msg, field);
+	}
+
 	inline bool GetInt32(const char *pszFieldName, int32 *out)
 	{
 		GETCHECK_FIELD();
@@ -139,6 +156,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedInt32(const char *pszFieldName, int index, int32 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(INT32);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedInt32(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddInt32(const char *pszFieldName, int32 value)
 	{
 		GETCHECK_FIELD();
@@ -180,6 +208,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedInt64(const char *pszFieldName, int index, int64 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(INT64);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedInt64(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddInt64(const char *pszFieldName, int64 value)
 	{
 		GETCHECK_FIELD();
@@ -221,6 +260,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedUInt32(const char *pszFieldName, int index, uint32 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(UINT32);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedUInt32(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddUInt32(const char *pszFieldName, uint32 value)
 	{
 		GETCHECK_FIELD();
@@ -262,6 +312,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedUInt64(const char *pszFieldName, int index, uint64 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(UINT64);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedUInt64(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddUInt64(const char *pszFieldName, uint64 value)
 	{
 		GETCHECK_FIELD();
@@ -272,60 +333,199 @@ public:
 		return true;
 	}
 
-	inline bool GetInt32OrUnsigned(const char *pszFieldName, int32 *out)
+	inline bool GetInt32OrUnsignedOrEnum(const char *pszFieldName, int32 *out)
 	{
 		GETCHECK_FIELD();
-		CHECK_FIELD_TYPE2(INT32, UINT32);
+		CHECK_FIELD_TYPE3(INT32, UINT32, ENUM);
 		CHECK_FIELD_NOT_REPEATED();
 
 		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT32)
 			*out = (int32)msg->GetReflection()->GetUInt32(*msg, field);
-		else
+		else if (fieldType == protobuf::FieldDescriptor::CPPTYPE_INT32)
 			*out = msg->GetReflection()->GetInt32(*msg, field);
+		else // CPPTYPE_ENUM
+			*out = msg->GetReflection()->GetEnum(*msg, field)->number();
+
+		return true;	
+	}
+	
+	inline bool GetInt64OrUnsigned(const char *pszFieldName, int64 *out)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE2(INT64, UINT64);
+		CHECK_FIELD_NOT_REPEATED();
+
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT64)
+			*out = (int64)msg->GetReflection()->GetUInt64(*msg, field);
+		else
+			*out = msg->GetReflection()->GetInt64(*msg, field);
 
 		return true;	
 	}
 
-	inline bool SetInt32OrUnsigned(const char *pszFieldName, int32 value)
+	inline bool SetInt32OrUnsignedOrEnum(const char *pszFieldName, int32 value)
 	{
 		GETCHECK_FIELD();
-		CHECK_FIELD_TYPE2(INT32, UINT32);
+		CHECK_FIELD_TYPE3(INT32, UINT32, ENUM);
 		CHECK_FIELD_NOT_REPEATED();
 
 		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT32)
+		{
 			msg->GetReflection()->SetUInt32(msg, field, (uint32)value);
-		else
+		}
+		else if (fieldType == protobuf::FieldDescriptor::CPPTYPE_INT32)
+		{
 			msg->GetReflection()->SetInt32(msg, field, value);
+		}
+		else // CPPTYPE_ENUM
+		{
+			const protobuf::EnumValueDescriptor *pEnumValue = field->enum_type()->FindValueByNumber(value);
+			if (!pEnumValue)
+				return false;
+
+			msg->GetReflection()->SetEnum(msg, field, pEnumValue);
+		}
+
+		return true;
+	}
+	
+	inline bool SetInt64OrUnsigned(const char *pszFieldName, int64 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE2(INT64, UINT64);
+		CHECK_FIELD_NOT_REPEATED();
+
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT64)
+		{
+			msg->GetReflection()->SetUInt64(msg, field, (uint64)value);
+		}
+		else
+		{
+			msg->GetReflection()->SetInt64(msg, field, value);
+		}
 
 		return true;
 	}
 
-	inline bool GetRepeatedInt32OrUnsigned(const char *pszFieldName, int index, int32 *out)
+	inline bool GetRepeatedInt32OrUnsignedOrEnum(const char *pszFieldName, int index, int32 *out)
 	{
 		GETCHECK_FIELD();
-		CHECK_FIELD_TYPE2(INT32, UINT32);
+		CHECK_FIELD_TYPE3(INT32, UINT32, ENUM);
 		CHECK_FIELD_REPEATED();
 		CHECK_REPEATED_ELEMENT(index);
 		
 		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT32)
 			*out = (int32)msg->GetReflection()->GetRepeatedUInt32(*msg, field, index);
-		else
+		else if (fieldType == protobuf::FieldDescriptor::CPPTYPE_INT32)
 			*out = msg->GetReflection()->GetRepeatedInt32(*msg, field, index);
+		else // CPPTYPE_ENUM
+			*out = msg->GetReflection()->GetRepeatedEnum(*msg, field, index)->number();
+
+		return true;
+	}
+	
+	inline bool GetRepeatedInt64OrUnsigned(const char *pszFieldName, int index, int64 *out)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE2(INT64, UINT64);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT64)
+			*out = (int64)msg->GetReflection()->GetRepeatedUInt64(*msg, field, index);
+		else
+			*out = msg->GetReflection()->GetRepeatedInt64(*msg, field, index);
 
 		return true;
 	}
 
-	inline bool AddInt32OrUnsigned(const char *pszFieldName, int32 value)
+	inline bool SetRepeatedInt32OrUnsignedOrEnum(const char *pszFieldName, int index, int32 value)
 	{
 		GETCHECK_FIELD();
-		CHECK_FIELD_TYPE2(INT32, UINT32);
+		CHECK_FIELD_TYPE3(INT32, UINT32, ENUM);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT32)
+		{
+			msg->GetReflection()->SetRepeatedUInt32(msg, field, index, (uint32)value);
+		}
+		else if (fieldType == protobuf::FieldDescriptor::CPPTYPE_INT32)
+		{
+			msg->GetReflection()->SetRepeatedInt32(msg, field, index, value);
+		}
+		else // CPPTYPE_ENUM
+		{
+			const protobuf::EnumValueDescriptor *pEnumValue = field->enum_type()->FindValueByNumber(value);
+			if (!pEnumValue)
+				return false;
+
+			msg->GetReflection()->SetRepeatedEnum(msg, field, index, pEnumValue);
+		}
+
+		return true;
+	}
+	
+	inline bool SetRepeatedInt64OrUnsigned(const char *pszFieldName, int index, int64 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE2(INT64, UINT64);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT64)
+		{
+			msg->GetReflection()->SetRepeatedUInt64(msg, field, index, (uint64)value);
+		}
+		else
+		{
+			msg->GetReflection()->SetRepeatedInt64(msg, field, index, value);
+		}
+
+		return true;
+	}
+
+	inline bool AddInt32OrUnsignedOrEnum(const char *pszFieldName, int32 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE3(INT32, UINT32, ENUM);
 		CHECK_FIELD_REPEATED();
 
 		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT32)
+		{
 			msg->GetReflection()->AddUInt32(msg, field, (uint32)value);
-		else
+		}
+		else if (fieldType == protobuf::FieldDescriptor::CPPTYPE_INT32)
+		{
 			msg->GetReflection()->AddInt32(msg, field, value);
+		}
+		else // CPPTYPE_ENUM
+		{
+			const protobuf::EnumValueDescriptor *pEnumValue = field->enum_type()->FindValueByNumber(value);
+			if (!pEnumValue)
+				return false;
 
+			msg->GetReflection()->AddEnum(msg, field, pEnumValue);
+		}
+
+		return true;
+	}
+	
+	inline bool AddInt64OrUnsigned(const char *pszFieldName, int64 value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE2(INT64, UINT64);
+		CHECK_FIELD_REPEATED();
+
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_UINT64)
+		{
+			msg->GetReflection()->AddUInt64(msg, field, (uint64)value);
+		}
+		else
+		{
+			msg->GetReflection()->AddInt64(msg, field, value);
+		}
+		
 		return true;
 	}
 
@@ -360,6 +560,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedBool(const char *pszFieldName, int index, bool value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(BOOL);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedBool(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddBool(const char *pszFieldName, bool value)
 	{
 		GETCHECK_FIELD();
@@ -401,6 +612,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedFloat(const char *pszFieldName, int index, float value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(FLOAT);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedFloat(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddFloat(const char *pszFieldName, float value)
 	{
 		GETCHECK_FIELD();
@@ -442,6 +664,17 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedDouble(const char *pszFieldName, int index, double value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(DOUBLE);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedDouble(msg, field, index, value);
+		return true;
+	}
+
 	inline bool AddDouble(const char *pszFieldName, double value)
 	{
 		GETCHECK_FIELD();
@@ -495,6 +728,21 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedFloatOrDouble(const char *pszFieldName, int index, float value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE2(FLOAT, DOUBLE);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		if (fieldType == protobuf::FieldDescriptor::CPPTYPE_DOUBLE)
+			msg->GetReflection()->SetRepeatedDouble(msg, field, index, (double)value);
+		else
+			msg->GetReflection()->SetRepeatedFloat(msg, field, index, value);
+
+		return true;
+	}
+
 	inline bool AddFloatOrDouble(const char *pszFieldName, float value)
 	{
 		GETCHECK_FIELD();
@@ -516,7 +764,7 @@ public:
 		CHECK_FIELD_NOT_REPEATED();
 
 		std::string scratch;
-		strncopy(out, msg->GetReflection()->GetStringReference(*msg, field, &scratch).c_str(), size);
+		ke::SafeStrcpy(out, size, msg->GetReflection()->GetStringReference(*msg, field, &scratch).c_str());
 
 		return true;	
 	}
@@ -539,7 +787,19 @@ public:
 		CHECK_REPEATED_ELEMENT(index);
 		
 		std::string scratch;
-		strncopy(out, msg->GetReflection()->GetRepeatedStringReference(*msg, field, index, &scratch).c_str(), size);
+		ke::SafeStrcpy(out, size, msg->GetReflection()->GetRepeatedStringReference(*msg, field, index, &scratch).c_str());
+
+		return true;
+	}
+
+	inline bool SetRepeatedString(const char *pszFieldName, int index, const char *value)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(STRING);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+		
+		msg->GetReflection()->SetRepeatedString(msg, field, index, value);
 
 		return true;
 	}
@@ -556,6 +816,9 @@ public:
 
 	inline bool GetColor(const char *pszFieldName, Color *out)
 	{
+#if SOURCE_ENGINE != SE_CSGO
+		return false;
+#else
 		GETCHECK_FIELD();
 		CHECK_FIELD_TYPE(MESSAGE);
 		CHECK_FIELD_NOT_REPEATED();
@@ -569,10 +832,14 @@ public:
 			);
 
 		return true;
+#endif
 	}
 
 	inline bool SetColor(const char *pszFieldName, const Color &value)
 	{
+#if SOURCE_ENGINE != SE_CSGO
+		return false;
+#else
 		GETCHECK_FIELD();
 		CHECK_FIELD_TYPE(MESSAGE);
 		CHECK_FIELD_NOT_REPEATED();
@@ -584,10 +851,14 @@ public:
 		msgRGBA->set_a(value.a());
 
 		return true;
+#endif
 	}
 
 	inline bool GetRepeatedColor(const char *pszFieldName, int index, Color *out)
 	{
+#if SOURCE_ENGINE != SE_CSGO
+		return false;
+#else
 		GETCHECK_FIELD();
 		CHECK_FIELD_TYPE(MESSAGE);
 		CHECK_FIELD_REPEATED();
@@ -602,10 +873,34 @@ public:
 			);
 
 		return true;
+#endif
+	}
+
+	inline bool SetRepeatedColor(const char *pszFieldName, int index, const Color &value)
+	{
+#if SOURCE_ENGINE != SE_CSGO
+		return false;
+#else
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(MESSAGE);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+
+		CMsgRGBA *msgRGBA = (CMsgRGBA *)msg->GetReflection()->MutableRepeatedMessage(msg, field, index);
+		msgRGBA->set_r(value.r());
+		msgRGBA->set_g(value.g());
+		msgRGBA->set_b(value.b());
+		msgRGBA->set_a(value.a());
+
+		return true;
+#endif
 	}
 
 	inline bool AddColor(const char *pszFieldName, const Color &value)
 	{
+#if SOURCE_ENGINE != SE_CSGO
+		return false;
+#else
 		GETCHECK_FIELD();
 		CHECK_FIELD_TYPE(MESSAGE);
 		CHECK_FIELD_REPEATED();
@@ -617,6 +912,7 @@ public:
 		msgRGBA->set_a(value.a());
 
 		return true;
+#endif
 	}
 
 	inline bool GetVector2D(const char *pszFieldName, Vector2D *out)
@@ -663,6 +959,20 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedVector2D(const char *pszFieldName, int index, Vector2D &vec)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(MESSAGE);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+
+		CMsgVector2D *msgVec2d = (CMsgVector2D *)msg->GetReflection()->MutableRepeatedMessage(msg, field, index);
+		msgVec2d->set_x(vec.x);
+		msgVec2d->set_y(vec.y);
+
+		return true;
+	}
+
 	inline bool AddVector2D(const char *pszFieldName, Vector2D &vec)
 	{
 		GETCHECK_FIELD();
@@ -723,6 +1033,21 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedVector(const char *pszFieldName, int index, Vector &vec)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(MESSAGE);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+
+		CMsgVector *msgVec = (CMsgVector *)msg->GetReflection()->MutableRepeatedMessage(msg, field, index);
+		msgVec->set_x(vec.x);
+		msgVec->set_y(vec.y);
+		msgVec->set_z(vec.z);
+
+		return true;
+	}
+
 	inline bool AddVector(const char *pszFieldName, Vector &vec)
 	{
 		GETCHECK_FIELD();
@@ -784,6 +1109,21 @@ public:
 		return true;
 	}
 
+	inline bool SetRepeatedQAngle(const char *pszFieldName, int index, QAngle &vec)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_TYPE(MESSAGE);
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+
+		CMsgQAngle *msgAng = (CMsgQAngle *)msg->GetReflection()->MutableRepeatedMessage(msg, field, index);
+		msgAng->set_x(vec.x);
+		msgAng->set_y(vec.y);
+		msgAng->set_z(vec.z);
+
+		return true;
+	}
+
 	inline bool AddQAngle(const char *pszFieldName, QAngle &vec)
 	{
 		GETCHECK_FIELD();
@@ -845,6 +1185,24 @@ public:
 		return msg->GetReflection()->FieldSize(*msg, field);
 	}
 
+	inline bool RemoveRepeatedFieldValue(const char *pszFieldName, int index)
+	{
+		GETCHECK_FIELD();
+		CHECK_FIELD_REPEATED();
+		CHECK_REPEATED_ELEMENT(index);
+
+		// Protobuf guarantees that repeated field values will stay in order and so must we.
+		const protobuf::Reflection *pReflection = msg->GetReflection();
+		for (int i = index; i < elemCount - 1; ++i)
+		{
+			pReflection->SwapElements(msg, field, i, i + 1);
+		}
+
+		pReflection->RemoveLast(msg, field);
+
+		return true;
+	}
+
 private:
 	protobuf::Message *msg;
 	PBHandleList childHandles;

core/UserMessages.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
@@ -31,10 +31,12 @@
 
 #include "UserMessages.h"
 #include "sm_stringutil.h"
+#include "logic_bridge.h"
 
 #if SOURCE_ENGINE == SE_CSGO
 #include <cstrike15_usermessage_helpers.h>
 #endif
+#include <amtl/am-string.h>
 
 UserMessages g_UserMsgs;
 
@@ -53,7 +55,6 @@ UserMessages::UserMessages()
 #ifndef USE_PROTOBUF_USERMESSAGES
 	: m_InterceptBuffer(m_pBase, 2500)
 {
-	m_Names = sm_trie_create();
 #else
 	: m_InterceptBuffer(NULL)
 {
@@ -67,10 +68,6 @@ UserMessages::UserMessages()
 
 UserMessages::~UserMessages()
 {
-#ifndef USE_PROTOBUF_USERMESSAGES
-	sm_trie_destroy(m_Names);
-#endif
-
 	CStack<ListenerInfo *>::iterator iter;
 	for (iter=m_FreeListeners.begin(); iter!=m_FreeListeners.end(); iter++)
 	{
@@ -89,7 +86,7 @@ void UserMessages::OnSourceModStartup(bool late)
 
 void UserMessages::OnSourceModAllInitialized()
 {
-	g_ShareSys.AddInterface(NULL, this);
+	sharesys->AddInterface(NULL, this);
 }
 
 void UserMessages::OnSourceModAllShutdown()
@@ -97,13 +94,13 @@ void UserMessages::OnSourceModAllShutdown()
 	if (m_HookCount)
 	{
 #if SOURCE_ENGINE == SE_CSGO
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Pre, false);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Post, true);
+		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Pre), false);
+		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Post), true);
 #else
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
+		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Pre), false);
+		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Post), true);
+		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Pre), false);
+		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Post), true);
 #endif
 	}
 	m_HookCount = 0;
@@ -115,9 +112,9 @@ int UserMessages::GetMessageIndex(const char *msg)
 	// Can split this per engine and/or game later
 	return g_Cstrike15UsermessageHelpers.GetIndex(msg);
 #else
-	int msgid;
 
-	if (!sm_trie_retrieve(m_Names, msg, reinterpret_cast<void **>(&msgid)))
+	int msgid;
+	if (!m_Names.retrieve(msg, &msgid))
 	{
 		if (m_FallbackSearch)
 		{
@@ -129,7 +126,7 @@ int UserMessages::GetMessageIndex(const char *msg)
 			{
 				if (strcmp(msgbuf, msg) == 0)
 				{
-					sm_trie_insert(m_Names, msg, reinterpret_cast<void *>(msgid));
+					m_Names.insert(msg, msgid);
 					return msgid;
 				}
 				msgid++;
@@ -139,9 +136,7 @@ int UserMessages::GetMessageIndex(const char *msg)
 		msgid = g_SMAPI->FindUserMessage(msg);
 
 		if (msgid != INVALID_MESSAGE_ID)
-		{
-			sm_trie_insert(m_Names, msg, reinterpret_cast<void *>(msgid));
-		}
+			m_Names.insert(msg, msgid);
 	}
 
 	return msgid;
@@ -150,12 +145,14 @@ int UserMessages::GetMessageIndex(const char *msg)
 
 bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) const
 {
+#ifdef USE_PROTOBUF_USERMESSAGES
 #if SOURCE_ENGINE == SE_CSGO
 	const char *pszName = g_Cstrike15UsermessageHelpers.GetName(msgid);
+#endif
 	if (!pszName)
 		return false;
 
-	strncopy(buffer, pszName, maxlength);
+	ke::SafeStrcpy(buffer, maxlength, pszName);
 	return true;
 #else
 	if (m_FallbackSearch)
@@ -168,7 +165,7 @@ bool UserMessages::GetMessageName(int msgid, char *buffer, size_t maxlength) con
 
 	if (msg)
 	{
-		strncopy(buffer, msg, maxlength);
+		ke::SafeStrcpy(buffer, maxlength, msg);
 		return true;
 	}
 
@@ -259,7 +256,7 @@ google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const
 	if (m_CurFlags & USERMSG_BLOCKHOOKS)
 	{
 		// direct message creation, return buffer "from engine". keep track
-		m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
+		m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
 		buffer = m_FakeEngineBuffer;
 	} else {
 		char messageName[32];
@@ -274,12 +271,12 @@ google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const
 		{
 		case MRES_IGNORED:
 		case MRES_HANDLED:
-			m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
+			m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
 			buffer = m_FakeEngineBuffer;
 			break;		
 
 		case MRES_OVERRIDE:
-			m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
+			m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
 		// fallthrough
 		case MRES_SUPERCEDE:
 			buffer = msg;
@@ -416,13 +413,13 @@ bool UserMessages::InternalHook(int msg_id, IBitBufUserMessageListener *pListene
 	if (!m_HookCount++)
 	{
 #if SOURCE_ENGINE == SE_CSGO
-		SH_ADD_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Pre, false);
-		SH_ADD_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Post, true);
+		SH_ADD_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Pre), false);
+		SH_ADD_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Post), true);
 #else
-		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
-		SH_ADD_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
-		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
-		SH_ADD_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
+		SH_ADD_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Pre), false);
+		SH_ADD_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Post), true);
+		SH_ADD_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Pre), false);
+		SH_ADD_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Post), true);
 #endif
 	}
 
@@ -436,6 +433,15 @@ bool UserMessages::InternalHook(int msg_id, IBitBufUserMessageListener *pListene
 	return true;
 }
 
+#ifdef USE_PROTOBUF_USERMESSAGES
+const protobuf::Message *UserMessages::GetMessagePrototype(int msg_type)
+{
+#if SOURCE_ENGINE == SE_CSGO
+	return g_Cstrike15UsermessageHelpers.GetPrototype(msg_type);
+#endif
+}
+#endif
+
 #ifdef USE_PROTOBUF_USERMESSAGES
 bool UserMessages::InternalUnhook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew)
 #else
@@ -482,13 +488,13 @@ void UserMessages::_DecRefCounter()
 	if (--m_HookCount == 0)
 	{
 #if SOURCE_ENGINE == SE_CSGO
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Pre, false);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, SendUserMessage, engine, this, &UserMessages::OnSendUserMessage_Post, true);
+		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Pre), false);
+		SH_REMOVE_HOOK(IVEngineServer, SendUserMessage, engine, SH_MEMBER(this, &UserMessages::OnSendUserMessage_Post), true);
 #else
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Pre, false);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, UserMessageBegin, engine, this, &UserMessages::OnStartMessage_Post, true);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Pre, false);
-		SH_REMOVE_HOOK_MEMFUNC(IVEngineServer, MessageEnd, engine, this, &UserMessages::OnMessageEnd_Post, true);
+		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Pre), false);
+		SH_REMOVE_HOOK(IVEngineServer, UserMessageBegin, engine, SH_MEMBER(this, &UserMessages::OnStartMessage_Post), true);
+		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Pre), false);
+		SH_REMOVE_HOOK(IVEngineServer, MessageEnd, engine, SH_MEMBER(this, &UserMessages::OnMessageEnd_Post), true);
 #endif
 	}
 }
@@ -496,20 +502,25 @@ void UserMessages::_DecRefCounter()
 #if SOURCE_ENGINE == SE_CSGO
 void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
 {
+#if SOURCE_ENGINE == SE_CSGO
 	OnStartMessage_Pre(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
+#endif
 	if (m_FakeMetaRes == MRES_SUPERCEDE)
 	{
 		int size = msg.ByteSize();
 		uint8 *data = (uint8 *)stackalloc(size);
 		msg.SerializePartialToArray(data, size);
-		m_InterceptBuffer->ParseFromArray(data, size);
+		m_InterceptBuffer->ParsePartialFromArray(data, size);
 	}
 	else
 	{
 		m_FakeEngineBuffer = &const_cast<protobuf::Message &>(msg);
-		OnStartMessage_Post(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
 	}
 
+#if SOURCE_ENGINE == SE_CSGO
+	OnStartMessage_Post(&filter, msg_type, g_Cstrike15UsermessageHelpers.GetName(msg_type));
+#endif
+
 	OnMessageEnd_Pre();
 	if (m_FakeMetaRes == MRES_SUPERCEDE)
 		RETURN_META(MRES_SUPERCEDE);
@@ -568,7 +579,8 @@ bf_write *UserMessages::OnStartMessage_Pre(IRecipientFilter *filter, int msg_typ
 #ifdef USE_PROTOBUF_USERMESSAGES
 		if (m_InterceptBuffer)
 			delete m_InterceptBuffer;
-		m_InterceptBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_type)->New();
+		m_InterceptBuffer = GetMessagePrototype(msg_type)->New();
+
 		UM_RETURN_META_VALUE(MRES_SUPERCEDE, m_InterceptBuffer);
 #else
 		m_InterceptBuffer.Reset();
@@ -593,7 +605,10 @@ bf_write *UserMessages::OnStartMessage_Post(IRecipientFilter *filter, int msg_ty
 	}
 
 #ifdef USE_PROTOBUF_USERMESSAGES
-	m_OrigBuffer = m_FakeEngineBuffer;
+	if (m_FakeMetaRes == MRES_SUPERCEDE)
+		m_OrigBuffer = m_InterceptBuffer;
+	else
+		m_OrigBuffer = m_FakeEngineBuffer;
 #else
 	m_OrigBuffer = META_RESULT_ORIG_RET(bf_write *);
 #endif
@@ -743,8 +758,6 @@ void UserMessages::OnMessageEnd_Pre()
 	{
 #if SOURCE_ENGINE == SE_CSGO
 		ENGINE_CALL(SendUserMessage)(static_cast<IRecipientFilter &>(*m_CurRecFilter), m_CurId, *m_InterceptBuffer);
-		delete m_InterceptBuffer;
-		m_InterceptBuffer = NULL;
 #else
 		bf_write *engine_bfw;
 #if SOURCE_ENGINE >= SE_LEFT4DEAD
@@ -763,8 +776,9 @@ void UserMessages::OnMessageEnd_Pre()
 		int size = m_OrigBuffer->ByteSize();
 		uint8 *data = (uint8 *)stackalloc(size);
 		m_OrigBuffer->SerializePartialToArray(data, size);
-		protobuf::Message *pTempMsg = g_Cstrike15UsermessageHelpers.GetPrototype(m_CurId)->New();
-		pTempMsg->ParseFromArray(data, size);
+
+		protobuf::Message *pTempMsg = GetMessagePrototype(m_CurId)->New();
+		pTempMsg->ParsePartialFromArray(data, size);
 #else
 		bf_write *pTempMsg = m_OrigBuffer;
 #endif

core/UserMessages.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2010 AlliedModders LLC.  All rights reserved.
@@ -32,12 +32,14 @@
 #ifndef _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 #define _INCLUDE_SOURCEMOD_CUSERMESSAGES_H_
 
-#include "ShareSys.h"
 #include <IUserMessages.h>
 #include "sourcemm_api.h"
-#include "sm_trie.h"
+#include <sm_stringhashmap.h>
 #include "sm_stringutil.h"
 #include "CellRecipientFilter.h"
+#include "sm_globals.h"
+#include <sh_list.h>
+#include <sh_stack.h>
 
 using namespace SourceHook;
 using namespace SourceMod;
@@ -119,6 +121,7 @@ public:
 	void OnMessageEnd_Post();
 private:
 #ifdef USE_PROTOBUF_USERMESSAGES
+	const protobuf::Message *GetMessagePrototype(int msg_type);
 	bool InternalHook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew);
 	bool InternalUnhook(int msg_id, IProtobufUserMessageListener *pListener, bool intercept, bool isNew);
 #else
@@ -130,9 +133,9 @@ private:
 	List<ListenerInfo *> m_msgHooks[255];
 	List<ListenerInfo *> m_msgIntercepts[255];
 	CStack<ListenerInfo *> m_FreeListeners;
-	unsigned char m_pBase[2500];
 	IRecipientFilter *m_CurRecFilter;
 #ifndef USE_PROTOBUF_USERMESSAGES
+	unsigned char m_pBase[2500];
 	bf_write m_InterceptBuffer;
 	bf_write *m_OrigBuffer;
 	bf_read m_ReadBuffer;
@@ -150,7 +153,7 @@ private:
 #ifndef USE_PROTOBUF_USERMESSAGES
 	bool m_FallbackSearch;
 
-	Trie *m_Names;
+	StringHashMap<int> m_Names;
 #endif
 	CellRecipientFilter m_CellRecFilter;
 	bool m_InExec;

core/command_args.h

@@ -0,0 +1,77 @@
+// vim: set ts=4 sw=4 tw=99 noet :
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2015 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
+#ifndef _INCLUDE_SOURCEMOD_CCOMMANDARGS_IMPL_H_
+#define _INCLUDE_SOURCEMOD_CCOMMANDARGS_IMPL_H_
+
+#include "sourcemm_api.h"
+#include <IRootConsoleMenu.h>
+#include <compat_wrappers.h>
+
+#if SOURCE_ENGINE==SE_EPISODEONE || SOURCE_ENGINE==SE_DARKMESSIAH
+class EngineArgs : public ICommandArgs
+{
+public:
+	EngineArgs(const CCommand& _cmd)
+	{
+	}
+	const char *Arg(int n) const
+	{
+		return engine->Cmd_Argv(n);
+	}
+	int ArgC() const
+	{
+		return engine->Cmd_Argc();
+	}
+	const char *ArgS() const
+	{
+		return engine->Cmd_Args();
+	}
+};
+#else
+class EngineArgs : public ICommandArgs
+{
+	const CCommand *cmd;
+public:
+	EngineArgs(const CCommand& _cmd) : cmd(&_cmd)
+	{
+	}
+	const char *Arg(int n) const
+	{
+		return cmd->Arg(n);
+	}
+	int ArgC() const
+	{
+		return cmd->ArgC();
+	}
+	const char *ArgS() const
+	{
+		return cmd->ArgS();
+	}
+};
+#endif
+
+#endif // _INCLUDE_SOURCEMOD_CCOMMANDARGS_IMPL_H_

core/concmd_cleaner.cpp

@@ -1,33 +1,29 @@
-/**
- * vim: set ts=4 :
- * =============================================================================
- * SourceMod
- * Copyright (C) 2004-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$
- */
+// vim: set ts=4 sw=4 tw=99 et:
+// =============================================================================
+// SourceMod
+// Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+// =============================================================================
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License, version 3.0, as published by the
+// Free Software Foundation.
+// 
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// As a special exception, AlliedModders LLC gives you permission to link the
+// code of this program (as well as its derivative works) to "Half-Life 2," the
+// "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+// by the Valve Corporation.  You must obey the GNU General Public License in
+// all respects for all other code used.  Additionally, AlliedModders LLC grants
+// this exception to all derivative works.  AlliedModders LLC defines further
+// exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+// or <http://www.sourcemod.net/license.php>.
 
 #include "sm_globals.h"
 #include <sh_list.h>
@@ -36,10 +32,15 @@
 #include "sm_stringutil.h"
 #include "sourcemm_api.h"
 #include "compat_wrappers.h"
+#include <amtl/am-string.h>
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 SH_DECL_HOOK1_void(ICvar, UnregisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
+#if SOURCE_ENGINE == SE_CSGO
+SH_DECL_HOOK2_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *, bool);
+#else
 SH_DECL_HOOK1_void(ICvar, RegisterConCommand, SH_NOATTRIB, 0, ConCommandBase *);
+#endif
 #else
 SH_DECL_HOOK1_void(ICvar, RegisterConCommandBase, SH_NOATTRIB, 0, ConCommandBase *);
 #endif
@@ -64,24 +65,28 @@ public:
 	void OnSourceModAllInitialized()
 	{
 #if SOURCE_ENGINE >= SE_ORANGEBOX
-		SH_ADD_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
-		SH_ADD_HOOK_MEMFUNC(ICvar, RegisterConCommand, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+		SH_ADD_HOOK(ICvar, UnregisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false);
+		SH_ADD_HOOK(ICvar, RegisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
 #else
-		SH_ADD_HOOK_MEMFUNC(ICvar, RegisterConCommandBase, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+		SH_ADD_HOOK(ICvar, RegisterConCommandBase, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
 #endif
 	}
 
 	void OnSourceModShutdown()
 	{
 #if SOURCE_ENGINE >= SE_ORANGEBOX
-		SH_REMOVE_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false);
-		SH_REMOVE_HOOK_MEMFUNC(ICvar, RegisterConCommand, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+		SH_REMOVE_HOOK(ICvar, UnregisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false);
+		SH_REMOVE_HOOK(ICvar, RegisterConCommand, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
 #else
-		SH_REMOVE_HOOK_MEMFUNC(ICvar, RegisterConCommandBase, icvar, this, &ConCommandCleaner::LinkConCommandBase, false);
+		SH_REMOVE_HOOK(ICvar, RegisterConCommandBase, icvar, SH_MEMBER(this, &ConCommandCleaner::LinkConCommandBase), false);
 #endif
 	}
 
+#if SOURCE_ENGINE == SE_CSGO
+	void LinkConCommandBase(ConCommandBase *pBase, bool unknown)
+#else
 	void LinkConCommandBase(ConCommandBase *pBase)
+#endif
 	{
 		IConCommandLinkListener *listener = IConCommandLinkListener::head;
 		while (listener)
@@ -103,41 +108,20 @@ public:
 			listener = listener->next;
 		}
 
-		if (pBase)
-		{
-			while (iter != tracked_bases.end())
-			{
-				if ((*iter)->pBase == pBase)
-				{
-					pInfo = (*iter);
-					iter = tracked_bases.erase(iter);
-					pInfo->cls->OnUnlinkConCommandBase(pBase, pBase->GetName(), true);
-					delete pInfo;
-				}
-				else
-				{
-					iter++;
-				}
-			}
-		}
-		else
-		{
-			while (iter != tracked_bases.end())
-			{
-				/* This is just god-awful! */
-				if (FindCommandBase((*iter)->name) != (*iter)->pBase)
-				{
-					pInfo = (*iter);
-					iter = tracked_bases.erase(iter);
-					pInfo->cls->OnUnlinkConCommandBase(pBase, pInfo->name, false);
-					delete pInfo;
-				}
-				else
-				{
-					iter++;
-				}
-			}
-		}
+        while (iter != tracked_bases.end())
+        {
+            if ((*iter)->pBase == pBase)
+            {
+                pInfo = (*iter);
+                iter = tracked_bases.erase(iter);
+                pInfo->cls->OnUnlinkConCommandBase(pBase, pBase->GetName());
+                delete pInfo;
+            }
+            else
+            {
+                iter++;
+            }
+        }
 	}
 
 	void AddTarget(ConCommandBase *pBase, IConCommandTracker *cls)
@@ -146,7 +130,7 @@ public:
 
 		info->pBase = pBase;
 		info->cls = cls;
-		strncopy(info->name, pBase->GetName(), sizeof(info->name));
+		ke::SafeStrcpy(info->name, sizeof(info->name), pBase->GetName());
 
 		tracked_bases.push_back(info);
 	}

core/concmd_cleaner.h

@@ -35,7 +35,7 @@
 class IConCommandTracker
 {
 public:
-	virtual void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name, bool is_read_safe) = 0;
+	virtual void OnUnlinkConCommandBase(ConCommandBase *pBase, const char *name) = 0;
 };
 
 void TrackConCommandBase(ConCommandBase *pBase, IConCommandTracker *me);

core/convar_sm.h

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

core/convar_sm_l4d.h

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

core/convar_sm_ob.h

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

core/frame_hooks.cpp

@@ -30,7 +30,6 @@
  */
 #include "frame_hooks.h"
 #include "TimerSys.h"
-#include "Database.h"
 #include "HalfLife2.h"
 #include "MenuStyle_Valve.h"
 #include "MenuStyle_Radio.h"
@@ -38,6 +37,7 @@
 #include "CoreConfig.h"
 #include <sm_queue.h>
 #include <IThreader.h>
+#include "sourcemod.h"
 
 static IMutex *frame_mutex;
 static Queue<FrameAction> *frame_queue;
@@ -95,7 +95,6 @@ void RunFrameHooks(bool simulating)
 	}
 
 	/* Frame based hooks */
-	g_DBMan.RunFrame();
 	g_HL2.ProcessFakeCliCmdQueue();
 	g_HL2.ProcessDelayedKicks();
 

core/logic/ADTFactory.cpp

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

core/logic/ADTFactory.h

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

core/logic/AMBuilder

@@ -1,60 +1,99 @@
-# vim: set ts=2 sw=2 tw=99 noet ft=python: 
+# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
-compiler = SM.DefaultCompiler()
-base = AMBuild.sourceFolder
-compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
-compiler['CXXINCLUDES'].append(os.path.join(base, 'core', 'logic'))
-compiler['CXXINCLUDES'].append(os.path.join(base, 'public'))
-compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn'))
-compiler['CDEFINES'].append('SM_DEFAULT_THREADER')
-compiler['CDEFINES'].append('SM_LOGIC')
+for arch in SM.archs:
+  binary = SM.Library(builder, 'sourcemod.logic', arch)
+  binary.compiler.cxxincludes += [
+    builder.sourcePath,
+    os.path.join(builder.sourcePath, 'core', 'logic'),
+    os.path.join(builder.sourcePath, 'public'),
+    os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
+    os.path.join(builder.sourcePath, 'public', 'amtl', 'amtl'),
+    os.path.join(builder.sourcePath, 'public', 'amtl'),
+    os.path.join(SM.mms_root, 'core', 'sourcehook')
+  ]
+  binary.compiler.defines += [
+    'SM_DEFAULT_THREADER',
+    'SM_LOGIC'
+  ]
+  
+  if builder.target.platform == 'linux':
+    binary.compiler.postlink += ['-lpthread', '-lrt']
+  elif builder.target.platform == 'mac':
+    binary.compiler.cflags += ['-Wno-deprecated-declarations']
+    binary.compiler.postlink += ['-framework', 'CoreServices']
 
-if AMBuild.target['platform'] == 'linux':
-	compiler['POSTLINKFLAGS'].append('-lpthread')
-if AMBuild.target['platform'] == 'darwin':
-	compiler['CFLAGS'].extend(['-Wno-deprecated-declarations'])
-	compiler['POSTLINKFLAGS'].extend(['-framework', 'CoreServices'])
+  if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
+    binary.compiler.cxxflags += ['-fno-rtti']
+  elif binary.compiler.family == 'msvc':
+    binary.compiler.cxxflags += ['/GR-']
 
-extension = AMBuild.AddJob('sourcemod.logic')
-binary = Cpp.LibraryBuilder('sourcemod.logic', AMBuild, extension, compiler)
-files = [
-	'common_logic.cpp',
-	'smn_adt_array.cpp',
-	'smn_sorting.cpp',
-	'smn_maplists.cpp',
-	'smn_adt_stack.cpp',
-	'thread/ThreadWorker.cpp',
-	'thread/BaseWorker.cpp',
-	'ThreadSupport.cpp',
-	'smn_float.cpp',
-	'TextParsers.cpp',
-	'smn_textparse.cpp',
-	'smn_adt_trie.cpp',
-	'Profiler.cpp',
-	'smn_functions.cpp',
-	'smn_timers.cpp',
-	'smn_players.cpp',
-	'MemoryUtils.cpp',
-	'smn_admin.cpp',
-	'smn_banning.cpp',
-	'stringutil.cpp',
-	'Translator.cpp',
-	'PhraseCollection.cpp',
-	'smn_lang.cpp',
-	'smn_string.cpp',
-	'smn_handles.cpp',
-	'smn_datapacks.cpp',
-	'smn_gameconfigs.cpp',
-	'GameConfigs.cpp',
-	'sm_crc32.cpp',
-	'smn_profiler.cpp'
-	]
-if AMBuild.target['platform'] == 'windows':
-	files.append('thread/WinThreads.cpp')
-else:
-	files.append('thread/PosixThreads.cpp')
-binary.AddSourceFiles('core/logic', files)
-SM.AutoVersion('core/logic', binary)
-binary.SendToJob()
+  binary.sources += [
+    'common_logic.cpp',
+    'smn_adt_array.cpp',
+    'smn_sorting.cpp',
+    'smn_maplists.cpp',
+    'ADTFactory.cpp',
+    'smn_adt_stack.cpp',
+    'thread/ThreadWorker.cpp',
+    'thread/BaseWorker.cpp',
+    'ThreadSupport.cpp',
+    'smn_float.cpp',
+    'TextParsers.cpp',
+    'smn_textparse.cpp',
+    'smn_adt_trie.cpp',
+    'smn_functions.cpp',
+    'smn_timers.cpp',
+    'smn_players.cpp',
+    'MemoryUtils.cpp',
+    'smn_admin.cpp',
+    'smn_banning.cpp',
+    'smn_filesystem.cpp',
+    'stringutil.cpp',
+    'Translator.cpp',
+    'PhraseCollection.cpp',
+    'smn_lang.cpp',
+    'smn_string.cpp',
+    'smn_handles.cpp',
+    'smn_datapacks.cpp',
+    'smn_gameconfigs.cpp',
+    'smn_fakenatives.cpp',
+    'GameConfigs.cpp',
+    'sm_crc32.cpp',
+    'smn_profiler.cpp',
+    'ShareSys.cpp',
+    'PluginSys.cpp',
+    'HandleSys.cpp',
+    'NativeOwner.cpp',
+    'ExtensionSys.cpp',
+    'DebugReporter.cpp',
+    'Database.cpp',
+    'smn_database.cpp',
+    'ForwardSys.cpp',
+    'AdminCache.cpp',
+    'sm_trie.cpp',
+    'smn_console.cpp',
+    'ProfileTools.cpp',
+    'Logger.cpp',
+    'smn_core.cpp',
+    'smn_menus.cpp',
+    'sprintf.cpp',
+    'LibrarySys.cpp',
+    'RootConsoleMenu.cpp',
+    'CDataPack.cpp',
+    'frame_tasks.cpp',
+    'smn_halflife.cpp',
+    'FrameIterator.cpp',
+    'DatabaseConfBuilder.cpp',
+    'NativeInvoker.cpp',
+  ]
 
+  if arch == 'x64':
+    binary.sources += ['PseudoAddrManager.cpp']
+
+  if builder.target.platform == 'windows':
+    binary.sources += ['thread/WinThreads.cpp']
+  else:
+    binary.sources += ['thread/PosixThreads.cpp']
+
+  SM.binaries += [builder.Add(binary)]

core/logic/AdminCache.h

@@ -1,208 +1,231 @@
-/**
- * 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_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);
-	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);
-public:
-	bool IsValidAdmin(AdminId id);
-	void DumpCache(FILE *fp);
-	AdminGroup *GetGroup(GroupId gid);
-	AdminUser *GetUser(AdminId id);
-	const char *GetString(int idx);
-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);
-	const char *GetMethodName(unsigned int index);
-	void NameFlag(const char *str, AdminFlag flag);
-public:
-	BaseStringTable *m_pStrings;
-	BaseMemTable *m_pMemory;
-	Trie *m_pCmdOverrides;
-	Trie *m_pCmdGrpOverrides;
-	int m_FirstGroup;
-	int m_LastGroup;
-	int m_FreeGroupList;
-	Trie *m_pGroups;
-	List<IAdminListener *> m_hooks;
-	List<AuthMethod> m_AuthMethods;
-	Trie *m_pAuthTables;
-	IForward *m_pCacheFwd;
-	int m_FirstUser;
-	int m_LastUser;
-	int m_FreeUserList;
-	bool m_InvalidatingAdmins;
-	bool m_destroying;
-	Trie *m_pLevelNames;
-};
-
-extern AdminCache g_Admins;
-
-#endif //_INCLUDE_SOURCEMOD_ADMINCACHE_H_
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_ADMINCACHE_H_
+#define _INCLUDE_SOURCEMOD_ADMINCACHE_H_
+
+#include "common_logic.h"
+#include <IAdminSystem.h>
+#include "sm_memtable.h"
+#include <sm_trie.h>
+#include <sh_list.h>
+#include <sh_string.h>
+#include <IForwardSys.h>
+#include <sm_stringhashmap.h>
+#include <sm_namehashset.h>
+
+using namespace SourceHook;
+
+#define GRP_MAGIC_SET		0xDEADFADE
+#define GRP_MAGIC_UNSET		0xFACEFACE
+#define USR_MAGIC_SET		0xDEADFACE
+#define USR_MAGIC_UNSET		0xFADEDEAD
+
+typedef StringHashMap<OverrideRule> OverrideMap;
+
+struct AdminGroup
+{
+	uint32_t magic;					/* Magic flag, for memory validation (ugh) */
+	unsigned int immunity_level;	/* Immunity level */
+	/* Immune from target table (-1 = nonexistent)
+	 * [0] = number of entries
+	 * [1...N] = immune targets
+	 */
+	int immune_table;			
+	OverrideMap *pCmdTable;			/* Command override table (can be NULL) */
+	OverrideMap *pCmdGrpTable;		/* Command group override table (can be NULL) */
+	int next_grp;					/* Next group in the chain */
+	int prev_grp;					/* Previous group in the chain */
+	int nameidx;					/* Name */
+	FlagBits addflags;				/* Additive flags */
+};
+
+struct AuthMethod
+{
+	String name;
+	StringHashMap<AdminId> identities;
+
+	AuthMethod(const char *name)
+		: name(name)
+	{
+	}
+
+	static inline bool matches(const char *name, const AuthMethod *method)
+	{
+		return strcmp(name, method->name.c_str()) == 0;
+	}
+	static inline uint32_t hash(const detail::CharsAndLength &key)
+	{
+		return key.hash();
+	}
+};
+
+struct UserAuth
+{
+	unsigned int index;				/* Index into auth table */
+	int identidx;					/* Index into the string table */
+};
+
+struct AdminUser
+{
+	uint32_t magic;					/* Magic flag, for memory validation */
+	FlagBits flags;					/* Flags */
+	FlagBits eflags;				/* Effective flags */
+	int nameidx;					/* Name index */
+	int password;					/* Password index */
+	unsigned int grp_count;			/* Number of groups */
+	unsigned int grp_size;			/* Size of groups table */
+	int grp_table;					/* Group table itself */
+	int next_user;					/* Next user in the list */
+	int prev_user;					/* Previous user in the list */
+	UserAuth auth;					/* Auth method for this user */
+	unsigned int immunity_level;	/* Immunity level */
+	unsigned int serialchange;		/* Serial # for changes */
+};
+
+class AdminCache : 
+	public IAdminSystem,
+	public SMGlobalClass
+{
+public:
+	AdminCache();
+	~AdminCache();
+public: //SMGlobalClass
+	void OnSourceModStartup(bool late);
+	void OnSourceModAllInitialized();
+	void OnSourceModLevelChange(const char *mapName);
+	void OnSourceModShutdown();
+	void OnSourceModPluginsLoaded();
+public: //IAdminSystem
+	/** Command cache stuff */
+	void AddCommandOverride(const char *cmd, OverrideType type, FlagBits flags);
+	bool GetCommandOverride(const char *cmd, OverrideType type, FlagBits *flags);
+	void UnsetCommandOverride(const char *cmd, OverrideType type);
+	/** Group cache stuff */
+	GroupId AddGroup(const char *group_name);
+	GroupId FindGroupByName(const char *group_name);
+	void SetGroupAddFlag(GroupId id, AdminFlag flag, bool enabled);
+	bool GetGroupAddFlag(GroupId id, AdminFlag flag);
+	FlagBits GetGroupAddFlags(GroupId id);
+	void SetGroupGenericImmunity(GroupId id, ImmunityType type, bool enabled);
+	bool GetGroupGenericImmunity(GroupId id, ImmunityType type);
+	void InvalidateGroup(GroupId id);
+	void AddGroupImmunity(GroupId id, GroupId other_id);
+	unsigned int GetGroupImmunityCount(GroupId id);
+	GroupId GetGroupImmunity(GroupId id, unsigned int number);
+	void AddGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule rule);
+	bool GetGroupCommandOverride(GroupId id, const char *name, OverrideType type, OverrideRule *pRule);
+	void DumpAdminCache(AdminCachePart part, bool rebuild);
+	void AddAdminListener(IAdminListener *pListener);
+	void RemoveAdminListener(IAdminListener *pListener);
+	/** User stuff */
+	void RegisterAuthIdentType(const char *name);
+	AdminId CreateAdmin(const char *name);
+	const char *GetAdminName(AdminId id);
+	bool BindAdminIdentity(AdminId id, const char *auth, const char *ident);
+	virtual void SetAdminFlag(AdminId id, AdminFlag flag, bool enabled);
+	bool GetAdminFlag(AdminId id, AdminFlag flag, AccessMode mode);
+	FlagBits GetAdminFlags(AdminId id, AccessMode mode);
+	bool AdminInheritGroup(AdminId id, GroupId gid);
+	unsigned int GetAdminGroupCount(AdminId id);
+	GroupId GetAdminGroup(AdminId id, unsigned int index, const char **name);
+	void SetAdminPassword(AdminId id, const char *password);
+	const char *GetAdminPassword(AdminId id);
+	AdminId FindAdminByIdentity(const char *auth, const char *identity);
+	bool InvalidateAdmin(AdminId id);
+	unsigned int FlagBitsToBitArray(FlagBits bits, bool array[], unsigned int maxSize);
+	FlagBits FlagBitArrayToBits(const bool array[], unsigned int maxSize);
+	FlagBits FlagArrayToBits(const AdminFlag array[], unsigned int numFlags);
+	unsigned int FlagBitsToArray(FlagBits bits, AdminFlag array[], unsigned int maxSize);
+	bool CheckAdminFlags(AdminId id, FlagBits bits);
+	bool CanAdminTarget(AdminId id, AdminId target);
+	void SetAdminFlags(AdminId id, AccessMode mode, FlagBits bits);
+	bool FindFlag(const char *str, AdminFlag *pFlag);
+	bool FindFlag(char c, AdminFlag *pAdmFlag);
+	FlagBits ReadFlagString(const char *flags, const char **end);
+	size_t FillFlagString(FlagBits bits, char *buffer, size_t maxlen);
+	unsigned int GetAdminSerialChange(AdminId id);
+	bool CanAdminUseCommand(int client, const char *cmd);
+	const char *GetGroupName(GroupId gid);
+	unsigned int SetGroupImmunityLevel(GroupId gid, unsigned int level);
+	unsigned int GetGroupImmunityLevel(GroupId gid);
+	unsigned int SetAdminImmunityLevel(AdminId id, unsigned int level);
+	unsigned int GetAdminImmunityLevel(AdminId id);
+	bool CheckAccess(int client, 
+		const char *cmd, 
+		FlagBits flags, 
+		bool override_only);
+	bool FindFlagChar(AdminFlag flag, char *c);
+	bool IsValidAdmin(AdminId id);
+	bool CheckClientCommandAccess(int client, const char *cmd, FlagBits cmdflags);
+public:
+	bool DumpCache(const char *filename);
+	AdminGroup *GetGroup(GroupId gid);
+	AdminUser *GetUser(AdminId id);
+	const char *GetString(int idx);
+	bool CheckAdminCommandAccess(AdminId adm, const char *cmd, FlagBits flags);
+private:
+	void _UnsetCommandOverride(const char *cmd);
+	void _UnsetCommandGroupOverride(const char *group);
+	void InvalidateGroupCache();
+	void InvalidateAdminCache(bool unlink_admins);
+	void DumpCommandOverrideCache(OverrideType type);
+	AuthMethod *GetMethodByIndex(unsigned int index);
+	bool GetMethodIndex(const char *name, unsigned int *_index);
+	const char *GetMethodName(unsigned int index);
+	void NameFlag(const char *str, AdminFlag flag);
+	bool GetUnifiedSteamIdentity(const char *ident, char *out, size_t maxlen);
+public:
+	typedef StringHashMap<FlagBits> FlagMap;
+
+	BaseStringTable *m_pStrings;
+	BaseMemTable *m_pMemory;
+	FlagMap m_CmdOverrides;
+	FlagMap m_CmdGrpOverrides;
+	int m_FirstGroup;
+	int m_LastGroup;
+	int m_FreeGroupList;
+	StringHashMap<GroupId> m_Groups;
+	List<IAdminListener *> m_hooks;
+	List<AuthMethod *> m_AuthMethods;
+	NameHashSet<AuthMethod *> m_AuthTables;
+	IForward *m_pCacheFwd;
+	int m_FirstUser;
+	int m_LastUser;
+	int m_FreeUserList;
+	bool m_InvalidatingAdmins;
+	bool m_destroying;
+	StringHashMap<AdminFlag> m_LevelNames;
+};
+
+extern AdminCache g_Admins;
+
+#endif //_INCLUDE_SOURCEMOD_ADMINCACHE_H_

core/logic/CDataPack.cpp

@@ -0,0 +1,244 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "CDataPack.h"
+#include <amtl/am-autoptr.h>
+
+CDataPack::CDataPack()
+{
+	Initialize();
+}
+
+CDataPack::~CDataPack()
+{
+	Initialize();
+}
+
+static ke::Vector<ke::AutoPtr<CDataPack>> sDataPackCache;
+
+CDataPack *CDataPack::New()
+{
+  if (sDataPackCache.empty())
+    return new CDataPack();
+
+  CDataPack *pack = sDataPackCache.back().take();
+  sDataPackCache.pop();
+  pack->Initialize();
+  return pack;
+}
+
+void
+CDataPack::Free(CDataPack *pack)
+{
+  sDataPackCache.append(static_cast<CDataPack *>(pack));
+}
+
+void CDataPack::Initialize()
+{
+	do
+	{
+	} while (this->RemoveItem());
+
+	elements.clear();
+	position = 0;
+}
+
+void CDataPack::ResetSize()
+{
+	Initialize();
+}
+
+size_t CDataPack::CreateMemory(size_t size, void **addr)
+{
+	InternalPack val;
+	val.type = CDataPackType::Raw;
+	val.pData.vval = new uint8_t[size + sizeof(size)];
+	reinterpret_cast<size_t *>(val.pData.vval)[0] = size;
+	elements.insert(position, val);
+
+	return position++;
+}
+
+void CDataPack::PackCell(cell_t cell)
+{
+	InternalPack val;
+	val.type = CDataPackType::Cell;
+	val.pData.cval = cell;
+	elements.insert(position++, val);
+}
+
+void CDataPack::PackFunction(cell_t function)
+{
+	InternalPack val;
+	val.type = CDataPackType::Function;
+	val.pData.cval = function;
+	elements.insert(position++, val);
+}
+
+void CDataPack::PackFloat(float floatval)
+{
+	InternalPack val;
+	val.type = CDataPackType::Float;
+	val.pData.fval = floatval;
+	elements.insert(position++, val);
+}
+
+void CDataPack::PackString(const char *string)
+{
+	InternalPack val;
+	val.type = CDataPackType::String;
+	ke::AString *sval = new ke::AString(string);
+	val.pData.sval = sval;
+	elements.insert(position++, val);
+}
+
+void CDataPack::Reset() const
+{
+	position = 0;
+}
+
+size_t CDataPack::GetPosition() const
+{
+	return position;
+}
+
+bool CDataPack::SetPosition(size_t pos) const
+{
+	if (pos > elements.length())
+		return false;
+
+	position = pos;
+	return true;
+}
+
+cell_t CDataPack::ReadCell() const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::Cell)
+		return 0;
+	
+	return elements[position++].pData.cval;
+}
+
+cell_t CDataPack::ReadFunction() const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::Function)
+		return 0;
+	
+	return elements[position++].pData.cval;
+}
+
+float CDataPack::ReadFloat() const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::Float)
+		return 0;
+	
+	return elements[position++].pData.fval;
+}
+
+bool CDataPack::IsReadable(size_t bytes) const
+{
+	return (position < elements.length());
+}
+
+const char *CDataPack::ReadString(size_t *len) const
+{
+	if (!IsReadable() || elements[position].type != CDataPackType::String)
+	{
+		if (len)
+			*len = 0;
+
+		return nullptr;
+	}
+
+	const ke::AString &val = *elements[position++].pData.sval;
+	if (len)
+		*len = val.length();
+
+	return val.chars();
+}
+
+void *CDataPack::ReadMemory(size_t *size) const
+{
+	void *ptr = nullptr;
+	if (!IsReadable() || elements[position].type != CDataPackType::Raw)
+		return ptr;
+
+	size_t *val = reinterpret_cast<size_t *>(elements[position].pData.vval);
+	ptr = &(val[1]);
+	++position;
+
+	if (size)
+		*size = val[0]; /* Egor!!!! */
+
+	return ptr;
+}
+
+bool CDataPack::RemoveItem(size_t pos)
+{
+	if (!elements.length())
+	{
+		return false;
+	}
+
+	if (pos == static_cast<size_t>(-1))
+	{
+		pos = position;
+	}
+	if (pos >= elements.length())
+	{
+		return false;
+	}
+
+	if (pos < position) // we're deleting under us, step back
+	{
+		--position;
+	}
+
+	switch (elements[pos].type)
+	{
+		case CDataPackType::Raw:
+		{
+			delete elements[pos].pData.vval;
+			break;
+		}
+
+		case CDataPackType::String:
+		{
+			delete elements[pos].pData.sval;
+			break;
+		}
+	}
+
+	elements.remove(pos);
+	return true;
+}

core/logic/CDataPack.h

@@ -0,0 +1,196 @@
+/**
+ * vim: set ts=4 :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
+ * =============================================================================
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, version 3.0, as published by the
+ * Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * As a special exception, AlliedModders LLC gives you permission to link the
+ * code of this program (as well as its derivative works) to "Half-Life 2," the
+ * "Source Engine," the "SourcePawn JIT," and any Game MODs that run on software
+ * by the Valve Corporation.  You must obey the GNU General Public License in
+ * all respects for all other code used.  Additionally, AlliedModders LLC grants
+ * this exception to all derivative works.  AlliedModders LLC defines further
+ * exceptions, found in LICENSE.txt (as of this writing, version JULY-31-2007),
+ * or <http://www.sourcemod.net/license.php>.
+ *
+ * Version: $Id$
+ */
+
+#ifndef _INCLUDE_SOURCEMOD_CDATAPACK_H_
+#define _INCLUDE_SOURCEMOD_CDATAPACK_H_
+
+#include <ISourceMod.h>
+#include <amtl/am-vector.h>
+#include <amtl/am-string.h>
+
+using namespace SourceMod;
+
+enum CDataPackType {
+	Raw,
+	Cell,
+	Float,
+	String,
+	Function
+};
+
+class CDataPack
+{
+public:
+	CDataPack();
+	~CDataPack();
+
+    static CDataPack *New();
+    static void Free(CDataPack *pack);
+
+public: // Originally IDataReader
+	/**
+	 * @brief Resets the position in the data stream to the beginning.
+	 */
+	void Reset() const;
+
+	/**
+	 * @brief Retrieves the current stream position.
+	 *
+	 * @return			Index into the stream.
+	 */
+	size_t GetPosition() const;
+
+	/**
+	 * @brief Sets the current stream position.
+	 *
+	 * @param pos		Index to set the stream at.
+	 * @return			True if succeeded, false if out of bounds.
+	 */
+	bool SetPosition(size_t pos) const;
+
+	/**
+	 * @brief Reads one cell from the data stream.
+	 *
+	 * @return			A cell read from the current position.
+	 */
+	cell_t ReadCell() const;
+
+	/**
+	 * @brief Reads one float from the data stream.
+	 *
+	 * @return			A float read from the current position.
+	 */
+	float ReadFloat() const;
+
+	/**
+	 * @brief Returns whether or not a specified number of bytes from the current stream
+	 *  position to the end can be read.
+	 *
+	 * @param bytes		Number of bytes to simulate reading.
+	 * @return			True if can be read, false otherwise.
+	 */
+	bool IsReadable(size_t bytes = 0) const;
+
+	/**
+	 * @brief Reads a string from the data stream.
+	 *
+	 * @param len		Optional pointer to store the string length.
+	 * @return			Pointer to the string, or NULL if out of bounds.
+	 */
+	const char *ReadString(size_t *len) const;
+
+	/**
+	 * @brief Reads the current position as a generic data type.
+	 *
+	 * @param size		Optional pointer to store the size of the data type.
+	 * @return			Pointer to the data, or NULL if out of bounds.
+	 */
+	void *ReadMemory(size_t *size) const;
+
+	/**
+	 * @brief Reads a function pointer from the data stream.
+	 *
+	 * @return			A function pointer read from the current position.
+	 */
+	cell_t ReadFunction() const;
+
+public: // Originally IDataPack
+	/**
+	 * @brief Resets the used size of the stream back to zero.
+	 */
+	void ResetSize();
+
+	/**
+	 * @brief Packs one cell into the data stream.
+	 *
+	 * @param cell		Cell value to write.
+	 */
+	void PackCell(cell_t cell);
+
+	/**
+	 * @brief Packs one float into the data stream.
+	 *
+	 * @param val		Float value to write.
+	 */
+	void PackFloat(float val);
+
+	/**
+	 * @brief Packs one string into the data stream.
+	 * The length is recorded as well for buffer overrun protection.
+	 *
+	 * @param string	String to write.
+	 */
+	void PackString(const char *string);
+
+	/**
+	 * @brief Creates a generic block of memory in the stream.
+	 *
+	 * Note that the pointer it returns can be invalidated on further
+	 * writing, since the stream size may grow.  You may need to double back
+	 * and fetch the pointer again.
+	 *
+	 * @param size		Size of the memory to create in the stream.
+	 * @param addr		Optional pointer to store the relocated memory address.
+	 * @return			Current position of the stream beforehand.
+	 */
+	size_t CreateMemory(size_t size, void **addr);
+
+	/**
+	 * @brief Packs one function pointer into the data stream.
+	 *
+	 * @param function	The function pointer to write.
+	 */
+	void PackFunction(cell_t function);
+
+public:
+	void Initialize();
+	inline size_t GetCapacity() const { return this->elements.length(); };
+	inline CDataPackType GetCurrentType(void) const { return this->elements[this->position].type; };
+	bool RemoveItem(size_t pos = -1);
+
+private:
+	typedef union {
+		cell_t cval;
+		float fval;
+		uint8_t *vval;
+		ke::AString *sval;
+	} InternalPackValue;
+	
+	typedef struct {
+		InternalPackValue pData;
+		CDataPackType type;
+	} InternalPack;
+
+	ke::Vector<InternalPack> elements;
+	mutable size_t position;
+};
+
+#endif //_INCLUDE_SOURCEMOD_CDATAPACK_H_

core/logic/CellArray.h

@@ -34,10 +34,11 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <ICellArray.h>
 
 extern HandleType_t htCellArray;
 
-class CellArray
+class CellArray : public ICellArray
 {
 public:
 	CellArray(size_t blocksize) : m_Data(NULL), m_BlockSize(blocksize), m_AllocSize(0), m_Size(0)
@@ -49,6 +50,31 @@ public:
 		free(m_Data);
 	}
 
+	/**
+	* @brief Creates a cell array object.
+	*
+	* @param blocksize  The number of cells each member of the array can
+	*                   hold.  For example, 32 cells is equivalent to:
+	*                   new Array[X][32]
+	* @return			A new ICellArray object.
+	*/
+	static ICellArray *New(size_t blocksize)
+	{
+		return new CellArray(blocksize);
+	}
+
+	/**
+	* @brief Releases a cell array's resources.
+	*
+	* @param pack		An ICellArray object to release.
+	*/
+	static void Free(ICellArray *arr)
+	{
+		delete arr;
+	}
+
+	// ICellArray
+public:
 	size_t size() const
 	{
 		return m_Size;
@@ -154,12 +180,18 @@ public:
 		return true;
 	}
 
-	CellArray *clone()
+	ICellArray *clone()
 	{
 		CellArray *array = new CellArray(m_BlockSize);
 		array->m_AllocSize = m_AllocSize;
 		array->m_Size = m_Size;
 		array->m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize);
+		if (!array->m_Data)
+		{
+			delete array;
+			return NULL;
+		}
+		
 		memcpy(array->m_Data, m_Data, sizeof(cell_t) * m_BlockSize * m_Size);
 		return array;
 	}
@@ -195,11 +227,17 @@ private:
 		/* finally, allocate the new block */
 		if (m_Data)
 		{
-			m_Data = (cell_t *)realloc(m_Data, sizeof(cell_t) * m_BlockSize * m_AllocSize);
+			cell_t *data = static_cast<cell_t*>(realloc(m_Data, sizeof(cell_t) * m_BlockSize * m_AllocSize));
+			if (!data)  // allocation failure
+			{
+				return false;
+			}
+
+			m_Data = data;
 		} else {
-			m_Data = (cell_t *)malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize);
+			m_Data = static_cast<cell_t*>(malloc(sizeof(cell_t) * m_BlockSize * m_AllocSize));
 		}
-		return (m_Data != NULL);
+		return (m_Data != nullptr);
 	}
 private:
 	cell_t *m_Data;

core/logic/Database.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -30,14 +30,14 @@
  */
 
 #include "Database.h"
+#include "ISourceMod.h"
 #include "HandleSys.h"
-#include "ShareSys.h"
-#include "sourcemod.h"
-#include "sm_stringutil.h"
-#include "Logger.h"
 #include "ExtensionSys.h"
+#include "PluginSys.h"
 #include <stdlib.h>
 #include <IThreader.h>
+#include <bridge/include/ILogger.h>
+#include <bridge/include/CoreProvider.h>
 
 #define DBPARSE_LEVEL_NONE		0
 #define DBPARSE_LEVEL_MAIN		1
@@ -47,10 +47,16 @@ DBManager g_DBMan;
 static bool s_OneTimeThreaderErrorMsg = false;
 
 DBManager::DBManager() 
-: m_ParseLevel(0), m_ParseState(0), m_pDefault(NULL)
+	: m_Terminate(false),
+	  m_pDefault(NULL)
 {
 }
 
+static void FrameHook(bool simulating)
+{
+	g_DBMan.RunFrame();
+}
+
 void DBManager::OnSourceModAllInitialized()
 {
 	HandleAccess sec;
@@ -58,53 +64,38 @@ void DBManager::OnSourceModAllInitialized()
 	g_HandleSys.InitAccessDefaults(NULL, &sec);
 	sec.access[HandleAccess_Delete] |= HANDLE_RESTRICT_IDENTITY;
 	sec.access[HandleAccess_Clone] |= HANDLE_RESTRICT_IDENTITY;
-	
+
 	m_DriverType = g_HandleSys.CreateType("IDriver", this, 0, NULL, &sec, g_pCoreIdent, NULL);
 	m_DatabaseType = g_HandleSys.CreateType("IDatabase", this, 0, NULL, NULL, g_pCoreIdent, NULL);
 
 	g_ShareSys.AddInterface(NULL, this);
 
-	g_SourceMod.BuildPath(Path_SM, m_Filename, sizeof(m_Filename), "configs/databases.cfg");
-
-	m_pConfigLock = g_pThreader->MakeMutex();
-	m_pThinkLock = g_pThreader->MakeMutex();
-	m_pQueueLock = g_pThreader->MakeMutex();
-
+	g_pSM->BuildPath(Path_SM, m_Filename, sizeof(m_Filename), "configs/databases.cfg");
+	m_Builder.SetPath(m_Filename);
+	
 	g_PluginSys.AddPluginsListener(this);
+
+	g_pSM->AddGameFrameHook(&FrameHook);
+
+	auto sm_reload_databases = [this] (int client, const ICommandArgs *args) -> bool {
+		m_Builder.StartParse();
+		return true;
+	};
+	bridge->DefineCommand("sm_reload_databases", "Reparse database configurations file", sm_reload_databases);
 }
 
 void DBManager::OnSourceModLevelChange(const char *mapName)
 {
-	SMCError err;
-	SMCStates states = {0, 0};
-
-	/* We lock and don't give up the lock until we're done.
-	 * This way the thread's search won't be searching through a
-	 * potentially empty/corrupt list, which would be very bad.
-	 */
-	m_pConfigLock->Lock();
-	if ((err = textparsers->ParseFile_SMC(m_Filename, this, &states)) != SMCError_Okay)
-	{
-		g_Logger.LogError("[SM] Detected parse error(s) in file \"%s\"", m_Filename);
-		if (err != SMCError_Custom)
-		{
-			const char *txt = textparsers->GetSMCErrorString(err);
-			g_Logger.LogError("[SM] Line %d: %s", states.line, txt);
-		}
-	}
-	m_pConfigLock->Unlock();
+	m_Builder.StartParse();
 }
 
 void DBManager::OnSourceModShutdown()
 {
+	g_pSM->RemoveGameFrameHook(&FrameHook);
 	KillWorkerThread();
 	g_PluginSys.RemovePluginsListener(this);
-	m_pConfigLock->DestroyThis();
-	m_pThinkLock->DestroyThis();
-	m_pQueueLock->DestroyThis();
 	g_HandleSys.RemoveType(m_DatabaseType, g_pCoreIdent);
 	g_HandleSys.RemoveType(m_DriverType, g_pCoreIdent);
-	ClearConfigs();
 }
 
 unsigned int DBManager::GetInterfaceVersion()
@@ -132,136 +123,10 @@ void DBManager::OnHandleDestroy(HandleType_t type, void *object)
 	}
 }
 
-void DBManager::ReadSMC_ParseStart()
-{
-	ClearConfigs();
-	m_ParseLevel = 0;
-	m_ParseState = DBPARSE_LEVEL_NONE;
-	m_DefDriver.clear();
-}
-
-void DBManager::ClearConfigs()
-{
-	List<ConfDbInfo *>::iterator iter;
-	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
-		delete (*iter);
-	m_confs.clear();
-}
-
-ConfDbInfo s_CurInfo;
-SMCResult DBManager::ReadSMC_NewSection(const SMCStates *states, const char *name)
-{
-	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 = 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 = value;
-			}
-		} else if (strcmp(key, "database") == 0) {
-			s_CurInfo.database = value;
-		} else if (strcmp(key, "host") == 0) {
-			s_CurInfo.host = value;
-		} else if (strcmp(key, "user") == 0) {
-			s_CurInfo.user = value;
-		} else if (strcmp(key, "pass") == 0) {
-			s_CurInfo.pass = 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;
-}
-
-SMCResult DBManager::ReadSMC_LeavingSection(const SMCStates *states)
-{
-	if (m_ParseLevel)
-	{
-		m_ParseLevel--;
-		return SMCResult_Continue;
-	}
-
-	if (m_ParseState == DBPARSE_LEVEL_DATABASE)
-	{
-		ConfDbInfo *cdb = new ConfDbInfo();
-
-		cdb->name = s_CurInfo.name;
-		cdb->driver = s_CurInfo.driver;
-		cdb->host = s_CurInfo.host;
-		cdb->user = s_CurInfo.user;
-		cdb->pass = s_CurInfo.pass;
-		cdb->database = s_CurInfo.database;
-		cdb->realDriver = s_CurInfo.realDriver;
-		cdb->info.maxTimeout = s_CurInfo.info.maxTimeout;
-		cdb->info.port = s_CurInfo.info.port;
-
-		cdb->info.driver = cdb->driver.c_str();
-		cdb->info.database = cdb->database.c_str();
-		cdb->info.host = cdb->host.c_str();
-		cdb->info.user = cdb->user.c_str();
-		cdb->info.pass = cdb->pass.c_str();
-		
-		/* Save it.. */
-		m_confs.push_back(cdb);
-
-		/* 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;
-}
-
-void DBManager::ReadSMC_ParseEnd(bool halted, bool failed)
-{
-}
-
 bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool persistent, char *error, size_t maxlength)
 {
-	ConfDbInfo *pInfo = GetDatabaseConf(name);
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::RefPtr<ConfDbInfo> pInfo = list->GetDatabaseConf(name);
 
 	if (!pInfo)
 	{
@@ -270,7 +135,7 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 			*pdr = NULL;
 		}
 		*pdb = NULL;
-		UTIL_Format(error, maxlength, "Configuration \"%s\" not found", name);
+		g_pSM->Format(error, maxlength, "Configuration \"%s\" not found", name);
 		return false;
 	}
 
@@ -280,11 +145,12 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 		/* Try to assign a real driver pointer */
 		if (pInfo->info.driver[0] == '\0')
 		{
-			if (!m_pDefault && m_DefDriver.size() > 0)
+			ke::AString defaultDriver = list->GetDefaultDriver();
+			if (!m_pDefault && defaultDriver.length() > 0)
 			{
-				m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
+				m_pDefault = FindOrLoadDriver(defaultDriver.chars());
 			}
-			dname = m_DefDriver.size() ? m_DefDriver.c_str() : "default";
+			dname = defaultDriver.length() ? defaultDriver.chars() : "default";
 			pInfo->realDriver = m_pDefault;
 		} else {
 			pInfo->realDriver = FindOrLoadDriver(pInfo->info.driver);
@@ -307,8 +173,7 @@ bool DBManager::Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool
 	}
 	*pdb = NULL;
 
-	UTIL_Format(error, maxlength, "Driver \"%s\" not found", dname);
-
+	g_pSM->Format(error, maxlength, "Driver \"%s\" not found", dname);
 	return false;
 }
 
@@ -321,7 +186,7 @@ void DBManager::AddDriver(IDBDriver *pDriver)
 	  */
 	KillWorkerThread();
 
-	 m_drivers.push_back(pDriver);
+	m_drivers.push_back(pDriver);
 }
 
 void DBManager::RemoveDriver(IDBDriver *pDriver)
@@ -341,17 +206,23 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
 		}
 	}
 
-	/* Make sure NOTHING references this! */
-	List<ConfDbInfo *>::iterator iter;
-	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	for (size_t i = 0; i < list->length(); i++)
 	{
-		ConfDbInfo &db = *(*iter);
-		if (db.realDriver == pDriver)
+		ke::RefPtr<ConfDbInfo> current = list->at(i);
+		if (current->realDriver == pDriver)
 		{
-			db.realDriver = NULL;
+			current->realDriver = NULL;
 		}
 	}
 
+
+	/* Someone unloaded the default driver? Silly.. */
+	if (pDriver == m_pDefault)
+	{
+		m_pDefault = NULL;
+	}
+
 	/* Now that the driver is gone, we have to test the think queue.
 	 * Whatever happens therein is up to the db op!
 	 */
@@ -381,9 +252,11 @@ void DBManager::RemoveDriver(IDBDriver *pDriver)
 
 IDBDriver *DBManager::GetDefaultDriver()
 {
-	if (!m_pDefault && m_DefDriver.size() > 0)
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::AString defaultDriver = list->GetDefaultDriver();
+	if (!m_pDefault && defaultDriver.length() > 0)
 	{
-		m_pDefault = FindOrLoadDriver(m_DefDriver.c_str());
+		m_pDefault = FindOrLoadDriver(defaultDriver.chars());
 	}
 
 	return m_pDefault;
@@ -446,10 +319,16 @@ IDBDriver *DBManager::GetDriver(unsigned int index)
 
 const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
 {
-	ConfDbInfo *info = GetDatabaseConf(name);
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::RefPtr<ConfDbInfo> info = list->GetDatabaseConf(name);
 	if (!info)
 	{
-		return NULL;
+		// couldn't find requested conf, return default if exists
+		info = list->GetDefaultConfiguration();
+		if (!info)
+		{
+			return NULL;
+		}
 	}
 
 	return &info->info;
@@ -457,18 +336,9 @@ const DatabaseInfo *DBManager::FindDatabaseConf(const char *name)
 
 ConfDbInfo *DBManager::GetDatabaseConf(const char *name)
 {
-	List<ConfDbInfo *>::iterator iter;
-
-	for (iter=m_confs.begin(); iter!=m_confs.end(); iter++)
-	{
-		ConfDbInfo &conf = *(*iter);
-		if (conf.name == name)
-		{
-			return &conf;
-		}
-	}
-
-	return NULL;
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	ke::RefPtr<ConfDbInfo> info(list->GetDatabaseConf(name));
+	return info;
 }
 
 IDBDriver *DBManager::FindOrLoadDriver(const char *name)
@@ -483,7 +353,7 @@ IDBDriver *DBManager::FindOrLoadDriver(const char *name)
 	}
 
 	char filename[PLATFORM_MAX_PATH];
-	UTIL_Format(filename, sizeof(filename), "dbi.%s.ext", name);
+	g_pSM->Format(filename, sizeof(filename), "dbi.%s.ext", name);
 
 	IExtension *pExt = g_Extensions.LoadAutoExtension(filename);
 	if (!pExt || !pExt->IsLoaded() || m_drivers.size() <= last_size)
@@ -504,12 +374,17 @@ IDBDriver *DBManager::FindOrLoadDriver(const char *name)
 
 void DBManager::KillWorkerThread()
 {
-	if (m_pWorker)
+	if (m_Worker)
 	{
-		m_pWorker->Stop(false);
-		g_pThreader->DestroyWorker(m_pWorker);
-		m_pWorker = NULL;
+		{
+			ke::AutoLock lock(&m_QueueEvent);
+			m_Terminate = true;
+			m_QueueEvent.Notify();
+		}
+		m_Worker->Join();
+		m_Worker = nullptr;
 		s_OneTimeThreaderErrorMsg = false;
+		m_Terminate = false;
 	}
 }
 
@@ -522,99 +397,108 @@ bool DBManager::AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio)
 		return false;
 	}
 
-	if (!m_pWorker)
+	if (!m_Worker)
 	{
-		m_pWorker = g_pThreader->MakeWorker(this, true);
-		if (!m_pWorker)
+		m_Worker = new ke::Thread([this]() -> void {
+			Run();
+		}, "SM SQL Worker");
+		if (!m_Worker->Succeeded())
 		{
 			if (!s_OneTimeThreaderErrorMsg)
 			{
-				g_Logger.LogError("[SM] Unable to create db threader (error unknown)");
+				logger->LogError("[SM] Unable to create db threader (error unknown)");
 				s_OneTimeThreaderErrorMsg = true;
 			}
-			return false;
-		}
-		if (!m_pWorker->Start())
-		{
-			if (!s_OneTimeThreaderErrorMsg)
-			{
-				g_Logger.LogError("[SM] Unable to start db threader (error unknown)");
-				s_OneTimeThreaderErrorMsg = true;
-			}
-			g_pThreader->DestroyWorker(m_pWorker);
-			m_pWorker = NULL;
+			m_Worker = nullptr;
 			return false;
 		}
 	}
 
 	/* Add to the queue */
 	{
-		m_pQueueLock->Lock();
+		ke::AutoLock lock(&m_QueueEvent);
 		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetQueue(prio);
 		queue.push(op);
-		m_pQueueLock->Unlock();
+		m_QueueEvent.Notify();
 	}
 
-	/* Make the thread */
-	m_pWorker->MakeThread(this);
-
 	return true;
 }
 
-void DBManager::OnWorkerStart(IThreadWorker *pWorker)
+void DBManager::Run()
 {
-	m_drSafety.clear();
-	for (size_t i=0; i<m_drivers.size(); i++)
+	// Initialize DB threadsafety.
+	for (size_t i=0; i < m_drivers.size(); i++)
 	{
 		if (m_drivers[i]->IsThreadSafe())
-		{
 			m_drSafety.push_back(m_drivers[i]->InitializeThreadSafety());
-		} else {
+		else
 			m_drSafety.push_back(false);
-		}
 	}
-}
 
-void DBManager::OnWorkerStop(IThreadWorker *pWorker)
-{
+	// Run actual worker thread logic.
+	ThreadMain();
+
+	// Shutdown DB threadsafety.
 	for (size_t i=0; i<m_drivers.size(); i++)
 	{
 		if (m_drSafety[i])
-		{
 			m_drivers[i]->ShutdownThreadSafety();
-		}
 	}
 	m_drSafety.clear();
 }
 
-void DBManager::RunThread(IThreadHandle *pThread)
+void DBManager::ThreadMain()
 {
-	IDBThreadOperation *op = NULL;
+	ke::AutoLock lock(&m_QueueEvent);
 
-	/* Get something from the queue */
-	{
-		m_pQueueLock->Lock();
-		Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
-		if (!queue.empty())
+	while (true) {
+		// The lock has been acquired. Grab everything we can out of the
+		// queue. Since we want to flush the queue even if we're terminated,
+		// we process all operations we can before checking to terminate.
+		// There's no risk of starvation since the main thread blocks on us
+		// terminating.
+		while (true)
 		{
-			op = queue.first();
+			Queue<IDBThreadOperation *> &queue = m_OpQueue.GetLikelyQueue();
+			if (queue.empty())
+				break;
+
+			IDBThreadOperation *op = queue.first();
 			queue.pop();
+
+			// Unlock the queue when we run the query, so the main thread can
+			// keep pumping events. We re-acquire the lock to check for more
+			// items. It's okay if we terminate while unlocked; the main
+			// thread would be blocked and we'd need to flush the queue
+			// anyway, so after we've depleted the queue here, we'll just
+			// reach the terminate at the top of the loop.
+			{
+				ke::AutoUnlock unlock(&m_QueueEvent);
+				op->RunThreadPart();
+
+				ke::AutoLock lock(&m_ThinkLock);
+				m_ThinkQueue.push(op);
+			}
+			
+			
+			if (!m_Terminate)
+			{
+				ke::AutoUnlock unlock(&m_QueueEvent);
+#ifdef _WIN32
+				Sleep(20);
+#else
+				usleep(20000);
+#endif
+			}
 		}
-		m_pQueueLock->Unlock();
+
+		if (m_Terminate)
+			return;
+
+		// Release the lock and wait for a signal.
+		m_QueueEvent.Wait();
 	}
-
-	/* whoa.  hi.  did we get something? we should have. */
-	if (!op)
-	{
-		/* wtf? */
-		return;
-	}
-
-	op->RunThreadPart();
-
-	m_pThinkLock->Lock();
-	m_ThinkQueue.push(op);
-	m_pThinkLock->Unlock();
 }
 
 void DBManager::RunFrame()
@@ -626,19 +510,16 @@ void DBManager::RunFrame()
 	}
 
 	/* Dump one thing per-frame so the server stays sane. */
-	m_pThinkLock->Lock();
-	IDBThreadOperation *op = m_ThinkQueue.first();
-	m_ThinkQueue.pop();
-	m_pThinkLock->Unlock();
+	IDBThreadOperation *op;
+	{
+		ke::AutoLock lock(&m_ThinkLock);
+		op = m_ThinkQueue.first();
+		m_ThinkQueue.pop();
+	}
 	op->RunThinkPart();
 	op->Destroy();
 }
 
-void DBManager::OnTerminate(IThreadHandle *pThread, bool cancel)
-{
-	/* Do nothing */
-}
-
 void DBManager::OnSourceModIdentityDropped(IdentityToken_t *pToken)
 {
 	s_pAddBlock = pToken;
@@ -676,7 +557,7 @@ void DBManager::OnSourceModIdentityDropped(IdentityToken_t *pToken)
 	s_pAddBlock = NULL;
 }
 
-void DBManager::OnPluginUnloaded(IPlugin *plugin)
+void DBManager::OnPluginWillUnload(IPlugin *plugin)
 {
 	/* Kill the thread so we can flush everything into the think queue... */
 	KillWorkerThread();
@@ -702,9 +583,7 @@ void DBManager::OnPluginUnloaded(IPlugin *plugin)
 		}
 	}
 
-	for (iter = templist.begin();
-		 iter != templist.end();
-		 iter++)
+	for (iter = templist.begin(); iter != templist.end(); iter++)
 	{
 		IDBThreadOperation *op = (*iter);
 		op->RunThinkPart();
@@ -712,23 +591,13 @@ void DBManager::OnPluginUnloaded(IPlugin *plugin)
 	}
 }
 
-void DBManager::LockConfig()
+ke::AString DBManager::GetDefaultDriverName()
 {
-	m_pConfigLock->Lock();
-}
-
-void DBManager::UnlockConfig()
-{
-	m_pConfigLock->Unlock();
-}
-
-const char *DBManager::GetDefaultDriverName()
-{
-	return m_DefDriver.c_str();
+	ConfDbInfoList *list = m_Builder.GetConfigList();
+	return list->GetDefaultDriver();
 }
 
 void DBManager::AddDependency(IExtension *myself, IDBDriver *driver)
 {
 	g_Extensions.AddRawDependency(myself, driver->GetIdentity(), driver);
 }
-

core/logic/Database.h

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -32,41 +32,24 @@
 #ifndef _INCLUDE_DATABASE_MANAGER_H_
 #define _INCLUDE_DATABASE_MANAGER_H_
 
-#include <IDBDriver.h>
-#include "sm_globals.h"
+#include "common_logic.h"
 #include <sh_vector.h>
-#include <sh_string.h>
+#include <am-string.h>
 #include <sh_list.h>
-#include <ITextParsers.h>
-#include "sm_memtable.h"
 #include <IThreader.h>
+#include <IPluginSys.h>
+#include <am-thread-utils.h>
 #include "sm_simple_prioqueue.h"
-#include "PluginSys.h"
+#include <am-refcounting.h>
+#include "DatabaseConfBuilder.h"
 
 using namespace SourceHook;
 
-struct ConfDbInfo
-{
-	ConfDbInfo() : realDriver(NULL)
-	{
-	}
-	String name;
-	String driver;
-	String host;
-	String user;
-	String pass;
-	String database;
-	IDBDriver *realDriver;
-	DatabaseInfo info;
-};
 
 class DBManager : 
 	public IDBManager,
 	public SMGlobalClass,
 	public IHandleTypeDispatch,
-	public ITextListener_SMC,
-	public IThread,
-	public IThreadWorkerCallbacks,
 	public IPluginsListener
 {
 public:
@@ -85,6 +68,7 @@ public: //IDBManager
 	void AddDriver(IDBDriver *pDrivera);
 	void RemoveDriver(IDBDriver *pDriver);
 	const DatabaseInfo *FindDatabaseConf(const char *name);
+	ConfDbInfo *GetDatabaseConf(const char *name);
 	bool Connect(const char *name, IDBDriver **pdr, IDatabase **pdb, bool persistent, char *error, size_t maxlength);
 	unsigned int GetDriverCount();
 	IDBDriver *GetDriver(unsigned int index);
@@ -92,28 +76,16 @@ public: //IDBManager
 	HandleError ReadHandle(Handle_t hndl, DBHandleType type, void **ptr);
 	HandleError ReleaseHandle(Handle_t hndl, DBHandleType type, IdentityToken_t *token);
 	void AddDependency(IExtension *myself, IDBDriver *driver);
-public: //ITextListener_SMC
-	void ReadSMC_ParseStart();
-	SMCResult ReadSMC_NewSection(const SMCStates *states, const char *name);
-	SMCResult ReadSMC_KeyValue(const SMCStates *states, const char *key, const char *value);
-	SMCResult ReadSMC_LeavingSection(const SMCStates *states);
-	void ReadSMC_ParseEnd(bool halted, bool failed);
-public: //IThread
-	void RunThread(IThreadHandle *pThread);
-	void OnTerminate(IThreadHandle *pThread, bool cancel);
-public: //IThreadWorkerCallbacks
-	void OnWorkerStart(IThreadWorker *pWorker);
-	void OnWorkerStop(IThreadWorker *pWorker);
+public: //ke::IRunnable
+	void Run();
+	void ThreadMain();
 public: //IPluginsListener
-	void OnPluginUnloaded(IPlugin *plugin);
+	void OnPluginWillUnload(IPlugin *plugin);
 public:
-	ConfDbInfo *GetDatabaseConf(const char *name);
 	IDBDriver *FindOrLoadDriver(const char *name);
 	IDBDriver *GetDefaultDriver();
-	const char *GetDefaultDriverName();
+	ke::AString GetDefaultDriverName();
 	bool AddToThreadQueue(IDBThreadOperation *op, PrioQueueLevel prio);
-	void LockConfig();
-	void UnlockConfig();
 	void RunFrame();
 	inline HandleType_t GetDatabaseType()
 	{
@@ -129,18 +101,15 @@ private:
 	PrioQueue<IDBThreadOperation *> m_OpQueue;
 	Queue<IDBThreadOperation *> m_ThinkQueue;
 	CVector<bool> m_drSafety;			/* which drivers are safe? */
-	IThreadWorker *m_pWorker;			/* Worker thread object */
-	IMutex *m_pConfigLock;				/* Configuration lock */
-	IMutex *m_pQueueLock;				/* Queue safety lock */
-	IMutex *m_pThinkLock;				/* Think-queue lock */
+	ke::AutoPtr<ke::Thread> m_Worker;
+	ke::ConditionVariable m_QueueEvent;
+	ke::Mutex m_ThinkLock;
+	bool m_Terminate;
 
-	List<ConfDbInfo *> m_confs;
+	DatabaseConfBuilder m_Builder;
 	HandleType_t m_DriverType;
 	HandleType_t m_DatabaseType;
-	String m_DefDriver;
 	char m_Filename[PLATFORM_MAX_PATH];
-	unsigned int m_ParseLevel;
-	unsigned int m_ParseState;
 	IDBDriver *m_pDefault;
 };
 

core/logic/DatabaseConfBuilder.cpp

@@ -0,0 +1,184 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2018 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 "DatabaseConfBuilder.h"
+#include <bridge/include/ILogger.h>
+
+#define DBPARSE_LEVEL_NONE		0
+#define DBPARSE_LEVEL_MAIN		1
+#define DBPARSE_LEVEL_DATABASE	2
+
+DatabaseConfBuilder::DatabaseConfBuilder()
+	: m_ParseList(nullptr),
+	  m_InfoList(new ConfDbInfoList())
+{
+}
+
+void DatabaseConfBuilder::SetPath(char *str)
+{
+	m_Filename = str;
+}
+
+DatabaseConfBuilder::~DatabaseConfBuilder()
+{
+}
+
+ConfDbInfoList *DatabaseConfBuilder::GetConfigList()
+{
+	return m_InfoList;
+}
+
+void DatabaseConfBuilder::StartParse()
+{
+	SMCError err;
+	SMCStates states = {0, 0};
+	if ((err = textparsers->ParseFile_SMC(m_Filename.chars(), this, &states)) != SMCError_Okay)
+	{
+		logger->LogError("[SM] Detected parse error(s) in file \"%s\"", m_Filename.chars());
+		if (err != SMCError_Custom)
+		{
+			const char *txt = textparsers->GetSMCErrorString(err);
+			logger->LogError("[SM] Line %d: %s", states.line, txt);
+		}
+	}
+}
+
+void DatabaseConfBuilder::ReadSMC_ParseStart()
+{
+	m_ParseLevel = 0;
+	m_ParseState = DBPARSE_LEVEL_NONE;
+	
+	m_ParseList = new ConfDbInfoList();
+}
+ 
+SMCResult DatabaseConfBuilder::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) {
+		m_ParseCurrent = new ConfDbInfo();
+		m_ParseCurrent->name = name;
+		m_ParseState = DBPARSE_LEVEL_DATABASE;
+	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
+		m_ParseLevel++;
+	}
+
+	return SMCResult_Continue;
+}
+
+SMCResult DatabaseConfBuilder::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_ParseList->SetDefaultDriver(value);
+		}
+	} else if (m_ParseState == DBPARSE_LEVEL_DATABASE) {
+		if (strcmp(key, "driver") == 0)
+		{
+			if (strcmp(value, "default") != 0)
+			{
+				m_ParseCurrent->driver = value;
+			}
+		} else if (strcmp(key, "database") == 0) {
+			m_ParseCurrent->database = value;
+		} else if (strcmp(key, "host") == 0) {
+			m_ParseCurrent->host = value;
+		} else if (strcmp(key, "user") == 0) {
+			m_ParseCurrent->user = value;
+		} else if (strcmp(key, "pass") == 0) {
+			m_ParseCurrent->pass = value;
+		} else if (strcmp(key, "timeout") == 0) {
+			m_ParseCurrent->info.maxTimeout = atoi(value);
+		} else if (strcmp(key, "port") == 0) {
+			m_ParseCurrent->info.port = atoi(value);
+		}
+	}
+
+	return SMCResult_Continue;
+}
+
+SMCResult DatabaseConfBuilder::ReadSMC_LeavingSection(const SMCStates *states)
+{
+	if (m_ParseLevel)
+	{
+		m_ParseLevel--;
+		return SMCResult_Continue;
+	}
+
+	if (m_ParseState == DBPARSE_LEVEL_DATABASE)
+	{
+		m_ParseCurrent->info.driver = m_ParseCurrent->driver.chars();
+		m_ParseCurrent->info.database = m_ParseCurrent->database.chars();
+		m_ParseCurrent->info.host = m_ParseCurrent->host.chars();
+		m_ParseCurrent->info.user = m_ParseCurrent->user.chars();
+		m_ParseCurrent->info.pass = m_ParseCurrent->pass.chars();
+		
+		/* Save it.. */
+		m_ParseCurrent->AddRef();
+		m_ParseList->append(m_ParseCurrent);
+		m_ParseCurrent = nullptr;
+		
+		/* 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;
+}
+
+void DatabaseConfBuilder::ReadSMC_ParseEnd(bool halted, bool failed)
+{
+	m_InfoList->ReleaseMembers();
+	delete m_InfoList;
+	m_InfoList = m_ParseList;
+	
+	m_ParseList = nullptr;
+}

core/logic/DatabaseConfBuilder.h

@@ -0,0 +1,129 @@
+/**
+ * vim: set ts=4 sw=4 tw=99 noet :
+ * =============================================================================
+ * SourceMod
+ * Copyright (C) 2004-2018 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_CONF_BUILDER_H_
+#define _INCLUDE_DATABASE_CONF_BUILDER_H_
+
+#include <IDBDriver.h>
+#include <ITextParsers.h>
+#include "common_logic.h"
+
+#include <am-vector.h>
+#include <am-string.h>
+#include <am-refcounting-threadsafe.h>
+
+class ConfDbInfo : public ke::RefcountedThreadsafe<ConfDbInfo>
+{
+public:
+	ConfDbInfo() : realDriver(NULL)
+	{
+	}
+	ke::AString name;
+	ke::AString driver;
+	ke::AString host;
+	ke::AString user;
+	ke::AString pass;
+	ke::AString database;
+	IDBDriver *realDriver;
+	DatabaseInfo info;
+};
+
+class ConfDbInfoList : public ke::Vector<ConfDbInfo *>
+{
+	/* Allow internal usage of ConfDbInfoList */
+	friend class DBManager;
+	friend class DatabaseConfBuilder;
+private:
+	ke::AString& GetDefaultDriver() {
+		return m_DefDriver;
+	}
+	
+	ConfDbInfo *GetDatabaseConf(const char *name) {
+		for (size_t i = 0; i < this->length(); i++)
+		{
+			ConfDbInfo *current = this->at(i);
+			/* If we run into the default configuration, then we'll save it
+			 * for the next call to GetDefaultConfiguration */ 
+			if (strcmp(current->name.chars(), "default") == 0)
+			{
+				m_DefaultConfig = current;
+			}
+			if (strcmp(current->name.chars(), name) == 0)
+			{
+				return current;
+			}
+		}
+		return nullptr;
+	}
+	ConfDbInfo *GetDefaultConfiguration() {
+		return m_DefaultConfig;
+	}
+	void SetDefaultDriver(const char *input) {
+		m_DefDriver = ke::AString(input);
+	}
+	void ReleaseMembers() {
+		for (size_t i = 0; i < this->length(); i++) {
+			ConfDbInfo *current = this->at(i);
+			current->Release();
+		}
+	}
+private:
+	ConfDbInfo *m_DefaultConfig;
+	ke::AString m_DefDriver;
+};
+
+
+class DatabaseConfBuilder : public ITextListener_SMC
+{
+public:
+	DatabaseConfBuilder();
+	~DatabaseConfBuilder();
+	void StartParse();
+	void SetPath(char* path);
+	ConfDbInfoList *GetConfigList();
+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);
+
+private:
+	unsigned int m_ParseLevel;
+	unsigned int m_ParseState;
+	ConfDbInfo *m_ParseCurrent;
+	ConfDbInfoList *m_ParseList;
+private:
+	ke::AString m_Filename;
+	ConfDbInfoList *m_InfoList;
+};
+
+#endif //_INCLUDE_DATABASE_CONF_BUILDER_H_

core/logic/DebugReporter.cpp

@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -29,10 +29,11 @@
  * Version: $Id$
  */
 
+#include <ISourceMod.h>
+#include <IPluginSys.h>
+#include <stdarg.h>
 #include "DebugReporter.h"
 #include "Logger.h"
-#include "PluginSys.h"
-#include "sm_stringutil.h"
 
 DebugReport g_DbgReporter;
 
@@ -47,7 +48,7 @@ void DebugReport::OnDebugSpew(const char *msg, ...)
 	char buffer[512];
 
 	va_start(ap, msg);
-	UTIL_FormatArgs(buffer, sizeof(buffer), msg, ap);
+	ke::SafeVsprintf(buffer, sizeof(buffer), msg, ap);
 	va_end(ap);
 
 	g_Logger.LogMessage("[SM] %s", buffer);
@@ -65,9 +66,9 @@ void DebugReport::GenerateError(IPluginContext *ctx, cell_t func_idx, int err, c
 void DebugReport::GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap)
 {
 	char buffer[512];
-	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
+	ke::SafeVsprintf(buffer, sizeof(buffer), message, ap);
 
-	const char *plname = g_PluginSys.FindPluginByContext(ctx->GetContext())->GetFilename();
+	const char *plname = pluginsys->FindPluginByContext(ctx->GetContext())->GetFilename();
 	const char *error = g_pSourcePawn2->GetErrorString(err);
 
 	if (error)
@@ -99,10 +100,10 @@ void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t code_addr
 	char buffer[512];
 
 	va_start(ap, message);
-	UTIL_FormatArgs(buffer, sizeof(buffer), message, ap);
+	ke::SafeVsprintf(buffer, sizeof(buffer), message, ap);
 	va_end(ap);
 
-	const char *plname = g_PluginSys.FindPluginByContext(pContext->GetContext())->GetFilename();
+	const char *plname = pluginsys->FindPluginByContext(pContext->GetContext())->GetFilename();
 	const char *error = g_pSourcePawn2->GetErrorString(err);
 
 	if (error)
@@ -132,55 +133,10 @@ void DebugReport::GenerateCodeError(IPluginContext *pContext, uint32_t 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();
+	IPluginIterator *iter = pluginsys->GetPluginIterator();
 
 	for (; iter->MorePlugins(); iter->NextPlugin(), id++)
 	{
@@ -196,6 +152,95 @@ int DebugReport::_GetPluginIndex(IPluginContext *ctx)
 
 	/* If we don't know which plugin this is, it's one being loaded.  Fake its index for now. */
 
-	return g_PluginSys.GetPluginCount() + 1;
+	return pluginsys->GetPluginCount() + 1;
 }
 
+void DebugReport::ReportError(const IErrorReport &report, IFrameIterator &iter)
+{
+	// Don't log an error if a function wasn't runnable.
+	// This is necassary due to the way SM is handling and exposing
+	// scripted functions. It's too late to change that now.
+	if (report.Code() == SP_ERROR_NOT_RUNNABLE)
+		return;
+
+	const char *blame = nullptr;
+	if (report.Blame()) 
+	{
+		blame = report.Blame()->DebugName();
+	} else {
+	    // Find the nearest plugin to blame.
+		for (; !iter.Done(); iter.Next()) 
+		{
+			if (iter.IsScriptedFrame()) 
+			{
+				IPlugin *plugin = pluginsys->FindPluginByContext(iter.Context()->GetContext());
+				if (plugin)
+				{
+					blame = plugin->GetFilename();
+				} else {
+					blame = iter.Context()->GetRuntime()->GetFilename();
+				}
+				break;
+			}
+		}
+	}
+
+	iter.Reset();
+
+	g_Logger.LogError("[SM] Exception reported: %s", report.Message());
+
+	if (blame) 
+	{
+		g_Logger.LogError("[SM] Blaming: %s", blame);
+	}
+
+	ke::Vector<ke::AString> arr = GetStackTrace(&iter);
+	for (size_t i = 0; i < arr.length(); i++)
+	{
+		g_Logger.LogError("%s", arr[i].chars());
+	}
+}
+
+ke::Vector<ke::AString> DebugReport::GetStackTrace(IFrameIterator *iter)
+{
+	char temp[3072];
+	ke::Vector<ke::AString> trace;
+	iter->Reset();
+	
+	if (!iter->Done())
+	{
+		trace.append("[SM] Call stack trace:");
+
+		for (int index = 0; !iter->Done(); iter->Next(), index++) 
+		{
+			const char *fn = iter->FunctionName();
+			if (!fn)
+			{
+				fn = "<unknown function>";
+			}
+			if (iter->IsNativeFrame()) 
+			{
+				g_pSM->Format(temp, sizeof(temp), "[SM]   [%d] %s", index, fn);
+				trace.append(temp);
+				continue;
+			}
+			if (iter->IsScriptedFrame()) 
+			{
+				const char *file = iter->FilePath();
+				if (!file)
+				{
+					file = "<unknown>";
+				}
+				g_pSM->Format(temp, sizeof(temp), "[SM]   [%d] Line %d, %s::%s",
+						index,
+						iter->LineNumber(),
+						file,
+						fn);
+				
+				trace.append(temp);
+			}
+		}
+	}
+	
+	return trace;
+}

core/logic/DebugReporter.h

@@ -33,7 +33,9 @@
 #define _INCLUDE_SOURCEMOD_CDBGREPORTER_H_
 
 #include "sp_vm_api.h"
-#include "sm_globals.h"
+#include "common_logic.h"
+#include <am-vector.h>
+#include <am-string.h>
 
 class DebugReport : 
 	public SMGlobalClass, 
@@ -42,12 +44,13 @@ class DebugReport :
 public: // SMGlobalClass
 	void OnSourceModAllInitialized();
 public: // IDebugListener
-	void OnContextExecuteError(IPluginContext *ctx, IContextTrace *error);
+	void ReportError(const IErrorReport &report, IFrameIterator &iter);
 	void OnDebugSpew(const char *msg, ...);
 public:
 	void GenerateError(IPluginContext *ctx, cell_t func_idx, int err, const char *message, ...);
 	void GenerateErrorVA(IPluginContext *ctx, cell_t func_idx, int err, const char *message, va_list ap); 
 	void GenerateCodeError(IPluginContext *ctx, uint32_t code_addr, int err, const char *message, ...);
+	ke::Vector<ke::AString> GetStackTrace(IFrameIterator *iter);
 private:
 	int _GetPluginIndex(IPluginContext *ctx);
 };