Merge branch 'master' into get-players-flag

.gitignore

@@ -84,3 +84,5 @@ Thumbs.db
 # AMXX plugin build related files
 plugins/compile.dat
 plugins/compiled/
+
+build_deps/

.travis.yml

@@ -8,6 +8,7 @@ addons:
     - linux-libc-dev
     - gcc-multilib
     - g++-multilib
+    - nasm
     sources:
     - llvm-toolchain-precise-3.7
     - ubuntu-toolchain-r-test
@@ -23,4 +24,4 @@ script:
   - mkdir build && cd build
   - PATH="~/.local/bin:$PATH"
   - CC=clang-3.7 CXX=clang-3.7 python ../configure.py --enable-optimize
-  - ambuild
+  - ambuild

AMBuildScript

@@ -20,6 +20,7 @@ class AMXXConfig(object):
     self.utf8rewind = None
     self.csx_app = None
     self.stdcxx_path = None
+    self.nasm_path = None
 
   def use_auto_versioning(self):
     if builder.backend != 'amb2':
@@ -105,6 +106,31 @@ class AMXXConfig(object):
       if not self.mysql_path:
         raise Exception('Could not find MySQL! Try passing --mysql to configure.py.')
 
+  def detectNASM(self):
+    import subprocess
+
+    nasm_paths = [
+      getattr(builder.options, 'nasm_path', 'nasm'),
+    ]
+    if builder.target_platform == 'windows':
+      nasm_paths += [os.path.join(
+        builder.sourcePath,
+        'build_deps',
+        'nasm',
+        'nasm.exe')
+      ]
+
+    for nasm_path in nasm_paths:
+      try:
+        subprocess.check_output([nasm_path, '-v'])
+        self.nasm_path = nasm_path
+        break
+      except:
+        pass
+
+    if self.nasm_path is None:
+      raise Exception('Could not find a suitable path for nasm')
+
   # Returns list of lines of output from the compiler
   @staticmethod
   def invokeCompiler(args):
@@ -369,11 +395,42 @@ class AMXXConfig(object):
     binary = context.compiler.Program(name)
     return self.AddVersioning(binary)
 
+  def AddAssembly(self, context, binary, input_file, output_file, includes=[], extra_argv=[]):
+    if builder.target_platform == 'windows':
+      obj_type = 'win32'
+    elif builder.target_platform == 'linux':
+      obj_type = 'elf32'
+    elif builder.target_platform == 'mac':
+      obj_type = 'macho32'
+
+    input_path = os.path.join(context.currentSourcePath, input_file)
+    output_path = output_file
+
+    argv = [
+      self.nasm_path,
+      '-I{0}{1}'.format(context.currentSourcePath, os.sep),
+      input_path,
+      '-f', obj_type,
+      '-o', output_path,
+    ] + extra_argv
+
+    extra_includes = []
+    for include_file in includes:
+      extra_includes.append(os.path.join(context.currentSourcePath, include_file))
+
+    cmd_node, output_nodes = context.AddCommand(
+      inputs = [input_path] + extra_includes,
+      argv = argv,
+      outputs = [output_path])
+
+    binary.compiler.linkflags += [output_nodes[0]]
+
 AMXX = AMXXConfig()
 AMXX.detectProductVersion()
 AMXX.detectMetamod()
 AMXX.detectHlsdk()
 AMXX.detectMysql()
+AMXX.detectNASM()
 AMXX.configure()
 
 if AMXX.use_auto_versioning():

README.md

@@ -15,4 +15,5 @@ Development
 -----------
 - [Issue tracker](https://bugs.alliedmods.net): Issues that require back and forth communication
 - [Building AMXX](https://wiki.alliedmods.net/Building_AMX_Mod_X): Instructions on how to build AMXX itself using [AMBuild](https://github.com/alliedmodders/ambuild)
+- [AMX Mod X API](https://amxmodx.org/api/): AMX Mod X API reference generated from include files
 - [AMXX scripting](https://wiki.alliedmods.net/Category:Scripting_(AMX_Mod_X)): Pawn examples and introduction to the language

amxmodx/AMBuilder

@@ -9,36 +9,25 @@ binary.compiler.defines += [
   'HAVE_STDINT_H',
 ]
 
+AMXX.AddAssembly(builder, binary, 'helpers-x86.asm', 'helpers-asm.obj')
+AMXX.AddAssembly(builder, binary, 'natives-x86.asm', 'natives-asm.obj')
+AMXX.AddAssembly(builder, binary, 'amxexecn.asm', 'amxexecn-asm.obj',
+  includes=['amxdefn.asm'])
+AMXX.AddAssembly(builder, binary, 'amxjitsn.asm', 'amxjitsn-asm.obj',
+  includes=['amxdefn.asm'],
+  # Opcode sizes must be maximum width for patching to work.
+  extra_argv=['-O0'])
+
 if builder.target_platform == 'mac':
-  jit_objects = [
-    binary.Dep('JIT/amxexecn-darwin.o'),
-    binary.Dep('JIT/amxjitsn-darwin.o'),
-    binary.Dep('JIT/natives-darwin-x86.o'),
-    binary.Dep('JIT/helpers-darwin-x86.o'),
-  ]
   binary.compiler.postlink += [
     '-Wl,-read_only_relocs,suppress'
   ]
-elif builder.target_platform == 'linux':
-  jit_objects = [
-    binary.Dep('JIT/amxexecn.o'),
-    binary.Dep('JIT/amxjitsn.o'),
-    binary.Dep('JIT/natives-x86.o'),
-    binary.Dep('JIT/helpers-x86.o'),
-  ]
 elif builder.target_platform == 'windows':
-  jit_objects = [
-    binary.Dep('JIT/amxexecn.obj'),
-    binary.Dep('JIT/amxjitsn.obj'),
-    binary.Dep('JIT/helpers-x86.obj'),
-    binary.Dep('JIT/natives-x86.obj'),
-  ]
   binary.compiler.linkflags += [
     '/EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8,@1',
     '/SECTION:.data,RW',
   ]
 
-binary.compiler.linkflags += jit_objects
 binary.compiler.linkflags += [AMXX.zlib.binary, AMXX.hashing.binary, AMXX.utf8rewind.binary]
 
 binary.sources = [

amxmodx/CGameConfigs.h

@@ -12,6 +12,7 @@
 
 #include <IGameConfigs.h>
 #include "CLibrarySys.h"
+#include <amtl/am-autoptr.h>
 #include <amtl/am-vector.h>
 #include <amtl/am-string.h>
 #include <amtl/am-refcounting.h>
@@ -166,6 +167,19 @@ class CGameConfigManager : public IGameConfigManager
 		StringHashMap<ITextListener_SMC*> m_customHandlers;
 };
 
+#define GET_OFFSET(classname, member)												\
+	static int member = -1;															\
+	if (member == -1)																\
+	{                                                                               \
+		TypeDescription type;                                                       \
+		if (!CommonConfig->GetOffsetByClass(classname, #member, &type) || type.fieldOffset < 0)\
+		{																			\
+			LogError(amx, AMX_ERR_NATIVE, "Invalid %s offset. Native %s is disabled", #member, __FUNCTION__);\
+			return 0;																\
+		}																			\
+		member = type.fieldOffset;                                                  \
+	}
+
 extern CGameConfigManager ConfigManager;
 extern IGameConfig *CommonConfig;
 

amxmodx/CPlugin.cpp

@@ -18,14 +18,14 @@
 
 extern const char *no_function;
 
-CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error, int debug)
+CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error, size_t maxLength, int debug)
 {
 	CPlugin** a = &head;
 
 	while (*a)
 		a = &(*a)->next;
 
-	*a = new CPlugin(pCounter++, path, name, error, debug);
+	*a = new CPlugin(pCounter++, path, name, error, maxLength, debug);
 
 	return (*a);
 }
@@ -137,7 +137,7 @@ int CPluginMngr::loadPluginsFromFile(const char* filename, bool warn)
 			continue;
 		}
 
-		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, debugFlag);
+		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, sizeof(error), debugFlag);
 
 		if (plugin->getStatusCode() == ps_bad_load)
 		{
@@ -267,7 +267,7 @@ const char* CPluginMngr::CPlugin::getStatus() const
 	return "error";
 }
 
-CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int d) : name(n), title(n), m_pNullStringOfs(nullptr), m_pNullVectorOfs(nullptr)
+CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, size_t m, int d) : name(n), title(n), m_pNullStringOfs(nullptr), m_pNullVectorOfs(nullptr)
 {
 	const char* unk = "unknown";
 
@@ -280,7 +280,7 @@ CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int
 	char* path = build_pathname_r(file, sizeof(file), "%s/%s", p, n);
 	code = 0;
 	memset(&amx, 0, sizeof(AMX));
-	int err = load_amxscript(&amx, &code, path, e, d);
+	int err = load_amxscript_ex(&amx, &code, path, e, m, d);
 
 	if (err == AMX_ERR_NONE)
 	{

amxmodx/CPlugin.h

@@ -15,6 +15,7 @@
 #include "amxxfile.h"
 #include <amtl/am-string.h>
 #include <amtl/am-vector.h>
+#include <amtl/am-autoptr.h>
 
 // *****************************************************
 // class CPluginMngr
@@ -65,7 +66,7 @@ public:
 		CPlugin* next;
 		int id;
 		
-		CPlugin(int i, const char* p, const char* n, char* e, int d);
+		CPlugin(int i, const char* p, const char* n, char* e, size_t m, int d);
 		~CPlugin();
 		
 		bool m_Debug;
@@ -121,7 +122,7 @@ public:
 
 	// Interface
 
-	CPlugin* loadPlugin(const char* path, const char* name, char* error, int debug);
+	CPlugin* loadPlugin(const char* path, const char* name, char* error, size_t maxLength, int debug);
 	void unloadPlugin(CPlugin** a);
 	int loadPluginsFromFile(const char* filename, bool warn=true);
 	

amxmodx/CoreConfig.cpp

@@ -53,7 +53,7 @@ void CoreConfig::ExecuteMainConfig()
 	char path[PLATFORM_MAX_PATH];
 	char command[PLATFORM_MAX_PATH + sizeof(CommandFormat)];
 
-	ke::SafeSprintf(path, sizeof(path), "%s/%s/%s", g_mod_name.chars(), get_localinfo("amx_configdir", "addons/amxmodx/configs"), MainConfigFile);
+	ke::SafeSprintf(path, sizeof(path), "%s/%s/%s", g_mod_name.chars(), get_localinfo("amxx_configsdir", "addons/amxmodx/configs"), MainConfigFile);
 	ke::SafeSprintf(command, sizeof(command), CommandFormat, path);
 
 	SERVER_COMMAND(command);
@@ -80,7 +80,7 @@ bool CoreConfig::ExecuteAutoConfig(CPluginMngr::CPlugin *plugin, AutoConfig *con
 {
 	bool will_create = false;
 
-	const char *configsDir = get_localinfo("amx_configdir", "addons/amxmodx/configs");
+	const char *configsDir = get_localinfo("amxx_configsdir", "addons/amxmodx/configs");
 
 	if (can_create && config->create)
 	{
@@ -254,7 +254,7 @@ bool CoreConfig::ExecuteAutoConfig(CPluginMngr::CPlugin *plugin, AutoConfig *con
 
 void CoreConfig::ExecuteMapConfig()
 {
-	const char *configsDir = get_localinfo("amx_configdir", "addons/amxmodx/configs");
+	const char *configsDir = get_localinfo("amxx_configsdir", "addons/amxmodx/configs");
 
 	char cfgPath[PLATFORM_MAX_PATH];
 	char mapName[PLATFORM_MAX_PATH];

amxmodx/amxmodx.cpp

@@ -214,7 +214,7 @@ static cell AMX_NATIVE_CALL console_print(AMX *amx, cell *params) /* 2 param */
 	{
 		CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
 
-		if (pPlayer->ingame)
+		if (pPlayer->ingame && !pPlayer->IsBot())
 		{
 			if (len > 126)	// Client console truncates after byte 127. (126 + \n = 127)
 			{
@@ -247,7 +247,7 @@ static cell AMX_NATIVE_CALL client_print(AMX *amx, cell *params) /* 3 param */
 		{
 			CPlayer *pPlayer = GET_PLAYER_POINTER_I(i);
 
-			if (pPlayer->ingame)
+			if (pPlayer->ingame && !pPlayer->IsBot())
 			{
 				g_langMngr.SetDefLang(i);
 				msg = format_amxstring(amx, params, 3, len);
@@ -280,7 +280,7 @@ static cell AMX_NATIVE_CALL client_print(AMX *amx, cell *params) /* 3 param */
 
 		CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
 
-		if (pPlayer->ingame)
+		if (pPlayer->ingame && !pPlayer->IsBot())
 		{
 			g_langMngr.SetDefLang(index);
 
@@ -338,7 +338,7 @@ static cell AMX_NATIVE_CALL client_print_color(AMX *amx, cell *params) /* 3 para
 				g_langMngr.SetDefLang(i);
 				msg = format_amxstring(amx, params, 3, len);
 
-				if (*msg > 4) // Insert default color code at the start if not present, otherwise message will not be colored.
+				if (static_cast<byte>(*msg) > 4) // Insert default color code at the start if not present, otherwise message will not be colored.
 				{
 					memmove(msg + 1, msg, ke::Min(len++, 191));
 					*msg = 1;
@@ -376,7 +376,7 @@ static cell AMX_NATIVE_CALL client_print_color(AMX *amx, cell *params) /* 3 para
 
 			msg = format_amxstring(amx, params, 3, len);
 
-			if (*msg > 4) // Insert default color code at the start if not present, otherwise message will not be colored.
+			if (static_cast<byte>(*msg) > 4) // Insert default color code at the start if not present, otherwise message will not be colored.
 			{
 				memmove(msg + 1, msg, ke::Min(len++, 191));
 				*msg = 1;
@@ -427,7 +427,7 @@ static cell AMX_NATIVE_CALL show_motd(AMX *amx, cell *params) /* 3 param */
 		{
 			CPlayer* pPlayer = GET_PLAYER_POINTER_I(i);
 
-			if (pPlayer->ingame)
+			if (pPlayer->ingame && !pPlayer->IsBot())
 				UTIL_ShowMOTD(pPlayer->pEdict, sToShow, ilen, szHead);
 		}
 	} else {
@@ -444,7 +444,7 @@ static cell AMX_NATIVE_CALL show_motd(AMX *amx, cell *params) /* 3 param */
 
 		CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
 
-		if (pPlayer->ingame)
+		if (pPlayer->ingame && !pPlayer->IsBot())
 			UTIL_ShowMOTD(pPlayer->pEdict, sToShow, ilen, szHead);
 	}
 
@@ -524,7 +524,7 @@ static cell AMX_NATIVE_CALL show_hudmessage(AMX *amx, cell *params) /* 2 param *
 		{
 			CPlayer *pPlayer = GET_PLAYER_POINTER_I(i);
 
-			if (pPlayer->ingame)
+			if (pPlayer->ingame && !pPlayer->IsBot())
 			{
 				g_langMngr.SetDefLang(i);
 				message = UTIL_SplitHudMessage(format_amxstring(amx, params, 2, len));
@@ -551,7 +551,7 @@ static cell AMX_NATIVE_CALL show_hudmessage(AMX *amx, cell *params) /* 2 param *
 
 		CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
 
-		if (pPlayer->ingame)
+		if (pPlayer->ingame && !pPlayer->IsBot())
 		{
 			if (aut)
 			{
@@ -787,22 +787,27 @@ static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */
 
 	if (index < 1 || index > gpGlobals->maxClients)
 	{
-		return 0;
+		return FALSE;
 	}
 
 	CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
 
+	if (!pPlayer->ingame)
+	{
+		return FALSE;
+	}
+
 	if (g_bmod_tfc)
 	{
 		edict_t *e = pPlayer->pEdict;
 		if (e->v.flags & FL_SPECTATOR ||
 			(!e->v.team || !e->v.playerclass))
 		{
-			return 0;
+			return FALSE;
 		}
 	}
 
-	return ((pPlayer->ingame && pPlayer->IsAlive()) ? 1 : 0);
+	return pPlayer->IsAlive() ? TRUE : FALSE;
 }
 
 static cell AMX_NATIVE_CALL get_amxx_verstring(AMX *amx, cell *params) /* 2 params */
@@ -1106,6 +1111,12 @@ static cell AMX_NATIVE_CALL user_has_weapon(AMX *amx, cell *params)
 	}
 
 	CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
+
+	if (!pPlayer->ingame)
+	{
+		return 0;
+	}
+
 	edict_t *pEntity = pPlayer->pEdict;
 
 	if (params[3] == -1)
@@ -1246,31 +1257,48 @@ static cell AMX_NATIVE_CALL get_user_team(AMX *amx, cell *params) /* 3 param */
 
 static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
 {
+	auto closeMenu = [amx](int index) -> int
+	{
+		auto pPlayer = GET_PLAYER_POINTER_I(index);
+
+		if (!pPlayer->ingame)
+		{
+			return 1;
+		}
+
+		pPlayer->keys = 0;
+		pPlayer->menu = 0;
+
+		// Fire newmenu callback so closing it can be handled by the plugin
+		if (!CloseNewMenus(pPlayer))
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Plugin called menu_display when item=MENU_EXIT");
+			return 2;
+		}
+
+		if (g_bmod_cstrike)
+		{
+			GET_OFFSET("CBasePlayer", m_iMenu);
+			set_pdata<int>(pPlayer->pEdict, m_iMenu, 0);
+		}
+
+		return 0;
+	};
+
+	int index = params[1];
+
 	// If show_menu is called from within a newmenu callback upon receiving MENU_EXIT
 	// it is possible for this native to recurse. We need to close newmenus right away
 	// because the recursive call would otherwise modify/corrupt the static get_amxstring
 	// buffer mid execution. This will either display incorrect text or result in UTIL_ShowMenu
 	// running into an infinite loop.
-	int index = params[1];
 	if (index == 0)
 	{
 		for (int i = 1; i <= gpGlobals->maxClients; ++i)
 		{
-			CPlayer* pPlayer = GET_PLAYER_POINTER_I(i);
-
-			if (pPlayer->ingame)
+			if (closeMenu(i) == 2)
 			{
-				pPlayer->keys = 0;
-				pPlayer->menu = 0;
-
-				// Fire newmenu callback so closing it can be handled by the plugin
-				if (!CloseNewMenus(pPlayer))
-				{
-					LogError(amx, AMX_ERR_NATIVE, "Plugin called menu_display when item=MENU_EXIT");
-					return 0;
-				}
-
-				UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
+				return 0;
 			}
 		}
 	}
@@ -1282,23 +1310,7 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
 			return 0;
 		}
 
-		CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
-
-		if (pPlayer->ingame)
-		{
-			pPlayer->keys = 0;
-			pPlayer->menu = 0;
-
-			// Fire newmenu callback so closing it can be handled by the plugin
-			if (!CloseNewMenus(pPlayer))
-			{
-				LogError(amx, AMX_ERR_NATIVE, "Plugin called menu_display when item=MENU_EXIT");
-				return 0;
-			}
-
-			UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
-		}
-		else
+		if (closeMenu(index))
 		{
 			return 0;
 		}
@@ -1343,17 +1355,20 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
 	} else {
 		CPlayer* pPlayer = GET_PLAYER_POINTER_I(index);
 
-		pPlayer->keys = keys;
-		pPlayer->menu = menuid;
-		pPlayer->vgui = false;
+		if (pPlayer->ingame)
+		{
+			pPlayer->keys = keys;
+			pPlayer->menu = menuid;
+			pPlayer->vgui = false;
 
-		if (time == -1)
-			pPlayer->menuexpire = INFINITE;
-		else
-			pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time);
+			if (time == -1)
+				pPlayer->menuexpire = INFINITE;
+			else
+				pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time);
 
-		pPlayer->page = 0;
-		UTIL_ShowMenu(pPlayer->pEdict, keys, time, sMenu, ilen);
+			pPlayer->page = 0;
+			UTIL_ShowMenu(pPlayer->pEdict, keys, time, sMenu, ilen);
+		}
 	}
 
 	return 1;
@@ -2625,11 +2640,11 @@ static cell AMX_NATIVE_CALL change_task(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL engine_changelevel(AMX *amx, cell *params)
 {
 	int length;
-	const char* new_map = get_amxstring(amx, params[1], 0, length);
+	ke::AString new_map(get_amxstring(amx, params[1], 0, length));
 
 	// Same as calling "changelevel" command but will trigger "server_changelevel" AMXX forward as well.
 	// Filling second param will call "changelevel2" command, but this is not usable in multiplayer game.
-	g_pEngTable->pfnChangeLevel(new_map, NULL);
+	g_pEngTable->pfnChangeLevel(new_map.chars(), NULL);
 
 	return 1;
 }
@@ -4710,7 +4725,8 @@ AMX_NATIVE_INFO amxmodx_Natives[] =
 	{"plugin_flags",			plugin_flags},
 	{"precache_model",			precache_model},
 	{"precache_sound",			precache_sound},
-	{"precache_generic",		precache_generic},
+	{"precache_generic",			precache_generic},
+	{"precache_event",			precache_event},
 	{"random_float",			random_float},
 	{"random_num",				random_num},
 	{"read_argc",				read_argc},

amxmodx/amxmodx.h

@@ -284,6 +284,7 @@ extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, in
 
 int amxstring_len(cell* cstr);
 int load_amxscript(AMX* amx, void** program, const char* path, char error[64], int debug);
+int load_amxscript_ex(AMX* amx, void** program, const char* path, char *error, size_t maxLength, int debug);
 int set_amxnatives(AMX* amx, char error[64]);
 int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max);
 int set_amxstring_simple(cell *dest, const char *source, int max);

amxmodx/emsg.cpp

@@ -87,6 +87,7 @@ void Client_TeamInfo(void* mValue)
 		case 1:
 			if (index < 1 || index > gpGlobals->maxClients) break;
 			char* msg = (char*)mValue;
+			if (!msg) break;
 			g_players[index].team = msg;
 			g_teamsIds.registerTeam(msg, -1);
 			g_players[index].teamId = g_teamsIds.findTeamId(msg);

amxmodx/meta_api.cpp

@@ -657,10 +657,11 @@ void C_ServerActivate_Post(edict_t *pEdictList, int edictCount, int clientMax)
 		pPlayer->Init(pEdictList + i, i);
 	}
 
+	CoreCfg.ExecuteMainConfig();    // Execute amxx.cfg
+
 	executeForwards(FF_PluginInit);
 	executeForwards(FF_PluginCfg);
 
-	CoreCfg.ExecuteMainConfig();    // Execute amxx.cfg
 	CoreCfg.ExecuteAutoConfigs();   // Execute configs created with AutoExecConfig native.
 	CoreCfg.SetMapConfigTimer(6.1); // Prepare per-map configs to be executed 6.1 seconds later.
 	                                // Original value which was used in admin.sma.
@@ -751,8 +752,6 @@ void C_ServerDeactivate_Post()
 
 	modules_callPluginsUnloading();
 
-	detachReloadModules();
-
 	CoreCfg.Clear();
 
 	g_auth.clear();
@@ -776,6 +775,8 @@ void C_ServerDeactivate_Post()
 	ClearPluginLibraries();
 	modules_callPluginsUnloaded();
 
+	detachReloadModules();
+
 	ClearMessages();
 
 	// Flush the dynamic admins list
@@ -1433,8 +1434,15 @@ int	C_Cmd_Argc(void)
 // Only	here we	may	find out who is	an owner.
 void C_SetModel(edict_t *e, const char *m)
 {
-	if (e->v.owner && m[7]=='w' && m[8]=='_' && m[9]=='h')
-		g_grenades.put(e, 1.75, 4, GET_PLAYER_POINTER(e->v.owner));
+	if (!m || strcmp(m, "models/w_hegrenade.mdl") != 0)
+	{
+		RETURN_META(MRES_IGNORED);
+	}
+
+	if (e->v.owner)
+	{
+		g_grenades.put(e, 1.75f, 4, GET_PLAYER_POINTER(e->v.owner));
+	}
 
 	RETURN_META(MRES_IGNORED);
 }

amxmodx/modules.cpp

@@ -108,7 +108,7 @@ static binlogfuncs_t logfuncs =
 };
 #endif
 
-int load_amxscript(AMX *amx, void **program, const char *filename, char error[64], int debug)
+int load_amxscript_internal(AMX *amx, void **program, const char *filename, char *error, size_t maxLength, int debug)
 {
 	*error = 0;
 	size_t bufSize;
@@ -127,7 +127,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 
 				if (!*program)
 				{
-					strcpy(error, "Failed to allocate memory");
+					ke::SafeStrcpy(error, maxLength, "Failed to allocate memory");
 					return (amx->error = AMX_ERR_MEMORY);
 				}
 
@@ -140,31 +140,31 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 			case CAmxxReader::Err_None:
 				break;
 			case CAmxxReader::Err_FileOpen:
-				strcpy(error, "Plugin file open error");
+				ke::SafeStrcpy(error, maxLength, "Plugin file open error");
 				return (amx->error = AMX_ERR_NOTFOUND);
 			case CAmxxReader::Err_FileRead:
-				strcpy(error, "Plugin file read error");
+				ke::SafeStrcpy(error, maxLength, "Plugin file read error");
 				return (amx->error = AMX_ERR_NOTFOUND);
 			case CAmxxReader::Err_InvalidParam:
-				strcpy(error, "Internal error: Invalid parameter");
+				ke::SafeStrcpy(error, maxLength, "Internal error: Invalid parameter");
 				return (amx->error = AMX_ERR_NOTFOUND);
 			case CAmxxReader::Err_FileInvalid:
-				strcpy(error, "Invalid Plugin");
+				ke::SafeStrcpy(error, maxLength, "Invalid Plugin");
 				return (amx->error = AMX_ERR_FORMAT);
 			case CAmxxReader::Err_SectionNotFound:
-				strcpy(error, "Searched section not found (.amxx)");
+				ke::SafeStrcpy(error, maxLength, "Searched section not found (.amxx)");
 				return (amx->error = AMX_ERR_NOTFOUND);
 			case CAmxxReader::Err_DecompressorInit:
-				strcpy(error, "Decompressor initialization failed");
+				ke::SafeStrcpy(error, maxLength, "Decompressor initialization failed");
 				return (amx->error = AMX_ERR_INIT);
 			case CAmxxReader::Err_Decompress:
-				strcpy(error, "Internal error: Decompress");
+				ke::SafeStrcpy(error, maxLength, "Internal error: Decompress");
 				return (amx->error = AMX_ERR_NOTFOUND);
 			case CAmxxReader::Err_OldFile:
-				strcpy(error, "Plugin uses deprecated format. Update compiler");
+				ke::SafeStrcpy(error, maxLength, "Plugin uses deprecated format. Update compiler");
 				return (amx->error = AMX_ERR_FORMAT);
 			default:
-				strcpy(error, "Unknown error");
+				ke::SafeStrcpy(error, maxLength, "Unknown error");
 				return (amx->error = AMX_ERR_NOTFOUND);
 		}
 	} else {
@@ -178,7 +178,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 
 	if (magic != AMX_MAGIC)
 	{
-		strcpy(error, "Invalid Plugin");
+		ke::SafeStrcpy(error, maxLength, "Invalid Plugin");
 		return (amx->error = AMX_ERR_FORMAT);
 	}
 
@@ -191,7 +191,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 	{
 		if ((hdr->file_version < CUR_FILE_VERSION))
 		{
-			sprintf(error, "Plugin needs newer debug version info");
+			ke::SafeStrcpy(error, maxLength, "Plugin needs newer debug version info");
 			return (amx->error = AMX_ERR_VERSION);
 		}
 		else if ((hdr->flags & AMX_FLAG_DEBUG) != 0)
@@ -209,13 +209,13 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 			{
 				dbg_FreeInfo(pDbg);
 				delete pDbg;
-				sprintf(error, "Debug loading error %d", err);
+				ke::SafeSprintf(error, maxLength, "Debug loading error %d", err);
 				return (amx->error = AMX_ERR_INIT);
 			}
 
 			amx->flags |= AMX_FLAG_DEBUG;
 		} else {
-			sprintf(error, "Plugin not compiled with debug option");
+			ke::SafeStrcpy(error, maxLength, "Plugin not compiled with debug option");
 			return (amx->error = AMX_ERR_INIT);
 		}
 	} else {
@@ -238,7 +238,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 			delete pDbg;
 		}
 
-		sprintf(error, "Load error %d (invalid file format or version)", err);
+		ke::SafeSprintf(error, maxLength, "Load error %d (invalid file format or version)", err);
 		return (amx->error = AMX_ERR_INIT);
 	}
 
@@ -276,7 +276,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 		{
 			delete[] np;
 			delete[] rt;
-			strcpy(error, "Failed to initialize JIT'd plugin");
+			ke::SafeStrcpy(error, maxLength, "Failed to initialize JIT'd plugin");
 
 			return (amx->error = AMX_ERR_INIT);
 		}
@@ -307,14 +307,14 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 
 			if (*program == 0)
 			{
-				strcpy(error, "Failed to allocate memory");
+				ke::SafeStrcpy(error, maxLength, "Failed to allocate memory");
 				return (amx->error = AMX_ERR_MEMORY);
 			}
 		} else {
 			delete[] np;
 			delete[] rt;
 
-			sprintf(error, "Failed to initialize plugin (%d)", err);
+			ke::SafeSprintf(error, maxLength, "Failed to initialize plugin (%d)", err);
 
 			return (amx->error = AMX_ERR_INIT_JIT);
 		}
@@ -325,7 +325,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 
 	if (!script)
 	{
-		ke::SafeSprintf(error, 64, "Failed to allocate memory for script");
+		ke::SafeStrcpy(error, maxLength, "Failed to allocate memory for script");
 		return (amx->error = AMX_ERR_MEMORY);
 	}
 
@@ -341,7 +341,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 		{
 			if (amx_Register(amx, core_Natives, -1) != AMX_ERR_NONE)
 			{
-				sprintf(error, "Plugin uses an unknown function (name \"%s\") - check your modules.ini.", no_function);
+				ke::SafeSprintf(error, maxLength, "Plugin uses an unknown function (name \"%s\") - check your modules.ini.", no_function);
 				return (amx->error = AMX_ERR_NOTFOUND);
 			}
 		} else {
@@ -352,6 +352,17 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 	return (amx->error = AMX_ERR_NONE);
 }
 
+int load_amxscript_ex(AMX *amx, void **program, const char *filename, char *error, size_t maxLength, int debug)
+{
+	return load_amxscript_internal(amx, program, filename, error, maxLength, debug);
+}
+
+// Deprecated. Use load_amxscript_ex() or MF_LoadAmxScriptEx() for modules. This function is kept to maintain backward compatibility.
+int load_amxscript(AMX *amx, void **program, const char *filename, char error[64], int debug)
+{
+	return load_amxscript_internal(amx, program, filename, error, 64 /* error max length */, debug);
+}
+
 const char *StrCaseStr(const char *as, const char *bs)
 {
 	static char a[256];
@@ -1759,9 +1770,10 @@ void Module_CacheFunctions()
 	REGISTER_FUNC("GetAmxScriptName", MNF_GetAmxScriptName)
 	REGISTER_FUNC("FindAmxScriptByName", MNF_FindAmxScriptByName)
 	REGISTER_FUNC("FindAmxScriptByAmx", MNF_FindAmxScriptByAmx)
-	REGISTER_FUNC("LoadAmxScript", load_amxscript)
+	REGISTER_FUNC("LoadAmxScript", load_amxscript) // Deprecated. Please use LoadAmxScriptEx instead.
+	REGISTER_FUNC("LoadAmxScriptEx", load_amxscript_ex)
 	REGISTER_FUNC("UnloadAmxScript", unload_amxscript)
-
+		
 	// String / mem in amx scripts support
 	REGISTER_FUNC("SetAmxString", set_amxstring)
 	REGISTER_FUNC("SetAmxStringUTF8Char", set_amxstring_utf8_char)

amxmodx/msvc12/amxmodx_mm.vcxproj

@@ -96,6 +96,14 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <SpecifySectionAttributes>.data,RW</SpecifySectionAttributes>
     </Link>
+    <PreBuildEvent>
+      <Command>cd ..
+md -p JIT 2&gt;NUL
+%NASM_PATH%nasm.exe -f win32 helpers-x86.asm -o JIT/helpers-x86.obj 
+%NASM_PATH%nasm.exe -f win32 natives-x86.asm -o JIT/natives-x86.obj 
+%NASM_PATH%nasm.exe -f win32 amxexecn.asm -o JIT/amxexecn.obj 
+%NASM_PATH%nasm.exe -O0 -f win32 amxjitsn.asm -o JIT/amxjitsn.obj</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='JITRelease|Win32'">
     <Midl>
@@ -148,6 +156,14 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
       <SpecifySectionAttributes>.data,RW</SpecifySectionAttributes>
     </Link>
+    <PreBuildEvent>
+      <Command>cd ..
+md -p JIT 2&gt;NUL
+%NASM_PATH%nasm.exe -f win32 helpers-x86.asm -o JIT/helpers-x86.obj 
+%NASM_PATH%nasm.exe -f win32 natives-x86.asm -o JIT/natives-x86.obj 
+%NASM_PATH%nasm.exe -f win32 amxexecn.asm -o JIT/amxexecn.obj 
+%NASM_PATH%nasm.exe -O0 -f win32 amxjitsn.asm -o JIT/amxjitsn.obj</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\public\memtools\CDetour\asm\asm.c" />
@@ -474,4 +490,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

amxmodx/newmenus.cpp

@@ -92,7 +92,7 @@ bool CloseNewMenus(CPlayer *pPlayer)
 
 Menu::Menu(const char *title, AMX *amx, int fid) : m_Title(title), m_ItemColor("\\r"), 
 m_NeverExit(false), m_AutoColors(g_coloredmenus), thisId(0), func(fid), 
-isDestroying(false), pageCallback(-1), items_per_page(7)
+isDestroying(false), pageCallback(-1), showPageNumber(true), items_per_page(7)
 {
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
 	menuId = g_menucmds.registerMenuId(title, amx);
@@ -316,11 +316,6 @@ bool Menu::Display(int player, page_t page)
 
 	CPlayer *pPlayer = GET_PLAYER_POINTER_I(player);
 
-	pPlayer->keys = 0;
-	pPlayer->menu = 0;
-
-	UTIL_FakeClientCommand(pPlayer->pEdict, "menuselect", "10", 0);
-
 	pPlayer->keys = keys;
 	pPlayer->menu = menuId;
 	pPlayer->newmenu = thisId;
@@ -362,7 +357,7 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	m_Text = nullptr;
 
 	char buffer[255];
-	if (items_per_page && (pages != 1))
+	if (showPageNumber && items_per_page && (pages != 1))
 	{
 		if (m_AutoColors)
 			ke::SafeSprintf(buffer, sizeof(buffer), "\\y%s %d/%d\n\\w\n", m_Title.chars(), page + 1, pages);
@@ -828,6 +823,12 @@ static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
 		return 0;
 	}
 
+	if (g_bmod_cstrike)
+	{
+		GET_OFFSET("CBasePlayer", m_iMenu);
+		set_pdata<int>(pPlayer->pEdict, m_iMenu, 0);
+	}
+
 	int time = -1;
 	if (params[0] / sizeof(cell) >= 4)
 		time = params[4];
@@ -982,6 +983,11 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 			unregisterSPForward(pMenu->pageCallback);
 			pMenu->pageCallback = callback;
 
+			break;
+		}
+	case MPROP_SHOWPAGE:
+		{
+			pMenu->showPageNumber = (get_amxaddr(amx, params[3]) != 0);
 			break;
 		}
 	case MPROP_SET_NUMBER_COLOR:

amxmodx/newmenus.h

@@ -31,6 +31,7 @@
 #define MPROP_PADMENU	9
 #define MPROP_SET_NUMBER_COLOR	10
 #define MPROP_PAGE_CALLBACK 11
+#define MPROP_SHOWPAGE		12
 
 typedef int (*MENUITEM_CALLBACK)(int, int, int);
 
@@ -125,6 +126,7 @@ public:
 	int func;
 	bool isDestroying;
 	int pageCallback;
+	bool showPageNumber;
 public:
 	unsigned int items_per_page;
 };

amxmodx/util.cpp

@@ -373,8 +373,8 @@ void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1,
 		{
 			if ((*aa).matchCommandLine(cmd, arg1) && (*aa).getPlugin()->isExecutable((*aa).getFunction()))
 			{
-				if (executeForwards((*aa).getFunction(), static_cast<cell>(GET_PLAYER_POINTER(pEdict)->index)),
-					static_cast<cell>((*aa).getFlags()), static_cast<cell>((*aa).getId()) > 0)
+				if (executeForwards((*aa).getFunction(), static_cast<cell>(GET_PLAYER_POINTER(pEdict)->index),
+					static_cast<cell>((*aa).getFlags()), static_cast<cell>((*aa).getId())) > 0)
 				{
 					g_fakecmd.notify = false;
 					return;

appveyor.yml

@@ -3,11 +3,16 @@ clone_folder: c:\projects\amxmodx
 install:
 - git submodule update --init --recursive
 - 'c:'
+- mkdir c:\nasm
+- set PATH=c:\nasm\nasm-2.13.03;%PATH%
+- curl -L -o "c:\nasm\nasm.zip" https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win32/nasm-2.13.03-win32.zip
+- chdir c:\nasm
+- 7z x nasm.zip
 - chdir c:\projects
 - git clone https://github.com/alliedmodders/ambuild
 - git clone https://github.com/alliedmodders/metamod-hl1
 - git clone https://github.com/alliedmodders/hlsdk
-- ps: Start-FileDownload 'http://cdn.mysql.com/archives/mysql-5.5/mysql-5.5.54-win32.zip'
+- ps: Start-FileDownload 'https://cdn.mysql.com/archives/mysql-5.5/mysql-5.5.54-win32.zip'
 - 7z x mysql-5.5.54-win32.zip -o"mysql"
 - cd mysql
 - ren mysql-5.5.54-win32 mysql-5.5
@@ -22,5 +27,5 @@ build_script:
 - '"%VS120COMNTOOLS%\vsvars32.bat"'
 - mkdir build
 - cd build
-- c:\python27\python ../configure.py --enable-optimize
-- c:\python27\scripts\ambuild
+- c:\python27\python ../configure.py --enable-optimize --nasm="C:\nasm\nasm-2.13.03\nasm.exe"
+- c:\python27\scripts\ambuild

compiler/amxxpc/amxxpc.cpp

@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 # else
 		printf("compiler failed to instantiate: %d\n", GetLastError());
 # endif
-		exit(0);
+		exit(EXIT_FAILURE);
 	}
 
 	COMPILER sc32 = (COMPILER)dlsym(lib, "Compile32");
@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 #else
 		printf("compiler failed to link: %d.\n", GetLastError());
 #endif
-		exit(0);
+		exit(EXIT_FAILURE);
 	}
 
 	pc_printf("AMX Mod X Compiler %s\n", AMXX_VERSION);
@@ -91,7 +91,7 @@ int main(int argc, char **argv)
 		pc_printf("Usage: <file.sma> [options]\n");
 		pc_printf("Use -? or --help to see full options\n\n");
 		getchar();
-		exit(0);
+		exit(EXIT_FAILURE);
 	}
 
 	if (!strcmp(argv[1], "-?") || !strcmp(argv[1], "--help"))
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
 		show_help();
 		pc_printf("Press any key to continue.\n");
 		getchar();
-		exit(0);
+		exit(EXIT_SUCCESS);
 	}
 
 	sc32(argc, argv);
