Merge branch 'patch-4' of https://github.com/luxxxoor/amxmodx

"Invalid map handle provided (%d)" error is very unclear when it appears in complex code.

.github/FUNDING.yml

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

.github/workflows/ci.yml

@@ -0,0 +1,137 @@
+name: Continuous Integration
+on: 
+  workflow_dispatch:
+  push:
+    branches:
+     - master
+     - 1.9-dev
+  pull_request:
+    branches:
+     - master
+     - 1.9-dev
+jobs:
+  test:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            os_short: linux
+            compiler_cc: gcc
+            compiler_cxx: g++
+          - os: ubuntu-latest
+            os_short: linux
+            compiler_cc: clang
+            compiler_cxx: clang++        
+          - os: ubuntu-18.04
+            os_short: linux
+            compiler_cc: clang-3.9
+            compiler_cxx: clang++-3.9
+          - os: ubuntu-18.04
+            os_short: linux
+            compiler_cc: gcc-6
+            compiler_cxx: g++-6
+            compiler_install: 'g++6 g++-6-multilib'
+          - os: windows-latest
+            os_short: windows
+            compiler_cc: msvc
+          - os: windows-2016
+            os_short: windows
+            compiler_cc: msvc++14.16-vs2017-cl
+# MacOS 32 Bins seem not supported
+#           - os: macos-latest
+#             os_short: mac
+#             compiler_cc: clang
+#             compiler_cxx: clang++            
+      fail-fast: false
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os_short }}-${{ matrix.os }}-${{ matrix.compiler_cc }}
+    env:
+      DEPENDENCIES_FOLDER: dependencies      
+      DEPENDENCIES_ROOT: ${{ github.workspace }}/dependencies      
+      DEPENDENCIES_ROOT_WIN: ${{ github.workspace }}\dependencies              
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          path: amxmodx
+      # Setup Python for AMBuild
+      - uses: actions/setup-python@v2
+        name: Setup Python 3.8
+        with:
+          python-version: 3.8
+      - name: Install Python dependencies
+        run: |
+          python3 -m pip install --upgrade pip setuptools wheel
+          python3 --version
+      - name: Install AMXModX dependencies (Linux)
+        if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
+        shell: bash
+        run: |
+          mkdir -p ${{ env.DEPENDENCIES_FOLDER }}
+          cd ${{ env.DEPENDENCIES_FOLDER }}
+          
+          # Satisfy checkout-deps requirement for a "amxmodx" folder.
+          mkdir -p amxmodx
+          ../amxmodx/support/checkout-deps.sh          
+      - name: Install AMXModX dependencies (Windows)
+        if: startsWith(runner.os, 'Windows')
+        shell: cmd
+        run: |
+          mkdir %DEPENDENCIES_ROOT_WIN%\nasm
+          curl -L -o "%DEPENDENCIES_ROOT_WIN%\nasm\nasm.zip" https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win32/nasm-2.13.03-win32.zip
+          chdir %DEPENDENCIES_ROOT_WIN%\nasm
+          7z x nasm.zip
+          
+          chdir %DEPENDENCIES_ROOT_WIN%
+          git clone https://github.com/alliedmodders/ambuild
+          git clone https://github.com/alliedmodders/metamod-hl1 metamod-am
+          git clone https://github.com/alliedmodders/hlsdk
+          
+          curl -L -o "mysql-connector-c-6.1.1-win32.zip" https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-c-6.1.1-win32.zip
+          7z x mysql-connector-c-6.1.1-win32.zip -o"mysql"
+          cd mysql
+          dir
+          ren mysql-connector-c-6.1.1-win32 mysql-5.5
+          move /Y mysql-5.5 ..\
+          
+          cd ..\ambuild
+          python3 setup.py install          
+      - name: Install Linux dependencies
+        if: startsWith(runner.os, 'Linux')
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            gcc-multilib g++-multilib libstdc++6 lib32stdc++6 \
+            libc6-dev libc6-dev-i386 linux-libc-dev \
+            linux-libc-dev:i386 lib32z1-dev nasm ${{ matrix.compiler_cc }} ${{ matrix.compiler_install }}
+      - name: Select compiler
+        if: startsWith(runner.os, 'Linux')
+        run: |
+          echo "CC=${{ matrix.compiler_cc }}" >> $GITHUB_ENV
+          echo "CXX=${{ matrix.compiler_cxx }}" >> $GITHUB_ENV
+          ${{ matrix.compiler_cc }} --version
+          ${{ matrix.compiler_cxx }} --version
+      - uses: ilammy/setup-nasm@v1
+      - name: Build Linux/macOS
+        if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
+        working-directory: amxmodx
+        run: |
+          mkdir build
+          cd build
+          python3 ../configure.py --enable-optimize --metamod=${{ env.DEPENDENCIES_ROOT }}/metamod-am --hlsdk=${{ env.DEPENDENCIES_ROOT }}/hlsdk --mysql=${{ env.DEPENDENCIES_ROOT }}/mysql-5.5
+          ambuild
+      - uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x86
+      - name: Build Windows
+        if: startsWith(runner.os, 'Windows')
+        working-directory: amxmodx
+        shell: cmd
+        run: |
+          cl.exe
+          mkdir build
+          cd build
+          python3 ../configure.py --enable-optimize --metamod=${{ env.DEPENDENCIES_ROOT_WIN }}\metamod-am --hlsdk=${{ env.DEPENDENCIES_ROOT_WIN }}\hlsdk --mysql=${{ env.DEPENDENCIES_ROOT_WIN }}\mysql-5.5
+          ambuild
+          

.travis.yml

@@ -16,6 +16,9 @@ language: cpp
 sudo: false
 compiler:
   - clang
+install:
+  - pyenv install 3.6.3
+  - pyenv global 3.6.3
 before_script:
   - CHECKOUT_DIR=$PWD && cd .. 
   - chmod a+x $CHECKOUT_DIR/support/checkout-deps.sh 
@@ -23,5 +26,5 @@ before_script:
 script:
   - mkdir build && cd build
   - PATH="~/.local/bin:$PATH"
-  - CC=clang-3.7 CXX=clang-3.7 python ../configure.py --enable-optimize
+  - CC=clang-3.7 CXX=clang-3.7 python3 ../configure.py --enable-optimize
   - ambuild

AMBuildScript

@@ -225,8 +225,14 @@ class AMXXConfig(object):
         cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
       if have_gcc and cxx.version >= '4.8':
         cxx.cflags += ['-Wno-unused-result', '-Wno-error=sign-compare']
+      if have_gcc and cxx.version >= '8.0':
+        cxx.cflags += ['-Wno-stringop-truncation']
+      if have_gcc and cxx.version >= '9.0':
+        cxx.cflags += ['-Wno-address-of-packed-member']		
     if have_clang:
       cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
+      if cxx.version >= '10.0':
+        cxx.cxxflags += ['-Wno-tautological-compare']
       if cxx.version >= 'apple-clang-10.0':
         cxx.cxxflags += [
           '-Wno-inconsistent-missing-override',

amxmodx/AMBuilder

@@ -27,6 +27,10 @@ elif builder.target_platform == 'windows':
     '/EXPORT:GiveFnptrsToDll=_GiveFnptrsToDll@8,@1',
     '/SECTION:.data,RW',
   ]
+elif builder.target_platform == 'linux':
+  binary.compiler.postlink += [
+    binary.Dep(AMXX.stdcxx_path),
+  ]
 
 binary.compiler.linkflags += [AMXX.zlib.binary, AMXX.hashing.binary, AMXX.utf8rewind.binary]
 

amxmodx/CForward.cpp

@@ -122,8 +122,8 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 #if defined BINLOG_ENABLED
 			g_BinLog.WriteOp(BinLog_CallPubFunc, iter->pPlugin->getId(), iter->func);
 #endif
-			int err = amx_Exec(amx, &retVal, iter->func);
-			
+
+			int err = amx_ExecPerf(amx, &retVal, iter->func);
 			// log runtime error, if any
 			if (err != AMX_ERR_NONE)
 			{
@@ -327,8 +327,7 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 #if defined BINLOG_ENABLED
 	g_BinLog.WriteOp(BinLog_CallPubFunc, pPlugin->getId(), m_Func);
 #endif
-	int err = amx_Exec(m_Amx, &retVal, m_Func);
-	
+	int err = amx_ExecPerf(m_Amx, &retVal, m_Func);
 	if (err != AMX_ERR_NONE)
 	{
 		//Did something else set an error?

amxmodx/CGameConfigs.cpp

@@ -325,16 +325,16 @@ SMCResult CGameConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key
 			}
 			else if (!strcmp(key, "size"))
 			{
-				TempType.fieldSize = ke::Max<int>(0, atoi(value));
+				TempType.fieldSize = ke::Max<int>(0, strtol(value, nullptr, 0));
 			}
 			else if (!strcmp(key, "unsigned"))
 			{
-				TempType.fieldUnsigned = !!atoi(value);
+				TempType.fieldUnsigned = !!strtol(value, nullptr, 0);
 			}
 			else if (g_LibSys.IsPlatformCompatible(key, &m_MatchedPlatform))
 			{
 				m_FoundOffset = true;
-				TempType.fieldOffset = atoi(value);
+				TempType.fieldOffset = strtol(value, nullptr, 0);
 			}
 			break;
 		}
@@ -397,7 +397,7 @@ SMCResult CGameConfig::ReadSMC_KeyValue(const SMCStates *states, const char *key
 
 				if (m_AddressReadCount < limit)
 				{
-					m_AddressRead[m_AddressReadCount] = atoi(value);
+					m_AddressRead[m_AddressReadCount] = strtol(value, nullptr, 0);
 					m_AddressReadCount++;
 				}
 				else

amxmodx/CGameConfigs.h

@@ -180,6 +180,18 @@ class CGameConfigManager : public IGameConfigManager
 		member = type.fieldOffset;                                                  \
 	}
 
+#define GET_OFFSET_NO_ERROR(classname, member)                                      \
+	static int member = -1;                                                         \
+	if (member == -1)                                                               \
+	{                                                                               \
+		TypeDescription type;                                                       \
+		if (!CommonConfig->GetOffsetByClass(classname, #member, &type) || type.fieldOffset < 0)\
+		{                                                                           \
+			return;                                                                 \
+		}                                                                           \
+		member = type.fieldOffset;                                                  \
+	}
+
 extern CGameConfigManager ConfigManager;
 extern IGameConfig *CommonConfig;
 

amxmodx/CMisc.h

@@ -83,18 +83,8 @@ public:
 
 	inline bool IsBot()
 	{
-		if ((pEdict->v.flags & FL_FAKECLIENT) == FL_FAKECLIENT)
-		{
-			return true;
-		}
-		
-		const char *auth = GETPLAYERAUTHID(pEdict); 	 
-		if (auth && (strcmp(auth, "BOT") == 0)) 	 
-		{
-			return true;
-		}
-		
-		return false;
+		const char *auth = GETPLAYERAUTHID(pEdict);
+		return auth && !strcmp(auth, "BOT");
 	}
 
 	inline bool IsAlive()

amxmodx/CPlugin.cpp

@@ -15,6 +15,7 @@
 #include "debugger.h"
 #include "libraries.h"
 #include <amxmodx_version.h>
+#include "engine_strucs.h"
 
 extern const char *no_function;
 
@@ -154,6 +155,37 @@ int CPluginMngr::loadPluginsFromFile(const char* filename, bool warn)
 				*get_amxaddr(plugin->getAMX(), addr) = gpGlobals->maxClients;
 			}
 
+			if (amx_FindPubVar(plugin->getAMX(), "MapName", &addr) != AMX_ERR_NOTFOUND)
+			{
+				set_amxstring(plugin->getAMX(), addr, STRING(gpGlobals->mapname), MAX_MAPNAME_LENGTH - 1);
+			}
+
+			auto length = 0;
+			if (amx_FindPubVar(plugin->getAMX(), "PluginName", &addr) != AMX_ERR_NOTFOUND)
+			{
+				plugin->setTitle(get_amxstring(plugin->getAMX(), addr, 0, length));
+			}
+
+			if (amx_FindPubVar(plugin->getAMX(), "PluginVersion", &addr) != AMX_ERR_NOTFOUND)
+			{
+				plugin->setVersion(get_amxstring(plugin->getAMX(), addr, 0, length));
+			}
+
+			if (amx_FindPubVar(plugin->getAMX(), "PluginAuthor", &addr) != AMX_ERR_NOTFOUND)
+			{
+				plugin->setAuthor(get_amxstring(plugin->getAMX(), addr, 0, length));
+			}
+
+			if (amx_FindPubVar(plugin->getAMX(), "PluginURL", &addr) != AMX_ERR_NOTFOUND)
+			{
+				plugin->setUrl(get_amxstring(plugin->getAMX(), addr, 0, length));
+			}
+
+			if (amx_FindPubVar(plugin->getAMX(), "PluginDescription", &addr) != AMX_ERR_NOTFOUND)
+			{
+				plugin->setDescription(get_amxstring(plugin->getAMX(), addr, 0, length));
+			}
+
 			if (amx_FindPubVar(plugin->getAMX(), "NULL_STRING", &addr) != AMX_ERR_NOTFOUND)
 			{
 				plugin->m_pNullStringOfs = get_amxaddr(plugin->getAMX(), addr);
@@ -275,6 +307,7 @@ CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, size
 	title = unk;
 	author = unk;
 	version = unk;
+	url = unk;
 
 	char file[PLATFORM_MAX_PATH];
 	char* path = build_pathname_r(file, sizeof(file), "%s/%s", p, n);

amxmodx/CPlugin.h

@@ -56,6 +56,8 @@ public:
 		ke::AString version;
 		ke::AString title;
 		ke::AString author;
+		ke::AString url;
+		ke::AString description;
 		ke::AString errorMsg;
 		
 		unsigned int failcounter;
@@ -78,6 +80,8 @@ public:
 		inline const char* getVersion() { return version.chars();}
 		inline const char* getTitle() { return title.chars();}
 		inline const char* getAuthor() { return author.chars();}
+		inline const char* getUrl() { return url.chars(); }
+		inline const char* getDescription() { return description.chars(); }
 		inline const char* getError() { return errorMsg.chars();}
 		inline int getStatusCode() { return status; }
 		inline int getId() const { return id; }
@@ -86,6 +90,8 @@ public:
 		inline void setTitle(const char* n) { title = n; }
 		inline void setAuthor(const char* n) { author =n; }
 		inline void setVersion(const char* n) { version = n; }
+		inline void setUrl(const char* n) { url = n; }
+		inline void setDescription(const char* n) { description = n; }
 		inline void setError(const char* n) { errorMsg = n; }
 		inline bool isValid() const { return (status >= ps_paused); }
 		inline bool isPaused() const { return ((status == ps_paused) || (status == ps_stopped)); }

amxmodx/CoreConfig.cpp

@@ -296,16 +296,19 @@ void CoreConfig::OnMapConfigTimer()
 		return;
 	}
 
-	if (m_PendingForwardPush)
+	if (m_legacyMapConfigNextTime <= gpGlobals->time)
 	{
-		m_PendingForwardPush = false;
-		m_ConfigsExecuted = true;
+		if (m_PendingForwardPush)
+		{
+			m_PendingForwardPush = false;
+			m_ConfigsExecuted = true;
 
-		executeForwards(m_ConfigsExecutedForward);
-	}
-	else if (!m_LegacyMapConfigsExecuted && m_legacyMapConfigNextTime <= gpGlobals->time)
-	{
-		ExecuteMapConfig();
+			executeForwards(m_ConfigsExecutedForward);
+		}
+		else if (!m_LegacyMapConfigsExecuted)
+		{
+			ExecuteMapConfig();
+		}
 	}
 }
 
@@ -316,6 +319,7 @@ void CoreConfig::CheckLegacyBufferedCommand(char *command)
 		return;
 	}
 
+
 	if (!m_LegacyMainConfigExecuted && strstr(command, MainConfigFile))
 	{
 		m_LegacyMainConfigExecuted = true;
@@ -324,6 +328,9 @@ void CoreConfig::CheckLegacyBufferedCommand(char *command)
 	if (!m_LegacyMapConfigsExecuted && strstr(command, MapConfigDir))
 	{
 		m_LegacyMapConfigsExecuted = true;
+		
+		// Consider all configs be executed to m_legacyMapConfigNextTime time.
+		m_PendingForwardPush = true;
 	}
 }
 

amxmodx/amx.cpp

@@ -66,6 +66,9 @@
   #include <windows.h>
 #endif
 
+#include <chrono>
+#include <amxmodx.h>
+#include <CPlugin.h>
 
 /* When one or more of the AMX_funcname macris are defined, we want
  * to compile only those functions. However, when none of these macros
@@ -4173,3 +4176,37 @@ int AMXAPI amx_GetStringOld(char *dest,const cell *source,int use_wchar)
   dest[len]='\0';     /* store terminator */
   return AMX_ERR_NONE;
 }
+
+int AMXAPI amx_ExecPerf(AMX* amx, cell* retval, int index)
+{
+    CPluginMngr::CPlugin* perf_Plug = g_plugins.findPluginFast(amx);
+    if (amxmodx_perflog->value > 0.0f && perf_Plug && (perf_Plug->isDebug() || (int)amxmodx_debug->value == 2))
+    {
+        char perf_funcname[sNAMEMAX + 1];
+        perf_funcname[0] = '\0';
+        amx_GetPublic(perf_Plug->getAMX(), index, perf_funcname);
+        if (perf_funcname[0] == '\0')
+            sprintf(perf_funcname, "Unknown_ID%d", index);
+
+        const char* perf_plugname = perf_Plug->getName();
+        if (!perf_plugname || perf_plugname[0] == '\0')
+            perf_plugname = "Unknown_plugin";
+
+        using std::chrono::steady_clock;
+        using std::chrono::duration_cast;
+        using std::chrono::duration;
+        using std::chrono::microseconds;
+
+        auto t1 = steady_clock::now();
+        int err = amx_Exec(amx, retval, index);
+
+        auto ms_int = duration_cast<microseconds>(steady_clock::now() - t1);
+        auto ms_float = (float)(ms_int.count() / 1000.0f);
+        if (ms_float >= amxmodx_perflog->value)
+        {
+            AMXXLOG_Log("[%s] performance issue. Function %s executed more than %.*fms.", perf_plugname, perf_funcname, 1, ms_float);
+        }
+        return err;
+    }
+    return amx_Exec(amx, retval, index);
+}

amxmodx/amx.h

@@ -382,6 +382,7 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params);
 int AMXAPI amx_CheckNatives(AMX *amx, AMX_NATIVE_FILTER nf);
 int AMXAPI amx_Cleanup(AMX *amx);
 int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data);
+int AMXAPI amx_ExecPerf(AMX* amx, cell* retval, int index);
 int AMXAPI amx_Exec(AMX *amx, cell *retval, int index);
 int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index);
 int AMXAPI amx_FindPublic(AMX *amx, const char *funcname, int *index);

amxmodx/amxmodx.cpp

@@ -23,15 +23,30 @@
 extern CFlagManager FlagMan;
 ke::Vector<CAdminData *> DynamicAdmins;
 
+const char *g_sInaccessibleXVars[] =
+{
+	"MaxClients",
+	"MapName",
+	"PluginName",
+	"PluginVersion",
+	"PluginAuthor",
+	"PluginURL",
+	"NULL_STRING",
+	"NULL_VECTOR"
+};
+
 static cell AMX_NATIVE_CALL get_xvar_id(AMX *amx, cell *params)
 {
 	int len;
 	char* sName = get_amxstring(amx, params[1], 0, len);
 	cell ptr;
 
-	if (!strcmp(sName, "MaxClients") || !strcmp(sName, "NULL_STRING") || !strcmp(sName, "NULL_VECTOR"))
+	for (auto name : g_sInaccessibleXVars)
 	{
-		return -1;
+		if (!strcmp(sName, name))
+		{
+			return -1;
+		}
 	}
 
 	for (CPluginMngr::iterator a = g_plugins.begin(); a ; ++a)
@@ -525,20 +540,22 @@ static cell AMX_NATIVE_CALL next_hudchannel(AMX *amx, cell *params)
 	return pPlayer->NextHUDChannel();
 }
 