@@ -109,16 +109,16 @@ int main(int argc, char **argv)
 	if (file == NULL)
 	{
 		pc_printf("Could not locate the output file.\n");
-		exit(0);
+		exit(EXIT_FAILURE);
 	} else if (strstr(file, ".asm")) {
 		pc_printf("Assembler output succeeded.\n");
-		exit(0);
+		exit(EXIT_SUCCESS);
 	} else {
 		FILE *fp = fopen(file, "rb");
 		if (fp == NULL)
 		{
 			pc_printf("Could not locate output file %s (compile failed).\n", file);
-			exit(0);
+			exit(EXIT_FAILURE);
 		}
 		ReadFileIntoPl(&pl32, fp);
 		pl32.cellsize = 4;
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
 	if (!fp)
 	{
 		pc_printf("Error trying to write file %s.\n", newfile);
-		exit(0);
+		exit(EXIT_FAILURE);
 	}
 
 	BinPlugin bh32;
@@ -179,7 +179,7 @@ int main(int argc, char **argv)
 #if !defined EMSCRIPTEN
 		dlclose(lib);
 #endif
-		exit(0);
+		exit(EXIT_FAILURE);
 	}
 
 	fclose(fp);
@@ -195,7 +195,7 @@ int main(int argc, char **argv)
 	dlclose(lib);
 #endif
 
-	exit(0);
+	exit(EXIT_SUCCESS);
 }
 
 void WriteBh(BinaryWriter *bw, BinPlugin *bh)
@@ -228,7 +228,7 @@ bool CompressPl(abl *pl)
 	if (err != Z_OK)
 	{
 		pc_printf("internal error - compression failed on first pass: %d\n", err);
-		exit(0);
+		exit(EXIT_FAILURE);
 	}
 
 	return true;

configure.py

@@ -30,4 +30,6 @@ run.options.add_option('--mysql', type='string', dest='mysql_path', default='',
                        help='Path to MySQL')
 run.options.add_option('--disable-auto-versioning', action='store_true', dest='disable_auto_versioning',
                        default=False, help='Disable the auto versioning script')
+run.options.add_option('--nasm', type='string', dest='nasm_path',
+                       default='nasm', help='Path to NASM')
 run.Configure()

modules/cstrike/cstrike/CstrikeHacks.cpp

@@ -721,9 +721,9 @@ void InitFuncsAddresses()
 		MF_Log("UTIL_FindEntByString is not available - native cs_find_ent_by_class() has been disabled");
 	}
 
-	if (!AddEntityHashValue || !AddEntityHashValue)
+	if (!AddEntityHashValue || !RemoveEntityHashValue)
 	{
-		MF_Log("AddEntityHashValue or AddEntityHashValue is not available - native cs_set_ent_class() has been disabled");
+		MF_Log("AddEntityHashValue or RemoveEntityHashValue is not available - native cs_set_ent_class() has been disabled");
 	}
 
 	if (!HasReGameDll && !GetWeaponInfo)

modules/cstrike/cstrike/CstrikeItemsInfos.cpp

@@ -17,7 +17,7 @@
 #include <resdk/mod_regamedll_api.h>
 
 CsItemInfo ItemsManager;
-ItemInfo WeaponsList[MAX_WEAPONS];
+ItemInfos WeaponsList[MAX_WEAPONS];
 
 #define PSTATE_ALIASES_TYPE       0
 #define PSTATE_ALIASES_ALIAS      1

modules/cstrike/cstrike/CstrikeItemsInfos.h

@@ -20,12 +20,12 @@
 #include <amtl/am-string.h>
 #include <sm_stringhashmap.h>
 