-static cell AMX_NATIVE_CALL set_hudmessage(AMX *amx, cell *params) /* 13 param */
+static cell AMX_NATIVE_CALL set_hudmessage(AMX *amx, cell *params) /* 11 param */
 {
 	cell num_params = params[0] / sizeof(cell);
-	
-	if(num_params >= 13) {
+
+	if (num_params >= 13)
+	{
 		cell *color2 = get_amxaddr(amx, params[13]);
 
-		g_hudset.a1 = params[12];
-		g_hudset.a2 = color2[3];
-		g_hudset.r2 = color2[0];
-		g_hudset.g2 = color2[1];
-		g_hudset.b2 = color2[2];
+		g_hudset.a1 = static_cast<byte>(params[12]);
+		g_hudset.a2 = static_cast<byte>(color2[3]);
+		g_hudset.r2 = static_cast<byte>(color2[0]);
+		g_hudset.g2 = static_cast<byte>(color2[1]);
+		g_hudset.b2 = static_cast<byte>(color2[2]);
 	}
-	else {
+	else
+	{
 		g_hudset.a1 = 0;
 		g_hudset.a2 = 0;
 		g_hudset.r2 = 255;
@@ -1417,7 +1434,7 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
 				pPlayer->vgui = false;
 
 				if (time == -1)
-					pPlayer->menuexpire = INFINITE;
+					pPlayer->menuexpire = static_cast<float>(INFINITE);
 				else
 					pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time);
 
@@ -1435,7 +1452,7 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
 			pPlayer->vgui = false;
 
 			if (time == -1)
-				pPlayer->menuexpire = INFINITE;
+				pPlayer->menuexpire = static_cast<float>(INFINITE);
 			else
 				pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time);
 
@@ -1447,29 +1464,34 @@ static cell AMX_NATIVE_CALL show_menu(AMX *amx, cell *params) /* 3 param */
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL register_plugin(AMX *amx, cell *params) /* 3 param */
+static cell AMX_NATIVE_CALL register_plugin(AMX *amx, cell *params) /* 5 param */
 {
+	enum { arg_count, arg_title, arg_version, arg_author, arg_url, arg_description };
+
 	CPluginMngr::CPlugin* a = g_plugins.findPluginFast(amx);
 	int i;
 
-	char *title = get_amxstring(amx, params[1], 0, i);
-	char *vers = get_amxstring(amx, params[2], 1, i);
-	char *author = get_amxstring(amx, params[3], 2, i);
+
+	a->setTitle(get_amxstring(amx, params[arg_title], 0, i));
+	a->setVersion(get_amxstring(amx, params[arg_version], 0, i));
+	a->setAuthor(get_amxstring(amx, params[arg_author], 0, i));
 
 #if defined BINLOG_ENABLED
-	g_BinLog.WriteOp(BinLog_Registered, a->getId(), title, vers);
+	g_BinLog.WriteOp(BinLog_Registered, a->getId(), a->getTitle(), a->getVersion());
 #endif
 
-	a->setTitle(title);
-	a->setVersion(vers);
-	a->setAuthor(author);
+	if (params[arg_count] / sizeof(cell) > arg_author)
+	{
+		a->setUrl(get_amxstring(amx, params[arg_url], 0, i));
+		a->setDescription(get_amxstring(amx, params[arg_description], 0, i));
+	}
 
 	/* Check if we need to add fail counters */
 	i = 0;
 	unsigned int counter = 0;
 	while (NONGPL_PLUGIN_LIST[i].author != NULL)
 	{
-		if (strcmp(NONGPL_PLUGIN_LIST[i].author, author) == 0)
+		if (strcmp(NONGPL_PLUGIN_LIST[i].author, a->getAuthor()) == 0)
 		{
 			counter++;
 		}
@@ -1477,7 +1499,7 @@ static cell AMX_NATIVE_CALL register_plugin(AMX *amx, cell *params) /* 3 param *
 		{
 			counter++;
 		}
-		if (stricmp(NONGPL_PLUGIN_LIST[i].title, title) == 0)
+		if (stricmp(NONGPL_PLUGIN_LIST[i].title, a->getTitle()) == 0)
 		{
 			counter++;
 		}
@@ -1511,31 +1533,34 @@ static cell AMX_NATIVE_CALL register_menucmd(AMX *amx, cell *params) /* 3 param
 	return 1;
 }
 
-static cell AMX_NATIVE_CALL get_plugin(AMX *amx, cell *params) /* 11 param */
+static cell AMX_NATIVE_CALL get_plugin(AMX *amx, cell *params) /* 15 param */
 {
+	enum
+	{ 
+		arg_count, arg_plugin, arg_name, arg_namelen, arg_title, arg_titlelen, 
+		arg_version, arg_versionlen, arg_author, arg_authorlen, arg_status, arg_statuslen,
+		arg_url, arg_urllen, arg_description, arg_descriptionlen 
+	};
+
 	CPluginMngr::CPlugin* a;
 
-	if (params[1] < 0)
+	if (params[arg_plugin] < 0)
 		a = g_plugins.findPluginFast(amx);
 	else
-		a = g_plugins.findPlugin((int)params[1]);
+		a = g_plugins.findPlugin((int)params[arg_plugin]);
 
 	if (a)
 	{
-		set_amxstring(amx, params[2], a->getName(), params[3]);
-		set_amxstring(amx, params[4], a->getTitle(), params[5]);
-		set_amxstring(amx, params[6], a->getVersion(), params[7]);
-		set_amxstring(amx, params[8], a->getAuthor(), params[9]);
-		set_amxstring(amx, params[10], a->getStatus(), params[11]);
+		set_amxstring(amx, params[arg_name], a->getName(), params[arg_namelen]);
+		set_amxstring(amx, params[arg_title], a->getTitle(), params[arg_titlelen]);
+		set_amxstring(amx, params[arg_version], a->getVersion(), params[arg_versionlen]);
+		set_amxstring(amx, params[arg_author], a->getAuthor(), params[arg_authorlen]);
+		set_amxstring(amx, params[arg_status], a->getStatus(), params[arg_statuslen]);
 
-		if (params[0] / sizeof(cell) >= 12)
+		if (params[arg_count] / sizeof(cell) > arg_url)
 		{
-			cell *jit_info = get_amxaddr(amx, params[12]);
-#if defined AMD64 || !defined JIT
-			*jit_info = 0;
-#else
-			*jit_info = a->isDebug() ? 0 : 1;
-#endif
+			set_amxstring(amx, params[arg_url], a->getUrl(), params[arg_urllen]);
+			set_amxstring(amx, params[arg_description], a->getDescription(), params[arg_descriptionlen]);
 		}
 
 		return a->getId();
@@ -3684,7 +3709,7 @@ static cell AMX_NATIVE_CALL callfunc_end(AMX *amx, cell *params)
 		amx_Push(pAmx, gparams[i]);
 	}
 
-	err = amx_Exec(pAmx, &retVal, func);
+	err = amx_ExecPerf(pAmx, &retVal, func);
 
 	if (err != AMX_ERR_NONE)
 	{

amxmodx/amxmodx.h

@@ -79,7 +79,7 @@ extern AMX_NATIVE_INFO g_GameConfigNatives[];
 #define DLPROC(m, func) GetProcAddress(m, func)
 #define DLFREE(m) FreeLibrary(m)
 #else
-#define DLLOAD(path) (DLHANDLE)dlopen(path, RTLD_NOW)
+#define DLLOAD(path) (DLHANDLE)dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND)
 #define DLPROC(m, func) dlsym(m, func)
 #define DLFREE(m) dlclose(m)
 #endif
@@ -196,7 +196,9 @@ extern bool g_official_mod;
 extern bool g_dontprecache;
 extern int g_srvindex;
 extern cvar_t* amxmodx_version;
+extern cvar_t* amxmodx_debug;
 extern cvar_t* amxmodx_language;
+extern cvar_t* amxmodx_perflog;
 extern cvar_t* hostname;
 extern cvar_t* mp_timelimit;
 extern fakecmd_t g_fakecmd;

amxmodx/amxxfile.cpp

@@ -289,7 +289,18 @@ size_t CAmxxReader::GetBufferSize()
 		m_pFile = NULL; \
 		return m_Status; \
 	}
-
+#define DATAREAD_RELEASE(addr, itemsize, itemcount) \
+	if (fread(addr, itemsize, itemcount, m_pFile) != static_cast<size_t>(itemcount)) \
+	{ \
+		if (feof(m_pFile)) \
+			m_Status = Err_FileInvalid; \
+		else \
+			m_Status = Err_FileRead; \
+		fclose(m_pFile); \
+		m_pFile = NULL; \
+		delete[] tempBuffer;\
+		return m_Status; \
+	}
 CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 {
 	if (!m_pFile)
@@ -311,7 +322,7 @@ CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 		PluginEntry *pe = &(m_Bh.plugins[m_Entry]);
 		char *tempBuffer = new char[m_SectionLength + 1];
 		fseek(m_pFile, pe->offs, SEEK_SET);
-		DATAREAD((void *)tempBuffer, 1, m_SectionLength);
+		DATAREAD_RELEASE((void *)tempBuffer, 1, m_SectionLength);
 		uLongf destLen = GetBufferSize();
 		int result = uncompress((Bytef *)buffer, &destLen, (Bytef *)tempBuffer, m_SectionLength);
 		delete [] tempBuffer;
@@ -335,7 +346,7 @@ CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 		// read the data to a temporary buffer
 		char *tempBuffer = new char[m_SectionLength + 1];
 		//fread(tempBuffer, sizeof(char), m_SectionLength, m_pFile);
-		DATAREAD((void*)tempBuffer, 1, m_SectionLength);
+		DATAREAD_RELEASE((void*)tempBuffer, 1, m_SectionLength);
 		// decompress
 		int result = uncompress((Bytef *)buffer, &destLen, (Bytef *)tempBuffer, m_SectionLength);
 		delete [] tempBuffer;

amxmodx/debugger.cpp

@@ -728,7 +728,7 @@ int Handler::HandleModule(const char *module, bool isClass)
 	m_pAmx->flags |= AMX_FLAG_PRENIT;
 	amx_Push(m_pAmx, isClass ? 1 : 0);
 	amx_PushString(m_pAmx, &hea_addr, &phys_addr, module, 0, 0);
-	int err = amx_Exec(m_pAmx, &retval, m_iModFunc);
+	int err = amx_ExecPerf(m_pAmx, &retval, m_iModFunc);
 	amx_Release(m_pAmx, hea_addr);
 	m_pAmx->flags &= ~AMX_FLAG_PRENIT;
 
@@ -768,7 +768,7 @@ int Handler::HandleNative(const char *native, int index, int trap)
 	amx_Push(m_pAmx, trap);
 	amx_Push(m_pAmx, index);
 	amx_PushString(m_pAmx, &hea_addr, &phys_addr, native, 0, 0);
-	int err = amx_Exec(m_pAmx, &retval, m_iNatFunc);
+	int err = amx_ExecPerf(m_pAmx, &retval, m_iNatFunc);
 	if (err != AMX_ERR_NONE)
 	{
 		//LogError() took care of something for us.
@@ -841,7 +841,7 @@ int Handler::HandleError(const char *msg)
 	amx_PushString(m_pAmx, &hea_addr, &phys_addr, msg, 0, 0);
 	amx_Push(m_pAmx, pDebugger ? 1 : 0);
 	amx_Push(m_pAmx, error);
-	int err = amx_Exec(m_pAmx, &result, m_iErrFunc);
+	int err = amx_ExecPerf(m_pAmx, &result, m_iErrFunc);
 	if (err != AMX_ERR_NONE)
 	{
 		//handle this manually.

amxmodx/emsg.cpp

@@ -88,21 +88,44 @@ void Client_TeamInfo(void* mValue)
 			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);
 
-			/**
-			* CS fix for SPECTATOR team. 
-			* -
-			* When a player chooses spectator, ScoreInfo is sent before TeamInfo and with 0 as index.
-			* This means for the first round of first spectator, SPECTATOR name is not associated with its index.
-			* The following fix manually sets the team index when we hit SPECTATOR team.
-			*/
-			if (g_players[index].teamId == -1 && g_bmod_cstrike && !strcmp(msg, "SPECTATOR"))
+			auto pPlayer = GET_PLAYER_POINTER_I(index);
+		
+			pPlayer->team = msg;
+			g_teamsIds.registerTeam(msg, -1);
+			pPlayer->teamId = g_teamsIds.findTeamId(msg);
+						
+			if (pPlayer->teamId == -1)
 			{
-				g_players[index].teamId = 3;
-				g_teamsIds.registerTeam(msg, 3);
+				/**
+				 * CS fix for SPECTATOR team. 
+				 * -
+				 * When a player chooses spectator, ScoreInfo is sent before TeamInfo and with 0 as index.
+				 * This means for the first round of first spectator, SPECTATOR name is not associated with its index.
+				 *  The following fix manually sets the team index when we hit SPECTATOR team.
+				 */
+				if (g_bmod_cstrike && !strcmp(msg, "SPECTATOR"))
+				{
+					pPlayer->teamId = 3;
+					g_teamsIds.registerTeam(msg, 3);
+				}
+
+				/**
+				 * Fixes in-between situation where the team name is not yet associated with a valid index
+				 * and ScoreInfo is executed later (used to retrieve the index). E.g. a player is dead,
+				 * then changes team. Index will return -1 until ScoreInfo is sent, usually at the next spawn.
+				 */
+				else if ((g_bmod_cstrike || g_bmod_dod || g_bmod_tfc || g_bmod_gearbox || g_bmod_valve) 
+					&&  pPlayer->pEdict->pvPrivateData 
+					&& !pPlayer->IsAlive())
+				{
+					GET_OFFSET_NO_ERROR("CBasePlayer", m_iTeam);
+
+					const auto teamId = get_pdata<int>(pPlayer->pEdict, m_iTeam);
+					
+					pPlayer->teamId = teamId;
+					g_teamsIds.registerTeam(msg, teamId);
+				}
 			}
 
 			break;

amxmodx/file.cpp

@@ -96,12 +96,14 @@ static cell AMX_NATIVE_CALL read_file(AMX *amx, cell *params)
 	{
 		length = strlen(buffer);
 
-		if (buffer[length - 1] == '\n')
+		if (length > 0)
+		{
+			if (buffer[length - 1] == '\n')
 			buffer[--length] = '\0';
 
-		if (buffer[length - 1] == '\r')
+			if (buffer[length - 1] == '\r')
 			buffer[--length] = '\0';
-
+		}
 		cell* textLen = get_amxaddr(amx, params[5]);
 		*textLen = set_amxstring_utf8(amx, params[3], buffer, length, params[4]);
 
@@ -756,7 +758,7 @@ struct DirectoryHandle
 	bool valvefs;
 };
 
-// native open_dir(dir[], firstfile[], length, &FileType:type = FileType_Unknown, bool:use_valve_fs=false, const valve_path_id[] = "GAME");
+// native open_dir(const dir[], firstfile[], length, &FileType:type = FileType_Unknown, bool:use_valve_fs=false, const valve_path_id[] = "GAME");
 static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
 {
 	int length;

amxmodx/meta_api.cpp

@@ -135,9 +135,14 @@ cvar_t init_amxmodx_debug = {"amx_debug", "1", FCVAR_SPONLY};
 cvar_t init_amxmodx_mldebug = {"amx_mldebug", "", FCVAR_SPONLY};
 cvar_t init_amxmodx_language = {"amx_language", "en", FCVAR_SERVER};
 cvar_t init_amxmodx_cl_langs = {"amx_client_languages", "1", FCVAR_SERVER};
+cvar_t init_amxmodx_perflog = { "amx_perflog_ms", "1.0", FCVAR_SPONLY };
+
 cvar_t* amxmodx_version = NULL;
 cvar_t* amxmodx_modules = NULL;
+cvar_t* amxmodx_debug = NULL;
 cvar_t* amxmodx_language = NULL;
+cvar_t* amxmodx_perflog = NULL;
+
 cvar_t* hostname = NULL;
 cvar_t* mp_timelimit = NULL;
 
@@ -774,6 +779,15 @@ void C_ServerDeactivate_Post()
 	g_vault.clear();
 	g_xvars.clear();
 	g_plugins.clear();
+	g_langMngr.Clear();
+
+	ArrayHandles.clear();
+	TrieHandles.clear();
+	TrieIterHandles.clear();
+	TrieSnapshotHandles.clear();
+	DataPackHandles.clear();
+	TextParsersHandles.clear();
+	GameConfigHandle.clear();
 
 	g_CvarManager.OnPluginUnloaded();
 
@@ -1145,12 +1159,12 @@ void C_ClientCommand(edict_t *pEntity)
 					if (item == MENU_BACK)
 					{
 						if (pMenu->pageCallback >= 0)
-							executeForwards(pMenu->pageCallback, static_cast<cell>(pPlayer->index), static_cast<cell>(MENU_BACK));
+							executeForwards(pMenu->pageCallback, static_cast<cell>(pPlayer->index), static_cast<cell>(MENU_BACK), static_cast<cell>(menu));
 
 						pMenu->Display(pPlayer->index, pPlayer->page - 1);
 					} else if (item == MENU_MORE) {
 						if (pMenu->pageCallback >= 0)
-							executeForwards(pMenu->pageCallback, static_cast<cell>(pPlayer->index), static_cast<cell>(MENU_MORE));
+							executeForwards(pMenu->pageCallback, static_cast<cell>(pPlayer->index), static_cast<cell>(MENU_MORE), static_cast<cell>(menu));
 
 						pMenu->Display(pPlayer->index, pPlayer->page + 1);
 					} else {
@@ -1618,9 +1632,12 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
 	CVAR_REGISTER(&init_amxmodx_mldebug);
 	CVAR_REGISTER(&init_amxmodx_language);
 	CVAR_REGISTER(&init_amxmodx_cl_langs);
+	CVAR_REGISTER(&init_amxmodx_perflog);
 
 	amxmodx_version = CVAR_GET_POINTER(init_amxmodx_version.name);
+	amxmodx_debug = CVAR_GET_POINTER(init_amxmodx_debug.name);
 	amxmodx_language = CVAR_GET_POINTER(init_amxmodx_language.name);
+	amxmodx_perflog = CVAR_GET_POINTER(init_amxmodx_perflog.name);
 
 	REG_SVR_COMMAND("amxx", amx_command);
 
@@ -1730,6 +1747,14 @@ C_DLLEXPORT	int	Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON	reason)
 	g_plugins.clear();
 	g_langMngr.Clear();
 
+	ArrayHandles.clear();
+	TrieHandles.clear();
+	TrieIterHandles.clear();
+	TrieSnapshotHandles.clear();
+	DataPackHandles.clear();
+	TextParsersHandles.clear();
+	GameConfigHandle.clear();
+
 	ClearMessages();
 
 	modules_callPluginsUnloaded();

amxmodx/modules.cpp

@@ -187,7 +187,7 @@ int load_amxscript_internal(AMX *amx, void **program, const char *filename, char
 	bool will_be_debugged = false;
 	tagAMX_DBG *pDbg = NULL;
 
-	if ((int)CVAR_GET_FLOAT("amx_debug") >= 2 || debug)
+	if ((int)amxmodx_debug->value == 2 || debug)
 	{
 		if ((hdr->file_version < CUR_FILE_VERSION))
 		{
@@ -544,7 +544,7 @@ int set_amxnatives(AMX* amx, char error[128])
 
 	if (amx_FindPublic(amx, "plugin_natives", &idx) == AMX_ERR_NONE)
 	{
-		if ((err = amx_Exec(amx, &retval, idx)) != AMX_ERR_NONE)
+		if ((err = amx_ExecPerf(amx, &retval, idx)) != AMX_ERR_NONE)
 		{
 			Debugger::GenericMessage(amx, err);
 			AMXXLOG_Log("An error occurred in plugin_natives. This is dangerous!");

amxmodx/msvc12/amxmodx_mm.vcxproj

@@ -457,6 +457,7 @@ md -p JIT 2>NUL
     <None Include="..\..\plugins\include\cvars.inc" />
     <None Include="..\..\plugins\include\datapack.inc" />
     <None Include="..\..\plugins\include\gameconfig.inc" />
+    <None Include="..\..\plugins\include\newmenus.inc" />
     <None Include="..\..\plugins\include\string_const.inc" />
     <None Include="..\..\plugins\include\string_stocks.inc" />
     <None Include="..\..\plugins\include\textparse_ini.inc" />

amxmodx/msvc12/amxmodx_mm.vcxproj.filters

@@ -54,7 +54,7 @@
     </Filter>
     <Filter Include="ReSDK\engine">
       <UniqueIdentifier>{04fab577-6f56-40d0-8f69-7ce1b8bf3bb9}</UniqueIdentifier>
-	</Filter>
+    </Filter>
     <Filter Include="Third Party\UTF8Rewind">
       <UniqueIdentifier>{270f3524-564f-4154-bb35-242a6faac09e}</UniqueIdentifier>
     </Filter>
@@ -693,10 +693,13 @@
     <None Include="..\..\plugins\include\string_stocks.inc">
       <Filter>Pawn Includes</Filter>
     </None>
+    <None Include="..\..\plugins\include\newmenus.inc">
+      <Filter>Pawn Includes</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Object Include="..\Jit\helpers-x86.obj">
       <Filter>Assembly\Builds</Filter>
     </Object>
   </ItemGroup>
-</Project>
+</Project>

amxmodx/natives.cpp

@@ -112,8 +112,7 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 		pDebugger->BeginExec();
 	}
 
-	err=amx_Exec(pNative->amx, &ret, pNative->func);
-
+	err = amx_ExecPerf(pNative->amx, &ret, pNative->func);
 	if (err != AMX_ERR_NONE)
 	{
 		if (pDebugger && pDebugger->ErrorExists())

amxmodx/newmenus.cpp

@@ -10,6 +10,7 @@
 #include "amxmodx.h"
 #include "CMenu.h"
 #include "newmenus.h"
+#include "format.h"
 
 ke::Vector<Menu *> g_NewMenus;
 CStack<int> g_MenuFreeStack;
@@ -90,9 +91,9 @@ bool CloseNewMenus(CPlayer *pPlayer)
 	return true;
 }
 
-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), showPageNumber(true), items_per_page(7)
+Menu::Menu(const char *title, AMX *amx, int fid, bool use_ml) : m_Title(title), m_ItemColor("\\r"), 
+m_NeverExit(false), m_ForceExit(false), m_AutoColors(g_coloredmenus), thisId(0), func(fid), 
+isDestroying(false), pageCallback(-1), showPageNumber(true), useMultilingual(use_ml), amx(amx), items_per_page(7)
 {
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
 	menuId = g_menucmds.registerMenuId(title, amx);
@@ -356,18 +357,32 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 
 	m_Text = nullptr;
 
+
+	auto title = m_Title.chars();
+
+	if (this->useMultilingual)
+	{
+		const auto language = playerlang(player);
+		const auto definition = translate(this->amx, language, title);
+
+		if (definition)
+		{
+			title = definition;
+		}
+	}
+
 	char buffer[255];
 	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);
+			ke::SafeSprintf(buffer, sizeof(buffer), "\\y%s %d/%d\n\\w\n", title, page + 1, pages);
 		else
-			ke::SafeSprintf(buffer, sizeof(buffer), "%s %d/%d\n\n", m_Title.chars(), page + 1, pages);
+			ke::SafeSprintf(buffer, sizeof(buffer), "%s %d/%d\n\n", title, page + 1, pages);
 	} else {
 		if (m_AutoColors)
-			ke::SafeSprintf(buffer, sizeof(buffer), "\\y%s\n\\w\n", m_Title.chars());
+			ke::SafeSprintf(buffer, sizeof(buffer), "\\y%s\n\\w\n", title);
 		else
-			ke::SafeSprintf(buffer, sizeof(buffer), "%s\n\n", m_Title.chars());
+			ke::SafeSprintf(buffer, sizeof(buffer), "%s\n\n", title);
 	}
 	
 	m_Text = m_Text + buffer;
@@ -403,27 +418,27 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	{
 		flags &= ~Display_Back;
 	}
-	
+
 	menuitem *pItem = NULL;
-	
+
 	int option = 0;
 	keys = 0;
 	bool enabled = true;
 	int ret = 0;
 	int slots = 0;
 	int option_display = 0;
-	
+
 	for (item_t i = start; i < end; i++)
 	{
 		// reset enabled
 		enabled = true;
 		pItem = m_Items[i];
-		
+
 		if (pItem->access && !(pItem->access & g_players[player].flags[0]))
 		{
 			enabled = false;
 		}
-		
+
 		if (pItem->handler != -1)
 		{
 			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i));
@@ -455,31 +470,44 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		{
 			keys |= (1<<option);
 		}
-		
+
 		option_display = ++option;
 		if (option_display == 10)
 		{
 			option_display = 0;
 		}
 
+		auto itemName = pItem->name.chars();
+
+		if (this->useMultilingual)
+		{
+			const auto language = playerlang(player);
+			const auto definition = translate(this->amx, language, itemName);
+
+			if (definition)
+			{
+				itemName = definition;
+			}
+		}
+
 		if (pItem->isBlank)
 		{
-			ke::SafeSprintf(buffer, sizeof(buffer), "%s\n", pItem->name.chars());
+			ke::SafeSprintf(buffer, sizeof(buffer), "%s\n", itemName);
 		}
 		else if (enabled)
 		{
-			if (m_AutoColors) 
+			if (m_AutoColors)
 			{
-				ke::SafeSprintf(buffer, sizeof(buffer), "%s%d.\\w %s\n", m_ItemColor.chars(),option_display, pItem->name.chars());
+				ke::SafeSprintf(buffer, sizeof(buffer), "%s%d.\\w %s\n", m_ItemColor.chars(),option_display, itemName);
 			} else {
-				ke::SafeSprintf(buffer, sizeof(buffer), "%d. %s\n", option_display, pItem->name.chars());
+				ke::SafeSprintf(buffer, sizeof(buffer), "%d. %s\n", option_display, itemName);
 			}
 		} else {
 			if (m_AutoColors)
 			{
-				ke::SafeSprintf(buffer, sizeof(buffer), "\\d%d. %s\n\\w", option_display, pItem->name.chars());
+				ke::SafeSprintf(buffer, sizeof(buffer), "\\d%d. %s\n\\w", option_display, itemName);
 			} else {
-				ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", pItem->name.chars());
+				ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", itemName);
 			}
 		}
 		slots++;
@@ -516,6 +544,20 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		/* Don't bother if there is only one page */
 		if (pages > 1)
 		{
+
+			auto tempItemName = m_OptNames[abs(MENU_BACK)].chars();
+
+			if (this->useMultilingual)
+			{
+				const auto language = playerlang(player);
+				const auto definition = translate(this->amx, language, tempItemName);
+
+				if (definition)
+				{
+					tempItemName = definition;
+				}
+			}
+
 			if (flags & Display_Back)
 			{
 				keys |= (1<<option++);
@@ -526,13 +568,13 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						"%s%d. \\w%s\n", 
 						m_ItemColor.chars(), 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_BACK)].chars());
+						tempItemName);
 				} else {
 					ke::SafeSprintf(buffer,
 						sizeof(buffer), 
 						"%d. %s\n", 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_BACK)].chars());
+						tempItemName);
 				}
 			} else {
 				option++;
@@ -542,13 +584,26 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						sizeof(buffer),
 						"\\d%d. %s\n\\w",
 						option == 10 ? 0 : option,
-						m_OptNames[abs(MENU_BACK)].chars());
+						tempItemName);
 				} else {
-					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", m_OptNames[abs(MENU_BACK)].chars());
+					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", tempItemName);
 				}
 			}
 			m_Text = m_Text + buffer;
-	
+
+			tempItemName = m_OptNames[abs(MENU_MORE)].chars();
+
+			if (this->useMultilingual)
+			{
+				const auto language = playerlang(player);
+				const auto definition = translate(this->amx, language, tempItemName);
+
+				if (definition)
+				{
+					tempItemName = definition;
+				}
+			}
+
 			if (flags & Display_Next)
 			{
 				keys |= (1<<option++);
@@ -559,13 +614,13 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						"%s%d. \\w%s\n", 
 						m_ItemColor.chars(), 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_MORE)].chars());
+						tempItemName);
 				} else {
 					ke::SafeSprintf(buffer,
 						sizeof(buffer), 
 						"%d. %s\n", 
 						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_MORE)].chars());
+						tempItemName);
 				}
 			} else {
 				option++;
@@ -575,9 +630,9 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 						sizeof(buffer),
 						"\\d%d. %s\n\\w",
 						option == 10 ? 0 : option,
-						m_OptNames[abs(MENU_MORE)].chars());
+						tempItemName);
 				} else {
-					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", m_OptNames[abs(MENU_MORE)].chars());
+					ke::SafeSprintf(buffer, sizeof(buffer), "#. %s\n", tempItemName);
 				}
 			}
 			m_Text = m_Text + buffer;
@@ -586,13 +641,26 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 			option += 2;
 		}
 	}
-	
+
 	if ((items_per_page && !m_NeverExit) || (m_ForceExit && numItems < 10))
 	{
+		auto exitName = m_OptNames[abs(MENU_EXIT)].chars();
+
+		if (this->useMultilingual)
+		{
+			const auto language = playerlang(player);
+			const auto definition = translate(this->amx, language, exitName);
+
+			if (definition)
+			{
+				exitName = definition;
+			}
+		}
+
 		/* Visual pad has not been added yet */
 		if (!items_per_page)
 			m_Text = m_Text + "\n";
-		
+
 		keys |= (1<<option++);
 		if (m_AutoColors)
 		{
@@ -601,17 +669,17 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 				"%s%d. \\w%s\n", 
 				m_ItemColor.chars(), 
 				option == 10 ? 0 : option, 
-				m_OptNames[abs(MENU_EXIT)].chars());
+				exitName);
 		} else {
 			ke::SafeSprintf(buffer,
 				sizeof(buffer), 
 				"%d. %s\n", 
 				option == 10 ? 0 : option, 
-				m_OptNames[abs(MENU_EXIT)].chars());
+				exitName);
 		}
 		m_Text = m_Text + buffer;
 	}
-	
+
 	return m_Text.ptr();
 }
 
@@ -620,38 +688,45 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.length()); \
 	return 0; }
 
-//Makes a new menu handle (-1 for failure)
-//native csdm_makemenu(title[]);
+// native menu_create(const title[], const handler[], bool:ml = false);
 static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
 {
-	int len;
-	char *title = get_amxstring(amx, params[1], 0, len);
-	validate_menu_text(title);
-	char *handler = get_amxstring(amx, params[2], 1, len);
+	enum args { arg_count, arg_title, arg_handler, arg_ml };
 
-	int func = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
-	
-	if (func == -1)
+	int length;
+	const auto title    = get_amxstring(amx, params[arg_title], 0, length);
+	const auto handler  = get_amxstring(amx, params[arg_handler], 1, length);
+	const auto callback = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+
+	if (callback == -1)
 	{
-		LogError(amx, AMX_ERR_NOTFOUND, "Invalid function \"%s\"", handler);
+		LogError(amx, AMX_ERR_NOTFOUND, R"(Invalid function "%s")", handler);
 		return 0;
 	}
 
-	Menu *pMenu = new Menu(title, amx, func);
+	validate_menu_text(title);
+
+	auto pMenu = new Menu(title, amx, callback, params[arg_ml] != 0);
 
 	if (g_MenuFreeStack.empty())
 	{
 		g_NewMenus.append(pMenu);
-		pMenu->thisId = (int)g_NewMenus.length() - 1;
-	} else {
-		int pos = g_MenuFreeStack.front();
+
+		pMenu->thisId = static_cast<int>(g_NewMenus.length()) - 1;
+	}
+	else
+	{
+		const auto position = g_MenuFreeStack.front();
+
 		g_MenuFreeStack.pop();
-		g_NewMenus[pos] = pMenu;
-		pMenu->thisId = pos;
+		g_NewMenus[position] = pMenu;
+
+		pMenu->thisId = position;
 	}
 
 	return pMenu->thisId;
 }
+
 static cell AMX_NATIVE_CALL menu_addblank(AMX *amx, cell *params)
 {
 	GETMENU(params[1]);
@@ -855,7 +930,7 @@ static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
 		time = params[4];
 
 	if (time < 0)
-		pPlayer->menuexpire = INFINITE;
+		pPlayer->menuexpire = static_cast<float>(INFINITE);
 	else
 		pPlayer->menuexpire = gpGlobals->time + static_cast<float>(time);
 
@@ -971,6 +1046,20 @@ static cell AMX_NATIVE_CALL menu_item_setcall(AMX *amx, cell *params)
 	return 1;
 }
 
+static cell AMX_NATIVE_CALL menu_item_setaccess(AMX *amx, cell *params)
+{
+	GETMENU(params[1]);
+
+	menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
+
+	if (!pItem)
+		return 0;
+
+	pItem->access = params[3];
+
+	return 1;
+}
+
 static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 {
 	GETMENU(params[1]);
@@ -994,7 +1083,7 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 				break;
 			}
 
-			int callback = registerSPForwardByName(amx, str, FP_CELL, FP_CELL, FP_DONE);
+			int callback = registerSPForwardByName(amx, str, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
 			if (callback < 0)
 			{
 				LogError(amx, AMX_ERR_NATIVE, "Function %s not present", str);
@@ -1202,6 +1291,7 @@ AMX_NATIVE_INFO g_NewMenuNatives[] =
 	{"menu_item_getinfo",		menu_item_getinfo},
 	{"menu_makecallback",		menu_makecallback},
 	{"menu_item_setcall",		menu_item_setcall},
+	{"menu_item_setaccess",		menu_item_setaccess},
 	{"menu_item_setcmd",		menu_item_setcmd},
 	{"menu_item_setname",		menu_item_setname},
 	{"menu_destroy",			menu_destroy},

amxmodx/newmenus.h

@@ -95,7 +95,7 @@ typedef unsigned int page_t;
 class Menu
 {
 public:
-	Menu(const char *title, AMX *amx, int fid);
+	Menu(const char *title, AMX *amx, int fid, bool use_ml);
 	~Menu();
 	
 	menuitem *GetMenuItem(item_t item);
@@ -127,6 +127,8 @@ public:
 	bool isDestroying;
 	int pageCallback;
 	bool showPageNumber;
+	bool useMultilingual;
+	AMX *amx;
 public:
 	unsigned int items_per_page;
 };

amxmodx/srvcmd.cpp

@@ -9,6 +9,7 @@
 
 #include "amxmodx.h"
 #include <amxmodx_version.h>
+#include <string>
 
 void amx_command()
 {
@@ -25,7 +26,7 @@ void amx_command()
 	if (!strcmp(cmd, "plugins") || !strcmp(cmd, "list"))
 	{
 		print_srvconsole("Currently loaded plugins:\n");
-		print_srvconsole("       %-23.22s %-11.10s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
+		print_srvconsole("       %-3.2s %-23.22s %-11.10s %-17.16s %-32.31s %-12.11s %-9.8s\n", "id", "name", "version", "author", "url", "file", "status");
 
 		int plugins = 0;
 		int	running = 0;
@@ -40,7 +41,7 @@ void amx_command()
 				if ((*a).isValid() && !(*a).isPaused())
 					++running;
 
-				print_srvconsole(" [%3d] %-23.22s %-11.10s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
+				print_srvconsole(" [%3d] %-3i %-23.22s %-11.10s %-17.16s %-32.31s %-12.11s %-9.8s\n", plugins, (*a).getId(), (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getUrl(), (*a).getName(), (*a).getStatus());
 			}
 			++a;
 		}
@@ -63,6 +64,52 @@ void amx_command()
 
 		print_srvconsole("%d plugins, %d running\n", plugins, running);
 	}
+	else if (!strcmp(cmd, "plugin"))
+	{
+		if (CMD_ARGC() < 3)
+		{
+			print_srvconsole("Usage: amxx plugin [ id ]\nFor a list of plugins, use the \"amxx plugins\" command\n");
+		}
+		else
+		{
+			char *pEnd;
+			auto id = strtol(CMD_ARGV(2), &pEnd, 10);
+
+			if (!pEnd)
+			{
+				print_srvconsole("Invalid plugin index %i.\n", id);
+				return;
+			}
+
+			auto plugin = g_plugins.findPlugin(id);
+
+			if (plugin && plugin->isValid())
+			{
+				print_srvconsole("   Name: %s\n", plugin->getTitle());
+				print_srvconsole("   Version: %s\n", plugin->getVersion());
+				print_srvconsole("   Author: %s\n", plugin->getAuthor());
+
+				auto url = plugin->getUrl();
+				if (url[0])
+				{
+					print_srvconsole("   URL: %s\n", url);
+				}
+
+				auto description = plugin->getDescription(); 
+				if (description[0])
+				{
+					print_srvconsole("   Description: %s\n", description);
+				}
+
+				print_srvconsole("   Filename: %s\n", plugin->getName());
+				print_srvconsole("   Status: %s\n", plugin->getStatus());
+			}
+			else
+			{
+				print_srvconsole("Plugin index %i not found.\n", id);
+			}
+		}
+	}
 	else if (!strcmp(cmd, "pause") && CMD_ARGC() > 2)
 	{
 		const char* sPlugin = CMD_ARGV(2);
@@ -244,6 +291,7 @@ void amx_command()
 		print_srvconsole("   version                    - display amxx version info\n");
 		print_srvconsole("   gpl                        - print the license\n");
 		print_srvconsole("   plugins [ criteria ]       - list plugins currently loaded or ones matching given search criteria\n");
+		print_srvconsole("   plugin [ id ]              - information about a plugin\n");
 		print_srvconsole("   modules                    - list modules currently loaded\n");
 		print_srvconsole("   cvars [ plugin ] [ index ] - list cvars handled by amxx or show information about a cvar if index is provided\n");
 		print_srvconsole("   cmds [ plugin ]            - list commands registered by plugins\n");

amxmodx/trie_natives.cpp

@@ -26,7 +26,7 @@ static cell AMX_NATIVE_CALL TrieClear(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 	t->map.clear();
@@ -40,7 +40,7 @@ static cell AMX_NATIVE_CALL TrieSetCell(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -76,7 +76,7 @@ static cell AMX_NATIVE_CALL TrieSetString(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -113,7 +113,7 @@ static cell AMX_NATIVE_CALL TrieSetArray(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -157,7 +157,7 @@ static cell AMX_NATIVE_CALL TrieGetCell(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -189,7 +189,7 @@ static cell AMX_NATIVE_CALL TrieGetString(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -236,7 +236,7 @@ static cell AMX_NATIVE_CALL TrieGetArray(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -297,7 +297,7 @@ static cell AMX_NATIVE_CALL TrieKeyExists(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -314,7 +314,7 @@ static cell AMX_NATIVE_CALL TrieDeleteKey(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -373,7 +373,7 @@ static cell AMX_NATIVE_CALL TrieGetSize(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -386,7 +386,7 @@ static cell AMX_NATIVE_CALL TrieSnapshotCreate(AMX *amx, cell *params)
 
 	if (!t)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[1]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
 		return 0;
 	}
 
@@ -506,7 +506,7 @@ static cell AMX_NATIVE_CALL TrieIterCreate(AMX *amx, cell *params)
 
 	if (!handle)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid map handle provided (%d)", params[arg_handle]);
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[arg_handle]);
 		return 0;
 	}
 

appveyor.yml

@@ -1,32 +1,126 @@
 version: 1.0.{build}
-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 'https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-c-6.1.1-win32.zip'
-- 7z x mysql-connector-c-6.1.1-win32.zip -o"mysql"
-- cd mysql
-- dir
-- ren mysql-connector-c-6.1.1-win32 mysql-5.5
-- move /Y mysql-5.5 ..\
-- cd ..\ambuild
-- c:\python27\python setup.py install
-- cd ..\amxmodx
-cache:
-  - c:\projects\*.zip -> appveyor.yml
-  - c:\projects\mysql-5.5 -> appveyor.yml
-build_script:
-- '"%VS140COMNTOOLS%\vsvars32.bat"'
-- mkdir build
-- cd build
-- c:\python27\python ../configure.py --enable-optimize --nasm="C:\nasm\nasm-2.13.03\nasm.exe"
-- c:\python27\scripts\ambuild
+
+environment:
+  fast_finish: false
+  allow_failures: true
+  matrix:
+    - job_name: MacOS
+      appveyor_build_worker_image: macos-mojave
+      job_group: Build
+
+    - job_name: Windows
+      appveyor_build_worker_image: Visual Studio 2015
+      job_group: Build
+
+for:
+  -
+    matrix:
+      only:
+        - job_name: Windows
+
+    clone_folder: c:\projects\amxmodx
+    install:
+    - cmd: >-
+        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
+        
+        curl -L -o "mysql-connector-c-6.1.1-win32.zip" https://downloads.mysql.com/archives/get/p/19/file/mysql-connector-c-6.1.1-win32.zip
+        
+        7z x mysql-connector-c-6.1.1-win32.zip -o"mysql"
+        
+        cd mysql
+        
+        dir
+        
+        ren mysql-connector-c-6.1.1-win32 mysql-5.5
+        
+        move /Y mysql-5.5 ..\
+        
+        cd ..\ambuild
+        
+        c:\python38\python setup.py install
+        
+        set PATH=C:\Python38;C:\Python38\Scripts;%PATH%
+        
+        cd ..\amxmodx
+        
+# cache:
+#   - c:\projects\*.zip -> appveyor.yml
+#   - c:\projects\mysql-5.5 -> appveyor.yml
+    build_script:
+    - cmd: >-
+        "%VS140COMNTOOLS%\vsvars32.bat"
+        
+        mkdir build
+        
+        cd build
+        
+        c:\python38\python ../configure.py --enable-optimize --nasm="C:\nasm\nasm-2.13.03\nasm.exe"
+        
+        echo %PATH%
+
+        ambuild
+
+  -
+    matrix:
+      only:
+        - job_name: MacOS
+
+    install:
+    - >-
+        git submodule update --init --recursive
+
+        mkdir -p $APPVEYOR_BUILD_FOLDER/deps
+
+        ls -alh
+        
+        cd $APPVEYOR_BUILD_FOLDER/deps
+        
+        mkdir -p amxmodx
+
+        ../support/checkout-deps.sh
+
+        brew install nasm
+
+        nasm -v
+
+        export CC=clang
+        
+        export CXX=clang++
+        
+        clang --version
+        
+        clang++ --version
+
+        cd $APPVEYOR_BUILD_FOLDER
+        
+    build_script:
+    - >-
+        echo $PATH
+        
+        mkdir build
+        
+        cd build
+        
+        python3 ../configure.py --enable-optimize --metamod=$APPVEYOR_BUILD_FOLDER/deps/metamod-am --hlsdk=$APPVEYOR_BUILD_FOLDER/deps/hlsdk --mysql=$APPVEYOR_BUILD_FOLDER/deps/mysql-5.5
+        
+        ambuild

compiler/amxxpc/amxxpc.cpp

@@ -343,22 +343,23 @@ char *FindFileName(int argc, char **argv)
 void show_help()
 {
 	printf("Options:\n");
-	printf("\t-A<num>  alignment in bytes of the data segment and the stack\n");
-	printf("\t-a       output assembler code\n");
-	printf("\t-C[+/-]  compact encoding for output file (default=-)\n");
-	printf("\t-c<name> codepage name or number; e.g. 1252 for Windows Latin-1\n");
-	printf("\t-Dpath   active directory path\n");
-	printf("\t-d0      no symbolic information, no run-time checks\n");
-	printf("\t-d1      [default] run-time checks, no symbolic information\n");
-	printf("\t-d2      full debug information and dynamic checking\n");
-	printf("\t-d3      full debug information, dynamic checking, no optimization\n");
-	printf("\t-e<name> set name of error file (quiet compile)\n");
-	printf("\t-H<hwnd> window handle to send a notification message on finish\n");
-	printf("\t-i<name> path for include files\n");
-	printf("\t-l       create list file (preprocess only)\n");
-	printf("\t-o<name> set base name of output file\n");
-	printf("\t-p<name> set name of \"prefix\" file\n");
-	printf("\t-r[name] write cross reference report to console or to specified file\n");
+	printf("\t-A<num>   alignment in bytes of the data segment and the stack\n");
+	printf("\t-a        output assembler code\n");
+	printf("\t-C[+/-]   compact encoding for output file (default=-)\n");
+	printf("\t-c<name>  codepage name or number; e.g. 1252 for Windows Latin-1\n");
+	printf("\t-Dpath    active directory path\n");
+	printf("\t-d0       no symbolic information, no run-time checks\n");
+	printf("\t-d1       [default] run-time checks, no symbolic information\n");
+	printf("\t-d2       full debug information and dynamic checking\n");
+	printf("\t-d3       full debug information, dynamic checking, no optimization\n");
+	printf("\t-e<name>  set name of error file (quiet compile)\n");
+	printf("\t-H<hwnd>  window handle to send a notification message on finish\n");
+	printf("\t-i<name>  path for include files\n");
+	printf("\t-l        create list file (preprocess only)\n");
+	printf("\t-o<name>  set base name of output file\n");
+	printf("\t-p<name>  set name of \"prefix\" file\n");
+	printf("\t-r[name]  write cross reference report to console or to specified file\n");
+	printf("\t-sui[+/-] show stack usage info\n");
 }
 
 #if defined(__linux__) || defined(__APPLE__)

compiler/libpc300/sc.h

@@ -54,7 +54,7 @@
 #define CTRL_CHAR   '^'    /* default control character */
 #define sCHARBITS   8       /* size of a packed character */
 
-#define sDIMEN_MAX     3    /* maximum number of array dimensions */
+#define sDIMEN_MAX     4    /* maximum number of array dimensions */
 #define sLINEMAX     4095    /* input line length (in characters) */
 #define sCOMP_STACK   32    /* maximum nesting of #if .. #endif sections */
 #define sDEF_LITMAX  500    /* initial size of the literal pool, in "cells" */
@@ -280,6 +280,12 @@ typedef struct s_stringpair {
   char *documentation;
 } stringpair;
 
+typedef struct s_valuepair {
+  struct s_valuepair *next;
+  long first;
+  long second;
+} valuepair;
+
 /* macros for code generation */
 #define opcodes(n)      ((n)*sizeof(cell))      /* opcode size */
 #define opargs(n)       ((n)*sizeof(cell))      /* size of typical argument */
@@ -700,6 +706,9 @@ SC_FUNC void delete_docstringtable(void);
 SC_FUNC stringlist *insert_autolist(char *string);
 SC_FUNC char *get_autolist(int index);
 SC_FUNC void delete_autolisttable(void);
+SC_FUNC valuepair *push_heaplist(long first, long second);
+SC_FUNC int popfront_heaplist(long *first, long *second);
+SC_FUNC void delete_heaplisttable(void);
 SC_FUNC stringlist *insert_dbgfile(const char *filename);
 SC_FUNC stringlist *insert_dbgline(int linenr);
 SC_FUNC stringlist *insert_dbgsymbol(symbol *sym);
@@ -803,6 +812,7 @@ SC_VDECL int rational_digits; /* number of fractional digits */
 SC_VDECL int sc_allowproccall;/* allow/detect tagnames in lex() */
 SC_VDECL char *pc_deprecate;  /* if non-NULL, mark next declaration as deprecated */
 SC_VDECL int sc_warnings_are_errors;
+SC_VDECL int sc_stkusageinfo;     /* show stack usage info? */
 
 SC_VDECL constvalue sc_automaton_tab; /* automaton table */
 SC_VDECL constvalue sc_state_tab;     /* state table */

compiler/libpc300/sc1.c

@@ -628,6 +628,7 @@ int pc_compile(int argc, char *argv[])
     /* reset "defined" flag of all functions and global variables */
     reduce_referrers(&glbtab);
     delete_symbols(&glbtab,0,TRUE,FALSE);
+    delete_heaplisttable();
     #if !defined NO_DEFINE
       delete_substtable();
       inst_datetime_defines();
@@ -755,14 +756,55 @@ cleanup:
 
   #if !defined SC_LIGHT
     if (errnum==0 && strlen(errfname)==0) {
-      int flag_exceed=0;
-      if (sc_amxlimit > 0 && (long)(hdrsize+code_idx+glb_declared*sizeof(cell)+sc_stksize*sizeof(cell)) >= sc_amxlimit)
-        flag_exceed=1;
-      if ((sc_debug & sSYMBOLIC)!=0 || verbosity>=2 || flag_exceed) {
+      int recursion = 0, flag_exceed = 0;
+      long stacksize = 0L;
+      unsigned long maxStackUsage = 0L;
+      unsigned long dynamicStackSizeLimit = (long)sc_stksize * sizeof(cell);
+
+      if (sc_amxlimit > 0) {
+        long totalsize = hdrsize + code_idx + glb_declared * sizeof(cell) + dynamicStackSizeLimit;
+        if (totalsize >= sc_amxlimit)
+        flag_exceed = 1;
+      } /* if */
+
+      /* if */
+      if(sc_stkusageinfo) {
+        stacksize = max_stacksize(&glbtab, &recursion);
+        maxStackUsage = stacksize * sizeof(cell);
+        
+        if (recursion) {
+          pc_printf("Note: estimated max. usage: unknown, due to recursion\n");
+        } /* if */
+        else if (maxStackUsage >= dynamicStackSizeLimit) {
+          pc_printf("Note: estimated max. stack usage is %ld cells %ld bytes, limit %ld bytes\n", stacksize, maxStackUsage, dynamicStackSizeLimit);
+        }
+      } /* if */
+
+      /* if */
+      /* Note: Seems like `stacksize + 32 >= (long)sc_stksize` condition in original compiler invented to show stack usage warning if it's exceeded, that's why it's defined */
+      if ((sc_debug & sSYMBOLIC)!=0 || verbosity>=2 || /* stacksize + 32 >= (long)sc_stksize || */ flag_exceed) {
         pc_printf("Header size:       %8ld bytes\n", (long)hdrsize);
         pc_printf("Code size:         %8ld bytes\n", (long)code_idx);
         pc_printf("Data size:         %8ld bytes\n", (long)glb_declared*sizeof(cell));
-        pc_printf("Stack/heap size:   %8ld bytes\n", (long)sc_stksize*sizeof(cell));
+        pc_printf("Stack/heap size:   %8ld bytes", dynamicStackSizeLimit);
+
+        if(sc_stkusageinfo) {
+          pc_printf(" | estimated max. usage");
+
+          /* if */
+          if (recursion) {
+            pc_printf(": unknown, due to recursion\n");
+          }
+          /* else if ((pc_memflags & suSLEEP_INSTR) != 0)
+              pc_printf(": unknown, due to the \"sleep\" instruction\n");*/
+          else {
+            pc_printf("=%ld cells (%ld bytes)\n", stacksize, maxStackUsage);
+          } /* if */
+        }
+        else {
+          pc_printf("\n");
+        } /* if */
+
         pc_printf("Total requirements:%8ld bytes\n", (long)hdrsize+(long)code_idx+(long)glb_declared*sizeof(cell)+(long)sc_stksize*sizeof(cell));
       } /* if */
       if (flag_exceed)
@@ -805,6 +847,7 @@ cleanup:
       free(sc_documentation);
   #endif
   delete_autolisttable();
+  delete_heaplisttable();
   if (errnum!=0) {
     if (strlen(errfname)==0)
       pc_printf("\n%d Error%s.\n",errnum,(errnum>1) ? "s" : "");
@@ -960,6 +1003,8 @@ static void initglobals(void)
   sc_documentation=NULL;
   sc_makereport=FALSE;  /* do not generate a cross-reference report */
 #endif
+
+  sc_stkusageinfo=FALSE;/* stack usage info disabled by default */
 }
 
 /* set_extension
@@ -1022,6 +1067,8 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
   const char *ptr;
   int arg,i,isoption;
 
+  static const char stackusageinfo[4] = { 's', 'u', 'i', '\0' };
+
   for (arg=1; arg<argc; arg++) {
     #if DIRSEP_CHAR=='/'
       isoption= argv[arg][0]=='-';
@@ -1150,9 +1197,18 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
         else
           about();
         break;
-      case 's':
+      case 's': {
+        if(strlen(ptr) >= (sizeof(stackusageinfo) - 1)) {
+          if(*(ptr+1) == stackusageinfo[1] && *(ptr+2) == stackusageinfo[2]) {
+            ptr += 2;
+            sc_stkusageinfo = toggle_option(ptr, sc_stkusageinfo);
+            break;
+          }
+        }
+
         skipinput=atoi(option_value(ptr));
         break;
+      }
       case 't':
         i=atoi(option_value(ptr));
         if (i>0)
@@ -1406,43 +1462,44 @@ static void about(void)
     setcaption();
     pc_printf("Usage:   pawncc <filename> [filename...] [options]\n\n");
     pc_printf("Options:\n");
-    pc_printf("         -A<num>  alignment in bytes of the data segment and the stack\n");
-    pc_printf("         -a       output assembler code\n");
+    pc_printf("         -A<num>   alignment in bytes of the data segment and the stack\n");
+    pc_printf("         -a        output assembler code\n");
 #if AMX_COMPACTMARGIN > 2
-    pc_printf("         -C[+/-]  compact encoding for output file (default=%c)\n", sc_compress ? '+' : '-');
+    pc_printf("         -C[+/-]   compact encoding for output file (default=%c)\n", sc_compress ? '+' : '-');
 #endif
-    pc_printf("         -c<name> codepage name or number; e.g. 1252 for Windows Latin-1\n");
+    pc_printf("         -c<name>  codepage name or number; e.g. 1252 for Windows Latin-1\n");
 #if defined dos_setdrive
-    pc_printf("         -Dpath   active directory path\n");
+    pc_printf("         -Dpath    active directory path\n");
 #endif
-    pc_printf("         -d0      no symbolic information, no run-time checks\n");
-    pc_printf("         -d1      [default] run-time checks, no symbolic information\n");
-    pc_printf("         -d2      full debug information and dynamic checking\n");
-    pc_printf("         -d3      full debug information, dynamic checking, no optimization\n");
-    pc_printf("         -e<name> set name of error file (quiet compile)\n");
+    pc_printf("         -d0       no symbolic information, no run-time checks\n");
+    pc_printf("         -d1       [default] run-time checks, no symbolic information\n");
+    pc_printf("         -d2       full debug information and dynamic checking\n");
+    pc_printf("         -d3       full debug information, dynamic checking, no optimization\n");
+    pc_printf("         -e<name>  set name of error file (quiet compile)\n");
 #if defined __WIN32__ || defined _WIN32 || defined _Windows
-    pc_printf("         -H<hwnd> window handle to send a notification message on finish\n");
+    pc_printf("         -H<hwnd>  window handle to send a notification message on finish\n");
 #endif
-    pc_printf("         -i<name> path for include files\n");
-    pc_printf("         -l       create list file (preprocess only)\n");
-    pc_printf("         -o<name> set base name of (P-code) output file\n");
-    pc_printf("         -p<name> set name of \"prefix\" file\n");
+    pc_printf("         -i<name>  path for include files\n");
+    pc_printf("         -l        create list file (preprocess only)\n");
+    pc_printf("         -o<name>  set base name of (P-code) output file\n");
+    pc_printf("         -p<name>  set name of \"prefix\" file\n");
 #if !defined SC_LIGHT
-    pc_printf("         -r[name] write cross reference report to console or to specified file\n");
+    pc_printf("         -r[name]  write cross reference report to console or to specified file\n");
 #endif
-    pc_printf("         -S<num>  stack/heap size in cells (default=%d)\n",(int)sc_stksize);
-    pc_printf("         -s<num>  skip lines from the input file\n");
-    pc_printf("         -t<num>  TAB indent size (in character positions, default=%d)\n",sc_tabsize);
-    pc_printf("         -v<num>  verbosity level; 0=quiet, 1=normal, 2=verbose (default=%d)\n",verbosity);
-    pc_printf("         -w<num>  disable a specific warning by its number\n");
-    pc_printf("         -E       treat warnings as errors\n");
-    pc_printf("         -X<num>  abstract machine size limit in bytes\n");
-    pc_printf("         -\\       use '\\' for escape characters\n");
-    pc_printf("         -^       use '^' for escape characters\n");
-    pc_printf("         -;[+/-]  require a semicolon to end each statement (default=%c)\n", sc_needsemicolon ? '+' : '-');
-    pc_printf("         -([+/-]  require parantheses for function invocation (default=%c)\n", optproccall ? '-' : '+');
-    pc_printf("         sym=val  define constant \"sym\" with value \"val\"\n");
-    pc_printf("         sym=     define constant \"sym\" with value 0\n");
+    pc_printf("         -S<num>   stack/heap size in cells (default=%d)\n",(int)sc_stksize);
+    pc_printf("         -s<num>   skip lines from the input file\n");
+    pc_printf("         -sui[+/-] show stack usage info\n");
+    pc_printf("         -t<num>   TAB indent size (in character positions, default=%d)\n",sc_tabsize);
+    pc_printf("         -v<num>   verbosity level; 0=quiet, 1=normal, 2=verbose (default=%d)\n",verbosity);
+    pc_printf("         -w<num>   disable a specific warning by its number\n");
+    pc_printf("         -E        treat warnings as errors\n");
+    pc_printf("         -X<num>   abstract machine size limit in bytes\n");
+    pc_printf("         -\\        use '\\' for escape characters\n");
+    pc_printf("         -^        use '^' for escape characters\n");
+    pc_printf("         -;[+/-]   require a semicolon to end each statement (default=%c)\n", sc_needsemicolon ? '+' : '-');
+    pc_printf("         -([+/-]   require parantheses for function invocation (default=%c)\n", optproccall ? '-' : '+');
+    pc_printf("         sym=val   define constant \"sym\" with value \"val\"\n");
+    pc_printf("         sym=      define constant \"sym\" with value 0\n");
 #if defined __WIN32__ || defined _WIN32 || defined _Windows || defined __MSDOS__
     pc_printf("\nOptions may start with a dash or a slash; the options \"-d0\" and \"/d0\" are\n");
     pc_printf("equivalent.\n");
@@ -2170,53 +2227,48 @@ static cell calc_arraysize(int dim[],int numdim,int cur)
   return dim[cur]+(dim[cur]*calc_arraysize(dim,numdim,cur+1));
 }
 
-static cell adjust_indirectiontables(int dim[],int numdim,int cur,cell increment,
-                                     int startlit,constvalue *lastdim,int *skipdim)
+static void adjust_indirectiontables(int dim[],int numdim,int startlit,
+                                     constvalue *lastdim,int *skipdim)
 {
 static int base;
-  int d;
+  int cur;
+  int i,d;
   cell accum;
+  cell size;
 
-  assert(cur>=0 && cur<numdim);
-  assert(increment>=0);
-  assert(cur>0 && startlit==-1 || startlit>=0 && startlit<=litidx);
-  if (cur==0)
-    base=startlit;
-  if (cur==numdim-1)
-    return 0;
-  /* 2 or more dimensions left, fill in an indirection vector */
-  assert(dim[cur]>0);
-  if (dim[cur+1]>0) {
-    for (d=0; d<dim[cur]; d++)
-      litq[base++]=(dim[cur]+d*(dim[cur+1]-1)+increment) * sizeof(cell);
-    accum=dim[cur]*(dim[cur+1]-1);
-  } else {
-    /* final dimension is variable length */
-    constvalue *ld;
-    assert(dim[cur+1]==0);
-    assert(lastdim!=NULL);
-    assert(skipdim!=NULL);
-    accum=0;
-    /* skip the final dimension sizes for all earlier major dimensions */
-    for (d=0,ld=lastdim->next; d<*skipdim; d++,ld=ld->next) {
-      assert(ld!=NULL);
-    } /* for */
-    for (d=0; d<dim[cur]; d++) {
-      assert(ld!=NULL);
-      assert(strtol(ld->name,NULL,16)==d);
-      litq[base++]=(dim[cur]+accum+increment) * sizeof(cell);
-      accum+=ld->value-1;
-      *skipdim+=1;
-      ld=ld->next;
-    } /* for */
-  } /* if */
-  /* create the indirection tables for the lower level */
-  if (cur+2<numdim) {   /* are there at least 2 dimensions below this one? */
-    increment+=(dim[cur]-1)*dim[cur+1]; /* this many indirection tables follow */
-    for (d=0; d<dim[cur]; d++)
-      increment+=adjust_indirectiontables(dim,numdim,cur+1,increment,-1,lastdim,skipdim);
-  } /* if */
-  return accum;
+  assert(startlit==-1 || startlit>=0 && startlit<=litidx);
+  base=startlit;
+  size=1;
+  for (cur=0; cur<numdim-1; cur++) {
+    /* 2 or more dimensions left, fill in an indirection vector */
+    if (dim[cur+1]>0) {
+      for (i=0; i<size; i++)
+        for (d=0; d<dim[cur]; d++)
+          litq[base++]=(size*dim[cur]+(dim[cur+1]-1)*(dim[cur]*i+d)) * sizeof(cell);
+    } else {
+      /* final dimension is variable length */
+      constvalue *ld;
+      assert(dim[cur+1]==0);
+      assert(lastdim!=NULL);
+      assert(skipdim!=NULL);
+      accum=0;
+      for (i=0; i<size; i++) {
+        /* skip the final dimension sizes for all earlier major dimensions */
+        for (d=0,ld=lastdim->next; d<*skipdim; d++,ld=ld->next) {
+          assert(ld!=NULL);
+        } /* for */
+        for (d=0; d<dim[cur]; d++) {
+          assert(ld!=NULL);
+          assert(strtol(ld->name,NULL,16)==d);
+          litq[base++]=(size*dim[cur]+accum) * sizeof(cell);
+          accum+=ld->value-1;
+          *skipdim+=1;
+          ld=ld->next;
+        } /* for */
+      } /* for */
+    } /* if */
+    size*=dim[cur];
+  } /* for */
 }
 
 /*  initials
@@ -2274,7 +2326,7 @@ static void initials2(int ident,int tag,cell *size,int dim[],int numdim,
       for (tablesize=calc_arraysize(dim,numdim-1,0); tablesize>0; tablesize--)
         litadd(0);
       if (dim[numdim-1]!=0)     /* error 9 has already been given */
-        adjust_indirectiontables(dim,numdim,0,0,curlit,NULL,NULL);
+        adjust_indirectiontables(dim,numdim,curlit,NULL,NULL);
     } /* if */
     return;
   } /* if */
@@ -2340,7 +2392,7 @@ static void initials2(int ident,int tag,cell *size,int dim[],int numdim,
        * of the array and we can properly adjust the indirection vectors
        */
       if (err==0)
-        adjust_indirectiontables(dim,numdim,0,0,curlit,&lastdim,&skipdim);
+        adjust_indirectiontables(dim,numdim,curlit,&lastdim,&skipdim);
       delete_consttable(&lastdim);  /* clear list of minor dimension sizes */
     } /* if */
   } /* if */
@@ -5455,6 +5507,16 @@ static void doreturn(void)
           /* nothing */;
         sub=addvariable(curfunc->name,(argcount+3)*sizeof(cell),iREFARRAY,sGLOBAL,curfunc->tag,dim,numdim,idxtag);
         sub->parent=curfunc;
+        /* Function that returns array can be used before it is defined, so at
+         * the call point (if it is before definition) we may not know if this
+         * function returns array and what is its size (for example inside the
+         * conditional operator), so we don't know how many cells on the heap
+         * we need. Calculating heap consumption is required for the fix of
+         * incorrect heap deallocation on conditional operator. That's why we
+         * need an additional pass.
+         */
+        if ((curfunc->usage & uREAD)!=0)
+          sc_reparse=TRUE;
       } /* if */
       /* get the hidden parameter, copy the array (the array is on the heap;
        * it stays on the heap for the moment, and it is removed -usually- at
@@ -5727,3 +5789,137 @@ static int *readwhile(void)
     return (wqptr-wqSIZE);
   } /* if */
 }
+
+#if !defined SC_LIGHT
+static long max_stacksize_recurse(symbol** sourcesym, symbol* sym, symbol** rsourcesym, long basesize, int* pubfuncparams, int* recursion)
+{
+    long size, maxsize;
+    int i, stkpos;
+
+    assert(sourcesym != NULL);
+    assert(sym != NULL);
+    assert(sym->ident == iFUNCTN);
+    assert((sym->usage & uNATIVE) == 0);
+    assert(recursion != NULL);
+
+    maxsize = sym->x.stacksize;
+    for (i = 0; i < sym->numrefers; i++) {
+        if (sym->refer[i] != NULL) {
+            assert(sym->refer[i]->ident == iFUNCTN);
+            assert((sym->refer[i]->usage & uNATIVE) == 0); /* a native function cannot refer to a user-function */
+            *(rsourcesym) = sym;
+            *(rsourcesym + 1) = NULL;
+            for (stkpos = 0; sourcesym[stkpos] != NULL; stkpos++) {
+                if (sym->refer[i] == sourcesym[stkpos]) {   /* recursion detection */
+                    *recursion = 1;
+                    goto break_recursion;         /* recursion was detected, quit loop */
+                } /* if */
+            } /* for */
+            /* add this symbol to the stack */
+            sourcesym[stkpos] = sym;
+            sourcesym[stkpos + 1] = NULL;
+            /* check size of callee */
+            size = max_stacksize_recurse(sourcesym, sym->refer[i], rsourcesym + 1, sym->x.stacksize, pubfuncparams, recursion);
+            if (maxsize < size)
+                maxsize = size;
+            /* remove this symbol from the stack */
+            sourcesym[stkpos] = NULL;
+        } /* if */
+    } /* for */
+break_recursion:
+
+    if ((sym->usage & uPUBLIC) != 0) {
+        /* Find out how many parameters a public function has, then see if this
+         * is bigger than some maximum
+         */
+        arginfo* arg = sym->dim.arglist;
+        int count = 0;
+        assert(arg != 0);
+        while (arg->ident != 0) {
+            count++;
+            arg++;
+        } /* while */
+        assert(pubfuncparams != 0);
+        if (count > * pubfuncparams)
+            *pubfuncparams = count;
+    } /* if */
+
+    return maxsize + basesize;
+}
+
+static long max_stacksize(symbol* root, int* recursion)
+{
+    /* Loop over all non-native functions. For each function, loop
+     * over all of its referrers, accumulating the stack requirements.
+     * Detect (indirect) recursion with a "mark-and-sweep" algorithm.
+     * I (mis-)use the "compound" field of the symbol structure for
+     * the marker, as this field is unused for functions.
+     *
+     * Note that the stack is shared with the heap. A host application
+     * may "eat" cells from the heap as well, through amx_Allot(). The
+     * stack requirements are thus only an estimate.
+     */
+    long size, maxsize;
+    int maxparams, numfunctions;
+    symbol* sym;
+    symbol** symstack, ** rsymstack;
+
+    assert(root != NULL);
+    assert(recursion != NULL);
+    /* count number of functions (for allocating the stack for recursion detection) */
+    numfunctions = 0;
+    for (sym = root->next; sym != NULL; sym = sym->next) {
+        if (sym->ident == iFUNCTN) {
+            assert(sym->compound == 0);
+            if ((sym->usage & uNATIVE) == 0)
+                numfunctions++;
+        } /* if */
+    } /* if */
+    /* allocate function symbol stack */
+    symstack = (symbol**)malloc((numfunctions + 1) * sizeof(symbol*));
+    rsymstack = (symbol**)malloc((numfunctions + 1) * sizeof(symbol*));
+    if (symstack == NULL || rsymstack == NULL)
+        error(103);         /* insufficient memory (fatal error) */
+    memset(symstack, 0, (numfunctions + 1) * sizeof(symbol*));
+    memset(rsymstack, 0, (numfunctions + 1) * sizeof(symbol*));
+
+    maxsize = 0;
+    maxparams = 0;
+    *recursion = 0;         /* assume no recursion */
+    for (sym = root->next; sym != NULL; sym = sym->next) {
+        int recursion_detected;
+        /* drop out if this is not a user-implemented function */
+        if (sym->ident != iFUNCTN || (sym->usage & uNATIVE) != 0)
+            continue;
+        /* accumulate stack size for this symbol */
+        symstack[0] = sym;
+        assert(symstack[1] == NULL);
+        recursion_detected = 0;
+        size = max_stacksize_recurse(symstack, sym, rsymstack, 0L, &maxparams, &recursion_detected);
+        if (recursion_detected) {
+            if (rsymstack[1] == NULL) {
+                pc_printf("recursion detected: function %s directly calls itself\n", sym->name);
+            }
+            else {
+                int i;
+                pc_printf("recursion detected: function %s indirectly calls itself:\n", sym->name);
+                pc_printf("%s ", sym->name);
+                for (i = 1; rsymstack[i] != NULL; i++) {
+                    pc_printf("<- %s ", rsymstack[i]->name);
+                }
+                pc_printf("<- %s\n", sym->name);
+            }
+            *recursion = recursion_detected;
+        }
+        assert(size >= 0);
+        if (maxsize < size)
+            maxsize = size;
+    } /* for */
+
+    free((void*)symstack);
+    free((void*)rsymstack);
+    maxsize++;                  /* +1 because a zero cell is always pushed on top
+                                 * of the stack to catch stack overwrites */
+    return maxsize + (maxparams + 1);/* +1 because # of parameters is always pushed on entry */
+}
+#endif

compiler/libpc300/sc2.c

@@ -1190,6 +1190,8 @@ static int command(void)
             if (comma)
               lptr++;
           } while (comma);
+        } else if (strcmp(str, "showstackusageinfo")==0) {
+            sc_stkusageinfo=TRUE;
         } else {
           error(207);           /* unknown #pragma */
         } /* if */

compiler/libpc300/sc3.c

@@ -1010,38 +1010,60 @@ static int hier13(value *lval)
 {
   int lvalue=plnge1(hier12,lval);
   if (matchtoken('?')) {
+    int locheap=decl_heap;      /* save current heap delta */
+    long heap1,heap2; /* max. heap delta either branch */
+    valuepair *heaplist_node;
     int flab1=getlabel();
     int flab2=getlabel();
     value lval2 = {0};
     int array1,array2;
 
-    int orig_heap=decl_heap;
-    int diff1=0,diff2=0;
     if (lvalue) {
       rvalue(lval);
     } else if (lval->ident==iCONSTEXPR) {
       ldconst(lval->constval,sPRI);
       error(lval->constval ? 206 : 205);        /* redundant test */
     } /* if */
+    if (sc_status==statFIRST) {
+      /* We should push a new node right now otherwise we will pop it in the
+       * wrong order on the write stage.
+       */
+      heaplist_node=push_heaplist(0,0); /* save the pointer to write the actual data later */
+    } else if (sc_status==statWRITE || sc_status==statSKIP) {
+      #if !defined NDEBUG
+        int result=
+      #endif
+      popfront_heaplist(&heap1,&heap2);
+      assert(result);           /* pop off equally many items than were pushed */
+    } /* if */
     jmp_eq0(flab1);             /* go to second expression if primary register==0 */
     PUSHSTK_I(sc_allowtags);
     sc_allowtags=FALSE;         /* do not allow tagnames here (colon is a special token) */
+    if (sc_status==statWRITE) {
+      modheap(heap1*sizeof(cell));
+      decl_heap+=heap1;         /* equilibrate the heap (see comment below) */
+    } /* if */
     if (hier13(lval))
       rvalue(lval);
     if (lval->ident==iCONSTEXPR)        /* load constant here */
       ldconst(lval->constval,sPRI);
     sc_allowtags=(short)POPSTK_I();     /* restore */
+    heap1=decl_heap-locheap;    /* save heap space used in "true" branch */
+    assert(heap1>=0);
+    decl_heap=locheap; /* restore heap delta */
     jumplabel(flab2);
     setlabel(flab1);
-    if (orig_heap!=decl_heap) {
-      diff1=abs(decl_heap-orig_heap);
-      decl_heap=orig_heap;
-    }
     needtoken(':');
+    if (sc_status==statWRITE) {
+      modheap(heap2*sizeof(cell));
+      decl_heap+=heap2;         /* equilibrate the heap (see comment below) */
+    } /* if */
     if (hier13(&lval2))
       rvalue(&lval2);
     if (lval2.ident==iCONSTEXPR)        /* load constant here */
       ldconst(lval2.constval,sPRI);
+    heap2=decl_heap-locheap;    /* save heap space used in "false" branch */
+    assert(heap2>=0);
     array1= (lval->ident==iARRAY || lval->ident==iREFARRAY);
     array2= (lval2.ident==iARRAY || lval2.ident==iREFARRAY);
     if (array1 && !array2) {
@@ -1055,19 +1077,26 @@ static int hier13(value *lval)
     if (!matchtag(lval->tag,lval2.tag,FALSE))
       error(213);               /* tagname mismatch ('true' and 'false' expressions) */
     setlabel(flab2);
+    if (sc_status==statFIRST) {
+      /* Calculate the max. heap space used by either branch and save values of
+       * max - heap1 and max - heap2. On the second pass, we use these values
+       * to equilibrate the heap space used by either branch. This is needed
+       * because we don't know (at compile time) which branch will be taken,
+       * but the heap cannot be restored inside each branch because the result
+       * on the heap may needed by the remaining expression.
+       */
+      int max=(heap1>heap2) ? heap1 : heap2;
+      heaplist_node->first=max-heap1;
+      heaplist_node->second=max-heap2;
+      decl_heap=locheap+max; /* otherwise it will contain locheap+heap2 and the
+                              * max. heap usage will be wrong for the upper
+                              * expression */
+    } /* if */
+    assert(sc_status!=statWRITE || heap1==heap2);
     if (lval->ident==iARRAY)
       lval->ident=iREFARRAY;    /* iARRAY becomes iREFARRAY */
     else if (lval->ident!=iREFARRAY)
       lval->ident=iEXPRESSION;  /* iREFARRAY stays iREFARRAY, rest becomes iEXPRESSION */
-    if (orig_heap!=decl_heap) {
-      diff2=abs(decl_heap-orig_heap);
-      decl_heap=orig_heap;
-    }
-    if (diff1==diff2) {
-      decl_heap+=(diff1/2);
-    } else {
-      decl_heap+=(diff1+diff2);
-    }
     return FALSE;               /* conditional expression is no lvalue */
   } else {
     return lvalue;
@@ -2058,7 +2087,8 @@ static int nesting=0;
             error(35,argidx+1); /* argument type mismatch */
           /* Verify that the dimensions match with those in arg[argidx].
            * A literal array always has a single dimension.
-           * An iARRAYCELL parameter is also assumed to have a single dimension.
+           * An iARRAYCELL parameter is also assumed to have a single dimension,
+           * but its size may be >1 in case of an enumeration pseudo-array.
            */
           if (lval.sym==NULL || lval.ident==iARRAYCELL) {
             if (arg[argidx].numdim!=1) {
@@ -2066,7 +2096,8 @@ static int nesting=0;
             } else if (arg[argidx].dim[0]!=0) {
               assert(arg[argidx].dim[0]>0);
               if (lval.ident==iARRAYCELL) {
-                error(47);        /* array sizes must match */
+                if (lval.constval==0 || arg[argidx].dim[0]!=lval.constval)
+                  error(47);        /* array sizes must match */
               } else {
                 assert(lval.constval!=0); /* literal array must have a size */
                 /* A literal array must have exactly the same size as the

compiler/libpc300/sc6.c

@@ -70,7 +70,7 @@ static ucell hex2long(char *s,char **n)
     s++;
   } /* if */
 
-  assert((*s>='0' && *s<='9') || (*s>='a' && *s<='f') || (*s>='a' && *s<='f'));
+  assert((*s>='0' && *s<='9') || (*s>='a' && *s<='f') || (*s>='A' && *s<='F'));
   for ( ;; ) {
     if (*s>='0' && *s<='9')
       digit=*s-'0';

compiler/libpc300/sci18n.c

@@ -46,7 +46,7 @@
   #define _MAX_PATH     250
 #endif
 #if !defined DIRSEP_CHAR
-  #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE___
+  #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__
     #define DIRSEP_CHAR '/'
   #elif defined macintosh
     #define DIRSEP_CHAR ':'

compiler/libpc300/sclist.c

@@ -443,6 +443,52 @@ SC_FUNC void delete_autolisttable(void)
 }
 
 
+/* ----- value pair list ----------------------------------------- */
+static valuepair heaplist = {NULL, 0, 0};
+
+SC_FUNC valuepair *push_heaplist(long first, long second)
+{
+  valuepair *cur, *last;
+  if ((cur=malloc(sizeof(valuepair)))==NULL)
+    error(103);       /* insufficient memory (fatal error) */
+
+  cur->first=first;
+  cur->second=second;
+  cur->next=NULL;
+
+  for (last=&heaplist; last->next!=NULL; last=last->next)
+    /* nothing */;
+  last->next=cur;
+  return cur;
+}
+
+SC_FUNC int popfront_heaplist(long *first, long *second)
+{
+  valuepair *front=heaplist.next;
+  if (front==NULL)
+    return 0;
+
+  /* copy fields */
+  *first=front->first;
+  *second=front->second;
+
+  /* unlink and free */
+  heaplist.next=front->next;
+  free(front);
+  return 1;
+}
+
+SC_FUNC void delete_heaplisttable(void)
+{
+  valuepair *cur;
+  while (heaplist.next!=NULL) {
+    cur=heaplist.next;
+    heaplist.next=cur->next;
+    free(cur);
+  } /* while */
+}
+
+
 /* ----- debug information --------------------------------------- */
 
 static stringlist dbgstrings = {NULL, NULL};

compiler/libpc300/scvars.c

@@ -87,6 +87,7 @@ SC_VDEFINE int sc_allowproccall=0; /* allow/detect tagnames in lex() */
 SC_VDEFINE char *pc_deprecate = NULL;/* if non-null, mark next declaration as deprecated */
 SC_VDEFINE int sc_showincludes=0;  /* show include files */
 SC_VDEFINE int sc_warnings_are_errors=0;
+SC_VDEFINE int sc_stkusageinfo = FALSE;     /* show stack usage info? */
 
 SC_VDEFINE constvalue sc_automaton_tab = { NULL, "", 0, 0}; /* automaton table */
 SC_VDEFINE constvalue sc_state_tab = { NULL, "", 0, 0};   /* state table */

configs/amxx.cfg

@@ -37,18 +37,38 @@ amx_show_activity 2
 // Default value: "Welcome to %hostname% -- This server is using AMX Mod X" 600
 amx_scrollmsg "Welcome to %hostname% -- This server is using AMX Mod X" 600
 
-// Center typed colored messages (last parameter is a color in RRRGGGBBB format)
+// Center typed colored info messages (last parameter is a color in RRRGGGBBB format)
 //
 // Default values: "Welcome to %hostname%" "000255100"
 //                 "This server is using AMX ModX\nVisit http://www.amxmodx.org" "000100255"
 amx_imessage "Welcome to %hostname%" "000255100"
 amx_imessage "This server is using AMX Mod X\nVisit http://www.amxmodx.org" "000100255"
 
-// Frequency in seconds of colored messages
+// Frequency in seconds of info messages
 //
 // Default value: 180
 amx_freq_imessage 180
 
+// X position on the screen for info messages
+//
+// Default value: -1.0
+amx_imessage_x_pos -1.0
+
+// Y position on the screen for info messages
+//
+// Default value: 0.2
+amx_imessage_y_pos 0.2
+
+// Hold time for info messages
+//
+// Default value: 12.0
+amx_imessage_holdtime 12.0
+
+// Set to 1 if you want to show info messages only to dead clients
+//
+// Default value: 0
+amx_imessage_only_dead 0
+
 // Ban times for the main ban menu (amx_banmenu)
 // Use 0 for permanent ban.
 // Default values: 0 5 10 15 30 45 60
@@ -180,4 +200,4 @@ amx_debug 1
 // "" means disabled
 //
 // Default value: ""
-amx_mldebug ""
+amx_mldebug ""

configs/cstrike/amxx.cfg

@@ -37,18 +37,38 @@ amx_show_activity 2
 // Default value: "Welcome to %hostname% -- This server is using AMX Mod X" 600
 amx_scrollmsg "Welcome to %hostname% -- This server is using AMX Mod X" 600
 
-// Center typed colored messages (last parameter is a color in RRRGGGBBB format)
+// Center typed colored info messages (last parameter is a color in RRRGGGBBB format)
 //
 // Default values: "Welcome to %hostname%" "000255100"
 //                 "This server is using AMX ModX\nVisit http://www.amxmodx.org" "000100255"
 amx_imessage "Welcome to %hostname%" "000255100"
 amx_imessage "This server is using AMX Mod X\nVisit http://www.amxmodx.org" "000100255"
 
-// Frequency in seconds of colored messages
+// Frequency in seconds of info messages
 //
 // Default value: 180
 amx_freq_imessage 180
 
+// X position on the screen for info messages
+//
+// Default value: -1.0
+amx_imessage_x_pos -1.0
+
+// Y position on the screen for info messages
+//
+// Default value: 0.2
+amx_imessage_y_pos 0.2
+
+// Hold time for info messages
+//
+// Default value: 12.0
+amx_imessage_holdtime 12.0
+
+// Set to 1 if you want to show info messages only to dead clients
+//
+// Default value: 0
+amx_imessage_only_dead 0
+
 // Ban times for the main ban menu (amx_banmenu)
 // Use 0 for permanent ban
 // Default values: 0 5 10 15 30 45 60
@@ -220,4 +240,3 @@ amx_statsx_freeze -2.0
 // -
 // Default value: 0
 amx_restrmapsettings 0
-

configs/ns/amxx.cfg

@@ -37,18 +37,38 @@ amx_show_activity 2
 // Default value: "Welcome to %hostname% -- This server is using AMX Mod X" 600
 amx_scrollmsg "Welcome to %hostname% -- This server is using AMX Mod X" 600
 
-// Center typed colored messages (last parameter is a color in RRRGGGBBB format)
+// Center typed colored info messages (last parameter is a color in RRRGGGBBB format)
 //
 // Default values: "Welcome to %hostname%" "000255100"
 //                 "This server is using AMX ModX\nVisit http://www.amxmodx.org" "000100255"
 amx_imessage "Welcome to %hostname%" "000255100"
 amx_imessage "This server is using AMX Mod X\nVisit http://www.amxmodx.org" "000100255"
 
-// Frequency in seconds of colored messages
+// Frequency in seconds of info messages
 //
 // Default value: 180
 amx_freq_imessage 180
 
+// X position on the screen for info messages
+//
+// Default value: -1.0
+amx_imessage_x_pos -1.0
+
+// Y position on the screen for info messages
+//
+// Default value: 0.2
+amx_imessage_y_pos 0.2
+
+// Hold time for info messages
+//
+// Default value: 12.0
+amx_imessage_holdtime 12.0
+
+// Set to 1 if you want to show info messages only to dead clients
+//
+// Default value: 0
+amx_imessage_only_dead 0
+
 // Ban times for the main ban menu (amx_banmenu)
 // Use 0 for permanent ban.
 // Default values: 0 5 10 15 30 45 60
@@ -217,4 +237,4 @@ amx_idle_ignore_immunity 1
 // say /stuck to free themselves.
 //
 // Default value: 4
-amx_unstuck_frequency 4
+amx_unstuck_frequency 4

gamedata/common.games/master.games.txt

@@ -1566,7 +1566,7 @@
 	//
 	// Team Fortress Classic
 	//
-    
+
 	"entities.games/tfc/offsets-cbaseentity.txt"
 	{
 		"game"  "tfc"
@@ -3404,7 +3404,7 @@
  	//
 	// Half-Life: Deathmatch
 	//
-    
+
 	"entities.games/valve/offsets-cbaseentity.txt"
 	{
 		"game"  "valve"
@@ -4105,4 +4105,67 @@
 		"game"  "valve"
 	}
 
+
+
+	//
+	// Virtual Functions
+	//
+
+	"virtual.games/ag/offsets-common.txt"
+	{
+		"game"  "ag"
+	}
+
+	"virtual.games/cstrike/offsets-common.txt"
+	{
+		"game"  "cstrike"
+		"game"  "czero"
+	}
+
+	"virtual.games/dod/offsets-common.txt"
+	{
+		"game"  "dod"
+	}
+
+	"virtual.games/esf/offsets-common.txt"
+	{
+		"game"  "esf"
+	}
+
+	"virtual.games/esf_openbeta/offsets-common.txt"
+	{
+		"game"  "esf_openbeta"
+	}
+
+	"virtual.games/gearbox/offsets-common.txt"
+	{
+		"game"  "gearbox"
+	}
+
+	"virtual.games/ns/offsets-common.txt"
+	{
+		"game"  "ns"
+		"game"  "nsp"
+	}
+
+	"virtual.games/svencoop/offsets-common.txt"
+	{
+		"game"  "svencoop"
+	}
+
+	"virtual.games/tfc/offsets-common.txt"
+	{
+		"game"  "tfc"
+	}
+
+	"virtual.games/ts/offsets-common.txt"
+	{
+		"game"  "ts"
+	}
+
+	"virtual.games/valve/offsets-common.txt"
+	{
+		"game"  "valve"
+		"game"  "dmc"
+	}
 }

gamedata/common.games/virtual.games/ag/offsets-common.txt

@@ -0,0 +1,938 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your AMX Mod X install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after AMXX's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(AMX_Mod_X)
+ */
+
+"Games"
+{
+    "#default"
+    {
+        "Offsets"
+        {
+            "pev"
+            {
+                "windows"  "4"
+                "linux"    "0"
+            }
+
+            "base"
+            {
+                "windows"  "0x0"
+                "linux"    "0x60"
+            }
+
+            "spawn"
+            {
+                "windows"  "0"
+                "linux"    "2"
+            }
+
+            "precache"
+            {
+                "windows"  "1"
+                "linux"    "3"
+            }
+
+            "keyvalue"
+            {
+                "windows"  "2"
+                "linux"    "4"
+            }
+
+            "objectcaps"
+            {
+                "windows"  "5"
+                "linux"    "7"
+            }
+
+            "activate"
+            {
+                "windows"  "6"
+                "linux"    "8"
+            }
+
+            "setobjectcollisionbox"
+            {
+                "windows"  "7"
+                "linux"    "9"
+            }
+
+            "classify"
+            {
+                "windows"  "8"
+                "linux"    "10"
+            }
+
+            "deathnotice"
+            {
+                "windows"  "9"
+                "linux"    "11"
+            }
+
+            "traceattack"
+            {
+                "windows"  "10"
+                "linux"    "12"
+            }
+
+            "takedamage"
+            {
+                "windows"  "11"
+                "linux"    "13"
+            }
+
+            "takehealth"
+            {
+                "windows"  "12"
+                "linux"    "14"
+            }
+
+            "killed"
+            {
+                "windows"  "13"
+                "linux"    "15"
+            }
+
+            "bloodcolor"
+            {
+                "windows"  "14"
+                "linux"    "16"
+            }
+
+            "tracebleed"
+            {
+                "windows"  "15"
+                "linux"    "17"
+            }
+
+            "istriggered"
+            {
+                "windows"  "16"
+                "linux"    "18"
+            }
+
+            "mymonsterpointer"
+            {
+                "windows"  "17"
+                "linux"    "19"
+            }
+
+            "mysquadmonsterpointer"
+            {
+                "windows"  "18"
+                "linux"    "20"
+            }
+
+            "gettogglestate"
+            {
+                "windows"  "19"
+                "linux"    "21"
+            }
+
+            "addpoints"
+            {
+                "windows"  "20"
+                "linux"    "22"
+            }
+
+            "addpointstoteam"
+            {
+                "windows"  "21"
+                "linux"    "23"
+            }
+
+            "addplayeritem"
+            {
+                "windows"  "22"
+                "linux"    "24"
+            }
+
+            "removeplayeritem"
+            {
+                "windows"  "23"
+                "linux"    "25"
+            }
+
+            "giveammo"
+            {
+                "windows"  "24"
+                "linux"    "26"
+            }
+
+            "getdelay"
+            {
+                "windows"  "25"
+                "linux"    "27"
+            }
+
+            "ismoving"
+            {
+                "windows"  "26"
+                "linux"    "28"
+            }
+
+            "overridereset"
+            {
+                "windows"  "27"
+                "linux"    "29"
+            }
+
+            "damagedecal"
+            {
+                "windows"  "28"
+                "linux"    "30"
+            }
+
+            "settogglestate"
+            {
+                "windows"  "29"
+                "linux"    "31"
+            }
+
+            "startsneaking"
+            {
+                "windows"  "30"
+                "linux"    "32"
+            }
+
+            "stopsneaking"
+            {
+                "windows"  "31"
+                "linux"    "33"
+            }
+
+            "oncontrols"
+            {
+                "windows"  "32"
+                "linux"    "34"
+            }
+
+            "issneaking"
+            {
+                "windows"  "33"
+                "linux"    "35"
+            }
+
+            "isalive"
+            {
+                "windows"  "34"
+                "linux"    "36"
+            }
+
+            "isbspmodel"
+            {
+                "windows"  "35"
+                "linux"    "37"
+            }
+
+            "reflectgauss"
+            {
+                "windows"  "36"
+                "linux"    "38"
+            }
+
+            "hastarget"
+            {
+                "windows"  "37"
+                "linux"    "39"
+            }
+
+            "isinworld"
+            {
+                "windows"  "38"
+                "linux"    "40"
+            }
+
+            "isplayer"
+            {
+                "windows"  "39"
+                "linux"    "41"
+            }
+
+            "isnetclient"
+            {
+                "windows"  "40"
+                "linux"    "42"
+            }
+
+            "teamid"
+            {
+                "windows"  "41"
+                "linux"    "43"
+            }
+
+            "getnexttarget"
+            {
+                "windows"  "42"
+                "linux"    "44"
+            }
+
+            "think"
+            {
+                "windows"  "43"
+                "linux"    "45"
+            }
+
+            "touch"
+            {
+                "windows"  "44"
+                "linux"    "46"
+            }
+
+            "use"
+            {
+                "windows"  "45"
+                "linux"    "47"
+            }
+
+            "blocked"
+            {
+                "windows"  "46"
+                "linux"    "48"
+            }
+
+            "respawn"
+            {
+                "windows"  "48"
+                "linux"    "50"
+            }
+
+            "updateowner"
+            {
+                "windows"  "49"
+                "linux"    "51"
+            }
+
+            "fbecomeprone"
+            {
+                "windows"  "50"
+                "linux"    "52"
+            }
+
+            "center"
+            {
+                "windows"  "51"
+                "linux"    "53"
+            }
+
+            "eyeposition"
+            {
+                "windows"  "52"
+                "linux"    "54"
+            }
+
+            "earposition"
+            {
+                "windows"  "53"
+                "linux"    "55"
+            }
+
+            "bodytarget"
+            {
+                "windows"  "54"
+                "linux"    "56"
+            }
+
+            "illumination"
+            {
+                "windows"  "55"
+                "linux"    "57"
+            }
+
+            "fvisible"
+            {
+                "windows"  "56"
+                "linux"    "58"
+            }
+
+            "fvecvisible"
+            {
+                "windows"  "57"
+                "linux"    "59"
+            }
+
+            "look"
+            {
+                "windows"  "60"
+                "linux"    "62"
+            }
+
+            "changeyaw"
+            {
+                "windows"  "63"
+                "linux"    "65"
+            }
+
+            "irelationship"
+            {
+                "windows"  "65"
+                "linux"    "67"
+            }
+
+            "monsterinitdead"
+            {
+                "windows"  "67"
+                "linux"    "69"
+            }
+
+            "becomedead"
+            {
+                "windows"  "68"
+                "linux"    "70"
+            }
+
+            "bestvisibleenemy"
+            {
+                "windows"  "70"
+                "linux"    "72"
+            }
+
+            "finviewcone"
+            {
+                "windows"  "71"
+                "linux"    "73"
+            }
+
+            "fvecinviewcone"
+            {
+                "windows"  "72"
+                "linux"    "74"
+            }
+
+            "runai"
+            {
+                "windows"  "61"
+                "linux"    "63"
+            }
+
+            "monsterthink"
+            {
+                "windows"  "64"
+                "linux"    "66"
+            }
+
+            "monsterinit"
+            {
+                "windows"  "66"
+                "linux"    "68"
+            }
+
+            "checklocalmove"
+            {
+                "windows"  "73"
+                "linux"    "75"
+            }
+
+            "move"
+            {
+                "windows"  "74"
+                "linux"    "76"
+            }
+
+            "moveexecute"
+            {
+                "windows"  "75"
+                "linux"    "77"
+            }
+
+            "shouldadvanceroute"
+            {
+                "windows"  "76"
+                "linux"    "78"
+            }
+
+            "getstoppedactivity"
+            {
+                "windows"  "77"
+                "linux"    "79"
+            }
+
+            "stop"
+            {
+                "windows"  "78"
+                "linux"    "80"
+            }
+
+            "checkrangeattack1"
+            {
+                "windows"  "79"
+                "linux"    "81"
+            }
+
+            "checkrangeattack2"
+            {
+                "windows"  "80"
+                "linux"    "82"
+            }
+
+            "checkmeleeattack1"
+            {
+                "windows"  "81"
+                "linux"    "83"
+            }
+
+            "checkmeleeattack2"
+            {
+                "windows"  "82"
+                "linux"    "84"
+            }
+
+            "schedulechange"
+            {
+                "windows"  "88"
+                "linux"    "90"
+            }
+
+            "canplaysequence"
+            {
+                "windows"  "89"
+                "linux"    "91"
+            }
+
+            "canplaysentence"
+            {
+                "windows"  "90"
+                "linux"    "92"
+            }
+
+            "playsentence"
+            {
+                "windows"  "91"
+                "linux"    "93"
+            }
+
+            "playscriptedsentence"
+            {
+                "windows"  "92"
+                "linux"    "94"
+            }
+
+            "sentencestop"
+            {
+                "windows"  "93"
+                "linux"    "95"
+            }
+
+            "getidealstate"
+            {
+                "windows"  "94"
+                "linux"    "96"
+            }
+
+            "setactivity"
+            {
+                "windows"  "95"
+                "linux"    "97"
+            }
+
+            "reportaistate"
+            {
+                "windows"  "96"
+                "linux"    "98"
+            }
+
+            "checkenemy"
+            {
+                "windows"  "97"
+                "linux"    "99"
+            }
+
+            "ftriangulate"
+            {
+                "windows"  "98"
+                "linux"    "100"
+            }
+
+            "setyawspeed"
+            {
+                "windows"  "99"
+                "linux"    "101"
+            }
+
+            "buildnearestroute"
+            {
+                "windows"  "100"
+                "linux"    "102"
+            }
+
+            "findcover"
+            {
+                "windows"  "101"
+                "linux"    "103"
+            }
+
+            "coverradius"
+            {
+                "windows"  "103"
+                "linux"    "105"
+            }
+
+            "fcancheckattacks"
+            {
+                "windows"  "104"
+                "linux"    "106"
+            }
+
+            "checkammo"
+            {
+                "windows"  "105"
+                "linux"    "107"
+            }
+
+            "ignoreconditions"
+            {
+                "windows"  "106"
+                "linux"    "108"
+            }
+
+            "fvalidatehinttype"
+            {
+                "windows"  "107"
+                "linux"    "109"
+            }
+
+            "fcanactiveidle"
+            {
+                "windows"  "108"
+                "linux"    "110"
+            }
+
+            "isoundmask"
+            {
+                "windows"  "109"
+                "linux"    "111"
+            }
+
+            "hearingsensitivity"
+            {
+                "windows"  "112"
+                "linux"    "114"
+            }
+
+            "barnaclevictimbitten"
+            {
+                "windows"  "113"
+                "linux"    "115"
+            }
+
+            "barnaclevictimreleased"
+            {
+                "windows"  "114"
+                "linux"    "116"
+            }
+
+            "preschedulethink"
+            {
+                "windows"  "115"
+                "linux"    "117"
+            }
+
+            "getdeathactivity"
+            {
+                "windows"  "116"
+                "linux"    "118"
+            }
+
+            "gibmonster"
+            {
+                "windows"  "117"
+                "linux"    "119"
+            }
+
+            "hashumangibs"
+            {
+                "windows"  "118"
+                "linux"    "120"
+            }
+
+            "hasaliengibs"
+            {
+                "windows"  "119"
+                "linux"    "121"
+            }
+
+            "fademonster"
+            {
+                "windows"  "120"
+                "linux"    "122"
+            }
+
+            "deathsound"
+            {
+                "windows"  "122"
+                "linux"    "124"
+            }
+
+            "alertsound"
+            {
+                "windows"  "123"
+                "linux"    "125"
+            }
+
+            "idlesound"
+            {
+                "windows"  "124"
+                "linux"    "126"
+            }
+
+            "painsound"
+            {
+                "windows"  "125"
+                "linux"    "127"
+            }
+
+            "stopfollowing"
+            {
+                "windows"  "126"
+                "linux"    "128"
+            }
+
+            "player_jump"
+            {
+                "windows"  "127"
+                "linux"    "129"
+            }
+
+            "player_duck"
+            {
+                "windows"  "128"
+                "linux"    "130"
+            }
+
+            "player_prethink"
+            {
+                "windows"  "129"
+                "linux"    "131"
+            }
+
+            "player_postthink"
+            {
+                "windows"  "130"
+                "linux"    "132"
+            }
+
+            "player_getgunposition"
+            {
+                "windows"  "121"
+                "linux"    "123"
+            }
+
+            "player_shouldfadeondeath"
+            {
+                "windows"  "62"
+                "linux"    "64"
+            }
+
+            "player_impulsecommands"
+            {
+                "windows"  "132"
+                "linux"    "134"
+            }
+
+            "player_updateclientdata"
+            {
+                "windows"  "131"
+                "linux"    "133"
+            }
+
+            "item_addtoplayer"
+            {
+                "windows"  "59"
+                "linux"    "61"
+            }
+
+            "item_addduplicate"
+            {
+                "windows"  "60"
+                "linux"    "62"
+            }
+
+            "item_getiteminfo"
+            {
+                "windows"  "61"
+                "linux"    "63"
+            }
+
+            "item_candeploy"
+            {
+                "windows"  "62"
+                "linux"    "64"
+            }
+
+            "item_deploy"
+            {
+                "windows"  "63"
+                "linux"    "65"
+            }
+
+            "item_canholster"
+            {
+                "windows"  "64"
+                "linux"    "66"
+            }
+
+            "item_holster"
+            {
+                "windows"  "65"
+                "linux"    "67"
+            }
+
+            "item_updateiteminfo"
+            {
+                "windows"  "66"
+                "linux"    "68"
+            }
+
+            "item_preframe"
+            {
+                "windows"  "67"
+                "linux"    "69"
+            }
+
+            "item_postframe"
+            {
+                "windows"  "68"
+                "linux"    "70"
+            }
+
+            "item_drop"
+            {
+                "windows"  "69"
+                "linux"    "71"
+            }
+
+            "item_kill"
+            {
+                "windows"  "70"
+                "linux"    "72"
+            }
+
+            "item_attachtoplayer"
+            {
+                "windows"  "71"
+                "linux"    "73"
+            }
+
+            "item_primaryammoindex"
+            {
+                "windows"  "72"
+                "linux"    "74"
+            }
+
+            "item_secondaryammoindex"
+            {
+                "windows"  "73"
+                "linux"    "75"
+            }
+
+            "item_updateclientdata"
+            {
+                "windows"  "74"
+                "linux"    "76"
+            }
+
+            "item_getweaponptr"
+            {
+                "windows"  "75"
+                "linux"    "77"
+            }
+
+            "item_itemslot"
+            {
+                "windows"  "76"
+                "linux"    "78"
+            }
+
+            "weapon_extractammo"
+            {
+                "windows"  "77"
+                "linux"    "79"
+            }
+
+            "weapon_extractclipammo"
+            {
+                "windows"  "78"
+                "linux"    "80"
+            }
+
+            "weapon_addweapon"
+            {
+                "windows"  "79"
+                "linux"    "81"
+            }
+
+            "weapon_playemptysound"
+            {
+                "windows"  "80"
+                "linux"    "82"
+            }
+
+            "weapon_resetemptysound"
+            {
+                "windows"  "81"
+                "linux"    "83"
+            }
+
+            "weapon_sendweaponanim"
+            {
+                "windows"  "82"
+                "linux"    "84"
+            }
+
+            "weapon_isusable"
+            {
+                "windows"  "83"
+                "linux"    "85"
+            }
+
+            "weapon_primaryattack"
+            {
+                "windows"  "84"
+                "linux"    "86"
+            }
+
+            "weapon_secondaryattack"
+            {
+                "windows"  "85"
+                "linux"    "87"
+            }
+
+            "weapon_reload"
+            {
+                "windows"  "86"
+                "linux"    "88"
+            }
+
+            "weapon_weaponidle"
+            {
+                "windows"  "87"
+                "linux"    "89"
+            }
+
+            "weapon_retireweapon"
+            {
+                "windows"  "88"
+                "linux"    "90"
+            }
+
+            "weapon_shouldweaponidle"
+            {
+                "windows"  "89"
+                "linux"    "91"
+            }
+
+            "weapon_usedecrement"
+            {
+                "windows"  "90"
+                "linux"    "92"
+            }
+
+        }
+    }
+}

gamedata/common.games/virtual.games/cstrike/offsets-common.txt

@@ -0,0 +1,874 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your AMX Mod X install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after AMXX's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(AMX_Mod_X)
+ */
+
+"Games"
+{
+    "#default"
+    {
+        "Offsets"
+        {
+            "pev"
+            {
+                "windows"  "4"
+                "linux"    "4"
+                "mac"      "4"
+            }
+
+            "base"
+            {
+                "windows"  "0x0"
+                "linux"    "0x0"
+                "mac"      "0x0"
+            }
+
+            "spawn"
+            {
+                "windows"  "0"
+                "linux"    "0"
+                "mac"      "0"
+            }
+
+            "precache"
+            {
+                "windows"  "1"
+                "linux"    "1"
+                "mac"      "1"
+            }
+
+            "keyvalue"
+            {
+                "windows"  "3"
+                "linux"    "3"
+                "mac"      "3"
+            }
+
+            "objectcaps"
+            {
+                "windows"  "6"
+                "linux"    "6"
+                "mac"      "6"
+            }
+
+            "activate"
+            {
+                "windows"  "7"
+                "linux"    "7"
+                "mac"      "7"
+            }
+
+            "setobjectcollisionbox"
+            {
+                "windows"  "8"
+                "linux"    "8"
+                "mac"      "8"
+            }
+
+            "classify"
+            {
+                "windows"  "9"
+                "linux"    "9"
+                "mac"      "9"
+            }
+
+            "deathnotice"
+            {
+                "windows"  "10"
+                "linux"    "10"
+                "mac"      "10"
+            }
+
+            "traceattack"
+            {
+                "windows"  "11"
+                "linux"    "11"
+                "mac"      "11"
+            }
+
+            "takedamage"
+            {
+                "windows"  "12"
+                "linux"    "12"
+                "mac"      "12"
+            }
+
+            "takehealth"
+            {
+                "windows"  "13"
+                "linux"    "13"
+                "mac"      "13"
+            }
+
+            "killed"
+            {
+                "windows"  "14"
+                "linux"    "14"
+                "mac"      "14"
+            }
+
+            "bloodcolor"
+            {
+                "windows"  "15"
+                "linux"    "15"
+                "mac"      "15"
+            }
+
+            "tracebleed"
+            {
+                "windows"  "16"
+                "linux"    "16"
+                "mac"      "16"
+            }
+
+            "istriggered"
+            {
+                "windows"  "17"
+                "linux"    "17"
+                "mac"      "17"
+            }
+
+            "mymonsterpointer"
+            {
+                "windows"  "18"
+                "linux"    "18"
+                "mac"      "18"
+            }
+
+            "mysquadmonsterpointer"
+            {
+                "windows"  "19"
+                "linux"    "19"
+                "mac"      "19"
+            }
+
+            "gettogglestate"
+            {
+                "windows"  "20"
+                "linux"    "20"
+                "mac"      "20"
+            }
+
+            "addpoints"
+            {
+                "windows"  "21"
+                "linux"    "21"
+                "mac"      "21"
+            }
+
+            "addpointstoteam"
+            {
+                "windows"  "22"
+                "linux"    "22"
+                "mac"      "22"
+            }
+
+            "addplayeritem"
+            {
+                "windows"  "23"
+                "linux"    "23"
+                "mac"      "23"
+            }
+
+            "removeplayeritem"
+            {
+                "windows"  "24"
+                "linux"    "24"
+                "mac"      "24"
+            }
+
+            "giveammo"
+            {
+                "windows"  "25"
+                "linux"    "25"
+                "mac"      "25"
+            }
+
+            "getdelay"
+            {
+                "windows"  "26"
+                "linux"    "26"
+                "mac"      "26"
+            }
+
+            "ismoving"
+            {
+                "windows"  "27"
+                "linux"    "27"
+                "mac"      "27"
+            }
+
+            "overridereset"
+            {
+                "windows"  "28"
+                "linux"    "28"
+                "mac"      "28"
+            }
+
+            "damagedecal"
+            {
+                "windows"  "29"
+                "linux"    "29"
+                "mac"      "29"
+            }
+
+            "settogglestate"
+            {
+                "windows"  "30"
+                "linux"    "30"
+                "mac"      "30"
+            }
+
+            "startsneaking"
+            {
+                "windows"  "31"
+                "linux"    "31"
+                "mac"      "31"
+            }
+
+            "stopsneaking"
+            {
+                "windows"  "32"
+                "linux"    "32"
+                "mac"      "32"
+            }
+
+            "oncontrols"
+            {
+                "windows"  "33"
+                "linux"    "33"
+                "mac"      "33"
+            }
+
+            "issneaking"
+            {
+                "windows"  "34"
+                "linux"    "34"
+                "mac"      "34"
+            }
+
+            "isalive"
+            {
+                "windows"  "35"
+                "linux"    "35"
+                "mac"      "35"
+            }
+
+            "isbspmodel"
+            {
+                "windows"  "36"
+                "linux"    "36"
+                "mac"      "36"
+            }
+
+            "reflectgauss"
+            {
+                "windows"  "37"
+                "linux"    "37"
+                "mac"      "37"
+            }
+
+            "hastarget"
+            {
+                "windows"  "38"
+                "linux"    "38"
+                "mac"      "38"
+            }
+
+            "isinworld"
+            {
+                "windows"  "39"
+                "linux"    "39"
+                "mac"      "39"
+            }
+
+            "isplayer"
+            {
+                "windows"  "40"
+                "linux"    "40"
+                "mac"      "40"
+            }
+
+            "isnetclient"
+            {
+                "windows"  "41"
+                "linux"    "41"
+                "mac"      "41"
+            }
+
+            "teamid"
+            {
+                "windows"  "42"
+                "linux"    "42"
+                "mac"      "42"
+            }
+
+            "getnexttarget"
+            {
+                "windows"  "43"
+                "linux"    "43"
+                "mac"      "43"
+            }
+
+            "think"
+            {
+                "windows"  "44"
+                "linux"    "44"
+                "mac"      "44"
+            }
+
+            "touch"
+            {
+                "windows"  "45"
+                "linux"    "45"
+                "mac"      "45"
+            }
+
+            "use"
+            {
+                "windows"  "46"
+                "linux"    "46"
+                "mac"      "46"
+            }
+
+            "blocked"
+            {
+                "windows"  "47"
+                "linux"    "47"
+                "mac"      "47"
+            }
+
+            "respawn"
+            {
+                "windows"  "48"
+                "linux"    "48"
+                "mac"      "48"
+            }
+
+            "updateowner"
+            {
+                "windows"  "49"
+                "linux"    "49"
+                "mac"      "49"
+            }
+
+            "fbecomeprone"
+            {
+                "windows"  "50"
+                "linux"    "50"
+                "mac"      "50"
+            }
+
+            "center"
+            {
+                "windows"  "51"
+                "linux"    "51"
+                "mac"      "51"
+            }
+
+            "eyeposition"
+            {
+                "windows"  "52"
+                "linux"    "52"
+                "mac"      "52"
+            }
+
+            "earposition"
+            {
+                "windows"  "53"
+                "linux"    "53"
+                "mac"      "53"
+            }
+
+            "bodytarget"
+            {
+                "windows"  "54"
+                "linux"    "54"
+                "mac"      "54"
+            }
+
+            "illumination"
+            {
+                "windows"  "55"
+                "linux"    "55"
+                "mac"      "55"
+            }
+
+            "fvisible"
+            {
+                "windows"  "56"
+                "linux"    "56"
+                "mac"      "56"
+            }
+
+            "fvecvisible"
+            {
+                "windows"  "57"
+                "linux"    "57"
+                "mac"      "57"
+            }
+
+            "changeyaw"
+            {
+                "windows"  "59"
+                "linux"    "59"
+                "mac"      "59"
+            }
+
+            "hashumangibs"
+            {
+                "windows"  "60"
+                "linux"    "60"
+                "mac"      "60"
+            }
+
+            "hasaliengibs"
+            {
+                "windows"  "61"
+                "linux"    "61"
+                "mac"      "61"
+            }
+
+            "fademonster"
+            {
+                "windows"  "62"
+                "linux"    "62"
+                "mac"      "62"
+            }
+
+            "gibmonster"
+            {
+                "windows"  "63"
+                "linux"    "63"
+                "mac"      "63"
+            }
+
+            "getdeathactivity"
+            {
+                "windows"  "64"
+                "linux"    "64"
+                "mac"      "64"
+            }
+
+            "becomedead"
+            {
+                "windows"  "65"
+                "linux"    "65"
+                "mac"      "65"
+            }
+
+            "irelationship"
+            {
+                "windows"  "67"
+                "linux"    "67"
+                "mac"      "67"
+            }
+
+            "painsound"
+            {
+                "windows"  "68"
+                "linux"    "68"
+                "mac"      "68"
+            }
+
+            "reportaistate"
+            {
+                "windows"  "70"
+                "linux"    "70"
+                "mac"      "70"
+            }
+
+            "monsterinitdead"
+            {
+                "windows"  "71"
+                "linux"    "71"
+                "mac"      "71"
+            }
+
+            "look"
+            {
+                "windows"  "72"
+                "linux"    "72"
+                "mac"      "72"
+            }
+
+            "bestvisibleenemy"
+            {
+                "windows"  "73"
+                "linux"    "73"
+                "mac"      "73"
+            }
+
+            "finviewcone"
+            {
+                "windows"  "75"
+                "linux"    "74"
+                "mac"      "74"
+            }
+
+            "fvecinviewcone"
+            {
+                "windows"  "74"
+                "linux"    "75"
+                "mac"      "75"
+            }
+
+            "player_jump"
+            {
+                "windows"  "76"
+                "linux"    "76"
+                "mac"      "76"
+            }
+
+            "player_duck"
+            {
+                "windows"  "77"
+                "linux"    "77"
+                "mac"      "77"
+            }
+
+            "player_prethink"
+            {
+                "windows"  "78"
+                "linux"    "78"
+                "mac"      "78"
+            }
+
+            "player_postthink"
+            {
+                "windows"  "79"
+                "linux"    "79"
+                "mac"      "79"
+            }
+
+            "player_getgunposition"
+            {
+                "windows"  "80"
+                "linux"    "80"
+                "mac"      "80"
+            }
+
+            "player_shouldfadeondeath"
+            {
+                "windows"  "66"
+                "linux"    "66"
+                "mac"      "66"
+            }
+
+            "player_impulsecommands"
+            {
+                "windows"  "83"
+                "linux"    "83"
+                "mac"      "83"
+            }
+
+            "player_updateclientdata"
+            {
+                "windows"  "82"
+                "linux"    "82"
+                "mac"      "82"
+            }
+
+            "item_addtoplayer"
+            {
+                "windows"  "59"
+                "linux"    "59"
+                "mac"      "59"
+            }
+
+            "item_addduplicate"
+            {
+                "windows"  "60"
+                "linux"    "60"
+                "mac"      "60"
+            }
+
+            "item_getiteminfo"
+            {
+                "windows"  "61"
+                "linux"    "61"
+                "mac"      "61"
+            }
+
+            "item_candeploy"
+            {
+                "windows"  "62"
+                "linux"    "62"
+                "mac"      "62"
+            }
+
+            "item_deploy"
+            {
+                "windows"  "64"
+                "linux"    "64"
+                "mac"      "64"
+            }
+
+            "item_canholster"
+            {
+                "windows"  "66"
+                "linux"    "66"
+                "mac"      "66"
+            }
+
+            "item_holster"
+            {
+                "windows"  "67"
+                "linux"    "67"
+                "mac"      "67"
+            }
+
+            "item_updateiteminfo"
+            {
+                "windows"  "68"
+                "linux"    "68"
+                "mac"      "68"
+            }
+
+            "item_preframe"
+            {
+                "windows"  "69"
+                "linux"    "69"
+                "mac"      "69"
+            }
+
+            "item_postframe"
+            {
+                "windows"  "70"
+                "linux"    "70"
+                "mac"      "70"
+            }
+
+            "item_drop"
+            {
+                "windows"  "71"
+                "linux"    "71"
+                "mac"      "71"
+            }
+
+            "item_kill"
+            {
+                "windows"  "72"
+                "linux"    "72"
+                "mac"      "72"
+            }
+
+            "item_attachtoplayer"
+            {
+                "windows"  "73"
+                "linux"    "73"
+                "mac"      "73"
+            }
+
+            "item_primaryammoindex"
+            {
+                "windows"  "74"
+                "linux"    "74"
+                "mac"      "74"
+            }
+
+            "item_secondaryammoindex"
+            {
+                "windows"  "75"
+                "linux"    "75"
+                "mac"      "75"
+            }
+
+            "item_updateclientdata"
+            {
+                "windows"  "76"
+                "linux"    "76"
+                "mac"      "76"
+            }
+
+            "item_getweaponptr"
+            {
+                "windows"  "77"
+                "linux"    "77"
+                "mac"      "77"
+            }
+
+            "item_itemslot"
+            {
+                "windows"  "79"
+                "linux"    "79"
+                "mac"      "79"
+            }
+
+            "weapon_extractammo"
+            {
+                "windows"  "80"
+                "linux"    "80"
+                "mac"      "80"
+            }
+
+            "weapon_extractclipammo"
+            {
+                "windows"  "81"
+                "linux"    "81"
+                "mac"      "81"
+            }
+
+            "weapon_addweapon"
+            {
+                "windows"  "82"
+                "linux"    "82"
+                "mac"      "82"
+            }
+
+            "weapon_playemptysound"
+            {
+                "windows"  "83"
+                "linux"    "83"
+                "mac"      "83"
+            }
+
+            "weapon_resetemptysound"
+            {
+                "windows"  "84"
+                "linux"    "84"
+                "mac"      "84"
+            }
+
+            "weapon_isusable"
+            {
+                "windows"  "86"
+                "linux"    "86"
+                "mac"      "86"
+            }
+
+            "weapon_primaryattack"
+            {
+                "windows"  "87"
+                "linux"    "87"
+                "mac"      "87"
+            }
+
+            "weapon_secondaryattack"
+            {
+                "windows"  "88"
+                "linux"    "88"
+                "mac"      "88"
+            }
+
+            "weapon_reload"
+            {
+                "windows"  "89"
+                "linux"    "89"
+                "mac"      "89"
+            }
+
+            "weapon_weaponidle"
+            {
+                "windows"  "90"
+                "linux"    "90"
+                "mac"      "90"
+            }
+
+            "weapon_retireweapon"
+            {
+                "windows"  "91"
+                "linux"    "91"
+                "mac"      "91"
+            }
+
+            "weapon_shouldweaponidle"
+            {
+                "windows"  "92"
+                "linux"    "92"
+                "mac"      "92"
+            }
+
+            "weapon_usedecrement"
+            {
+                "windows"  "93"
+                "linux"    "93"
+                "mac"      "93"
+            }
+
+            "cstrike_restart"
+            {
+                "windows"  "2"
+                "linux"    "2"
+                "mac"      "2"
+            }
+
+            "cstrike_roundrespawn"
+            {
+                "windows"  "84"
+                "linux"    "84"
+                "mac"      "84"
+            }
+
+            "cstrike_item_candrop"
+            {
+                "windows"  "63"
+                "linux"    "63"
+                "mac"      "63"
+            }
+
+            "cstrike_item_isweapon"
+            {
+                "windows"  "65"
+                "linux"    "65"
+                "mac"      "65"
+            }
+
+            "cstrike_item_getmaxspeed"
+            {
+                "windows"  "78"
+                "linux"    "78"
+                "mac"      "78"
+            }
+
+            "cstrike_weapon_sendweaponanim"
+            {
+                "windows"  "85"
+                "linux"    "85"
+                "mac"      "85"
+            }
+
+            "cstrike_player_resetmaxspeed"
+            {
+                "windows"  "69"
+                "linux"    "69"
+                "mac"      "69"
+            }
+
+            "cstrike_player_isbot"
+            {
+                "windows"  "81"
+                "linux"    "81"
+                "mac"      "81"
+            }
+
+            "cstrike_player_getautoaimvector"
+            {
+                "windows"  "85"
+                "linux"    "85"
+                "mac"      "85"
+            }
+
+            "cstrike_player_blind"
+            {
+                "windows"  "86"
+                "linux"    "86"
+                "mac"      "86"
+            }
+
+            "cstrike_player_ontouchingweapon"
+            {
+                "windows"  "87"
+                "linux"    "87"
+                "mac"      "87"
+            }
+
+        }
+    }
+}

gamedata/common.games/virtual.games/esf/offsets-common.txt

@@ -0,0 +1,902 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your AMX Mod X install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after AMXX's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(AMX_Mod_X)
+ */
+
+"Games"
+{
+    "#default"
+    {
+        "Offsets"
+        {
+            "pev"
+            {
+                "windows"  "4"
+                "linux"    "0"
+            }
+
+            "base"
+            {
+                "windows"  "0x0"
+                "linux"    "0x60"
+            }
+
+            "spawn"
+            {
+                "windows"  "0"
+                "linux"    "2"
+            }
+
+            "precache"
+            {
+                "windows"  "1"
+                "linux"    "3"
+            }
+
+            "keyvalue"
+            {
+                "windows"  "2"
+                "linux"    "4"
+            }
+
+            "objectcaps"
+            {
+                "windows"  "5"
+                "linux"    "7"
+            }
+
+            "activate"
+            {
+                "windows"  "6"
+                "linux"    "8"
+            }
+
+            "setobjectcollisionbox"
+            {
+                "windows"  "7"
+                "linux"    "9"
+            }
+
+            "classify"
+            {
+                "windows"  "8"
+                "linux"    "10"
+            }
+
+            "deathnotice"
+            {
+                "windows"  "9"
+                "linux"    "11"
+            }
+
+            "traceattack"
+            {
+                "windows"  "10"
+                "linux"    "12"
+            }
+
+            "takedamage"
+            {
+                "windows"  "11"
+                "linux"    "13"
+            }
+
+            "takehealth"
+            {
+                "windows"  "12"
+                "linux"    "14"
+            }
+
+            "killed"
+            {
+                "windows"  "13"
+                "linux"    "15"
+            }
+
+            "bloodcolor"
+            {
+                "windows"  "14"
+                "linux"    "16"
+            }
+
+            "tracebleed"
+            {
+                "windows"  "15"
+                "linux"    "17"
+            }
+
+            "istriggered"
+            {
+                "windows"  "16"
+                "linux"    "18"
+            }
+
+            "mymonsterpointer"
+            {
+                "windows"  "17"
+                "linux"    "19"
+            }
+
+            "mysquadmonsterpointer"
+            {
+                "windows"  "18"
+                "linux"    "20"
+            }
+
+            "gettogglestate"
+            {
+                "windows"  "19"
+                "linux"    "21"
+            }
+
+            "addpoints"
+            {
+                "windows"  "20"
+                "linux"    "22"
+            }
+
+            "addpointstoteam"
+            {
+                "windows"  "21"
+                "linux"    "23"
+            }
+
+            "addplayeritem"
+            {
+                "windows"  "22"
+                "linux"    "24"
+            }
+
+            "removeplayeritem"
+            {
+                "windows"  "23"
+                "linux"    "25"
+            }
+
+            "getdelay"
+            {
+                "windows"  "24"
+                "linux"    "26"
+            }
+
+            "ismoving"
+            {
+                "windows"  "25"
+                "linux"    "27"
+            }
+
+            "overridereset"
+            {
+                "windows"  "26"
+                "linux"    "28"
+            }
+
+            "damagedecal"
+            {
+                "windows"  "27"
+                "linux"    "29"
+            }
+
+            "settogglestate"
+            {
+                "windows"  "28"
+                "linux"    "30"
+            }
+
+            "startsneaking"
+            {
+                "windows"  "29"
+                "linux"    "31"
+            }
+
+            "stopsneaking"
+            {
+                "windows"  "30"
+                "linux"    "32"
+            }
+
+            "oncontrols"
+            {
+                "windows"  "31"
+                "linux"    "33"
+            }
+
+            "issneaking"
+            {
+                "windows"  "32"
+                "linux"    "34"
+            }
+
+            "isalive"
+            {
+                "windows"  "33"
+                "linux"    "35"
+            }
+
+            "isbspmodel"
+            {
+                "windows"  "34"
+                "linux"    "36"
+            }
+
+            "reflectgauss"
+            {
+                "windows"  "35"
+                "linux"    "37"
+            }
+
+            "hastarget"
+            {
+                "windows"  "36"
+                "linux"    "38"
+            }
+
+            "isinworld"
+            {
+                "windows"  "37"
+                "linux"    "39"
+            }
+
+            "isplayer"
+            {
+                "windows"  "38"
+                "linux"    "40"
+            }
+
+            "isnetclient"
+            {
+                "windows"  "39"
+                "linux"    "41"
+            }
+
+            "teamid"
+            {
+                "windows"  "40"
+                "linux"    "42"
+            }
+
+            "getnexttarget"
+            {
+                "windows"  "41"
+                "linux"    "43"
+            }
+
+            "think"
+            {
+                "windows"  "42"
+                "linux"    "44"
+            }
+
+            "touch"
+            {
+                "windows"  "43"
+                "linux"    "45"
+            }
+
+            "use"
+            {
+                "windows"  "44"
+                "linux"    "46"
+            }
+
+            "blocked"
+            {
+                "windows"  "45"
+                "linux"    "47"
+            }
+
+            "respawn"
+            {
+                "windows"  "46"
+                "linux"    "48"
+            }
+
+            "updateowner"
+            {
+                "windows"  "47"
+                "linux"    "49"
+            }
+
+            "fbecomeprone"
+            {
+                "windows"  "48"
+                "linux"    "50"
+            }
+
+            "center"
+            {
+                "windows"  "49"
+                "linux"    "51"
+            }
+
+            "eyeposition"
+            {
+                "windows"  "50"
+                "linux"    "52"
+            }
+
+            "earposition"
+            {
+                "windows"  "51"
+                "linux"    "53"
+            }
+
+            "bodytarget"
+            {
+                "windows"  "52"
+                "linux"    "54"
+            }
+
+            "illumination"
+            {
+                "windows"  "53"
+                "linux"    "55"
+            }
+
+            "fvisible"
+            {
+                "windows"  "54"
+                "linux"    "56"
+            }
+
+            "fvecvisible"
+            {
+                "windows"  "55"
+                "linux"    "57"
+            }
+
+            "look"
+            {
+                "windows"  "57"
+                "linux"    "59"
+            }
+
+            "changeyaw"
+            {
+                "windows"  "60"
+                "linux"    "62"
+            }
+
+            "irelationship"
+            {
+                "windows"  "62"
+                "linux"    "64"
+            }
+
+            "monsterinitdead"
+            {
+                "windows"  "64"
+                "linux"    "66"
+            }
+
+            "becomedead"
+            {
+                "windows"  "65"
+                "linux"    "67"
+            }
+
+            "bestvisibleenemy"
+            {
+                "windows"  "67"
+                "linux"    "69"
+            }
+
+            "finviewcone"
+            {
+                "windows"  "68"
+                "linux"    "70"
+            }
+
+            "fvecinviewcone"
+            {
+                "windows"  "69"
+                "linux"    "71"
+            }
+
+            "runai"
+            {
+                "windows"  "58"
+                "linux"    "60"
+            }
+
+            "monsterthink"
+            {
+                "windows"  "61"
+                "linux"    "63"
+            }
+
+            "monsterinit"
+            {
+                "windows"  "63"
+                "linux"    "65"
+            }
+
+            "checklocalmove"
+            {
+                "windows"  "70"
+                "linux"    "72"
+            }
+
+            "move"
+            {
+                "windows"  "71"
+                "linux"    "73"
+            }
+
+            "moveexecute"
+            {
+                "windows"  "72"
+                "linux"    "74"
+            }
+
+            "shouldadvanceroute"
+            {
+                "windows"  "73"
+                "linux"    "75"
+            }
+
+            "getstoppedactivity"
+            {
+                "windows"  "74"
+                "linux"    "76"
+            }
+
+            "stop"
+            {
+                "windows"  "75"
+                "linux"    "77"
+            }
+
+            "checkrangeattack1"
+            {
+                "windows"  "76"
+                "linux"    "78"
+            }
+
+            "checkrangeattack2"
+            {
+                "windows"  "77"
+                "linux"    "79"
+            }
+
+            "checkmeleeattack1"
+            {
+                "windows"  "78"
+                "linux"    "80"
+            }
+
+            "checkmeleeattack2"
+            {
+                "windows"  "79"
+                "linux"    "81"
+            }
+
+            "schedulechange"
+            {
+                "windows"  "85"
+                "linux"    "87"
+            }
+
+            "canplaysequence"
+            {
+                "windows"  "86"
+                "linux"    "88"
+            }
+
+            "canplaysentence"
+            {
+                "windows"  "87"
+                "linux"    "89"
+            }
+
+            "playsentence"
+            {
+                "windows"  "88"
+                "linux"    "90"
+            }
+
+            "playscriptedsentence"
+            {
+                "windows"  "89"
+                "linux"    "91"
+            }
+
+            "sentencestop"
+            {
+                "windows"  "90"
+                "linux"    "92"
+            }
+
+            "getidealstate"
+            {
+                "windows"  "91"
+                "linux"    "93"
+            }
+
+            "setactivity"
+            {
+                "windows"  "92"
+                "linux"    "94"
+            }
+
+            "reportaistate"
+            {
+                "windows"  "93"
+                "linux"    "95"
+            }
+
+            "checkenemy"
+            {
+                "windows"  "94"
+                "linux"    "96"
+            }
+
+            "ftriangulate"
+            {
+                "windows"  "95"
+                "linux"    "97"
+            }
+
+            "setyawspeed"
+            {
+                "windows"  "96"
+                "linux"    "98"
+            }
+
+            "buildnearestroute"
+            {
+                "windows"  "97"
+                "linux"    "99"
+            }
+
+            "findcover"
+            {
+                "windows"  "98"
+                "linux"    "100"
+            }
+
+            "coverradius"
+            {
+                "windows"  "100"
+                "linux"    "102"
+            }
+
+            "fcancheckattacks"
+            {
+                "windows"  "101"
+                "linux"    "103"
+            }
+
+            "checkammo"
+            {
+                "windows"  "102"
+                "linux"    "104"
+            }
+
+            "ignoreconditions"
+            {
+                "windows"  "103"
+                "linux"    "105"
+            }
+
+            "fvalidatehinttype"
+            {
+                "windows"  "104"
+                "linux"    "106"
+            }
+
+            "fcanactiveidle"
+            {
+                "windows"  "105"
+                "linux"    "107"
+            }
+
+            "isoundmask"
+            {
+                "windows"  "106"
+                "linux"    "108"
+            }
+
+            "hearingsensitivity"
+            {
+                "windows"  "109"
+                "linux"    "111"
+            }
+
+            "barnaclevictimbitten"
+            {
+                "windows"  "110"
+                "linux"    "112"
+            }
+
+            "barnaclevictimreleased"
+            {
+                "windows"  "111"
+                "linux"    "113"
+            }
+
+            "preschedulethink"
+            {
+                "windows"  "112"
+                "linux"    "114"
+            }
+
+            "getdeathactivity"
+            {
+                "windows"  "113"
+                "linux"    "115"
+            }
+
+            "gibmonster"
+            {
+                "windows"  "114"
+                "linux"    "116"
+            }
+
+            "hashumangibs"
+            {
+                "windows"  "115"
+                "linux"    "117"
+            }
+
+            "hasaliengibs"
+            {
+                "windows"  "116"
+                "linux"    "118"
+            }
+
+            "fademonster"
+            {
+                "windows"  "117"
+                "linux"    "119"
+            }
+
+            "deathsound"
+            {
+                "windows"  "119"
+                "linux"    "121"
+            }
+
+            "alertsound"
+            {
+                "windows"  "120"
+                "linux"    "122"
+            }
+
+            "idlesound"
+            {
+                "windows"  "121"
+                "linux"    "123"
+            }
+
+            "painsound"
+            {
+                "windows"  "122"
+                "linux"    "124"
+            }
+
+            "stopfollowing"
+            {
+                "windows"  "123"
+                "linux"    "125"
+            }
+
+            "player_jump"
+            {
+                "windows"  "124"
+                "linux"    "126"
+            }
+
+            "player_prethink"
+            {
+                "windows"  "125"
+                "linux"    "127"
+            }
+
+            "player_postthink"
+            {
+                "windows"  "126"
+                "linux"    "128"
+            }
+
+            "player_getgunposition"
+            {
+                "windows"  "118"
+                "linux"    "120"
+            }
+
+            "player_shouldfadeondeath"
+            {
+                "windows"  "59"
+                "linux"    "61"
+            }
+
+            "player_impulsecommands"
+            {
+                "windows"  "128"
+                "linux"    "130"
+            }
+
+            "player_updateclientdata"
+            {
+                "windows"  "127"
+                "linux"    "129"
+            }
+
+            "item_addtoplayer"
+            {
+                "windows"  "57"
+                "linux"    "59"
+            }
+
+            "item_addduplicate"
+            {
+                "windows"  "58"
+                "linux"    "60"
+            }
+
+            "item_getiteminfo"
+            {
+                "windows"  "59"
+                "linux"    "61"
+            }
+
+            "item_candeploy"
+            {
+                "windows"  "60"
+                "linux"    "62"
+            }
+
+            "item_deploy"
+            {
+                "windows"  "61"
+                "linux"    "63"
+            }
+
+            "item_canholster"
+            {
+                "windows"  "62"
+                "linux"    "64"
+            }
+
+            "item_holster"
+            {
+                "windows"  "63"
+                "linux"    "65"
+            }
+
+            "item_updateiteminfo"
+            {
+                "windows"  "64"
+                "linux"    "66"
+            }
+
+            "item_preframe"
+            {
+                "windows"  "65"
+                "linux"    "67"
+            }
+
+            "item_postframe"
+            {
+                "windows"  "66"
+                "linux"    "68"
+            }
+
+            "item_drop"
+            {
+                "windows"  "67"
+                "linux"    "69"
+            }
+
+            "item_kill"
+            {
+                "windows"  "68"
+                "linux"    "70"
+            }
+
+            "item_attachtoplayer"
+            {
+                "windows"  "69"
+                "linux"    "71"
+            }
+
+            "item_primaryammoindex"
+            {
+                "windows"  "70"
+                "linux"    "72"
+            }
+
+            "item_secondaryammoindex"
+            {
+                "windows"  "71"
+                "linux"    "73"
+            }
+
+            "item_updateclientdata"
+            {
+                "windows"  "72"
+                "linux"    "74"
+            }
+
+            "item_getweaponptr"
+            {
+                "windows"  "73"
+                "linux"    "75"
+            }
+
+            "item_itemslot"
+            {
+                "windows"  "74"
+                "linux"    "76"
+            }
+
+            "weapon_playemptysound"
+            {
+                "windows"  "75"
+                "linux"    "77"
+            }
+
+            "weapon_resetemptysound"
+            {
+                "windows"  "76"
+                "linux"    "78"
+            }
+
+            "weapon_sendweaponanim"
+            {
+                "windows"  "77"
+                "linux"    "79"
+            }
+
+            "weapon_primaryattack"
+            {
+                "windows"  "78"
+                "linux"    "80"
+            }
+
+            "weapon_secondaryattack"
+            {
+                "windows"  "79"
+                "linux"    "81"
+            }
+
+            "weapon_weaponidle"
+            {
+                "windows"  "80"
+                "linux"    "82"
+            }
+
+            "weapon_retireweapon"
+            {
+                "windows"  "81"
+                "linux"    "83"
+            }
+
+            "weapon_shouldweaponidle"
+            {
+                "windows"  "82"
+                "linux"    "84"
+            }
+
+            "weapon_usedecrement"
+            {
+                "windows"  "83"
+                "linux"    "85"
+            }
+
+            "esf_weapon_holsterwhenmeleed"
+            {
+                "windows"  "84"
+                "linux"    "86"
+            }
+
+        }
+    }
+}

gamedata/common.games/virtual.games/ns/offsets-common.txt

@@ -0,0 +1,878 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your AMX Mod X install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after AMXX's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(AMX_Mod_X)
+ */
+
+"Games"
+{
+    "#default"
+    {
+        "Offsets"
+        {
+            "pev"
+            {
+                "windows"  "4"
+                "linux"    "4"
+            }
+
+            "base"
+            {
+                "windows"  "0x0"
+                "linux"    "0x0"
+            }
+
+            "spawn"
+            {
+                "windows"  "0"
+                "linux"    "0"
+            }
+
+            "precache"
+            {
+                "windows"  "1"
+                "linux"    "1"
+            }
+
+            "keyvalue"
+            {
+                "windows"  "2"
+                "linux"    "2"
+            }
+
+            "objectcaps"
+            {
+                "windows"  "5"
+                "linux"    "5"
+            }
+
+            "activate"
+            {
+                "windows"  "6"
+                "linux"    "6"
+            }
+
+            "setobjectcollisionbox"
+            {
+                "windows"  "7"
+                "linux"    "7"
+            }
+
+            "classify"
+            {
+                "windows"  "8"
+                "linux"    "8"
+            }
+
+            "deathnotice"
+            {
+                "windows"  "9"
+                "linux"    "9"
+            }
+
+            "traceattack"
+            {
+                "windows"  "10"
+                "linux"    "10"
+            }
+
+            "takedamage"
+            {
+                "windows"  "11"
+                "linux"    "11"
+            }
+
+            "takehealth"
+            {
+                "windows"  "12"
+                "linux"    "12"
+            }
+
+            "killed"
+            {
+                "windows"  "14"
+                "linux"    "14"
+            }
+
+            "bloodcolor"
+            {
+                "windows"  "16"
+                "linux"    "16"
+            }
+
+            "tracebleed"
+            {
+                "windows"  "17"
+                "linux"    "17"
+            }
+
+            "istriggered"
+            {
+                "windows"  "18"
+                "linux"    "18"
+            }
+
+            "mymonsterpointer"
+            {
+                "windows"  "19"
+                "linux"    "19"
+            }
+
+            "mysquadmonsterpointer"
+            {
+                "windows"  "20"
+                "linux"    "20"
+            }
+
+            "gettogglestate"
+            {
+                "windows"  "21"
+                "linux"    "21"
+            }
+
+            "addpoints"
+            {
+                "windows"  "22"
+                "linux"    "22"
+            }
+
+            "addpointstoteam"
+            {
+                "windows"  "23"
+                "linux"    "23"
+            }
+
+            "addplayeritem"
+            {
+                "windows"  "24"
+                "linux"    "24"
+            }
+
+            "removeplayeritem"
+            {
+                "windows"  "25"
+                "linux"    "25"
+            }
+
+            "giveammo"
+            {
+                "windows"  "26"
+                "linux"    "26"
+            }
+
+            "getdelay"
+            {
+                "windows"  "27"
+                "linux"    "27"
+            }
+
+            "ismoving"
+            {
+                "windows"  "28"
+                "linux"    "28"
+            }
+
+            "overridereset"
+            {
+                "windows"  "29"
+                "linux"    "29"
+            }
+
+            "damagedecal"
+            {
+                "windows"  "30"
+                "linux"    "30"
+            }
+
+            "settogglestate"
+            {
+                "windows"  "31"
+                "linux"    "31"
+            }
+
+            "startsneaking"
+            {
+                "windows"  "32"
+                "linux"    "32"
+            }
+
+            "stopsneaking"
+            {
+                "windows"  "33"
+                "linux"    "33"
+            }
+
+            "oncontrols"
+            {
+                "windows"  "34"
+                "linux"    "34"
+            }
+
+            "issneaking"
+            {
+                "windows"  "35"
+                "linux"    "35"
+            }
+
+            "isalive"
+            {
+                "windows"  "36"
+                "linux"    "36"
+            }
+
+            "isbspmodel"
+            {
+                "windows"  "37"
+                "linux"    "37"
+            }
+
+            "reflectgauss"
+            {
+                "windows"  "38"
+                "linux"    "38"
+            }
+
+            "hastarget"
+            {
+                "windows"  "39"
+                "linux"    "39"
+            }
+
+            "isinworld"
+            {
+                "windows"  "40"
+                "linux"    "40"
+            }
+
+            "isplayer"
+            {
+                "windows"  "41"
+                "linux"    "41"
+            }
+
+            "isnetclient"
+            {
+                "windows"  "42"
+                "linux"    "42"
+            }
+
+            "teamid"
+            {
+                "windows"  "43"
+                "linux"    "43"
+            }
+
+            "getnexttarget"
+            {
+                "windows"  "46"
+                "linux"    "46"
+            }
+
+            "think"
+            {
+                "windows"  "47"
+                "linux"    "47"
+            }
+
+            "touch"
+            {
+                "windows"  "48"
+                "linux"    "48"
+            }
+
+            "use"
+            {
+                "windows"  "49"
+                "linux"    "49"
+            }
+
+            "blocked"
+            {
+                "windows"  "50"
+                "linux"    "50"
+            }
+
+            "respawn"
+            {
+                "windows"  "52"
+                "linux"    "52"
+            }
+
+            "updateowner"
+            {
+                "windows"  "53"
+                "linux"    "53"
+            }
+
+            "fbecomeprone"
+            {
+                "windows"  "54"
+                "linux"    "54"
+            }
+
+            "center"
+            {
+                "windows"  "55"
+                "linux"    "55"
+            }
+
+            "eyeposition"
+            {
+                "windows"  "56"
+                "linux"    "56"
+            }
+
+            "earposition"
+            {
+                "windows"  "57"
+                "linux"    "57"
+            }
+
+            "bodytarget"
+            {
+                "windows"  "58"
+                "linux"    "58"
+            }
+
+            "illumination"
+            {
+                "windows"  "59"
+                "linux"    "59"
+            }
+
+            "fvisible"
+            {
+                "windows"  "60"
+                "linux"    "60"
+            }
+
+            "fvecvisible"
+            {
+                "windows"  "61"
+                "linux"    "61"
+            }
+
+            "changeyaw"
+            {
+                "windows"  "65"
+                "linux"    "65"
+            }
+
+            "hashumangibs"
+            {
+                "windows"  "66"
+                "linux"    "66"
+            }
+
+            "hasaliengibs"
+            {
+                "windows"  "67"
+                "linux"    "67"
+            }
+
+            "fademonster"
+            {
+                "windows"  "68"
+                "linux"    "68"
+            }
+
+            "gibmonster"
+            {
+                "windows"  "69"
+                "linux"    "69"
+            }
+
+            "getdeathactivity"
+            {
+                "windows"  "70"
+                "linux"    "70"
+            }
+
+            "becomedead"
+            {
+                "windows"  "71"
+                "linux"    "71"
+            }
+
+            "irelationship"
+            {
+                "windows"  "73"
+                "linux"    "73"
+            }
+
+            "painsound"
+            {
+                "windows"  "74"
+                "linux"    "74"
+            }
+
+            "reportaistate"
+            {
+                "windows"  "75"
+                "linux"    "75"
+            }
+
+            "monsterinitdead"
+            {
+                "windows"  "76"
+                "linux"    "76"
+            }
+
+            "look"
+            {
+                "windows"  "77"
+                "linux"    "77"
+            }
+
+            "bestvisibleenemy"
+            {
+                "windows"  "78"
+                "linux"    "78"
+            }
+
+            "finviewcone"
+            {
+                "windows"  "80"
+                "linux"    "80"
+            }
+
+            "fvecinviewcone"
+            {
+                "windows"  "81"
+                "linux"    "81"
+            }
+
+            "player_jump"
+            {
+                "windows"  "83"
+                "linux"    "83"
+            }
+
+            "player_duck"
+            {
+                "windows"  "84"
+                "linux"    "84"
+            }
+
+            "player_prethink"
+            {
+                "windows"  "85"
+                "linux"    "85"
+            }
+
+            "player_postthink"
+            {
+                "windows"  "86"
+                "linux"    "86"
+            }
+
+            "player_getgunposition"
+            {
+                "windows"  "87"
+                "linux"    "87"
+            }
+
+            "player_shouldfadeondeath"
+            {
+                "windows"  "72"
+                "linux"    "72"
+            }
+
+            "player_impulsecommands"
+            {
+                "windows"  "101"
+                "linux"    "101"
+            }
+
+            "player_updateclientdata"
+            {
+                "windows"  "99"
+                "linux"    "99"
+            }
+
+            "item_addtoplayer"
+            {
+                "windows"  "64"
+                "linux"    "64"
+            }
+
+            "item_addduplicate"
+            {
+                "windows"  "65"
+                "linux"    "65"
+            }
+
+            "item_getiteminfo"
+            {
+                "windows"  "68"
+                "linux"    "68"
+            }
+
+            "item_candeploy"
+            {
+                "windows"  "69"
+                "linux"    "69"
+            }
+
+            "item_deploy"
+            {
+                "windows"  "70"
+                "linux"    "70"
+            }
+
+            "item_canholster"
+            {
+                "windows"  "71"
+                "linux"    "71"
+            }
+
+            "item_holster"
+            {
+                "windows"  "72"
+                "linux"    "72"
+            }
+
+            "item_updateiteminfo"
+            {
+                "windows"  "74"
+                "linux"    "74"
+            }
+
+            "item_preframe"
+            {
+                "windows"  "75"
+                "linux"    "75"
+            }
+
+            "item_postframe"
+            {
+                "windows"  "76"
+                "linux"    "76"
+            }
+
+            "item_drop"
+            {
+                "windows"  "77"
+                "linux"    "77"
+            }
+
+            "item_kill"
+            {
+                "windows"  "78"
+                "linux"    "78"
+            }
+
+            "item_attachtoplayer"
+            {
+                "windows"  "79"
+                "linux"    "79"
+            }
+
+            "item_primaryammoindex"
+            {
+                "windows"  "80"
+                "linux"    "80"
+            }
+
+            "item_secondaryammoindex"
+            {
+                "windows"  "81"
+                "linux"    "81"
+            }
+
+            "item_updateclientdata"
+            {
+                "windows"  "82"
+                "linux"    "82"
+            }
+
+            "item_getweaponptr"
+            {
+                "windows"  "83"
+                "linux"    "83"
+            }
+
+            "item_itemslot"
+            {
+                "windows"  "84"
+                "linux"    "84"
+            }
+
+            "weapon_extractammo"
+            {
+                "windows"  "85"
+                "linux"    "85"
+            }
+
+            "weapon_extractclipammo"
+            {
+                "windows"  "86"
+                "linux"    "86"
+            }
+
+            "weapon_addweapon"
+            {
+                "windows"  "87"
+                "linux"    "87"
+            }
+
+            "weapon_playemptysound"
+            {
+                "windows"  "88"
+                "linux"    "88"
+            }
+
+            "weapon_resetemptysound"
+            {
+                "windows"  "89"
+                "linux"    "89"
+            }
+
+            "weapon_sendweaponanim"
+            {
+                "windows"  "94"
+                "linux"    "94"
+            }
+
+            "weapon_isusable"
+            {
+                "windows"  "73"
+                "linux"    "73"
+            }
+
+            "weapon_primaryattack"
+            {
+                "windows"  "98"
+                "linux"    "98"
+            }
+
+            "weapon_secondaryattack"
+            {
+                "windows"  "99"
+                "linux"    "99"
+            }
+
+            "weapon_reload"
+            {
+                "windows"  "100"
+                "linux"    "100"
+            }
+
+            "weapon_weaponidle"
+            {
+                "windows"  "101"
+                "linux"    "101"
+            }
+
+            "weapon_retireweapon"
+            {
+                "windows"  "102"
+                "linux"    "102"
+            }
+
+            "weapon_shouldweaponidle"
+            {
+                "windows"  "103"
+                "linux"    "103"
+            }
+
+            "weapon_usedecrement"
+            {
+                "windows"  "104"
+                "linux"    "104"
+            }
+
+            "ns_getpointvalue"
+            {
+                "windows"  "13"
+                "linux"    "13"
+            }
+
+            "ns_awardkill"
+            {
+                "windows"  "15"
+                "linux"    "15"
+            }
+
+            "ns_resetentity"
+            {
+                "windows"  "45"
+                "linux"    "45"
+            }
+
+            "ns_updateonremove"
+            {
+                "windows"  "51"
+                "linux"    "51"
+            }
+
+            "ns_setbonecontroller"
+            {
+                "windows"  "63"
+                "linux"    "63"
+            }
+
+            "ns_savedataforreset"
+            {
+                "windows"  "64"
+                "linux"    "64"
+            }
+
+            "ns_gethull"
+            {
+                "windows"  "79"
+                "linux"    "79"
+            }
+
+            "ns_getmaxwalkspeed"
+            {
+                "windows"  "88"
+                "linux"    "88"
+            }
+
+            "ns_setteamid"
+            {
+                "windows"  "90"
+                "linux"    "90"
+            }
+
+            "ns_geteffectiveplayerclass"
+            {
+                "windows"  "91"
+                "linux"    "91"
+            }
+
+            "ns_getauthenticationmask"
+            {
+                "windows"  "92"
+                "linux"    "92"
+            }
+
+            "ns_effectiveplayerclasschanged"
+            {
+                "windows"  "93"
+                "linux"    "93"
+            }
+
+            "ns_needsteamupdate"
+            {
+                "windows"  "94"
+                "linux"    "94"
+            }
+
+            "ns_sendteamupdate"
+            {
+                "windows"  "95"
+                "linux"    "95"
+            }
+
+            "ns_sendweaponupdate"
+            {
+                "windows"  "96"
+                "linux"    "96"
+            }
+
+            "ns_initplayerfromspawn"
+            {
+                "windows"  "97"
+                "linux"    "97"
+            }
+
+            "ns_packdeadplayeritems"
+            {
+                "windows"  "98"
+                "linux"    "98"
+            }
+
+            "ns_getanimationforactivity"
+            {
+                "windows"  "100"
+                "linux"    "100"
+            }
+
+            "ns_startobserver"
+            {
+                "windows"  "102"
+                "linux"    "102"
+            }
+
+            "ns_stopobserver"
+            {
+                "windows"  "103"
+                "linux"    "103"
+            }
+
+            "ns_getadrenalinefactor"
+            {
+                "windows"  "104"
+                "linux"    "104"
+            }
+
+            "ns_givenameditem"
+            {
+                "windows"  "106"
+                "linux"    "106"
+            }
+
+            "ns_suicide"
+            {
+                "windows"  "107"
+                "linux"    "107"
+            }
+
+            "ns_getcanuseweapon"
+            {
+                "windows"  "108"
+                "linux"    "108"
+            }
+
+            "ns_weapon_getweaponprimetime"
+            {
+                "windows"  "90"
+                "linux"    "90"
+            }
+
+            "ns_weapon_primeweapon"
+            {
+                "windows"  "91"
+                "linux"    "91"
+            }
+
+            "ns_weapon_getisweaponprimed"
+            {
+                "windows"  "92"
+                "linux"    "92"
+            }
+
+            "ns_weapon_getisweaponpriming"
+            {
+                "windows"  "93"
+                "linux"    "93"
+            }
+
+            "ns_weapon_defaultdeploy"
+            {
+                "windows"  "95"
+                "linux"    "95"
+            }
+
+            "ns_weapon_defaultreload"
+            {
+                "windows"  "96"
+                "linux"    "96"
+            }
+
+            "ns_weapon_getdeploytime"
+            {
+                "windows"  "97"
+                "linux"    "97"
+            }
+
+        }
+    }
+}

gamedata/common.games/virtual.games/ts/offsets-common.txt

@@ -0,0 +1,746 @@
+/**
+ * Do not edit this file.  Any changes will be overwritten by the gamedata
+ * updater or by upgrading your AMX Mod X install.
+ *
+ * To override data in this file, create a subdirectory named "custom" and
+ * place your own gamedata file(s) inside of it.  Such files will be parsed
+ * after AMXX's own.
+ *
+ * For more information, see http://wiki.alliedmods.net/Gamedata_Updating_(AMX_Mod_X)
+ */
+
+"Games"
+{
+    "#default"
+    {
+        "Offsets"
+        {
+            "pev"
+            {
+                "windows"  "4"
+                "linux"    "0"
+            }
+
+            "base"
+            {
+                "windows"  "0x0"
+                "linux"    "0x60"
+            }
+
+            "spawn"
+            {
+                "windows"  "7"
+                "linux"    "9"
+            }
+
+            "precache"
+            {
+                "windows"  "8"
+                "linux"    "10"
+            }
+
+            "keyvalue"
+            {
+                "windows"  "9"
+                "linux"    "11"
+            }
+
+            "objectcaps"
+            {
+                "windows"  "12"
+                "linux"    "14"
+            }
+
+            "activate"
+            {
+                "windows"  "13"
+                "linux"    "15"
+            }
+
+            "setobjectcollisionbox"
+            {
+                "windows"  "16"
+                "linux"    "18"
+            }
+
+            "classify"
+            {
+                "windows"  "17"
+                "linux"    "19"
+            }
+
+            "deathnotice"
+            {
+                "windows"  "18"
+                "linux"    "20"
+            }
+
+            "traceattack"
+            {
+                "windows"  "19"
+                "linux"    "21"
+            }
+
+            "takedamage"
+            {
+                "windows"  "20"
+                "linux"    "22"
+            }
+
+            "takehealth"
+            {
+                "windows"  "21"
+                "linux"    "23"
+            }
+
+            "killed"
+            {
+                "windows"  "22"
+                "linux"    "24"
+            }
+
+            "bloodcolor"
+            {
+                "windows"  "23"
+                "linux"    "25"
+            }
+
+            "tracebleed"
+            {
+                "windows"  "24"
+                "linux"    "26"
+            }
+
+            "istriggered"
+            {
+                "windows"  "25"
+                "linux"    "27"
+            }
+
+            "mymonsterpointer"
+            {
+                "windows"  "26"
+                "linux"    "28"
+            }
+
+            "mysquadmonsterpointer"
+            {
+                "windows"  "27"
+                "linux"    "29"
+            }
+
+            "gettogglestate"
+            {
+                "windows"  "28"
+                "linux"    "30"
+            }
+
+            "addpoints"
+            {
+                "windows"  "29"
+                "linux"    "31"
+            }
+
+            "addpointstoteam"
+            {
+                "windows"  "30"
+                "linux"    "32"
+            }
+
+            "addplayeritem"
+            {
+                "windows"  "31"
+                "linux"    "33"
+            }
+
+            "removeplayeritem"
+            {
+                "windows"  "32"
+                "linux"    "34"
+            }
+
+            "giveammo"
+            {
+                "windows"  "33"
+                "linux"    "35"
+            }
+
+            "getdelay"
+            {
+                "windows"  "34"
+                "linux"    "36"
+            }
+
+            "ismoving"
+            {
+                "windows"  "35"
+                "linux"    "37"
+            }
+
+            "overridereset"
+            {
+                "windows"  "36"
+                "linux"    "38"
+            }
+
+            "damagedecal"
+            {
+                "windows"  "37"
+                "linux"    "39"
+            }
+
+            "settogglestate"
+            {
+                "windows"  "38"
+                "linux"    "40"
+            }
+
+            "startsneaking"
+            {
+                "windows"  "39"
+                "linux"    "41"
+            }
+
+            "stopsneaking"
+            {
+                "windows"  "40"
+                "linux"    "42"
+            }
+
+            "oncontrols"
+            {
+                "windows"  "41"
+                "linux"    "43"
+            }
+
+            "issneaking"
+            {
+                "windows"  "42"
+                "linux"    "44"
+            }
+
+            "isalive"
+            {
+                "windows"  "43"
+                "linux"    "45"
+            }
+
+            "isbspmodel"
+            {
+                "windows"  "44"
+                "linux"    "46"
+            }
+
+            "reflectgauss"
+            {
+                "windows"  "45"
+                "linux"    "47"
+            }
+
+            "hastarget"
+            {
+                "windows"  "46"
+                "linux"    "48"
+            }
+
+            "isinworld"
+            {
+                "windows"  "47"
+                "linux"    "49"
+            }
+
+            "isplayer"
+            {
+                "windows"  "48"
+                "linux"    "50"
+            }
+
+            "isnetclient"
+            {
+                "windows"  "49"
+                "linux"    "51"
+            }
+
+            "teamid"
+            {
+                "windows"  "50"
+                "linux"    "52"
+            }
+
+            "getnexttarget"
+            {
+                "windows"  "51"
+                "linux"    "53"
+            }
+
+            "think"
+            {
+                "windows"  "52"
+                "linux"    "54"
+            }
+
+            "touch"
+            {
+                "windows"  "53"
+                "linux"    "55"
+            }
+
+            "use"
+            {
+                "windows"  "54"
+                "linux"    "56"
+            }
+
+            "blocked"
+            {
+                "windows"  "55"
+                "linux"    "57"
+            }
+
+            "respawn"
+            {
+                "windows"  "57"
+                "linux"    "59"
+            }
+
+            "updateowner"
+            {
+                "windows"  "58"
+                "linux"    "60"
+            }
+
+            "fbecomeprone"
+            {
+                "windows"  "59"
+                "linux"    "61"
+            }
+
+            "center"
+            {
+                "windows"  "60"
+                "linux"    "62"
+            }
+
+            "eyeposition"
+            {
+                "windows"  "61"
+                "linux"    "63"
+            }
+
+            "earposition"
+            {
+                "windows"  "62"
+                "linux"    "64"
+            }
+
+            "bodytarget"
+            {
+                "windows"  "63"
+                "linux"    "65"
+            }
+
+            "illumination"
+            {
+                "windows"  "64"
+                "linux"    "66"
+            }
+
+            "fvisible"
+            {
+                "windows"  "65"
+                "linux"    "67"
+            }
+
+            "fvecvisible"
+            {
+                "windows"  "66"
+                "linux"    "68"
+            }
+
+            "changeyaw"
+            {
+                "windows"  "68"
+                "linux"    "70"
+            }
+
+            "hashumangibs"
+            {
+                "windows"  "69"
+                "linux"    "71"
+            }
+
+            "hasaliengibs"
+            {
+                "windows"  "70"
+                "linux"    "72"
+            }
+
+            "fademonster"
+            {
+                "windows"  "71"
+                "linux"    "73"
+            }
+
+            "gibmonster"
+            {
+                "windows"  "72"
+                "linux"    "74"
+            }
+
+            "getdeathactivity"
+            {
+                "windows"  "73"
+                "linux"    "75"
+            }
+
+            "becomedead"
+            {
+                "windows"  "74"
+                "linux"    "76"
+            }
+
+            "irelationship"
+            {
+                "windows"  "76"
+                "linux"    "78"
+            }
+
+            "painsound"
+            {
+                "windows"  "77"
+                "linux"    "79"
+            }
+
+            "reportaistate"
+            {
+                "windows"  "78"
+                "linux"    "80"
+            }
+
+            "monsterinitdead"
+            {
+                "windows"  "79"
+                "linux"    "81"
+            }
+
+            "look"
+            {
+                "windows"  "80"
+                "linux"    "82"
+            }
+
+            "bestvisibleenemy"
+            {
+                "windows"  "81"
+                "linux"    "83"
+            }
+
+            "finviewcone"
+            {
+                "windows"  "82"
+                "linux"    "84"
+            }
+
+            "fvecinviewcone"
+            {
+                "windows"  "83"
+                "linux"    "85"
+            }
+
+            "player_jump"
+            {
+                "windows"  "84"
+                "linux"    "86"
+            }
+
+            "player_duck"
+            {
+                "windows"  "85"
+                "linux"    "87"
+            }
+
+            "player_prethink"
+            {
+                "windows"  "86"
+                "linux"    "88"
+            }
+
+            "player_postthink"
+            {
+                "windows"  "87"
+                "linux"    "89"
+            }
+
+            "player_getgunposition"
+            {
+                "windows"  "88"
+                "linux"    "90"
+            }
+
+            "player_shouldfadeondeath"
+            {
+                "windows"  "75"
+                "linux"    "77"
+            }
+
+            "player_impulsecommands"
+            {
+                "windows"  "90"
+                "linux"    "92"
+            }
+
+            "player_updateclientdata"
+            {
+                "windows"  "89"
+                "linux"    "91"
+            }
+
+            "item_addtoplayer"
+            {
+                "windows"  "68"
+                "linux"    "70"
+            }
+
+            "item_addduplicate"
+            {
+                "windows"  "69"
+                "linux"    "71"
+            }
+
+            "item_candeploy"
+            {
+                "windows"  "71"
+                "linux"    "73"
+            }
+
+            "item_deploy"
+            {
+                "windows"  "72"
+                "linux"    "74"
+            }
+
+            "item_canholster"
+            {
+                "windows"  "73"
+                "linux"    "75"
+            }
+
+            "item_holster"
+            {
+                "windows"  "74"
+                "linux"    "76"
+            }
+
+            "item_updateiteminfo"
+            {
+                "windows"  "75"
+                "linux"    "77"
+            }
+
+            "item_preframe"
+            {
+                "windows"  "76"
+                "linux"    "78"
+            }
+
+            "item_postframe"
+            {
+                "windows"  "77"
+                "linux"    "79"
+            }
+
+            "item_drop"
+            {
+                "windows"  "78"
+                "linux"    "80"
+            }
+
+            "item_kill"
+            {
+                "windows"  "79"
+                "linux"    "81"
+            }
+
+            "item_attachtoplayer"
+            {
+                "windows"  "80"
+                "linux"    "82"
+            }
+
+            "item_primaryammoindex"
+            {
+                "windows"  "81"
+                "linux"    "83"
+            }
+
+            "item_secondaryammoindex"
+            {
+                "windows"  "82"
+                "linux"    "84"
+            }
+
+            "item_updateclientdata"
+            {
+                "windows"  "83"
+                "linux"    "85"
+            }
+
+            "item_getweaponptr"
+            {
+                "windows"  "84"
+                "linux"    "86"
+            }
+
+            "item_itemslot"
+            {
+                "windows"  "85"
+                "linux"    "87"
+            }
+
+            "weapon_extractammo"
+            {
+                "windows"  "86"
+                "linux"    "88"
+            }
+
+            "weapon_extractclipammo"
+            {
+                "windows"  "87"
+                "linux"    "89"
+            }
+
+            "weapon_addweapon"
+            {
+                "windows"  "88"
+                "linux"    "90"
+            }
+
+            "weapon_playemptysound"
+            {
+                "windows"  "89"
+                "linux"    "91"
+            }
+
+            "weapon_resetemptysound"
+            {
+                "windows"  "90"
+                "linux"    "92"
+            }
+
+            "weapon_sendweaponanim"
+            {
+                "windows"  "91"
+                "linux"    "93"
+            }
+
+            "weapon_isusable"
+            {
+                "windows"  "92"
+                "linux"    "94"
+            }
+
+            "weapon_primaryattack"
+            {
+                "windows"  "93"
+                "linux"    "95"
+            }
+
+            "weapon_secondaryattack"
+            {
+                "windows"  "94"
+                "linux"    "96"
+            }
+
+            "weapon_reload"
+            {
+                "windows"  "96"
+                "linux"    "98"
+            }
+
+            "weapon_weaponidle"
+            {
+                "windows"  "97"
+                "linux"    "99"
+            }
+
+            "weapon_retireweapon"
+            {
+                "windows"  "98"
+                "linux"    "100"
+            }
+
+            "weapon_shouldweaponidle"
+            {
+                "windows"  "99"
+                "linux"    "101"
+            }
+
+            "weapon_usedecrement"
+            {
+                "windows"  "100"
+                "linux"    "102"
+            }
+
+            "ts_breakablerespawn"
+            {
+                "windows"  "0"
+                "linux"    "2"
+            }
+
+            "ts_canusedthroughwalls"
+            {
+                "windows"  "1"
+                "linux"    "3"
+            }
+
+            "ts_giveslowmul"
+            {
+                "windows"  "2"
+                "linux"    "4"
+            }
+
+            "ts_goslow"
+            {
+                "windows"  "3"
+                "linux"    "5"
+            }
+
+            "ts_inslow"
+            {
+                "windows"  "4"
+                "linux"    "6"
+            }
+
+            "ts_isobjective"
+            {
+                "windows"  "5"
+                "linux"    "7"
+            }
+
+            "ts_enableobjective"
+            {
+                "windows"  "6"
+                "linux"    "8"
+            }
+
+            "ts_onfreeentprivatedata"
+            {
+                "windows"  "10"
+                "linux"    "12"
+            }
+
+            "ts_shouldcollide"
+            {
+                "windows"  "11"
+                "linux"    "13"
+            }
+
+            "ts_weapon_alternateattack"
+            {
+                "windows"  "95"
+                "linux"    "97"
+            }
+
+        }
+    }
+}

installer/amxmodx-installer.nsi

@@ -110,7 +110,6 @@ Section "MainSection" SEC01
   File "installer\files\base\addons\amxmodx\configs\core.ini"
   File "installer\files\base\addons\amxmodx\configs\custommenuitems.cfg"
   File "installer\files\base\addons\amxmodx\configs\cvars.ini"
-  File "installer\files\base\addons\amxmodx\configs\hamdata.ini"
   File "installer\files\base\addons\amxmodx\configs\maps.ini"
   File "installer\files\base\addons\amxmodx\configs\modules.ini"
   File "installer\files\base\addons\amxmodx\configs\plugins.ini"

modules/cstrike/csx/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'csx')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
   'CRank.cpp',

modules/cstrike/csx/CMisc.cpp

@@ -127,11 +127,11 @@ void CPlayer::Connect(const char* address ){
 
 void CPlayer::restartStats(bool all)
 {
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
-	memset(&life,0,sizeof(life));
+	if ( all ) memset(&weapons,0,sizeof(weapons));
+	memset(&weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
+	life = {};
 }
 
 void CPlayer::Init( int pi, edict_t* pe )

modules/cstrike/csx/WinCSX/WinCSX.cpp

@@ -229,8 +229,8 @@ void ListboxItemSelected(HWND hDlg) {
 	// Retrieve complete stats record of this position. Position in listbox should be same as rank in our records!
 	RankSystem::RankStats* stats = g_rank.findEntryInRankByPos((int)nItem + 1);
 	if (stats == NULL) {
-		char msg[] = "Error: Couldn't find the record by position! (nItem = %d)";
-		sprintf(msg, msg, nItem);
+		char msg[512];
+		sprintf(msg, "Error: Couldn't find the record by position! (nItem = %d)", nItem);
 		MessageBox(hDlg, msg, "Oh fiddlesticks!", MB_OK);
 		ClearStatsfields(hDlg);
 		return;

modules/cstrike/csx/rank.cpp

@@ -307,10 +307,10 @@ static cell AMX_NATIVE_CALL custom_wpn_dmg(AMX *amx, cell *params){ // wid,att,v
 	CPlayer* pAtt = GET_PLAYER_POINTER_I(att);
 	CPlayer* pVic = GET_PLAYER_POINTER_I(vic);
 
+	if ( !pAtt ) pAtt = pVic;
 	pVic->pEdict->v.dmg_inflictor = NULL;
 	pAtt->saveHit( pVic , weapon , dmg, aim );
 
-	if ( !pAtt ) pAtt = pVic;
 	int TA = 0;
 	if ( (pVic->teamId == pAtt->teamId) && ( pVic != pAtt) )
 		TA = 1;

modules/dod/dodfun/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'dodfun')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
   'NBase.cpp',

modules/dod/dodfun/NPD.cpp

@@ -506,7 +506,7 @@ static cell AMX_NATIVE_CALL objective_set_data(AMX *amx, cell *params){ // index
 			GET_CP_PD(pent).model_body_neutral = ivalue;
 			return 1;
 		case CP_model_body_allies :
-			GET_CP_PD(pent).model_body_axis = ivalue;
+			GET_CP_PD(pent).model_body_allies = ivalue;
 			return 1;
 		case CP_model_body_axis :
 			GET_CP_PD(pent).model_body_axis = ivalue;

modules/dod/dodx/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'dodx')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
   'CRank.cpp',

modules/dod/dodx/CMisc.cpp

@@ -94,15 +94,15 @@ void CPlayer::restartStats(bool all)
 {
 	if ( all )
 	{
-		memset(weapons,0,sizeof(weapons));
-		memset(&round,0,sizeof(round));
-		memset(weaponsRnd,0,sizeof(weaponsRnd));
+		memset(&weapons,0,sizeof(weapons));
+		memset(static_cast<void *>(&round),0,sizeof(round));
+		memset(&weaponsRnd,0,sizeof(weaponsRnd));
 	}
 
-	memset(weaponsLife,0,sizeof(weaponsLife));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
-	memset(&life,0,sizeof(life));
+	memset(&weaponsLife,0,sizeof(weaponsLife));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
+	life = {};
 }
 
 void CPlayer::Init( int pi, edict_t* pe )
@@ -434,7 +434,7 @@ void CPlayer::WeaponsCheck(int weapons)
 	int old;
 	int cur;
 
-	for(int i = 1; i < MAX_WEAPONS; ++i)
+	for(int i = 1; i < DODMAX_WEAPONS; ++i)
 	{
 		// Check to see we are not talking about a grenade and we have changed
 		if(i != 13 && i != 14 && i != 15 && i != 16 && i != 36)

modules/dod/dodx/NBase.cpp

@@ -263,7 +263,7 @@ static cell AMX_NATIVE_CALL dod_weapon_type(AMX *amx, cell *params) /* 2 params
 	{
 		int weaponsbit = pPlayer->pEdict->v.weapons & ~(1<<31); // don't count last element
 
-		for(int x = 1; x < MAX_WEAPONS; ++x)
+		for(int x = 1; x < DODMAX_WEAPONS; ++x)
 		{
 			if((weaponsbit&(1<<x)) > 0)
 			{
@@ -387,12 +387,12 @@ static cell AMX_NATIVE_CALL cwpn_dmg(AMX *amx, cell *params)
 
 	pVic->pEdict->v.dmg_inflictor = NULL;
 
-	if(pAtt->index != pVic->index)
-		pAtt->saveHit(pVic , weapon , dmg, aim);
-
 	if(!pAtt) 
 		pAtt = pVic;
 
+	if(pAtt->index != pVic->index)
+		pAtt->saveHit(pVic , weapon , dmg, aim);
+
 	int TA = 0;
 
 	if((pVic->pEdict->v.team == pAtt->pEdict->v.team) && (pVic != pAtt))

modules/dod/dodx/moduleconfig.cpp

@@ -172,8 +172,8 @@ void PlayerPreThink_Post(edict_t *pEntity)
 	if(pPlayer->clearRound && pPlayer->clearRound < gpGlobals->time)
 	{
 		pPlayer->clearRound = 0.0f;
-		memset(&pPlayer->round,0,sizeof(pPlayer->round));
-		memset(pPlayer->weaponsRnd,0,sizeof(pPlayer->weaponsRnd));
+		memset(static_cast<void *>(&pPlayer->round),0,sizeof(pPlayer->round));
+		memset(&pPlayer->weaponsRnd,0,sizeof(pPlayer->weaponsRnd));
 	}
 
 	if (pPlayer->sendScore && pPlayer->sendScore < gpGlobals->time)

modules/dod/dodx/usermsg.cpp

@@ -222,7 +222,7 @@ void Client_AmmoX(void* mValue)
   case 1:
 	if (!mPlayer ) 
 		break;
-    for(int i = 1; i < MAX_WEAPONS ; ++i)
+    for(int i = 1; i < DODMAX_WEAPONS ; ++i)
 	{
       if (iAmmo == weaponData[i].ammoSlot)
         mPlayer->weapons[i].ammo = *(int*)mValue;
@@ -244,7 +244,7 @@ void Client_AmmoShort(void* mValue)
 	if(!mPlayer ) 
 		break;
 
-    for(int i = 1; i < MAX_WEAPONS ; ++i) 
+    for(int i = 1; i < DODMAX_WEAPONS ; ++i) 
 	{
       if (iAmmo == weaponData[i].ammoSlot)
 		  mPlayer->weapons[i].ammo = *(int*)mValue;

modules/fakemeta/fm_tr.cpp

@@ -34,31 +34,26 @@ static cell AMX_NATIVE_CALL set_tr(AMX *amx, cell *params)
 		{
 			gfm_tr->fAllSolid = *ptr;
 			return 1;
-			break;
 		}
 	case TR_StartSolid:
 		{
 			gfm_tr->fStartSolid = *ptr;
 			return 1;
-			break;
 		}
 	case TR_InOpen:
 		{
 			gfm_tr->fInOpen = *ptr;
 			return 1;
-			break;
 		}
 	case TR_InWater:
 		{
 			gfm_tr->fInWater = *ptr;
 			return 1;
-			break;
 		}
 	case TR_flFraction:
 		{
 			gfm_tr->flFraction = amx_ctof(*ptr);
 			return 1;
-			break;
 		}
 	case TR_vecEndPos:
 		{
@@ -66,13 +61,11 @@ static cell AMX_NATIVE_CALL set_tr(AMX *amx, cell *params)
 			gfm_tr->vecEndPos.y = amx_ctof(ptr[1]);
 			gfm_tr->vecEndPos.z = amx_ctof(ptr[2]);
 			return 1;
-			break;
 		}
 	case TR_flPlaneDist:
 		{
 			gfm_tr->flPlaneDist = amx_ctof(*ptr);
 			return 1;
-			break;
 		}
 	case TR_vecPlaneNormal:
 		{
@@ -80,7 +73,6 @@ static cell AMX_NATIVE_CALL set_tr(AMX *amx, cell *params)
 			gfm_tr->vecPlaneNormal.y = amx_ctof(ptr[1]);
 			gfm_tr->vecPlaneNormal.z = amx_ctof(ptr[2]);
 			return 1;
-			break;
 		}
 	case TR_pHit:
 		{
@@ -96,14 +88,12 @@ static cell AMX_NATIVE_CALL set_tr(AMX *amx, cell *params)
 		{
 			gfm_tr->iHitgroup = *ptr;
 			return 1;
-			break;
-		}
-	default:
-		{
-			MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
-			return 0;
 		}
 	}
+	
+	MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
+	
+	return 0;
 }
 
 static cell AMX_NATIVE_CALL get_tr(AMX *amx, cell *params)
@@ -116,29 +106,24 @@ static cell AMX_NATIVE_CALL get_tr(AMX *amx, cell *params)
 	case TR_AllSolid:
 		{
 			return gfm_tr->fAllSolid;
-			break;
 		}
 	case TR_StartSolid:
 		{
 			return gfm_tr->fStartSolid;
-			break;
 		}
 	case TR_InOpen:
 		{
 			return gfm_tr->fInOpen;
-			break;
 		}
 	case TR_InWater:
 		{
 			return gfm_tr->fInWater;
-			break;
 		}
 	case TR_flFraction:
 		{
 			ptr = MF_GetAmxAddr(amx, params[2]);
 			*ptr = amx_ftoc(gfm_tr->flFraction);
 			return 1;
-			break;
 		}
 	case TR_vecEndPos:
 		{
@@ -147,14 +132,12 @@ static cell AMX_NATIVE_CALL get_tr(AMX *amx, cell *params)
 			ptr[1] = amx_ftoc(gfm_tr->vecEndPos.y);
 			ptr[2] = amx_ftoc(gfm_tr->vecEndPos.z);
 			return 1;
-			break;
 		}
 	case TR_flPlaneDist:
 		{
 			ptr = MF_GetAmxAddr(amx, params[2]);
 			*ptr = amx_ftoc(gfm_tr->flPlaneDist);
 			return 1;
-			break;
 		}
 	case TR_vecPlaneNormal:
 		{
@@ -163,26 +146,21 @@ static cell AMX_NATIVE_CALL get_tr(AMX *amx, cell *params)
 			ptr[1] = amx_ftoc(gfm_tr->vecPlaneNormal.y);
 			ptr[2] = amx_ftoc(gfm_tr->vecPlaneNormal.z);
 			return 1;
-			break;
 		}
 	case TR_pHit:
 		{
 			if (FNullEnt(gfm_tr->pHit))
 				return -1;
 			return ENTINDEX(gfm_tr->pHit);
-			break;
 		}
 	case TR_iHitgroup:
 		{
 			return gfm_tr->iHitgroup;
-			break;
-		}
-	default:
-		{
-			MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
-			return 0;
 		}
 	}
+	MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
+	
+	return 0;
 }
 
 AMX_NATIVE_INFO tr_Natives[] = 

modules/fakemeta/fm_tr2.cpp

@@ -48,31 +48,26 @@ static cell AMX_NATIVE_CALL set_tr2(AMX *amx, cell *params)
 		{
 			tr->fAllSolid = *ptr;
 			return 1;
-			break;
 		}
 	case TR_InOpen:
 		{
 			tr->fInOpen = *ptr;
 			return 1;
-			break;
 		}
 	case TR_StartSolid:
 		{
 			tr->fStartSolid = *ptr;
 			return 1;
-			break;
 		}
 	case TR_InWater:
 		{
 			tr->fInWater = *ptr;
 			return 1;
-			break;
 		}
 	case TR_flFraction:
 		{
 			tr->flFraction = amx_ctof(*ptr);
 			return 1;
-			break;
 		}
 	case TR_vecEndPos:
 		{
@@ -80,13 +75,11 @@ static cell AMX_NATIVE_CALL set_tr2(AMX *amx, cell *params)
 			tr->vecEndPos.y = amx_ctof(ptr[1]);
 			tr->vecEndPos.z = amx_ctof(ptr[2]);
 			return 1;
-			break;
 		}
 	case TR_flPlaneDist:
 		{
 			tr->flPlaneDist = amx_ctof(*ptr);
 			return 1;
-			break;
 		}
 	case TR_vecPlaneNormal:
 		{
@@ -94,7 +87,6 @@ static cell AMX_NATIVE_CALL set_tr2(AMX *amx, cell *params)
 			tr->vecPlaneNormal.y = amx_ctof(ptr[1]);
 			tr->vecPlaneNormal.z = amx_ctof(ptr[2]);
 			return 1;
-			break;
 		}
 	case TR_pHit:
 		{
@@ -110,15 +102,11 @@ static cell AMX_NATIVE_CALL set_tr2(AMX *amx, cell *params)
 		{
 			tr->iHitgroup = *ptr;
 			return 1;
-			break;
-		}
-	default:
-		{
-			MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
-			return 0;
 		}
 	}
 
+	MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
+	
 	return 0;
 }
 
@@ -137,29 +125,24 @@ static cell AMX_NATIVE_CALL get_tr2(AMX *amx, cell *params)
 	case TR_AllSolid:
 		{
 			return tr->fAllSolid;
-			break;
 		}
 	case TR_InOpen:
 		{
 			return tr->fInOpen;
-			break;
 		}
 	case TR_StartSolid:
 		{
 			return tr->fStartSolid;
-			break;
 		}
 	case TR_InWater:
 		{
 			return tr->fInWater;
-			break;
 		}
 	case TR_flFraction:
 		{
 			ptr = MF_GetAmxAddr(amx, params[3]);
 			*ptr = amx_ftoc(tr->flFraction);
 			return 1;
-			break;
 		}
 	case TR_vecEndPos:
 		{
@@ -168,14 +151,12 @@ static cell AMX_NATIVE_CALL get_tr2(AMX *amx, cell *params)
 			ptr[1] = amx_ftoc(tr->vecEndPos.y);
 			ptr[2] = amx_ftoc(tr->vecEndPos.z);
 			return 1;
-			break;
 		}
 	case TR_flPlaneDist:
 		{
 			ptr = MF_GetAmxAddr(amx, params[3]);
 			*ptr = amx_ftoc(tr->flPlaneDist);
 			return 1;
-			break;
 		}
 	case TR_vecPlaneNormal:
 		{
@@ -184,27 +165,21 @@ static cell AMX_NATIVE_CALL get_tr2(AMX *amx, cell *params)
 			ptr[1] = amx_ftoc(tr->vecPlaneNormal.y);
 			ptr[2] = amx_ftoc(tr->vecPlaneNormal.z);
 			return 1;
-			break;
 		}
 	case TR_pHit:
 		{
 			if (FNullEnt(tr->pHit))
 				return -1;
 			return ENTINDEX(tr->pHit);
-			break;
 		}
 	case TR_iHitgroup:
 		{
 			return tr->iHitgroup;
-			break;
-		}
-	default:
-		{
-			MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
-			return 0;
 		}
 	}
 
+	MF_LogError(amx, AMX_ERR_NATIVE, "Unknown TraceResult member %d", params[2]);
+	
 	return 0;
 }
 
@@ -221,7 +196,6 @@ static cell AMX_NATIVE_CALL get_kvd(AMX *amx, cell *params)
 	case KV_fHandled:
 		{
 			return kvd->fHandled;
-			break;
 		}
 	case KV_ClassName:
 		{
@@ -232,7 +206,6 @@ static cell AMX_NATIVE_CALL get_kvd(AMX *amx, cell *params)
 			}
 			cell *ptr = MF_GetAmxAddr(amx, params[4]);
 			return MF_SetAmxString(amx, params[3], kvd->szClassName, (int)*ptr);
-			break;
 		}
 	case KV_KeyName:
 		{
@@ -243,7 +216,6 @@ static cell AMX_NATIVE_CALL get_kvd(AMX *amx, cell *params)
 			}
 			cell *ptr = MF_GetAmxAddr(amx, params[4]);
 			return MF_SetAmxString(amx, params[3], kvd->szKeyName, (int)*ptr);
-			break;
 		}
 	case KV_Value:
 		{
@@ -254,12 +226,11 @@ static cell AMX_NATIVE_CALL get_kvd(AMX *amx, cell *params)
 			}
 			cell *ptr = MF_GetAmxAddr(amx, params[4]);
 			return MF_SetAmxString(amx, params[3], kvd->szValue, (int)*ptr);
-			break;
 		}
 	}
 
 	MF_LogError(amx, AMX_ERR_NATIVE, "Invalid KeyValueData member: %d", params[2]);
-
+	
 	return 0;
 }
 
@@ -301,28 +272,24 @@ static cell AMX_NATIVE_CALL set_kvd(AMX *amx, cell *params)
 		{
 			kvd->fHandled = (int)*ptr;
 			return 1;
-			break;
 		}
 	case KV_ClassName:
 		{
 			kvdw->cls = MF_GetAmxString(amx, params[3], 0, &len);
 			kvd->szClassName = const_cast<char *>(kvdw->cls.chars());
 			return 1;
-			break;
 		}
 	case KV_KeyName:
 		{
 			kvdw->key = MF_GetAmxString(amx, params[3], 0, &len);
 			kvd->szKeyName = const_cast<char *>(kvdw->key.chars());
 			return 1;
-			break;
 		}
 	case KV_Value:
 		{
 			kvdw->val = MF_GetAmxString(amx, params[3], 0, &len);
 			kvd->szValue = const_cast<char *>(kvdw->val.chars());
 			return 1;
-			break;
 		}
 	}
 
@@ -1110,9 +1077,9 @@ static cell AMX_NATIVE_CALL set_es(AMX *amx, cell *params)
 		es->vuser3.z = amx_ctof(ptr[2]);
 		return 1;
 	case ES_vUser4:
-		es->vuser3.x = amx_ctof(ptr[0]);
-		es->vuser3.y = amx_ctof(ptr[1]);
-		es->vuser3.z = amx_ctof(ptr[2]);
+		es->vuser4.x = amx_ctof(ptr[0]);
+		es->vuser4.y = amx_ctof(ptr[1]);
+		es->vuser4.z = amx_ctof(ptr[2]);
 		return 1;
 	}
 
@@ -1255,7 +1222,7 @@ static cell AMX_NATIVE_CALL create_tr2(AMX *amx, cell *params)
 		tr = g_FreeTRs.front();
 		g_FreeTRs.pop();
 	}
-	memset(tr, 0, sizeof(TraceResult));
+	memset(static_cast<void *>(tr), 0, sizeof(TraceResult));
 	return reinterpret_cast<cell>(tr);
 }
 

modules/fakemeta/forward.cpp

@@ -80,8 +80,7 @@ static cell AMX_NATIVE_CALL fm_return(AMX *amx, cell *params)
 		}
 	default:
 		{
-		return 0;
-		break;
+			return 0;
 		}
 	}
 

modules/fun/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'fun')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
   '../../public/memtools/MemoryUtils.cpp',

modules/hamsandwich/config_parser.cpp

@@ -11,381 +11,46 @@
 // Ham Sandwich Module
 //
 
-#include "amxxmodule.h"
-
+#include <amxxmodule.h>
 #include "ham_const.h"
 #include "hooklist.h"
 #include "offsets.h"
-#include <amtl/am-string.h>
 
-extern hook_t hooklist[];
+IGameConfig *CommonConfig;
+IGameConfigManager *ConfigManager;
 
-enum
-{
-	LEX_INVALID = 0,
-
-	LEX_UNKNOWN,
-
-	LEX_START_SEC,
-	LEX_END_SEC,
-
-	LEX_MIRROR,
-
-	LEX_PEV,
-	LEX_BASE,
-
-	LEX_END
-};
-
-const char *tokens[] =
-{
-	"", // LEX_INVALID
-
-	"", // LEX_UNKNOWN
-
-	"@section", // LEX_START_SEC
-	"@end", // LEX_END_SEC
-
-	"@mirror", // LEX_MIRROR
-
-	"pev", // LEX_PEV
-	"base", // LEX_BASE
-
-	"", // LEX_END
-};
-
-static void trim_line(char *input);
-static void read_mirror(char *input);
-static void skip_to_end_of_section(FILE *fp);
-static int lex(char*& buffer);
-
-int lex(char*& buffer)
-{
-	trim_line(buffer);
-
-	size_t len;
-
-	for (int i=0; i<LEX_END; i++)
-	{
-		if (tokens[i]!=NULL && *(tokens[i])!='\0')
-		{
-			len=strlen(tokens[i]);
-			if (strncmp(buffer,tokens[i],len)==0)
-			{
-				buffer+=len+1;
-				return i;
-			}
-		}
-	}
-	return LEX_UNKNOWN;
-}
-
-// How we handle "mirrors"
-// We just note down the current mod name, and every time
-// we come across a mirror with the destination that matches
-// the current mod name, we change the current mod name to
-// the source for that mirror.
-
-char CurrentModName[64];
-
-static void read_mirror(char *input)
-{
-	char *data=input;
-	char *data2;
-
-	char source[64];
-	char dest[64];
-
-	char old;
-	while ( *data!=' ' &&
-			*data!='\t' &&
-			*data!='\0')
-	{
-
-		data++;
-	}
-
-	old=*data;
-	*data='\0';
-
-	// mark down the source
-	ke::SafeSprintf(source, sizeof(source), "%s", input);
-
-	*data=old;
-
-	while ( *data==' ' ||
-			*data=='\t')
-	{
-		data++;
-	}
-	data2=data;
-
-	while ( *data!=' ' &&
-			*data!='\t' &&
-			*data!='\0')
-	{
-		data++;
-	}
-	old=*data;
-	*data='\0';
-
-	ke::SafeSprintf(dest, sizeof(dest), "%s", data2);
-
-	*data=old;
-
-	if (strcmp(dest, CurrentModName)==0)
-	{
-		ke::SafeSprintf(CurrentModName, sizeof(CurrentModName), "%s", source);
-	}
-
-}
-
-static void trim_line(char *input)
-{
-	char *oldinput=input;
-	char *start=input;
-
-	while ( *start==' ' ||
-			*start=='\t' ||
-			*start=='\r' ||
-			*start=='\n')
-	{
-		start++;
-	}
-
-	// Overwrite the whitespace
-
-	if (start != input)
-	{
-		while ((*input++=*start++)!='\0')
-			/* do nothing */ ;
-	}
-
-	start=oldinput;
-
-	start+=strlen(start) - 1;
-
-	while ( start >= oldinput &&
-			( *start == '\0' ||
-			  *start == ' '  ||
-			  *start == '\r' ||
-			  *start == '\n' ||
-			  *start == '\t'))
-	{
-		start--;
-	}
-	start++;
-	*start='\0';
-
-	// Now find any comments and cut off at the start
-
-	while (*start != '\0')
-	{
-		if (*start == ';')
-		{
-			*start='\0';
-			break;
-		}
-
-		start++;
-	}
-}
-
-void skip_to_end_of_section(FILE *fp)
-{
-	char buffer[1024];
-
-	while (!feof(fp))
-	{
-		buffer[0]='\0';
-
-		fgets(buffer, sizeof(buffer)-1, fp);
-
-		trim_line(buffer);
-
-		char *b=&buffer[0];
-		if (lex(b)==LEX_END_SEC)
-		{
-			break;
-		}
-	}
-}
-static const char* get_localinfo( const char* name , const char* def = 0 )
-{
-	const char* b = LOCALINFO( (char*)name );
-	if (((b==0)||(*b==0)) && def )
-		SET_LOCALINFO((char*)name,(char*)(b = def) );
-	return b;
-}
-int read_start_section(char *data)
-{
-	if (strncasecmp(data, CurrentModName, strlen(CurrentModName))==0)
-	{
-		data+=strlen(CurrentModName)+1;
-		trim_line(data);
-
-#ifdef _WIN32
-		if (strcmp(data, "windows")==0)
-#elif defined(__linux__)
-		if (strcmp(data, "linux")==0)
-#elif defined(__APPLE__)
-		if (strcmp(data, "mac")==0)
-#endif
-		{
-			return 1;
-		}
-	}
-	return 0;
-}
-int read_number(char *input)
-{
-	char *end; /* Temporary pointer, needed for strtoul(). */
-
-	// if begins with 0x or 0X it's to be interpretted as hex
-	if (*input=='0' &&
-		(*(input+1)=='x' || *(input+1)=='X'))
-	{
-		return strtoul(input,&end,16);
-	}
-
-	// otherwise it's to be interpretted as base 10
-	return strtoul(input,&end,10);
-}
-void process_pev(char *data)
-{
-	trim_line(data);
-	Offsets.SetPev(read_number(data));
-}
-void process_base(char *data)
-{
-	trim_line(data);
-	Offsets.SetBase(read_number(data));
-}
-void process_key(char *data)
-{
-	size_t size=0;
-
-	char *a=data;
-
-	while (*a != ' ' && *a != '\t' && *a != '\0')
-	{
-		a++;
-		size++;
-	}
-
-	if (size==0)
-	{
-		return;
-	}
-	int set=0;
-	for (int i=0; i< HAM_LAST_ENTRY_DONT_USE_ME_LOL; i++)
-	{
-		if (strncmp(data, hooklist[i].name, size)==0)
-		{
-			data+=size+1;
-
-			trim_line(data);
-			int value=read_number(data);
-
-			hooklist[i].isset=1;
-			hooklist[i].vtid=value;
-
-
-			set=1;
-			break;
-
-		}
-	}
-
-	if (set==0)
-	{
-		printf("stray key in process_key: %s\n", data);
-	}
-
-}
 int ReadConfig(void)
 {
-	char FileName[512];
+	ConfigManager = MF_GetConfigManager();
 
-	MF_BuildPathnameR(FileName,sizeof(FileName),"%s",get_localinfo("amxx_configsdir","addons/amxmodx/configs"));
+	char error[256] = "";
 
-	strncat(FileName,"/hamdata.ini",sizeof(FileName)-1);
-
-	FILE *fp=fopen(FileName,"r");
-
-
-	ke::SafeSprintf(CurrentModName, sizeof(CurrentModName), "%s", MF_GetModname());
-
-	if (!fp)
+	if (!ConfigManager->LoadGameConfigFile("common.games", &CommonConfig, error, sizeof error))
 	{
-		MF_Log("Unable to open \"%s\" for reading.", FileName);
-
+		MF_Log("common.games gamedata could not be read: %s", error);
 		return -1;
 	}
 
-	char data[2048];
+	TypeDescription value;
 
-	int insec=0;
-
-	while (!feof(fp))
+	if (CommonConfig->GetOffset("pev", &value))
 	{
-		data[0]='\0';
-
-		fgets(data, sizeof(data)-1, fp);
-
-		char *b=&data[0];
-
-		switch(lex(b))
-		{
-		case LEX_PEV:
-			{
-				if (insec)
-				{
-					process_pev(b);
-				}
-				break;
-			};
-		case LEX_BASE:
-			{
-				if (insec)
-				{
-					process_base(b);
-				}
-				break;
-			};
-		case LEX_MIRROR:
-			{
-				read_mirror(b);
-				break;
-			};
-		case LEX_START_SEC:
-			{
-				insec=read_start_section(b);
-
-				if (!insec)
-				{
-					skip_to_end_of_section(fp);
-				}
-				break;
-			};
-		case LEX_END_SEC:
-			{
-				insec=0;
-				break;
-			};
-		case LEX_UNKNOWN:
-			{
-				if (insec)
-				{
-					process_key(b);
-				}
-			};
-		}
-
-
+		Offsets.SetPev(value.fieldOffset);
 	}
 
-	fclose(fp);
+	if (CommonConfig->GetOffset("base", &value))
+	{
+		Offsets.SetBase(value.fieldOffset);
+	}
+
+	for (auto index = 0; index < HAM_LAST_ENTRY_DONT_USE_ME_LOL; ++index)
+	{
+		if (CommonConfig->GetOffset(hooklist[index].name, &value))
+		{
+			hooklist[index].isset = 1;
+			hooklist[index].vtid = value.fieldOffset;
+		}
+	}
 
 	return 1;
 }

modules/hamsandwich/ham_const.h

@@ -558,7 +558,7 @@ enum
 	HAM_OK = 0,
 	
 	HAM_INVALID_FUNC,			// The function is not valid
-	HAM_FUNC_NOT_CONFIGURED,	// This function is not configured in hamdata.ini
+	HAM_FUNC_NOT_CONFIGURED,	// This function is not configured in gamedata
 	HAM_FUNC_NOT_AVAILABLE,		// This function is not more available in the mod
 
 	HAM_ERR_END

modules/hamsandwich/ham_utils.h

@@ -33,7 +33,7 @@ extern HLTypeConversion TypeConversion;
 		return 0;																					\
 	} else if (hooklist[x].isset == 0) {															\
 		char msg[1024];																				\
-		ke::SafeSprintf(msg, sizeof(msg), "Function %s is not configured in hamdata.ini.", hooklist[x].name);	\
+		ke::SafeSprintf(msg, sizeof(msg), "Function %s is not configured in gamedata.", hooklist[x].name);	\
 		FailPlugin(amx, x, HAM_FUNC_NOT_CONFIGURED, msg);											\
 		return 0;																					\
 	}

modules/hamsandwich/hook_callbacks.cpp

@@ -136,7 +136,7 @@ extern bool gDoForwards;
 #define CHECK_RETURN_VEC()												\
 		if (thisresult < HAM_OVERRIDE)									\
 		{																\
-			memcpy(out, &origret, sizeof(Vector));						\
+			memcpy(static_cast<void *>(out), &origret, sizeof(Vector));						\
 			return;							\
 		}
 
@@ -852,8 +852,8 @@ void Hook_Vector_Float_Cbase_Int(Hook *hook, Vector *out, void *pthis, float f1,
 
 	MAKE_VECTOR()
 
-	memset(&ret, 0x0, sizeof(Vector));
-	memset(&origret, 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&ret), 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&origret), 0x0, sizeof(Vector));
 
 	int iEnt = TypeConversion.cbase_to_id(cb);
 	
@@ -879,7 +879,7 @@ void Hook_Vector_Float_Cbase_Int(Hook *hook, Vector *out, void *pthis, float f1,
 	POP()
 
 	CHECK_RETURN_VEC()
-	memcpy(out, &ret, sizeof(Vector));
+	memcpy(static_cast<void *>(out), &ret, sizeof(Vector));
 }
 
 void Hook_Void_Cbase_Cbase_Int_Float(Hook *hook, void *pthis, void *cb1, void *cb2, int i1, float f1)
@@ -1038,8 +1038,8 @@ void Hook_Vector_Void(Hook *hook, Vector *out, void *pthis)
 
 	MAKE_VECTOR()
 
-	memset(&ret, 0x0, sizeof(Vector));
-	memset(&origret, 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&ret), 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&origret), 0x0, sizeof(Vector));
 
 	PRE_START()
 	PRE_END()
@@ -1056,7 +1056,7 @@ void Hook_Vector_Void(Hook *hook, Vector *out, void *pthis)
 	KILL_VECTOR()
 	POP()
 	CHECK_RETURN_VEC()
-	memcpy(out, &ret, sizeof(Vector));
+	memcpy(static_cast<void *>(out), &ret, sizeof(Vector));
 
 }
 
@@ -1074,8 +1074,8 @@ void Hook_Vector_pVector(Hook *hook, Vector *out, void *pthis, Vector *v1)
 	MAKE_VECTOR()
 	P_PTRVECTOR(v1)
 
-	memset(&ret, 0x0, sizeof(Vector));
-	memset(&origret, 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&ret), 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&origret), 0x0, sizeof(Vector));
 
 	PRE_START()
 		, MF_PrepareCellArrayA(reinterpret_cast<cell *>(v1), 3, false)
@@ -1094,7 +1094,7 @@ void Hook_Vector_pVector(Hook *hook, Vector *out, void *pthis, Vector *v1)
 	KILL_VECTOR()
 	POP()
 	CHECK_RETURN_VEC()
-	memcpy(out, &ret, sizeof(Vector));
+	memcpy(static_cast<void *>(out), &ret, sizeof(Vector));
 }
 
 int Hook_Int_pVector(Hook *hook, void *pthis, Vector *v1)
@@ -1476,8 +1476,8 @@ void Hook_Vector_Float(Hook *hook, Vector *out, void *pthis, float f1)
 	MAKE_VECTOR()
 	P_FLOAT(f1)
 
-	memset(&ret, 0x0, sizeof(Vector));
-	memset(&origret, 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&ret), 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&origret), 0x0, sizeof(Vector));
 
 	PRE_START()
 		, f1
@@ -1496,7 +1496,7 @@ void Hook_Vector_Float(Hook *hook, Vector *out, void *pthis, float f1)
 	KILL_VECTOR()
 	POP()
 	CHECK_RETURN_VEC()
-	memcpy(out, &ret, sizeof(Vector));
+	memcpy(static_cast<void *>(out), &ret, sizeof(Vector));
 
 }
 
@@ -3269,8 +3269,8 @@ void Hook_Vector_Vector_Vector_Vector(Hook *hook, Vector *out, void *pthis, Vect
 	P_VECTOR(v2)
 	P_VECTOR(v3)
 
-	memset(&ret, 0x0, sizeof(Vector));
-	memset(&origret, 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&ret), 0x0, sizeof(Vector));
+	memset(static_cast<void *>(&origret), 0x0, sizeof(Vector));
 
 	PRE_START()
 		, MF_PrepareCellArrayA(reinterpret_cast<cell *>(&v1), 3, false)
@@ -3294,7 +3294,7 @@ void Hook_Vector_Vector_Vector_Vector(Hook *hook, Vector *out, void *pthis, Vect
 	POP()
 	CHECK_RETURN_VEC()
 
-	memcpy(out, &ret, sizeof(Vector));
+	memcpy(static_cast<void *>(out), &ret, sizeof(Vector));
 }
 
 const char *Hook_Str_Str(Hook *hook, void *pthis, const char* str)

modules/json/IJsonMngr.h

@@ -232,6 +232,15 @@ namespace AMXX
 			 */
 			virtual const char *ValueToString(JS_Handle value) = 0;
 
+			/**
+			 * @brief                 Gets a string data length.
+			 *
+			 * @param value           JSON handle
+			 *
+			 * @return                Length of string data
+			 */
+			virtual size_t ValueToStringLen(JS_Handle value) = 0;
+
 			/**
 			 * @brief                 Gets a number.
 			 *
@@ -277,6 +286,16 @@ namespace AMXX
 			 */
 			virtual const char *ArrayGetString(JS_Handle array, size_t index) = 0;
 
+			/**
+			 * @brief                 Gets string data length from the array.
+			 *
+			 * @param array           JSON handle
+			 * @param index           Position in the array (starting from 0)
+			 *
+			 * @return                Length of string data
+			 */
+			virtual size_t ArrayGetStringLen(JS_Handle array, size_t index) = 0;
+
 			/**
 			 * @brief                 Gets a number from the array.
 			 *
@@ -468,6 +487,20 @@ namespace AMXX
 			 */
 			virtual const char *ObjectGetString(JS_Handle object, const char *name, bool dotfunc = false) = 0;
 
+			/**
+			 * @brief                 Gets string data length from the object.
+			 *
+			 * @note                  If dot notation is used some values may be inaccessible
+			 *                        because valid names in JSON can contain dots.
+			 *
+			 * @param object          JSON handle
+			 * @param name            Key name
+			 * @param dotfunc         True to use dot notation, false to not
+			 *
+			 * @return                Length of string data
+			 */
+			virtual size_t ObjectGetStringLen(JS_Handle object, const char *name, bool dotfunc = false) = 0;
+
 			/**
 			 * @brief                 Gets a number from the object.
 			 *
@@ -696,6 +729,15 @@ namespace AMXX
 			 */
 			virtual char *SerialToString(JS_Handle value, bool pretty) = 0;
 
+			/**
+			 * @brief                 Slashes should be escaped or not when serializing JSON.
+			 *
+			 * @note                  This function sets a global setting and is not thread safe.
+			 *
+			 * @param escape_slashes  True to escape slashes, false to not
+			 */
+			virtual void EscapeSlashes(int escape_slashes) = 0;
+
 			/**
 			 * @brief                 Frees serialized string.
 			 *

modules/json/JsonMngr.cpp

@@ -465,3 +465,8 @@ char *JSONMngr::SerialToString(JS_Handle value, bool pretty)
 
 	return (result) ? result : nullptr;
 }
+
+void JSONMngr::EscapeSlashes(int escape_slashes)
+{
+	json_set_escape_slashes(escape_slashes);
+}

modules/json/JsonMngr.h

@@ -69,6 +69,10 @@ class JSONMngr : public IJSONMngr
 
 	// Convert functions
 	const char *ValueToString(JS_Handle value) override;
+	inline size_t ValueToStringLen(JS_Handle value) override
+	{
+		return json_value_get_string_len(m_Handles[value]->m_pValue);
+	}
 	inline double ValueToNum(JS_Handle value) override
 	{
 		return json_value_get_number(m_Handles[value]->m_pValue);
@@ -81,6 +85,10 @@ class JSONMngr : public IJSONMngr
 	// Wrappers for Array API
 	bool ArrayGetValue(JS_Handle array, size_t index, JS_Handle *handle) override;
 	const char *ArrayGetString(JS_Handle array, size_t index) override;
+	inline size_t ArrayGetStringLen(JS_Handle array, size_t index) override
+	{
+		return json_array_get_string_len(m_Handles[array]->m_pArray, index);
+	}
 	inline bool ArrayGetBool(JS_Handle array, size_t index) override
 	{
 		return json_array_get_boolean(m_Handles[array]->m_pArray, index) == 1;
@@ -142,6 +150,15 @@ class JSONMngr : public IJSONMngr
 	// Get functions
 	bool ObjectGetValue(JS_Handle object, const char *name, JS_Handle *handle, bool dotfunc) override;
 	const char *ObjectGetString(JS_Handle object, const char *name, bool dotfunc) override;
+	inline size_t ObjectGetStringLen(JS_Handle object, const char *name, bool dotfunc) override
+	{
+		if (!dotfunc)
+		{
+			return json_object_get_string_len(m_Handles[object]->m_pObject, name);
+		}
+
+		return json_object_dotget_string_len(m_Handles[object]->m_pObject, name);
+	}
 	double ObjectGetNum(JS_Handle object, const char *name, bool dotfunc) override;
 	bool ObjectGetBool(JS_Handle object, const char *name, bool dotfunc) override;
 	inline size_t ObjectGetCount(JS_Handle object) override
@@ -171,6 +188,7 @@ class JSONMngr : public IJSONMngr
 	bool SerialToBuffer(JS_Handle value, char *buffer, size_t size, bool pretty) override;
 	bool SerialToFile(JS_Handle value, const char *filepath, bool pretty) override;
 	char *SerialToString(JS_Handle value, bool pretty) override;
+	void EscapeSlashes(int escape_slashes) override;
 	inline void FreeString(char *string) override
 	{
 		json_free_serialized_string(string);

modules/json/JsonNatives.cpp

@@ -231,6 +231,19 @@ static cell AMX_NATIVE_CALL amxx_json_get_number(AMX *amx, cell *params)
 	return static_cast<cell>(JsonMngr->ValueToNum(value));
 }
 
+//native json_get_string_len(const JSON:value);
+static cell AMX_NATIVE_CALL amxx_json_get_string_len(AMX *amx, cell *params)
+{
+	auto value = params[1];
+	if (!JsonMngr->IsValidHandle(value))
+	{
+		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid JSON value! %d", value);
+		return 0;
+	}
+
+	return JsonMngr->ValueToStringLen(value);
+}
+
 //native Float:json_get_real(const JSON:value);
 static cell AMX_NATIVE_CALL amxx_json_get_real(AMX *amx, cell *params)
 {
@@ -290,6 +303,19 @@ static cell AMX_NATIVE_CALL amxx_json_array_get_string(AMX *amx, cell *params)
 	return MF_SetAmxStringUTF8Char(amx, params[3], string, strlen(string), params[4]);
 }
 
+//native json_array_get_string_len(const JSON:array, index);
+static cell AMX_NATIVE_CALL amxx_json_array_get_string_len(AMX *amx, cell *params)
+{
+	auto array = params[1];
+	if (!JsonMngr->IsValidHandle(array, Handle_Array))
+	{
+		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid JSON array! %d", array);
+		return 0;
+	}
+
+	return JsonMngr->ArrayGetStringLen(array, params[2]);
+}
+
 //native json_array_get_number(const JSON:array, index);
 static cell AMX_NATIVE_CALL amxx_json_array_get_number(AMX *amx, cell *params)
 {
@@ -578,6 +604,22 @@ static cell AMX_NATIVE_CALL amxx_json_object_get_string(AMX *amx, cell *params)
 	return MF_SetAmxStringUTF8Char(amx, params[3], string, strlen(string), params[4]);
 }
 
+//native json_object_get_string_len(const JSON:object, const name[], bool:dotfunc = false);
+static cell AMX_NATIVE_CALL amxx_json_object_get_string_len(AMX *amx, cell *params)
+{
+	auto object = params[1];
+	if (!JsonMngr->IsValidHandle(object, Handle_Object))
+	{
+		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid JSON object! %d", object);
+		return 0;
+	}
+
+	int len;
+	auto name = MF_GetAmxString(amx, params[2], 0, &len);
+
+	return JsonMngr->ObjectGetStringLen(object, name, params[3] != 0);
+}
+
 //native json_object_get_number(const JSON:object, const name[], bool:dotfunc = false);
 static cell AMX_NATIVE_CALL amxx_json_object_get_number(AMX *amx, cell *params)
 {
@@ -871,6 +913,13 @@ static cell AMX_NATIVE_CALL amxx_json_serial_to_file(AMX *amx, cell *params)
 	return JsonMngr->SerialToFile(value, path, params[3] != 0);
 }
 
+//native json_set_escape_slashes(bool:escape_slashes = true);
+static cell AMX_NATIVE_CALL amxx_json_set_escape_slashes(AMX *amx, cell *params)
+{
+	JsonMngr->EscapeSlashes(params[1] != 0);
+	return 1;
+}
+
 AMX_NATIVE_INFO JsonNatives[] =
 {
 	{ "json_parse",                     amxx_json_parse },
@@ -888,11 +937,13 @@ AMX_NATIVE_INFO JsonNatives[] =
 	{ "json_deep_copy",                 amxx_json_deep_copy },
 	{ "json_free",                      amxx_json_free },
 	{ "json_get_string",                amxx_json_get_string },
+	{ "json_get_string_len",            amxx_json_get_string_len },
 	{ "json_get_number",                amxx_json_get_number },
 	{ "json_get_real",                  amxx_json_get_real },
 	{ "json_get_bool",                  amxx_json_get_bool },
 	{ "json_array_get_value",           amxx_json_array_get_value },
 	{ "json_array_get_string",          amxx_json_array_get_string },
+	{ "json_array_get_string_len",      amxx_json_array_get_string_len },
 	{ "json_array_get_count",           amxx_json_array_get_count },
 	{ "json_array_get_number",          amxx_json_array_get_number },
 	{ "json_array_get_real",            amxx_json_array_get_real },
@@ -913,6 +964,7 @@ AMX_NATIVE_INFO JsonNatives[] =
 	{ "json_array_clear",               amxx_json_array_clear },
 	{ "json_object_get_value",          amxx_json_object_get_value },
 	{ "json_object_get_string",         amxx_json_object_get_string },
+	{ "json_object_get_string_len",     amxx_json_object_get_string_len },
 	{ "json_object_get_number",         amxx_json_object_get_number },
 	{ "json_object_get_real",           amxx_json_object_get_real },
 	{ "json_object_get_bool",           amxx_json_object_get_bool },
@@ -931,6 +983,7 @@ AMX_NATIVE_INFO JsonNatives[] =
 	{ "json_serial_size",               amxx_json_serial_size },
 	{ "json_serial_to_string",          amxx_json_serial_to_string },
 	{ "json_serial_to_file",            amxx_json_serial_to_file },
+	{ "json_set_escape_slashes",        amxx_json_set_escape_slashes },
 	{ nullptr,                          nullptr }
 };
 

modules/mysqlx/AMBuilder

@@ -17,18 +17,18 @@ if AMXX.mysql_path:
 
   binary.sources = []
 
-  if builder.target_platform is 'linux' or builder.target_platform is 'mac':
+  if builder.target_platform == 'linux' or builder.target_platform == 'mac':
     binary.compiler.defines += ['stricmp=strcasecmp']
     binary.compiler.linkflags += [
       os.path.join(AMXX.mysql_path, 'lib', 'libmysqlclient_r.a'),
       '-lpthread',
       '-lm',
     ]
-    if builder.target_platform is 'linux':
+    if builder.target_platform == 'linux':
       binary.compiler.linkflags += [
         '-lrt'
       ]
-  elif builder.target_platform is 'windows':
+  elif builder.target_platform == 'windows':
     binary.compiler.linkflags += [
       os.path.join(AMXX.mysql_path, 'lib', 'mysqlclient.lib'),
       'ws2_32.lib',

modules/mysqlx/basic_sql.cpp

@@ -277,7 +277,6 @@ static cell AMX_NATIVE_CALL SQL_ReadResult(AMX *amx, cell *params)
 		{
 			int num = row->GetInt(col);
 			return num;
-			break;
 		}
 	default:
 		{

modules/mysqlx/oldcompat_sql.cpp

@@ -247,7 +247,6 @@ static cell AMX_NATIVE_CALL dbi_field(AMX *amx, cell *params)
 	case 2:
 		{
 			return atoi(data);
-			break;
 		}
 	case 3:
 		{
@@ -255,12 +254,10 @@ static cell AMX_NATIVE_CALL dbi_field(AMX *amx, cell *params)
 			REAL fdata = atof(data);
 			*destaddr = amx_ftoc(fdata);
 			return 1;
-			break;
 		}
 	case 4:
 		{
 			return MF_SetAmxString(amx, params[3], data, params[4]);
-			break;
 		}
 	}
 
@@ -315,7 +312,6 @@ static cell AMX_NATIVE_CALL dbi_result(AMX *amx, cell *params)
 	case 2:
 		{
 			return atoi(data);
-			break;
 		}
 	case 3:
 		{
@@ -323,12 +319,10 @@ static cell AMX_NATIVE_CALL dbi_result(AMX *amx, cell *params)
 			REAL fdata = atof(data);
 			*destaddr = amx_ftoc(fdata);
 			return 1;
-			break;
 		}
 	case 4:
 		{
 			return MF_SetAmxString(amx, params[3], data, params[4]);
-			break;
 		}
 	}
 

modules/mysqlx/threading.cpp

@@ -178,7 +178,7 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
 
 	float save_time = m_qrInfo.queue_time;
 
-	memset(&m_qrInfo, 0, sizeof(m_qrInfo));
+	memset(static_cast<void *>(&m_qrInfo), 0, sizeof(m_qrInfo));
 
 	m_qrInfo.queue_time = save_time;
 

modules/nvault/amxxapi.cpp

@@ -115,20 +115,17 @@ static cell nvault_get(AMX *amx, cell *params)
 	case 2:
 		{
 			return atoi(val);
-			break;
 		}
 	case 3:
 		{
 			cell *fAddr = MF_GetAmxAddr(amx, params[3]);
 			*fAddr = amx_ftoc((REAL)atof(val));
 			return 1;
-			break;
 		}
 	case 4:
 		{
 			len = *(MF_GetAmxAddr(amx, params[4]));
 			return MF_SetAmxString(amx, params[3], val, len);
-			break;
 		}
 	}
 

modules/regex/CRegEx.cpp

@@ -654,7 +654,7 @@ int RegEx::Replace(char *text, size_t textMaxLen, const char *replace, size_t re
 							 * $nn or ${nn}
 							 *   ^       ^
 							 */
-							if (*walk && *walk >= '0' && *walk <= '9')
+							if (*walk >= '0' && *walk <= '9')
 							{
 								backref = backref * 10 + *walk - '0';
 								++walk;

modules/sqlite/AMBuilder

@@ -12,7 +12,7 @@ binary.compiler.defines += [
   'HAVE_STDINT_H',
 ]
 
-if builder.target_platform is 'linux' or builder.target_platform is 'mac':
+if builder.target_platform == 'linux' or builder.target_platform == 'mac':
   binary.compiler.defines += ['stricmp=strcasecmp']
   binary.compiler.postlink += ['-lpthread']
 

modules/sqlite/basic_sql.cpp

@@ -273,7 +273,6 @@ static cell AMX_NATIVE_CALL SQL_ReadResult(AMX *amx, cell *params)
 		{
 			int num = row->GetInt(col);
 			return num;
-			break;
 		}
 	default:
 		{

modules/sqlite/oldcompat_sql.cpp

@@ -245,7 +245,6 @@ static cell AMX_NATIVE_CALL dbi_field(AMX *amx, cell *params)
 	case 2:
 		{
 			return atoi(data);
-			break;
 		}
 	case 3:
 		{
@@ -253,12 +252,10 @@ static cell AMX_NATIVE_CALL dbi_field(AMX *amx, cell *params)
 			REAL fdata = atof(data);
 			*destaddr = amx_ftoc(fdata);
 			return 1;
-			break;
 		}
 	case 4:
 		{
 			return MF_SetAmxString(amx, params[3], data, params[4]);
-			break;
 		}
 	}
 
@@ -309,7 +306,6 @@ static cell AMX_NATIVE_CALL dbi_result(AMX *amx, cell *params)
 	case 2:
 		{
 			return atoi(data);
-			break;
 		}
 	case 3:
 		{
@@ -317,12 +313,10 @@ static cell AMX_NATIVE_CALL dbi_result(AMX *amx, cell *params)
 			REAL fdata = atof(data);
 			*destaddr = amx_ftoc(fdata);
 			return 1;
-			break;
 		}
 	case 4:
 		{
 			return MF_SetAmxString(amx, params[3], data, params[4]);
-			break;
 		}
 	}
 

modules/sqlite/threading.cpp

@@ -162,7 +162,7 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
 
 	float save_time = m_qrInfo.queue_time;
 
-	memset(&m_qrInfo, 0, sizeof(m_qrInfo));
+	memset(static_cast<void *>(&m_qrInfo), 0, sizeof(m_qrInfo));
 
 	m_qrInfo.queue_time = save_time;
 

modules/tfcx/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'tfcx')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../public/sdk/amxxmodule.cpp',
   'CRank.cpp',

modules/tfcx/CMisc.cpp

@@ -126,11 +126,11 @@ void CPlayer::Connect(const char* address ){
 
 void CPlayer::restartStats(bool all)
 {
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
-	memset(&life,0,sizeof(life));
+	if ( all ) memset(&weapons,0,sizeof(weapons));
+	memset(&weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
+	life = {};
 }
 
 void CPlayer::Init( int pi, edict_t* pe )

modules/tfcx/CMisc.h

@@ -161,10 +161,10 @@ struct CPlayer {
 		int	clip;
 	};
 
-	PlayerWeapon	weapons[MAX_WEAPONS];
+	PlayerWeapon	weapons[TFCMAX_WEAPONS];
 	PlayerWeapon	attackers[33];
 	PlayerWeapon	victims[33];
-	Stats			weaponsRnd[MAX_WEAPONS]; // DEC-Weapon (Round) stats
+	Stats			weaponsRnd[TFCMAX_WEAPONS]; // DEC-Weapon (Round) stats
 	Stats			life;
 
 	int teamId;

modules/tfcx/NRank.cpp

@@ -262,10 +262,10 @@ static cell AMX_NATIVE_CALL cwpn_dmg(AMX *amx, cell *params){ // wid,att,vic,dmg
 	CPlayer* pAtt = GET_PLAYER_POINTER_I(att);
 	CPlayer* pVic = GET_PLAYER_POINTER_I(vic);
 
+	if ( !pAtt ) pAtt = pVic;
 	pVic->pEdict->v.dmg_inflictor = NULL;
 	pAtt->saveHit( pVic , weapon , dmg, aim );
 
-	if ( !pAtt ) pAtt = pVic;
 	int TA = 0;
 	if ( (pVic->pEdict->v.team == pAtt->pEdict->v.team ) && ( pVic != pAtt) )
 		TA = 1;

modules/tfcx/Utils.cpp

@@ -47,7 +47,7 @@ bool isModuleActive(){
 
 bool util_strncmp( const char *sz1, const char *sz2, int size){
 	int i = 0;
-	while( sz1[i] && i<=size){
+	while( i<=size && sz1[i] ){
 		if ( sz1[i] != sz2[i] )
 			return false;
 		i++;

modules/tfcx/usermsg.cpp

@@ -46,7 +46,7 @@ void Client_WeaponList(void* mValue){
     break;
   case 7:
     int iId = *(int*)mValue;
-    if ( (iId < 0 || iId >= MAX_WEAPONS ) || ( wpnList & (1<<iId) ) )
+    if ( (iId < 0 || iId >= TFCMAX_WEAPONS ) || ( wpnList & (1<<iId) ) )
       break;
 
     wpnList |= (1<<iId);
@@ -340,7 +340,7 @@ void Client_AmmoX(void* mValue){
 	}
 	//
 
-    for(int i = 1; i < MAX_WEAPONS ; ++i) 
+    for(int i = 1; i < TFCMAX_WEAPONS ; ++i) 
       if (iAmmo == weaponData[i].ammoSlot)
         mPlayer->weapons[i].ammo = *(int*)mValue;
   }
@@ -355,7 +355,7 @@ void Client_AmmoPickup(void* mValue){
     break;
   case 1:
 	if (!mPlayer ) break;
-    for(int i = 1; i < MAX_WEAPONS ; ++i)
+    for(int i = 1; i < TFCMAX_WEAPONS ; ++i)
       if (weaponData[i].ammoSlot == iSlot)
         mPlayer->weapons[i].ammo += *(int*)mValue;
   }

modules/ts/tsfun/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'tsfun')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
 ]

modules/ts/tsx/AMBuilder

@@ -3,6 +3,10 @@ import os.path
 
 binary = AMXX.MetaModule(builder, 'tsx')
 
+binary.compiler.defines += [
+  'HAVE_STDINT_H',
+]
+
 binary.sources = [
   '../../../public/sdk/amxxmodule.cpp',
   'CMisc.cpp',

modules/ts/tsx/CMisc.cpp

@@ -78,11 +78,11 @@ void CPlayer::Connect(const char* ippp)
 
 void CPlayer::restartStats(bool all)
 {
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
-	memset(&life,0,sizeof(life));
+	if ( all ) memset(&weapons,0,sizeof(weapons));
+	memset(&weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
+	life = {};
 }
 
 void CPlayer::Init( int pi, edict_t* pe )

modules/ts/tsx/NRank.cpp

@@ -295,10 +295,10 @@ static cell AMX_NATIVE_CALL cwpn_dmg(AMX *amx, cell *params){ // wid,att,vic,dmg
 	CPlayer* pAtt = GET_PLAYER_POINTER_I(att);
 	CPlayer* pVic = GET_PLAYER_POINTER_I(vic);
 
+	if ( !pAtt ) pAtt = pVic;
 	pVic->pEdict->v.dmg_inflictor = NULL;
 	pAtt->saveHit( pVic , weapon , dmg, aim );
-
-	if ( !pAtt ) pAtt = pVic;
+	
 	int TA = 0;
 	if ( (pVic->pEdict->v.team == pAtt->pEdict->v.team ) && ( pVic != pAtt) )
 		TA = 1;

modules/ts/tsx/usermsg.cpp

@@ -122,7 +122,8 @@ void Client_TSHealth_End(void* mValue){
 			
 			weapon = 37; // throwing knife
 			aim = pAttacker ? pAttacker->aiming : 0;
-			pAttacker->saveHit( mPlayer , weapon , damage, aim );
+			if (pAttacker)
+				pAttacker->saveHit( mPlayer , weapon , damage, aim );
 		}
 	}
 	if ( !pAttacker ) pAttacker = mPlayer;