-struct ItemInfo
+struct ItemInfos
 {
-	ItemInfo() : name("Empty"), ammoIndex1(-1), maxAmmo1(0), ammoIndex2(-1), maxAmmo2(0), slot(0), position(0), id(0), flags(0)
+	ItemInfos() : name("Empty"), ammoIndex1(-1), maxAmmo1(0), ammoIndex2(-1), maxAmmo2(0), slot(0), position(0), id(0), flags(0)
 	{}
 
-	ItemInfo &operator = (ItemInfo &other)
+	ItemInfos &operator = (ItemInfos &other)
 	{
 		name       = other.name;
 		ammoIndex1 = other.ammoIndex1;
@@ -133,7 +133,7 @@ class CsItemInfo : public ITextListener_SMC
 		int          m_EquipmentsPrice[static_cast<size_t>(Equipments::Count)];
 };
 
-extern ItemInfo WeaponsList[MAX_WEAPONS];
+extern ItemInfos WeaponsList[MAX_WEAPONS];
 extern CsItemInfo ItemsManager;
 
 #endif // _CSTRIKE_WEAPONS_INFOS_H_

modules/cstrike/cstrike/CstrikeNatives.cpp

@@ -882,7 +882,7 @@ static cell AMX_NATIVE_CALL cs_set_user_model(AMX *amx, cell *params)
 
 		GET_OFFSET("CBasePlayer", m_modelIndexPlayer);
 
-		char modelpath[260];
+		char modelpath[PLATFORM_MAX_PATH];
 		ke::SafeSprintf(modelpath, sizeof(modelpath), "models/player/%s/%s.mdl", newModel, newModel);
 
 		auto modelIndex = 0;

modules/cstrike/cstrike/CstrikeUserMessages.cpp

@@ -22,7 +22,7 @@ bool ShouldBlock;
 bool ShouldBlockHLTV;
 bool ShouldDisableHooks;
 bool RetrieveWeaponList;
-ItemInfo CurrentWeaponList;
+ItemInfos CurrentWeaponList;
 int ArgPosition;
 
 int MessageIdArmorType;

modules/cstrike/cstrike/CstrikeUtils.cpp

@@ -13,12 +13,13 @@
 
 #include "amxxmodule.h"
 #include <amtl/am-algorithm.h>
+#include <amtl/am-string.h>
 
 extern int MessageIdTextMsg;
 
 bool UTIL_IsPlayer(edict_t *pPlayer)
 {
-	return strcmp(STRING(pPlayer->v.classname), "player") == 0;
+	return pPlayer && strcmp(STRING(pPlayer->v.classname), "player") == 0;
 }
 
 void UTIL_TextMsg_Generic(edict_t* pPlayer, const char* message)
@@ -36,7 +37,7 @@ bool UTIL_CheckForPublic(const char *publicname)
 	int i = 0;
 	char blah[64];
 
-	strncpy(blah, publicname, sizeof(blah) - 1);
+	ke::SafeStrcpy(blah, sizeof(blah), publicname);
 
 	while ((amx = MF_GetScriptAmx(i++)))
 	{

modules/cstrike/cstrike/CstrikeUtils.h

@@ -49,6 +49,10 @@ void UTIL_StringToLower(const char *str, char *buffer, size_t maxlength);
 				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (not in-game)", x); \
 				return 0; \
 			} \
+			else if (!MF_GetPlayerEdict(x)->pvPrivateData) { \
+				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (no private data)", x); \
+				return 0; \
+			} \
 		} else { \
 			if (x != 0 && FNullEnt(TypeConversion.id_to_edict(x))) { \
 				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d", x); \
@@ -62,8 +66,12 @@ void UTIL_StringToLower(const char *str, char *buffer, size_t maxlength);
 		MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
 		return 0; \
 	} else { \
-		if (!MF_IsPlayerIngame(x) || FNullEnt(MF_GetPlayerEdict(x))) { \
-			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d", x); \
+		if (!MF_IsPlayerIngame(x)) { \
+			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (not in-game)", x); \
+			return 0; \
+		} \
+		else if (!MF_GetPlayerEdict(x)->pvPrivateData) { \
+			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (no private data)", x); \
 			return 0; \
 		} \
 	}

modules/cstrike/cstrike/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "cstrike"
 #define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/cstrike/cstrike/msvc12/cstrike.vcxproj

@@ -165,9 +165,18 @@
     <ClInclude Include="..\..\..\..\public\memtools\CDetour\detours.h" />
     <ClInclude Include="..\..\..\..\public\memtools\MemoryUtils.h" />
     <ClInclude Include="..\..\..\..\public\resdk\common\hookchains.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSEntity.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSInterfaces.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSPlayer.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSPlayerItem.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSPlayerWeapon.h" />
     <ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_api.h" />
     <ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_const.h" />
-    <ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_interfaces.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\engine\cmd_rehlds.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\engine\FlightRecorder.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\engine\IObjectContainer.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\engine\ObjectList.h" />
+    <ClInclude Include="..\..\..\..\public\resdk\engine\pr_dlls.h" />
     <ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_api.h" />
     <ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_interfaces.h" />
     <ClInclude Include="..\..\..\..\public\resdk\mod_regamedll_api.h" />
@@ -188,4 +197,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

modules/cstrike/cstrike/msvc12/cstrike.vcxproj.filters

@@ -39,6 +39,9 @@
     <Filter Include="ReSDK\cstrike">
       <UniqueIdentifier>{ba0b72ba-25d8-48c3-af84-c1d4d7436636}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ReSDK\cstrike\API">
+      <UniqueIdentifier>{67de85cb-b8e7-4cd6-b8cf-2ff7ed540c2b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\CstrikeHacks.cpp">
@@ -127,9 +130,6 @@
     <ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_const.h">
       <Filter>ReSDK\cstrike</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\public\resdk\cstrike\regamedll_interfaces.h">
-      <Filter>ReSDK\cstrike</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\public\resdk\engine\rehlds_api.h">
       <Filter>ReSDK\engine</Filter>
     </ClInclude>
@@ -142,6 +142,36 @@
     <ClInclude Include="..\..\..\..\public\resdk\mod_rehlds_api.h">
       <Filter>ReSDK</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSEntity.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSInterfaces.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSPlayer.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSPlayerItem.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\cstrike\API\CSPlayerWeapon.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\engine\cmd_rehlds.h">
+      <Filter>ReSDK\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\engine\FlightRecorder.h">
+      <Filter>ReSDK\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\engine\IObjectContainer.h">
+      <Filter>ReSDK\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\engine\ObjectList.h">
+      <Filter>ReSDK\engine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\public\resdk\engine\pr_dlls.h">
+      <Filter>ReSDK\engine</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\plugins\include\cstrike.inc">

modules/cstrike/csx/CRank.cpp

@@ -139,9 +139,9 @@ void RankSystem::clear(){
 
 
 
-bool RankSystem::loadCalc(const char* filename, char* error)
+bool RankSystem::loadCalc(const char* filename, char* error, size_t maxLength)
 {
-	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error,0)!=AMX_ERR_NONE)||
+	if ((MF_LoadAmxScriptEx(&calc.amx,&calc.code,filename, error, maxLength, 0)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 11 , &calc.amxAddr1, &calc.physAddr1)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr2, &calc.physAddr2)!=AMX_ERR_NONE)||
 		(MF_AmxFindPublic(&calc.amx,"get_score",&calc.func)!=AMX_ERR_NONE)){

modules/cstrike/csx/CRank.h

@@ -110,7 +110,7 @@ public:
 	void saveRank( const char* filename );
 	void loadRank( const char* filename );
 	RankStats* findEntryInRank(const char* unique, const char* name, bool isip=false);
-	bool loadCalc(const char* filename, char* error);
+	bool loadCalc(const char* filename, char* error, size_t maxLength);
 	inline int getRankNum( ) const { return rankNum; }
 	void clear();
 	void unloadCalc();

modules/cstrike/csx/meta_api.cpp

@@ -178,14 +178,18 @@ void PlayerPreThink_Post( edict_t *pEntity ) {
 	RETURN_META(MRES_IGNORED);
 }
 
-void ServerDeactivate() {
+void ServerDeactivate() 
+{
 	int i;
-	for( i = 1;i<=gpGlobals->maxClients; ++i){
-		CPlayer *pPlayer = GET_PLAYER_POINTER_I(i);
-		if (pPlayer->rank) pPlayer->Disconnect();
+
+	for( i = 1; i <= gpGlobals->maxClients; ++i)
+	{
+		GET_PLAYER_POINTER_I(i)->Disconnect();
 	}
-	if ( (g_rank.getRankNum() >= (int)csstats_maxsize->value) || ((int)csstats_reset->value == 1 ) ) {
-		CVAR_SET_FLOAT("csstats_reset",0.0);
+
+	if (static_cast<int>(csstats_maxsize->value) <= 0 || g_rank.getRankNum() >= static_cast<int>(csstats_maxsize->value) || static_cast<int>(csstats_reset->value) != 0)
+	{
+		CVAR_SET_FLOAT("csstats_reset", 0.0f);
 		g_rank.clear(); // clear before save to file
 	}
 	g_rank.saveRank( MF_BuildPathname("%s",get_localinfo("csstats")) );	
@@ -197,27 +201,26 @@ void ServerDeactivate() {
 	RETURN_META(MRES_IGNORED);
 }
 
-BOOL ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ]  ){
+BOOL ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[128])
+{
 	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
 	
-	if (pPlayer->pEdict == NULL)
-	{
-		pPlayer->Init(ENTINDEX(pEntity), pEntity);
-	}
-	
 	pPlayer->Connect(pszAddress);
 
 	RETURN_META_VALUE(MRES_IGNORED, TRUE);
 }
 
-void ClientDisconnect( edict_t *pEntity ) {
-	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	if (pPlayer->rank) pPlayer->Disconnect();
+void ClientDisconnect( edict_t *pEntity ) 
+{
+	GET_PLAYER_POINTER(pEntity)->Disconnect();
+
 	RETURN_META(MRES_IGNORED);
 }
 
-void ClientPutInServer_Post( edict_t *pEntity ) {
+void ClientPutInServer_Post( edict_t *pEntity ) 
+{
 	GET_PLAYER_POINTER(pEntity)->PutInServer();
+
 	RETURN_META(MRES_IGNORED);
 }
 
@@ -418,7 +421,7 @@ void OnAmxxAttach(){
 	if ( path && *path ) 
 	{
 		char error[128];
-		g_rank.loadCalc( MF_BuildPathname("%s",path) , error  );
+		g_rank.loadCalc( MF_BuildPathname("%s",path) , error, sizeof(error));
 	}
 	
 	if ( !g_rank.begin() )

modules/cstrike/csx/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "csx"
 #define MODULE_LIBCLASS "xstats"
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/cstrike/csx/msvc12/csx.vcxproj

@@ -160,6 +160,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\plugins\include\csstats.inc" />
+    <None Include="..\..\..\plugins\include\csstats_const.inc" />
     <None Include="..\..\..\plugins\include\csx.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

modules/cstrike/csx/msvc12/csx.vcxproj.filters

@@ -60,6 +60,9 @@
     <None Include="..\..\..\plugins\include\csstats.inc">
       <Filter>Pawn Includes</Filter>
     </None>
+    <None Include="..\..\..\plugins\include\csstats_const.inc">
+      <Filter>Pawn Includes</Filter>
+    </None>
     <None Include="..\..\..\plugins\include\csx.inc">
       <Filter>Pawn Includes</Filter>
     </None>

modules/dod/dodfun/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "dodfun"
 #define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/dod/dodx/CRank.cpp

@@ -128,9 +128,9 @@ void RankSystem::clear(){
 	}
 }
 
-bool RankSystem::loadCalc(const char* filename, char* error)
+bool RankSystem::loadCalc(const char* filename, char* error, size_t maxLength)
 {
-	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error,0)!=AMX_ERR_NONE)||
+	if ((MF_LoadAmxScriptEx(&calc.amx,&calc.code,filename, error, maxLength, 0)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr1, &calc.physAddr1)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr2, &calc.physAddr2)!=AMX_ERR_NONE)||
 		(MF_AmxFindPublic(&calc.amx,"get_score",&calc.func)!=AMX_ERR_NONE)){

modules/dod/dodx/CRank.h

@@ -104,7 +104,7 @@ public:
 	void saveRank( const char* filename );
 	void loadRank( const char* filename );
 	RankStats* findEntryInRank(const char* unique, const char* name , bool isip = false);
-	bool loadCalc(const char* filename, char* error);
+	bool loadCalc(const char* filename, char* error, size_t maxLength);
 	inline int getRankNum( ) const { return rankNum; }
 	void clear();
 	void unloadCalc();

modules/dod/dodx/moduleconfig.cpp

@@ -471,7 +471,7 @@ void OnAmxxAttach()
 	if ( path && *path )
 	{
 		char error[128];
-		g_rank.loadCalc( MF_BuildPathname("%s",path) , error  );
+		g_rank.loadCalc( MF_BuildPathname("%s",path) , error, sizeof(error));
 	}
 
 	if ( !g_rank.begin() )

modules/dod/dodx/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "dodx"
 #define MODULE_LIBCLASS "xstats"
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/engine/engine.cpp

@@ -456,6 +456,13 @@ static cell AMX_NATIVE_CALL set_view(AMX *amx, cell *params) {
 
 			plinfo[iIndex].iViewType = CAMERA_3RDPERSON;
 			pNewCamera = CREATE_NAMED_ENTITY(MAKE_STRING("info_target"));
+
+			if (!pNewCamera)
+			{
+				MF_LogError(amx, AMX_ERR_NATIVE, "Could not create camera entity.");
+				return 0;
+			}
+
 			pNewCamera->v.classname = MAKE_STRING("VexdCam");
 
 			SET_MODEL(pNewCamera, "models/rpgrocket.mdl");
@@ -486,6 +493,13 @@ static cell AMX_NATIVE_CALL set_view(AMX *amx, cell *params) {
 
 			plinfo[iIndex].iViewType = CAMERA_UPLEFT;
 			pNewCamera = CREATE_NAMED_ENTITY(MAKE_STRING("info_target"));
+
+			if (!pNewCamera)
+			{
+				MF_LogError(amx, AMX_ERR_NATIVE, "Could not create camera entity.");
+				return 0;
+			}
+
 			pNewCamera->v.classname = MAKE_STRING("VexdCam");
 
 			SET_MODEL(pNewCamera, "models/rpgrocket.mdl");
@@ -516,6 +530,13 @@ static cell AMX_NATIVE_CALL set_view(AMX *amx, cell *params) {
 
 			plinfo[iIndex].iViewType = CAMERA_TOPDOWN;
 			pNewCamera = CREATE_NAMED_ENTITY(MAKE_STRING("info_target"));
+
+			if (!pNewCamera)
+			{
+				MF_LogError(amx, AMX_ERR_NATIVE, "Could not create camera entity.");
+				return 0;
+			}
+
 			pNewCamera->v.classname = MAKE_STRING("VexdCam");
 
 			SET_MODEL(pNewCamera, "models/rpgrocket.mdl");

modules/engine/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "engine"
 #define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/fakemeta/engfunc.cpp

@@ -12,9 +12,12 @@
 //
 
 #include "fakemeta_amxx.h"
+#include <engine_strucs.h>
 
 TraceResult g_tr;
 
+ke::AString LightStyleBuffers[MAX_LIGHTSTYLES];
+
 //by mahnsawce from his NS module
 static cell AMX_NATIVE_CALL engfunc(AMX *amx, cell *params)
 {
@@ -595,8 +598,13 @@ static cell AMX_NATIVE_CALL engfunc(AMX *amx, cell *params)
 	case	EngFunc_LightStyle:			// void )			(int style, const char* val);
 		cRet = MF_GetAmxAddr(amx,params[2]);
 		iparam1=cRet[0];
-		temp = MF_GetAmxString(amx,params[3],0,&len);
-		(*g_engfuncs.pfnLightStyle)(iparam1,temp);
+		if (iparam1 < 0 || iparam1 >= ARRAYSIZE(LightStyleBuffers))
+		{
+			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid style %d", iparam1);
+			return 0;
+		}
+		LightStyleBuffers[iparam1] = MF_GetAmxString(amx, params[3], 0, &len);
+		(*g_engfuncs.pfnLightStyle)(iparam1, LightStyleBuffers[iparam1].chars());
 		return 1;
 
 

modules/fakemeta/fakemeta_amxx.cpp

@@ -107,6 +107,11 @@ void OnAmxxDetach()
 	ConfigManager->CloseGameConfigFile(CommonConfig);
 	ConfigManager->CloseGameConfigFile(GamerulesConfig);
 
+	if (HasRegameDll)
+	{
+		ReGameHookchains->InstallGameRules()->unregisterHook(InstallGameRules);
+	}
+
 	while (!g_FreeTRs.empty())
 	{
 		delete g_FreeTRs.front();

modules/fakemeta/fakemeta_amxx.h

@@ -50,6 +50,16 @@
 
 #define CHECK_ENTITY(x) if (x != 0 && (FNullEnt(TypeConversion.id_to_edict(x)) || x < 0 || x > gpGlobals->maxEntities)) { MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity"); return 0; }
 #define CHECK_OFFSET(x) if (x < 0) { MF_LogError(amx, AMX_ERR_NATIVE, "Invalid offset"); return 0; }
+#define CHECK_ENTITY_PDATA(x) \
+	if (FNullEnt(TypeConversion.id_to_edict(x))) { \
+		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d", x); \
+		return 0; \
+	} \
+	else if (!TypeConversion.id_to_edict(x)->pvPrivateData) { \
+		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d (no private data)", x); \
+		return 0; \
+	}
+
 
 extern AMX_NATIVE_INFO engfunc_natives[];
 extern AMX_NATIVE_INFO dllfunc_natives[];

modules/fakemeta/fm_tr.cpp

@@ -86,7 +86,7 @@ static cell AMX_NATIVE_CALL set_tr(AMX *amx, cell *params)
 	case TR_pHit:
 		{
 			e = TypeConversion.id_to_edict(*ptr);
-			if (!e || FNullEnt(e))
+			if (*ptr != -1 && FNullEnt(e))
 				return 0; //TODO: return error
 			gfm_tr->pHit = e;
 			return 1;
@@ -167,7 +167,7 @@ static cell AMX_NATIVE_CALL get_tr(AMX *amx, cell *params)
 		}
 	case TR_pHit:
 		{
-			if (gfm_tr->pHit == NULL || FNullEnt(gfm_tr->pHit))
+			if (FNullEnt(gfm_tr->pHit))
 				return -1;
 			return ENTINDEX(gfm_tr->pHit);
 			break;

modules/fakemeta/fm_tr2.cpp

@@ -99,7 +99,7 @@ static cell AMX_NATIVE_CALL set_tr2(AMX *amx, cell *params)
 	case TR_pHit:
 		{
 			edict_t *e = TypeConversion.id_to_edict(*ptr);
-			if (!e || FNullEnt(e))
+			if (*ptr != -1 && FNullEnt(e))
 				return 0; //TODO: return error
 			tr->pHit = e;
 			return 1;
@@ -187,7 +187,7 @@ static cell AMX_NATIVE_CALL get_tr2(AMX *amx, cell *params)
 		}
 	case TR_pHit:
 		{
-			if (tr->pHit == NULL || FNullEnt(tr->pHit))
+			if (FNullEnt(tr->pHit))
 				return -1;
 			return ENTINDEX(tr->pHit);
 			break;

modules/fakemeta/misc.cpp

@@ -18,7 +18,7 @@ static cell AMX_NATIVE_CALL copy_infokey_buffer(AMX *amx, cell *params)
 {
 	char *infobuffer = reinterpret_cast<char *>(params[1]);
 
-	return MF_SetAmxString(amx, params[2], infobuffer, params[3]);
+	return MF_SetAmxString(amx, params[2], infobuffer ? infobuffer : "", params[3]);
 }
 
 // lookup_sequence(entid, "sequence name", &Float:framerate = 0.0, &bool:loops = false, &Float:groundspeed = 0.0);

modules/fakemeta/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "fakemeta"
 #define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/fakemeta/msvc12/fakemeta.vcxproj

@@ -120,11 +120,14 @@
     <ClInclude Include="..\..\..\public\HLTypeConversion.h" />
     <ClInclude Include="..\..\..\public\memtools\MemoryUtils.h" />
     <ClInclude Include="..\..\..\public\resdk\common\hookchains.h" />
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSEntity.h" />
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSInterfaces.h" />
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSPlayer.h" />
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSPlayerItem.h" />
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSPlayerWeapon.h" />
     <ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_api.h" />
     <ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_const.h" />
-    <ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_interfaces.h" />
     <ClInclude Include="..\..\..\public\resdk\mod_regamedll_api.h" />
-    <ClInclude Include="..\..\..\public\resdk\mod_rehlds_api.h" />
     <ClInclude Include="..\fakemeta_amxx.h" />
     <ClInclude Include="..\fm_tr.h" />
     <ClInclude Include="..\dllfunc.h" />
@@ -148,4 +151,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

modules/fakemeta/msvc12/fakemeta.vcxproj.filters

@@ -45,6 +45,9 @@
     <Filter Include="ReSDK\cstrike">
       <UniqueIdentifier>{0d1c5025-071d-43aa-b19a-2eee0d34a906}</UniqueIdentifier>
     </Filter>
+    <Filter Include="ReSDK\cstrike\API">
+      <UniqueIdentifier>{2800175e-06bf-42bf-b3c1-f86561471531}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\fakemeta_amxx.cpp">
@@ -145,14 +148,23 @@
     <ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_const.h">
       <Filter>ReSDK\cstrike</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\public\resdk\cstrike\regamedll_interfaces.h">
-      <Filter>ReSDK\cstrike</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\public\resdk\mod_regamedll_api.h">
       <Filter>ReSDK</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\public\resdk\mod_rehlds_api.h">
-      <Filter>ReSDK</Filter>
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSEntity.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSInterfaces.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSPlayer.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSPlayerItem.h">
+      <Filter>ReSDK\cstrike\API</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\public\resdk\cstrike\API\CSPlayerWeapon.h">
+      <Filter>ReSDK\cstrike\API</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

modules/fakemeta/pdata.cpp

@@ -32,18 +32,18 @@
 //implement these with setjmp later.
 bool IsBadReadPtr(void *l, size_t size)
 {
-	return false;
+	return l ? false : true;
 }
 bool IsBadWritePtr(void *l, size_t size)
 {
-	return false;
+	return l ? false : true;
 }
 #endif
 
 static cell AMX_NATIVE_CALL set_pdata_int(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset);
@@ -65,7 +65,7 @@ static cell AMX_NATIVE_CALL set_pdata_int(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_int(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset);
@@ -87,7 +87,7 @@ static cell AMX_NATIVE_CALL get_pdata_int(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_float(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset);
@@ -109,7 +109,7 @@ static cell AMX_NATIVE_CALL set_pdata_float(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_float(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset);
@@ -130,7 +130,7 @@ static cell AMX_NATIVE_CALL get_pdata_float(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_string(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset);
@@ -167,7 +167,7 @@ static cell AMX_NATIVE_CALL get_pdata_string(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_string(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset);
@@ -192,30 +192,35 @@ static cell AMX_NATIVE_CALL set_pdata_string(AMX *amx, cell *params)
 		szData = get_pdata_direct<char*>(pEdict, iOffset);
 		if (IsBadWritePtr(szData, 1))
 			return 0;
-		strcpy(szData, data);
 	} else {
 		szData = get_pdata<char*>(pEdict, iOffset);
 		if (IsBadWritePtr(szData, 1))
 			return 0;
-		if (params[4] == 1)
+
+		if (len > static_cast<int>(strlen(szData)))
 		{
-			free(szData);
-			szData = (char *)malloc(len + 1);
-		} else if (params[4] == 2) {
-			delete [] szData;
-			szData = new char[len + 1];
+			if (params[4] == 1)
+			{
+				free(szData);
+				szData = (char *)malloc(len + 1);
+			}
+			else if (params[4] == 2) {
+				delete[] szData;
+				szData = new char[len + 1];
+			}
+			set_pdata<char*>(pEdict, iOffset, szData);
 		}
-		strcpy(szData, data);
-		set_pdata<char*>(pEdict, iOffset, szData);
 	}
 
+	strncopy(szData, data, len + 1);
+
 	return 1;
 }
 
 static cell AMX_NATIVE_CALL get_pdata_ent(AMX *amx, cell *params)
 {
 	int index=params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int iOffset=params[2];
 	CHECK_OFFSET(iOffset); 
@@ -256,7 +261,7 @@ static cell AMX_NATIVE_CALL get_pdata_ent(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_ent(AMX *amx, cell *params)
 {
 	int index  = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -282,7 +287,7 @@ static cell AMX_NATIVE_CALL set_pdata_ent(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_bool(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -303,7 +308,7 @@ static cell AMX_NATIVE_CALL get_pdata_bool(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_bool(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -328,7 +333,7 @@ static cell AMX_NATIVE_CALL set_pdata_bool(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_byte(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -349,7 +354,7 @@ static cell AMX_NATIVE_CALL get_pdata_byte(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_byte(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -374,7 +379,7 @@ static cell AMX_NATIVE_CALL set_pdata_byte(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_short(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -395,7 +400,7 @@ static cell AMX_NATIVE_CALL get_pdata_short(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_short(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -420,7 +425,7 @@ static cell AMX_NATIVE_CALL set_pdata_short(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_vector(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -449,7 +454,7 @@ static cell AMX_NATIVE_CALL get_pdata_vector(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_vector(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -476,7 +481,7 @@ static cell AMX_NATIVE_CALL set_pdata_vector(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_pdata_ehandle(AMX *amx, cell *params)
 {
 	int index = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);
@@ -524,7 +529,7 @@ static cell AMX_NATIVE_CALL get_pdata_ehandle(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_pdata_ehandle(AMX *amx, cell *params)
 {
 	int index  = params[1];
-	CHECK_ENTITY(index);
+	CHECK_ENTITY_PDATA(index);
 
 	int offset = params[2];
 	CHECK_OFFSET(offset);

modules/fakemeta/pdata_entities.cpp

@@ -18,7 +18,7 @@
 static cell AMX_NATIVE_CALL get_ent_data(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -33,7 +33,7 @@ static cell AMX_NATIVE_CALL get_ent_data(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_ent_data(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -57,7 +57,7 @@ static cell AMX_NATIVE_CALL set_ent_data(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_ent_data_float(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -72,7 +72,7 @@ static cell AMX_NATIVE_CALL get_ent_data_float(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_ent_data_float(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -90,7 +90,7 @@ static cell AMX_NATIVE_CALL set_ent_data_float(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_ent_data_vector(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -107,7 +107,7 @@ static cell AMX_NATIVE_CALL get_ent_data_vector(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_ent_data_vector(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -125,7 +125,7 @@ static cell AMX_NATIVE_CALL set_ent_data_vector(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_ent_data_entity(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -142,7 +142,7 @@ static cell AMX_NATIVE_CALL set_ent_data_entity(AMX *amx, cell *params)
 	int entity = params[1];
 	int value = params[4];
 
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	if (value != -1)
 	{
@@ -165,7 +165,7 @@ static cell AMX_NATIVE_CALL set_ent_data_entity(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_ent_data_string(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);
@@ -190,7 +190,7 @@ static cell AMX_NATIVE_CALL get_ent_data_string(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL set_ent_data_string(AMX *amx, cell *params)
 {
 	int entity = params[1];
-	CHECK_ENTITY(entity);
+	CHECK_ENTITY_PDATA(entity);
 
 	TypeDescription data;
 	GET_TYPE_DESCRIPTION(2, data, CommonConfig);

modules/fun/fun.cpp

@@ -11,563 +11,464 @@
 // Fun Module
 //
 
-#include <string.h>
 #include "fun.h"
 #include <HLTypeConversion.h>
 
-/*
-	JGHG says:
-
-	Ok this is what I use below, it may probably not be right with all natives etc but I try to maintain this style to natives.
-	Note that this is still very much subject to change, regarding return values etc!
-	(Ok I haven't checked all natives that they comply with this yet, this is just a model I'm working on and which I might implement soon.)
-
-	static cell AMX_NATIVE_CALL nativename(AMX *amx, cell *params) // nativename(argument1, argument2); = 2 params
-	{
-		// Description what this native does.					<--- Description what this native does
-		// params[1] = argument1								<--- Description of each argument, so we don't have to allocate new variables and can
-		// params[2] = argument2								<--- use the ones in params[n] directly, to save some time.
-
-		// Check receiver and sender validity.					<--- Check ents, maybe need to do this better and more proper later?
-		CHECK_PLAYER(params[1])
-		CHECK_PLAYER(params[2])
-
-		// Get * pointer.
-		edict_t *pPlayer = MF_GetPlayerEdict(params[1]);		<--- Players require a different function than INDEXENT because of an HLSDK bug
-
-		return 1												<--- If native succeeded, return 1, if the native isn't supposed to return a specific value.		
-																Note: Should be able to do: if (thenative()) and it should return false when it fails, and true when succeeds... is -1 treated as false, or is 0 a must?
-	}
-*/
-
-char g_bodyhits[33][33];	// where can the guy in the first dimension hit the people in the 2nd dimension? :-)
-bool g_silent[33];			// used for set_user_footsteps()
-
 HLTypeConversion TypeConversion;
+CPlayers Players;
 
-// ######## Utils:
-void FUNUTIL_ResetPlayer(int index)
+// native get_client_listen(receiver, sender)
+static cell AMX_NATIVE_CALL get_client_listening(AMX *amx, cell *params)
 {
-	//MF_PrintSrvConsole("Resetting player index %d! maxclients: %d\n", index, gpGlobals->maxClients);
-	for (int i = 1; i <= gpGlobals->maxClients; i++) {
-		g_bodyhits[index][i] = (char)((1<<HITGROUP_GENERIC) | 
-						(1<<HITGROUP_HEAD) | 
-						(1<<HITGROUP_CHEST) | 
-						(1<<HITGROUP_STOMACH) | 
-						(1<<HITGROUP_LEFTARM) | 
-						(1<<HITGROUP_RIGHTARM)| 
-						(1<<HITGROUP_LEFTLEG) | 
-						(1<<HITGROUP_RIGHTLEG));
-	}
-	// Reset silent slippers
-	g_silent[index] = false;
+	enum args { arg_count, arg_receiver, arg_sender };
+
+	CHECK_PLAYER(params[arg_receiver]);
+	CHECK_PLAYER(params[arg_sender]);
+
+	return GETCLIENTLISTENING(params[arg_receiver], params[arg_sender]);
 }
 
-// ######## Natives:
-static cell AMX_NATIVE_CALL get_client_listening(AMX *amx, cell *params) // get_client_listening(receiver, sender); = 2 params
+// native set_client_listen(receiver, sender, listen)
+static cell AMX_NATIVE_CALL set_client_listening(AMX *amx, cell *params)
 {
-	// Gets who can listen to who.
-	// params[1] = receiver
-	// params[2] = sender
+	enum args { arg_count, arg_receiver, arg_sender, arg_listen };
 
-	// Check receiver and sender validity.
-	CHECK_PLAYER(params[1]);
-	CHECK_PLAYER(params[2]);
+	CHECK_PLAYER(params[arg_receiver]);
+	CHECK_PLAYER(params[arg_sender]);
 
-	// GET- AND SETCLIENTLISTENING returns "qboolean", an int, probably 0 or 1...
-	return GETCLIENTLISTENING(params[1], params[2]);
+	return SETCLIENTLISTENING(params[arg_receiver], params[arg_sender], params[arg_listen]);
 }
 
-static cell AMX_NATIVE_CALL set_client_listening(AMX *amx, cell *params) // set_client_listening(receiver, sender, listen); = 3 params
+// native set_user_godmode(index, godmode = 0)
+static cell AMX_NATIVE_CALL set_user_godmode(AMX *amx, cell *params)
 {
-	// Sets who can listen to who.
-	// params[1] = receiver
-	// params[2] = sender
-	// params[3] = listen
+	enum args { arg_count, arg_user, arg_godmode };
 
-	// Check receiver and sender validity.
-	CHECK_PLAYER(params[1]);
-	CHECK_PLAYER(params[2]);
+	CHECK_PLAYER(params[arg_user]);
 
-	// Make a check on params[3] here later, and call run time error when it's wrong.
-	// To do: find out the possible values to set (0, 1?)
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_user]);
 
-	// GET- AND SETCLIENTLISTENING returns "qboolean", an int, probably 0 or 1...
-	return SETCLIENTLISTENING(params[1], params[2], params[3]);
-}
-
-static cell AMX_NATIVE_CALL set_user_godmode(AMX *amx, cell *params) // set_user_godmode(index, godmode = 0); = 2 params
-{
-	/* Sets player godmode. If you want to disable godmode set only first parameter. */
-	// params[1] = index
-	// params[2] = godmode = 0
-
-	// Check index.
-	CHECK_PLAYER(params[1]);
-
-	// Get player pointer.
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
-
-	if (params[2] == 1) {
-		// Enable godmode
-		pPlayer->v.takedamage = 0.0;	// 0.0, the player doesn't seem to be able to get hurt.
-	}
-	else {
-		// Disable godmode
-		pPlayer->v.takedamage = 2.0;	// 2.0 seems to be standard value?
-	}
+	pPlayer->v.takedamage = params[arg_godmode] != 0 ? DAMAGE_NO : DAMAGE_AIM;
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL get_user_godmode(AMX *amx, cell *params) // get_user_godmode(index); = 1 param
+// native get_user_godmode(index)
+static cell AMX_NATIVE_CALL get_user_godmode(AMX *amx, cell *params)
 {
-	/* Returns 1 if godmode is set. */
-	// params[1] = index
+	enum args { arg_count, arg_user };
 
-	// Check index.
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_user]);
 
-	// Get player pointer.
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_user]);
 
-	int godmode = 0;
-
-	if (pPlayer->v.takedamage == 0.0) {
-		// God mode is enabled
-		godmode = 1;
-	}
-
-	return godmode;
+	return pPlayer->v.takedamage == DAMAGE_NO;
 }
 
-static cell AMX_NATIVE_CALL give_item(AMX *amx, cell *params) // native give_item(index, const item[]); = 2 params
+// native give_item(index, const item[])
+static cell AMX_NATIVE_CALL give_item(AMX *amx, cell *params)
 {
-	/* Gives item to player, name of item can start
-	* with weapon_, ammo_ and item_. This event
-	* is announced with proper message to all players. */
-	// params[1] = index
-	// params[2] = item...
+	enum args { arg_count, arg_index, arg_item };
 
-	// Check index.
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Get player pointer.
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	auto itemLength = 0;
+	const auto item = MF_GetAmxString(amx, params[arg_item], 1, &itemLength);
 
-	// Create item entity pointer
-	edict_t	*pItemEntity;
-
-	// Make an "intstring" out of 2nd parameter
-	int length;
-	const char *szItem = MF_GetAmxString(amx, params[2], 1, &length);
-
-	//check for valid item
-	if (strncmp(szItem, "weapon_", 7) && 
-		strncmp(szItem, "ammo_", 5) && 
-		strncmp(szItem, "item_", 5) &&
-		strncmp(szItem, "tf_weapon_", 10)
-	) {
+	if (!itemLength
+		||(strncmp(item, "weapon_", 7) != 0
+		&& strncmp(item, "ammo_", 5) != 0
+		&& strncmp(item, "item_", 5) != 0
+		&& strncmp(item, "tf_weapon_", 10) != 0))
+	{
 		return 0;
 	}
 
-	//string_t item = MAKE_STRING(szItem);
-	string_t item = ALLOC_STRING(szItem); // Using MAKE_STRING makes "item" contents get lost when we leave this scope! ALLOC_STRING seems to allocate properly...
-	// Create the entity, returns to pointer
-	pItemEntity = CREATE_NAMED_ENTITY(item);
+	auto pEntity = CREATE_NAMED_ENTITY(ALLOC_STRING(item));
 
-	if (FNullEnt(pItemEntity)) {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Item \"%s\" failed to create", szItem);
+	if (FNullEnt(pEntity))
+	{
+		MF_LogError(amx, AMX_ERR_NATIVE, "Item \"%s\" failed to create", item);
 		return 0;
 	}
 
-	//VARS(pItemEntity)->origin = VARS(pPlayer)->origin; // nice to do VARS(ent)->origin instead of ent->v.origin? :-I
-	//I'm not sure, normally I use macros too =P
-	pItemEntity->v.origin = pPlayer->v.origin;
-	pItemEntity->v.spawnflags |= SF_NORESPAWN;	//SF_NORESPAWN;
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
 
-	MDLL_Spawn(pItemEntity);
+	pEntity->v.origin = pPlayer->v.origin;
+	pEntity->v.spawnflags |= SF_NORESPAWN;
 
-	int save = pItemEntity->v.solid;
+	MDLL_Spawn(pEntity);
 
-	MDLL_Touch(pItemEntity, ENT(pPlayer));
+	const auto oldSolid = pEntity->v.solid;
 
-	//The problem with the original give_item was the
-	// item was not removed.  I had tried this but it
-	// did not work.  OLO's implementation is better.
-	/*
-	int iEnt = ENTINDEX(pItemEntity->v.owner);
-	if (iEnt > 32 || iEnt <1 ) {
-		MDLL_Think(pItemEntity);
-	}*/
+	MDLL_Touch(pEntity, pPlayer);
 
-	if (pItemEntity->v.solid == save) {
-		REMOVE_ENTITY(pItemEntity);
-		//the function did not fail - we're just deleting the item
+	if (pEntity->v.solid == oldSolid)
+	{
+		REMOVE_ENTITY(pEntity); // The function did not fail - we're just deleting the item
 		return -1;
 	}
 
-	return ENTINDEX(pItemEntity);
+	return TypeConversion.edict_to_id(pEntity);
 }
 
-static cell AMX_NATIVE_CALL spawn(AMX *amx, cell *params) // spawn(id) = 1 param
+// native spawn(index)
+static cell AMX_NATIVE_CALL spawn(AMX *amx, cell *params)
 {
-	// Spawns an entity, this can be a user/player -> spawns at spawnpoints, or created entities seems to need this as a final "kick" into the game? :-)
-	// params[1] = entity to spawn
+	enum args { arg_count, arg_index };
 
-	CHECK_ENTITY(params[1]);
+	CHECK_ENTITY(params[arg_index]);
 
-	edict_t *pEnt = TypeConversion.id_to_edict(params[1]);
+	const auto pEntity = TypeConversion.id_to_edict(params[arg_index]);
 
-	MDLL_Spawn(pEnt);
+	MDLL_Spawn(pEntity);
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL set_user_health(AMX *amx, cell *params) // set_user_health(index, health); = 2 arguments
+// native set_user_health(index, health)
+static cell AMX_NATIVE_CALL set_user_health(AMX *amx, cell *params)
 {
-	// Sets user health. If health is 0 and below, also kill...
-	// params[1] = index
-	// params[2] = health
+	enum args { arg_count, arg_index, arg_health };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
+	const auto health  = float(params[arg_health]);
 
-	// Kill if health too low.
-	if (params[2] > 0)
-		pPlayer->v.health = float(params[2]);
+	if (health > 0.0f)
+	{
+		pPlayer->v.health = health;
+	}
 	else
+	{
 		MDLL_ClientKill(pPlayer);
+	}
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL set_user_frags(AMX *amx, cell *params) // set_user_frags(index, frags); = 2 arguments
+// native set_user_frags(index, frags)
+static cell AMX_NATIVE_CALL set_user_frags(AMX *amx, cell *params)
 {
-	// Sets user frags.
-	// params[1] = index
-	// params[2] = frags
+	enum args { arg_count, arg_index, arg_frags };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
 
-	pPlayer->v.frags = params[2];
+	pPlayer->v.frags = float(params[arg_frags]);
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL set_user_armor(AMX *amx, cell *params) // set_user_armor(index, armor); = 2 arguments
+// native set_user_armor(index, armor)
+static cell AMX_NATIVE_CALL set_user_armor(AMX *amx, cell *params)
 {
-	// Sets user armor.
-	// params[1] = index
-	// params[2] = armor
+	enum args { arg_count, arg_index, arg_armor };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
 
-	pPlayer->v.armorvalue = params[2];
+	pPlayer->v.armorvalue = float(params[arg_armor]);
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL set_user_origin(AMX *amx, cell *params) // set_user_origin(index, origin[3]); = 2 arguments
+// native set_user_origin(index, const origin[3])
+static cell AMX_NATIVE_CALL set_user_origin(AMX *amx, cell *params)
 {
-	// Sets user origin.
-	// params[1] = index
-	// params[2] = origin
+	enum args { arg_count, arg_index, arg_origin };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
-
-	cell *newVectorCell = MF_GetAmxAddr(amx, params[2]);
+	auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
+	const auto pVector = MF_GetAmxAddr(amx, params[arg_origin]);
 
 	SET_SIZE(pPlayer, pPlayer->v.mins, pPlayer->v.maxs);
-	SET_ORIGIN(pPlayer, Vector((float)newVectorCell[0], (float)newVectorCell[1], (float)newVectorCell[2]));
-	
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL set_user_rendering(AMX *amx, cell *params) // set_user_rendering(index, fx = kRenderFxNone, r = 255, g = 255, b = 255, render = kRenderNormal, amount = 16); = 7 arguments
-{
-	// Sets user rendering.
-	// params[1] = index
-	// params[2] = fx
-	// params[3] = r
-	// params[4] = g
-	// params[5] = b
-	// params[6] = render
-	// params[7] = amount
-
-	// Check index
-	CHECK_PLAYER(params[1]);
-
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
-
-	pPlayer->v.renderfx = params[2];
-	Vector newVector = Vector(float(params[3]), float(params[4]), float(params[5]));
-	pPlayer->v.rendercolor = newVector;
-	pPlayer->v.rendermode = params[6];
-	pPlayer->v.renderamt = params[7];
-	
-	return 1;
-}
-
-
-static cell AMX_NATIVE_CALL set_user_maxspeed(AMX *amx, cell *params) // set_user_maxspeed(index, Float:speed = -1.0) = 2 arguments
-{
-	// Sets user maxspeed.
-	// params[1] = index
-	// params[2] = speed (should be -1.0 if not specified) (JGHG: unspecified parameters seems to always be -1.0!)
-
-	REAL fNewSpeed = amx_ctof(params[2]);
-
-	// Check index
-	CHECK_PLAYER(params[1]);
-
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
-
-	SETCLIENTMAXSPEED(pPlayer, fNewSpeed);
-	pPlayer->v.maxspeed = fNewSpeed;
+	SET_ORIGIN(pPlayer, Vector(float(pVector[0]), float(pVector[1]), float(pVector[2])));
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL get_user_maxspeed(AMX *amx, cell *params) // Float:get_user_maxspeed(index) = 1 argument
+// native set_user_rendering(index, fx = kRenderFxNone, r = 0, g = 0, b = 0, render = kRenderNormal, amount = 0)
+static cell AMX_NATIVE_CALL set_user_rendering(AMX *amx, cell *params)
 {
-	// Gets user maxspeed.
-	// params[1] = index
+	enum args { arg_count, arg_index, arg_fx, arg_red, arg_green, arg_blue, arg_render, arg_amount };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
+
+	pPlayer->v.renderfx    = params[arg_fx];
+	pPlayer->v.rendercolor = Vector(float(params[arg_red]), float(params[arg_green]), float(params[arg_blue]));
+	pPlayer->v.rendermode  = params[arg_render];
+	pPlayer->v.renderamt   = float(params[arg_amount]);
+
+	return 1;
+}
+
+// get_user_rendering(index, &fx = kRenderFxNone, &r = 0, &g = 0, &b = 0, &render = kRenderNormal, &amount = 0);
+static cell AMX_NATIVE_CALL get_user_rendering(AMX *amx, cell *params)
+{
+	enum args { arg_count, arg_index, arg_fx, arg_red, arg_green, arg_blue, arg_render, arg_amount };
+
+	CHECK_PLAYER(params[arg_index]);
+
+	auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
+
+	*MF_GetAmxAddr(amx, params[arg_fx])     = pPlayer->v.renderfx;
+	*MF_GetAmxAddr(amx, params[arg_red])    = pPlayer->v.rendercolor[0];
+	*MF_GetAmxAddr(amx, params[arg_green])  = pPlayer->v.rendercolor[1];
+	*MF_GetAmxAddr(amx, params[arg_blue])   = pPlayer->v.rendercolor[2];
+	*MF_GetAmxAddr(amx, params[arg_render]) = pPlayer->v.rendermode;
+	*MF_GetAmxAddr(amx, params[arg_amount]) = pPlayer->v.renderamt;
+
+	return 1;
+}
+
+// native set_user_maxspeed(index, Float:speed = -1.0)
+static cell AMX_NATIVE_CALL set_user_maxspeed(AMX *amx, cell *params)
+{
+	enum args { arg_count, arg_index, arg_speed };
+
+	CHECK_PLAYER(params[arg_index]);
+
+	const auto pPlayer  = TypeConversion.id_to_edict(params[arg_index]);
+	const auto newSpeed = amx_ctof(params[arg_speed]);
+
+	SETCLIENTMAXSPEED(pPlayer, newSpeed);
+	pPlayer->v.maxspeed = newSpeed;
+
+	return 1;
+}
+
+// native Float:get_user_maxspeed(index)
+static cell AMX_NATIVE_CALL get_user_maxspeed(AMX *amx, cell *params)
+{
+	enum args { arg_count, arg_index };
+
+	CHECK_PLAYER(params[arg_index]);
+
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
 
 	return amx_ftoc(pPlayer->v.maxspeed);
 }
 
-static cell AMX_NATIVE_CALL set_user_gravity(AMX *amx, cell *params) // set_user_gravity(index, Float:gravity = 1.0) = 2 arguments
+// native set_user_gravity(index, Float:gravity = 1.0)
+static cell AMX_NATIVE_CALL set_user_gravity(AMX *amx, cell *params)
 {
-	// Sets user gravity.
-	// params[1] = index
-	// params[2] = gravity (=-1.0)
-	// Check index
-	CHECK_PLAYER(params[1]);
+	enum args { arg_count, arg_index, arg_gravity };
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	pPlayer->v.gravity = amx_ctof(params[2]);
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
+
+	pPlayer->v.gravity = amx_ctof(params[arg_gravity]);
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL get_user_gravity(AMX *amx, cell *params) // Float:get_user_gravity(index) = 1 argument
+// native Float:get_user_gravity(index)
+static cell AMX_NATIVE_CALL get_user_gravity(AMX *amx, cell *params)
 {
-	// Gets user gravity.
-	// params[1] = index
+	enum args { arg_count, arg_index };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	CHECK_PLAYER(params[arg_index]);
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
 
-	return amx_ftoc(pPlayer->v.gravity); 
+	return amx_ftoc(pPlayer->v.gravity);
 }
 
-static cell AMX_NATIVE_CALL set_user_hitzones(AMX *amx, cell *params) // set_user_hitzones(index = 0, target = 0, body = 255); = 3 arguments
+// native set_user_hitzones(index = 0, target = 0, body = HITZONES_DEFAULT)
+static cell AMX_NATIVE_CALL set_user_hitzones(AMX *amx, cell *params)
 {
-	// Sets user hitzones.
-	// params[1] = the one(s) who shoot(s), shooter
-	int shooter = params[1];
+	enum args { arg_count, arg_attacker, arg_target, arg_hitzones };
 
-	// params[2] = the one getting hit
-	int gettingHit = params[2];
+	const int attacker = params[arg_attacker];
+	const int target   = params[arg_target];
+	const int hitzones = params[arg_hitzones];
 
-	// params[3] = specified hit zones
-	int hitzones = params[3];
-
-	//set_user_hitzones(id, 0, 0) // Makes ID not able to shoot EVERYONE - id can shoot on 0 (all) at 0
-	//set_user_hitzones(0, id, 0) // Makes EVERYONE not able to shoot ID - 0 (all) can shoot id at 0
-	if (shooter == 0 && gettingHit == 0) {
-		for (int i = 1; i <= gpGlobals->maxClients; i++) {
-			for (int j = 1; j <= gpGlobals->maxClients; j++) {
-				g_bodyhits[i][j] = hitzones;
-			}
-			//g_zones_toHit[i] = hitzones;
-			//g_zones_getHit[i] = hitzones;
-		}
+	if (attacker == 0 && target == 0)
+	{
+		Players.SetEveryoneBodyHits(hitzones);
 	}
-	else if (shooter == 0 && gettingHit != 0) {
-		// "All" shooters, target (gettingHit) should be existing player id
-		CHECK_PLAYER(gettingHit);
-		// Where can all hit gettingHit?
-		for (int i = 1; i <= gpGlobals->maxClients; i++)
-			g_bodyhits[i][gettingHit] = hitzones;
+	else if (attacker == 0 && target != 0)
+	{
+		CHECK_PLAYER(target);
+
+		Players.SetAttackersBodyHits(target, hitzones);
 	}
-	else if (shooter != 0 && gettingHit == 0) {
-		// Shooter can hit all in bodyparts.
-		CHECK_PLAYER(shooter);
-		for (int i = 1; i <= gpGlobals->maxClients; i++)
-			g_bodyhits[shooter][i] = hitzones;
+	else if (attacker != 0 && target == 0)
+	{
+		CHECK_PLAYER(attacker);
+
+		Players.SetTargetsBodyHits(attacker, hitzones);
 	}
-	else {
-		// Specified, where can player A hit player B?
-		CHECK_PLAYER(shooter);
-		CHECK_PLAYER(gettingHit);
-		g_bodyhits[shooter][gettingHit] = hitzones;
-	}
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL get_user_hitzones(AMX *amx, cell *params) // get_user_hitzones(index, target); = 2 arguments
-{
-	int shooter = params[1];
-	CHECK_PLAYER(shooter);
-	int target = params[2];
-	CHECK_PLAYER(target);
-	return g_bodyhits[shooter][target];
-}
-
-static cell AMX_NATIVE_CALL set_user_noclip(AMX *amx, cell *params) // set_user_noclip(index, noclip = 0); = 2 arguments
-{
-	// Sets user to no clipping mode.
-	// params[1] = index
-	// params[2] = no clip or not...
-
-	// Check index
-	CHECK_PLAYER(params[1]);
-
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
-
-	if (params[2] == 1)
-		pPlayer->v.movetype = MOVETYPE_NOCLIP;
 	else
-		pPlayer->v.movetype = MOVETYPE_WALK;
+	{
+		CHECK_PLAYER(attacker);
+		CHECK_PLAYER(target);
+
+		Players.SetBodyHits(attacker, target, hitzones);
+	}
+
+	g_pengfuncsTable_Post->pfnTraceLine = Players.HaveBodyHits() ? TraceLine_Post : nullptr;
 
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL get_user_noclip(AMX *amx, cell *params) // get_user_noclip(index); = 1 argument
+// native get_user_hitzones(index, target)
+static cell AMX_NATIVE_CALL get_user_hitzones(AMX *amx, cell *params)
 {
-	// Gets user noclip.
-	// params[1] = index
+	enum args { arg_count, arg_attacker, arg_target };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	const auto attacker = params[arg_attacker];
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	CHECK_PLAYER(attacker);
+
+	const auto target = params[arg_target];
+
+	CHECK_PLAYER(target);
+
+	return Players[attacker].GetBodyHits(target);
+}
+
+// native set_user_noclip(index, noclip = 0)
+static cell AMX_NATIVE_CALL set_user_noclip(AMX *amx, cell *params)
+{
+	enum args { arg_count, arg_index, arg_noclip };
+
+	CHECK_PLAYER(params[arg_index]);
+
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
+
+	pPlayer->v.movetype = params[arg_noclip] != 0 ? MOVETYPE_NOCLIP : MOVETYPE_WALK;
+
+	return 1;
+}
+
+// native get_user_noclip(index)
+static cell AMX_NATIVE_CALL get_user_noclip(AMX *amx, cell *params)
+{
+	enum args { arg_count, arg_index };
+
+	CHECK_PLAYER(params[arg_index]);
+
+	const auto pPlayer = TypeConversion.id_to_edict(params[arg_index]);
 
 	return pPlayer->v.movetype == MOVETYPE_NOCLIP;
 }
 
-// JustinHoMi made this one originally
-static cell AMX_NATIVE_CALL set_user_footsteps(AMX *amx, cell *params) // set_user_footsteps(id, set = 1); = 2 params
+// native set_user_footsteps(id, set = 1)
+static cell AMX_NATIVE_CALL set_user_footsteps(AMX *amx, cell *params)
 {
-	// Gives player silent footsteps.
-	// if set=0 it will return footsteps to normal
-	// params[1] = index of player
-	// params[2] = 0 = normal footstep sound, 1 = silent slippers
+	enum args { arg_count, arg_index, arg_footsteps };
 
-	// Check index
-	CHECK_PLAYER(params[1]);
+	const auto index = params[arg_index];
 
-	// Fetch player pointer
-	edict_t *pPlayer = TypeConversion.id_to_edict(params[1]);
+	CHECK_PLAYER(index);
 
-	if (params[2]) {
+	const auto pPlayer = TypeConversion.id_to_edict(index);
+
+	if (params[arg_footsteps] != 0)
+	{
 		pPlayer->v.flTimeStepSound = 999;
-		g_silent[params[1]] = true;
+		Players[index].SetSilentFootsteps(true);
+
+		g_pFunctionTable->pfnPlayerPreThink = PlayerPreThink;
 	}
-	else {
+	else
+	{
 		pPlayer->v.flTimeStepSound = STANDARDTIMESTEPSOUND;
-		g_silent[params[1]] = false;
+		Players[index].SetSilentFootsteps(false);
+
+		if (g_pFunctionTable->pfnPlayerPreThink && !Players.HaveSilentFootsteps())
+		{
+			g_pFunctionTable->pfnPlayerPreThink = nullptr;
+		}
 	}
 
 	return 1;
 }
 
+// native get_user_footsteps(index)
 static cell AMX_NATIVE_CALL get_user_footsteps(AMX *amx, cell *params)
 {
-	CHECK_PLAYER(params[1]);
+	enum args { arg_count, arg_index };
 
-	return g_silent[params[1]];
+	const auto index = params[arg_index];
+
+	CHECK_PLAYER(index);
+
+	return Players[index].HasSilentFootsteps();
 }
 
-// SidLuke
-static cell AMX_NATIVE_CALL strip_user_weapons(AMX *amx, cell *params) // index
+// native strip_user_weapons(index)
+static cell AMX_NATIVE_CALL strip_user_weapons(AMX *amx, cell *params)
 {
-	CHECK_PLAYER(params[1]);
+	enum args { arg_count, arg_index };
 
-	edict_t* pPlayer = TypeConversion.id_to_edict(params[1]);
+	const auto index = params[arg_index];
 
-	string_t item = MAKE_STRING("player_weaponstrip");
-	edict_t *pent = CREATE_NAMED_ENTITY(item);
+	CHECK_PLAYER(index);
 
-	if (FNullEnt(pent))
+	const auto pPlayer = TypeConversion.id_to_edict(index);
+	const auto pEntity = CREATE_NAMED_ENTITY(MAKE_STRING("player_weaponstrip"));
+
+	if (FNullEnt(pEntity))
 	{
 		return 0;
 	}
 
-	MDLL_Spawn(pent);
-	MDLL_Use(pent, pPlayer);
-	REMOVE_ENTITY(pent);
+	MDLL_Spawn(pEntity);
+	MDLL_Use(pEntity, pPlayer);
+	REMOVE_ENTITY(pEntity);
 
-	*reinterpret_cast<int *>(MF_PlayerPropAddr(params[1], Player_CurrentWeapon)) = 0;
+	*reinterpret_cast<int *>(MF_PlayerPropAddr(index, Player_CurrentWeapon)) = 0;
 
 	return 1;
 }
 
-AMX_NATIVE_INFO fun_Exports[] = {
-	{"get_client_listen",		get_client_listening},
-	{"set_client_listen",		set_client_listening},
-	{"set_user_godmode",		set_user_godmode},
-	{"get_user_godmode",		get_user_godmode},
-	{"set_user_health",			set_user_health},
-	{"give_item",				give_item},
-	{"spawn",					spawn},
-	{"set_user_frags",			set_user_frags},
-	{"set_user_armor",			set_user_armor},
-	{"set_user_origin",			set_user_origin},
-	{"set_user_rendering",		set_user_rendering},
-	{"set_user_maxspeed",		set_user_maxspeed},
-	{"get_user_maxspeed",		get_user_maxspeed},
-	{"set_user_gravity",		set_user_gravity},
-	{"get_user_gravity",		get_user_gravity},
-	{"get_user_footsteps",		get_user_footsteps},
-	{"set_user_hitzones",		set_user_hitzones},
-	{"get_user_hitzones",		get_user_hitzones},
-	{"set_user_noclip",			set_user_noclip},
-	{"get_user_noclip",			get_user_noclip},
-	{"set_user_footsteps",		set_user_footsteps},
-	{"strip_user_weapons",		strip_user_weapons},
-	  /////////////////// <--- 19 chars max in current small version
-	{NULL,					NULL}
+
+AMX_NATIVE_INFO fun_Exports[] =
+{
+	{ "get_client_listen" , get_client_listening },
+	{ "set_client_listen" , set_client_listening },
+	{ "set_user_godmode"  , set_user_godmode     },
+	{ "get_user_godmode"  , get_user_godmode     },
+	{ "set_user_health"   , set_user_health      },
+	{ "give_item"         , give_item            },
+	{ "spawn"             , spawn                },
+	{ "set_user_frags"    , set_user_frags       },
+	{ "set_user_armor"    , set_user_armor       },
+	{ "set_user_origin"   , set_user_origin      },
+	{ "set_user_rendering", set_user_rendering   },
+	{ "get_user_rendering",	get_user_rendering   },
+	{ "set_user_maxspeed" , set_user_maxspeed    },
+	{ "get_user_maxspeed" , get_user_maxspeed    },
+	{ "set_user_gravity"  , set_user_gravity     },
+	{ "get_user_gravity"  , get_user_gravity     },
+	{ "get_user_footsteps", get_user_footsteps   },
+	{ "set_user_hitzones" , set_user_hitzones    },
+	{ "get_user_hitzones" , get_user_hitzones    },
+	{ "set_user_noclip"   , set_user_noclip      },
+	{ "get_user_noclip"   , get_user_noclip      },
+	{ "set_user_footsteps", set_user_footsteps   },
+	{ "strip_user_weapons", strip_user_weapons   },
+	{ nullptr             , nullptr              }
 };
 
-/******************************************************************************************/
+
 void PlayerPreThink(edict_t *pEntity)
 {
-	if (g_silent[ENTINDEX(pEntity)]) {
-		pEntity->v.flTimeStepSound = 999; 
+	const auto index = TypeConversion.edict_to_id(pEntity);
+
+	if (Players[index].HasSilentFootsteps())
+	{
+		pEntity->v.flTimeStepSound = 999;
 		RETURN_META(MRES_HANDLED);
 	}
 
@@ -576,76 +477,51 @@ void PlayerPreThink(edict_t *pEntity)
 
 int ClientConnect(edict_t *pPlayer, const char *pszName, const char *pszAddress, char szRejectReason[128])
 {
-	// Reset stuff:
-	FUNUTIL_ResetPlayer(ENTINDEX(pPlayer));
+	const auto index = TypeConversion.edict_to_id(pPlayer);
+
+	Players[index].Clear();
 
 	RETURN_META_VALUE(MRES_IGNORED, 0);
 }
 
-void TraceLine(const float *v1, const float *v2, int fNoMonsters, edict_t *shooter, TraceResult *ptr) {
-	TRACE_LINE(v1, v2, fNoMonsters, shooter, ptr);
-	if ( ptr->pHit && (ptr->pHit->v.flags& (FL_CLIENT | FL_FAKECLIENT))
-	&& shooter && (shooter->v.flags & (FL_CLIENT | FL_FAKECLIENT)) ) {
-		int shooterIndex = ENTINDEX(shooter);
-		if ( !(g_bodyhits[shooterIndex][ENTINDEX(ptr->pHit)] & (1<<ptr->iHitgroup)) )
+void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *shooter, TraceResult *ptr)
+{
+	if (ptr->pHit && (ptr->pHit->v.flags & (FL_CLIENT | FL_FAKECLIENT))
+	    && shooter &&  (shooter->v.flags & (FL_CLIENT | FL_FAKECLIENT)) )
+	{
+		const auto shooterIndex = TypeConversion.edict_to_id(shooter);
+		const auto targetIndex  = TypeConversion.edict_to_id(ptr->pHit);
+
+		if (!(Players[shooterIndex].GetBodyHits(targetIndex) & (1 << ptr->iHitgroup)))
+		{
 			ptr->flFraction = 1.0;
+			RETURN_META(MRES_HANDLED);
+		}
 	}
-	RETURN_META(MRES_SUPERCEDE);
+
+	RETURN_META(MRES_IGNORED);
 }
 
 
-//int g_hitIndex, g_canTargetGetHit, g_canShooterHitThere;
-//void TraceLine(const float *v1, const float *v2, int fNoMonsters, edict_t *shooter, TraceResult *ptr) {
-//	if (!pentToSkip || (pentToSkip->v.flags & (FL_CLIENT | FL_FAKECLIENT)) == false || pentToSkip->v.deadflag != DEAD_NO)
-//		RETURN_META(MRES_IGNORED);
-//
-//	TRACE_LINE(v1, v2, fNoMonsters, shooter, ptr); // Filter shooter
-//
-//	if (!ptr->pHit || (ptr->pHit->v.flags & (FL_CLIENT | FL_FAKECLIENT)) == false )
-//		RETURN_META(MRES_SUPERCEDE);
-//
-//	g_hitIndex = ENTINDEX(ptr->pHit);
-//	//bool blocked = false;
-//	g_canTargetGetHit = g_zones_getHit[g_hitIndex] & (1 << ptr->iHitgroup);
-//	g_canShooterHitThere = g_zones_toHit[ENTINDEX(shooter)] & (1 << ptr->iHitgroup);
-//
-//	if (!g_canTargetGetHit || !g_canShooterHitThere) {
-//		ptr->flFraction = 1.0;	// set to not hit anything (1.0 = shot doesn't hit anything)
-//		//blocked = true;
-//	}
-//	/*
-//	if (blocked) {
-//		MF_PrintSrvConsole("%s was blocked from hitting %s: %d and %d\n", MF_GetPlayerName(ENTINDEX(pentToSkip)), MF_GetPlayerName(hitIndex), canTargetGetHit, canShooterHitThere);
-//	}
-//	else {
-//		MF_PrintSrvConsole("%s was NOT blocked from hitting %s: %d and %d\n", MF_GetPlayerName(ENTINDEX(pentToSkip)), MF_GetPlayerName(hitIndex), canTargetGetHit, canShooterHitThere);
-//	}
-//	*/
-//
-//	RETURN_META(MRES_SUPERCEDE);
-//}
-
 void OnAmxxAttach()
 {
 	MF_AddNatives(fun_Exports);
 }
 
-// The content of OnPluginsLoaded() was moved from OnAmxxAttach with AMXx 1.5 because for some reason gpGlobals->maxClients wasn't
-// initialized to its proper value until some time after OnAmxxAttach(). In OnAmxxAttach() it always showed 0. /JGHG
-void OnPluginsLoaded() {
-	// Reset stuff - hopefully this should
-	for (int i = 1; i <= gpGlobals->maxClients; i++) {
-		// Reset all hitzones
-		FUNUTIL_ResetPlayer(i);
-	}
+void OnPluginsLoaded()
+{
+	Players.Clear();
 
 	TypeConversion.init();
+
+	g_pFunctionTable->pfnPlayerPreThink = nullptr;
+	g_pengfuncsTable_Post->pfnTraceLine = nullptr;
 }
-/*
-void ClientConnectFakeBot(int index)
+
+void ServerDeactivate()
 {
-	FUNUTIL_ResetPlayer(index);
-	//MF_Log("A bot connects, forwarded to fun! The bot is %d!", index);
-	//CPlayer* player;
+	g_pFunctionTable->pfnPlayerPreThink = nullptr;
+	g_pengfuncsTable_Post->pfnTraceLine = nullptr;
+
+	RETURN_META(MRES_IGNORED);
 }
-*/

modules/fun/fun.h

@@ -11,7 +11,9 @@
 // Fun Module
 //
 
-#include "amxxmodule.h"
+#pragma once
+
+#include <amxxmodule.h>
 
 // Fun-specific defines below
 #define GETCLIENTLISTENING		(*g_engfuncs.pfnVoice_GetClientListening)
@@ -29,19 +31,181 @@
 #define HITGROUP_RIGHTARM		5 // 32
 #define HITGROUP_LEFTLEG		6 // 64
 #define HITGROUP_RIGHTLEG		7 // 128
+#define HITGROUP_MAX            8
+
+extern DLL_FUNCTIONS *g_pFunctionTable;
+extern enginefuncs_t *g_pengfuncsTable_Post;
+
+void PlayerPreThink(edict_t *pEntity);
+void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *shooter, TraceResult *ptr);
+
+static const auto kHitGroupsBits = (1 << HITGROUP_MAX) - 1;
+static const auto kMaxClients = 32u;
+
+class CPlayer
+{
+	public:
+
+		CPlayer()
+		{
+			Clear();
+		}
+
+	public:
+
+		bool HasBodyHits() const
+		{
+			for (auto i = 1; i <= gpGlobals->maxClients; ++i)
+			{
+				if (GetBodyHits(i) != kHitGroupsBits)
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		int GetBodyHits(const int other) const
+		{
+			return bodyHits_[other];
+		}
+
+		void SetBodyHits(const int other, const int flags)
+		{
+			bodyHits_[other] = flags;
+		}
+
+		void SetBodyHits(const int flags)
+		{
+			memset(bodyHits_, flags, sizeof bodyHits_);
+		}
+
+	public:
+
+		bool HasSilentFootsteps() const
+		{
+			return silentFootsteps_;
+		}
+
+		void SetSilentFootsteps(const bool state)
+		{
+			silentFootsteps_ = state;
+		}
+
+	public:
+
+		void Clear()
+		{
+			SetBodyHits(kHitGroupsBits);
+			SetSilentFootsteps(false);
+		}
+
+	private:
+
+		int  bodyHits_[kMaxClients + 1] {};
+		bool silentFootsteps_ {};
+};
+
+class CPlayers
+{
+	using Internal = CPlayer;
+
+	public:
+
+		bool HaveBodyHits() const
+		{
+			for (auto i = 1; i <= gpGlobals->maxClients; ++i)
+			{
+				if (players_[i].HasBodyHits())
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		void SetBodyHits(const int attacker, const int target, const int flags)
+		{
+			players_[attacker].SetBodyHits(target, flags);
+		}
+
+		void SetTargetsBodyHits(const int attacker, const int flags)
+		{
+			players_[attacker].SetBodyHits(flags);
+		}
+
+		void SetAttackersBodyHits(const int target, const int flags)
+		{
+			for (auto i = 1; i <= gpGlobals->maxClients; ++i)
+			{
+				players_[i].SetBodyHits(target, flags);
+			}
+		}
+
+		void SetEveryoneBodyHits(const int flags)
+		{
+			for (auto i = 1; i <= gpGlobals->maxClients; ++i)
+			{
+				players_[i].SetBodyHits(flags);
+			}
+		}
+
+	public:
+
+		bool HaveSilentFootsteps() const
+		{
+			for (auto i = 1; i <= gpGlobals->maxClients; ++i)
+			{
+				if (players_[i].HasSilentFootsteps())
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+	public:
+
+		void Clear()
+		{
+			for (auto i = 1; i <= gpGlobals->maxClients; ++i)
+			{
+				players_[i].Clear();
+			}
+		}
+
+	public:
+
+		Internal& operator [](const size_t index)
+		{
+			return players_[index];
+		}
+
+		const Internal& operator [](const size_t index) const
+		{
+			return players_[index];
+		}
+
+	private:
+
+		Internal players_[kMaxClients + 1];
+};
 
 #define CHECK_ENTITY(x) \
-	if (x < 0 || x > gpGlobals->maxEntities) { \
+	if ((x) < 0 || (x) > gpGlobals->maxEntities) { \
 		MF_LogError(amx, AMX_ERR_NATIVE, "Entity out of range (%d)", x); \
 		return 0; \
 	} else { \
-		if (x <= gpGlobals->maxClients) { \
+		if ((x) <= gpGlobals->maxClients) { \
 			if (!MF_IsPlayerIngame(x)) { \
 				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (not in-game)", x); \
 				return 0; \
 			} \
 		} else { \
-			if (x != 0 && FNullEnt(TypeConversion.id_to_edict(x))) { \
+			if ((x) != 0 && FNullEnt(TypeConversion.id_to_edict(x))) { \
 				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d", x); \
 				return 0; \
 			} \
@@ -49,7 +213,7 @@
 	}
 
 #define CHECK_PLAYER(x) \
-	if (x < 1 || x > gpGlobals->maxClients) { \
+	if ((x) < 1 || (x) > gpGlobals->maxClients) { \
 		MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
 		return 0; \
 	} else { \

modules/fun/moduleconfig.h

@@ -26,7 +26,7 @@
 #define MODULE_LIBRARY "fun"
 #define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__
@@ -119,8 +119,8 @@
 // #define FN_ClientCommand				ClientCommand				/* pfnClientCommand()			(wd) Player has sent a command (typed or from a bind) */
 // #define FN_ClientUserInfoChanged		ClientUserInfoChanged		/* pfnClientUserInfoChanged()	(wd) Client has updated their setinfo structure */
 // #define FN_ServerActivate			ServerActivate				/* pfnServerActivate()			(wd) Server is starting a new map */
-// #define FN_ServerDeactivate			ServerDeactivate			/* pfnServerDeactivate()		(wd) Server is leaving the map (shutdown or changelevel); SDK2 */
-#define FN_PlayerPreThink			PlayerPreThink				/* pfnPlayerPreThink() */
+#define FN_ServerDeactivate			ServerDeactivate			/* pfnServerDeactivate()		(wd) Server is leaving the map (shutdown or changelevel); SDK2 */
+// #define FN_PlayerPreThink			PlayerPreThink				/* pfnPlayerPreThink() */
 // #define FN_PlayerPostThink			PlayerPostThink				/* pfnPlayerPostThink() */
 // #define FN_StartFrame				StartFrame					/* pfnStartFrame() */
 // #define FN_ParmsNewLevel				ParmsNewLevel				/* pfnParmsNewLevel() */
@@ -232,7 +232,7 @@
 // #define FN_SetOrigin							SetOrigin
 // #define FN_EmitSound							EmitSound
 // #define FN_EmitAmbientSound					EmitAmbientSound
-#define FN_TraceLine							TraceLine
+// #define FN_TraceLine							TraceLine
 // #define FN_TraceToss							TraceToss
 // #define FN_TraceMonsterHull					TraceMonsterHull
 // #define FN_TraceHull							TraceHull

modules/geoip/AMBuilder

@@ -13,6 +13,7 @@ binary.compiler.defines += [
 
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
+  '../../third_party/libmaxminddb/data-pool.c',
   '../../third_party/libmaxminddb/maxminddb.c',
   'geoip_main.cpp',
   'geoip_natives.cpp',

modules/geoip/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "geoip"
 #define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/geoip/msvc12/geoip.vcxproj

@@ -102,6 +102,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\third_party\libmaxminddb\data-pool.c" />
     <ClCompile Include="..\..\..\third_party\libmaxminddb\maxminddb.c" />
     <ClCompile Include="..\geoip_main.cpp" />
     <ClCompile Include="..\geoip_natives.cpp" />
@@ -109,6 +110,7 @@
     <ClCompile Include="..\..\..\public\sdk\amxxmodule.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\data-pool.h" />
     <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb-compat-util.h" />
     <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb.h" />
     <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb_config.h" />
@@ -124,4 +126,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

modules/geoip/msvc12/geoip.vcxproj.filters

@@ -38,6 +38,9 @@
     <ClCompile Include="..\..\..\third_party\libmaxminddb\maxminddb.c">
       <Filter>GeoIP2</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\third_party\libmaxminddb\data-pool.c">
+      <Filter>GeoIP2</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\geoip_util.h">
@@ -64,6 +67,9 @@
     <ClInclude Include="..\..\..\third_party\libmaxminddb\maxminddb-compat-util.h">
       <Filter>GeoIP2</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\third_party\libmaxminddb\data-pool.h">
+      <Filter>GeoIP2</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\plugins\include\geoip.inc">

modules/hamsandwich/hook.h

@@ -39,7 +39,7 @@ public:
 	char			*ent;     // ent name that's being hooked
 	int              trampSize;
 
-	Hook(void **vtable_, int entry_, void *target_, bool voidcall, bool retbuf, int paramcount, char *name) :
+	Hook(void **vtable_, int entry_, void *target_, bool voidcall, bool retbuf, int paramcount, const char *name) :
 		func(NULL), vtable(vtable_), entry(entry_), target(target_), exec(0), del(0), tramp(NULL), trampSize(0)
 		{
 			// original function is vtable[entry]

modules/hamsandwich/hook_native.cpp

@@ -534,21 +534,24 @@ static cell AMX_NATIVE_CALL RegisterHam(AMX *amx, cell *params)
 
 	CHECK_FUNCTION(func);
 
-	char *function=MF_GetAmxString(amx, params[3], 0, NULL);
-	char *classname=MF_GetAmxString(amx, params[2], 1, NULL);
-	
+	// Fixes a buffer issue by copying locally the strings.
+	// REMOVE_ENTITY invokes pfnOnFreeEntPrivateData which plugins can hook and `function` and `classname` strings are used after that
+	// but it is pointing to the AMXX static buffer. Basically, hooking this forward and doing stuff inside could invalid all RegisterHam calls.
+	ke::AString function(MF_GetAmxString(amx, params[3], 0, NULL));
+	ke::AString classname(MF_GetAmxString(amx, params[2], 1, NULL));
+
 	// Check the entity
 
 	// create an entity, assign it the gamedll's class, hook it and destroy it
 	edict_t *Entity=CREATE_ENTITY();
 
-	CALL_GAME_ENTITY(PLID,classname,&Entity->v);
+	CALL_GAME_ENTITY(PLID,classname.chars(),&Entity->v);
 
 	if (Entity->pvPrivateData == NULL)
 	{
 		REMOVE_ENTITY(Entity);
 
-		MF_LogError(amx, AMX_ERR_NATIVE,"Failed to retrieve classtype for \"%s\", hook for \"%s\" not active.",classname,function);
+		MF_LogError(amx, AMX_ERR_NATIVE,"Failed to retrieve classtype for \"%s\", hook for \"%s\" not active.",classname.chars(),function.chars());
 
 		return 0;
 	}
@@ -558,18 +561,18 @@ static cell AMX_NATIVE_CALL RegisterHam(AMX *amx, cell *params)
 
 	if (vtable == NULL)
 	{
-		MF_LogError(amx, AMX_ERR_NATIVE,"Failed to retrieve vtable for \"%s\", hook for \"%s\" not active.",classname,function);
+		MF_LogError(amx, AMX_ERR_NATIVE,"Failed to retrieve vtable for \"%s\", hook for \"%s\" not active.",classname.chars(),function.chars());
 
 		return 0;
 	}
 
 	// Verify that the function is valid
 	// Don't fail the plugin if this fails, just emit a normal error
-	int fwd=hooklist[func].makefunc(amx, function);
+	int fwd=hooklist[func].makefunc(amx, function.chars());
 
 	if (fwd == -1)
 	{
-		MF_LogError(amx, AMX_ERR_NATIVE, "Function %s not found.", function);
+		MF_LogError(amx, AMX_ERR_NATIVE, "Function %s not found.", function.chars());
 
 		return 0;
 	}
@@ -586,9 +589,9 @@ static cell AMX_NATIVE_CALL RegisterHam(AMX *amx, cell *params)
 	pfwd->AddRef();
 
 	// We've passed all tests...
-	if (strcmp(classname, "player") == 0 && enableSpecialBot)
+	if (strcmp(classname.chars(), "player") == 0 && enableSpecialBot)
 	{
-		SpecialbotHandler.RegisterHamSpecialBot(amx, func, function, post, pfwd);
+		SpecialbotHandler.RegisterHamSpecialBot(amx, func, function.chars(), post, pfwd);
 	}
 
 	int **ivtable=(int **)vtable;
@@ -615,7 +618,7 @@ static cell AMX_NATIVE_CALL RegisterHam(AMX *amx, cell *params)
 	}
 
 	// If we got here, the function is not hooked
-	Hook *hook = new Hook(vtable, hooklist[func].vtid, hooklist[func].targetfunc, hooklist[func].isvoid, hooklist[func].needsretbuf, hooklist[func].paramcount, classname);
+	Hook *hook = new Hook(vtable, hooklist[func].vtid, hooklist[func].targetfunc, hooklist[func].isvoid, hooklist[func].needsretbuf, hooklist[func].paramcount, classname.chars());
 	hooks[func].append(hook);
 
 	if (post)

modules/mysqlx/moduleconfig.h

@@ -35,7 +35,7 @@
 #define MODULE_LIBRARY "mysql"
 #define MODULE_LIBCLASS "sqlx"
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/sqlite/moduleconfig.h

@@ -25,7 +25,7 @@
 #define MODULE_LIBRARY "sqlite"
 #define MODULE_LIBCLASS "sqlx"
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/tfcx/CRank.cpp

@@ -127,9 +127,9 @@ void RankSystem::clear(){
 	}
 }
 
-bool RankSystem::loadCalc(const char* filename, char* error)
+bool RankSystem::loadCalc(const char* filename, char* error, size_t maxLength)
 {
-	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error,0)!=AMX_ERR_NONE)||
+	if ((MF_LoadAmxScriptEx(&calc.amx,&calc.code,filename, error, maxLength, 0)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr1, &calc.physAddr1)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr2, &calc.physAddr2)!=AMX_ERR_NONE)||
 		(MF_AmxFindPublic(&calc.amx,"get_score",&calc.func)!=AMX_ERR_NONE)){

modules/tfcx/CRank.h

@@ -102,7 +102,7 @@ public:
 	void saveRank( const char* filename );
 	void loadRank( const char* filename );
 	RankStats* findEntryInRank(const char* unique, const char* name , bool isip = false);
-	bool loadCalc(const char* filename, char* error);
+	bool loadCalc(const char* filename, char* error, size_t maxLength);
 	inline int getRankNum( ) const { return rankNum; }
 	void clear();
 	void unloadCalc();

modules/tfcx/moduleconfig.cpp

@@ -330,7 +330,7 @@ void OnAmxxAttach() {
 	if ( path && *path ) 
 	{
 		char error[128];
-		g_rank.loadCalc( MF_BuildPathname("%s",path) , error  );
+		g_rank.loadCalc( MF_BuildPathname("%s",path), error, sizeof(error));
 	}
 	if ( !g_rank.begin() )
 	{		

modules/tfcx/moduleconfig.h

@@ -26,7 +26,7 @@
 #define MODULE_LIBRARY "tfcx"
 #define MODULE_LIBCLASS "xstats"
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

modules/ts/tsx/CRank.cpp

@@ -127,9 +127,9 @@ void RankSystem::clear(){
 	}
 }
 
-bool RankSystem::loadCalc(const char* filename, char* error)
+bool RankSystem::loadCalc(const char* filename, char* error, size_t maxLength)
 {
-	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error,0)!=AMX_ERR_NONE)||
+	if ((MF_LoadAmxScriptEx(&calc.amx,&calc.code,filename, error, maxLength, 0)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr1, &calc.physAddr1)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr2, &calc.physAddr2)!=AMX_ERR_NONE)||
 		(MF_AmxFindPublic(&calc.amx,"get_score",&calc.func)!=AMX_ERR_NONE)){

modules/ts/tsx/CRank.h

@@ -102,7 +102,7 @@ public:
 	void saveRank( const char* filename );
 	void loadRank( const char* filename );
 	RankStats* findEntryInRank(const char* unique, const char* name , bool isip = false );
-	bool loadCalc(const char* filename, char* error);
+	bool loadCalc(const char* filename, char* error, size_t maxLength);
 	inline int getRankNum( ) const { return rankNum; }
 	void clear();
 	void unloadCalc();

modules/ts/tsx/moduleconfig.cpp

@@ -344,7 +344,7 @@ void OnAmxxAttach()
 	if ( path && *path ) 
 	{
 		char error[128];
-		g_rank.loadCalc( MF_BuildPathname("%s",path) , error  );
+		g_rank.loadCalc( MF_BuildPathname("%s",path), error, sizeof(error));
 	}
 	if ( !g_rank.begin() )
 	{		

modules/ts/tsx/moduleconfig.h

@@ -26,7 +26,7 @@
 #define MODULE_LIBRARY "tsx"
 #define MODULE_LIBCLASS "xstats"
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
+// #define MODULE_RELOAD_ON_MAPCHANGE
 
 #ifdef __DATE__
 #define MODULE_DATE __DATE__

plugins/cstrike/csstats.sma

@@ -33,5 +33,5 @@
 * Returning cellmin as value in get_score function
 * makes that rank won't be saved. */
 
-public get_score(stats[11], body[8])
-	return stats[0] - stats[1] - stats[3]	// kills - deaths - teamkills
+public get_score(stats[11], body[MAX_BODYHITS])
+	return stats[STATSX_KILLS] - stats[STATSX_DEATHS] - stats[STATSX_TEAMKILLS]	// kills - deaths - teamkills

plugins/cstrike/stats_logging.sma

@@ -37,7 +37,7 @@ public client_disconnected(id)
 
 	remove_task(id)
 	
-	new szTeam[16], szName[MAX_NAME_LENGTH], szAuthid[32], iStats[8], iHits[8], szWeapon[24]
+	new szTeam[16], szName[MAX_NAME_LENGTH], szAuthid[32], iStats[STATSX_MAX_STATS], iHits[MAX_BODYHITS], szWeapon[24]
 	new iUserid = get_user_userid(id)
 	new _max = xmod_get_maxweapons()
 	
@@ -52,9 +52,9 @@ public client_disconnected(id)
 			xmod_get_wpnname(i, szWeapon, charsmax(szWeapon))
 			
 			log_message("^"%s<%d><%s><%s>^" triggered ^"weaponstats^" (weapon ^"%s^") (shots ^"%d^") (hits ^"%d^") (kills ^"%d^") (headshots ^"%d^") (tks ^"%d^") (damage ^"%d^") (deaths ^"%d^")", 
-						szName, iUserid, szAuthid, szTeam, szWeapon, iStats[4], iStats[5], iStats[0], iStats[2], iStats[3], iStats[6], iStats[1])
+						szName, iUserid, szAuthid, szTeam, szWeapon, iStats[STATSX_SHOTS], iStats[STATSX_HITS], iStats[STATSX_KILLS], iStats[STATSX_HEADSHOTS], iStats[STATSX_TEAMKILLS], iStats[STATSX_DAMAGE], iStats[STATSX_DEATHS])
 			log_message("^"%s<%d><%s><%s>^" triggered ^"weaponstats2^" (weapon ^"%s^") (head ^"%d^") (chest ^"%d^") (stomach ^"%d^") (leftarm ^"%d^") (rightarm ^"%d^") (leftleg ^"%d^") (rightleg ^"%d^")", 
-						szName, iUserid, szAuthid, szTeam, szWeapon, iHits[1], iHits[2], iHits[3], iHits[4], iHits[5], iHits[6], iHits[7])
+						szName, iUserid, szAuthid, szTeam, szWeapon, iHits[HIT_HEAD], iHits[HIT_CHEST], iHits[HIT_STOMACH], iHits[HIT_LEFTARM], iHits[HIT_RIGHTARM], iHits[HIT_LEFTLEG], iHits[HIT_RIGHTLEG])
 		}
 	}
 	

plugins/cstrike/statsx.sma

@@ -78,17 +78,8 @@ public SpecRankInfo         = 0 // displays rank info when spectating
 #define MAX_TEXT_LENGTH         255
 #define MAX_BUFFER_LENGTH       2047
 
-// User stats parms id
-#define STATS_KILLS             0
-#define STATS_DEATHS            1
-#define STATS_HS                2
-#define STATS_TKS               3
-#define STATS_SHOTS             4
-#define STATS_HITS              5
-#define STATS_DAMAGE            6
-
 // Global player flags.
-new BODY_PART[8][] =
+new BODY_PART[MAX_BODYHITS][] =
 {
 	"WHOLEBODY",
 	"HEAD",
@@ -140,14 +131,14 @@ new g_pHudFreezeLimit                                   = 0
 new Float:g_fStartGame                                  = 0.0
 new g_izTeamScore[MAX_TEAMS]                            = {0, ...}
 new g_izTeamEventScore[MAX_TEAMS]                       = {0, ...}
-new g_izTeamRndStats[MAX_TEAMS][8]
-new g_izTeamGameStats[MAX_TEAMS][8]
+new g_izTeamRndStats[MAX_TEAMS][STATSX_MAX_STATS]
+new g_izTeamGameStats[MAX_TEAMS][STATSX_MAX_STATS]
 new g_izUserUserID[MAX_PLAYERS + 1]                     = {0, ...}
 new g_izUserAttackerDistance[MAX_PLAYERS + 1]           = {0, ...}
 new g_izUserVictimDistance[MAX_PLAYERS + 1][MAX_PLAYERS + 1]
 new g_izUserRndName[MAX_PLAYERS + 1][MAX_NAME_LENGTH]
-new g_izUserRndStats[MAX_PLAYERS + 1][8]
-new g_izUserGameStats[MAX_PLAYERS + 1][8]
+new g_izUserRndStats[MAX_PLAYERS + 1][STATSX_MAX_STATS]
+new g_izUserGameStats[MAX_PLAYERS + 1][STATSX_MAX_STATS]
 
 // Common buffer to improve performance, as Small always zero-initializes all vars
 new g_sBuffer[MAX_BUFFER_LENGTH + 1]                    = ""
@@ -291,14 +282,14 @@ public cmdHudTest(id)
 #endif
 
 // Stats formulas
-Float:accuracy(izStats[8])
+Float:accuracy(izStats[STATSX_MAX_STATS])
 {
-	return izStats[STATS_SHOTS] ? (100.0 * float(izStats[STATS_HITS]) / float(izStats[STATS_SHOTS])) : (0.0);
+	return izStats[STATSX_SHOTS] ? (100.0 * float(izStats[STATSX_HITS]) / float(izStats[STATSX_SHOTS])) : (0.0);
 }
 
-Float:effec(izStats[8])
+Float:effec(izStats[STATSX_MAX_STATS])
 {
-	return izStats[STATS_KILLS] ? (100.0 * float(izStats[STATS_KILLS]) / float(izStats[STATS_KILLS] + izStats[STATS_DEATHS])) : (0.0);
+	return izStats[STATSX_KILLS] ? (100.0 * float(izStats[STATSX_KILLS]) / float(izStats[STATSX_KILLS] + izStats[STATSX_DEATHS])) : (0.0);
 }
 
 // Distance formula (metric)
@@ -332,7 +323,7 @@ get_config_cvars()
 // Get and format attackers header and list.
 get_attackers(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 {
-	new izStats[8], izBody[8]
+	new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 	new iAttacker
 	new iFound, iLen
 
@@ -342,13 +333,13 @@ get_attackers(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 	// Get and format header. Add killing attacker statistics if user is dead.
 	// Make sure shots is greater than zero or division by zero will occur.
 	// To print a '%', 4 of them must done in a row.
-	izStats[STATS_SHOTS] = 0
+	izStats[STATSX_SHOTS] = 0
 	iAttacker = g_izKilled[id][KILLED_KILLER_ID]
 
 	if (iAttacker)
 		get_user_astats(id, iAttacker, izStats, izBody)
 
-	if (izStats[STATS_SHOTS] && ShowFullStats)
+	if (izStats[STATSX_SHOTS] && ShowFullStats)
 	{
 		get_user_name(iAttacker, t_sName, charsmax(t_sName))
 		iLen = formatex(sBuffer, charsmax(sBuffer), "%L -- %s -- %0.2f%% %L:^n", id, "ATTACKERS", t_sName, accuracy(izStats), id, "ACC")
@@ -364,20 +355,20 @@ get_attackers(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 			iFound = 1
 			get_user_name(iAttacker, t_sName, charsmax(t_sName))
 
-			if (izStats[STATS_KILLS])
+			if (izStats[STATSX_KILLS])
 			{
 				if (!ShowDistHS)
-					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s^n", t_sName, izStats[STATS_HITS], id, "HIT_S",
-									izStats[STATS_DAMAGE], id, "DMG", t_sWpn)
-				else if (izStats[STATS_HS])
-					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m / HS^n", t_sName, izStats[STATS_HITS], id, "HIT_S",
-									izStats[STATS_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserAttackerDistance[id]))
+					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s^n", t_sName, izStats[STATSX_HITS], id, "HIT_S",
+									izStats[STATSX_DAMAGE], id, "DMG", t_sWpn)
+				else if (izStats[STATSX_HEADSHOTS])
+					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m / HS^n", t_sName, izStats[STATSX_HITS], id, "HIT_S",
+									izStats[STATSX_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserAttackerDistance[id]))
 				else
-					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m^n", t_sName, izStats[STATS_HITS], id, "HIT_S",
-									izStats[STATS_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserAttackerDistance[id]))
+					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m^n", t_sName, izStats[STATSX_HITS], id, "HIT_S",
+									izStats[STATSX_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserAttackerDistance[id]))
 			}
 			else
-				iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L^n", t_sName, izStats[STATS_HITS], id, "HIT_S", izStats[STATS_DAMAGE], id, "DMG")
+				iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L^n", t_sName, izStats[STATSX_HITS], id, "HIT_S", izStats[STATSX_DAMAGE], id, "DMG")
 		}
 	}
 
@@ -390,7 +381,7 @@ get_attackers(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 // Get and format victims header and list
 get_victims(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 {
-	new izStats[8], izBody[8]
+	new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 	new iVictim
 	new iFound, iLen
 
@@ -400,10 +391,10 @@ get_victims(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 	// Get and format header.
 	// Make sure shots is greater than zero or division by zero will occur.
 	// To print a '%', 4 of them must done in a row.
-	izStats[STATS_SHOTS] = 0
+	izStats[STATSX_SHOTS] = 0
 	get_user_vstats(id, 0, izStats, izBody)
 
-	if (izStats[STATS_SHOTS])
+	if (izStats[STATSX_SHOTS])
 		iLen = formatex(sBuffer, charsmax(sBuffer), "%L -- %0.2f%% %L:^n", id, "VICTIMS", accuracy(izStats), id, "ACC")
 	else
 		iLen = formatex(sBuffer, charsmax(sBuffer), "%L:^n", id, "VICTIMS")
@@ -415,20 +406,20 @@ get_victims(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 			iFound = 1
 			get_user_name(iVictim, t_sName, charsmax(t_sName))
 
-			if (izStats[STATS_DEATHS])
+			if (izStats[STATSX_DEATHS])
 			{
 				if (!ShowDistHS)
-					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s^n", t_sName, izStats[STATS_HITS], id, "HIT_S",
-									izStats[STATS_DAMAGE], id, "DMG", t_sWpn)
-				else if (izStats[STATS_HS])
-					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m / HS^n", t_sName, izStats[STATS_HITS], id, "HIT_S",
-									izStats[STATS_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserVictimDistance[id][iVictim]))
+					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s^n", t_sName, izStats[STATSX_HITS], id, "HIT_S",
+									izStats[STATSX_DAMAGE], id, "DMG", t_sWpn)
+				else if (izStats[STATSX_HEADSHOTS])
+					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m / HS^n", t_sName, izStats[STATSX_HITS], id, "HIT_S",
+									izStats[STATSX_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserVictimDistance[id][iVictim]))
 				else
-					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m^n", t_sName, izStats[STATS_HITS], id, "HIT_S",
-									izStats[STATS_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserVictimDistance[id][iVictim]))
+					iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L / %s / %0.0f m^n", t_sName, izStats[STATSX_HITS], id, "HIT_S",
+									izStats[STATSX_DAMAGE], id, "DMG", t_sWpn, distance(g_izUserVictimDistance[id][iVictim]))
 			}
 			else
-				iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L^n", t_sName, izStats[STATS_HITS], id, "HIT_S", izStats[STATS_DAMAGE], id, "DMG")
+				iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%s -- %d %L / %d %L^n", t_sName, izStats[STATSX_HITS], id, "HIT_S", izStats[STATSX_DAMAGE], id, "DMG")
 		}
 	}
 
@@ -448,23 +439,23 @@ get_kill_info(id, iKiller, sBuffer[MAX_BUFFER_LENGTH + 1])
 
 	if (iKiller && iKiller != id)
 	{
-		new izAStats[8], izABody[8], izVStats[8], iaVBody[8]
+		new izAStats[STATSX_MAX_STATS], izABody[MAX_BODYHITS], izVStats[STATSX_MAX_STATS], iaVBody[MAX_BODYHITS]
 
 		iFound = 1
 		get_user_name(iKiller, t_sName, charsmax(t_sName))
 
-		izAStats[STATS_HITS] = 0
-		izAStats[STATS_DAMAGE] = 0
+		izAStats[STATSX_HITS] = 0
+		izAStats[STATSX_DAMAGE] = 0
 		t_sWpn[0] = 0
 		get_user_astats(id, iKiller, izAStats, izABody, t_sWpn, charsmax(t_sWpn))
 
-		izVStats[STATS_HITS] = 0
-		izVStats[STATS_DAMAGE] = 0
+		izVStats[STATSX_HITS] = 0
+		izVStats[STATSX_DAMAGE] = 0
 		get_user_vstats(id, iKiller, izVStats, iaVBody)
 
 		iLen = formatex(sBuffer, charsmax(sBuffer), "%L^n", id, "KILLED_YOU_DIST", t_sName, t_sWpn, distance(g_izUserAttackerDistance[id]))
-		iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%L^n", id, "DID_DMG_HITS", izAStats[STATS_DAMAGE], izAStats[STATS_HITS], g_izKilled[id][KILLED_KILLER_HEALTH], g_izKilled[id][KILLED_KILLER_ARMOUR])
-		iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%L^n", id, "YOU_DID_DMG", izVStats[STATS_DAMAGE], izVStats[STATS_HITS])
+		iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%L^n", id, "DID_DMG_HITS", izAStats[STATSX_DAMAGE], izAStats[STATSX_HITS], g_izKilled[id][KILLED_KILLER_HEALTH], g_izKilled[id][KILLED_KILLER_ARMOUR])
+		iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%L^n", id, "YOU_DID_DMG", izVStats[STATSX_DAMAGE], izVStats[STATSX_HITS])
 	}
 
 	return iFound
@@ -482,11 +473,11 @@ add_most_disruptive(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 	// Find player.
 	for (iPlayer = 1; iPlayer <= MaxClients; iPlayer++)
 	{
-		if (g_izUserRndStats[iPlayer][STATS_DAMAGE] >= iMaxDamage && (g_izUserRndStats[iPlayer][STATS_DAMAGE] > iMaxDamage || g_izUserRndStats[iPlayer][STATS_HS] > iMaxHeadShots))
+		if (g_izUserRndStats[iPlayer][STATSX_DAMAGE] >= iMaxDamage && (g_izUserRndStats[iPlayer][STATSX_DAMAGE] > iMaxDamage || g_izUserRndStats[iPlayer][STATSX_HEADSHOTS] > iMaxHeadShots))
 		{
 			iMaxDamageId = iPlayer
-			iMaxDamage = g_izUserRndStats[iPlayer][STATS_DAMAGE]
-			iMaxHeadShots = g_izUserRndStats[iPlayer][STATS_HS]
+			iMaxDamage = g_izUserRndStats[iPlayer][STATSX_DAMAGE]
+			iMaxHeadShots = g_izUserRndStats[iPlayer][STATSX_HEADSHOTS]
 		}
 	}
 
@@ -499,7 +490,7 @@ add_most_disruptive(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 		new Float:fRndAcc = accuracy(g_izUserRndStats[iPlayer])
 
 		formatex(t_sText, charsmax(t_sText), "%L: %s^n%d %L / %d %L -- %0.2f%% %L / %0.2f%% %L^n", id, "MOST_DMG", g_izUserRndName[iPlayer],
-				g_izUserRndStats[iPlayer][STATS_HITS], id, "HIT_S", iMaxDamage, id, "DMG", fGameEff, id, "EFF", fRndAcc, id, "ACC")
+				g_izUserRndStats[iPlayer][STATSX_HITS], id, "HIT_S", iMaxDamage, id, "DMG", fGameEff, id, "EFF", fRndAcc, id, "ACC")
 		add(sBuffer, charsmax(sBuffer), t_sText)
 	}
 
@@ -518,11 +509,11 @@ add_best_score(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 	// Find player
 	for (iPlayer = 1; iPlayer <= MaxClients; iPlayer++)
 	{
-		if (g_izUserRndStats[iPlayer][STATS_KILLS] >= iMaxKills && (g_izUserRndStats[iPlayer][STATS_KILLS] > iMaxKills || g_izUserRndStats[iPlayer][STATS_HS] > iMaxHeadShots))
+		if (g_izUserRndStats[iPlayer][STATSX_KILLS] >= iMaxKills && (g_izUserRndStats[iPlayer][STATSX_KILLS] > iMaxKills || g_izUserRndStats[iPlayer][STATSX_HEADSHOTS] > iMaxHeadShots))
 		{
 			iMaxKillsId = iPlayer
-			iMaxKills = g_izUserRndStats[iPlayer][STATS_KILLS]
-			iMaxHeadShots = g_izUserRndStats[iPlayer][STATS_HS]
+			iMaxKills = g_izUserRndStats[iPlayer][STATSX_KILLS]
+			iMaxHeadShots = g_izUserRndStats[iPlayer][STATSX_HEADSHOTS]
 		}
 	}
 
@@ -582,8 +573,8 @@ save_team_chatscore(id, sBuffer[MAX_TEXT_LENGTH + 1])
 // Get and format total stats.
 add_total_stats(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 {
-	formatex(t_sText, charsmax(t_sText), "%L: %d %L / %d hs -- %d %L / %d %L^n", id, "TOTAL", g_izUserRndStats[0][STATS_KILLS], id, "KILL_S",
-			g_izUserRndStats[0][STATS_HS], g_izUserRndStats[0][STATS_HITS], id, "HITS", g_izUserRndStats[0][STATS_SHOTS], id, "SHOT_S")
+	formatex(t_sText, charsmax(t_sText), "%L: %d %L / %d hs -- %d %L / %d %L^n", id, "TOTAL", g_izUserRndStats[0][STATSX_KILLS], id, "KILL_S",
+			g_izUserRndStats[0][STATSX_HEADSHOTS], g_izUserRndStats[0][STATSX_HITS], id, "HITS", g_izUserRndStats[0][STATSX_SHOTS], id, "SHOT_S")
 	add(sBuffer, charsmax(sBuffer), t_sText)
 }
 
@@ -594,12 +585,12 @@ add_attacker_hits(id, iAttacker, sBuffer[MAX_BUFFER_LENGTH + 1])
 
 	if (iAttacker && iAttacker != id)
 	{
-		new izStats[8], izBody[8], iLen
+		new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS], iLen
 
-		izStats[STATS_HITS] = 0
+		izStats[STATSX_HITS] = 0
 		get_user_astats(id, iAttacker, izStats, izBody)
 
-		if (izStats[STATS_HITS])
+		if (izStats[STATSX_HITS])
 		{
 			iFound = 1
 			iLen = strlen(sBuffer)
@@ -627,18 +618,18 @@ format_kill_ainfo(id, iKiller, sBuffer[MAX_BUFFER_LENGTH + 1])
 
 	if (iKiller && iKiller != id)
 	{
-		new izStats[8], izBody[8]
+		new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 		new iLen
 
 		iFound = 1
 		get_user_name(iKiller, t_sName, charsmax(t_sName))
-		izStats[STATS_HITS] = 0
+		izStats[STATSX_HITS] = 0
 		get_user_astats(id, iKiller, izStats, izBody, t_sWpn, charsmax(t_sWpn))
 
 		iLen = formatex(sBuffer, charsmax(sBuffer), "%L (%dhp, %dap) >>", id, "KILLED_BY_WITH", t_sName, t_sWpn, distance(g_izUserAttackerDistance[id]),
 						g_izKilled[id][KILLED_KILLER_HEALTH], g_izKilled[id][KILLED_KILLER_ARMOUR])
 
-		if (izStats[STATS_HITS])
+		if (izStats[STATSX_HITS])
 		{
 			for (new i = 1; i < sizeof(izBody); i++)
 			{
@@ -661,24 +652,24 @@ format_kill_ainfo(id, iKiller, sBuffer[MAX_BUFFER_LENGTH + 1])
 format_kill_vinfo(id, iKiller, sBuffer[MAX_BUFFER_LENGTH + 1])
 {
 	new iFound = 0
-	new izStats[8]
-	new izBody[8]
+	new izStats[STATSX_MAX_STATS]
+	new izBody[MAX_BODYHITS]
 	new iLen
 
-	izStats[STATS_HITS] = 0
-	izStats[STATS_DAMAGE] = 0
+	izStats[STATSX_HITS] = 0
+	izStats[STATSX_DAMAGE] = 0
 	get_user_vstats(id, iKiller, izStats, izBody)
 
 	if (iKiller && iKiller != id)
 	{
 		iFound = 1
 		get_user_name(iKiller, t_sName, charsmax(t_sName))
-		iLen = formatex(sBuffer, charsmax(sBuffer), "%L >>", id, "YOU_HIT", t_sName, izStats[STATS_HITS], izStats[STATS_DAMAGE])
+		iLen = formatex(sBuffer, charsmax(sBuffer), "%L >>", id, "YOU_HIT", t_sName, izStats[STATSX_HITS], izStats[STATSX_DAMAGE])
 	}
 	else
-		iLen = formatex(sBuffer, charsmax(sBuffer), "%L >>", id, "LAST_RES", izStats[STATS_HITS], izStats[STATS_DAMAGE])
+		iLen = formatex(sBuffer, charsmax(sBuffer), "%L >>", id, "LAST_RES", izStats[STATSX_HITS], izStats[STATSX_DAMAGE])
 
-	if (izStats[STATS_HITS])
+	if (izStats[STATSX_HITS])
 	{
 		for (new i = 1; i < sizeof(izBody); i++)
 		{
@@ -698,7 +689,7 @@ format_kill_vinfo(id, iKiller, sBuffer[MAX_BUFFER_LENGTH + 1])
 format_top15(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 {
 	new iMax = get_statsnum()
-	new izStats[8], izBody[8]
+	new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 	new iLen = 0
 
 	if (iMax > 15)
@@ -724,16 +715,16 @@ format_top15(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 		get_stats(i, izStats, izBody, t_sName, charsmax(t_sName))
 		replace_string(t_sName, charsmax(t_sName), "<", "[")
 		replace_string(t_sName, charsmax(t_sName), ">", "]")
-		iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%2d %-22.22s %6d %6d %6d %6d %4d %3.0f%% %3.0f%%^n", i + 1, t_sName, izStats[STATS_KILLS],
-						izStats[STATS_DEATHS], izStats[STATS_HITS], izStats[STATS_SHOTS], izStats[STATS_HS], effec(izStats), accuracy(izStats))
+		iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%2d %-22.22s %6d %6d %6d %6d %4d %3.0f%% %3.0f%%^n", i + 1, t_sName, izStats[STATSX_KILLS],
+						izStats[STATSX_DEATHS], izStats[STATSX_HITS], izStats[STATSX_SHOTS], izStats[STATSX_HEADSHOTS], effec(izStats), accuracy(izStats))
 	}
 }
 
 // Get and format rank stats.
 format_rankstats(id, sBuffer[MAX_BUFFER_LENGTH + 1], iMyId = 0)
 {
-	new izStats[8] = {0, ...}
-	new izBody[8]
+	new izStats[STATSX_MAX_STATS] = {0, ...}
+	new izBody[MAX_BODYHITS]
 	new iRankPos, iLen
 	new lKills[16], lDeaths[16], lHits[16], lShots[16], lDamage[16], lEff[16], lAcc[16]
 
@@ -752,10 +743,10 @@ format_rankstats(id, sBuffer[MAX_BUFFER_LENGTH + 1], iMyId = 0)
 	iLen = formatex(sBuffer, charsmax(sBuffer), "<meta charset=utf-8><body bgcolor=#000000><font color=#FFB000><pre>")
 	iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%L %L^n^n", id, (!iMyId || iMyId == id) ? "YOUR" : "PLAYERS", id, "RANK_IS", iRankPos, get_statsnum())
 	iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%6s: %d  (%d with hs)^n%6s: %d^n%6s: %d^n%6s: %d^n%6s: %d^n%6s: %0.2f%%^n%6s: %0.2f%%^n^n",
-					lKills, izStats[STATS_KILLS], izStats[STATS_HS], lDeaths, izStats[STATS_DEATHS], lHits, izStats[STATS_HITS], lShots, izStats[STATS_SHOTS],
-					lDamage, izStats[STATS_DAMAGE], lEff, effec(izStats), lAcc, accuracy(izStats))
+					lKills, izStats[STATSX_KILLS], izStats[STATSX_HEADSHOTS], lDeaths, izStats[STATSX_DEATHS], lHits, izStats[STATSX_HITS], lShots, izStats[STATSX_SHOTS],
+					lDamage, izStats[STATSX_DAMAGE], lEff, effec(izStats), lAcc, accuracy(izStats))
 
-	new L_BODY_PART[8][32]
+	new L_BODY_PART[MAX_BODYHITS][32]
 
 	for (new i = 1; i < sizeof(L_BODY_PART); i++)
 	{
@@ -763,15 +754,15 @@ format_rankstats(id, sBuffer[MAX_BUFFER_LENGTH + 1], iMyId = 0)
 	}
 
 	iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%10s:^n%10s: %d^n%10s: %d^n%10s: %d^n%10s: %d^n%10s: %d^n%10s: %d^n%10s: %d", "HITS",
-					L_BODY_PART[1], izBody[1], L_BODY_PART[2], izBody[2], L_BODY_PART[3], izBody[3], L_BODY_PART[4], izBody[4], L_BODY_PART[5],
-					izBody[5], L_BODY_PART[6], izBody[6], L_BODY_PART[7], izBody[7])
+					L_BODY_PART[HIT_HEAD], izBody[HIT_HEAD], L_BODY_PART[HIT_CHEST], izBody[HIT_CHEST], L_BODY_PART[HIT_STOMACH], izBody[HIT_STOMACH], L_BODY_PART[HIT_LEFTARM], izBody[HIT_LEFTARM], L_BODY_PART[HIT_RIGHTARM],
+					izBody[HIT_RIGHTARM], L_BODY_PART[HIT_LEFTLEG], izBody[HIT_LEFTLEG], L_BODY_PART[HIT_RIGHTLEG], izBody[HIT_RIGHTLEG])
 }
 
 // Get and format stats.
 format_stats(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 {
-	new izStats[8] = {0, ...}
-	new izBody[8]
+	new izStats[STATSX_MAX_STATS] = {0, ...}
+	new izBody[MAX_BODYHITS]
 	new iWeapon, iLen
 	new lKills[16], lDeaths[16], lHits[16], lShots[16], lDamage[16], lEff[16], lAcc[16], lWeapon[16]
 
@@ -791,8 +782,8 @@ format_stats(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 
 	iLen = formatex(sBuffer, charsmax(sBuffer), "<meta charset=utf-8><body bgcolor=#000000><font color=#FFB000><pre>")
 	iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%6s: %d  (%d with hs)^n%6s: %d^n%6s: %d^n%6s: %d^n%6s: %d^n%6s: %0.2f%%^n%6s: %0.2f%%^n^n",
-					lKills, izStats[STATS_KILLS], izStats[STATS_HS], lDeaths, izStats[STATS_DEATHS], lHits, izStats[STATS_HITS], lShots, izStats[STATS_SHOTS],
-					lDamage, izStats[STATS_DAMAGE], lEff, effec(izStats), lAcc, accuracy(izStats))
+					lKills, izStats[STATSX_KILLS], izStats[STATSX_HEADSHOTS], lDeaths, izStats[STATSX_DEATHS], lHits, izStats[STATSX_HITS], lShots, izStats[STATSX_SHOTS],
+					lDamage, izStats[STATSX_DAMAGE], lEff, effec(izStats), lAcc, accuracy(izStats))
 	iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%-12.12s  %6s  %6s  %6s  %6s  %6s  %4s^n", lWeapon, lKills, lDeaths, lHits, lShots, lDamage, lAcc)
 
 	for (iWeapon = 1; iWeapon < xmod_get_maxweapons() && charsmax(sBuffer) - iLen > 0 ; iWeapon++)
@@ -800,8 +791,8 @@ format_stats(id, sBuffer[MAX_BUFFER_LENGTH + 1])
 		if (get_user_wstats(id, iWeapon, izStats, izBody))
 		{
 			xmod_get_wpnname(iWeapon, t_sWpn, charsmax(t_sWpn))
-			iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%-12.12s  %6d  %6d  %6d  %6d  %6d  %3.0f%%^n", t_sWpn, izStats[STATS_KILLS], izStats[STATS_DEATHS],
-							izStats[STATS_HITS], izStats[STATS_SHOTS], izStats[STATS_DAMAGE], accuracy(izStats))
+			iLen += formatex(sBuffer[iLen], charsmax(sBuffer) - iLen, "%-12.12s  %6d  %6d  %6d  %6d  %6d  %3.0f%%^n", t_sWpn, izStats[STATSX_KILLS], izStats[STATSX_DEATHS],
+							izStats[STATSX_HITS], izStats[STATSX_SHOTS], izStats[STATSX_DAMAGE], accuracy(izStats))
 		}
 	}
 }
@@ -1045,7 +1036,7 @@ public cmdRank(id)
 		return PLUGIN_HANDLED
 	}
 
-	new izStats[8], izBody[8]
+	new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 	new iRankPos, iRankMax
 	new Float:fEff, Float:fAcc
 
@@ -1055,7 +1046,7 @@ public cmdRank(id)
 	fEff = effec(izStats)
 	fAcc = accuracy(izStats)
 
-	client_print(id, print_chat, "* %L", id, "YOUR_RANK_IS", iRankPos, iRankMax, izStats[STATS_KILLS], izStats[STATS_HITS], fEff, fAcc)
+	client_print(id, print_chat, "* %L", id, "YOUR_RANK_IS", iRankPos, iRankMax, izStats[STATSX_KILLS], izStats[STATSX_HITS], fEff, fAcc)
 
 	return PLUGIN_CONTINUE
 }
@@ -1443,7 +1434,7 @@ kill_stats(id)
 	g_fzShowUserStatsTime[id] = get_gametime()
 
 	// Add user death stats to user round stats
-	new izStats[8], izBody[8]
+	new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 	new iTeam, i
 	new iKiller
 
@@ -1651,7 +1642,7 @@ public eventShowRank(id)
 
 		if (is_user_connected(iPlayer))
 		{
-			new izStats[8], izBody[8]
+			new izStats[STATSX_MAX_STATS], izBody[MAX_BODYHITS]
 			new iRankPos, iRankMax
 
 			get_user_name(iPlayer, t_sName, charsmax(t_sName))

plugins/dod/dodstats.sma

@@ -28,13 +28,14 @@
  */
 
 #include <amxmodx>
+#include <dodx>
 
-#define KILLS	stats[0]
-#define DEATHS	stats[1]
-#define TK		stats[3]
-#define SCORE	stats[7]
+#define KILLS	stats[DODX_KILLS]
+#define DEATHS	stats[DODX_DEATHS]
+#define TK		stats[DODX_TEAMKILLS]
+#define SCORE	stats[DODX_POINTS]
 
-public get_score(stats[9],body[8]){
+public get_score(stats[DODX_MAX_STATS],body[MAX_BODYHITS]){
 	if (!DEATHS)
 		DEATHS = 1
 

plugins/dod/stats.sma

@@ -86,7 +86,7 @@ new g_center1_sync
 new g_center2_sync
 new g_left_sync
 
-new g_bodyParts[8][] = { 
+new g_bodyParts[MAX_BODYHITS][] = { 
                         "WHOLEBODY",
                         "HEAD",
                         "CHEST",
@@ -294,19 +294,19 @@ public cmdStats(id){
 
 /* build list of attackers */ 
 getAttackers(id) { 
-  new name[MAX_NAME_LENGTH],wpn[32], stats[9],body[8],found=0 
+  new name[MAX_NAME_LENGTH],wpn[32], stats[DODX_MAX_STATS],body[MAX_BODYHITS],found=0 
   new pos = format(g_Buffer,charsmax(g_Buffer),"%L^n",id,"ATTACKERS") 
   for(new a = 1; a <= MaxClients; ++a){ 
 
     if(get_user_astats(id,a,stats,body,wpn,charsmax(wpn)))
     { 
       found = 1 
-      if (stats[0]) 
+      if (stats[DODX_KILLS]) 
         format(wpn,charsmax(wpn)," -- %s",wpn) 
       else 
         wpn[0] = 0 
       get_user_name(a,name,charsmax(name)) 
-      pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%s -- %d %L / %d %L%s^n",name,stats[6],id,"DMG",stats[5],id,"HIT_S",wpn) 
+      pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%s -- %d %L / %d %L%s^n",name,stats[DODX_DAMAGE],id,"DMG",stats[DODX_HITS],id,"HIT_S",wpn) 
     } 
   } 
   return found 
@@ -315,18 +315,18 @@ getAttackers(id) {
 
 /* build list of victims */ 
 getVictims(id) { 
-  new name[MAX_NAME_LENGTH],wpn[32], stats[9],body[8],found=0 
+  new name[MAX_NAME_LENGTH],wpn[32], stats[DODX_MAX_STATS],body[MAX_BODYHITS],found=0 
   new pos = format(g_Buffer,charsmax(g_Buffer),"%L^n",id,"VICTIMS") 
   for(new a = 1; a <= MaxClients; ++a){ 
     if(get_user_vstats(id,a,stats,body,wpn,charsmax(wpn)))
     { 
       found = 1 
-      if (stats[1]) 
+      if (stats[DODX_DEATHS]) 
         format(wpn,charsmax(wpn)," -- %s",wpn) 
       else 
         wpn[0] = 0 
       get_user_name(a,name,charsmax(name)) 
-      pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%s -- %d %L / %d %L%s^n",name,stats[6],id,"DMG",stats[5],id,"HITS",wpn) 
+      pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%s -- %d %L / %d %L%s^n",name,stats[DODX_DAMAGE],id,"DMG",stats[DODX_HITS],id,"HITS",wpn) 
     } 
   } 
   return found 
@@ -334,7 +334,7 @@ getVictims(id) {
 
 /* build list of hita for AV List */ 
 getHits(id,killer) { 
-  new stats[9], body[8], pos = 0 
+  new stats[DODX_MAX_STATS], body[MAX_BODYHITS], pos = 0 
   g_Buffer[0] = 0 
   get_user_astats(id,killer,stats,body) 
   for(new a = 1; a < sizeof(body); ++a) 
@@ -344,7 +344,7 @@ getHits(id,killer) {
 
 /* build list of hits for say hp */ 
 getMyHits(id,killed) { 
-  new name[MAX_NAME_LENGTH], stats[9], body[8], found = 0 
+  new name[MAX_NAME_LENGTH], stats[DODX_MAX_STATS], body[MAX_BODYHITS], found = 0 
   get_user_name(killed,name,charsmax(name)) 
   new pos = format(g_Buffer,charsmax(g_Buffer),"%L",id,"YOU_HIT",name) 
   get_user_vstats(id,killed,stats,body) 
@@ -367,13 +367,13 @@ public cmdKiller(id) {
     return PLUGIN_HANDLED 
   } 
   if (g_Killers[id][0]) { 
-    new name[MAX_NAME_LENGTH], stats[9], body[8], wpn[32], mstats[9], mbody[8] 
+    new name[MAX_NAME_LENGTH], stats[DODX_MAX_STATS], body[MAX_BODYHITS], wpn[32], mstats[DODX_MAX_STATS], mbody[MAX_BODYHITS] 
     get_user_name(g_Killers[id][0],name,charsmax(name)) 
     get_user_astats(id,g_Killers[id][0],stats,body,wpn,charsmax(wpn)) 
     get_user_vstats(id,g_Killers[id][0],mstats,mbody) 
     client_print(id,print_chat,"%L",id,"KILL_INFO1", name,wpn,float(g_Killers[id][2]) * 0.0254 ) 
-    client_print(id,print_chat,"%L",id,"KILL_INFO2", stats[6],stats[5], g_Killers[id][1] ) 
-    client_print(id,print_chat,"%L",id,"KILL_INFO3", mstats[6], mstats[5] ) 
+    client_print(id,print_chat,"%L",id,"KILL_INFO2", stats[DODX_DAMAGE],stats[DODX_HITS], g_Killers[id][1] ) 
+    client_print(id,print_chat,"%L",id,"KILL_INFO3", mstats[DODX_DAMAGE], mstats[DODX_HITS] ) 
 
     if (getMyHits(id,g_Killers[id][0])) client_print(id,print_chat,"%L",id,"KILL_INFO4",g_Buffer) 
   } 
@@ -479,7 +479,7 @@ public round_end(){
 
   if ( !EndRoundStats ) return PLUGIN_CONTINUE
 
-  new g_Buffer2[1024], len, players[MAX_PLAYERS], pnum, stats[9],bodyhits[8]
+  new g_Buffer2[1024], len, players[MAX_PLAYERS], pnum, stats[DODX_MAX_STATS],bodyhits[MAX_BODYHITS]
   get_players( players , pnum ) 
 
 
@@ -488,25 +488,25 @@ public round_end(){
 
   for(new i = 0; i < pnum; ++i){
      get_user_rstats( players[i],stats, bodyhits )
-     if ( stats[7] > score ){
+     if ( stats[DODX_POINTS] > score ){
         who1 = players[i]
-        score = stats[7]
+        score = stats[DODX_POINTS]
      }  
   }
   for(new i = 0; i < pnum; ++i){
      get_user_rstats( players[i],stats, bodyhits )
-     if ( stats[0] > kills ){
+     if ( stats[DODX_KILLS] > kills ){
         who2 = players[i]
-        kills = stats[0]
-        hs = stats[2]
+        kills = stats[DODX_KILLS]
+        hs = stats[DODX_HEADSHOTS]
      }  
   }
   for(new i = 0; i < pnum; ++i){
      get_user_rstats( players[i],stats, bodyhits )
-     if ( stats[6] > damage ){
+     if ( stats[DODX_DAMAGE] > damage ){
         who3 = players[i]
-        hits = stats[5]
-        damage = stats[6]
+        hits = stats[DODX_HITS]
+        damage = stats[DODX_DAMAGE]
      }  
   }
 
@@ -632,15 +632,15 @@ public client_death(killer,victim,wpnindex,hitplace,TK)
 
 
   if ( ShowKiller && !(!get_cvar_num("dodstats_rankbots") &&  (is_user_bot(killer) || is_user_bot(victim)))  ){ 
-    new stats[9], body[8], wpn[32], mstats[9], mbody[8] 
+    new stats[DODX_MAX_STATS], body[MAX_BODYHITS], wpn[32], mstats[DODX_MAX_STATS], mbody[MAX_BODYHITS] 
   
     get_user_astats(victim,killer,stats,body,wpn,charsmax(wpn)) 
     get_user_vstats(victim,killer,mstats,mbody) 
     set_hudmessage(220,80,0,0.05,0.15,0, statstime, 12.0, 1.0, 2.0, -1) 
     getHits(victim,killer) 
     show_hudmessage(victim,"%L%L%L%L",victim,"KILL_INFO1",killer_name,wpn,float(g_Killers[victim][2]) * 0.0254,
-			/*2*/ victim,"KILL_INFO2",stats[6],stats[5],g_Killers[victim][1],
-			/*3*/ victim,"KILL_INFO3",mstats[6],mstats[5],
+			/*2*/ victim,"KILL_INFO2",stats[DODX_DAMAGE],stats[DODX_HITS],g_Killers[victim][1],
+			/*3*/ victim,"KILL_INFO3",mstats[DODX_DAMAGE],mstats[DODX_HITS],
 			/*4*/ victim,"KILL_INFO4",g_Buffer ) 
   } 
 
@@ -919,7 +919,7 @@ public cmdStatsMe(id){
 }
 
 displayStats_steam(id,dest) {
- new name[MAX_NAME_LENGTH], stats[9], body[8]
+ new name[MAX_NAME_LENGTH], stats[DODX_MAX_STATS], body[MAX_BODYHITS]
  get_user_wstats(id,0,stats,body)
 
  new pos = copy(g_Buffer,charsmax(g_Buffer),"<html><head><meta charset=utf-8><style type=^"text/css^">pre{color:#FFB000;}body{background:Black;margin-left:8px;margin-top:0px; color:#FFB000;}</style></head><pre><body>")
@@ -927,7 +927,7 @@ displayStats_steam(id,dest) {
                dest,"M_KILLS",dest,"M_DEATHS",dest,"M_SCORE",dest,"M_TKS",dest,"M_HITS",dest,"M_SHOTS",dest,"M_HS")
 
  pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"<tr><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td></tr></table><br><br><br>",
-		stats[0],stats[1],stats[7],stats[3],stats[5],stats[4],stats[2])
+		stats[DODX_KILLS],stats[DODX_DEATHS],stats[DODX_POINTS],stats[DODX_TEAMKILLS],stats[DODX_HITS],stats[DODX_SHOTS],stats[DODX_HEADSHOTS])
 
  pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"<table><tr><td>%L</td><td>%L</td><td>%L</td><td>%L</td><td>%L</td><td>%L<td></tr>",
                dest,"M_WEAPON",dest,"M_SHOTS",dest,"M_HITS",dest,"M_DAMAGE",dest,"M_KILLS",dest,"M_DEATHS")
@@ -935,10 +935,10 @@ displayStats_steam(id,dest) {
  for(new a = 1; a < DODMAX_WEAPONS; ++a) {
    if (get_user_wstats(id,a,stats,body)){
      if ( xmod_is_melee_wpn(a) )
-       stats[4] = -1;
+       stats[DODX_SHOTS] = -1;
      xmod_get_wpnname(a,name,charsmax(name))
      pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"<tr><td>%s</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td></tr>^n",
-		name,stats[4],stats[5],stats[6],stats[0],stats[1])
+		name,stats[DODX_SHOTS],stats[DODX_HITS],stats[DODX_DAMAGE],stats[DODX_KILLS],stats[DODX_DEATHS])
    }
  }
  copy(g_Buffer[pos],charsmax(g_Buffer)-pos,"</table></pre></body></html>")
@@ -958,7 +958,7 @@ public cmdRank(id){
 }
 
 displayRank_steam(id,dest) {
- new name[MAX_NAME_LENGTH], stats[9], body[8]
+ new name[MAX_NAME_LENGTH], stats[DODX_MAX_STATS], body[MAX_BODYHITS]
  new rank_pos = get_user_stats(id,stats,body)
 
  new pos = copy(g_Buffer,charsmax(g_Buffer),"<html><head><meta charset=utf-8><style type=^"text/css^">pre{color:#FFB000;}body{background:Black;margin-left:8px;margin-top:0px;color:#FFB000;}</style></head><pre><body>")
@@ -968,9 +968,9 @@ displayRank_steam(id,dest) {
 
  pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,
                "<tr><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td></tr></table><br><br>",
-               stats[0],stats[1],stats[7],stats[3],stats[5],stats[4],stats[2])
+               stats[DODX_KILLS],stats[DODX_DEATHS],stats[DODX_POINTS],stats[DODX_TEAMKILLS],stats[DODX_HITS],stats[DODX_SHOTS],stats[DODX_HEADSHOTS])
 
- pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%L^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n",dest,"M_HITS",dest,g_bodyParts[1],body[1],dest,g_bodyParts[2],body[2],dest,g_bodyParts[3],body[3],dest,g_bodyParts[4],body[4],dest,g_bodyParts[5],body[5],dest,g_bodyParts[6],body[6],dest,g_bodyParts[7],body[7])
+ pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%L^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n%L: %d^n",dest,"M_HITS",dest,g_bodyParts[HIT_HEAD],body[HIT_HEAD],dest,g_bodyParts[HIT_CHEST],body[HIT_CHEST],dest,g_bodyParts[HIT_STOMACH],body[HIT_STOMACH],dest,g_bodyParts[HIT_LEFTARM],body[HIT_LEFTARM],dest,g_bodyParts[HIT_RIGHTARM],body[HIT_RIGHTARM],dest,g_bodyParts[HIT_LEFTLEG],body[HIT_LEFTLEG],dest,g_bodyParts[HIT_RIGHTLEG],body[HIT_RIGHTLEG])
 
  pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"%L <b>%d</b> %L <b>%d</b>",dest,(id==dest)?"M_YOUR_RANK_IS":"M_THEIR_RANK_IS",
 											rank_pos,dest,"M_OF",get_statsnum())
@@ -997,7 +997,7 @@ public cmdTop15(id) {
 
 /* get top 15 */
 getTop15_steam(id){
-  new stats[9], body[8], name[MAX_NAME_LENGTH]
+  new stats[DODX_MAX_STATS], body[MAX_BODYHITS], name[MAX_NAME_LENGTH]
 
   new pos = copy(g_Buffer,charsmax(g_Buffer),"<html><head><meta charset=utf-8><style type=^"text/css^">pre{color:#FFB000;}body{background:Black;margin-left:8px;margin-top:0px;color:#FFB000;}</style></head><pre><body>")
 
@@ -1012,7 +1012,7 @@ getTop15_steam(id){
     replace_all(name, charsmax(name), "<", "[")
     replace_all(name, charsmax(name), ">", "]")
     pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"<tr><td>%d.</td><td>%s</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td></tr>^n",
-		a+1,name,stats[0],stats[1],stats[7],stats[3],stats[5],stats[4],stats[2])
+		a+1,name,stats[DODX_KILLS],stats[DODX_DEATHS],stats[DODX_POINTS],stats[DODX_TEAMKILLS],stats[DODX_HITS],stats[DODX_SHOTS],stats[DODX_HEADSHOTS])
   }
   pos += format(g_Buffer[pos],charsmax(g_Buffer)-pos,"</table></pre></body></html>") 
 

plugins/dod/stats_logging.sma

@@ -24,7 +24,7 @@ public plugin_init()
 public client_disconnected(id) {
   if ( is_user_bot( id ) || !is_user_connected(id) || !isDSMActive() ) return PLUGIN_CONTINUE
   remove_task( id )
-  new szTeam[16],szName[MAX_NAME_LENGTH],szAuthid[32], iStats[9], iHits[8], szWeapon[16]
+  new szTeam[16],szName[MAX_NAME_LENGTH],szAuthid[32], iStats[DODX_MAX_STATS], iHits[MAX_BODYHITS], szWeapon[16]
   new iUserid = get_user_userid( id )
   get_user_info(id,"team", szTeam, charsmax(szTeam) )
   szTeam[0] -= 32;
@@ -34,9 +34,9 @@ public client_disconnected(id) {
     if( get_user_wstats( id , i ,iStats , iHits ) )   {
       xmod_get_wpnlogname( i , szWeapon , charsmax(szWeapon) )
       log_message("^"%s<%d><%s><%s>^" triggered ^"weaponstats^" (weapon ^"%s^") (shots ^"%d^") (hits ^"%d^") (kills ^"%d^") (headshots ^"%d^") (tks ^"%d^") (damage ^"%d^") (deaths ^"%d^") (score ^"%d^")",
-        szName,iUserid,szAuthid,szTeam,szWeapon,iStats[4],iStats[5],iStats[0], iStats[2],iStats[3],iStats[6],iStats[1],iStats[7])
+        szName,iUserid,szAuthid,szTeam,szWeapon,iStats[DODX_SHOTS],iStats[DODX_HITS],iStats[DODX_KILLS], iStats[DODX_HEADSHOTS],iStats[DODX_TEAMKILLS],iStats[DODX_DAMAGE],iStats[DODX_DEATHS],iStats[DODX_POINTS])
       log_message("^"%s<%d><%s><%s>^" triggered ^"weaponstats2^" (weapon ^"%s^") (head ^"%d^") (chest ^"%d^") (stomach ^"%d^") (leftarm ^"%d^") (rightarm ^"%d^") (leftleg ^"%d^") (rightleg ^"%d^")",
-        szName,iUserid,szAuthid,szTeam,szWeapon,iHits[1],iHits[2],iHits[3],  iHits[4],iHits[5],iHits[6],iHits[7])
+        szName,iUserid,szAuthid,szTeam,szWeapon,iHits[HIT_HEAD],iHits[HIT_CHEST],iHits[HIT_STOMACH],  iHits[HIT_LEFTARM],iHits[HIT_RIGHTARM],iHits[HIT_LEFTLEG],iHits[HIT_RIGHTLEG])
     }
   }
   new iTime = get_user_time( id , 1 )

plugins/include/amxconst.inc

@@ -151,6 +151,7 @@ public stock const Float:NULL_VECTOR[3];
 #define HIT_LEFTLEG     6
 #define HIT_RIGHTLEG    7
 #define HIT_SHIELD      8 // CS only
+#define MAX_BODYHITS    8
 
 /**
  * @section emit_sound() constants
@@ -518,4 +519,20 @@ enum FindPlayerFlags (<<= 1)
 	FindPlayer_IncludeConnecting   // Include connecting clients
 }
 
+/**
+ * Constants for client statistics
+ */
+enum
+{
+	STATSX_KILLS = 0,
+	STATSX_DEATHS,
+	STATSX_HEADSHOTS,
+	STATSX_TEAMKILLS,
+	STATSX_SHOTS,
+	STATSX_HITS,
+	STATSX_DAMAGE,
+	STATSX_RANK,
+	STATSX_MAX_STATS
+}
+
 #include <cstrike_const> // To keep backward compatibility

plugins/include/amxmisc.inc

@@ -865,9 +865,38 @@ stock set_task_ex(Float:time, const function[], id = 0, const any:parameter[] =
  *
  * @noreturn
  */
+
 stock get_players_ex(players[MAX_PLAYERS], &num, GetPlayersFlags:flags = GetPlayers_None, const string[] = "")
 {
 	new strFlags[12];
 	get_flags(_:flags, strFlags, charsmax(strFlags));
 	get_players(players, num, strFlags, string);
 }
+
+/**
+ * Returns the number of clients on the server that match the specified flags.
+ *
+ * @note Example retrieving all alive CTs:
+ *       new AliveCt = get_playersnum_ex(GetPlayers_ExcludeDead | GetPlayers_MatchTeam, "CT")
+ *
+ * @param flags     Optional filtering flags (enum GetPlayersFlags); valid flags are:
+ *                    GetPlayers_None - No filter (Default)
+ *                    GetPlayers_ExcludeDead - do not include dead clients
+ *                    GetPlayers_ExcludeAlive - do not include alive clients
+ *                    GetPlayers_ExcludeBots - do not include bots
+ *                    GetPlayers_ExcludeHuman - do not include human clients
+ *                    GetPlayers_MatchTeam - match with team
+ *                    GetPlayers_MatchNameSubstring - match with part of name
+ *                    GetPlayers_CaseInsensitive - match case insensitive
+ *                    GetPlayers_ExcludeHLTV - do not include HLTV proxies
+ *                    GetPlayers_IncludeConnecting - include connecting clients
+ * @param team      String to match against if the GetPlayers_MatchTeam or GetPlayers_MatchNameSubstring flag is specified
+ *
+ * @return          Number of clients on the server that match the specified flags
+ */
+stock get_playersnum_ex(GetPlayersFlags:flags = GetPlayers_None, const team[] = "")
+{
+	new PlayersNum;
+	get_players_ex(_, PlayersNum, flags, team);
+	return PlayersNum;
+}

plugins/include/amxmodx.inc

@@ -178,7 +178,7 @@ forward client_authorized(id, const authid[]);
 #pragma deprecated Use client_disconnected() instead.
 forward client_disconnect(id);
 
- /**
+/**
  * Called when a client is disconnected from the server.
  *
  * @note This will be called in some additional cases that client_disconnect doesn't cover, 
@@ -459,7 +459,7 @@ native client_print_color(index, sender, const message[], any:...);
  *       last, to the client with the highest index.
  *
  * @param player    Client index, use 0 to display to all clients
- * @param type      Message type, see print_* destination constants in
+ * @param type      Message type, see engprint_* destination constants in
  *                  amxconst.inc
  * @param message   Formatting rules
  * @param ...       Variable number of formatting parameters
@@ -587,7 +587,7 @@ native register_event_ex(const event[], const function[], RegisterEventFlags:fla
 /**
  * Enables a function hook of a game event which has been previously registered with register_event_ex().
  *
- * @param handle    Value returned from register_event_ex()
+ * @param handle    Value returned from register_event() or register_event_ex()
  *
  * @noreturn
  * @error           If an invalid handle is provided, an error will be thrown.
@@ -597,7 +597,7 @@ native enable_event(handle);
 /**
  * Disables a function hook of a game event which has been previously registered with register_event_ex().
  *
- * @param handle    Value returned from register_event_ex()
+ * @param handle    Value returned from register_event() or register_event_ex()
  *
  * @noreturn
  * @error           If an invalid handle is provided, an error will be thrown.
@@ -2144,6 +2144,9 @@ native random_num(a, b);
  * @note Example usage: get_user_msgid("TextMsg")
  * @note The message id is unique as long as the server is running, but might
  *       change between updates. They should not be hardcoded into plugins.
+ * @note On first server start, this function will return 0 if used inside
+ *       plugin_precache(). Consider hooking RegUserMsg in order to retrieve
+ *       the correct message id.
  *
  * @param name      Client message name
  *
@@ -3285,7 +3288,7 @@ native DestroyForward(forward_handle);
  *
  * @noreturn
  */
-native arrayset(array[], value, size);
+native arrayset(any:array[], any:value, size);
 
 /**
  * Returns the weapon id associated with a weapon name.

plugins/include/cellarray.inc

@@ -239,7 +239,7 @@ native ArraySetString(Array:which, item, const input[]);
 native ArrayPushArray(Array:which, const any:input[], size = -1);
 
 /**
- * Creates a new item ath the end of the array and sets the item's single cell
+ * Creates a new item at the end of the array and sets the item's single cell
  * value.
  *
  * @param which         Array handle

plugins/include/core.inc

@@ -167,9 +167,9 @@ native time(&hour = 0, &minute = 0, &second = 0);
 /**
  * Retrieves the current date in year, month and day.
  *
- * @param hour      Variable to store year in
- * @param minute    Variable to store month in
- * @param second    Variable to store day in
+ * @param year      Variable to store year in
+ * @param month     Variable to store month in
+ * @param day       Variable to store day in
  *
  * @noreturn
  */

plugins/include/csstats.inc

@@ -12,6 +12,8 @@
 #endif
 #define _csstats_included
 
+#include <csstats_const>
+
 /**
  * Retrieves the client's current weapon statistics.
  *
@@ -19,6 +21,8 @@
  *       amxconst.inc, this function also works on custom weapons.
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -39,7 +43,7 @@
  * @error           If an invalid client index or weapon id is provided, an
  *                  error will be thrown.
  */
-native get_user_wstats(index, wpnindex, stats[8], bodyhits[8]);
+native get_user_wstats(index, wpnindex, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS]);
 
 /**
  * Retrieves the client's weapon statistics from the current round.
@@ -48,6 +52,8 @@ native get_user_wstats(index, wpnindex, stats[8], bodyhits[8]);
  *       amxconst.inc, this function also works on custom weapons.
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -68,7 +74,7 @@ native get_user_wstats(index, wpnindex, stats[8], bodyhits[8]);
  * @error           If an invalid client index or weapon id is provided, an
  *                  error will be thrown.
  */
-native get_user_wrstats(index, wpnindex, stats[8], bodyhits[8]);
+native get_user_wrstats(index, wpnindex, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS]);
 
 /**
  * Retrieves the client's weapon statistics from the permanent storage on the
@@ -80,6 +86,8 @@ native get_user_wrstats(index, wpnindex, stats[8], bodyhits[8]);
  *       deaths/teamkills.
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -99,13 +107,15 @@ native get_user_wrstats(index, wpnindex, stats[8], bodyhits[8]);
  * @error           If an invalid client index is provided, an error will be
  *                  thrown.
  */
-native get_user_stats(index, stats[8], bodyhits[8]);
+native get_user_stats(index, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS]);
 
 /**
  * Retrieves the client's statistics from the current round.
  *
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -123,7 +133,7 @@ native get_user_stats(index, stats[8], bodyhits[8]);
  * @error           If an invalid client index is provided, an error will be
  *                  thrown.
  */
-native get_user_rstats(index, stats[8], bodyhits[8]);
+native get_user_rstats(index, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS]);
 
 /**
  * Retrieves the client's statistics inflicted upon another client from the
@@ -131,6 +141,8 @@ native get_user_rstats(index, stats[8], bodyhits[8]);
  *
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -153,7 +165,7 @@ native get_user_rstats(index, stats[8], bodyhits[8]);
  * @error           If an invalid client index is provided, an error will be
  *                  thrown.
  */
-native get_user_vstats(index, victim, stats[8], bodyhits[8], wpnname[] = "", len = 0);
+native get_user_vstats(index, victim, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS], wpnname[] = "", len = 0);
 
 /**
  * Retrieves the client's statistics received from another client from the
@@ -161,6 +173,8 @@ native get_user_vstats(index, victim, stats[8], bodyhits[8], wpnname[] = "", len
  *
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -183,7 +197,7 @@ native get_user_vstats(index, victim, stats[8], bodyhits[8], wpnname[] = "", len
  * @error           If an invalid client index is provided, an error will be
  *                  thrown.
  */
-native get_user_astats(index, wpnindex, stats[8], bodyhits[8], wpnname[] = "", len = 0);
+native get_user_astats(index, wpnindex, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS], wpnname[] = "", len = 0);
 
 /**
  * Resets the current round weapon, attacker and victim statistics.
@@ -206,6 +220,8 @@ native reset_user_wstats(index);
  *       deaths/teamkills.
  * @note For a list of possible body hitplaces see the HIT_* constants in
  *       amxconst.inc
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - Kills
  *          1 - Deaths
@@ -227,7 +243,7 @@ native reset_user_wstats(index);
  * @return              Next rank index (> 0 and > index), or 0 if no more
  *                      statistics exist
  */
-native get_stats(index, stats[8], bodyhits[8], name[], len, authid[] = "", authidlen = 0);
+native get_stats(index, stats[STATSX_MAX_STATS], bodyhits[MAX_BODYHITS], name[], len, authid[] = "", authidlen = 0);
 
 /**
  * Returns the number of all entries in the permanent statistics storage.
@@ -240,6 +256,8 @@ native get_statsnum();
  * Retrieves the client's objective statistics from the permanent storage.
  *
  * @note The permanent storage is updated on every respawn or client disconnect.
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - total defusions
  *          1 - bomb defused
@@ -254,13 +272,15 @@ native get_statsnum();
  * @error           If an invalid client index is provided, an error will be
  *                  thrown.
  */
-native get_user_stats2(index, stats[4]);
+native get_user_stats2(index, stats[STATSX_MAX_OBJECTIVE]);
 
 /**
  * Retrieves objective statistics from the permanent storage on the server via
  * iterative, incremental access.
  *
  * @note The permanent storage is updated on every respawn or client disconnect.
+ * @note For a list of possible stat constants see the STATSX_* constants in
+ *       amxconst.inc
  * @note The fields in the statistics are:
  *          0 - total defusions
  *          1 - bomb defused
@@ -275,4 +295,4 @@ native get_user_stats2(index, stats[4]);
  * @return              Next rank index (> 0 and > index), or 0 if no more
  *                      statistics exist
  */
-native get_stats2(index, stats[4], authid[] = "", authidlen = 0);
+native get_stats2(index, stats[STATSX_MAX_OBJECTIVE], authid[] = "", authidlen = 0);

plugins/include/csstats_const.inc

@@ -0,0 +1,29 @@
+// vim: set ts=4 sw=4 tw=99 noet:
+//
+// AMX Mod X, based on AMX Mod by Aleksander Naszko ("OLO").
+// Copyright (C) The AMX Mod X Development Team.
+//
+// This software is licensed under the GNU General Public License, version 3 or higher.
+// Additional exceptions apply. For full license details, see LICENSE.txt or visit:
+//     https://alliedmods.net/amxmodx-license
+
+//
+// Counter-Strike Functions
+//
+
+#if defined _csstats_const_included
+	#endinput
+#endif
+#define _csstats_const_included
+
+/**
+ * Constants for objective based statistics
+ */
+enum
+{
+	STATSX_TOTAL_DEFUSIONS = 0,
+	STATSX_BOMBS_DEFUSED,
+	STATSX_BOMBS_PLANTED,
+	STATSX_BOMB_EXPLOSIONS,
+	STATSX_MAX_OBJECTIVE
+}