Tagged 1.76b

Neither is still as accurate as I want them to be though :\

amxmodx/CEvent.cpp

@@ -425,7 +425,7 @@ void EventsMngr::executeEvents()
 		}
 		
 		(*iter).m_Stamp = (float)*m_Timer;
-		executeForwards((*iter).m_Func, m_ParseVault ? m_ParseVault[0].iValue : 0);
+		executeForwards((*iter).m_Func, static_cast<cell>(m_ParseVault ? m_ParseVault[0].iValue : 0));
 	}
 
 	m_CurrentMsgType = -1;

amxmodx/CForward.cpp

@@ -31,8 +31,9 @@
 
 #include "amxmodx.h"
 #include "debugger.h"
+#include "binlog.h"
 
-CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes)
+CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes, int fwd_type)
 {
 	m_FuncName = name;
 	m_ExecType = et;
@@ -42,11 +43,17 @@ CForward::CForward(const char *name, ForwardExecType et, int numParams, const Fo
 	
 	// find funcs
 	int func;
-	AMXForward *tmp = NULL;
 	m_Funcs.clear();
 	
 	for (CPluginMngr::iterator iter = g_plugins.begin(); iter; ++iter)
 	{
+		if ((fwd_type != FORWARD_ALL) &&
+			((fwd_type == FORWARD_ONLY_NEW && ((*iter).getAMX()->flags & AMX_FLAG_OLDFILE))
+			|| (fwd_type == FORWARD_ONLY_OLD && !((*iter).getAMX()->flags & AMX_FLAG_OLDFILE))
+			))
+		{
+			continue;
+		}
 		if ((*iter).isValid() && amx_FindPublic((*iter).getAMX(), name, &func) == AMX_ERR_NONE)
 		{
 			AMXForward tmp;
@@ -55,6 +62,8 @@ CForward::CForward(const char *name, ForwardExecType et, int numParams, const Fo
 			m_Funcs.push_back(tmp);
 		}
 	}
+
+	m_Name.assign(name);
 }
 
 cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
@@ -66,8 +75,6 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 
 	cell globRetVal = 0;
 
-	unsigned int id = 0;
-
 	AMXForwardList::iterator iter;
 
 	for (iter = m_Funcs.begin(); iter != m_Funcs.end(); iter++)
@@ -82,15 +89,18 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 				pDebugger->BeginExec();
 			
 			// handle strings & arrays
-			int i, ax = 0;
+			int i;
 			
 			for (i = 0; i < m_NumParams; ++i)
 			{
 				if (m_ParamTypes[i] == FP_STRING || m_ParamTypes[i] == FP_STRINGEX)
 				{
+					const char *str = reinterpret_cast<const char*>(params[i]);
 					cell *tmp;
-					amx_Allot(iter->pPlugin->getAMX(), (m_ParamTypes[i] == FP_STRING) ? strlen(reinterpret_cast<const char*>(params[i])) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
+					if (!str)
-					amx_SetStringOld(tmp, (const char *)(params[i]), 0, 0);
+						str = "";
+					amx_Allot(iter->pPlugin->getAMX(), (m_ParamTypes[i] == FP_STRING) ? strlen(str) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
+					amx_SetStringOld(tmp, str, 0, 0);
 					physAddrs[i] = tmp;
 				}
 				else if (m_ParamTypes[i] == FP_ARRAY)
@@ -121,6 +131,9 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 			
 			// exec
 			cell retVal;
+#if defined BINLOG_ENABLED
+			g_BinLog.WriteOp(BinLog_CallPubFunc, (*iter).pPlugin->getId(), iter->func);
+#endif
 			int err = amx_Exec(amx, &retVal, iter->func);
 			
 			// log runtime error, if any
@@ -203,12 +216,16 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 
 void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
 {
+	char name[sNAMEMAX];
 	m_Func = func;
 	m_Amx = amx;
 	m_NumParams = numParams;
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = true;
 	isFree = false;
+	name[0] = '\0';
+	amx_GetPublic(amx, func, name);
+	m_Name.assign(name);
 }
 
 void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
@@ -218,6 +235,7 @@ void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const Forwar
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
 	isFree = false;
+	m_Name.assign(funcName);
 }
 
 cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
@@ -248,9 +266,12 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	{
 		if (m_ParamTypes[i] == FP_STRING || m_ParamTypes[i] == FP_STRINGEX)
 		{
+			const char *str = reinterpret_cast<const char*>(params[i]);
+			if (!str)
+				str = "";
 			cell *tmp;
-			amx_Allot(m_Amx, (m_ParamTypes[i] == FP_STRING) ? strlen(reinterpret_cast<const char*>(params[i])) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
+			amx_Allot(m_Amx, (m_ParamTypes[i] == FP_STRING) ? strlen(str) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
-			amx_SetStringOld(tmp, (const char *)(params[i]), 0, 0);
+			amx_SetStringOld(tmp, str, 0, 0);
 			physAddrs[i] = tmp;
 		}
 		else if (m_ParamTypes[i] == FP_ARRAY)
@@ -278,6 +299,9 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	
 	// exec
 	cell retVal;
+#if defined BINLOG_ENABLED
+	g_BinLog.WriteOp(BinLog_CallPubFunc, pPlugin->getId(), m_Func);
+#endif
 	int err = amx_Exec(m_Amx, &retVal, m_Func);
 	
 	if (err != AMX_ERR_NONE)
@@ -335,13 +359,15 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	return retVal;
 }
 
-int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam * paramTypes)
+int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam * paramTypes, int fwd_type)
 {
 	int retVal = m_Forwards.size() << 1;
-	CForward *tmp = new CForward(funcName, et, numParams, paramTypes);
+	CForward *tmp = new CForward(funcName, et, numParams, paramTypes, fwd_type);
 	
 	if (!tmp)
+	{
 		return -1;				// should be invalid
+	}
 	
 	m_Forwards.push_back(tmp);
 	
@@ -432,6 +458,24 @@ cell CForwardMngr::executeForwards(int id, cell *params)
 	return retVal;
 }
 
+const char *CForwardMngr::getFuncName(int id) const
+{
+	if (!isIdValid(id))
+	{
+		return "";
+	}
+	return (id & 1) ? m_SPForwards[id >> 1]->getFuncName() : m_Forwards[id >> 1]->getFuncName();
+}
+
+int CForwardMngr::getFuncsNum(int id) const
+{
+	if (!isIdValid(id))
+	{
+		return 0;
+	}
+	return (id & 1) ? m_SPForwards[id >> 1]->getFuncsNum() : m_Forwards[id >> 1]->getFuncsNum();
+}
+
 int CForwardMngr::getParamsNum(int id) const
 {
 	return (id & 1) ? m_SPForwards[id >> 1]->getParamsNum() : m_Forwards[id >> 1]->getParamsNum();
@@ -439,6 +483,10 @@ int CForwardMngr::getParamsNum(int id) const
 
 ForwardParam CForwardMngr::getParamType(int id, int paramNum) const
 {
+	if (!isIdValid(id))
+	{
+		return FP_DONE;
+	}
 	return (id & 1) ? m_SPForwards[id >> 1]->getParamType(paramNum) : m_Forwards[id >> 1]->getParamType(paramNum);
 }
 
@@ -480,6 +528,18 @@ void CForwardMngr::unregisterSPForward(int id)
 	m_FreeSPForwards.push(id);
 }
 
+int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num, int fwd_type)
+{
+	ForwardParam params[FORWARD_MAX_PARAMS];
+	
+	for (size_t i=0; i<num; i++)
+	{
+		params[i] = static_cast<ForwardParam>(list[i]);
+	}
+	
+	return g_forwards.registerForward(funcName, et, num, params, fwd_type);
+}
+
 int registerForward(const char *funcName, ForwardExecType et, ...)
 {
 	int curParam = 0;
@@ -509,6 +569,16 @@ int registerForward(const char *funcName, ForwardExecType et, ...)
 	return g_forwards.registerForward(funcName, et, curParam, params);
 }
 
+int registerSPForwardByNameC(AMX *amx, const char *funcName, cell *list, size_t num)
+{
+	ForwardParam params[FORWARD_MAX_PARAMS];
+	
+	for (size_t i=0; i<num; i++)
+		params[i] = static_cast<ForwardParam>(list[i]);
+
+	return g_forwards.registerSPForward(funcName, amx, num, params);
+}
+
 int registerSPForwardByName(AMX *amx, const char *funcName, ...)
 {
 	int curParam = 0;

amxmodx/CForward.h

@@ -46,8 +46,15 @@
 #ifndef FORWARD_H
 #define FORWARD_H
 
+#include <stdarg.h>
+#include "sh_stack.h"
+
 const int FORWARD_MAX_PARAMS = 32;
 
+#define FORWARD_ONLY_OLD	1
+#define FORWARD_ONLY_NEW	2
+#define FORWARD_ALL			3
+
 enum ForwardExecType
 {
 	ET_IGNORE = 0,					// Ignore return vaue
@@ -90,6 +97,7 @@ class CForward
 	const char *m_FuncName;
 	ForwardExecType m_ExecType;
 	int m_NumParams;
+	String m_Name;
 	
 	struct AMXForward
 	{
@@ -103,7 +111,7 @@ class CForward
 	ForwardParam m_ParamTypes[FORWARD_MAX_PARAMS];
 
 public:
-	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes);
+	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes, int fwd_type=FORWARD_ALL);
 	CForward() {}		// leaves everything unitialized'
 	
 	cell execute(cell *params, ForwardPreparedArray *preparedArrays);
@@ -118,6 +126,11 @@ public:
 		return m_Funcs.size();
 	}
 
+	const char *getFuncName() const
+	{
+		return m_Name.c_str();
+	}
+	
 	ForwardParam getParamType(int paramId) const
 	{
 		if (paramId < 0 || paramId >= m_NumParams)
@@ -138,6 +151,7 @@ class CSPForward
 	
 	int m_Func;
 	bool m_HasFunc;
+	String m_Name;
 
 public:
 	bool isFree;
@@ -158,6 +172,11 @@ public:
 		return (m_HasFunc) ? 1 : 0;
 	}
 
+	const char *getFuncName() const
+	{
+		return m_Name.c_str();
+	}
+	
 	ForwardParam getParamType(int paramId) const
 	{
 		if (paramId < 0 || paramId >= m_NumParams)
@@ -171,7 +190,7 @@ class CForwardMngr
 {
 	typedef CVector<CForward*> ForwardVec;
 	typedef CVector<CSPForward*> SPForwardVec;
-	typedef CQueue<int> FreeSPVec;							// Free SP Forwards
+	typedef CStack<int> FreeSPVec;							// Free SP Forwards
 
 	ForwardVec m_Forwards;
 
@@ -188,7 +207,7 @@ public:
 
 	// Interface
 	// Register normal forward
-	int registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam *paramTypes);
+	int registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam *paramTypes, int fwd_type=FORWARD_ALL);
 	// Register single plugin forward
 	int registerSPForward(const char *funcName, AMX *amx, int numParams, const ForwardParam * paramTypes);
 	int registerSPForward(int func, AMX *amx, int numParams, const ForwardParam * paramTypes);
@@ -204,6 +223,7 @@ public:
 	bool isSPForward(int id) const;			// check whether forward is single plugin
 	int getParamsNum(int id) const;			// get num of params of a forward
 	int getFuncsNum(int id) const;			// get num of found functions of a forward
+	const char *getFuncName(int id) const;	// get the function name
 	
 	ForwardParam getParamType(int id, int paramId) const;
 	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack);		// prepare array
@@ -211,7 +231,9 @@ public:
 
 // (un)register forward
 int registerForward(const char *funcName, ForwardExecType et, ...);
+int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num, int fwd_type=FORWARD_ALL);
 int registerSPForwardByName(AMX *amx, const char *funcName, ...);
+int registerSPForwardByNameC(AMX *amx, const char *funcName, cell *list, size_t num);
 int registerSPForward(AMX *amx, int func, ...);
 void unregisterSPForward(int id);
 

amxmodx/CLang.h

@@ -32,28 +32,56 @@
 #ifndef _INCLUDE_CLANG_H
 #define _INCLUDE_CLANG_H
 
+#include "sh_tinyhash.h"
+
 #define LANG_SERVER 0
 #define LANG_PLAYER -1
 
+#define ERR_BADKEY	1	// Lang key not found
+#define ERR_BADLANG 2	// Invalid lang
+
 struct md5Pair
 {
 	String file;
 	String val;
 };
 
-struct keyEntry
-{
-	String key;
-	uint32_t hash;
-};
-
 struct sKeyDef
 {
-	sKeyDef() { key = -1; def = 0; }
+	String *definition;
-	~sKeyDef() { if (def) delete def; }
-	
 	int key;
-	String *def;
+};
+
+struct lang_err
+{
+	lang_err() : last(0.0f)
+	{
+	};
+	float last;
+};
+
+class defentry
+{
+public:
+	defentry() : definition(NULL)
+	{
+	};
+	defentry(const defentry &src)
+	{
+		definition = src.definition;
+	}
+	~defentry()
+	{
+	}
+	String *definition;
+};
+
+struct keytbl_val
+{
+	keytbl_val() : index(-1)
+	{
+	};
+	int index;
 };
 
 class CLangMngr
@@ -69,9 +97,9 @@ class CLangMngr
 		~CLang();
 
 		// Get the definition
-		const char *GetDef(const char *key);
+		const char *GetDef(int key, int &status);
 		// Add definitions to this language
-		void MergeDefinitions(CQueue <sKeyDef*> & vec);
+		void MergeDefinitions(CQueue <sKeyDef> & vec);
 		// Reset this language
 		void Clear();
 
@@ -83,69 +111,27 @@ class CLangMngr
 		
 		// Get language name
 		const char *GetName() { return m_LanguageName; }
-		// Save to file
-		bool Save(FILE *fp, int &defOffset, uint32_t &curOffset);
-		bool SaveDefinitions(FILE *fp, uint32_t &curOffset);
-		// Load
-		bool Load(FILE *fp);
 		void SetMngr(CLangMngr *l) { m_LMan = l; }
 		// Get number of entries
-		int Entries() { return m_LookUpTable.size(); }
+		int Entries();
-		// Make a hash from a string; convert to lowercase first if needed
-		static uint32_t MakeHash(const char *src, bool makeLower = false);
-	
 	protected:
-		// An entry in the language
+		typedef THash<int, defentry> LookUpVec;
-		class LangEntry
-		{
-			// the definition hash
-			uint32_t m_DefHash;
-			// index into the lookup table?
-			int key;
-			// the definition
-			String m_pDef;
-			// is this from the cache or not?
-			bool m_isCache;
-		public:
-			// Set
-			void SetKey(int key);
-			void SetDef(const char *pDef);
-			void SetCache(bool c);
-			// Get
-			uint32_t GetDefHash();
-			int GetKey();
-			const char *GetDef();
-			int GetDefLength();
-			bool GetCache();
-
-			// Constructors / destructors
-			LangEntry();
-			LangEntry(int key);
-			LangEntry(int key, const char *pDef);
-			LangEntry(const LangEntry &other);
-			LangEntry(int pKey, uint32_t defHash, const char *pDef);
-
-			// Reset
-			void Clear();
-		};
-
-		// Get (construct if needed) an entry
-		LangEntry * GetEntry(int key);
-
-		typedef CVector<LangEntry*>	LookUpVec;
 		typedef LookUpVec::iterator	 LookUpVecIter;
 
 		char m_LanguageName[3];
 
 		// our lookup table
 		LookUpVec m_LookUpTable;
+		int m_entries;
 		CLangMngr *m_LMan;
 	public:
-		LangEntry *AddEntry(int pKey, uint32_t defHash, const char *def, bool cache);
+		void AddEntry(int key, const char *definition);
 	};
-
+public:
 	// Merge definitions into a language
-	void MergeDefinitions(const char *lang, CQueue <sKeyDef*> &tmpVec);
+	void MergeDefinitions(const char *lang, CQueue <sKeyDef> &tmpVec);
+
+private:
 	// strip lowercase; make lower if needed
 	static size_t strip(char *str, char *newstr, bool makelower = false);
 
@@ -155,7 +141,8 @@ class CLangMngr
 	LangVec m_Languages;
 
 	CVector<md5Pair *> FileList;
-	CVector<keyEntry*> KeyList;
+	CVector<String *> KeyList;
+	THash<String, keytbl_val> KeyTable;
 
 	// Get a lang object (construct if needed)
 	CLang * GetLang(const char *name);
@@ -167,30 +154,19 @@ class CLangMngr
 public:
 	// Merge a definitions file
 	int MergeDefinitionFile(const char *file);
-	// Get a definition from a lang name and a kyer
+	// Get a definition from a lang name and a key
-	const char *GetDef(const char *langName, const char *key);
+	const char *GetDef(const char *langName, const char *key, int &status);
-	// Format a string
-	const char *Format(const char *src, ...);
 	// Format a string for an AMX plugin
 	char *FormatAmxString(AMX *amx, cell *params, int parm, int &len);
-	char *FormatString(const char *fmt, va_list &ap);
+	void InvalidateCache();
-	// Save
-	bool Save(const char *filename);
-	// Load
-	bool Load(const char *filename);
-	// Cache
-	bool LoadCache(const char *filename);
-	bool SaveCache(const char *filename);
 	// Get index
 	int GetKeyEntry(String &key);
 	int GetKeyEntry(const char *key);
-	int GetKeyHash(int key);
 	// Get key from index
 	const char *GetKey(int key);
 	// Add key
 	int AddKeyEntry(String &key);
-	// Make a hash from a string; convert to lowercase first if needed
+	int AddKeyEntry(const char *key);
-	uint32_t MakeHash(const char *src, bool makeLower);
 
 	// Get the number of languages
 	int GetLangsNum();
@@ -202,6 +178,8 @@ public:
 	// When a language id in a format string in FormatAmxString is LANG_PLAYER, the glob id decides which language to take.
 	void SetDefLang(int id);
 
+	inline int GetDefLang() const { return m_CurGlobId; }
+
 	// Reset
 	void Clear();
 

amxmodx/CMenu.cpp

@@ -47,6 +47,7 @@ MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f
 MenuMngr::~MenuMngr() 
 {
 	clear();
+	MenuMngr::MenuIdEle::uniqueid = 0;
 }
 
 int MenuMngr::findMenuId(const char* name, AMX* amx)
@@ -60,6 +61,46 @@ int MenuMngr::findMenuId(const char* name, AMX* amx)
 	return 0;
 }
 
+void MenuMngr::removeMenuId(int id)
+{
+	MenuIdEle *n = headid;
+	MenuIdEle *l = NULL;
+	while (n)
+	{
+		if (n->id == id)
+		{
+			if (l)
+				l->next = n->next;
+			else
+				headid = n->next;
+			delete n;
+			break;
+		}
+		l = n;
+		n = n->next;
+	}
+
+	MenuCommand *c = headcmd;
+	MenuCommand *lc = NULL;
+	MenuCommand *tmp;
+	while (c)
+	{
+		if (c->menuid == id)
+		{
+			if (lc)
+				lc->next = c->next;
+			else
+				headcmd = c->next;
+			tmp = c->next;
+			delete c;
+			c = tmp;
+		} else {
+			lc = c;
+			c = c->next;
+		}
+	}
+}
+
 int MenuMngr::registerMenuId(const char* n, AMX* a)
 {
 	int id = findMenuId(n, a);

amxmodx/CMenu.h

@@ -51,8 +51,6 @@ class MenuMngr
 		{
 			id = ++uniqueid;
 		}
-		
-		~MenuIdEle() { --uniqueid; }
 	} *headid;
 
 public:
@@ -85,6 +83,7 @@ public:
 
 	int findMenuId(const char* name, AMX* a = 0);
 	int registerMenuId(const char* n, AMX* a);
+	void removeMenuId(int id);
 	void registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f);
 	void clear();
 

amxmodx/CMisc.cpp

@@ -29,6 +29,7 @@
 *  version.
 */
 #include "amxmodx.h"
+#include "newmenus.h"
 // *****************************************************
 // class CPlayer
 // *****************************************************
@@ -39,7 +40,8 @@ void CPlayer::Init(edict_t* e, int i)
 	pEdict = e;
 	initialized = false;
 	ingame = false;
-	bot = false;
+	bot_value = false;
+	bot_cached = false;
 	authorized = false;
 
 	current = 0;
@@ -48,6 +50,8 @@ void CPlayer::Init(edict_t* e, int i)
 	aiming = 0;
 	menu = 0;
 	keys = 0;
+	menuexpire = 0.0;
+	newmenu = -1;
 
 	death_weapon.clear();
 	name.clear();
@@ -61,19 +65,34 @@ void CPlayer::Disconnect()
 	initialized = false;
 	authorized = false;
 
-	while (!cvarQueryQueue.empty())
+	if (newmenu != -1)
 	{
-		ClientCvarQuery_Info *pQuery = cvarQueryQueue.front();
+		Menu *pMenu = g_NewMenus[newmenu];
-		unregisterSPForward(pQuery->resultFwd);
+		if (pMenu)
-		
+		{
-		if (pQuery->params)
+			//prevent recursion
-			delete [] pQuery->params;
+			newmenu = -1;
-		
+			menu = 0;
-		delete pQuery;
+			executeForwards(pMenu->func, 
-		cvarQueryQueue.pop();
+				static_cast<cell>(ENTINDEX(pEdict)),
+				static_cast<cell>(pMenu->thisId),
+				static_cast<cell>(MENU_EXIT));
+		}
 	}
 
-	bot = 0;
+	List<ClientCvarQuery_Info *>::iterator iter, end=queries.end();
+	for (iter=queries.begin(); iter!=end; iter++)
+	{
+		unregisterSPForward((*iter)->resultFwd);
+		delete [] (*iter)->params;
+		delete (*iter);
+	}
+	queries.clear();
+
+	bot_value = false;
+	bot_cached = false;
+	menu = 0;
+	newmenu = -1;
 }
 
 void CPlayer::PutInServer()
@@ -82,13 +101,29 @@ void CPlayer::PutInServer()
 	ingame = true;
 }
 
+int CPlayer::NextHUDChannel()
+{
+	int ilow = 1;
+
+	for (int i=ilow+1; i<=4; i++)
+	{
+		if (channels[i] < channels[ilow])
+			ilow = i;
+	}
+
+	return ilow;
+}
+
 bool CPlayer::Connect(const char* connectname, const char* ipaddress)
 {
+	bot_value = false;
+	bot_cached = false;
 	name.assign(connectname);
 	ip.assign(ipaddress);
 	time = gpGlobals->time;
-	bot = IsBot();
 	death_killer = 0;
+	menu = 0;
+	newmenu = -1;
 	
 	memset(flags, 0, sizeof(flags));
 	memset(weapons, 0, sizeof(weapons));
@@ -96,6 +131,21 @@ bool CPlayer::Connect(const char* connectname, const char* ipaddress)
 	initialized = true;
 	authorized = false;
 
+	for (int i=0; i<=4; i++)
+	{
+		channels[i] = 0.0f;
+		hudmap[i] = 0;
+	}
+
+	List<ClientCvarQuery_Info *>::iterator iter, end=queries.end();
+	for (iter=queries.begin(); iter!=end; iter++)
+	{
+		unregisterSPForward((*iter)->resultFwd);
+		delete [] (*iter)->params;
+		delete (*iter);
+	}
+	queries.clear();
+
 	const char* authid = GETPLAYERAUTHID(pEdict);
 
 	if ((authid == 0) || (*authid == 0) || (strcmp(authid, "STEAM_ID_PENDING") == 0))

amxmodx/CMisc.h

@@ -33,6 +33,7 @@
 #define CMISC_H
 
 #include "CList.h"
+#include "sh_list.h"
 
 // *****************************************************
 // class CCVar
@@ -57,6 +58,7 @@ public:
 	inline const char* getPluginName() { return plugin.c_str(); }
 	inline const char* getName() { return name.c_str(); }
 	inline bool operator == (const char* string) { return (strcmp(name.c_str(), string) == 0); }
+	int plugin_id;
 };
 
 // *****************************************************
@@ -65,10 +67,8 @@ public:
 
 struct ClientCvarQuery_Info
 {
-	bool querying;				// Are we actually waiting for a response at the moment?
-	String cvarName;
 	int resultFwd;
-
+	int requestId;
 	int paramLen;
 	cell *params;
 };
@@ -84,11 +84,14 @@ public:
 
 	bool initialized;
 	bool ingame;
-	bool bot;
+	bool bot_cached;
+	bool bot_value;
 	bool authorized;
+	bool vgui;	
 
 	float time;
 	float playtime;
+	float menuexpire;
 	
 	struct
 	{
@@ -113,11 +116,14 @@ public:
 	int newmenu;
 	int page;
 
+	float channels[5];
+	cell hudmap[5];
+	
 	Vector lastTrace;
 	Vector thisTrace;
 	Vector lastHit;
 	
-	CQueue<ClientCvarQuery_Info*> cvarQueryQueue;
+	List<ClientCvarQuery_Info *> queries;
 
 	void Init(edict_t* e, int i);
 	void Disconnect();
@@ -127,7 +133,24 @@ public:
 
 	inline bool IsBot()
 	{
-		return ((pEdict->v.flags & FL_FAKECLIENT) ? true : false);
+		if (!bot_cached)
+		{
+			bot_value = false;
+			if (pEdict->v.flags & FL_FAKECLIENT)
+			{
+				bot_value = true;
+				bot_cached = true;
+			} else {
+				const char *auth = GETPLAYERAUTHID(pEdict);
+				if (auth && (strcmp(auth, "BOT") == 0))
+				{
+					bot_value = true;
+					bot_cached = true;
+				}
+			}
+		}
+
+		return bot_value;
 	}
 
 	inline bool IsAlive()
@@ -137,6 +160,8 @@ public:
 
 	inline void Authorize() { authorized = true; }
 
+	int NextHUDChannel();
+
 };
 
 // *****************************************************

amxmodx/CModule.cpp

@@ -30,6 +30,7 @@
 */
 
 #include "amxmodx.h"
+#include "libraries.h"
 
 #ifndef FAR
 	#define FAR
@@ -41,6 +42,8 @@ typedef int (FAR *QUERYMOD_NEW)(int * /*ifvers*/, amxx_module_info_s * /*modInfo
 typedef int (FAR *ATTACHMOD_NEW)(PFN_REQ_FNPTR /*reqFnptrFunc*/);
 typedef int (FAR *DETACHMOD_NEW)(void);
 typedef void (FAR *PLUGINSLOADED_NEW)(void);
+typedef void (*PLUGINSUNLOADED_NEW)(void);
+typedef void (*PLUGINSUNLOADING_NEW)(void);
 
 // *****************************************************
 // class CModule
@@ -79,7 +82,14 @@ void CModule::clear(bool clearFilename)
 	m_InfoNew.reload = 0;
 	m_MissingFunc = NULL;
 
+	for (size_t i=0; i<m_DestroyableIndexes.size(); i++)
+	{
+		delete [] m_Natives[m_DestroyableIndexes[i]];
+	}
+
+	m_DestroyableIndexes.clear();
 	m_Natives.clear();
+	m_NewNatives.clear();
 }
 
 bool CModule::attachMetamod(const char *mmfile, PLUG_LOADTIME now)
@@ -102,6 +112,53 @@ bool CModule::attachMetamod(const char *mmfile, PLUG_LOADTIME now)
 	return true;
 }
 
+//this ugly function is ultimately something like O(n^4).
+//sigh.  it shouldn't be needed.
+void CModule::rewriteNativeLists(AMX_NATIVE_INFO *list)
+{
+	AMX_NATIVE_INFO *curlist;
+	for (size_t i=0; i<m_Natives.size(); i++)
+	{
+		curlist = m_Natives[i];
+		bool changed = false;
+		bool found = false;
+		CVector<size_t> newlist;
+		for (size_t j=0; curlist[j].func != NULL; j++)
+		{
+			found = false;
+			for (size_t k=0; list[k].func != NULL; k++)
+			{
+				if (strcmp(curlist[j].name, list[k].name) == 0)
+				{
+					found = true;
+					break;
+				}
+			}
+			if (found)
+			{
+				changed = true;
+				//don't break, we have to search it all
+			} else {
+				newlist.push_back(j);
+			}
+		}
+		if (changed)
+		{
+			//now build the new list
+			AMX_NATIVE_INFO *rlist = new AMX_NATIVE_INFO[newlist.size()+1];
+			for (size_t j=0; j<newlist.size(); j++)
+			{
+				rlist[j].func = curlist[newlist[j]].func;
+				rlist[j].name = curlist[newlist[j]].name;
+			}
+			rlist[newlist.size()].func = NULL;
+			rlist[newlist.size()].name = NULL;
+			m_Natives[i] = rlist;
+			m_DestroyableIndexes.push_back(i);
+		}
+	}
+}
+
 bool CModule::attachModule()
 {
 	// old & new
@@ -126,7 +183,7 @@ bool CModule::attachModule()
 		{
 			case AMXX_OK:
 				m_Status = MODULE_LOADED;
-				return true;
+				break;
 			case AMXX_PARAM:
 				AMXXLOG_Log("[AMXX] Internal Error: Module \"%s\" (version \"%s\") retured \"Invalid parameter\" from Attach func.", m_Filename.c_str(), getVersion());
 				m_Status = MODULE_INTERROR;
@@ -144,6 +201,13 @@ bool CModule::attachModule()
 		m_Status = MODULE_BADLOAD;
 	}
 
+	if (m_Status == MODULE_LOADED)
+	{
+		AddLibrariesFromString(m_InfoNew.library, LibType_Library, LibSource_Module, this);
+		AddLibrariesFromString(m_InfoNew.libclass, LibType_Class, LibSource_Module, this);
+		return true;
+	}
+
 	return false;
 }
 
@@ -184,10 +248,36 @@ bool CModule::queryModule()
 				return false;
 			case AMXX_IFVERS:
 				if (ifVers < AMXX_INTERFACE_VERSION)
+				{
+					//backwards compat for new defs
+					if (ifVers == 3)
+					{
+						g_ModuleCallReason = ModuleCall_Query;
+						g_CurrentlyCalledModule = this;
+						retVal = (*queryFunc_New)(&ifVers, &m_InfoNew);
+                        g_CurrentlyCalledModule = NULL;
+						g_ModuleCallReason = ModuleCall_NotCalled;
+						if (retVal == AMXX_OK)
+						{
+							m_InfoNew.library = m_InfoNew.logtag;
+							if (StrCaseStr(m_InfoNew.library, "sql") 
+								|| StrCaseStr(m_InfoNew.library, "dbi"))
+							{
+								m_InfoNew.libclass = "DBI";
+							} else {
+								m_InfoNew.libclass = "";
+							}
+							break;
+						}
+						return false;
+					} else {
 						m_Status = MODULE_OLD;
-				else
+						return false;
+					}
+				} else {
 					m_Status = MODULE_NEWER;
 					return false;
+				}
 			case AMXX_OK:
 				break;
 			default:
@@ -217,6 +307,8 @@ bool CModule::detachModule()
 	if (m_Status != MODULE_LOADED)
 		return false;
 
+	RemoveLibraries(this);
+
 	if (m_Amxx)
 	{
 		DETACHMOD_NEW detachFunc_New = (DETACHMOD_NEW)DLPROC(m_Handle, "AMXX_Detach");
@@ -244,6 +336,38 @@ bool CModule::detachModule()
 	return true;
 }
 
+void CModule::CallPluginsUnloaded()
+{
+	if (m_Status != MODULE_LOADED)
+		return;
+
+	if (!m_Handle)
+		return;
+
+	PLUGINSUNLOADED_NEW func = (PLUGINSUNLOADED_NEW)DLPROC(m_Handle, "AMXX_PluginsUnloaded");
+
+	if (!func)
+		return;
+
+	func();
+}
+
+void CModule::CallPluginsUnloading()
+{
+	if (m_Status != MODULE_LOADED)
+		return;
+
+	if (!m_Handle)
+		return;
+
+	PLUGINSUNLOADING_NEW func = (PLUGINSUNLOADING_NEW)DLPROC(m_Handle, "AMXX_PluginsUnloading");
+
+	if (!func)
+		return;
+
+	func();
+}
+
 void CModule::CallPluginsLoaded()
 {
 	if (m_Status != MODULE_LOADED)

amxmodx/CModule.h

@@ -59,6 +59,8 @@ struct amxx_module_info_s
 	const char *version;
 	int reload;				// reload on mapchange when nonzero
 	const char *logtag;		//added in version 2
+	const char *library;	// added in version 4
+	const char *libclass;	// added in version 4
 };
 
 #define AMXX_OK					0			/* no error */
@@ -66,7 +68,7 @@ struct amxx_module_info_s
 #define AMXX_PARAM				2			/* Invalid parameter */
 #define AMXX_FUNC_NOT_PRESENT	3			/* Function not present */
 
-#define AMXX_INTERFACE_VERSION	3
+#define AMXX_INTERFACE_VERSION	4
 
 class CModule 
 {
@@ -90,6 +92,7 @@ public:
 	bool attachModule();
 	bool queryModule();
 	bool detachModule();
+	void rewriteNativeLists(AMX_NATIVE_INFO *list);
 
 #ifndef FAKEMETA
 	bool attachMetamod(const char *mmfile, PLUG_LOADTIME now);
@@ -109,9 +112,13 @@ public:
 	inline const char *getFilename() { return m_Filename.c_str(); }
 	inline bool IsMetamod() { return m_Metamod; }
 	
-	void CModule::CallPluginsLoaded();
+	void CallPluginsLoaded();
+	void CallPluginsUnloaded();
+	void CallPluginsUnloading();
 
-	CList<AMX_NATIVE_INFO*> m_Natives;
+	CVector<AMX_NATIVE_INFO*> m_Natives;
+	CVector<AMX_NATIVE_INFO*> m_NewNatives; // Natives for new (AMXX, not AMX) plugins only
+	CVector<size_t> m_DestroyableIndexes;
 };
 
 #endif //CMODULE_H

amxmodx/CPlugin.cpp

@@ -36,6 +36,7 @@
 #include "amx.h"
 #include "natives.h"
 #include "debugger.h"
+#include "libraries.h"
 
 extern const char *no_function;
 
@@ -80,14 +81,17 @@ void CPluginMngr::Finalize()
 	m_Finalized = true;
 }
 
-int CPluginMngr::loadPluginsFromFile(const char* filename)
+int CPluginMngr::loadPluginsFromFile(const char* filename, bool warn)
 {
 	char file[256];
 	FILE *fp = fopen(build_pathname_r(file, sizeof(file) - 1, "%s", filename), "rt");
 
 	if (!fp) 
+	{
+		if (warn)
 		{
 			AMXXLOG_Log("[AMXX] Plugins list not found (file \"%s\")", filename);
+		}
 		return 1;
 	}
 	
@@ -98,6 +102,8 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 	
 	String line;
 
+	List<String *>::iterator block_iter;
+
 	while (!feof(fp)) 
 	{
 		pluginName[0] = '\0';
@@ -107,16 +113,46 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 		
 		line.clear();
 		line._fread(fp);
+		/** quick hack */
+		char *ptr = const_cast<char *>(line.c_str());
+		while (*ptr)
+		{
+			if (*ptr == ';')
+			{
+				*ptr = '\0';
+			} else {
+				ptr++;
+			}
+		}
 		sscanf(line.c_str(), "%s %s", pluginName, debug);
 		
 		if (!isalnum(*pluginName))
+		{
 			continue;
+		}
 
-		if (isalnum(*debug) && strcmp(debug, "debug") == 0)
+		if (isalnum(*debug) && !strcmp(debug, "debug"))
 		{
 			debugFlag = 1;
 		}
 
+		bool skip = false;
+		for (block_iter = m_BlockList.begin();
+			 block_iter != m_BlockList.end();
+			 block_iter++)
+		{
+			if ((*block_iter)->compare(pluginName) == 0)
+			{
+				skip = true;
+				break;
+			}
+		}
+
+		if (skip || !strcmp(debug, "disabled"))
+		{
+			continue;
+		}
+
 		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, debugFlag);
 		
 		if (plugin->getStatusCode() == ps_bad_load)
@@ -147,11 +183,14 @@ void CPluginMngr::clear()
 		delete [] pNatives;
 		pNatives = NULL;
 	}
-}
 
-CPluginMngr::CPlugin* CPluginMngr::findPluginFast(AMX *amx) 
+	List<String *>::iterator iter = m_BlockList.begin();
-{ 
+	while (iter != m_BlockList.end())
-	return (CPlugin*)(amx->userdata[UD_FINDPLUGIN]); 
+	{
+		delete (*iter);
+		iter = m_BlockList.erase(iter);
+	}
+	m_BlockList.clear();
 }
 
 CPluginMngr::CPlugin* CPluginMngr::findPlugin(AMX *amx)
@@ -243,8 +282,8 @@ CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int
 	
 	if (status == ps_running)
 	{
-		m_PauseFwd = registerSPForwardByName(&amx, "plugin_pause");
+		m_PauseFwd = registerSPForwardByName(&amx, "plugin_pause", FP_DONE);
-		m_UnpauseFwd = registerSPForwardByName(&amx, "plugin_unpause");
+		m_UnpauseFwd = registerSPForwardByName(&amx, "plugin_unpause", FP_DONE);
 		
 		if (amx.flags & AMX_FLAG_DEBUG)
 		{
@@ -293,7 +332,7 @@ static cell AMX_NATIVE_CALL invalid_native(AMX *amx, cell *params)
 	}
 
 	char name[sNAMEMAX + 1];
-	int native = amx->usertags[UT_NATIVE];
+	int native = (int)(_INT_PTR)(amx->usertags[UT_NATIVE]);
 	int err = amx_GetNative(amx, native, name);
 
 	if (err != AMX_ERR_NONE)
@@ -302,6 +341,7 @@ static cell AMX_NATIVE_CALL invalid_native(AMX *amx, cell *params)
 	//1 - because we're trapping usage
 	if (!pHandler->HandleNative(name, native, 1))
 	{
+		amx->usertags[UT_NATIVE] = (void *)native;
 		LogError(amx, AMX_ERR_INVNATIVE, NULL);
 		return 0;
 	}
@@ -377,13 +417,286 @@ void CPluginMngr::CPlugin::pausePlugin()
 // Unpause a plugin
 void CPluginMngr::CPlugin::unpausePlugin()
 {
-	if (isValid())
+	if (isValid() && (getStatusCode() != ps_stopped))
 	{
 		// set status first so the function will be marked executable
 		setStatus(ps_running);
 		
 		// call plugin_unpause if provided
 		if (m_UnpauseFwd != -1)
+		{
 			executeForwards(m_UnpauseFwd);
 		}
+	}
+}
+
+char *CPluginMngr::ReadIntoOrFromCache(const char *file, size_t &bufsize)
+{
+	List<plcache_entry *>::iterator iter;
+	plcache_entry *pl;
+
+	for (iter=m_plcache.begin(); iter!=m_plcache.end(); iter++)
+	{
+		pl = (*iter);
+		if (pl->path.compare(file) == 0)
+		{
+			bufsize = pl->bufsize;
+			return pl->buffer;
+		}
+	}
+
+	pl = new plcache_entry;
+
+	pl->file = new CAmxxReader(file, sizeof(cell));
+	pl->buffer = NULL;
+	if (pl->file->GetStatus() != CAmxxReader::Err_None ||
+		pl->file->IsOldFile())
+	{
+		delete pl->file;
+		delete pl;
+		return NULL;
+	}
+
+	pl->bufsize = pl->file->GetBufferSize();
+	if (pl->bufsize)
+	{
+		pl->buffer = new char[pl->bufsize];
+		pl->file->GetSection(pl->buffer);
+	}
+
+	if (!pl->buffer || pl->file->GetStatus() != CAmxxReader::Err_None)
+	{
+		delete [] pl->buffer;
+		delete pl->file;
+		delete pl;
+		return NULL;
+	}
+
+	pl->path.assign(file);
+
+	bufsize = pl->bufsize;
+
+	m_plcache.push_back(pl);
+
+	return pl->buffer;
+}
+
+void CPluginMngr::InvalidateCache()
+{
+	List<plcache_entry *>::iterator iter;
+	plcache_entry *pl;
+
+	for (iter=m_plcache.begin(); iter!=m_plcache.end(); iter++)
+	{
+		pl = (*iter);
+		delete [] pl->buffer;
+		delete pl->file;
+		delete pl;
+	}
+
+	m_plcache.clear();
+}
+
+void CPluginMngr::InvalidateFileInCache(const char *file, bool freebuf)
+{
+	List<plcache_entry *>::iterator iter;
+	plcache_entry *pl;
+
+	for (iter=m_plcache.begin(); iter!=m_plcache.end(); iter++)
+	{
+		pl = (*iter);
+		if (pl->path.compare(file) == 0)
+		{
+			if (freebuf)
+				delete [] pl->buffer;
+			delete pl->file;
+			delete pl;
+			m_plcache.erase(iter);
+			return;
+		}
+	}
+}
+
+void CPluginMngr::CacheAndLoadModules(const char *plugin)
+{
+	size_t progsize;
+	char *prog = ReadIntoOrFromCache(plugin, progsize);
+
+	if (!prog)
+		return;
+
+	AMX_HEADER hdr;
+	memcpy(&hdr, prog, sizeof(AMX_HEADER));
+
+	uint16_t magic = hdr.magic;
+	amx_Align16(&magic);
+
+	if (magic != AMX_MAGIC)
+	{
+		return;
+	}
+
+	if (hdr.file_version < MIN_FILE_VERSION ||
+		hdr.file_version > CUR_FILE_VERSION)
+	{
+		return;
+	}
+	if ((hdr.defsize != sizeof(AMX_FUNCSTUB)) && 
+		(hdr.defsize != sizeof(AMX_FUNCSTUBNT)))
+	{
+		return;
+	}
+
+	amx_Align32((uint32_t*)&hdr.nametable);
+	uint16_t *namelength=(uint16_t*)((unsigned char*)prog + (unsigned)hdr.nametable);
+	amx_Align16(namelength);
+	if (*namelength>sNAMEMAX)
+	{
+		return;
+	}
+	
+	if (hdr.stp <= 0)
+	{
+		return;
+	}
+
+	AMX amx;
+	memset(&amx, 0, sizeof(AMX));
+	amx.base = (unsigned char *)prog;
+
+	int num;
+	char name[sNAMEMAX+1];
+
+	num = amx_GetLibraries(&amx);
+	for (int i=0; i<num; i++)
+	{
+		amx_GetLibrary(&amx, i, name, sNAMEMAX);
+		if (stricmp(name, "Float")==0)
+			continue;
+		//awful backwards compat hack
+		if (stricmp(name, "socket")==0)
+			strcpy(name, "sockets");
+		//we don't want to report failed modules here...
+		LoadModule(name, PT_ANYTIME, true, true);
+	}
+
+	cell tag_id;
+	amx_NumTags(&amx, &num);
+
+	CVector<LibDecoder *> expects;
+	CVector<LibDecoder *> defaults;
+	CStack<LibDecoder *> delstack;
+	for (int i=0; i<num; i++)
+	{
+		amx_GetTag(&amx, i, name, &tag_id);
+		if (name[0] == '?')
+		{
+			LibDecoder *dc = new LibDecoder;
+			delstack.push(dc);
+			if (DecodeLibCmdString(name, dc))
+			{
+				if (dc->cmd == LibCmd_ForceLib)
+				{
+					RunLibCommand(dc);
+				} else if ( (dc->cmd == LibCmd_ExpectClass) ||
+							(dc->cmd == LibCmd_ExpectLib) ) 
+				{
+					expects.push_back(dc);
+				} else if (dc->cmd == LibCmd_DefaultLib) {
+					defaults.push_back(dc);
+				}
+			}
+		}
+	}
+
+	for (size_t i=0; i<expects.size(); i++)
+	{
+		RunLibCommand(expects[i]);
+	}
+	for (size_t i=0; i<defaults.size(); i++)
+	{
+		RunLibCommand(defaults[i]);
+	}
+
+	expects.clear();
+	defaults.clear();
+
+	while (!delstack.empty())
+	{
+		delete delstack.front();
+		delstack.pop();
+	}
+
+	return;
+}
+
+void CPluginMngr::CALMFromFile(const char *file)
+{
+	char filename[256];
+	FILE *fp = fopen(build_pathname_r(filename, sizeof(filename) - 1, "%s", file), "rt");
+
+	if (!fp) 
+	{
+		return;
+	}
+
+	// Find now folder
+	char pluginName[256];
+	char line[256];
+	String rline;
+
+	while (!feof(fp)) 
+	{
+		fgets(line, sizeof(line)-1, fp);
+		if (line[0] == ';' || line[0] == '\n' || line[0] == '\0')
+		{
+			continue;
+		}
+
+		/** quick hack */
+		char *ptr = line;
+		while (*ptr)
+		{
+			if (*ptr == ';')
+			{
+				*ptr = '\0';
+			} else {
+				ptr++;
+			}
+		}
+
+		rline.assign(line);
+		rline.trim();
+		pluginName[0] = '\0';
+		sscanf(rline.c_str(), "%s", pluginName);
+
+		/* HACK: see if there's a 'disabled' coming up
+		 * new block for scopying flexibility
+		 */
+		if (1)
+		{
+			const char *_ptr = rline.c_str() + strlen(pluginName);
+			while (*_ptr != '\0'  && isspace(*_ptr))
+			{
+				_ptr++;
+			}
+			if ((*_ptr != '\0') && !strcmp(_ptr, "disabled"))
+			{
+				String *pString = new String(pluginName);
+				m_BlockList.push_back(pString);
+				continue;
+			}
+		}
+
+		if (!isalnum(*pluginName))
+		{
+			continue;
+		}
+
+		build_pathname_r(filename, sizeof(filename)-1, "%s/%s", get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins"), pluginName);
+
+		CacheAndLoadModules(filename);
+	}
+
+	fclose(fp);
 }

amxmodx/CPlugin.h

@@ -32,18 +32,23 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
+#include "CString.h"
+#include "sh_list.h"
+#include "amx.h"
+#include "amxxfile.h"
+
 // *****************************************************
 // class CPluginMngr
 // *****************************************************
 
 enum
 {
-	ps_bad_load,
+	ps_bad_load,	//Load failed
-	ps_error,
+	ps_error,	//Erroneous state
-	ps_locked,
+	ps_locked,	//UNUSED
-	ps_paused,
+	ps_paused,	//Plugin is temporarily paused
-	ps_stopped,
+	ps_stopped,	//Plugin is ... more temporarily paused
-	ps_running,
+	ps_running,	//Plugin is running
 };
 
 class CPluginMngr
@@ -111,7 +116,7 @@ private:
 	int pCounter;
 public:
 	CPluginMngr() { head = 0; pCounter = 0; pNatives = NULL; m_Finalized=false;}
-	~CPluginMngr() { clear(); }
+	~CPluginMngr() { clear(); InvalidateCache(); }
 
 	bool m_Finalized;
 	AMX_NATIVE_INFO *pNatives;
@@ -120,9 +125,9 @@ public:
 
 	CPlugin* loadPlugin(const char* path, const char* name, char* error, int debug);
 	void unloadPlugin(CPlugin** a);
-	int loadPluginsFromFile(const char* filename);
+	int loadPluginsFromFile(const char* filename, bool warn=true);
 	
-	CPlugin* findPluginFast(AMX *amx);
+	inline CPlugin* findPluginFast(AMX *amx) { return (CPlugin*)(amx->userdata[UD_FINDPLUGIN]); }
 	CPlugin* findPlugin(AMX *amx);
 	CPlugin* findPlugin(int index);
 	CPlugin* findPlugin(const char* name);
@@ -145,6 +150,22 @@ public:
 	
 	inline iterator begin() const { return iterator(head); }
 	inline iterator end() const { return iterator(0); }
+public:
+	struct plcache_entry
+	{
+		CAmxxReader *file;
+		size_t bufsize;
+		char *buffer;
+		String path;
+	};
+	char *ReadIntoOrFromCache(const char *file, size_t &bufsize);
+	void InvalidateCache();
+	void InvalidateFileInCache(const char *file, bool freebuf);
+	void CacheAndLoadModules(const char *plugin);
+	void CALMFromFile(const char *file);
+private:
+	List<plcache_entry *> m_plcache;
+	List<String *> m_BlockList;
 };
 
 #endif //PLUGIN_H

amxmodx/CStack.h

@@ -1,105 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-//by David "BAILOPAN" Anderson
-#ifndef _INCLUDE_CSTACK_H
-#define _INCLUDE_CSTACK_H
-
-template <class T>
-class CStack
-{
-public:
-	struct CStackItem
-	{
-	public:
-		T item;
-		CStackItem *prev;
-	};
-
-public:
-	CStack()
-	{
-		mSize = 0;
-		mStack = NULL;
-	}
-	
-	~CStack()
-	{
-		CStackItem *p, *t;
-		p = mStack;
-		
-		while (p)
-		{
-			t = p->prev;
-			delete p;
-			p = t;
-		}
-		
-		mStack = NULL;
-	}
-	
-	bool empty()
-	{
-		return (mSize == 0);
-	}
-
-	void push(const T & v)
-	{
-		CStackItem *p = new CStackItem;
-		p->item = v;
-		p->prev = mStack;
-		mStack = p;
-		mSize++;
-	}
-
-	void pop()
-	{
-		CStackItem *p = mStack;
-		mStack = p->prev;
-		delete p;
-		mSize--;
-	}
-
-	T & top()
-	{
-		return mStack->item;
-	}
-
-	size_t size()
-	{
-		return mSize;
-	}
-private:
-	CStackItem *mStack;
-	size_t mSize;
-};
-
-#endif //_INCLUDE_CQUEUE_H

amxmodx/CString.h

@@ -66,7 +66,7 @@ public:
 		return ret; 	 
 	}
 
-	String(String &src) 
+	String(const String &src) 
 	{
 		v = NULL;
 		a_size = 0;
@@ -107,8 +107,10 @@ public:
 		{
 			clear();
 		} else {
-			Grow(strlen(d) + 1, false);
+			size_t len = strlen(d);
-			strcpy(v, d);
+			Grow(len + 1, false);
+			memcpy(v, d, len);
+			v[len] = '\0';
 		}
 	}
 
@@ -118,7 +120,7 @@ public:
 			v[0] = '\0';
 	}
 
-	int compare (const char *d)
+	int compare (const char *d) const
 	{
 		if (!v)
 			return strcmp("", d);
@@ -148,13 +150,13 @@ public:
 
 	int find(const char c, int index = 0)
 	{
-		size_t len = size();
+		int len = static_cast<int>(size());
 		if (len < 1)
 			return npos;
-		if (index >= (int)len || index < 0)
+		if (index >= len || index < 0)
 			return npos;
-		unsigned int i = 0;
+		int i = 0;
-		for (i=index; i<(int)len; i++)
+		for (i=index; i<len; i++)
 		{
 			if (v[i] == c)
 			{
@@ -177,6 +179,30 @@ public:
 		return false;
 	}
 
+	void reparse_newlines()
+	{
+		size_t len = size();
+		int offs = 0;
+		char c;
+		if (!len)
+			return;
+		for (size_t i=0; i<len; i++)
+		{
+			c = v[i];
+			if (c == '^' && (i != len-1))
+			{
+				c = v[++i];
+				if (c == 'n')
+					c = '\n';
+				else if (c == 't')
+					c = '\t';
+				offs++;
+			}
+			v[i-offs] = c;
+		}
+		v[len-offs] = '\0';
+	}
+	
 	void trim()
 	{
 		if (!v)
@@ -247,7 +273,7 @@ public:
 		unsigned int i = 0;
 		size_t len = size();
 		//check for bounds
-		if (num == npos || start+num > len-num+1)
+		if (num == npos || start+num > len-start)
 			num = len - start;
 		//do the erasing
 		bool copyflag = false;
@@ -297,7 +323,7 @@ public:
 			num = len - index;
 		}
 
-		unsigned int i = 0, j=0;
+		unsigned int i = 0;
 		unsigned int nslen = num + 2;
 
 		ns.Grow(nslen);

amxmodx/CTask.cpp

@@ -34,17 +34,7 @@
 
 /*********************** CTask ***********************/
 
-int CTaskMngr::CTask::getTaskId() const
+void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
-{
-	return m_iId;
-}
-
-CPluginMngr::CPlugin *CTaskMngr::CTask::getPlugin() const
-{
-	return m_pPlugin;
-}
-
-void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
 {
 	clear();
 	m_bFree = false;
@@ -53,6 +43,7 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 	m_iFunc = iFunc;
 	m_iId = iId;
 	m_fBase = fBase;
+	m_bInExecute = false;
 
 	if (iFlags & 2)
 	{
@@ -150,6 +141,7 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 		//only bother calling if we have something to call
 		if (!(m_bLoop && !m_iRepeat))
 		{
+			m_bInExecute = true;
 			if (m_iParamLen)	// call with parameters
 			{
 				cell arr = prepareCellArray(m_pParams, m_iParamLen);
@@ -157,6 +149,7 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 			} else {
 				executeForwards(m_iFunc, m_iId);
 			}
+			m_bInExecute = false;
 		}
 	
 		if (isFree())
@@ -193,6 +186,7 @@ CTaskMngr::CTask::CTask()
 	m_bLoop = false;
 	m_bAfterStart =	false;
 	m_bBeforeEnd = false;
+	m_bInExecute = false;
 
 	m_fNextExecTime = 0.0f;
 
@@ -226,7 +220,7 @@ void CTaskMngr::registerTimers(float *pCurrentTime, float *pTimeLimit, float *pT
 	m_pTmr_TimeLeft = pTimeLeft;
 }
 
-void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
+void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
 {
 	// first, search for free tasks
 	TaskListIter iter = m_Tasks.find(CTaskDescriptor(0, NULL, true));

amxmodx/CTask.h

@@ -41,10 +41,11 @@ private:
 		// task settings
 		
 		CPluginMngr::CPlugin *m_pPlugin;
-		int m_iId;
+		cell m_iId;
 		int m_iFunc;
 		int m_iRepeat;
 		
+		bool m_bInExecute;
 		bool m_bLoop;
 		bool m_bAfterStart;
 		bool m_bBeforeEnd;
@@ -57,17 +58,19 @@ private:
 		// execution
 		float m_fNextExecTime;
 	public:
-		void set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime);
+		void set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime);
 		void clear();
 		bool isFree() const;
 
-		CPluginMngr::CPlugin *getPlugin() const;
+		inline CPluginMngr::CPlugin *getPlugin() const { return m_pPlugin; }
-		int getTaskId() const;
+		inline AMX *getAMX() const { return m_pPlugin->getAMX(); }
+		inline int getTaskId() const { return m_iId; }
 
 		void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
 
 		void changeBase(float fNewBase);
 		void resetNextExecTime(float fCurrentTime);
+		inline bool inExecute() const { return m_bInExecute; }
 
 		bool shouldRepeat();
 
@@ -78,7 +81,7 @@ private:
 	class CTaskDescriptor
 	{
 	public:
-		int m_iId;
+		cell m_iId;
 		AMX *m_pAmx;
 		bool m_bFree;
 
@@ -92,9 +95,11 @@ private:
 		friend bool operator == (const CTask &left, const CTaskDescriptor &right)
 		{
 			if (right.m_bFree)
-				return left.isFree();
+				return (left.isFree() && !left.inExecute());
 			
-			return !left.isFree() && (right.m_pAmx ? left.getPlugin()->getAMX() == right.m_pAmx : true) && left.getTaskId() == right.m_iId;
+			return (!left.isFree()) && 
+					(right.m_pAmx ? left.getAMX() == right.m_pAmx : true) && 
+					(left.getTaskId() == right.m_iId);
 		}
 	};
 
@@ -112,7 +117,7 @@ public:
 	~CTaskMngr();
 
 	void registerTimers(float *pCurrentTime, float *pTimeLimit, float *pTimeLeft);	// The timers will always point to the right value
-	void registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat);
+	void registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat);
 	
 	int removeTasks(int iId, AMX *pAmx);											// remove all tasks that match the id and amx
 	int changeTasks(int iId, AMX *pAmx, float fNewBase);							// change all tasks that match the id and amx

amxmodx/Makefile

@@ -1,27 +1,38 @@
 #(C)2004-2005 AMX Mod X Development Team
 # Makefile written by David "BAILOPAN" Anderson
 
-HLSDK = ../hlsdk/SourceCode
+HLSDK = ../../hlsdk
 MM_ROOT = ../metamod/metamod
 
 ### EDIT BELOW FOR OTHER PROJECTS ###
 
-OPT_FLAGS = -O2 -funroll-loops -s -pipe
+OPT_FLAGS = -O2 -fno-strict-aliasing -funroll-loops -s -fomit-frame-pointer -pipe
 DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
+CPP = gcc-4.1
-NAME = amxmodx_mm
+NAME = amxmodx
+
+BIN_SUFFIX_32 = mm_i386.so
+BIN_SUFFIX_64 = mm_amd64.so
 
 OBJECTS = meta_api.cpp CFile.cpp CVault.cpp vault.cpp float.cpp file.cpp modules.cpp \
 	CMisc.cpp CTask.cpp string.cpp amxmodx.cpp CEvent.cpp CCmd.cpp CLogEvent.cpp \
 	srvcmd.cpp strptime.cpp amxcore.cpp amxtime.cpp power.cpp amxxlog.cpp fakemeta.cpp \
 	amxxfile.cpp CLang.cpp md5.cpp emsg.cpp CForward.cpp CPlugin.cpp CModule.cpp \
-	CMenu.cpp util.cpp amx.cpp amxdbg.cpp natives.cpp newmenus.cpp debugger.cpp
+	CMenu.cpp util.cpp amx.cpp amxdbg.cpp natives.cpp newmenus.cpp debugger.cpp \
+	optimizer.cpp format.cpp messages.cpp libraries.cpp vector.cpp sorting.cpp \
+	amxmod_compat.cpp
 
-LINK = -lz 
+LINK = -lgcc -static-libgcc
 
 INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
 	-I$(MM_ROOT) -Lzlib -I$(HLSDK)/common
 
+GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
+
+ifeq "$(GCC_VERSION)" "4"
+	OPT_FLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+endif
+
 ifeq "$(DEBUG)" "true"
 	BIN_DIR = Debug
 	CFLAGS = $(DEBUG_FLAGS)
@@ -30,22 +41,27 @@ else
 	CFLAGS = $(OPT_FLAGS)
 endif
 
-ifeq "$(MMGR)" "true"
+ifeq "$(BINLOG)" "true"
-	OBJECTS += mmgr/mmgr.cpp
+	NAME := $(NAME)_bl
-	CFLAGS += -DMEMORY_TEST
+	BIN_DIR := $(BIN_DIR)BinLog
+	OBJECTS += binlog.cpp
+	CFLAGS += -DBINLOG_ENABLED
 endif
 
-CFLAGS += -DLINUX -DNDEBUG -fPIC -Wno-deprecated -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
+CFLAGS += -DLINUX -DNDEBUG -DAMX_NOPROPLIST -fPIC -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
 
 ifeq "$(AMD64)" "true"
-	BINARY = $(NAME)_amd64.so
+	BINARY = $(NAME)_$(BIN_SUFFIX_64)
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 
+	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -DAMD64 -m64
+	LINK += -lz64
 	OBJECTS += JIT/natives-amd64.o
 else
-	BINARY = $(NAME)_i386.so
+	BINARY = $(NAME)_$(BIN_SUFFIX_32)
 	OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o
+	OBJECTS += JIT/helpers-x86.o
 	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
-	OPT_FLAGS += -march=i686
+	LINK += -lz
+	OPT_FLAGS += -march=i586
 endif
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
@@ -61,23 +77,23 @@ amd64:
 	rm -f zlib/libz.a
 	$(MAKE) all AMD64=true
 
-amd64_mmgr:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true MMGR=true
-
-amd64_debug_mmgr:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true DEBUG=true MMGR=true
-
 amd64_debug:
 	rm -f zlib/libz.a
 	$(MAKE) all AMD64=true DEBUG=true
 
-mmgr:
+amd64_binlog:
-	$(MAKE) all MMGR=true
+	rm -f zlib/libz.a
+	$(MAKE) all AMD64=true BINLOG=true
 
-debug_mmgr:
+amd64_binlog_debug:
-	$(MAKE) all MMGR=true DEBUG=true
+	rm -f zlib/libz.a
+	$(MAKE) all AMD64=true BINLOG=true DEBUG=true
+	
+binlog:
+	$(MAKE) all BINLOG=true
+	
+binlog_debug:
+	$(MAKE) all BINLOG=true DEBUG=true
 
 amxmodx: $(OBJ_LINUX)
 	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
@@ -89,7 +105,14 @@ default: all
 
 clean:
 	rm -rf Release/*.o
-	rm -rf Release/$(BINARY)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
+	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf ReleaseBinLog/*.o
+	rm -rf ReleaseBinLog/$(NAME)_bl_$(BIN_SUFFIX_32)
+	rm -rf ReleaseBinLog/$(NAME)_bl_$(BIN_SUFFIX_64)
 	rm -rf Debug/*.o
-	rm -rf Debug/$(BINARY)
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-
+	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
+	rm -rf DebugBinLog/*.o
+	rm -rf DebugBinLog/$(NAME)_bl_$(BIN_SUFFIX_32)
+	rm -rf DebugBinLog/$(NAME)_bl_$(BIN_SUFFIX_64)

amxmodx/amx.cpp

@@ -24,7 +24,7 @@
 #define AMX_NODYNALOAD
 #define AMX_ANSIONLY
 
-#if BUILD_PLATFORM == WINDOWS && BUILD_TYPE == RELEASE && BUILD_COMPILER == MSVC && PAWN_CELL_SIZE == 64
+#if !defined __linux__ && BUILD_PLATFORM == WINDOWS && BUILD_TYPE == RELEASE && BUILD_COMPILER == MSVC && PAWN_CELL_SIZE == 64
   /* bad bad workaround but we have to prevent a compiler crash :/ */
   #pragma optimize("g",off)
 #endif
@@ -46,6 +46,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <math.h>
 #include "osdefs.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
   #include <sclinux.h>
@@ -265,6 +266,13 @@ typedef enum {
   OP_SYSREQ_D,
   OP_SYMTAG,  /* obsolete */
   OP_BREAK,
+  OP_FLOAT_MUL,
+  OP_FLOAT_DIV,
+  OP_FLOAT_ADD,
+  OP_FLOAT_SUB,
+  OP_FLOAT_TO,
+  OP_FLOAT_ROUND,
+  OP_FLOAT_CMP,
   /* ----- */
   OP_NUM_OPCODES
 } OPCODE;
@@ -444,7 +452,7 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
   /* As of AMX Mod X 1.56, we don't patch sysreq.c to sysreq.d anymore.
    * Otherwise, we'd have no way of knowing the last native to be used.
    */
-  amx->usertags[UT_NATIVE] = (long)index;
+  amx->usertags[UT_NATIVE] = (void *)index;
 
   /* Note:
    *   params[0] == number of bytes for the additional parameters passed to the native function
@@ -454,8 +462,24 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
 
   amx->error=AMX_ERR_NONE;
 
+#if defined BINLOG_ENABLED
+  binlogfuncs_t *logfuncs = (binlogfuncs_t *)amx->usertags[UT_BINLOGS];
+  if (logfuncs)
+  {
+	  logfuncs->pfnLogNative(amx, index, (int)(params[0] / sizeof(cell)));
+	  logfuncs->pfnLogParams(amx, params);
+  }
+#endif //BINLOG_ENABLED
+
   *result = f(amx,params);
 
+#if defined BINLOG_ENABLED
+  if (logfuncs)
+  {
+	  logfuncs->pfnLogReturn(amx, *result);
+  }
+#endif
+
   return amx->error;
 }
 #endif /* defined AMX_INIT */
@@ -487,6 +511,7 @@ static int amx_BrowseRelocate(AMX *amx)
   cell cip;
   long codesize;
   OPCODE op;
+  BROWSEHOOK hook = NULL;
   #if defined __GNUC__ || defined ASM32 || defined JIT
     cell *opcode_list;
   #endif
@@ -502,6 +527,7 @@ static int amx_BrowseRelocate(AMX *amx)
   code=amx->base+(int)hdr->cod;
   codesize=hdr->dat - hdr->cod;
   amx->flags|=AMX_FLAG_BROWSE;
+  hook = (BROWSEHOOK)amx->usertags[UT_BROWSEHOOK];
 
   /* sanity checks */
   assert(OP_PUSH_PRI==36);
@@ -607,11 +633,22 @@ static int amx_BrowseRelocate(AMX *amx)
     case OP_FILL:
     case OP_HALT:
     case OP_BOUNDS:
-    case OP_SYSREQ_C:
     case OP_PUSHADDR:
     case OP_SYSREQ_D:
       cip+=sizeof(cell);
       break;
+    case OP_SYSREQ_C:
+		{
+			if (hook)
+#if defined __GNUC__ || defined ASM32 || defined JIT
+				hook(amx, opcode_list, &cip);
+#else
+				hook(amx, NULL, &cip);
+#endif
+			else
+				cip+=sizeof(cell);
+			break;
+		}
 
     case OP_LOAD_I:     /* instructions without parameters */
     case OP_STOR_I:
@@ -672,6 +709,13 @@ static int amx_BrowseRelocate(AMX *amx)
     case OP_SWAP_ALT:
     case OP_NOP:
     case OP_BREAK:
+    case OP_FLOAT_MUL:
+    case OP_FLOAT_DIV:
+    case OP_FLOAT_ADD:
+    case OP_FLOAT_SUB:
+    case OP_FLOAT_TO:
+    case OP_FLOAT_ROUND:
+	case OP_FLOAT_CMP:
       break;
 
     case OP_CALL:       /* opcodes that need relocation */
@@ -796,22 +840,10 @@ static void expand(unsigned char *code, long codesize, long memsize)
 }
 #endif /* defined AMX_INIT */
 
-int AMXAPI amx_Init(AMX *amx,void *program)
+int AMXAPI amx_Init(AMX *amx, void *program)
 {
   AMX_HEADER *hdr;
-  #if (defined _Windows || defined LINUX || defined __FreeBSD__ || defined __OpenBSD__) && !defined AMX_NODYNALOAD
+  BROWSEHOOK hook = NULL;
-    char libname[sNAMEMAX+8];  /* +1 for '\0', +3 for 'amx' prefix, +4 for extension */
-    #if defined _Windows
-      typedef int (FAR WINAPI *AMX_ENTRY)(AMX _FAR *amx);
-      HINSTANCE hlib;
-    #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-      typedef int (*AMX_ENTRY)(AMX *amx);
-      void *hlib;
-    #endif
-    int numlibraries,i;
-    AMX_FUNCSTUB *lib;
-    AMX_ENTRY libinit;
-  #endif
 
   if ((amx->flags & AMX_FLAG_RELOC)!=0)
     return AMX_ERR_INIT;  /* already initialized (may not do so twice) */
@@ -821,22 +853,6 @@ int AMXAPI amx_Init(AMX *amx,void *program)
    * multi-byte words
    */
   assert(check_endian());
-  #if BYTE_ORDER==BIG_ENDIAN
-    amx_Align32((uint32_t*)&hdr->size);
-    amx_Align16(&hdr->magic);
-    amx_Align16((uint16_t*)&hdr->flags);
-    amx_Align16((uint16_t*)&hdr->defsize);
-    amx_Align32((uint32_t*)&hdr->cod);
-    amx_Align32((uint32_t*)&hdr->dat);
-    amx_Align32((uint32_t*)&hdr->hea);
-    amx_Align32((uint32_t*)&hdr->stp);
-    amx_Align32((uint32_t*)&hdr->cip);
-    amx_Align32((uint32_t*)&hdr->publics);
-    amx_Align32((uint32_t*)&hdr->natives);
-    amx_Align32((uint32_t*)&hdr->libraries);
-    amx_Align32((uint32_t*)&hdr->pubvars);
-    amx_Align32((uint32_t*)&hdr->tags);
-  #endif
 
   if (hdr->magic!=AMX_MAGIC)
     return AMX_ERR_FORMAT;
@@ -857,13 +873,7 @@ int AMXAPI amx_Init(AMX *amx,void *program)
   } /* if */
   if (hdr->stp<=0)
     return AMX_ERR_FORMAT;
-  #if BYTE_ORDER==BIG_ENDIAN
+
-    if ((hdr->flags & AMX_FLAG_COMPACT)==0) {
-      ucell *code=(ucell *)((unsigned char *)program+(int)hdr->cod);
-      while (code<(ucell *)((unsigned char *)program+(int)hdr->hea))
-        swapcell(code++);
-    } /* if */
-  #endif
   assert((hdr->flags & AMX_FLAG_COMPACT)!=0 || hdr->hea == hdr->size);
   if ((hdr->flags & AMX_FLAG_COMPACT)!=0) {
     #if AMX_COMPACTMARGIN > 2
@@ -890,111 +900,18 @@ int AMXAPI amx_Init(AMX *amx,void *program)
     amx->callback=amx_Callback;
   amx->data=NULL;
 
-  /* also align all addresses in the public function, public variable,
-   * public tag and native function tables --offsets into the name table
-   * (if present) must also be swapped.
-   */
-  #if BYTE_ORDER==BIG_ENDIAN
-  { /* local */
-    AMX_FUNCSTUB *fs;
-    int i,num;
-
-    fs=GETENTRY(hdr,natives,0);
-    num=NUMENTRIES(hdr,natives,libraries);
-    for (i=0; i<num; i++) {
-      amx_AlignCell(&fs->address);      /* redundant, because it should be zero */
-      if (USENAMETABLE(hdr))
-        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
-      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
-    } /* for */
-
-    fs=GETENTRY(hdr,publics,0);
-    assert(hdr->publics<=hdr->natives);
-    num=NUMENTRIES(hdr,publics,natives);
-    for (i=0; i<num; i++) {
-      amx_AlignCell(&fs->address);
-      if (USENAMETABLE(hdr))
-        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
-      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
-    } /* for */
-
-    fs=GETENTRY(hdr,pubvars,0);
-    assert(hdr->pubvars<=hdr->tags);
-    num=NUMENTRIES(hdr,pubvars,tags);
-    for (i=0; i<num; i++) {
-      amx_AlignCell(&fs->address);
-      if (USENAMETABLE(hdr))
-        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
-      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
-    } /* for */
-
-    fs=GETENTRY(hdr,tags,0);
-    if (hdr->file_version<7) {
-      assert(hdr->tags<=hdr->cod);
-      num=NUMENTRIES(hdr,tags,cod);
-    } else {
-      assert(hdr->tags<=hdr->nametable);
-      num=NUMENTRIES(hdr,tags,nametable);
-    } /* if */
-    for (i=0; i<num; i++) {
-      amx_AlignCell(&fs->address);
-      if (USENAMETABLE(hdr))
-        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
-      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
-    } /* for */
-  } /* local */
-  #endif
-
   /* relocate call and jump instructions */
+  hook = (BROWSEHOOK)amx->usertags[UT_BROWSEHOOK];
+  if (hook)
+	  hook(amx, NULL, NULL);
   amx_BrowseRelocate(amx);
 
-  /* load any extension modules that the AMX refers to */
-  #if (defined _Windows || defined LINUX || defined __FreeBSD__ || defined __OpenBSD__) && !defined AMX_NODYNALOAD
-    hdr=(AMX_HEADER *)amx->base;
-    numlibraries=NUMENTRIES(hdr,libraries,pubvars);
-    for (i=0; i<numlibraries; i++) {
-      lib=GETENTRY(hdr,libraries,i);
-      strcpy(libname,"amx");
-      strcat(libname,GETENTRYNAME(hdr,lib));
-      #if defined _Windows
-        strcat(libname,".dll");
-        #if defined __WIN32__
-          hlib=LoadLibraryA(libname);
-        #else
-          hlib=LoadLibrary(libname);
-          if (hlib<=HINSTANCE_ERROR)
-            hlib=NULL;
-        #endif
-      #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-        strcat(libname,".so");
-        hlib=dlopen(libname,RTLD_NOW);
-      #endif
-      if (hlib!=NULL) {
-        /* a library that cannot be loaded or that does not have the required
-         * initialization function is simply ignored
-         */
-        char funcname[sNAMEMAX+9]; /* +1 for '\0', +4 for 'amx_', +4 for 'Init' */
-        strcpy(funcname,"amx_");
-        strcat(funcname,GETENTRYNAME(hdr,lib));
-        strcat(funcname,"Init");
-        #if defined _Windows
-          libinit=(AMX_ENTRY)GetProcAddress(hlib,funcname);
-        #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-          libinit=(AMX_ENTRY)dlsym(hlib,funcname);
-        #endif
-        if (libinit!=NULL)
-          libinit(amx);
-      } /* if */
-      lib->address=(ucell)hlib;
-    } /* for */
-  #endif
-
   return AMX_ERR_NONE;
 }
 
 #if defined JIT
 
-  #define CODESIZE_JIT    8192  /* approximate size of the code for the JIT */
+  #define CODESIZE_JIT    65536  /* approximate size of the code for the JIT */
 
   #if defined __WIN32__   /* this also applies to Win32 "console" applications */
 
@@ -1073,6 +990,7 @@ int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code)
     amx->cip = hdr->cip;
     amx->hea = hdr->hea;
     amx->stp = hdr->stp - sizeof(cell);
+	amx->hlw = hdr->hea;
     /* also put a sentinel for strings at the top the stack */
     *(cell *)((char*)native_code + hdr->dat + hdr->stp - sizeof(cell)) = 0;
     amx->stk = amx->stp;
@@ -1259,27 +1177,22 @@ int AMXAPI amx_GetNative(AMX *amx, int index, char *funcname)
 
 int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index)
 {
-  int first,last,mid,result;
+  int first,last,mid;
   char pname[sNAMEMAX+1];
 
   amx_NumNatives(amx, &last);
   last--;       /* last valid index is 1 less than the number of functions */
   first=0;
-  /* binary search */
+  /* normal search */
-  while (first<=last) {
+  for (mid=0; mid<=last; mid++)
-    mid=(first+last)/2;
+  {
     amx_GetNative(amx, mid, pname);
-    result=strcmp(pname,name);
+    if (strcmp(pname, name)==0)
-    if (result>0) {
+	{
-      last=mid-1;
+      *index = mid;
-    } else if (result<0) {
-      first=mid+1;
-    } else {
-      *index=mid;
       return AMX_ERR_NONE;
 	} /* if */
-  } /* while */
+  } /* for */
-  /* not found, set to an invalid index, so amx_Exec() will fail */
   *index=INT_MAX;
   return AMX_ERR_NOTFOUND;
 }
@@ -1492,37 +1405,11 @@ int AMXAPI amx_FindTagId(AMX *amx, cell tag_id, char *tagname)
 #if defined AMX_XXXUSERDATA
 int AMXAPI amx_GetUserData(AMX *amx, long tag, void **ptr)
 {
-  int index;
-
-  assert(amx!=NULL);
-  assert(tag!=0);
-  for (index=0; index<AMX_USERNUM && amx->usertags[index]!=tag; index++)
-    /* nothing */;
-  if (index>=AMX_USERNUM)
-    return AMX_ERR_USERDATA;
-  *ptr=amx->userdata[index];
   return AMX_ERR_NONE;
 }
 
 int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr)
 {
-  int index;
-
-  assert(amx!=NULL);
-  assert(tag!=0);
-  /* try to find existing tag */
-  for (index=0; index<AMX_USERNUM && amx->usertags[index]!=tag; index++)
-    /* nothing */;
-  /* if not found, try to find empty tag */
-  if (index>=AMX_USERNUM)
-    for (index=0; index<AMX_USERNUM && amx->usertags[index]!=0; index++)
-      /* nothing */;
-  /* if still not found, quit with error */
-  if (index>=AMX_USERNUM)
-    return AMX_ERR_INDEX;
-  /* set the tag and the value */
-  amx->usertags[index]=tag;
-  amx->userdata[index]=ptr;
   return AMX_ERR_NONE;
 }
 #endif /* AMX_XXXUSERDATA */
@@ -1595,6 +1482,36 @@ int AMXAPI amx_RegisterToAny(AMX *amx, AMX_NATIVE f)
   return err;
 }
 
+int AMXAPI amx_Reregister(AMX *amx, const AMX_NATIVE_INFO *list, int number)
+{
+  AMX_FUNCSTUB *func;
+  AMX_HEADER *hdr;
+  int i,numnatives,count=0;
+  AMX_NATIVE funcptr;
+
+  hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
+  assert(hdr->natives<=hdr->libraries);
+  numnatives=NUMENTRIES(hdr,natives,libraries);
+
+  count=0;
+  func=GETENTRY(hdr,natives,0);
+  for (i=0; i<numnatives; i++) {
+    if (func->address!=0) {
+      /* this function is located */
+      funcptr=(list!=NULL) ? findfunction(GETENTRYNAME(hdr,func),list,number) : NULL;
+      if (funcptr!=NULL)
+      {
+        func->address=(ucell)funcptr;
+        count++;
+      }
+    } /* if */
+    func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
+  } /* for */
+  return count;
+}
+
 int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *list, int number)
 {
   AMX_FUNCSTUB *func;
@@ -1764,13 +1681,16 @@ static const void * const amx_opcodelist[] = {
         &&op_file,      &&op_line,      &&op_symbol,    &&op_srange,
         &&op_jump_pri,  &&op_switch,    &&op_casetbl,   &&op_swap_pri,
         &&op_swap_alt,  &&op_pushaddr,  &&op_nop,       &&op_sysreq_d,
-        &&op_symtag,    &&op_break };
+        &&op_symtag,    &&op_break,     &&op_float_mul, &&op_float_div,
+        &&op_float_add, &&op_float_sub, &&op_float_to,  &&op_float_round,
+        &&op_float_cmp};
   AMX_HEADER *hdr;
   AMX_FUNCSTUB *func;
   unsigned char *code, *data;
   cell pri,alt,stk,frm,hea;
   cell reset_stk, reset_hea, *cip;
-  cell offs;
+  cell offs, offs2;
+  REAL fnum, fnum2;
   ucell codesize;
   int num,i;
 
@@ -2616,7 +2536,60 @@ static const void * const amx_opcodelist[] = {
     NEXT(cip);
   op_nop:
     NEXT(cip);
-  op_break:
+  op_float_mul:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+    fnum = amx_ctof(offs) * amx_ctof(offs2);
+    pri = amx_ftoc(fnum);
+    NEXT(cip);
+  op_float_add:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+    fnum = amx_ctof(offs) + amx_ctof(offs2);
+    pri = amx_ftoc(fnum);
+    NEXT(cip);
+  op_float_sub:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+    fnum = amx_ctof(offs) - amx_ctof(offs2);
+    pri = amx_ftoc(fnum);
+    NEXT(cip);
+  op_float_div:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+    fnum = amx_ctof(offs) / amx_ctof(offs2);
+    pri = amx_ftoc(fnum);
+    NEXT(cip);
+  op_float_to:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    fnum = (REAL)offs;
+    pri = amx_ftoc(fnum);
+    NEXT(cip);
+  op_float_round:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+    fnum = amx_ctof(offs);
+    if (!offs2)
+       fnum = floor(fnum + 0.5);
+	else  if (offs2 == 1)
+       fnum = floor(fnum);
+	else
+       fnum = ceil(fnum);
+    pri = (cell)fnum;
+    NEXT(cip);
+  op_float_cmp:
+    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+    fnum = amx_ctof(offs);
+    fnum2 = amx_ctof(offs2);
+    if (fnum == fnum2)
+      pri = 0;
+	else if (fnum > fnum2)
+      pri = 1;
+	else
+      pri = -1;
+    NEXT(cip);
+op_break:
     if (amx->debug!=NULL) {
       /* store status */
       amx->frm=frm;
@@ -2700,7 +2673,8 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
     cell  parms[9];     /* registers and parameters for assembler AMX */
   #else
     OPCODE op;
-    cell offs;
+    cell offs, offs2;
+	REAL fnum, fnum2;
     int num;
   #endif
   assert(amx!=NULL);
@@ -3591,6 +3565,59 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
       break;
     case OP_NOP:
       break;
+    case OP_FLOAT_MUL:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+      fnum = amx_ctof(offs) * amx_ctof(offs2);
+      pri = amx_ftoc(fnum);
+      break;
+    case OP_FLOAT_ADD:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+      fnum = amx_ctof(offs) + amx_ctof(offs2);
+      pri = amx_ftoc(fnum);
+      break;
+    case OP_FLOAT_SUB:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+      fnum = amx_ctof(offs) - amx_ctof(offs2);
+      pri = amx_ftoc(fnum);
+      break;
+    case OP_FLOAT_DIV:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+      fnum = amx_ctof(offs) / amx_ctof(offs2);
+      pri = amx_ftoc(fnum);
+      break;
+    case OP_FLOAT_TO:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      fnum = (float)offs;
+      pri = amx_ftoc(fnum);
+      break;
+    case OP_FLOAT_ROUND:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+      fnum = amx_ctof(offs);
+      if (!offs2)
+         fnum = (REAL)floor(fnum + 0.5);
+      else  if (offs2 == 1)
+         fnum = floor(fnum);
+	  else
+         fnum = ceil(fnum);
+      pri = (cell)fnum;
+      break;
+	case OP_FLOAT_CMP:
+      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
+      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
+      fnum = amx_ctof(offs);
+      fnum2 = amx_ctof(offs2);
+      if (fnum == fnum2)
+        pri = 0;
+	  else if (fnum > fnum2)
+        pri = 1;
+	  else
+        pri = -1;
+      break;
     case OP_BREAK:
       assert((amx->flags & AMX_FLAG_BROWSE)==0);
       if (amx->debug!=NULL) {

amxmodx/amx.h

@@ -79,15 +79,6 @@
   #endif
 #endif
 
-#if HAVE_ALLOCA_H
-  #include <alloca.h>
-#endif
-#if defined __WIN32__ || defined _WIN32 || defined WIN32 /* || defined __MSDOS__ */
-  #if !defined alloca
-    #define alloca(n)   _alloca(n)
-  #endif
-#endif
-
 #if !defined arraysize
   #define arraysize(array)  (sizeof(array) / sizeof((array)[0]))
 #endif
@@ -175,6 +166,14 @@ typedef int (AMXAPI *AMX_NATIVE_FILTER)(struct tagAMX *amx, int index);
   #pragma warning(disable:4103)  /* disable warning message 4103 that complains
                                   * about pragma pack in a header file */
   #pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
+
+	#if _MSC_VER >= 1400
+		// MSVC8 - Replace POSIX stricmp with ISO C++ conformant one as it is deprecated
+		#define stricmp _stricmp
+
+		// Need this because of some stupid bug
+		#pragma warning (disable : 4996)
+	#endif
 #endif
 
 /* Some compilers do not support the #pragma align, which should be fine. Some
@@ -215,7 +214,7 @@ typedef struct tagAMX_NATIVE_INFO {
 
 typedef struct tagAMX_FUNCSTUB {
   ucell address         PACKED;
-  char name[sEXPMAX+1]  PACKED;
+  char name[sEXPMAX+1];
 } PACKED AMX_FUNCSTUB;
 
 typedef struct tagFUNCSTUBNT {
@@ -240,7 +239,7 @@ typedef struct tagAMX {
   cell stp              PACKED; /* top of the stack: relative to base + amxhdr->dat */
   int flags             PACKED; /* current status, see amx_Flags() */
   /* user data */
-  long usertags[AMX_USERNUM] PACKED;
+  void _FAR *usertags[AMX_USERNUM] PACKED;
   //okay userdata[3] in AMX Mod X is for the CPlugin * pointer
   //we're also gonna set userdata[2] to a special debug structure
   //lastly, userdata[1] is for opcode_list from amx_BrowseRelocate
@@ -266,8 +265,8 @@ typedef struct tagAMX {
 typedef struct tagAMX_HEADER {
   int32_t size          PACKED; /* size of the "file" */
   uint16_t magic        PACKED; /* signature */
-  char    file_version  PACKED; /* file format version */
+  char    file_version;         /* file format version */
-  char    amx_version   PACKED; /* required version of the AMX */
+  char    amx_version;          /* required version of the AMX */
   int16_t flags         PACKED;
   int16_t defsize       PACKED; /* size of a definition record */
   int32_t cod           PACKED; /* initial value of COD - code block */
@@ -323,6 +322,7 @@ enum {
 #define AMX_FLAG_COMPACT  0x04  /* compact encoding */
 #define AMX_FLAG_BYTEOPC  0x08  /* opcode is a byte (not a cell) */
 #define AMX_FLAG_NOCHECKS 0x10  /* no array bounds checking; no STMT opcode */
+#define AMX_FLAG_OLDFILE  0x20	/* Old AMX Mod plugin */
 #define AMX_FLAG_PRENIT	 0x100	/* pre-initialized, do not check natives */
 #define AMX_FLAG_NTVREG 0x1000  /* all native functions are registered */
 #define AMX_FLAG_JITC   0x2000  /* abstract machine is JIT compiled */
@@ -343,6 +343,11 @@ enum {
 #define UD_OPCODELIST	1
 #define	UD_HANDLER		0
 #define	UT_NATIVE		3
+#define UT_OPTIMIZER	2
+#define UT_BROWSEHOOK	1
+#define UT_BINLOGS		0
+
+typedef void (*BROWSEHOOK)(AMX *amx, cell *oplist, cell *cip);
 
 /* for native functions that use floating point parameters, the following
  * two macros are convenient for casting a "cell" into a "float" type _without_
@@ -406,6 +411,7 @@ int AMXAPI amx_PushArray(AMX *amx, cell *amx_addr, cell **phys_addr, const cell
 int AMXAPI amx_PushString(AMX *amx, cell *amx_addr, cell **phys_addr, const char *string, int pack, int use_wchar);
 int AMXAPI amx_RaiseError(AMX *amx, int error);
 int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
+int AMXAPI amx_Reregister(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
 int AMXAPI amx_RegisterToAny(AMX *amx, AMX_NATIVE f);
 int AMXAPI amx_Release(AMX *amx, cell amx_addr);
 int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
@@ -445,6 +451,15 @@ int AMXAPI amx_GetStringOld(char *dest,const cell *source,int use_wchar);
   #endif
 #endif
 
+#if defined BINLOG_ENABLED
+typedef struct tagBINLOG
+{
+	void	(*pfnLogNative)(AMX *amx, int native, int params);
+	void	(*pfnLogReturn)(AMX *amx, cell retval);
+	void	(*pfnLogParams)(AMX *amx, cell *params);
+} binlogfuncs_t;
+#endif
+
 #ifdef  __cplusplus
 }
 #endif

amxmodx/amxdbg.h

@@ -65,8 +65,8 @@ extern  "C" {
 typedef struct tagAMX_DBG_HDR {
   int32_t size          PACKED; /* size of the debug information chunk */
   uint16_t magic        PACKED; /* signature, must be 0xf1ef */
-  char    file_version  PACKED; /* file format version */
+  char    file_version;         /* file format version */
-  char    amx_version   PACKED; /* required version of the AMX */
+  char    amx_version;          /* required version of the AMX */
   int16_t flags         PACKED; /* currently unused */
   int16_t files         PACKED; /* number of entries in the "file" table */
   int16_t lines         PACKED; /* number of entries in the "line" table */
@@ -74,51 +74,51 @@ typedef struct tagAMX_DBG_HDR {
   int16_t tags          PACKED; /* number of entries in the "tag" table */
   int16_t automatons    PACKED; /* number of entries in the "automaton" table */
   int16_t states        PACKED; /* number of entries in the "state" table */
-} AMX_DBG_HDR           PACKED;
+} PACKED AMX_DBG_HDR;
 #define AMX_DBG_MAGIC   0xf1ef
 
 typedef struct tagAMX_DBG_FILE {
   ucell   address       PACKED; /* address in the code segment where generated code (for this file) starts */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
+  const char name[1];           /* ASCII string, zero-terminated */
-} AMX_DBG_FILE          PACKED;
+} PACKED AMX_DBG_FILE;
 
 typedef struct tagAMX_DBG_LINE {
   ucell   address       PACKED; /* address in the code segment where generated code (for this line) starts */
   int32_t line          PACKED; /* line number */
-} AMX_DBG_LINE          PACKED;
+} PACKED AMX_DBG_LINE;
 
 typedef struct tagAMX_DBG_SYMBOL {
   ucell   address       PACKED; /* address in the data segment or relative to the frame */
   int16_t tag           PACKED; /* tag for the symbol */
   ucell   codestart     PACKED; /* address in the code segment from which this symbol is valid (in scope) */
   ucell   codeend       PACKED; /* address in the code segment until which this symbol is valid (in scope) */
-  char    ident         PACKED; /* kind of symbol (function/variable) */
+  char    ident;                /* kind of symbol (function/variable) */
-  char    vclass        PACKED; /* class of symbol (global/local) */
+  char    vclass;               /* class of symbol (global/local) */
   int16_t dim           PACKED; /* number of dimensions */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
+  const char name[1];           /* ASCII string, zero-terminated */
-} AMX_DBG_SYMBOL        PACKED;
+} PACKED AMX_DBG_SYMBOL;
 
 typedef struct tagAMX_DBG_SYMDIM {
   int16_t tag           PACKED; /* tag for the array dimension */
   ucell   size          PACKED; /* size of the array dimension */
-} AMX_DBG_SYMDIM        PACKED;
+} PACKED AMX_DBG_SYMDIM;
 
 typedef struct tagAMX_DBG_TAG {
   int16_t tag           PACKED; /* tag id */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
+  const char name[1];           /* ASCII string, zero-terminated */
-} AMX_DBG_TAG           PACKED;
+} PACKED AMX_DBG_TAG;
 
 typedef struct tagAMX_DBG_MACHINE {
   int16_t automaton     PACKED; /* automaton id */
   ucell address         PACKED; /* address of state variable */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
+  const char name[1];           /* ASCII string, zero-terminated */
-} AMX_DBG_MACHINE       PACKED;
+} PACKED AMX_DBG_MACHINE;
 
 typedef struct tagAMX_DBG_STATE {
   int16_t state         PACKED; /* state id */
   int16_t automaton     PACKED; /* automaton id */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
+  const char name[1];           /* ASCII string, zero-terminated */
-} AMX_DBG_STATE         PACKED;
+} PACKED AMX_DBG_STATE;
 
 typedef struct tagAMX_DBG {
   AMX_DBG_HDR     _FAR *hdr         PACKED; /* points to the AMX_DBG header */
@@ -128,7 +128,7 @@ typedef struct tagAMX_DBG {
   AMX_DBG_TAG     _FAR **tagtbl     PACKED;
   AMX_DBG_MACHINE _FAR **automatontbl PACKED;
   AMX_DBG_STATE   _FAR **statetbl   PACKED;
-} AMX_DBG                           PACKED;
+} PACKED AMX_DBG;
 
 #if !defined iVARIABLE
   #define iVARIABLE  1  /* cell that has an address and that can be fetched directly (lvalue) */

amxmodx/amxexecn.asm

@@ -56,6 +56,8 @@
 ;
 ;History (list of changes)
 ;-------------------------
+; 10 february 2006 by David Anderson
+;       Addition of float opcodes
 ; 17 february 2005  by Thiadmer Riemersms
 ;       Addition of the BREAK opcode, removal of the older debugging opcode table.
 ;  6 march 2004  by Thiadmer Riemersma
@@ -1406,6 +1408,108 @@ OP_NOP:
         add     esi,4
         GO_ON
         
+OP_FLOAT_MUL:
+		add   esi,4
+		fld   dword [edi+ecx+4]
+		fmul	dword [edi+ecx+8]
+		sub   esp,4
+		fstp	dword [esp]
+		pop   eax
+		GO_ON
+		
+OP_FLOAT_DIV:
+		add   esi,4
+		fld   dword [edi+ecx+4]
+		fdiv	dword [edi+ecx+8]
+		sub   esp,4
+		fstp	dword [esp]
+		pop   eax
+		GO_ON
+		
+OP_FLOAT_ADD:
+		add   esi,4
+		fld   dword [edi+ecx+4]
+		fadd	dword [edi+ecx+8]
+		sub   esp,4
+		fstp	dword [esp]
+		pop   eax
+		GO_ON
+		
+OP_FLOAT_SUB:
+		add   esi,4
+		fld   dword [edi+ecx+4]
+		fsub	dword [edi+ecx+8]
+		sub   esp, 4
+		fstp	dword [esp]
+		pop   eax
+		GO_ON
+		
+OP_FLOAT_TO:
+		add     esi,4
+		fild    dword [edi+ecx+4]
+		sub     esp,4
+		fstp    dword [esp]
+		pop     eax
+		GO_ON
+		
+OP_FLOAT_ROUND:
+		add	    esi,4
+		;get the float control word
+		push    0
+		mov     ebp,esp
+		fstcw   [ebp]
+		mov		eax,[ebp]
+		push    eax
+		;clear the top bits
+		xor     ah,ah
+		;get the control method
+		push    edx
+		mov     edx,[edi+ecx+8]
+		and     edx,3	;sanity check
+		shl     edx,2	;shift it to right position
+		;set the bits
+		or      ah,dl	;set bits 15,14 of FCW to rounding method
+		or      ah,3	;set precision to 64bit
+		mov     [ebp], eax
+		fldcw   [ebp]
+		;calculate
+		sub     esp,4
+		fld     dword [edi+ecx+4]
+		test    edx,edx
+		jz      .correct
+		jmp     .skip_correct
+	.correct:
+		fadd    st0
+		fadd    dword [g_round_nearest]
+		fistp   dword [esp]
+		pop     eax
+		sar     eax,1
+		jmp     .done
+	.skip_correct:
+		frndint
+		fistp   dword [esp]
+		pop     eax
+	.done:
+		pop     edx
+		;restore bits
+		pop     ebp
+		mov     [esp], ebp
+		fldcw   [esp]
+		pop      ebp
+		GO_ON
+		
+OP_FLOAT_CMP:
+		add     esi, 4
+		fld     dword [edi+ecx+8]
+		fld     dword [edi+ecx+4]
+		fucompp
+		fnstsw  ax
+		fwait
+		sahf
+		cmovz   eax, [g_flags+4]
+		cmova   eax, [g_flags+8]
+		cmovb   eax, [g_flags+0]
+		GO_ON
 		
 OP_BREAK:
         mov     ebp,amx         ; get amx into ebp
@@ -1501,6 +1605,14 @@ Start_DATA
 
 lodb_and DD     0ffh, 0ffffh, 0, 0ffffffffh
 
+g_round_nearest	DD	0.5
+
+		GLOBAL g_flags
+g_flags:
+		DD		-1
+		DD		0
+		DD		1
+
         GLOBAL  amx_opcodelist
         GLOBAL  _amx_opcodelist
 amx_opcodelist:
@@ -1642,4 +1754,10 @@ _amx_opcodelist DD OP_INVALID
         DD      OP_SYSREQ_D
         DD      OP_SYMTAG
         DD      OP_BREAK
-
+        DD      OP_FLOAT_MUL
+        DD      OP_FLOAT_DIV
+        DD      OP_FLOAT_ADD
+        DD      OP_FLOAT_SUB
+        DD      OP_FLOAT_TO
+        DD      OP_FLOAT_ROUND
+        DD      OP_FLOAT_CMP

amxmodx/amxjitsn.asm

@@ -304,7 +304,11 @@
 %endmacro
 
 
+%ifdef WIN32
+section .data exec
+%else
 section .text
+%endif
 
 
 global  asm_runJIT, _asm_runJIT
@@ -437,7 +441,9 @@ reloc_done:
 ; in the compiled code. This is fine, but the .text section in an ELF executable
 ; is usually marked read-only, that's why this code is in the .data section.
 
+%ifndef WIN32
 section .data exec
+%endif
 
 OP_LOAD_PRI:
 ;nop;
@@ -1876,7 +1882,7 @@ OP_BREAK:
         jae     code_gen_done
         jmp     DWORD [ebx]             ; go on with the next opcode
 %else
-        GO_ON   j_break, OP_INVALID
+        GO_ON   j_break, OP_FLOAT_MUL
     j_break:
         mov     ebp,amx
         cmp     DWORD [ebp+_debug], 0
@@ -1885,6 +1891,116 @@ OP_BREAK:
     CHECKCODESIZE j_break
 %endif
 
+OP_FLOAT_MUL:
+		GO_ON	j_float_mul, OP_FLOAT_DIV
+	j_float_mul:
+		fld     dword [esi+4]
+		fmul    dword [esi+8]
+		sub     esp, 4
+		fstp    dword [esp]
+		pop     eax
+	CHECKCODESIZE j_float_mul
+	
+OP_FLOAT_DIV:
+		GO_ON	j_float_div, OP_FLOAT_ADD
+	j_float_div:
+		fld     dword [esi+4]
+		fdiv    dword [esi+8]
+		sub     esp, 4
+		fstp    dword [esp]
+		pop     eax
+	CHECKCODESIZE j_float_div
+	
+OP_FLOAT_ADD:
+		GO_ON	j_float_add, OP_FLOAT_SUB
+	j_float_add:
+		fld     dword [esi+4]
+		fadd    dword [esi+8]
+		sub     esp, 4
+		fstp    dword [esp]
+		pop     eax
+	CHECKCODESIZE j_float_add
+	
+OP_FLOAT_SUB:
+		GO_ON	j_float_sub, OP_FLOAT_TO
+	j_float_sub:
+		fld     dword [esi+4]
+		fsub    dword [esi+8]
+		sub     esp, 4
+		fstp	  dword [esp]
+		pop     eax
+	CHECKCODESIZE j_float_sub
+	
+OP_FLOAT_TO:
+		GO_ON   j_float_to, OP_FLOAT_ROUND
+	j_float_to:
+		fild    dword [esi+4]
+		sub     esp, 4
+		fstp    dword [esp]
+		pop     eax
+	CHECKCODESIZE j_float_to
+	
+OP_FLOAT_ROUND:
+		GO_ON   j_float_round, OP_FLOAT_CMP
+	j_float_round:
+		;get the float control word
+		push    0
+		mov     ebp,esp
+		fstcw   [ebp]
+		mov     eax,[ebp]
+		push    eax
+		;clear the top bits
+		xor     ah,ah
+		;get the control method
+		push    edx
+		mov     edx,[esi+8]
+		and     edx,3	;sanity check
+		shl     edx,2	;shift it to right position
+		;set the bits
+		or      ah,dl	;set bits 15,14 of FCW to rounding method
+		or      ah,3	;set precision to 64bit
+		mov     [ebp], eax
+		fldcw   [ebp]
+		;calculate
+		sub     esp,4
+		fld     dword [esi+4]
+		test    edx,edx
+		jz      .correct
+		jmp     .skip_correct
+	.correct:
+		fadd    st0
+		fadd    dword [g_round_nearest]
+		fistp   dword [esp]
+		pop     eax
+		sar     eax,1
+		jmp     .done
+	.skip_correct:
+		frndint
+		fistp   dword [esp]
+		pop     eax
+	.done:
+		pop     edx
+		;restore bits
+		pop     ebp
+		mov     [esp], ebp
+		fldcw   [esp]
+		pop      ebp
+	CHECKCODESIZE j_float_round
+	
+OP_FLOAT_CMP:
+		GO_ON	j_float_cmp, OP_INVALID
+	j_float_cmp:
+		fld     dword [esi+8]
+		fld     dword [esi+4]
+		fucompp
+		fnstsw  ax
+		fwait
+		sahf
+		cmovz   eax, [g_flagsjit+4]
+		cmova   eax, [g_flagsjit+8]
+		cmovb   eax, [g_flagsjit+0]
+	CHECKCODESIZE j_float_cmp
+
 OP_INVALID:                     ; break from the compiler with an error code
         mov     eax,AMX_ERR_INVINSTR
         pop     esi
@@ -2006,7 +2122,9 @@ err_heaplow:
 _CHKMARGIN_HEAP:
         cmp     esi,stp
         jg      err_stacklow
-        cmp     dword hea,0
+        mov     ebp,amx
+        mov     ebp,[ebp+_hlw]
+        cmp     dword hea,ebp
         jl      err_heaplow
         ret
 
@@ -2313,6 +2431,16 @@ jit_switch      DD      JIT_OP_SWITCH
 ; The table for the browser/relocator function.
 ;
 
+global g_flagsjit
+g_flagsjit:
+		DD		-1
+		DD		0
+		DD		1
+		
+global g_round_nearest
+g_round_nearest:
+		DD		0.5
+
 global amx_opcodelist_jit, _amx_opcodelist_jit
 
 amx_opcodelist_jit:
@@ -2455,5 +2583,12 @@ _amx_opcodelist_jit:
         DD      OP_SYSREQ_D     ; TR
         DD      OP_SYMTAG       ; TR
         DD      OP_BREAK        ; TR
+        DD      OP_FLOAT_MUL	; DA
+        DD      OP_FLOAT_DIV	; DA
+        DD      OP_FLOAT_ADD	; DA
+        DD      OP_FLOAT_SUB	; DA
+        DD      OP_FLOAT_TO		; DA
+        DD      OP_FLOAT_ROUND	; DA
+        DD      OP_FLOAT_CMP	; DA
 
 END

amxmodx/amxmod_compat.cpp

@@ -0,0 +1,117 @@
+#include "amxmodx.h"
+#include "amxmod_compat.h"
+#include "format.h"
+
+bool GetTranslation(amxtrans_t trans, int &key, int &dest, int &lang)
+{
+	key = (trans & BCOMPAT_TRANSLATE_KEYMASK);
+	dest = (trans >> BCOMPAT_TRANSLATE_DESTRSH) & BCOMPAT_TRANSLATE_DESTMASK;
+	lang = (trans >> BCOMPAT_TRANSLATE_LANGRSH) & BCOMPAT_TRANSLATE_LANGMASK;
+
+	if (dest == 0x3F)
+	{
+		dest = -1;
+	} 
+
+	if (lang == 0x1F)
+	{
+		lang = -1;
+	}
+
+	return true;
+}
+
+bool translate_bcompat(AMX *amx, cell *source, const char **_key, const char **_def)
+{
+	amxtrans_t trans = static_cast<amxtrans_t>(*source);
+	int key, _dest, lang;
+	if (!GetTranslation(trans, key, _dest, lang))
+	{
+		return false;
+	}
+
+	cell amx_addr, *phys_addr;
+	if (amx_Allot(amx, 3, &amx_addr, &phys_addr) != AMX_ERR_NONE)
+	{
+		return false;
+	}
+
+	if (_dest == -1)
+	{
+		*phys_addr = LANG_PLAYER;
+	} else if (_dest == 0) {
+		*phys_addr = LANG_SERVER;
+	} else if (lang >= 0 && lang < g_langMngr.GetLangsNum()) {
+		const char *name = g_langMngr.GetLangName(lang);
+		phys_addr[0] = static_cast<cell>(name[0]);
+		phys_addr[1] = static_cast<cell>(name[1]);
+		phys_addr[2] = static_cast<cell>('\0');
+	} else {
+		*phys_addr = LANG_SERVER;
+	}
+
+	//not optimized but it works, eh
+	//if someone cares they can make a translate() wrapper that takes the key # in directly
+	const char *r_key = g_langMngr.GetKey(key);
+	const char *def = translate(amx, amx_addr, r_key);
+	if (!def)
+	{
+		def = r_key;
+	}
+	amx_Release(amx, amx_addr);
+
+	*_key = g_langMngr.GetKey(key);
+	*_def = def;
+
+	return true;
+}
+
+static cell AMX_NATIVE_CALL amx_translate(AMX *amx, cell *params)
+{
+	int len;
+	char *key = get_amxstring(amx, params[1], 0, len);
+
+	amxtrans_t trans;
+
+	int suki = g_langMngr.GetKeyEntry(key);
+	//Some AMX Mod plugins do not register everything they need.  Prevent a crash.
+	if (suki == -1)
+	{
+		suki = g_langMngr.AddKeyEntry(key);
+	}
+
+	if (suki > BCOMPAT_TRANSLATE_KEYMASK)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Not enough translation space, aborting!");
+		return 0;
+	}
+
+	trans = suki & BCOMPAT_TRANSLATE_KEYMASK;
+	int dest = static_cast<int>(params[2]);
+	int lang = static_cast<int>(params[3]);
+	if (dest == -1)
+	{
+		trans |= (0x3F << BCOMPAT_TRANSLATE_DESTRSH);
+	} else {
+		trans |= (dest & BCOMPAT_TRANSLATE_DESTMASK) << BCOMPAT_TRANSLATE_DESTRSH;
+	}
+
+	if (lang == -1)
+	{
+		trans |= (0x1F << BCOMPAT_TRANSLATE_LANGRSH);
+	} else {
+		trans |= (lang & BCOMPAT_TRANSLATE_LANGMASK) << BCOMPAT_TRANSLATE_LANGRSH;
+	}
+
+	trans |= BCOMPAT_TRANSLATE_BITS;
+
+	return static_cast<cell>(trans);
+}
+
+AMX_NATIVE_INFO g_BcompatNatives[] = 
+{
+	{"translate",				amx_translate},
+
+	{NULL,						NULL},
+};
+

amxmodx/amxmod_compat.h

@@ -0,0 +1,28 @@
+#ifndef _INCLUDE_AMXMOD_CORE_COMPAT_H
+#define _INCLUDE_AMXMOD_CORE_COMPAT_H
+
+/**
+ * New format for translation:
+ * Note that we only support:
+ *  4k keys
+ *  32 languages
+ * 0000 0000 0000 0000 0000 0000 0000 0000
+ *                          |  key id    |
+ *                  |     | <- dest id
+ *           |     | <- lang id
+ */
+
+#define BCOMPAT_TRANSLATE_BITS		0xFF000000
+#define BCOMPAT_TRANSLATE_KEYMASK	0xFFF
+#define BCOMPAT_TRANSLATE_DESTMASK	0x3F
+#define BCOMPAT_TRANSLATE_DESTRSH	12
+#define BCOMPAT_TRANSLATE_LANGMASK  0x1F
+#define BCOMPAT_TRANSLATE_LANGRSH	18
+
+typedef unsigned int amxtrans_t;
+
+bool GetTranslation(amxtrans_t trans, int &key, int &dest, int &lang);
+
+extern AMX_NATIVE_INFO g_BcompatNatives[];
+
+#endif //_INCLUDE_AMXMOD_CORE_COMPAT_H

amxmodx/amxmodx.h

@@ -41,10 +41,14 @@
 #include "string.h"
 #include <extdll.h>
 #include <meta_api.h>
-#include "mm_pextensions.h"		// metamod-p extensions
 
-#ifdef MEMORY_TEST
+#ifdef _MSC_VER
-	#include "mmgr/mmgr.h"
+	// MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated
+	#if _MSC_VER >= 1400
+		#define unlink _unlink	
+		#define mkdir _mkdir
+		#define strdup _strdup
+	#endif
 #endif
 
 #include "md5.h"
@@ -68,7 +72,8 @@
 #include "amxxlog.h"
 
 #define AMXXLOG_Log g_log.Log
-#define AMX_VERSION	"1.60"
+#define AMXXLOG_Error g_log.LogError
+#define AMX_VERSION	"1.76b"
 
 extern AMX_NATIVE_INFO core_Natives[];
 extern AMX_NATIVE_INFO time_Natives[];
@@ -78,6 +83,9 @@ extern AMX_NATIVE_INFO file_Natives[];
 extern AMX_NATIVE_INFO float_Natives[];
 extern AMX_NATIVE_INFO string_Natives[];
 extern AMX_NATIVE_INFO vault_Natives[];
+extern AMX_NATIVE_INFO msg_Natives[];
+extern AMX_NATIVE_INFO vector_Natives[];
+extern AMX_NATIVE_INFO g_SortNatives[];
 
 #ifndef __linux__
 #define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
@@ -89,10 +97,22 @@ extern AMX_NATIVE_INFO vault_Natives[];
 #define DLFREE(m) dlclose(m)
 #endif
 
+#if defined __GNUC__
+	#include <stdint.h>
+	typedef intptr_t _INT_PTR;
+#else
+	#if defined AMD64
+		typedef __int64 _INT_PTR;
+	#else
+		typedef __int32 _INT_PTR;
+	#endif
+#endif
+
 #ifndef __linux__
 	typedef HINSTANCE DLHANDLE;
 #else
 	typedef void* DLHANDLE;
+	#define INFINITE 0xFFFFFFFF
 #endif
 
 #ifndef GETPLAYERAUTHID
@@ -139,8 +159,6 @@ struct fakecmd_t
 	bool fake;
 };
 
-extern bool g_IsNewMM;
-extern pextension_funcs_t *gpMetaPExtFuncs;
 extern CLog g_log;
 extern CPluginMngr g_plugins;
 extern CTaskMngr g_tasksMngr;
@@ -248,6 +266,8 @@ enum CountModulesMode
 
 int countModules(CountModulesMode mode);
 void modules_callPluginsLoaded();
+void modules_callPluginsUnloaded();
+void modules_callPluginsUnloading();
 
 cell* get_amxaddr(AMX *amx, cell amx_addr);
 char* build_pathname(char *fmt, ...);
@@ -256,6 +276,7 @@ char* format_amxstring(AMX *amx, cell *params, int parm, int& len);
 AMX* get_amxscript(int, void**, const char**);
 const char* get_amxscriptname(AMX* amx);
 char* get_amxstring(AMX *amx, cell amx_addr, int id, int& len);
+extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, int maxlen);
 
 int amxstring_len(cell* cstr);
 int load_amxscript(AMX* amx, void** program, const char* path, char error[64], int debug);
@@ -272,7 +293,7 @@ void free_amxmemory(void **ptr);
 // get_localinfo
 const char* get_localinfo(const char* name, const char* def);
 cell AMX_NATIVE_CALL require_module(AMX *amx, cell *params);
-void LogError(AMX *amx, int err, const char *fmt, ...);
+extern "C" void LogError(AMX *amx, int err, const char *fmt, ...);
 
 enum ModuleCallReason
 {
@@ -305,11 +326,12 @@ extern int FF_PluginLog;
 extern int FF_PluginEnd;
 extern int FF_InconsistentFile;
 extern int FF_ClientAuthorized;
+extern int FF_ChangeLevel;
 extern bool g_coloredmenus;
 
-#ifdef FAKEMETA
+typedef void (*AUTHORIZEFUNC)(int player, const char *authstring);
-	extern CFakeMeta g_FakeMeta;
+
-#endif
+#define MM_CVAR2_VERS	13
 
 struct func_s
 {
@@ -317,4 +339,6 @@ struct func_s
 	const char *desc;
 };
 
+extern enginefuncs_t *g_pEngTable;
+
 #endif // AMXMODX_H

amxmodx/amxtime.cpp

@@ -54,7 +54,7 @@ static cell AMX_NATIVE_CALL _time(AMX *amx, cell *params)
   /* the time() function returns the number of seconds since January 1 1970
    * in Universal Coordinated Time (the successor to Greenwich Mean Time)
    */
-  return sec1970;
+  return (cell)sec1970;
 }
 
 #if defined __BORLANDC__ || defined __WATCOMC__

amxmodx/amxxfile.cpp

@@ -53,7 +53,7 @@
 
 struct TableEntry
 {
-	mint8_t cellSize PACKED;
+	mint8_t cellSize;
 	mint32_t origSize PACKED;			// contains AMX_HEADER->stp
 	mint32_t offset PACKED;
 };
@@ -109,7 +109,7 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 	{
 		DATAREAD(&m_Bh.version, sizeof(int16_t), 1);
 		
-		if (m_Bh.version != MAGIC_VERSION)
+		if (m_Bh.version > MAGIC_VERSION)
 		{
 			m_Status = Err_OldFile;
 			fclose(m_pFile);
@@ -300,7 +300,7 @@ size_t CAmxxReader::GetBufferSize()
 
 #undef DATAREAD
 #define DATAREAD(addr, itemsize, itemcount) \
-	if (fread(addr, itemsize, itemcount, m_pFile) != itemcount) \
+	if (fread(addr, itemsize, itemcount, m_pFile) != static_cast<size_t>(itemcount)) \
 	{ \
 		if (feof(m_pFile)) \
 			m_Status = Err_FileInvalid; \

amxmodx/amxxfile.h

@@ -92,6 +92,7 @@ public:
 	Error GetStatus();						// Get the current status
 	size_t GetBufferSize();					// Get the size for the buffer
 	Error GetSection(void *buffer);			// Copy the currently selected section to the buffer
+	inline bool IsOldFile() const { return m_OldFile; }
 };
 
 #endif // __AMXXFILE_H__

amxmodx/amxxlog.cpp

@@ -48,6 +48,8 @@ CLog::CLog()
 {
 	m_LogType = 0;
 	m_LogFile.clear();
+	m_FoundError = false;
+	m_LoggedErrMap = false;
 }
 
 CLog::~CLog()
@@ -92,11 +94,13 @@ void CLog::CreateNewFile()
 	time(&td);
 	tm *curTime = localtime(&td);
 
+	char file[256];
 	int i = 0;
 	
 	while (true)
 	{
-		FILE *pTmpFile = fopen(m_LogFile.c_str(), "r");			// open for reading to check whether the file exists
+		build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d%03d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i);
+		FILE *pTmpFile = fopen(file, "r");			// open for reading to check whether the file exists
 		
 		if (!pTmpFile)
 			break;
@@ -104,6 +108,7 @@ void CLog::CreateNewFile()
 		fclose(pTmpFile);
 		++i;
 	}
+	m_LogFile.assign(file);
 	
 	// Log logfile start
 	FILE *fp = fopen(m_LogFile.c_str(), "w");
@@ -143,17 +148,17 @@ void CLog::MapChange()
 		print_srvconsole("[AMXX] Invalid amxx_logging value; setting back to 1...");
 	}
 
+	m_LoggedErrMap = false;
+
 	if (m_LogType == 2)
 	{
 		// create new logfile
 		CreateNewFile();
-	}
+	} else if (m_LogType == 1) {
-	else if (m_LogType == 1)
-	{
 		Log("-------- Mapchange to %s --------", STRING(gpGlobals->mapname));
-	}
+	} else {
-	else
 		return;
+	}
 }
 
 void CLog::Log(const char *fmt, ...)
@@ -211,9 +216,7 @@ void CLog::Log(const char *fmt, ...)
 
 		// print on server console
 		print_srvconsole("L %s: %s\n", date, msg);
-	}
+	} else if (m_LogType == 3) {
-	else if (m_LogType == 3)
-	{
 		// build message
 		static char msg_[3072];
 		va_list arglst;
@@ -223,3 +226,53 @@ void CLog::Log(const char *fmt, ...)
 		ALERT(at_logged, "%s\n", msg_);
 	}
 }
+
+void CLog::LogError(const char *fmt, ...)
+{
+	static char file[256];
+
+	if (m_FoundError)
+	{
+		return;
+	}
+
+	// get time
+	time_t td;
+	time(&td);
+	tm *curTime = localtime(&td);
+
+	char date[32];
+	strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
+
+	// msg
+	static char msg[3072];
+
+	va_list arglst;
+	va_start(arglst, fmt);
+	vsnprintf(msg, sizeof(msg)-1, fmt, arglst);
+	va_end(arglst);
+
+	FILE *pF = NULL;
+	build_pathname_r(file, sizeof(file)-1, "%s/error_%02d%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, curTime->tm_year - 100);
+	pF = fopen(file, "a+");
+
+	if (pF)
+	{
+		if (!m_LoggedErrMap)
+		{
+			fprintf(pF, "L %s: Start of error session.\n", date);
+			fprintf(pF, "L %s: Info (map \"%s\") (logfile \"error_%02d%02d%02d.log\")\n", date, STRING(gpGlobals->mapname), curTime->tm_mon + 1, curTime->tm_mday, curTime->tm_year - 100);
+			m_LoggedErrMap = true;
+		}
+		fprintf(pF, "L %s: %s\n", date, msg);
+		fclose(pF);
+	} else {
+		ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Error Logging disabled for this map.\n", file);
+		m_FoundError = true;
+		return;
+	}
+
+	// print on server console
+	print_srvconsole("L %s: %s\n", date, msg);
+}
+

amxmodx/amxxlog.h

@@ -36,6 +36,8 @@ class CLog
 private:
 	String m_LogFile;
 	int m_LogType;
+	bool m_FoundError;
+	bool m_LoggedErrMap;
 
 	void GetLastFile(int &outMonth, int &outDay, String &outFilename);
 	void UseFile(const String &fileName);
@@ -47,6 +49,7 @@ public:
 	void CloseFile();
 	void MapChange();
 	void Log(const char *fmt, ...);
+	void LogError(const char *fmt, ...);
 };
 
 #endif // __AMXXLOG_H__

amxmodx/binlog.cpp

@@ -0,0 +1,362 @@
+#if defined BINLOG_ENABLED
+
+#include <time.h>
+#include "amxmodx.h"
+#include "binlog.h"
+#include "debugger.h"
+
+BinLog g_BinLog;
+int g_binlog_level = 0;
+int g_binlog_maxsize = 0;
+
+// Helper function to get a filename index
+#define USHR(x) ((unsigned int)(x)>>1)
+int LookupFile(AMX_DBG *amxdbg, ucell address)
+{
+	int high, low, mid;
+
+	high = amxdbg->hdr->files;
+	low = -1;
+
+	while (high - low > 1)
+	{
+		mid = USHR(low + high);
+		if (amxdbg->filetbl[mid]->address <= address)
+		{
+			low = mid;
+		} else {
+			high = mid;
+		}
+	}
+
+	if (low == -1)
+	{
+		return -1;
+	}
+
+	return low;
+}
+
+bool BinLog::Open()
+{
+	const char *data = get_localinfo("amxmodx_datadir", "addons/amxmodx/data");
+	char path[255];
+	build_pathname_r(path, sizeof(path)-1, "%s/binlogs", data);
+	
+	if (!DirExists(path))
+	{
+		mkdir(path
+#if defined __linux__
+			, 0755
+#endif
+			);
+		if (!DirExists(path))
+			return false;
+	}
+
+	char file[255];
+	build_pathname_r(file, sizeof(file)-1, "%s/binlogs/lastlog", data);
+
+	unsigned int lastcntr = 0;
+	FILE *lastlog = fopen(file, "rb");
+	if (lastlog)
+	{
+		if (fread(&lastcntr, sizeof(int), 1, lastlog) != 1)
+			lastcntr = 0;
+		fclose(lastlog);
+	}
+	lastlog = fopen(file, "wb");
+	if (lastlog)
+	{
+		lastcntr++;
+		fwrite(&lastcntr, sizeof(int), 1, lastlog);
+		fclose(lastlog);
+	}
+	build_pathname_r(file, sizeof(file)-1, "%s/binlogs/binlog%04d.blg", data, lastcntr);
+	m_logfile.assign(file);
+
+	/**
+	* it's now safe to create the binary log
+	*/
+	FILE *fp = fopen(m_logfile.c_str(), "wb");
+	if (!fp)
+		return false;
+
+	int magic = BINLOG_MAGIC;
+	short vers = BINLOG_VERSION;
+	char c = sizeof(time_t);
+	fwrite(&magic, sizeof(int), 1, fp);
+	fwrite(&vers, sizeof(short), 1, fp);
+	fwrite(&c, sizeof(char), 1, fp);
+
+	WritePluginDB(fp);
+	fclose(fp);
+
+	m_state = true;
+
+	WriteOp(BinLog_Start, -1);
+
+	return true;
+}
+
+void BinLog::Close()
+{
+	WriteOp(BinLog_End, -1);
+	m_state = false;
+}
+
+void BinLog::WriteOp(BinLogOp op, int plug, ...)
+{
+	if (!m_state)
+		return;
+
+	FILE *fp = fopen(m_logfile.c_str(), "ab");
+	if (!fp)
+		return;
+
+	if (g_binlog_maxsize && op != BinLog_End)
+	{
+		fseek(fp, 0, SEEK_END);
+		if (ftell(fp) > (g_binlog_maxsize * (1024 * 1024)))
+		{
+			fclose(fp);
+			Close();
+			Open();
+			fp = fopen(m_logfile.c_str(), "ab");
+			if (!fp)
+				return;
+		}
+	}
+
+	unsigned char c = static_cast<char>(op);
+	time_t t = time(NULL);
+	float gt = gpGlobals->time;
+	fwrite(&c, sizeof(char), 1, fp);
+	fwrite(&t, sizeof(time_t), 1, fp);
+	fwrite(&gt, sizeof(float), 1, fp);
+	fwrite(&plug, sizeof(int), 1, fp);
+
+	va_list ap;
+	va_start(ap, plug);
+
+	AMX *amx = NULL;
+	bool debug = false;
+	AMX_DBG *dbg = NULL;
+	CPluginMngr::CPlugin *pl = NULL;
+
+	if (plug != -1)
+	{
+		pl = g_plugins.findPlugin(plug);
+		if ((debug = pl->isDebug()))
+		{
+			amx = pl->getAMX();
+			dbg = static_cast<Debugger *>(amx->userdata[UD_DEBUGGER])->m_pAmxDbg;
+		}
+	}
+
+	switch (c)
+	{
+	case BinLog_Registered:
+		{
+			const char *title = va_arg(ap, const char *);
+			const char *vers = va_arg(ap, const char *);
+			c = (char)strlen(title);
+			fwrite(&c, sizeof(char), 1, fp);
+			fwrite(title, sizeof(char), c+1, fp);
+			c = (char)strlen(vers);
+			fwrite(&c, sizeof(char), 1 ,fp);
+			fwrite(vers, sizeof(char), c+1, fp);
+			break;
+		}
+	case BinLog_NativeCall:
+		{
+			int file;
+			int native = va_arg(ap, int);
+			int params = va_arg(ap, int);
+			fwrite(&native, sizeof(int), 1, fp);
+			fwrite(&params, sizeof(int), 1, fp);
+			if (debug)
+			{
+				file = LookupFile(dbg, amx->cip);
+				fwrite(&file, sizeof(int), 1, fp);
+			} else {
+				file = 0;
+				fwrite(&file, sizeof(int), 1, fp);
+			}
+			break;
+		}
+	case BinLog_NativeRet:
+		{
+			cell retval = va_arg(ap, cell);
+			fwrite(&retval, sizeof(cell), 1, fp);
+			break;
+		}
+	case BinLog_NativeError:
+		{
+			int err = va_arg(ap, int);
+			const char *msg = va_arg(ap, const char *);
+			short len = (short)strlen(msg);
+			fwrite(&err, sizeof(int), 1, fp);
+			fwrite(&len, sizeof(short), 1, fp);
+			fwrite(msg, sizeof(char), len+1, fp);
+			break;
+		}
+	case BinLog_CallPubFunc:
+		{
+			int file;
+			int num = va_arg(ap, int);
+			fwrite(&num, sizeof(int), 1, fp);
+			if (debug)
+			{
+				file = LookupFile(dbg, amx->cip);
+				fwrite(&file, sizeof(int), 1, fp);
+			} else {
+				file = 0;
+				fwrite(&file, sizeof(int), 1, fp);
+			}
+			break;
+		}
+	case BinLog_SetLine:
+		{
+			int file;
+			int line = va_arg(ap, int);
+			fwrite(&line, sizeof(int), 1, fp);
+			if (debug)
+			{
+				file = LookupFile(dbg, amx->cip);
+				fwrite(&file, sizeof(int), 1, fp);
+			} else {
+				file = 0;
+				fwrite(&file, sizeof(int), 1, fp);
+			}
+			break;
+		}
+	case BinLog_FormatString:
+		{
+			int param = va_arg(ap, int);
+			int maxlen = va_arg(ap, int);
+			const char *str = va_arg(ap, const char *);
+			short len = (short)strlen(str);
+			fwrite(&param, sizeof(int), 1, fp);
+			fwrite(&maxlen, sizeof(int), 1, fp);
+			fwrite(&len, sizeof(short), 1, fp);
+			fwrite(str, sizeof(char), len+1, fp);
+			break;
+		}
+	case BinLog_NativeParams:
+		{
+			cell *params = va_arg(ap, cell *);
+			cell num = params[0] / sizeof(cell);
+			fwrite(&num, sizeof(cell), 1, fp);
+			for (cell i=1; i<=num; i++)
+				fwrite(&(params[i]), sizeof(cell), 1, fp);
+			break;
+		}
+	case BinLog_GetString:
+		{
+			cell addr = va_arg(ap, cell);
+			const char *str = va_arg(ap, const char *);
+			short len = (short)strlen(str);
+			fwrite(&addr, sizeof(cell), 1, fp);
+			fwrite(&len, sizeof(short), 1, fp);
+			fwrite(str, sizeof(char), len+1, fp);
+			break;
+		}
+	case BinLog_SetString:
+		{
+			cell addr = va_arg(ap, cell);
+			int maxlen = va_arg(ap, int);
+			const char *str = va_arg(ap, const char *);
+			short len = (short)strlen(str);
+			fwrite(&addr, sizeof(cell), 1, fp);
+			fwrite(&maxlen, sizeof(int), 1, fp);
+			fwrite(&len, sizeof(short), 1, fp);
+			fwrite(str, sizeof(char), len+1, fp);
+			break;
+		}
+	};
+
+	va_end(ap);
+	fclose(fp);
+}
+
+void BinLog::WritePluginDB(FILE *fp)
+{
+	int num = g_plugins.getPluginsNum();
+	fwrite(&num, sizeof(int), 1, fp);
+
+	CPluginMngr::CPlugin *pl;
+	char c;
+	unsigned char len;
+	for (CPluginMngr::iterator iter = g_plugins.begin(); iter; ++iter)
+	{
+		pl = &(*iter);
+		if (pl->isValid())
+			c = 1;
+		else
+			c = 0;
+		if (c && pl->isDebug())
+			c = 2;
+		fwrite(&c, sizeof(char), 1, fp);
+		if (c)
+		{
+			Debugger *pd = NULL;
+			len = (char)strlen(pl->getName());
+			fwrite(&len, sizeof(char), 1, fp);
+			len++;
+			fwrite(pl->getName(), sizeof(char), len, fp);
+			int natives, publics, files;
+			AMX *amx = pl->getAMX();
+			// Write the number of Filenames
+			if (c == 2)
+			{
+				pd = static_cast<Debugger *>(amx->userdata[UD_DEBUGGER]);
+				files = pd->m_pAmxDbg->hdr->files;
+				fwrite(&files, sizeof(int), 1, fp);
+			}
+			amx_NumNatives(amx, &natives);
+			amx_NumPublics(amx, &publics);
+			fwrite(&natives, sizeof(int), 1, fp);
+			fwrite(&publics, sizeof(int), 1, fp);
+			char name[34];
+			// Write the Filenames to the binfile
+			if (c == 2)
+			{
+				AMX_DBG_FILE **ftable = pd->m_pAmxDbg->filetbl;
+				for (int i=0; i<files; i++)
+				{
+					len = (char)strlen(ftable[i]->name);
+					fwrite(&len, sizeof(char), 1, fp);
+					len++;
+					fwrite(ftable[i]->name, sizeof(char), len, fp);
+				}
+			}
+			for (int i=0; i<natives; i++)
+			{
+				amx_GetNative(amx, i, name);
+				len = (char)strlen(name);
+				fwrite(&len, sizeof(char), 1, fp);
+				len++;
+				fwrite(name, sizeof(char), len, fp);
+			}
+			for (int i=0; i<publics; i++)
+			{
+				amx_GetPublic(amx, i, name);
+				len = (char)strlen(name);
+				fwrite(&len, sizeof(char), 1, fp);
+				len++;
+				fwrite(name, sizeof(char), len, fp);
+			}
+		} else {
+			char empty[] = " ";
+			len = 1;
+			fwrite(&len, sizeof(char), 1, fp);
+			fwrite(empty, sizeof(char), len, fp);
+			int no = 0;
+			fwrite(&no, sizeof(int), 1, fp);
+			fwrite(&no, sizeof(int), 1, fp);
+		}
+	}
+}
+
+#endif //BINLOG_ENABLED

amxmodx/binlog.h

@@ -0,0 +1,84 @@
+#ifndef _INCLUDE_BINLOG_H
+#define _INCLUDE_BINLOG_H
+
+#if defined BINLOG_ENABLED
+
+#include "CString.h"
+
+#define BINLOG_MAGIC	0x414D424C
+#define BINLOG_VERSION	0x0300
+
+/**
+ * Format of binlog:
+ * uint32		magic
+ * uint16		version
+ * uint8		sizeof(time_t)
+ * uint32		num plugins
+ * [
+ *  uint8		status codes
+ *  str[int8]	filename
+ *  if(status==2)
+ *    uint32	num filenames
+ *  uint32		num natives
+ *  uint32		num publics
+ *  if (status==2)
+ *    [
+ *     str[uint8] file name
+ *    ]
+ *  [
+ *   str[uint8] native name
+ *  ]
+ *  [
+ *   str[uint8] public name
+ *  ]
+ * ]
+ * [
+ *  uint8		operation code
+ *  time_t		realtime
+ *  float		gametime
+ *  int32		plugin id
+ *  <extra info>
+ * ]
+ * If filename id is 0 skip as plugin was not in debug mode, if -1 there was an error.
+ */
+
+enum BinLogOp
+{
+	BinLog_Start=1,
+	BinLog_End,
+	BinLog_NativeCall,	//<int32 native id> <int32_t num_params> <int32_t filename id>
+	BinLog_NativeError, //<int32 errornum> <str[int16] string>
+	BinLog_NativeRet,	//<cell value>
+	BinLog_CallPubFunc,	//<int32 public id> <int32_t filename id>
+	BinLog_SetLine,		//<int32 line no#> <int32_t filename id>
+	BinLog_Registered,	//<string title> <string version>
+	BinLog_FormatString, //<int32 param#> <int32 maxlen> <str[int16] string>
+	BinLog_NativeParams, //<int32 num> <cell ...>
+	BinLog_GetString,	//<cell addr> <string[int16]>
+	BinLog_SetString,	//<cell addr> <int maxlen> <string[int16]>
+};
+
+class BinLog
+{
+public:
+	BinLog() : m_state(false)
+	{
+	};
+public:
+	bool Open();
+	void Close();
+	void WriteOp(BinLogOp op, int plug, ...);
+private:
+	void WritePluginDB(FILE *fp);
+private:
+	String m_logfile;
+	bool m_state;
+};
+
+extern BinLog g_BinLog;
+extern int g_binlog_level;
+extern int g_binlog_maxsize;
+
+#endif //BINLOG_ENABLED
+
+#endif //_INCLUDE_BINLOG_H

amxmodx/debugger.cpp

@@ -31,6 +31,7 @@
 
 #include "amxmodx.h"
 #include "debugger.h"
+#include "binlog.h"
 
 #if !defined WIN32 && !defined _WIN32
 #define _snprintf snprintf
@@ -307,6 +308,19 @@ void Debugger::StepI()
 {
 	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
 
+#if defined BINLOG_ENABLED
+	if (g_binlog_level & 32)
+	{
+		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(m_pAmx);
+		if (pl)
+		{
+			long line;
+			dbg_LookupLine(m_pAmxDbg, m_pAmx->cip, &line);
+			g_BinLog.WriteOp(BinLog_SetLine, pl->getId(), (int)(line + 1));
+		}
+	}
+#endif
+
 	m_pCalls[m_Top]->StepI(m_pAmx->frm, m_pAmx->cip);
 }
 
@@ -363,53 +377,6 @@ bool Debugger::ErrorExists()
 	return (m_pCalls[m_Top]->m_Error != AMX_ERR_NONE);
 }
 
-#define	FLAG_INDIRECT	(1<<0)
-
-//vaddr - the address of our current index vector
-//base - the base address of which the array is offset to
-//dim - the current dimension to search
-//dimNum - the number of dimensions total
-//sizes[] - an array containing the dimension sizes
-//Indexes[] - an output array to contain each dimension's index
-int WalkArray(cell *vaddr, unsigned char *base, cell *addr, int dim, int dimNum, int &flags, int sizes[], int Indexes[])
-{
-	cell *my_addr;
-	int idx = 0;
-
-	//if we are the second to last walker, we only need to check the ranges of our vector.
-	if (dim == dimNum - 2)
-	{
-		my_addr = vaddr;
-		//first check the actual vectors themselves
-		for (int i=0; i<sizes[dim]; i++)
-		{
-			if (addr == my_addr)
-				return i;
-			my_addr++;
-		}
-
-		return -1;
-	}
-
-	//otherwise, search lower vectors!
-	//vaddr is the address where we can start reading vectors
-	flags |= FLAG_INDIRECT;
-	for (int i=0; i<sizes[dim]; i++)
-	{
-		//the next vector is offset from the last address!
-		//this is funky but that's the internal implementation
-		my_addr = (cell *)((char *)vaddr + i*sizeof(cell) + vaddr[i]);
-		idx = WalkArray(my_addr, base, addr, dim+1, dimNum, flags, sizes, Indexes);
-		if (idx != -1)
-		{
-			Indexes[dim+1] = idx;
-			return i;
-		}
-	}
-
-	return -1;
-}
-
 int Debugger::FormatError(char *buffer, size_t maxLength)
 {
 	if (!ErrorExists())
@@ -421,9 +388,9 @@ int Debugger::FormatError(char *buffer, size_t maxLength)
 	int error = pTracer->m_Error;
 	const char *gen_err = GenericError(error);
 	int size = 0;
-	trace_info_t *pTrace = pTracer->GetEnd();
+	//trace_info_t *pTrace = pTracer->GetEnd();
-	cell cip = _CipAsVa(m_pAmx->cip);
+	//cell cip = _CipAsVa(m_pAmx->cip);
-	cell *p_cip = NULL;
+	//cell *p_cip = NULL;
 	int amx_err = AMX_ERR_NONE;
 
 	size += _snprintf(buffer, maxLength, "Run time error %d: %s ", error, gen_err);
@@ -442,7 +409,7 @@ int Debugger::FormatError(char *buffer, size_t maxLength)
 			num = (int)*p_cip;
 		}*/
 		//New code only requires this...
-		num = m_pAmx->usertags[UT_NATIVE];
+		num = (int)(_INT_PTR)m_pAmx->usertags[UT_NATIVE];
 		amx_err = amx_GetNative(m_pAmx, num, native_name);
 		/*if (num)
 			amx_err = amx_GetNative(m_pAmx, (int)*p_cip, native_name);
@@ -450,205 +417,6 @@ int Debugger::FormatError(char *buffer, size_t maxLength)
 			amx_err = AMX_ERR_NOTFOUND;*/
 		//if (!amx_err)
 			size += _snprintf(buffer, maxLength, "(native \"%s\")", native_name);
-	} else if (error == AMX_ERR_BOUNDS) {
-		tagAMX_DBG *pDbg = m_pAmxDbg;
-		int symbols = pDbg->hdr->symbols;
-		int index = 0;
-		tagAMX_DBG_SYMBOL **pSymbols = pDbg->symboltbl;
-		tagAMX_DBG_SYMBOL *pSymbol, *pLastSymbol=NULL;
-		const tagAMX_DBG_SYMDIM *pDims;
-		ucell addr = 0;
-		int flags = 0;
-		char v_class, i_dent;
-		cell *arr_addr=NULL, *p_addr=NULL;
-		unsigned char *data = m_pAmx->base + ((AMX_HEADER *)m_pAmx->base)->dat;
-		bool valid=false;
-		//we can't really browse the assembly because
-		// we've no idea what the peephole optimizer did.
-		// so we're gonna try to go out on a limb and guess.
-		if (m_pAmx->alt < 0)
-		{
-			//take a guess that it's local
-            addr = m_pAmx->alt - pTrace->frm;
-			v_class = 1;
-		} else {
-			//take a guess that it's a global
-			//it won't be global if it's passed in from the stack frame, however
-			// doing this with a hardcoded array size is quite rare, and is probably passed
-			// as iREFARRAY not iARRAY!
-			addr = m_pAmx->alt;
-			v_class = 0;
-		}
-		bool found = false;
-		bool _found = true;
-		static char _msgbuf[255];
-		size_t _size = 0;
-		//take a pre-emptive guess at the v_class!
-		//are we GLOBAL (0) or LOCAL (1) ?
-		if (m_pAmx->alt < 0)
-		{
-			v_class = 1;
-			i_dent = iARRAY;
-			arr_addr = (cell *)(data + pTrace->frm + m_pAmx->alt);
-		} else {
-			//it's greater than 0, check other things!
-			if (m_pAmx->alt >= m_pAmx->hlw &&
-				m_pAmx->alt <= m_pAmx->stp)
-			{
-				//it's in the stack somewhere... guess that it's a local!
-				v_class = 1;
-				//relocate it
-				m_pAmx->alt -= pTrace->frm;
-				//alt cannot be zero
-				if (m_pAmx->alt < 0)
-					i_dent = iARRAY;
-				else
-					i_dent = iREFARRAY;
-				arr_addr = (cell *)(data + pTrace->frm + m_pAmx->alt);
-			} else {
-				//guess that it's DAT
-				v_class = 0;
-				i_dent = iARRAY;
-				arr_addr = (cell *)(data + m_pAmx->alt);
-			}
-		}
-		for (index = 0; index < symbols; index++)
-		{
-			pSymbol = pSymbols[index];
-			if (pSymbol->codestart <= (ucell)cip && 
-				pSymbol->codeend >= (ucell)cip &&
-				(pSymbol->ident == iARRAY || pSymbol->ident == iREFARRAY))
-			{
-				amx_err = dbg_GetArrayDim(pDbg, pSymbol, &pDims);
-				if (amx_err != AMX_ERR_NONE)
-					continue;
-				//calculate the size of the array.  this is important!
-				ucell size = pDims[0].size;
-				ucell aggre = pDims[0].size;
-				valid = false;
-				for (int16_t i=1; i<pSymbol->dim; i++)
-				{
-					aggre *= pDims[i].size;
-					size += aggre;
-				}
-				if (pSymbol->vclass != v_class)
-					continue;
-				if (pSymbol->ident != i_dent)
-					continue;
-				if (v_class == 1)
-				{
-					if (i_dent == iARRAY)
-					{
-						p_addr = (cell *)(data + pTrace->frm + pSymbol->address);
-					} else if (i_dent == iREFARRAY) {
-						//get the variable off the stack, by reference
-						ucell _addr = (ucell)*((cell *)(data + pTrace->frm + pSymbol->address));
-						p_addr = (cell *)(data + _addr);
-					}
-				} else if (v_class == 0) {
-					p_addr = (cell *)(data + pSymbol->address);
-				}
-				//make sure our address is in bounds!
-				if (arr_addr < p_addr || arr_addr > (p_addr + size))
-					continue;
-				int *sizes = new int[pSymbol->dim];
-				int *indexes = new int[pSymbol->dim];
-				for (int i=0; i<pSymbol->dim; i++)
-				{
-					sizes[i] = pDims[i].size;
-					indexes[i] = -1;
-				}
-				flags = 0;
-				if (pSymbol->dim >= 2)
-				{
-					int dims = pSymbol->dim;
-					indexes[0] = WalkArray(p_addr, data, arr_addr, 0, pSymbol->dim, flags, sizes, indexes);
-					if (indexes[0] == -1)
-					{
-						while (indexes[0] == -1 && --dims > 0)
-						{
-							flags = 0;
-							indexes[0] = WalkArray(p_addr, data, arr_addr, 0, dims, flags, sizes, indexes);
-						}
-					}
-					//find the last known good dimension
-					for (dims=pSymbol->dim-1; dims>=0; dims--)
-					{
-						if (indexes[dims] != -1)
-							break;
-					}
-					//check for the "impossible" case.
-					//if we have [X][-1], and X is zero, the array did not walk properly.
-					if (dims >= 0 
-						&& indexes[dims] == 0 
-						&& !(flags & FLAG_INDIRECT) 
-						&& dims < pSymbol->dim - 1)
-					{
-						//here we have the dreaded MIXED CASE.  we don't know whether 
-						//[-][X] or [0][-] (where - is a bad input) was intended.
-						//first, we take a guess by checking the bounds.
-						cell *_cip = (cell *)_CipAsVa(cip);
-						_cip -= 1;
-						cell bounds = *_cip;
-						if (sizes[dims] != sizes[dims+1])
-						{
-							//we were checking initial bounds
-							if (bounds == sizes[dims] - 1)
-							{
-								indexes[dims] = m_pAmx->pri;
-							} else if (bounds == sizes[dims+1] - 1) {
-								indexes[dims + 1] = m_pAmx->pri;
-								indexes[dims] = 0;
-							} else {
-								//this should really never happen...
-								_found = false;
-							}
-						} else {
-							_found = false;
-						}
-						if (!_found)
-						{
-							//we still don't have a good approximation.
-							//the user did something like:
-							//new X[40][40]
-							//we could do some really complicated and random guesswork
-							// but fact is, we have no way of deterministically knowing
-							// what the user intended.
-						}
-					} else {
-						//set the last know index to our culprit
-						indexes[dims + 1] = m_pAmx->pri;
-					}
-				} else {
-					indexes[0] = m_pAmx->pri;
-				}
-				_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "(array \"%s", pSymbol->name);
-				for (int i=0; i<pSymbol->dim; i++)
-					_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "[%d]", pDims[i].size);
-				if (_found)
-				{
-					_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "\") (indexed \"");
-					for (int i=0; i<pSymbol->dim; i++)
-					{
-						if (indexes[i] == -1)
-							_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "[]");
-						else
-							_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "[%d]", indexes[i]);
-					}
-					_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "\")");
-				} else {
-					_size += _snprintf(&(_msgbuf[_size]), sizeof(_msgbuf)-_size, "\") (unknown index \"%d\")", m_pAmx->pri);
-				}
-				found = true;
-				delete [] indexes;
-				delete [] sizes;
-				break;
-			} /* symbol validation */
-		} /* is in valid ranges */
-		if (!found)
-			_msgbuf[0] = '\0';
-
-		size += _snprintf(buffer, maxLength, "%s", _msgbuf);
 	}
 
 	return size;
@@ -788,15 +556,15 @@ void Debugger::Clear()
 void Debugger::DisplayTrace(const char *message)
 {
 	if (message != NULL)
-		AMXXLOG_Log("%s", message);
+		AMXXLOG_Error("%s", message);
 
 	char buffer[512];
 	FormatError(buffer, sizeof(buffer)-1);
 
 	const char *filename = _GetFilename();
 
-	AMXXLOG_Log("[AMXX] Displaying debug trace (plugin \"%s\")", filename);
+	AMXXLOG_Error("[AMXX] Displaying debug trace (plugin \"%s\")", filename);
-	AMXXLOG_Log("[AMXX] %s", buffer);
+	AMXXLOG_Error("[AMXX] %s", buffer);
 	
 	int count = 0;
 	long lLine;
@@ -805,7 +573,7 @@ void Debugger::DisplayTrace(const char *message)
 	while (pTrace)
 	{
 		GetTraceInfo(pTrace, lLine, function, file);
-		AMXXLOG_Log(
+		AMXXLOG_Error(
 			"[AMXX]    [%d] %s::%s (line %d)",
 			count,
 			file,
@@ -840,6 +608,7 @@ const char *Debugger::_GetFilename()
 void Debugger::FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLength)
 {
 	const char *filename = "";
+	char native[sNAMEMAX+1];
 
 	CList<CScript,AMX*>::iterator a = g_loadedscripts.find(amx);
 	if (a)
@@ -854,7 +623,15 @@ void Debugger::FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLengt
 		}
 	}
 
+	if (error == AMX_ERR_EXIT)
+	{
+		_snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - %s", error, filename, GenericError(AMX_ERR_EXIT));
+	} else if (error == AMX_ERR_NATIVE) {
+		amx_GetNative(amx, reinterpret_cast<long>(amx->usertags[UT_NATIVE]), native);
+		_snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") (native \"%s\") - debug not enabled!", error, filename, native);
+	} else {
 		_snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - debug not enabled!", error, filename);
+	}
 }
 
 void Debugger::GenericMessage(AMX *amx, int err)
@@ -865,12 +642,14 @@ void Debugger::GenericMessage(AMX *amx, int err)
 	Debugger::FmtGenericMsg(amx, err, buffer, sizeof(buffer)-1);
 
 	if (buffer[0] != '\0')
-		AMXXLOG_Log("[AMXX] %s", buffer);
+		AMXXLOG_Error("[AMXX] %s", buffer);
 }
 
 Debugger::~Debugger()
 {
 	Clear();
+	dbg_FreeInfo(m_pAmxDbg);
+	delete m_pAmxDbg;
 }
 
 int Handler::SetErrorHandler(const char *function)
@@ -879,7 +658,7 @@ int Handler::SetErrorHandler(const char *function)
 	
 	error = amx_FindPublic(m_pAmx, function, &m_iErrFunc);
 
-	if (error != AMX_ERR_NONE && m_iErrFunc < 1)
+	if (error != AMX_ERR_NONE && m_iErrFunc < 0)
 		m_iErrFunc = -1;
 
 	return error;
@@ -891,7 +670,7 @@ int Handler::SetModuleFilter(const char *function)
 	
 	error = amx_FindPublic(m_pAmx, function, &m_iModFunc);
 
-	if (error != AMX_ERR_NONE && m_iModFunc < 1)
+	if (error != AMX_ERR_NONE && m_iModFunc < 0)
 		m_iModFunc = -1;
 
 	return error;
@@ -925,9 +704,9 @@ const char *Handler::GetLastMsg()
 	return m_MsgCache.c_str();
 }
 
-int Handler::HandleModule(const char *module)
+int Handler::HandleModule(const char *module, bool isClass)
 {
-	if (m_iModFunc < 1)
+	if (m_iModFunc < 0)
 		return 0;
 
 	/**
@@ -935,14 +714,20 @@ int Handler::HandleModule(const char *module)
 	 */
 
 	cell hea_addr, *phys_addr, retval;
+	Debugger *pd;
+
+	pd = DisableDebugHandler(m_pAmx);
 
 	//temporarily set prenit
 	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);
 	amx_Release(m_pAmx, hea_addr);
 	m_pAmx->flags &= ~AMX_FLAG_PRENIT;
 
+	EnableDebugHandler(m_pAmx, pd);
+
 	if (err != AMX_ERR_NONE)
 		return 0;
 
@@ -966,6 +751,8 @@ int Handler::HandleNative(const char *native, int index, int trap)
 
 	if (pDebugger && trap)
 		pDebugger->BeginExec();
+	else if (pDebugger && !trap)
+		DisableDebugHandler(m_pAmx);
 
 	cell hea_addr, *phys_addr, retval;
 
@@ -987,7 +774,7 @@ int Handler::HandleNative(const char *native, int index, int trap)
 		}
 		if (!trap)
 		{
-			AMXXLOG_Log("[AMXX] Runtime failure %d occurred in native filter.  Aborting plugin load.", err);
+			AMXXLOG_Error("[AMXX] Runtime failure %d occurred in native filter.  Aborting plugin load.", err);
 			return 0;
 		}
 		//handle this manually.
@@ -998,13 +785,15 @@ int Handler::HandleNative(const char *native, int index, int trap)
 		} else if (err != -1) {
 			LogError(m_pAmx, err, NULL);
 		}
-		AMXXLOG_Log("[AMXX] NOTE: Runtime failures in native filters are not good!");
+		AMXXLOG_Error("[AMXX] NOTE: Runtime failures in native filters are not good!");
 		retval = 0;
 	}
 	if (!trap)
 		m_pAmx->flags &= ~AMX_FLAG_PRENIT;
 	if (pDebugger && trap)
 		pDebugger->EndExec();
+	else if (pDebugger && !trap)
+		EnableDebugHandler(m_pAmx, pDebugger);
 
 	amx_Release(m_pAmx, hea_addr);
 
@@ -1056,10 +845,10 @@ int Handler::HandleError(const char *msg)
 			pDebugger->DisplayTrace(msg);
 		} else {
 			if (GetLastMsg())
-				AMXXLOG_Log("%s", GetLastMsg());
+				AMXXLOG_Error("%s", GetLastMsg());
 			Debugger::GenericMessage(m_pAmx, err);
 		}
-		AMXXLOG_Log("[AMXX] NOTE: Runtime failures in an error filter are not good!");
+		AMXXLOG_Error("[AMXX] NOTE: Runtime failures in an error filter are not good!");
 	}
 
 	if (pDebugger)
@@ -1087,7 +876,7 @@ static cell AMX_NATIVE_CALL set_error_filter(AMX *amx, cell *params)
 	if (!pHandler)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Plugin not initialized correctly.");
+		AMXXLOG_Error("[AMXX] Plugin not initialized correctly.");
 		return 0;
 	}
 
@@ -1095,7 +884,7 @@ static cell AMX_NATIVE_CALL set_error_filter(AMX *amx, cell *params)
 	if (err != AMX_ERR_NONE)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Function not found: %s", function);
+		AMXXLOG_Error("[AMXX] Function not found: %s", function);
 		return 0;
 	}
 
@@ -1175,7 +964,7 @@ static cell AMX_NATIVE_CALL set_native_filter(AMX *amx, cell *params)
 	if (!pHandler)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Plugin not initialized correctly.");
+		AMXXLOG_Error("[AMXX] Plugin not initialized correctly.");
 		return 0;
 	}
 
@@ -1194,7 +983,7 @@ static cell AMX_NATIVE_CALL set_native_filter(AMX *amx, cell *params)
 	if (err != AMX_ERR_NONE)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Function not found: %s", function);
+		AMXXLOG_Error("[AMXX] Function not found: %s", function);
 		return 0;
 	}
 

amxmodx/debugger.h

@@ -50,7 +50,7 @@ public:
 		
 		struct trace_info
 		{
-			trace_info() : cip(0), frm(0), used(false), next(NULL), prev(NULL) {};
+			trace_info() : cip(0), frm(0), next(NULL), prev(NULL), used(false) {};
 			
 			cell cip;
 			cell frm;
@@ -167,7 +167,7 @@ public:
 public:
 	int HandleError(const char *msg);
 	int HandleNative(const char *native, int index, int trap);
-	int HandleModule(const char *module);
+	int HandleModule(const char *module, bool isClass=false);
 public:
 	bool IsHandling() const { return m_Handling; }
 	void SetErrorMsg(const char *msg);

amxmodx/emsg.cpp

@@ -59,10 +59,13 @@ void Client_VGUIMenu(void* mValue)
 {
 	if (!mPlayer) return;
 
+	mPlayer->vgui = true;
+
 	switch (mState++)
 	{
 		case 0:
 			mPlayer->menu = -(*(int*)mValue);
+			mPlayer->newmenu = -1;
 			break;
 		case 1:
 			mPlayer->keys = *(int*)mValue;
@@ -73,19 +76,26 @@ void Client_ShowMenu(void* mValue)
 {
 	if (!mPlayer) return;
 
+	mPlayer->vgui = true;
+
 	switch (mState++)
 	{
 		case 0:
 			mPlayer->keys = *(int*)mValue;
 			break;
 		case 3:
+			{
 			mPlayer->menu = g_menucmds.findMenuId((char*)mValue);
+			mPlayer->newmenu = -1;
+			break;
+			}
 	}
 }
 
+extern bool g_bmod_tfc;
 void Client_TeamInfo(void* mValue)
 {
-	if (mPlayer) return;
+	if (mPlayer && !g_bmod_tfc) return;
 	static int index;
 
 	switch (mState++)
@@ -98,6 +108,7 @@ void Client_TeamInfo(void* mValue)
 			char* msg = (char*)mValue;
 			g_players[index].team.assign(msg);
 			g_teamsIds.registerTeam(msg, -1);
+			break;
 	}
 }
 

amxmodx/fakemeta.h

@@ -31,203 +31,7 @@
 #ifndef __FAKEMETA_H__
 #define __FAKEMETA_H__
 
-#ifndef FAKEMETA
+int UnloadMetamodPlugin(void *handle);
-	int UnloadMetamodPlugin(void *handle);
+int LoadMetamodPlugin(const char *path, void **handle, PLUG_LOADTIME now);
-	int LoadMetamodPlugin(const char *path, void **handle, PLUG_LOADTIME now);
-#else
-// Fake metamod api for modules
-
-#include "CList.h"
-
-// from mplugin.h (metamod)
-// Flags to indicate current "load" state of plugin.
-// NOTE: order is important, as greater/less comparisons are made.
-typedef enum
-{
-	PL_EMPTY = 0,		// empty slot
-	PL_VALID,			// has valid info in it
-	PL_BADFILE,			// nonexistent file (open failed), 
-						// or not a valid plugin file (query failed)
-	PL_OPENED,			// dlopened and queried
-	PL_FAILED,			// opened, but failed to attach or unattach
-	PL_RUNNING,			// attached and running
-	PL_PAUSED,			// attached but paused
-} PLUG_STATUS;
-
-// from h_export.h (metamod)
-// Our GiveFnptrsToDll, called by engine.
-typedef void (WINAPI *GIVE_ENGINE_FUNCTIONS_FN) (enginefuncs_t *pengfuncsFromEngine, globalvars_t *pGlobals);
-
-// *** CFakeMeta
-
-class CFakeMeta
-{
-private:
-	// Core tables
-	/* DLL_FUNCTIONS m_CoreDllFuncTable;
-	enginefuncs_t m_CoreEngineFuncTable;
-	NEW_DLL_FUNCTIONS m_CoreNewDllFuncTable;
-
-	DLL_FUNCTIONS m_CoreDllFuncTable_Post;
-	enginefuncs_t m_CoreEngineFuncTable_Post;
-	NEW_DLL_FUNCTIONS m_CoreNewDllFuncTable_Post; */
-
-	bool AddCorePlugin();	// Adds the core plugin if needed
-public:
-	class CFakeMetaPlugin
-	{
-	private:
-		// plugin info
-		String m_Path;
-		PLUG_STATUS m_Status;
-		plugin_info_t *m_Info;
-		// Function tables
-		META_FUNCTIONS m_MetaFuncTable;
-
-		DLL_FUNCTIONS m_DllFuncTable;
-		enginefuncs_t m_EngineFuncTable;
-		NEW_DLL_FUNCTIONS m_NewDllFuncTable;
-
-		DLL_FUNCTIONS m_DllFuncTable_Post;
-		enginefuncs_t m_EngineFuncTable_Post;
-		NEW_DLL_FUNCTIONS m_NewDllFuncTable_Post;
-
-		// OS dep handle
-		DLHANDLE m_Handle;
-	public:
-		inline PLUG_STATUS GetStatus() const
-		{ return m_Status; }
-		inline void SetStatus(PLUG_STATUS newStatus)
-		{ m_Status = newStatus; }
-
-		inline plugin_info_t * GetInfo()
-		{ return m_Info; }
-		inline const plugin_info_t * GetInfo() const
-		{ return m_Info; }
-		inline void SetInfo(plugin_info_t *newInfo)
-		{ m_Info = newInfo; }
-
-		inline const char * GetPath() 
-		{ return m_Path.c_str(); }
-
-		inline const META_FUNCTIONS &GetMetaFunctions() const
-		{ return m_MetaFuncTable; }
-
-		// Get
-		inline DLL_FUNCTIONS &GetDllFuncTable()
-		{ return m_DllFuncTable; }
-		inline enginefuncs_t &GetEngineFuncTable()
-		{ return m_EngineFuncTable; }
-		inline NEW_DLL_FUNCTIONS &GetNewDllFuncTable()
-		{ return m_NewDllFuncTable; }
-		
-		// Get const
-		inline const DLL_FUNCTIONS &GetDllFuncTable() const
-		{ return m_DllFuncTable; }
-		inline const enginefuncs_t &GetEngineFuncTable() const
-		{ return m_EngineFuncTable; }
-		inline const NEW_DLL_FUNCTIONS &GetNewDllFuncTable() const
-		{ return m_NewDllFuncTable; }
-
-		// Get post
-		inline DLL_FUNCTIONS &GetDllFuncTable_Post()
-		{ return m_DllFuncTable_Post; }
-		inline enginefuncs_t &GetEngineFuncTable_Post()
-		{ return m_EngineFuncTable_Post; }
-		inline NEW_DLL_FUNCTIONS &GetNewDllFuncTable_Post()
-		{ return m_NewDllFuncTable_Post; }
-
-		// Get post const
-		inline const DLL_FUNCTIONS &GetDllFuncTable_Post() const
-		{ return m_DllFuncTable_Post; }
-		inline const enginefuncs_t &GetEngineFuncTable_Post() const
-		{ return m_EngineFuncTable_Post; }
-		inline const NEW_DLL_FUNCTIONS &GetNewDllFuncTable_Post() const
-		{ return m_NewDllFuncTable_Post; }
-
-		int Query(mutil_funcs_t *pMetaUtilFuncs);	// Also calls GiveFnPtrsToDll
-		int Attach(PLUG_LOADTIME now, meta_globals_t *pMGlobals, gamedll_funcs_t *pGameDllFuncs);
-		int Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason);
-
-		int GetEntityAPI2(int interfaceVersion);
-		int GetEntityAPI2_Post(int interfaceVersion);
-		int GetEngineFunctions(int interfaceVersion);
-		int GetEngineFunctions_Post(int interfaceVersion);
-		int GetNewDLLFunctions(int interfaceVersion);
-		int GetNewDLLFunctions_Post(int interfaceVersion);
-
-		CFakeMetaPlugin(const char *path);
-		~CFakeMetaPlugin();
-	};	// CFakeMetaPlugin
-
-	CFakeMeta();
-	~CFakeMeta();
-
-	bool AddPlugin(const char *path /*path relative to moddir*/);
-	void ReleasePlugins();
-
-	// This is public because i don't want to declare all the functions as friends :)
-	// :NOTE: The core is now a special, first plugin!
-	CList<CFakeMetaPlugin> m_Plugins;
-
-	// ****** Meta functions ******
-	// Query all added plugins
-	void Meta_Query(mutil_funcs_t *pMetaUtilFuncs);
-	// Attach all added plugins
-	void Meta_Attach(PLUG_LOADTIME now, meta_globals_t *pMGlobals, gamedll_funcs_t *pGamedllFuncs);
-	// Detach all added plugins
-	void Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason);
-	// :NOTE: Meta_Init currently not supported
-	int GetEntityAPI2(DLL_FUNCTIONS *pFunctionTable /*from metamod*/, int *interfaceVersion /*from metamod*/,
-		DLL_FUNCTIONS *pAMXXFunctionTable /*Functions amxx needs*/);
-	int GetEntityAPI2_Post(DLL_FUNCTIONS *pFunctionTable /*from metamod*/, int *interfaceVersion /*from metamod*/,
-		DLL_FUNCTIONS *pAMXXFunctionTable /*Functions amxx needs*/);
-	int GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *interfaceVersion,
-		enginefuncs_t *pAMXXFunctionTable /*Fucntions amxx needs*/);
-	int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine, int *interfaceVersion,
-		enginefuncs_t *pAMXXFunctionTable /*Fucntions amxx needs*/);
-	int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *interfaceVersion,
-		NEW_DLL_FUNCTIONS *pAMXXFunctionTable);
-	int GetNewDLLFunctions_Post(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *interfaceVersion,
-		NEW_DLL_FUNCTIONS *pAMXXFunctionTable);
-
-	// Get
-	/*inline DLL_FUNCTIONS &GetDllFuncTable()
-	{ return m_CoreDllFuncTable; }
-	inline enginefuncs_t &GetEngineFuncTable()
-	{ return m_CoreEngineFuncTable; }
-	inline NEW_DLL_FUNCTIONS &GetNewDllFuncTable()
-	{ return m_CoreNewDllFuncTable; }
-	
-	// Get const
-	inline const DLL_FUNCTIONS &GetDllFuncTable() const
-	{ return m_CoreDllFuncTable; }
-	inline const enginefuncs_t &GetEngineFuncTable() const
-	{ return m_CoreEngineFuncTable; }
-	inline const NEW_DLL_FUNCTIONS &GetNewDllFuncTable() const
-	{ return m_CoreNewDllFuncTable; }
-
-	// Get post
-	inline DLL_FUNCTIONS &GetDllFuncTable_Post()
-	{ return m_CoreDllFuncTable_Post; }
-	inline enginefuncs_t &GetEngineFuncTable_Post()
-	{ return m_CoreEngineFuncTable_Post; }
-	inline NEW_DLL_FUNCTIONS &GetNewDllFuncTable_Post()
-	{ return m_CoreNewDllFuncTable_Post; }
-
-	// Get post const
-	inline const DLL_FUNCTIONS &GetDllFuncTable_Post() const
-	{ return m_CoreDllFuncTable_Post; }
-	inline const enginefuncs_t &GetEngineFuncTable_Post() const
-	{ return m_CoreEngineFuncTable_Post; }
-	inline const NEW_DLL_FUNCTIONS &GetNewDllFuncTable_Post() const
-	{ return m_CoreNewDllFuncTable_Post; } */
-};	// CFakeMeta
-
-// Fake Metamod
-// defined in meta_api.cpp
-extern CFakeMeta g_FakeMeta;
-
-#endif //FAKEMETA
 
 #endif // #ifndef __FAKEMETA_H__

amxmodx/file.cpp

@@ -5,7 +5,7 @@
 *
 *
 *  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public<EFBFBD> License as published by the
+*  under the terms of the GNU General Public License as published by the
 *  Free Software Foundation; either version 2 of the License, or (at
 *  your option) any later version.
 *
@@ -51,8 +51,6 @@
 #include <io.h>
 #endif
 
-#include <extdll.h>
-#include <meta_api.h>
 #include "amxmodx.h"
 
 CVector<FILE *> FileList;
@@ -141,7 +139,7 @@ static cell AMX_NATIVE_CALL read_file(AMX *amx, cell *params) /* 5 param */
 	
 	if ((fp =fopen(build_pathname("%s", szFile), "r")) == NULL)
 	{
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
+		LogError(amx, AMX_ERR_NATIVE, "Couldn't read file \"%s\"", szFile);
 		return 0;
 	}
 
@@ -185,7 +183,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 	{
 		if ((pFile = fopen(sFile, "a")) == NULL)
 		{
-			amx_RaiseError(amx, AMX_ERR_NATIVE);
+			LogError(amx, AMX_ERR_NATIVE, "Couldn't write file \"%s\"", sFile);
 			return 0;
 		}
 		
@@ -201,7 +199,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 	{
 		if ((pFile = fopen(sFile, "w")) == NULL)
 		{
-			amx_RaiseError(amx, AMX_ERR_NATIVE);
+			LogError(amx, AMX_ERR_NATIVE, "Couldn't write file \"%s\"", sFile);
 			return 0;
 		}
 		
@@ -221,7 +219,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 
 	if ((pTemp = tmpfile()) == NULL)
 	{
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
+		LogError(amx, AMX_ERR_NATIVE, "Couldn't create temp file");
 		return 0;
 	}
 
@@ -251,7 +249,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 	// now rewrite because file can be now smaller...
 	if ((pFile = fopen(sFile, "w")) == NULL)
 	{
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
+		LogError(amx, AMX_ERR_NATIVE, "Couldn't write file \"%s\"", sFile);
 		return 0;
 	}
 
@@ -307,27 +305,7 @@ static cell AMX_NATIVE_CALL dir_exists(AMX *amx, cell *params) /* 1 param */
 	char *sFile = get_amxstring(amx, params[1], 0, iLen);
 	char *file = build_pathname("%s", sFile);
 
-#if defined WIN32 || defined _WIN32
+	return DirExists(file) ? 1 : 0;
-	DWORD attr = GetFileAttributes(file);
-	
-	if (attr == INVALID_FILE_ATTRIBUTES)
-		return 0;
-	
-	if (attr == FILE_ATTRIBUTE_DIRECTORY)
-		return 1;
-	
-	return 0;
-#else
-	struct stat s;
-	
-	if (stat(file, &s) != 0)
-		return 0;
-	
-	if (S_ISDIR(s.st_mode))
-		return 1;
-	
-	return 0;
-#endif
 }
 
 static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
@@ -378,250 +356,279 @@ static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
 	return -1;
 }
 
-//ported from Sanji's file access module by BAILOPAN
-// Important update - now uses new handles
 static cell AMX_NATIVE_CALL amx_fopen(AMX *amx, cell *params)
 {
-	unsigned int i;
+	int len;
-	int len, j = -1;
 	char *file = build_pathname("%s", get_amxstring(amx, params[1], 1, len));
 	char *flags = get_amxstring(amx, params[2], 0, len);
 
 	FILE *fp = fopen(file, flags);
 
-	if (fp == NULL)
+	return (cell)fp;
-	{
-		// Failed
-		return 0;
-	}
-
-	for (i = 0; i < FileList.size(); i++)
-	{
-		if (FileList.at(i) == NULL)
-		{
-			j = i;
-			break;
-		}
-	}
-	
-	if (j == -1)
-	{
-		FileList.push_back(fp);
-		j = FileList.size() - 1;
-	} else {
-		FileList.at(j) = fp;
-	}
-
-	return j + 1;
 }
 
-static cell AMX_NATIVE_CALL amx_fclose(AMX *amx, cell *params)
+static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 {
-	unsigned int id = params[1] - 1;
+	FILE *fp = (FILE *)params[1];
 
-	if (id >= FileList.size() || FileList.at(id) == NULL)
+	if (!fp)
 		return 0;
 
-	FILE *fp = FileList.at(id);
+	cell *addr = get_amxaddr(amx, params[2]);
-	
+	size_t blocks = params[3];
-	if (fp)
+	size_t btmp = blocks;
+	cell mode = params[4];
+	switch (mode)
 	{
-		return fclose(fp);
+	case 1:
-	} else {
+		{
-		return -1;
+			char *a = new char[blocks];
+			while (btmp--)
+				*a++ = static_cast<char>(*addr++);
+			size_t res = fwrite(a, sizeof(char), blocks, fp);
+			delete [] a;
+			return res;
+		}
+	case 2:
+		{
+			short *a = new short[blocks];
+			while (btmp--)
+				*a++ = static_cast<short>(*addr++);
+			size_t res = fwrite(a, sizeof(short), blocks, fp);
+			delete [] a;
+			return res;
+		}
+	case 4:
+		{
+			int *a = new int[blocks];
+			while (btmp--)
+				*a++ = static_cast<int>(*addr++);
+			size_t res = fwrite(a, sizeof(int), blocks, fp);
+			delete [] a;
+			return res;
+		}
 	}
-}
 
-static cell AMX_NATIVE_CALL amx_fread(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
 	return 0;
-	
-	FILE *fp = FileList.at(id);
-	
-	char *buffer;
-	
-	if (fp)
-	{
-		buffer = new char[params[3]];			// SLOW!!! :TODO: Find a better way (auto pointers?)
-		fread(buffer, sizeof(char), params[3], fp);
-		set_amxstring(amx, params[2], buffer, params[3]);
-		delete [] buffer;
-		
-		return 1;
-	}
-	
-	return -1;
-}
-
-#ifdef UNUSED
-static cell AMX_NATIVE_CALL amx_fgetc(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-	
-	if (fp)
-	{
-		return fgetc(fp);
-	} else {
-		return -1;
-	}
 }
 
 static cell AMX_NATIVE_CALL amx_fwrite(AMX *amx, cell *params)
 {
-	unsigned int id = params[1] - 1;
+	FILE *fp = (FILE *)params[1];
 
-	if (id >= FileList.size() || FileList.at(id) == NULL)
+	if (!fp)
 		return 0;
 
-	FILE *fp = FileList.at(id);
+	size_t mode = params[3];
-	char *buf;
+	switch (mode)
-	int len;
-	
-	if (fp)
 	{
-		buf = format_amxstring(amx, params, 2, len);
+	case 1:
-		return fwrite(buf, sizeof(char), strlen(buf), fp);
+		{
+			char a = static_cast<char>(params[2]);
+			return fwrite(&a, sizeof(char), 1, fp);
+		}
+	case 2:
+		{
+			short b = static_cast<short>(params[2]);
+			return fwrite(&b, sizeof(short), 1, fp);
+		}
+	case 4:
+		{
+			int c = static_cast<int>(params[2]);
+			return fwrite(&c, sizeof(short), 1, fp);
+		}
 	}
 
-	return -1;
+	return 0;
 }
 
-static cell AMX_NATIVE_CALL amx_feof(AMX *amx, cell *params)
+static cell AMX_NATIVE_CALL amx_fwrite_raw(AMX *amx, cell *params)
 {
-	unsigned int id = params[1] - 1;
+	FILE *fp = (FILE *)params[1];
 
-	if (id >= FileList.size() || FileList.at(id) == NULL)
+	if (!fp)
 		return 0;
 
-	FILE *fp = FileList.at(id);
+	cell *addr = get_amxaddr(amx, params[2]);
+	return fwrite(addr, params[3], params[4], fp);
+}
 
-	if (fp)
+static cell AMX_NATIVE_CALL amx_fread_raw(AMX *amx, cell *params)
-	{
+{
-		if (feof(fp))
+	FILE *fp = (FILE *)params[1];
-		{
+
-			return 1;
+	if (!fp)
-		}
 		return 0;
+
+	cell *addr = get_amxaddr(amx, params[2]);
+	size_t size = static_cast<cell>(params[3]);
+	size_t blocks = static_cast<cell>(params[4]);
+    
+	return fread(addr, size, blocks, fp);
+}
+
+static cell AMX_NATIVE_CALL amx_fread(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	cell *addr = get_amxaddr(amx, params[2]);
+	switch (params[3])
+	{
+	case 1:	//char
+		{
+			char a;
+			size_t res = fread(&a, sizeof(char), 1, fp);
+			*addr = static_cast<cell>(a);
+			return res;
+		}
+	case 2:	//short
+		{
+			short a;
+			size_t res = fread(&a, sizeof(short), 1, fp);
+			*addr = static_cast<cell>(a);
+			return res;
+		}
+	case 4:	//int
+	default:
+		{
+			int a;
+			size_t res = fread(&a, sizeof(int), 1, fp);
+			*addr = static_cast<cell>(a);
+			return res;
+		}
 	}
 
-	return -1;
+	return 0;
+}
+
+static cell AMX_NATIVE_CALL amx_fread_blocks(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	cell *addr = get_amxaddr(amx, params[2]);
+	size_t blocks = params[3];
+	switch (params[3])
+	{
+	case 1:	//char
+		{
+			char *a = new char[blocks];
+			char *ptr = a;
+			size_t res = fread(a, sizeof(char), blocks, fp);
+			while (blocks--)
+				*addr++ = static_cast<cell>(*ptr++);
+			delete [] a;
+			return res;
+		}
+	case 2:	//short
+		{
+			short *a = new short[blocks];
+			short *ptr = a;
+			size_t res = fread(a, sizeof(short), blocks, fp);
+			while (blocks--)
+				*addr++ = static_cast<cell>(*ptr++);
+			delete [] a;
+			return res;
+		}
+	case 4:	//int
+	default:
+		{
+			int *a = new int[blocks];
+			int *ptr = a;
+			size_t res = fread(a, sizeof(int), blocks, fp);
+			while (blocks--)
+				*addr++ = static_cast<cell>(*ptr++);
+			delete [] a;
+			return res;
+		}
+	}
+
+	return 0;
+}
+
+static cell AMX_NATIVE_CALL amx_fputs(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	int len;
+	char *str = get_amxstring(amx, params[2], 0, len);
+	return fputs(str, fp);
+}
+
+static cell AMX_NATIVE_CALL amx_fgets(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	static char buffer[4096];
+	buffer[0] = '\0';
+	fgets(buffer, sizeof(buffer)-1, fp);
+	return set_amxstring(amx, params[2], buffer, params[3]);
 }
 
 static cell AMX_NATIVE_CALL amx_fseek(AMX *amx, cell *params)
 {
-	unsigned int id = params[1] - 1;
+	FILE *fp = (FILE *)params[1];
 
-	if (id >= FileList.size() || FileList.at(id) == NULL)
+	if (!fp)
 		return 0;
 
-	FILE *fp = FileList.at(id);
+	return fseek(fp, params[2], params[3]);
-
-	if (fp)
-	{
-		return fseek(fp, (long)params[2], params[3]);
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputc(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	if (fp)
-	{
-		return fputc(params[2], fp);
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_rewind(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	if (fp)
-	{
-		rewind(fp);
-		return 1;
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fflush(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	if (fp)
-	{
-		return fflush(fp);
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fscanf(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	char *buf;
-	int len;
-	buf = format_amxstring(amx, params, 2, len);
-	
-	if (fp)
-	{
-		return fscanf(fp, "%s", buf);
-	}
-
-	return -1;
 }
 
 static cell AMX_NATIVE_CALL amx_ftell(AMX *amx, cell *params)
 {
-	unsigned int id = params[1] - 1;
+	FILE *fp = (FILE *)params[1];
 
-	if (id >= FileList.size() || FileList.at(id) == NULL)
+	if (!fp)
 		return 0;
 
-	FILE *fp = FileList.at(id);
-
-	if (fp)
-	{
 	return ftell(fp);
-	}
-	
-	return -1;
 }
-#endif //UNUSED
+
+static cell AMX_NATIVE_CALL amx_fprintf(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	int len;
+	char *str = format_amxstring(amx, params, 2, len);
+	return fprintf(fp, "%s", str);
+}
+
+static cell AMX_NATIVE_CALL amx_feof(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 1;
+
+	return feof(fp);
+}
+
+static cell AMX_NATIVE_CALL amx_fclose(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 1;
+
+	fclose(fp);
+
+	return 1;
+}
 
 static cell AMX_NATIVE_CALL amx_filesize(AMX *amx, cell *params)
 {
@@ -642,164 +649,6 @@ static cell AMX_NATIVE_CALL amx_filesize(AMX *amx, cell *params)
 	return -1;
 }
 
-#ifdef UNUSED
-static cell AMX_NATIVE_CALL amx_fgetl(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	long t;
-	
-	if (fp)
-	{
-		fread(&t, sizeof(long), 1, fp);
-		return t;
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fgeti(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	int t;
-	
-	if (fp)
-	{
-		fread(&t, sizeof(int), 1, fp);
-		return t;
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fgets(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	short t;
-	
-	if (fp)
-	{
-		fread(&t, sizeof(short), 1, fp);
-		return t;
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputs(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	short size = params[2];
-	
-	if (fp)
-	{
-		return fwrite(&size, sizeof(short), 1, fp);
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputl(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	long size = params[2];
-	
-	if (fp)
-	{
-		return fwrite(&size, sizeof(long), 1, fp);
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputi(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	int size = params[2];
-	
-	if (fp)
-	{
-		return fwrite(&size, sizeof(int), 1, fp);
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fgetf(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	float t;
-	
-	if (fp)
-	{
-		fread(&t, sizeof(float), 1, fp);
-		return *(cell*)&t;
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputf(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	
-	FILE *fp = FileList.at(id);
-
-	float size = *(float *)((void *)&params[2]);
-	
-	if (fp)
-	{
-		return fwrite(&size, sizeof(float), 1, fp);
-	}
-	
-	return -1;
-}
-#endif //UNUSED
-
 static cell AMX_NATIVE_CALL amx_build_pathname(AMX *amx, cell *params)
 {
 	int len;
@@ -830,13 +679,13 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
 	DIR *dp = opendir(dirname);
 	
 	if (!dp)
-		return NULL;
+		return 0;
 	struct dirent *ep = readdir(dp);
 	
 	if (!ep)
 	{
 		closedir(dp);
-		return NULL;
+		return 0;
 	}
 	
 	set_amxstring(amx, params[2], ep->d_name, params[3]);
@@ -899,6 +748,79 @@ static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
 #endif
 }
 
+//native fgetc( file );
+static cell AMX_NATIVE_CALL amx_fgetc(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	return fgetc(fp);
+}
+
+//native fputc( file, data );
+static cell AMX_NATIVE_CALL amx_fputc(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	return fputc(static_cast<int>(params[2]), fp);
+}
+
+//native ungetc( file, data );
+static cell AMX_NATIVE_CALL amx_ungetc(AMX *amx, cell *params)
+{
+	FILE *fp = (FILE *)params[1];
+
+	if (!fp)
+		return 0;
+
+	return ungetc(static_cast<int>(params[2]), fp);
+}
+
+#if defined __linux__
+#define _rmdir rmdir
+#endif
+
+static cell AMX_NATIVE_CALL amx_rmdir(AMX *amx, cell *params)
+{
+	int len;
+	char* sFile = build_pathname("%s", get_amxstring(amx, params[1], 0, len));
+
+	if (_rmdir(sFile) != 0)
+		return 0;
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL amx_rename(AMX *amx, cell *params)
+{
+	int len;
+	char f_old_r[260];
+	char f_new_r[260];
+
+	char *fold = get_amxstring(amx, params[1], 0, len);
+	char *fnew = get_amxstring(amx, params[2], 1, len);
+
+	if (params[0] / sizeof(cell) == 3 && params[3])
+	{
+		build_pathname_r(f_old_r, sizeof(f_old_r)-1, "%s", fold);
+		build_pathname_r(f_new_r, sizeof(f_new_r)-1, "%s", fnew);
+	} else {
+		snprintf(f_old_r, sizeof(f_old_r)-1, "%s", fold);
+		snprintf(f_new_r, sizeof(f_new_r)-1, "%s", fnew);
+	}
+
+#if defined __linux__
+	return (rename(f_old_r, f_new_r) == 0);
+#elif defined WIN32
+	return MoveFileA(f_old_r, f_new_r);
+#endif
+}
+
 AMX_NATIVE_INFO file_Natives[] =
 {
 	{"delete_file",		delete_file},
@@ -907,35 +829,32 @@ AMX_NATIVE_INFO file_Natives[] =
 	{"read_dir",		read_dir},
 	{"read_file",		read_file},
 	{"write_file",		write_file},
-	//Sanji's File Natives
+	//new, sane file natives
 	{"fopen",			amx_fopen},
 	{"fclose",			amx_fclose},
 	{"fread",			amx_fread},
-	{"filesize",	amx_filesize},
+	{"fread_blocks",	amx_fread_blocks},
-#ifdef UNUSED
+	{"fread_raw",		amx_fread_raw},
-	{"fgetc",		amx_fgetc},
 	{"fwrite",			amx_fwrite},
+	{"fwrite_blocks",	amx_fwrite_blocks},
+	{"fwrite_raw",		amx_fwrite_raw},
 	{"feof",			amx_feof},
-	{"fseek",		amx_fseek},
+	{"fprintf",			amx_fprintf},
-	{"fputc",		amx_fputc},
-	{"rewind",		amx_rewind},
-	{"fflush",		amx_fflush},
-	{"fscanf",		amx_fscanf},
-	{"ftell",		amx_ftell},
-	{"fgetl",		amx_fgetl},
-	{"fgeti",		amx_fgeti},
 	{"fgets",			amx_fgets},
-	{"fputs",		amx_fputs},
+	{"fseek",			amx_fseek},
-	{"fputl",		amx_fputl},
+	{"ftell",			amx_ftell},
-	{"fputi",		amx_fputi},
+	{"filesize",		amx_filesize},
-	{"fgetf",		amx_fgetf},
-	{"fputf",		amx_fputf},
-#endif
 	{"unlink",			delete_file},
 	{"build_pathname",	amx_build_pathname},
 	{"dir_exists",		dir_exists},
 	{"open_dir",		amx_open_dir},
 	{"close_dir",		amx_close_dir},
 	{"next_file",		amx_get_dir},
+	{"fgetc",			amx_fgetc},
+	{"fputc",			amx_fputc},
+	{"fungetc",			amx_ungetc},
+	{"rmdir",			amx_rmdir},
+	{"fputs",			amx_fputs},
+	{"rename_file",		amx_rename},
 	{NULL,				NULL}
 };

amxmodx/float.cpp

@@ -368,7 +368,6 @@ static cell AMX_NATIVE_CALL n_floatatan(AMX *amx, cell *params)
 	 * params[2] = radix
 	 */
 	REAL fA = amx_ctof(params[1]);
-	fA = ToRadians(fA, params[2]);
 	fA = atan(fA);
 	fA = FromRadians(fA, params[2]);
 	return amx_ftoc(fA);
@@ -425,6 +424,54 @@ static cell AMX_NATIVE_CALL n_floatatan2(AMX *amx, cell *params)
 	return amx_ftoc(fC);
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
+/* Added by DS */
+static cell AMX_NATIVE_CALL n_floatsinh(AMX *amx, cell *params)
+{
+	/*
+	 * params[1] = angle
+	 * params[2] = radix
+	 */
+	REAL fA = amx_ctof(params[1]);
+	fA = ToRadians(fA, params[2]);
+	fA = sinh(fA);
+	return amx_ftoc(fA);
+}
+
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
+/* Added by DS */
+static cell AMX_NATIVE_CALL n_floatcosh(AMX *amx, cell *params)
+{
+	/*
+	 * params[1] = angle
+	 * params[2] = radix
+	 */
+	REAL fA = amx_ctof(params[1]);
+	fA = ToRadians(fA, params[2]);
+	fA = cosh(fA);
+	return amx_ftoc(fA);
+}
+
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
+/* Added by DS */
+static cell AMX_NATIVE_CALL n_floattanh(AMX *amx, cell *params)
+{
+	/*
+	 * params[1] = angle
+	 * params[2] = radix
+	 */
+	REAL fA = amx_ctof(params[1]);
+	fA = ToRadians(fA, params[2]);
+	fA = tanh(fA);
+	return amx_ftoc(fA);
+}
+
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
@@ -457,6 +504,9 @@ AMX_NATIVE_INFO float_Natives[] = {
   { "floatacos",   n_floatacos  },
   { "floatatan",   n_floatatan  },
   { "floatatan2",  n_floatatan2 },
+  { "floatsinh",   n_floatsinh  },
+  { "floatcosh",   n_floatcosh  },
+  { "floattanh",   n_floattanh  },
   { NULL, NULL }        /* terminator */
 };
 

amxmodx/format.cpp

@@ -0,0 +1,508 @@
+#include "amxmodx.h"
+#include "format.h"
+#include "amxmod_compat.h"
+
+//Adapted from Quake3's vsprintf
+// thanks to cybermind for linking me to this :)
+//I made the following changes:
+// - Fixed spacing to be AMX Mod X standard
+// - Added 'n' support, no buffer overflows
+// - Templatized input/output buffers
+
+#define ALT			0x00000001		/* alternate form */
+#define HEXPREFIX	0x00000002		/* add 0x or 0X prefix */
+#define LADJUST		0x00000004		/* left adjustment */
+#define LONGDBL		0x00000008		/* long double */
+#define LONGINT		0x00000010		/* long integer */
+#define QUADINT		0x00000020		/* quad integer */
+#define SHORTINT	0x00000040		/* short integer */
+#define ZEROPAD		0x00000080		/* zero (as opposed to blank) pad */
+#define FPT			0x00000100		/* floating point number */
+#define to_digit(c)		((c) - '0')
+#define is_digit(c)		((unsigned)to_digit(c) <= 9)
+#define to_char(n)		((n) + '0')
+#define CHECK_ARGS(n) \
+	if ((arg+n) > args) { \
+		LogError(amx, AMX_ERR_PARAMS, "String formatted incorrectly - parameter %d (total %d)", arg, args); \
+		return 0; \
+	}
+
+THash<String, lang_err> BadLang_Table;
+
+static cvar_t *amx_mldebug = NULL;
+static cvar_t *amx_cl_langs = NULL;
+
+const char *translate(AMX *amx, cell amxaddr, const char *key)
+{
+	const char *pLangName = NULL;
+	const char *def = NULL;
+	int status;
+	cell *addr = get_amxaddr(amx, amxaddr);
+	char name[4];
+	if (addr[0] == LANG_PLAYER)
+	{
+		if (!amx_cl_langs)
+			amx_cl_langs = CVAR_GET_POINTER("amx_client_languages");
+		if ( (int)amx_cl_langs->value == 0 )
+		{
+			pLangName = g_vault.get("server_language");
+		} else {
+			pLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I(g_langMngr.GetDefLang())->pEdict, "lang");
+		}
+	} else if (addr[0] == LANG_SERVER) {
+		pLangName = g_vault.get("server_language");
+	} else if (addr[0] >= 1 && addr[0] <= gpGlobals->maxClients) {
+		if (!amx_cl_langs)
+			amx_cl_langs = CVAR_GET_POINTER("amx_client_languages");
+		if ( (int)amx_cl_langs->value == 0 )
+		{
+			pLangName = g_vault.get("server_language");
+		} else {
+			pLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I(addr[0])->pEdict, "lang");
+		}
+	} else {
+		get_amxstring_r(amx, amxaddr, name, 3);
+		pLangName = name;
+	}
+	if (!pLangName || !isalpha(pLangName[0]))
+		pLangName = "en";
+	//next parameter!
+	def = g_langMngr.GetDef(pLangName, key, status);
+			
+	if (!amx_mldebug)
+		amx_mldebug = CVAR_GET_POINTER("amx_mldebug");
+
+	bool debug = (amx_mldebug && amx_mldebug->string && (amx_mldebug->string[0] != '\0'));
+		
+	if (debug)
+	{
+		int debug_status;
+		bool validlang = true;
+		const char *testlang = amx_mldebug->string;
+		if (!g_langMngr.LangExists(testlang))
+		{
+			AMXXLOG_Error("[AMXX] \"%s\" is an invalid debug language", testlang);
+			validlang = false;
+		}
+				
+		g_langMngr.GetDef(testlang, key, debug_status);
+				
+		if (validlang && debug_status == ERR_BADKEY)
+			AMXXLOG_Error("[AMXX] Language key \"%s\" not found for language \"%s\", check \"%s\"", key, testlang, GetFileName(amx));
+	}
+				
+	if (def == NULL)
+	{
+		if (debug)
+		{
+			if (status == ERR_BADLANG && (BadLang_Table.AltFindOrInsert(pLangName).last + 120.0f < gpGlobals->time))
+			{
+				AMXXLOG_Error("[AMXX] Language \"%s\" not found", pLangName);
+				BadLang_Table.AltFindOrInsert(pLangName).last = gpGlobals->time;
+			}
+		}
+
+		if (addr[0] != LANG_SERVER)
+			def = g_langMngr.GetDef(g_vault.get("server_language"), key, status);
+		
+		if (!def && (strcmp(pLangName, "en") != 0 && strcmp(g_vault.get("server_language"), "en") != 0))
+			def = g_langMngr.GetDef("en", key, status);
+	}
+
+	return def;
+}
+
+template <typename U>
+void AddString(U **buf_p, size_t &maxlen, const cell *string, int width, int prec)
+{
+	int		size = 0;
+	U		*buf;
+	static cell nlstr[] = {'(','n','u','l','l',')','\0'};
+
+	buf = *buf_p;
+
+	if (string == NULL)
+	{
+		string = nlstr;
+		prec = -1;
+	}
+
+	if (prec >= 0)
+	{
+		for (size = 0; size < prec; size++) 
+		{
+			if (string[size] == '\0')
+				break;
+		}
+	} else {
+		while (string[size++]) ;
+		size--;
+	}
+
+	if (size > (int)maxlen)
+		size = maxlen;
+
+	maxlen -= size;
+	width -= size;
+
+	while (size--)
+		*buf++ = static_cast<U>(*string++);
+
+	while (width-- > 0 && maxlen)
+	{
+		*buf++ = ' ';
+		maxlen--;
+	}
+
+	*buf_p = buf;
+}
+
+template <typename U>
+void AddFloat(U **buf_p, size_t &maxlen, double fval, int width, int prec)
+{
+	U		text[32];
+	int		digits;
+	double	signedVal;
+	U		*buf;
+	int		val;
+
+	// get the sign
+	signedVal = fval;
+	if (fval < 0)
+		fval = -fval;
+
+	// write the float number
+	digits = 0;
+	val = (int)fval;
+	do {
+		text[digits++] = '0' + val % 10;
+		val /= 10;
+	} while (val);
+
+	if (signedVal < 0)
+		text[digits++] = '-';
+
+	buf = *buf_p;
+
+	while (digits < width && maxlen)
+	{
+		*buf++ = ' ';
+		width--;
+		maxlen--;
+	}
+
+	while (digits-- && maxlen)
+	{
+		*buf++ = text[digits];
+		maxlen--;
+	}
+
+	*buf_p = buf;
+
+	if (prec < 0)
+		prec = 6;
+	// write the fraction
+	digits = 0;
+	while (digits < prec)
+	{
+		fval -= (int) fval;
+		fval *= 10.0;
+		val = (int) fval;
+		text[digits++] = '0' + val % 10;
+	}
+
+	if (digits > 0 && maxlen)
+	{
+		buf = *buf_p;
+		*buf++ = '.';
+		maxlen--;
+		for (prec = 0; maxlen && prec < digits; prec++)
+		{
+			*buf++ = text[prec];
+			maxlen--;
+		}
+		*buf_p = buf;
+	}
+}
+
+template <typename U>
+void AddUInt(U **buf_p, size_t &maxlen, unsigned int val, int width, int flags)
+{
+	U		text[32];
+	int		digits;
+	U		*buf;
+
+	digits = 0;
+	do {
+		text[digits++] = '0' + val % 10;
+		val /= 10;
+	} while (val);
+
+	buf = *buf_p;
+
+	if( !(flags & LADJUST) )
+	{
+		while (digits < width && maxlen)
+		{
+			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+			width--;
+			maxlen--;
+		}
+	}
+
+	while (digits-- && maxlen)
+	{
+		*buf++ = text[digits];
+		width--;
+		maxlen--;
+	}
+
+	if (flags & LADJUST)
+	{
+		while (width-- && maxlen)
+		{
+			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+			maxlen--;
+		}
+	}
+
+	*buf_p = buf;
+}
+
+template <typename U>
+void AddInt(U **buf_p, size_t &maxlen, int val, int width, int flags)
+{
+	U		text[32];
+	int		digits;
+	int		signedVal;
+	U		*buf;
+	unsigned int unsignedVal;
+
+	digits = 0;
+	signedVal = val;
+	if (val < 0)
+	{
+		/* we want the unsigned version */
+		unsignedVal = abs(val);
+	} else {
+		unsignedVal = val;
+	}
+	do {
+		text[digits++] = '0' + unsignedVal % 10;
+		unsignedVal /= 10;
+	} while (unsignedVal);
+
+	if (signedVal < 0)
+		text[digits++] = '-';
+
+	buf = *buf_p;
+
+	if( !(flags & LADJUST) )
+	{
+		while (digits < width && maxlen)
+		{
+			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+			width--;
+			maxlen--;
+		}
+	}
+
+	while (digits-- && maxlen)
+	{
+		*buf++ = text[digits];
+		width--;
+		maxlen--;
+	}
+
+	if (flags & LADJUST)
+	{
+		while (width-- && maxlen)
+		{
+			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+			maxlen--;
+		}
+	}
+
+	*buf_p = buf;
+}
+
+template <typename D, typename S>
+size_t atcprintf(D *buffer, size_t maxlen, const S *format, AMX *amx, cell *params, int *param)
+{
+	int		arg;
+	int		args = params[0] / sizeof(cell);
+	D		*buf_p;
+	D		ch;
+	int		flags;
+	int		width;
+	int		prec;
+	int		n;
+	char	sign;
+	const S	*fmt;
+	size_t	llen = maxlen;
+
+	buf_p = buffer;
+	arg = *param;
+	fmt = format;
+
+	while (true)
+	{
+		// run through the format string until we hit a '%' or '\0'
+		for (ch = static_cast<D>(*fmt); 
+			llen && ((ch = static_cast<D>(*fmt)) != '\0' && ch != '%');
+			fmt++)
+		{
+			*buf_p++ = static_cast<D>(ch);
+			llen--;
+		}
+		if (ch == '\0' || llen <= 0)
+			goto done;
+
+		// skip over the '%'
+		fmt++;
+
+		// reset formatting state
+		flags = 0;
+		width = 0;
+		prec = -1;
+		sign = '\0';
+
+rflag:
+		ch = static_cast<D>(*fmt++);
+reswitch:
+		switch(ch)
+		{
+		case '-':
+			flags |= LADJUST;
+			goto rflag;
+		case '.':
+			n = 0;
+			while( is_digit( ( ch = static_cast<D>(*fmt++)) ) )
+				n = 10 * n + ( ch - '0' );
+			prec = n < 0 ? -1 : n;
+			goto reswitch;
+		case '0':
+			flags |= ZEROPAD;
+			goto rflag;
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			n = 0;
+			do {
+				n = 10 * n + ( ch - '0' );
+				ch = static_cast<D>(*fmt++);
+			} while( is_digit( ch ) );
+			width = n;
+			goto reswitch;
+		case 'c':
+			CHECK_ARGS(0);
+			*buf_p++ = static_cast<D>(*get_amxaddr(amx, params[arg]));
+			arg++;
+			break;
+		case 'd':
+		case 'i':
+			CHECK_ARGS(0);
+			AddInt(&buf_p, llen, *get_amxaddr(amx, params[arg]), width, flags);
+			arg++;
+			break;
+		case 'u':
+			CHECK_ARGS(0);
+			AddUInt(&buf_p, llen, static_cast<unsigned int>(*get_amxaddr(amx, params[arg])), width, flags);
+			arg++;
+			break;
+		case 'f':
+			CHECK_ARGS(0);
+			AddFloat(&buf_p, llen, amx_ctof(*get_amxaddr(amx, params[arg])), width, prec);
+			arg++;
+			break;
+		case 's':
+			CHECK_ARGS(0);
+			if (amx->flags & AMX_FLAG_OLDFILE)
+			{
+				cell *addr = get_amxaddr(amx, params[arg]);
+				if (*addr & BCOMPAT_TRANSLATE_BITS)
+				{
+					const char *key, *def;
+					if (!translate_bcompat(amx, addr, &key, &def))
+					{
+						goto break_to_normal_string;
+					}
+					arg++;
+					size_t written = atcprintf(buf_p, llen, def, amx, params, &arg);
+					buf_p += written;
+					llen -= written;
+					break;
+				}
+			}
+break_to_normal_string:
+			AddString(&buf_p, llen, get_amxaddr(amx, params[arg]), width, prec);
+			arg++;
+			break;
+		case 'L':
+			{
+				CHECK_ARGS(1);
+				cell addr = params[arg++];
+				int len;
+				const char *key = get_amxstring(amx, params[arg++], 3, len);
+				const char *def = translate(amx, addr, key);
+				if (!def)
+				{
+					static char buf[255];
+					snprintf(buf, sizeof(buf)-1, "ML_NOTFOUND: %s", key);
+					def = buf;
+				}
+				size_t written = atcprintf(buf_p, llen, def, amx, params, &arg);
+				buf_p += written;
+				llen -= written;
+				break;
+			}
+		case '%':
+			*buf_p++ = static_cast<D>(ch);
+			if (!llen)
+				goto done;
+			llen--;
+			break;
+		case '\0':
+			*buf_p++ = static_cast<D>('%');
+			if (!llen)
+				goto done;
+			llen--;
+			goto done;
+			break;
+		default:
+			*buf_p++ = static_cast<D>(ch);
+			if (!llen)
+				goto done;
+			llen--;
+			break;
+		}
+	}
+
+done:
+	*buf_p = static_cast<D>(0);
+	*param = arg;
+	return maxlen-llen;
+}
+
+/**
+ * HACKHACK: The compiler will generate code for each case we need.
+ * Don't remove this, otherwise files that use certain code generations
+ *  will have extern problems.  For each case you need, add dummy code
+ *  here.
+ */
+void __WHOA_DONT_CALL_ME_PLZ_K_lol_o_O()
+{
+	//acsprintf
+	atcprintf((cell *)NULL, 0, (const char *)NULL, NULL, NULL, NULL);
+	//accprintf
+	atcprintf((cell *)NULL, 0, (cell *)NULL, NULL, NULL, NULL);
+	//ascprintf
+	atcprintf((char *)NULL, 0, (cell *)NULL, NULL, NULL, NULL);
+}
+

amxmodx/format.h

@@ -0,0 +1,11 @@
+#ifndef _INCLUDE_FORMATTING_H
+#define _INCLUDE_FORMATTING_H
+
+//Amx Templatized Cell Printf
+template <typename D, typename S>
+size_t atcprintf(D *buffer, size_t maxlen, const S *format, AMX *amx, cell *params, int *param);
+
+const char *translate(AMX *amx, cell amxaddr, const char *key);
+bool translate_bcompat(AMX *amx, cell *source, const char **_key, const char **_def);
+
+#endif //_INCLUDE_FORMATTING_H

amxmodx/helpers-x86.asm

@@ -0,0 +1,51 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; (C)2006 by David "BAILOPAN" Anderson			 ;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;Licensed under the GNU General Public License, version 2
+;;This is a portion of AMX Mod X 
+;; and is maintained by the AMX Mod X development team.
+
+section .text
+
+global amxx_CpuSupport, _amxx_CpuSupport
+
+amxx_CpuSupport:
+_amxx_CpuSupport:
+	push	ebp
+	mov		ebp, esp
+	
+	push	ebx
+	
+	mov		eax, 0
+	cpuid
+	cmp		eax, 1
+	jl		.fail
+	
+	mov		eax, 1
+	cpuid
+	;check if family == 5 or 4
+	and		eax, 0780h	;family mask
+	shr		eax, 7		;family shift
+	cmp		eax, 5
+	je		.fail
+	cmp		eax, 4
+	je		.fail
+	;check if CMOV exists
+	shr		edx, 15
+	and		edx, 1
+	cmp		edx, 0
+	je		.fail
+	
+	mov		eax, 1
+	jmp		.end
+
+.fail:
+	xor		eax, eax
+	
+.end
+	
+	pop		ebx
+
+	pop		ebp
+	ret

amxmodx/libraries.cpp

@@ -0,0 +1,243 @@
+#include "libraries.h"
+#include "sh_list.h"
+
+List<Library *> g_libraries;
+
+bool AddLibrary(const char *name, LibType type, LibSource src, void *parent)
+{
+	if (FindLibrary(name, type))
+		return false;
+
+	Library *lib = new Library;
+
+	lib->name.assign(name);
+	lib->type = type;
+	lib->src = src;
+	lib->parent = parent;
+
+	g_libraries.push_back(lib);
+	
+	return true;
+}
+
+bool DecodeLibCmdString(const char *str, LibDecoder *dec)
+{
+	if (dec->buffer)
+	{
+		free(dec->buffer);
+		dec->buffer = NULL;
+	}
+	if (str[0] != '?')
+	{
+		return false;
+	} else {
+		str++;
+		if (*str == 'r')
+		{
+			str++;
+			if (*str == 'c')
+				dec->cmd = LibCmd_ReqClass;
+			else if (*str == 'l')
+				dec->cmd = LibCmd_ReqLib;
+			else
+				return false;
+			str++;
+		} else if (*str == 'f') {
+			str++;
+			dec->cmd = LibCmd_ForceLib;
+		} else if (*str == 'e') {
+			str++;
+			if (*str == 'c')
+				dec->cmd = LibCmd_ExpectClass;
+			else if (*str == 'l')
+				dec->cmd = LibCmd_ExpectLib;
+			else
+				return false;
+			str++;
+		} else if (*str == 'd') {
+			str++;
+			dec->cmd = LibCmd_DefaultLib;
+		}
+		if (*str != '_')
+			return false;
+		str++;
+		if (dec->cmd < LibCmd_ExpectLib)
+		{
+			dec->buffer = strdup(str);
+			dec->param1 = dec->buffer;
+			dec->param2 = NULL;
+		} else {
+			dec->buffer = strdup(str);
+			char *p = strchr(dec->buffer, '_');
+			while (p && (*(p+1) == '_'))
+				p = strchr(p+2, '_');
+			if (!p || !*(p+1))
+				return false;
+			*p = '\0';
+			dec->param1 = dec->buffer;
+			dec->param2 = p+1;
+		}
+	}
+
+	return true;
+}
+
+size_t AddLibrariesFromString(const char *name, LibType type, LibSource src, void *parent)
+{
+	char buffer[255];
+	char *ptr, *p, s;
+	size_t count = 0;
+
+	snprintf(buffer, sizeof(buffer)-1, "%s", name);
+
+	ptr = buffer;
+	p = buffer;
+	while (*p)
+	{
+		while (*p && (*p != ','))
+			p++;
+		s = *p;
+		*p = '\0';
+		if (AddLibrary(ptr, type, src, parent))
+			count++;
+		if (!s)
+			break;
+		p++;
+		while (*p && (*p == ','))
+			p++;
+		ptr = p;
+	}
+
+	return count;
+}
+
+size_t ClearLibraries(LibSource src)
+{
+	List<Library *>::iterator iter;
+	size_t count = 0;
+
+	iter = g_libraries.begin();
+	while (iter != g_libraries.end())
+	{
+		if ( (*iter)->src == src )
+		{
+			delete (*iter);
+			iter = g_libraries.erase(iter);
+			count++;
+		} else {
+			iter++;
+		}
+	}
+
+	return count;
+}
+
+size_t RemoveLibraries(void *parent)
+{
+	List<Library *>::iterator iter;
+	Library *lib;
+	size_t count = 0;
+
+	iter = g_libraries.begin();
+	while (iter != g_libraries.end())
+	{
+		lib = (*iter);
+		if (lib->parent == parent)
+		{
+			delete (*iter);
+			iter = g_libraries.erase(iter);
+			count++;
+		} else {
+			iter++;
+		}
+	}
+
+	return count;
+}
+
+bool FindLibrary(const char *name, LibType type)
+{
+	List<Library *>::iterator iter;
+	Library *lib;
+
+	for (iter = g_libraries.begin(); iter != g_libraries.end(); iter++)
+	{
+		lib = (*iter);
+		if (lib->type != type)
+			continue;
+		if (strcasecmp(lib->name.c_str(), name) == 0)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+LibError RunLibCommand(const LibDecoder *enc)
+{
+	List<Library *>::iterator iter,end;
+	Library *lib;
+	
+	iter = g_libraries.begin();
+	end = g_libraries.end();
+
+	if ( (enc->cmd == LibCmd_ReqLib) || (enc->cmd == LibCmd_ReqClass) )
+	{
+		LibType expect = LibType_Library;
+
+		if (enc->cmd == LibCmd_ReqLib)
+			expect = LibType_Library;
+		else if (enc->cmd == LibCmd_ReqClass)
+			expect = LibType_Class;
+
+		/** see if it exists */
+		for (; iter != end; iter++)
+		{
+			lib = (*iter);
+			if (lib->type != expect)
+				continue;
+			if (strcasecmp(lib->name.c_str(), enc->param1) == 0)
+				return LibErr_None;
+		}
+		if (expect == LibType_Library)
+			return LibErr_NoLibrary;
+		else if (expect == LibType_Class)
+			return LibErr_NoClass;
+
+		return LibErr_NoLibrary;
+	} else if (enc->cmd == LibCmd_ForceLib) {
+		if (!LoadModule(enc->param1, PT_ANYTIME, true, true))
+		{
+			return LibErr_NoLibrary;
+		}
+	} else if ( (enc->cmd == LibCmd_DefaultLib) || 
+				((enc->cmd == LibCmd_ExpectLib) || (enc->cmd == LibCmd_ExpectClass)) )
+	{
+		LibType expect;
+
+		if (enc->cmd == LibCmd_ExpectLib)
+			expect = LibType_Library;
+		else
+			expect = LibType_Class;
+
+		/** see if it exists */
+		for (; iter != end; iter++)
+		{
+			lib = (*iter);
+			if (lib->type != expect)
+				continue;
+			if (strcasecmp(lib->name.c_str(), enc->param1) == 0)
+				return LibErr_None;
+		}
+
+		if (!LoadModule(enc->param2, PT_ANYTIME, true, true))
+		{
+			return LibErr_NoLibrary;
+		}
+
+		return LibErr_None;
+	}
+
+	return LibErr_None;
+}

amxmodx/libraries.h

@@ -0,0 +1,73 @@
+#ifndef _INCLUDE_LIBRARIES_H
+#define _INCLUDE_LIBRARIES_H
+
+#include <string.h>
+#include "amxmodx.h"
+#include "CString.h"
+
+enum LibSource
+{
+	LibSource_Plugin,
+	LibSource_Module
+};
+
+enum LibType
+{
+	LibType_Library,
+	LibType_Class
+};
+
+struct Library
+{
+	String name;
+	LibSource src;
+	LibType type;
+	void *parent;
+};
+
+enum LibCmd
+{
+	LibCmd_ReqLib,
+	LibCmd_ReqClass,
+	LibCmd_ForceLib,
+	LibCmd_ExpectLib,
+	LibCmd_ExpectClass,
+	LibCmd_DefaultLib,
+};
+
+enum LibError
+{
+	LibErr_None = 0,
+	LibErr_NoLibrary,
+	LibErr_NoClass,
+};
+
+class LibDecoder
+{
+public:
+	LibDecoder() : buffer(NULL)
+	{
+	}
+	~LibDecoder()
+	{
+		free(buffer);
+		buffer = NULL;
+		param1 = NULL;
+		param2 = NULL;
+	}
+	char *buffer;
+	char *param1;
+	char *param2;
+	LibCmd cmd;
+};
+
+bool AddLibrary(const char *name, LibType type, LibSource src, void *parent=NULL);
+bool DecodeLibCmdString(const char *str, LibDecoder *cmd);
+size_t AddLibrariesFromString(const char *name, LibType type, LibSource src, void *parent=NULL);
+size_t ClearLibraries(LibSource src);
+LibError RunLibCommand(const LibDecoder *enc);
+size_t RemoveLibraries(void *parent);
+bool FindLibrary(const char *name, LibType type);
+
+
+#endif //_INCLUDE_LIBRARIES_H

amxmodx/md5.cpp

@@ -111,7 +111,7 @@ void MD5::update(FILE *file){
   unsigned char buffer[1024];
   int len;
 
-  while (len=fread(buffer, 1, 1024, file))
+  while ((len=fread(buffer, 1, 1024, file)))
     update(buffer, len);
 
   fclose (file);

amxmodx/messages.cpp

@@ -0,0 +1,805 @@
+#include "amxmodx.h"
+#include "messages.h"
+
+Message Msg;
+CVector<int> msgHooks[256];
+int msgBlocks[256] = {BLOCK_NOT};
+int msgDest;
+int msgType;
+float *msgOrigin;
+edict_t *msgpEntity;
+bool inhook = false;
+bool inblock = false;
+enginefuncs_t *g_pEngTable = NULL;
+
+void ClearMessages()
+{
+	for (size_t i=0; i<MAX_MESSAGES; i++)
+	{
+		msgHooks[i].clear();
+		msgBlocks[i] = BLOCK_NOT;
+	}
+}
+
+Message::Message()
+{
+	m_CurParam = 0;
+}
+
+bool Message::Ready()
+{
+	if (!m_Params.size())
+		return false;
+	return true;
+}
+
+void Message::Init()
+{
+	if (!Ready())
+	{
+		msgparam *p = new msgparam;
+		m_Params.push_back(p);
+	}
+	m_CurParam = 0;
+}
+
+Message::~Message()
+{
+	for (size_t i=0; i<m_Params.size(); i++)
+		delete m_Params[i];
+	
+	m_Params.clear();
+}
+
+msgparam *Message::AdvPtr()
+{
+	msgparam *pParam = NULL;
+
+	if (++m_CurParam >= m_Params.size())
+	{
+		pParam = new msgparam;
+		m_Params.push_back(pParam);
+	} else {
+		pParam = m_Params[m_CurParam];
+	}
+
+	return pParam;
+}
+
+void Message::AddParam(const char *data, msgtype type)
+{
+	msgparam *pParam = AdvPtr();
+
+	pParam->szData.assign(data);
+	pParam->type = type;
+}
+
+void Message::AddParam(int data, msgtype type)
+{
+	msgparam *pParam = AdvPtr();
+	
+	pParam->v.iData = data;
+	pParam->type = type;
+}
+
+void Message::AddParam(float data, msgtype type)
+{
+	msgparam *pParam = AdvPtr();
+
+	pParam->v.fData = data;
+	pParam->type = type;
+}
+
+msgtype Message::GetParamType(size_t index)
+{
+	if (index < 1 || index > m_CurParam)
+		return static_cast<msgtype>(0);
+
+	return m_Params[index]->type;
+}
+
+float Message::GetParamFloat(size_t index)
+{
+	if (index < 1 || index > m_CurParam)
+		return 0;
+
+	return m_Params[index]->v.fData;
+}
+
+const char *Message::GetParamString(size_t index)
+{
+	if (index < 1 || index > m_CurParam)
+		return 0;
+
+	return m_Params[index]->szData.c_str();
+}
+
+int Message::GetParamInt(size_t index)
+{
+	if (index < 1 || index > m_CurParam)
+		return 0;
+
+	return m_Params[index]->v.iData;
+}
+
+void Message::SetParam(size_t index, float data)
+{
+	if (index < 1 || index > m_CurParam)
+		return;
+
+	m_Params[index]->v.fData = data;
+}
+
+void Message::SetParam(size_t index, int data)
+{
+	if (index < 1 || index > m_CurParam)
+		return;
+
+	m_Params[index]->v.iData = data;
+}
+
+void Message::SetParam(size_t index, const char *data)
+{
+	if (index < 1 || index > m_CurParam)
+		return;
+
+	m_Params[index]->szData.assign(data);
+}
+
+void Message::Reset()
+{
+	m_CurParam = 0;
+}
+
+size_t Message::Params()
+{
+	return m_CurParam;
+}
+
+void Message::Send()
+{
+	msgparam *pParam = NULL;
+
+	for (size_t i=1; i<=m_CurParam; i++)
+	{
+		pParam = m_Params[i];
+		switch (pParam->type)
+		{
+		case arg_byte:
+			WRITE_BYTE(pParam->v.iData);
+			break;
+		case arg_char:
+			WRITE_CHAR(pParam->v.iData);
+			break;
+		case arg_short:
+			WRITE_SHORT(pParam->v.iData);
+			break;
+		case arg_long:
+			WRITE_LONG(pParam->v.iData);
+			break;
+		case arg_angle:
+			WRITE_ANGLE(pParam->v.fData);
+			break;
+		case arg_coord:
+			WRITE_COORD(pParam->v.fData);
+			break;
+		case arg_string:
+			WRITE_STRING(pParam->szData.c_str());
+			break;
+		case arg_entity:
+			WRITE_ENTITY(pParam->v.iData);
+			break;
+		}
+	}
+}
+
+void C_MessageBegin(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed)
+{
+	if (msgBlocks[msg_type])
+	{
+		inblock = true;
+		msgType = msg_type;
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (msgHooks[msg_type].size()) {
+		inhook = true;
+		msgDest = msg_dest;
+		msgType = msg_type;
+		msgOrigin = (float *)pOrigin;
+		msgpEntity = ed;
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteByte(int iValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(iValue, arg_byte);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteChar(int iValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(iValue, arg_char);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteShort(int iValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(iValue, arg_short);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteLong(int iValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(iValue, arg_long);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteAngle(float flValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(flValue, arg_angle);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteCoord(float flValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(flValue, arg_coord);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteString(const char *sz)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(sz, arg_string);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_WriteEntity(int iValue)
+{
+	if (inblock)
+	{
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		Msg.AddParam(iValue, arg_entity);
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+void C_MessageEnd(void)
+{
+	int mres = 0, mresB = 0;
+	unsigned int i = 0;
+	if (inblock)
+	{
+		inblock = false;
+		if (msgBlocks[msgType] == BLOCK_ONCE)
+		{
+			msgBlocks[msgType] = BLOCK_NOT;
+		}
+		RETURN_META(MRES_SUPERCEDE);
+	} else if (inhook) {
+		for (i=0; i<msgHooks[msgType].size(); i++)
+		{
+				mresB = executeForwards(msgHooks[msgType].at(i), (cell)msgType, (cell)msgDest, (cell)ENTINDEX(msgpEntity));
+				if (mresB > mres)
+						mres = mresB;
+		}
+		inhook = false;
+		if (mres & 1)
+		{
+			Msg.Reset();
+			RETURN_META(MRES_SUPERCEDE);
+		}
+
+		/* send the real message */
+		MESSAGE_BEGIN(msgDest, msgType, msgOrigin, msgpEntity);
+		Msg.Send();
+		MESSAGE_END();
+
+		/* reset */
+		Msg.Reset();
+
+		RETURN_META(MRES_SUPERCEDE);
+	}
+
+	RETURN_META(MRES_IGNORED);
+}
+
+static cell AMX_NATIVE_CALL message_begin(AMX *amx, cell *params) /* 4 param */
+{
+	int numparam = *params / sizeof(cell);
+	float vecOrigin[3];
+	cell *cpOrigin;
+
+	if (params[2] < 1 || ((params[2] > 63)		// maximal number of engine messages
+		&& !GET_USER_MSG_NAME(PLID, params[2], NULL)))
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Plugin called message_begin with an invalid message id (%d).", params[2]);
+		return 0;
+	}
+
+	switch (params[1])
+	{
+	case MSG_BROADCAST:
+	case MSG_ALL:
+	case MSG_SPEC:
+		MESSAGE_BEGIN(params[1], params[2], NULL);
+		break;
+	case MSG_PVS: case MSG_PAS:
+	case MSG_PVS_R: case MSG_PAS_R:
+		if (numparam < 3)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Invalid number of parameters passed");
+			return 0;
+		}
+
+		cpOrigin = get_amxaddr(amx, params[3]);
+
+		vecOrigin[0] = static_cast<float>(*cpOrigin);
+		vecOrigin[1] = static_cast<float>(*(cpOrigin + 1));
+		vecOrigin[2] = static_cast<float>(*(cpOrigin + 2));
+
+		MESSAGE_BEGIN(params[1], params[2], vecOrigin);
+
+		break;
+	case MSG_ONE_UNRELIABLE:
+	case MSG_ONE:
+		if (numparam < 4)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Invalid number of parameters passed");
+			return 0;
+		}
+
+		MESSAGE_BEGIN(params[1], params[2], NULL, INDEXENT(params[4]));
+		break;
+	}
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL message_end(AMX *amx, cell *params)
+{
+	MESSAGE_END();
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_byte(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_BYTE(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_char(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_CHAR(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_short(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_SHORT(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_long(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_LONG(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_entity(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_ENTITY(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_angle(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_ANGLE(static_cast<float>(params[1]));
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_coord(AMX *amx, cell *params) /* 1 param */
+{
+	WRITE_COORD(static_cast<float>(params[1]));
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL write_string(AMX *amx, cell *params) /* 1 param */
+{
+	int a;
+	WRITE_STRING(get_amxstring(amx, params[1], 3, a));
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL register_message(AMX *amx, cell *params)
+{
+	int len;
+	char *name = get_amxstring(amx, params[2], 0, len);
+
+	if (!Msg.Ready())
+		Msg.Init();
+
+	if (params[1]>0 && params[1] < 256)
+	{
+		int id = registerSPForwardByName(amx, name, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+		if (id != -1)
+		{
+			msgHooks[params[1]].push_back(id);
+			return id;
+		} else {
+			LogError(amx, AMX_ERR_NOTFOUND, "Could not find function \"%s\"", name);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static cell AMX_NATIVE_CALL set_msg_block(AMX *amx, cell *params)
+{
+	int msgid = params[1];
+	int block = params[2];
+
+	if (msgid < 1 || msgid > 255)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message id");
+		return 0;
+	}
+
+	msgBlocks[msgid] = block;
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL get_msg_block(AMX *amx, cell *params)
+{
+	int msgid = params[1];
+
+	if (msgid < 1 || msgid > 255)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message id");
+		return 0;
+	}
+
+	return msgBlocks[msgid];
+}
+
+static cell AMX_NATIVE_CALL get_msg_args(AMX *amx, cell *params)
+{
+	return Msg.Params();
+}
+
+static cell AMX_NATIVE_CALL get_msg_argtype(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	return Msg.GetParamType(argn);
+}
+
+static cell AMX_NATIVE_CALL get_msg_arg_int(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	return Msg.GetParamInt(argn);
+}
+
+static cell AMX_NATIVE_CALL set_msg_arg_int(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	Msg.SetParam(argn, (int)params[3]);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL get_msg_arg_float(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	REAL f = (REAL)Msg.GetParamFloat(argn);
+	return amx_ftoc(f);
+}
+
+static cell AMX_NATIVE_CALL set_msg_arg_float(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	REAL fVal = amx_ctof(params[3]);
+
+	Msg.SetParam(argn, (float)fVal);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL get_msg_arg_string(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	const char *szVal = Msg.GetParamString(argn);
+
+	return set_amxstring(amx, params[2], szVal, params[3]);
+}
+
+static cell AMX_NATIVE_CALL set_msg_arg_string(AMX *amx, cell *params)
+{
+	size_t argn = static_cast<size_t>(params[1]);
+	int iLen;
+
+	if (!inhook || argn > Msg.Params())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid message argument %d", argn);
+		return 0;
+	}
+
+	char *szVal = get_amxstring(amx, params[2], 0, iLen);
+
+	Msg.SetParam(argn, szVal);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL get_msg_origin(AMX *amx, cell *params)
+{
+	if (!inhook)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Not in a message hook");
+		return 0;
+	}
+
+	cell *cAddr = get_amxaddr(amx, params[1]);
+
+	if (msgDest >= MSG_PVS && msgDest <= MSG_PAS_R)
+	{
+		vec3_t vRet = (Vector)msgOrigin;
+		cAddr[0] = FloatToCell(vRet.x);
+		cAddr[1] = FloatToCell(vRet.y);
+		cAddr[2] = FloatToCell(vRet.z);
+	} else {
+		cAddr[0] = 0;
+		cAddr[1] = 0;
+		cAddr[2] = 0;
+	}
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL emessage_begin(AMX *amx, cell *params) /* 4 param */
+{
+	int numparam = *params / sizeof(cell);
+	float vecOrigin[3];
+	cell *cpOrigin;
+
+	if (params[2] < 1 || ((params[2] > 63)		// maximal number of engine messages
+		&& !GET_USER_MSG_NAME(PLID, params[2], NULL)))
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Plugin called message_begin with an invalid message id (%d).", params[2]);
+		return 0;
+	}
+
+	switch (params[1])
+	{
+	case MSG_BROADCAST:
+	case MSG_ALL:
+	case MSG_SPEC:
+		g_pEngTable->pfnMessageBegin(params[1], params[2], NULL, NULL);
+		break;
+	case MSG_PVS: case MSG_PAS:
+	case MSG_PVS_R: case MSG_PAS_R:
+		if (numparam < 3)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Invalid number of parameters passed");
+			return 0;
+		}
+
+		cpOrigin = get_amxaddr(amx, params[3]);
+
+		vecOrigin[0] = static_cast<float>(*cpOrigin);
+		vecOrigin[1] = static_cast<float>(*(cpOrigin + 1));
+		vecOrigin[2] = static_cast<float>(*(cpOrigin + 2));
+
+		g_pEngTable->pfnMessageBegin(params[1], params[2], vecOrigin, NULL);
+
+		break;
+	case MSG_ONE_UNRELIABLE:
+	case MSG_ONE:
+		if (numparam < 4)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Invalid number of parameters passed");
+			return 0;
+		}
+
+		g_pEngTable->pfnMessageBegin(params[1], params[2], NULL, INDEXENT(params[4]));
+		break;
+	}
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL emessage_end(AMX *amx, cell *params)
+{
+	g_pEngTable->pfnMessageEnd();
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_byte(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteByte(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_char(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteChar(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_short(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteShort(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_long(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteLong(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_entity(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteEntity(params[1]);
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_angle(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteAngle(static_cast<float>(params[1]));
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_coord(AMX *amx, cell *params) /* 1 param */
+{
+	g_pEngTable->pfnWriteCoord(static_cast<float>(params[1]));
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL ewrite_string(AMX *amx, cell *params) /* 1 param */
+{
+	int a;
+	g_pEngTable->pfnWriteString(get_amxstring(amx, params[1], 3, a));
+
+	return 1;
+}
+
+AMX_NATIVE_INFO msg_Natives[] =
+{
+	{"message_begin",		message_begin},
+	{"message_end",			message_end},
+
+	{"write_angle",			write_angle},
+	{"write_byte",			write_byte},
+	{"write_char",			write_char},
+	{"write_coord",			write_coord},
+	{"write_entity",		write_entity},
+	{"write_long",			write_long},
+	{"write_short",			write_short},
+	{"write_string",		write_string},
+
+	{"register_message",	register_message},
+
+	{"set_msg_block",		set_msg_block},
+	{"get_msg_block",		get_msg_block},
+
+	{"get_msg_args",		get_msg_args},
+	{"get_msg_argtype",		get_msg_argtype},
+	{"get_msg_arg_int",		get_msg_arg_int},
+	{"set_msg_arg_int",		set_msg_arg_int},
+	{"get_msg_arg_float",	get_msg_arg_float},
+	{"set_msg_arg_float",	set_msg_arg_float},
+	{"get_msg_arg_string",	get_msg_arg_string},
+	{"set_msg_arg_string",	set_msg_arg_string},
+	{"get_msg_origin",		get_msg_origin},
+
+	{"emessage_begin",		emessage_begin},
+	{"emessage_end",		emessage_end},
+
+	{"ewrite_angle",		ewrite_angle},
+	{"ewrite_byte",			ewrite_byte},
+	{"ewrite_char",			ewrite_char},
+	{"ewrite_coord",		ewrite_coord},
+	{"ewrite_entity",		ewrite_entity},
+	{"ewrite_long",			ewrite_long},
+	{"ewrite_short",		ewrite_short},
+	{"ewrite_string",		ewrite_string},
+
+	{NULL,					NULL},
+};

amxmodx/messages.h

@@ -1,10 +1,16 @@
 #ifndef _MSGS_INCLUDE_H
 #define _MSGS_INCLUDE_H
 
-#include "engine.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amx.h"
+#include "CVector.h"
+#include "CString.h"
 
 #define MAX_MESSAGES 255
 
+#define MSGBLOCK_SET	0
+#define MSGBLOCK_GET	1
 #define BLOCK_NOT 0
 #define BLOCK_ONCE 1
 #define BLOCK_SET 2
@@ -59,9 +65,21 @@ private:
 	size_t m_CurParam;
 };
 
-extern AMX_NATIVE_INFO msg_Natives[];
+void C_MessageBegin(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
+void C_WriteByte(int iValue);
+void C_WriteChar(int iValue);
+void C_WriteShort(int iValue);
+void C_WriteLong(int iValue);
+void C_WriteAngle(float flValue);
+void C_WriteCoord(float flValue);
+void C_WriteString(const char *sz);
+void C_WriteEntity(int iValue);
+void C_MessageEnd(void);
+
 extern CVector<int> msgHooks[256];
 extern int msgBlocks[256];
 
+void ClearMessages();
+
 #endif //_MSGS_INCLUDE_H
 

amxmodx/mm_pextensions.h

@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2004 Jussi Kivilinna
- *
- *    This file is part of "Metamod All-Mod-Support"-patch for Metamod.
- *
- *    Metamod is free software; you can redistribute it and/or modify it
- *    under the terms of the GNU General Public License as published by the
- *    Free Software Foundation; either version 2 of the License, or (at
- *    your option) any later version.
- *
- *    Metamod is distributed in the hope that it will be useful, but
- *    WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Metamod; if not, write to the Free Software Foundation,
- *    Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *    In addition, as a special exception, the author gives permission to
- *    link the code of this program with the Half-Life Game Engine ("HL
- *    Engine") and Modified Game Libraries ("MODs") developed by Valve,
- *    L.L.C ("Valve").  You must obey the GNU General Public License in all
- *    respects for all of the code used other than the HL Engine and MODs
- *    from Valve.  If you modify this file, you may extend this exception
- *    to your version of the file, but you are not obligated to do so.  If
- *    you do not wish to do so, delete this exception statement from your
- *    version.
- *
- */
-
-#ifndef MM_PEXTENSIONS_H
-#define MM_PEXTENSIONS_H
-
-#include "plinfo.h"		// plid_t
-#include "meta_api.h"		// PLUG_LOADTIME
-/*
-
-	How to use:
-		1. Add new export function 'Meta_PExtGiveFnptrs' to your plugin file.
-		   'Meta_PExtGiveFnptrs' will be called right after 'Meta_Query' call.
-		2. Meta_PExtGiveFnptrs is called with interface version 'META_PEXT_VERSION'
-		   and pointer to extension function table.
-		3. Meta_PExtGiveFnptrs should return plugin's interface version.
-		4. !NOTE! Metamod will not stop loading plugin even if plugin returns 
-		   interface version greater than current. Plugin should disable itself in
-		   this kind of situation.
-	
-	Example:
-		#include "mm_pextensions.h"
-		
-		pextension_funcs_t *gpMetaPExtFuncs;
-		
-		int Meta_PExtGiveFnptrs(int interfaceVersion, pextension_funcs_t *pMetaPExtFuncs) {
-			if(interfaceVersion < META_PEXT_VERSION) {
-				LOG_DEVELOPER(PLID, "Error! Metamod is too old, please update!");
-				gpMetaPExtFuncs = NULL;
-			
-				return(META_PEXT_VERSION);
-			}
-			
-			gpMetaPExtFuncs = pMetaPExtFuncs;
-			
-			return(META_PEXT_VERSION);
-		}
-	
-	Callback functions:
-		- int PEXT_LOAD_PLUGIN_BY_NAME(PLID, const char *cmdline, PLUG_LOADTIME now, void **plugin_handle);
-			Parses 'cmdline' as metamod would parse 'meta load <cmdline>' and loads found 
-			plugin. If 'plugin_handle' is set, metamod writes module handle of loaded 
-			plugin at it.
-			Returns zero on success.
-			For error codes see 'META_ERRNO' in 'types_meta.h'.
-		
-		- int PEXT_UNLOAD_PLUGIN_BY_NAME(PLID, const char *cmdline, PLUG_LOADTIME now, PL_UNLOAD_REASON reason);
-			Parses 'cmdline' as metamod would parse 'meta unload <cmdline>' and 
-			unloads found plugin.
-			Returns zero on success.
-			For error codes see 'META_ERRNO' in 'types_meta.h'.
-		
-		- int PEXT_UNLOAD_PLUGIN_BY_HANDLE(PLID, void *plugin_handle, PLUG_LOADTIME now, PL_UNLOAD_REASON reason);
-			Unloads plugin with 'plugin_handle'.
-			Returns zero on success.
-			For error codes see 'META_ERRNO' in 'types_meta.h'.
-		
-		!NOTE! Plugin cannot unload itself!
-*/
-
-// Interface version
-//  1: first version. Used in p13
-//  2: Complete remake (p14):
-//	pfnLoadMetaPluginByName
-//	pfnUnloadMetaPluginByName
-//	pfnUnloadMetaPluginByHandle
-//  v2 is locked now. Don't modify old functions. If you add new functions, increase META_PEXT_VERSION.
-#define META_PEXT_VERSION 2
-
-// Meta PExtension Function table type.
-typedef struct pextension_funcs_s {
-	int (*pfnLoadMetaPluginByName)(plid_t plid, const char *cmdline, PLUG_LOADTIME now, void **plugin_handle);
-	int (*pfnUnloadMetaPluginByName)(plid_t plid, const char *cmdline, PLUG_LOADTIME now, PL_UNLOAD_REASON reason);
-	int (*pfnUnloadMetaPluginByHandle)(plid_t plid, void *plugin_handle, PLUG_LOADTIME now, PL_UNLOAD_REASON reason);
-} pextension_funcs_t;
-
-// Convenience macros for MetaPExtension functions.
-#define PEXT_LOAD_PLUGIN_BY_NAME	(*gpMetaPExtFuncs->pfnLoadMetaPluginByName)
-#define PEXT_UNLOAD_PLUGIN_BY_NAME	(*gpMetaPExtFuncs->pfnUnloadMetaPluginByName)
-#define PEXT_UNLOAD_PLUGIN_BY_HANDLE	(*gpMetaPExtFuncs->pfnUnloadMetaPluginByHandle)
-
-// Give plugin extension function table.
-C_DLLEXPORT int Meta_PExtGiveFnptrs(int interfaceVersion, 
-		pextension_funcs_t *pMetaPExtFuncs);
-typedef int (*META_GIVE_PEXT_FUNCTIONS_FN) (int interfaceVersion, 
-		pextension_funcs_t *pMetaPExtFuncs);
-
-#endif /* MM_PEXTENSIONS_H */

amxmodx/modules.h

@@ -38,7 +38,7 @@
 #ifndef __linux__
 	#define DLLEXPORT __declspec(dllexport)
 #else
-	#define DLLEXPORT
+	#define DLLEXPORT __attribute__((visibility("default")))
 	#define WINAPI
 #endif
 
@@ -48,7 +48,44 @@
 #define RELOAD_MODULE 0
 #define STATIC_MODULE 1
 
+typedef enum
+{
+	Player_Name,		//String
+	Player_Ip,			//String
+	Player_Team,		//String
+	Player_Ingame,		//bool
+	Player_Authorized,	//bool
+	Player_Vgui,		//bool
+	Player_Time,		//float
+	Player_Playtime,	//float
+	Player_MenuExpire,	//float
+	Player_Weapons,		//struct{int,int}[32]
+	Player_CurrentWeapon,	//int
+	Player_TeamID,			//int
+	Player_Deaths,			//int
+	Player_Aiming,			//int
+	Player_Menu,			//int
+	Player_Keys,			//int
+	Player_Flags,			//int[32]
+	Player_Newmenu,			//int
+	Player_NewmenuPage,		//int
+}  PlayerProp;
+
 int CheckModules(AMX *amx, char error[128]);
+bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify=true, bool noFileBail=false);
 const char *StrCaseStr(const char *as, const char *bs);
 
+class Debugger;
+Debugger *DisableDebugHandler(AMX *amx);
+void EnableDebugHandler(AMX *amx, Debugger *pd);
+
+bool DirExists(const char *dir);
+const char* GetFileName(AMX *amx);
+
+inline cell FloatToCell(float input)
+{
+	REAL output = input;
+	return *(cell *)&output;
+}
+
 #endif // __MODULES_H__

amxmodx/msvc/amxmodx_mm.def

@@ -1,6 +0,0 @@
-LIBRARY amxx_mm
-EXPORTS
-	GiveFnptrsToDll			@1
-	
-SECTIONS
-	.data READ WRITE

amxmodx/msvc/amxmodx_mm.sln

@@ -5,32 +5,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx", "amxmodx_mm.vcpro
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
 		JITDebug = JITDebug
-		JITMemtestRelease = JITMemtestRelease
+		JITDebugBinLog = JITDebugBinLog
 		JITRelease = JITRelease
-		MaximalSpeed = MaximalSpeed
+		JITReleaseBinLog = JITReleaseBinLog
-		MemtestDebug = MemtestDebug
-		MemtestRelease = MemtestRelease
-		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.ActiveCfg = Debug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.Build.0 = Debug|Win32
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.ActiveCfg = JITDebug|Win32
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.Build.0 = JITDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITMemtestRelease.ActiveCfg = JITMemtestRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.ActiveCfg = JITDebugBinLog|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITMemtestRelease.Build.0 = JITMemtestRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.Build.0 = JITDebugBinLog|Win32
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.ActiveCfg = JITRelease|Win32
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.Build.0 = JITRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MaximalSpeed.ActiveCfg = MaximalSpeed|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog.ActiveCfg = JITReleaseBinLog|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MaximalSpeed.Build.0 = MaximalSpeed|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog.Build.0 = JITReleaseBinLog|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestDebug.ActiveCfg = MemtestDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestDebug.Build.0 = MemtestDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestRelease.ActiveCfg = MemtestRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestRelease.Build.0 = MemtestRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release.ActiveCfg = Release|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

amxmodx/msvc/amxmodx_mm.vcproj

@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="amxmodx"
 	ProjectGUID="{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
+	RootNamespace="amxmodx"
 	SccProjectName=""
 	SccLocalPath="">
 	<Platforms>
@@ -11,287 +12,6 @@
 			Name="Win32"/>
 	</Platforms>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\debug/amxmodx.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\JIT\natives-x86.obj ..\zlib\zlib.lib"
-				OutputFile="debug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
-				ImportLibrary=".\debug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\release/amxmodx.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
-				OutputFile="release/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="LIBC"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\release/amxx_mm.pdb"
-				ImportLibrary=".\release/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MemtestDebug|Win32"
-			OutputDirectory="MemtestDebug"
-			IntermediateDirectory="MemtestDebug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\memtestdebug/amxmodx.pch"
-				AssemblerListingLocation=".\memtestdebug/"
-				ObjectFile=".\memtestdebug/"
-				ProgramDataBaseFileName=".\memtestdebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
-				OutputFile="memtestdebug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\memtestdebug/amxx_mm.pdb"
-				ImportLibrary=".\memtestdebug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MemtestRelease|Win32"
-			OutputDirectory="MemtestRelease"
-			IntermediateDirectory="MemtestRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\memtestrelease/amxmodx.pch"
-				AssemblerListingLocation=".\memtestrelease/"
-				ObjectFile=".\memtestrelease/"
-				ProgramDataBaseFileName=".\memtestrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
-				OutputFile="memtestrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="LIBC"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\memtestrelease/amxx_mm.pdb"
-				GenerateMapFile="TRUE"
-				MapExports="TRUE"
-				ImportLibrary=".\memtestrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
 		<Configuration
 			Name="JITDebug|Win32"
 			OutputDirectory="JITDebug"
@@ -303,7 +23,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -326,14 +46,14 @@
 				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
 				OutputFile="jitdebug/amxmodx_mm.dll"
 				Version="0.1"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
+				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
+				ProgramDatabaseFile=".\jitdebug/amxmodx_mm.pdb"
-				ImportLibrary=".\jitdebug/amxx_mm.lib"/>
+				ImportLibrary=".\jitdebug/amxmodx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
@@ -372,10 +92,13 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="2"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
+				OptimizeForProcessor="0"
 				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32"
 				IgnoreStandardIncludePath="FALSE"
@@ -390,6 +113,7 @@
 				ProgramDataBaseFileName=".\jitrelease/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -404,9 +128,9 @@
 				IgnoreDefaultLibraryNames="MSVCRT"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitrelease/amxx_mm.pdb"
+				ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb"
-				GenerateMapFile="FALSE"
+				GenerateMapFile="TRUE"
-				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
+				ImportLibrary=".\jitrelease/amxmodx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -436,31 +160,30 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="JITMemtestRelease|Win32"
+			Name="JITDebugBinLog|Win32"
-			OutputDirectory="JITMemtestRelease"
+			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="JITMemtestRelease"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
+				Optimization="0"
-				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=""
-				FavorSizeOrSpeed="1"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;BINLOG_ENABLED"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				BasicRuntimeChecks="3"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST;JIT;ASM32;PAWN_CELL_SIZE=32"
+				RuntimeLibrary="5"
-				StringPooling="TRUE"
+				StructMemberAlignment="3"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitmemtestrelease/amxmodx.pch"
+				PrecompiledHeaderFile=".\jitdebugbinlog/amxmodx.pch"
-				AssemblerListingLocation=".\jitmemtestrelease/"
+				AssemblerListingLocation=".\jitdebugbinlog/"
-				ObjectFile=".\jitmemtestrelease/"
+				ObjectFile=".\jitdebugbinlog/"
-				ProgramDataBaseFileName=".\jitmemtestrelease/"
+				ProgramDataBaseFileName=".\jitdebugbinlog/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -468,22 +191,23 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="jitmemtestrelease/amxmodx_mm.dll"
+				OutputFile="jitdebugbinlog/amxmodx_bl_mm.dll"
-				LinkIncremental="1"
+				Version="0.1"
+				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
+				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitmemtestrelease/amxx_mm.pdb"
+				ProgramDatabaseFile=".\jitdebugbinlog/amxmodx_bl_mm.pdb"
-				ImportLibrary=".\jitmemtestrelease/amxx_mm.lib"/>
+				ImportLibrary=".\jitdebugbinlog/amxmodx_bl_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="TRUE"
 				SuppressStartupBanner="TRUE"
 				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
+				TypeLibraryName=".\debug/amxmodx.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@@ -492,7 +216,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
@@ -506,48 +230,54 @@
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
 		<Configuration
-			Name="MaximalSpeed|Win32"
+			Name="JITReleaseBinLog|Win32"
-			OutputDirectory="MaximalSpeed"
+			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="MaximalSpeed"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="2"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
-				OptimizeForProcessor="2"
+				OmitFramePointers="TRUE"
-				OptimizeForWindowsApplication="TRUE"
+				OptimizeForProcessor="0"
 				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;BINLOG_ENABLED"
+				IgnoreStandardIncludePath="FALSE"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
 				EnableFunctionLevelLinking="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\MaximalSpeed/amxmodx.pch"
+				PrecompiledHeaderFile=".\jitreleasebinlog/amxmodx.pch"
-				AssemblerListingLocation=".\MaximalSpeed/"
+				AssemblerListingLocation=".\jitreleasebinlog/"
-				ObjectFile=".\MaximalSpeed/"
+				ObjectFile=".\jitreleasebinlog/"
-				ProgramDataBaseFileName=".\MaximalSpeed/"
+				ProgramDataBaseFileName=".\jitreleasebinlog/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="MaximalSpeed/amxmodx_mm.dll"
+				OutputFile="jitreleasebinlog/amxmodx_bl_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT"
 				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\MaximalSpeede/amxx_mm.pdb"
+				GenerateDebugInformation="TRUE"
-				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
+				ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_bl_mm.pdb"
+				GenerateMapFile="TRUE"
+				ImportLibrary=".\jitreleasebinlog/amxmodx_bl_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
@@ -592,6 +322,9 @@
 			<File
 				RelativePath="..\amxdbg.cpp">
 			</File>
+			<File
+				RelativePath="..\amxmod_compat.cpp">
+			</File>
 			<File
 				RelativePath="..\amxmodx.cpp">
 			</File>
@@ -604,6 +337,21 @@
 			<File
 				RelativePath="..\amxxlog.cpp">
 			</File>
+			<File
+				RelativePath="..\binlog.cpp">
+				<FileConfiguration
+					Name="JITDebug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\CCmd.cpp">
 			</File>
@@ -648,12 +396,6 @@
 			</File>
 			<File
 				RelativePath="..\fakemeta.cpp">
-				<FileConfiguration
-					Name="MemtestDebug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						GeneratePreprocessedFile="0"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\file.cpp">
@@ -661,9 +403,30 @@
 			<File
 				RelativePath="..\float.cpp">
 			</File>
+			<File
+				RelativePath="..\format.cpp">
+				<FileConfiguration
+					Name="JITRelease|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="4"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITReleaseBinLog|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="4"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\libraries.cpp">
+			</File>
 			<File
 				RelativePath="..\md5.cpp">
 			</File>
+			<File
+				RelativePath="..\messages.cpp">
+			</File>
 			<File
 				RelativePath="..\meta_api.cpp">
 			</File>
@@ -676,14 +439,32 @@
 			<File
 				RelativePath="..\newmenus.cpp">
 			</File>
+			<File
+				RelativePath="..\optimizer.cpp">
+			</File>
 			<File
 				RelativePath="..\power.cpp">
 			</File>
+			<File
+				RelativePath="..\sorting.cpp">
+			</File>
 			<File
 				RelativePath="..\srvcmd.cpp">
 			</File>
 			<File
 				RelativePath="..\string.cpp">
+				<FileConfiguration
+					Name="JITRelease|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="2"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITReleaseBinLog|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="2"/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\strptime.cpp">
@@ -694,44 +475,10 @@
 			<File
 				RelativePath="..\vault.cpp">
 			</File>
-			<Filter
-				Name="mmgr"
-				Filter="">
 			<File
-					RelativePath="..\mmgr\mmgr.cpp">
+				RelativePath="..\vector.cpp">
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITDebug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITRelease|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MaximalSpeed|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
 			</File>
 		</Filter>
-		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
@@ -741,6 +488,9 @@
 			<File
 				RelativePath="..\amxdbg.h">
 			</File>
+			<File
+				RelativePath="..\amxmod_compat.h">
+			</File>
 			<File
 				RelativePath="..\amxmodx.h">
 			</File>
@@ -750,6 +500,9 @@
 			<File
 				RelativePath="..\amxxlog.h">
 			</File>
+			<File
+				RelativePath="..\binlog.h">
+			</File>
 			<File
 				RelativePath="..\CCmd.h">
 			</File>
@@ -786,9 +539,6 @@
 			<File
 				RelativePath="..\CQueue.h">
 			</File>
-			<File
-				RelativePath="..\CStack.h">
-			</File>
 			<File
 				RelativePath="..\CString.h">
 			</File>
@@ -807,12 +557,21 @@
 			<File
 				RelativePath="..\fakemeta.h">
 			</File>
+			<File
+				RelativePath="..\format.h">
+			</File>
+			<File
+				RelativePath="..\libraries.h">
+			</File>
 			<File
 				RelativePath="..\md5.h">
 			</File>
 			<File
 				RelativePath="..\menus.h">
 			</File>
+			<File
+				RelativePath="..\messages.h">
+			</File>
 			<File
 				RelativePath="..\modules.h">
 			</File>
@@ -822,25 +581,27 @@
 			<File
 				RelativePath="..\newmenus.h">
 			</File>
+			<File
+				RelativePath="..\optimizer.h">
+			</File>
 			<File
 				RelativePath="..\resource.h">
 			</File>
+			<File
+				RelativePath="..\sh_list.h">
+			</File>
+			<File
+				RelativePath="..\sh_stack.h">
+			</File>
+			<File
+				RelativePath="..\sh_tinyhash.h">
+			</File>
 			<File
 				RelativePath="..\zlib\zconf.h">
 			</File>
 			<File
 				RelativePath="..\zlib\zlib.h">
 			</File>
-			<Filter
-				Name="mmgr"
-				Filter="">
-				<File
-					RelativePath="..\mmgr\mmgr.h">
-				</File>
-				<File
-					RelativePath="..\mmgr\nommgr.h">
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -861,12 +622,59 @@
 			<File
 				RelativePath="..\amxjitsn.asm">
 			</File>
+			<File
+				RelativePath="..\helpers-x86.asm">
+			</File>
 			<File
 				RelativePath="..\natives-amd64.asm">
 			</File>
 			<File
 				RelativePath="..\natives-x86.asm">
 			</File>
+			<Filter
+				Name="Builds"
+				Filter="">
+				<File
+					RelativePath="..\Jit\helpers-x86.obj">
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="SDK"
+			Filter="">
+			<File
+				RelativePath="..\sdk\amxxmodule.cpp">
+				<FileConfiguration
+					Name="JITDebug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITDebugBinLog|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITReleaseBinLog|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\sdk\amxxmodule.h">
+			</File>
+			<File
+				RelativePath="..\sdk\moduleconfig.h">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

amxmodx/msvc8/amxmodx_mm.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		JITDebug|Win32 = JITDebug|Win32
+		JITDebugBinLog|Win32 = JITDebugBinLog|Win32
+		JITRelease|Win32 = JITRelease|Win32
+		JITReleaseBinLog|Win32 = JITReleaseBinLog|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug|Win32.ActiveCfg = JITDebug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug|Win32.Build.0 = JITDebug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.ActiveCfg = JITDebugBinLog|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog|Win32.Build.0 = JITDebugBinLog|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease|Win32.ActiveCfg = JITRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease|Win32.Build.0 = JITRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.ActiveCfg = JITReleaseBinLog|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog|Win32.Build.0 = JITReleaseBinLog|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

amxmodx/msvc8/amxmodx_mm.vcproj

@@ -0,0 +1,926 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="amxmodx_mm"
+	ProjectGUID="{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
+	RootNamespace="amxmodx"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="JITDebug|Win32"
+			OutputDirectory="JITDebug"
+			IntermediateDirectory="JITDebug"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\debug/amxmodx.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				StructMemberAlignment="3"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\jitdebug/amxmodx.pch"
+				AssemblerListingLocation=".\jitdebug/"
+				ObjectFile=".\jitdebug/"
+				ProgramDataBaseFileName=".\jitdebug/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
+				OutputFile="jitdebug/amxmodx_mm.dll"
+				Version="0.1"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
+				ImportLibrary=".\jitdebug/amxmodx_mm.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="JITRelease|Win32"
+			OutputDirectory="JITRelease"
+			IntermediateDirectory="JITRelease"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;_CRT_SECURE_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\jitrelease/amxmodx.pch"
+				AssemblerListingLocation=".\jitrelease/"
+				ObjectFile=".\jitrelease/"
+				ProgramDataBaseFileName=".\jitrelease/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				ShowIncludes="false"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
+				OutputFile="jitrelease/amxmodx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb"
+				GenerateMapFile="true"
+				ImportLibrary=".\jitrelease/amxmodx_mm.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="JITDebugBinLog|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\debug/amxmodx.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				StructMemberAlignment="3"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\jitdebugbinlog/amxmodx.pch"
+				AssemblerListingLocation=".\jitdebugbinlog/"
+				ObjectFile=".\jitdebugbinlog/"
+				ProgramDataBaseFileName=".\jitdebugbinlog/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
+				OutputFile="jitdebugbinlog/amxmodx_bl_mm.dll"
+				Version="0.1"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\jitdebugbinlog/amxmodx_bl_mm.pdb"
+				ImportLibrary=".\jitdebugbinlog/amxmodx_bl_mm.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="JITReleaseBinLog|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE"
+				IgnoreStandardIncludePath="false"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\jitreleasebinlog/amxmodx.pch"
+				AssemblerListingLocation=".\jitreleasebinlog/"
+				ObjectFile=".\jitreleasebinlog/"
+				ProgramDataBaseFileName=".\jitreleasebinlog/"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
+				OutputFile="jitreleasebinlog/amxmodx_bl_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_bl_mm.pdb"
+				GenerateMapFile="true"
+				ImportLibrary=".\jitreleasebinlog/amxmodx_bl_mm.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\amx.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxcore.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxdbg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxmod_compat.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxmodx.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxtime.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxxfile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\amxxlog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\binlog.cpp"
+				>
+				<FileConfiguration
+					Name="JITDebug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\CCmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CEvent.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CForward.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CLang.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CLogEvent.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CMenu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CMisc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CModule.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CPlugin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CTask.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\CVault.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\debugger.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\emsg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\fakemeta.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\file.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\float.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\format.cpp"
+				>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="4"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITReleaseBinLog|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\libraries.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\md5.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\messages.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\meta_api.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\modules.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\natives.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\newmenus.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\optimizer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\power.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\sorting.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\srvcmd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\string.cpp"
+				>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="2"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITReleaseBinLog|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="2"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\strptime.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\util.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\vault.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\vector.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\amx.h"
+				>
+			</File>
+			<File
+				RelativePath="..\amxdbg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\amxmod_compat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\amxmodx.h"
+				>
+			</File>
+			<File
+				RelativePath="..\amxxfile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\amxxlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\binlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CCmd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CForward.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CLang.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CLogEvent.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CMenu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CMisc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CModule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CQueue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CTask.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CVault.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\debugger.h"
+				>
+			</File>
+			<File
+				RelativePath="..\fakemeta.h"
+				>
+			</File>
+			<File
+				RelativePath="..\format.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libraries.h"
+				>
+			</File>
+			<File
+				RelativePath="..\md5.h"
+				>
+			</File>
+			<File
+				RelativePath="..\menus.h"
+				>
+			</File>
+			<File
+				RelativePath="..\messages.h"
+				>
+			</File>
+			<File
+				RelativePath="..\modules.h"
+				>
+			</File>
+			<File
+				RelativePath="..\natives.h"
+				>
+			</File>
+			<File
+				RelativePath="..\newmenus.h"
+				>
+			</File>
+			<File
+				RelativePath="..\optimizer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\resource.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sh_list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sh_stack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sh_tinyhash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\zlib\zconf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\zlib\zlib.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Assembly"
+			>
+			<File
+				RelativePath="..\amxdefn.asm"
+				>
+			</File>
+			<File
+				RelativePath="..\amxexecn.asm"
+				>
+			</File>
+			<File
+				RelativePath="..\amxjitsn.asm"
+				>
+			</File>
+			<File
+				RelativePath="..\helpers-x86.asm"
+				>
+			</File>
+			<File
+				RelativePath="..\natives-amd64.asm"
+				>
+			</File>
+			<File
+				RelativePath="..\natives-x86.asm"
+				>
+			</File>
+			<Filter
+				Name="Builds"
+				>
+				<File
+					RelativePath="..\Jit\helpers-x86.obj"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="SDK"
+			>
+			<File
+				RelativePath="..\sdk\amxxmodule.cpp"
+				>
+				<FileConfiguration
+					Name="JITDebug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITDebugBinLog|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITReleaseBinLog|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\sdk\amxxmodule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sdk\moduleconfig.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

amxmodx/natives.cpp

@@ -29,8 +29,11 @@
 */
 
 #include "amxmodx.h"
-#include "CStack.h"
+#include "sh_stack.h"
 #include "natives.h"
+#include "debugger.h"
+#include "libraries.h"
+#include "format.h"
 
 #ifdef __linux__
 #include <malloc.h>
@@ -43,11 +46,10 @@
 //With the exception for param_convert, which was written by
 // Julien "dJeyL" Laurent
 
+CStack<int> g_ErrorStk;
 CVector<regnative *> g_RegNatives;
 CStack<regnative *> g_NativeStack;
-CVector<String> g_Libraries;
 static char g_errorStr[512] = {0};
-static int g_errorNum = 0;
 bool g_Initialized = false;
 
 int amxx_DynaCallback(int idx, AMX *amx, cell *params)
@@ -67,39 +69,68 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 		return 0;
 	}
 
-	//parameter stack
-	pNative->caller = amx;
-
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
+	CPluginMngr::CPlugin *pNativePlugin = g_plugins.findPluginFast(pNative->amx);
+
+	if (!pNativePlugin->isExecutable(pNative->func))
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Called dynanative into a paused plugin.");
+		pPlugin->setStatus(ps_paused);
+		return 0;
+	}
+
+	if (pNative->caller)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Bug caught! Please contact the AMX Mod X Dev Team.");
+		return 0;
+	}
+
+	//parameter stack
+	//NOTE: it is possible that recursive register native calling
+	// could potentially be somehow damaged here.
+	//so, a :TODO: - make the stack unique, rather than a known ptr
+	pNative->caller = amx;
 
 	int err = 0;
 	cell ret = 0;
-	g_errorNum = 0;
+	g_ErrorStk.push(0);
 	g_NativeStack.push(pNative);
 	if (pNative->style == 0)
 	{
 		amx_Push(pNative->amx, numParams);
 		amx_Push(pNative->amx, pPlugin->getId());
-		for (int i=numParams; i>=1; i--)
+		for (int i=numParams; i>=0; i--)
 			pNative->params[i] = params[i];
 	} else if (pNative->style == 1) {
 		//use dJeyL's system .. very clever!
 		for (int i=numParams; i>=1; i--)
 			amx_Push(pNative->amx, params[i]);
 	}
-	if ( (err=amx_Exec(pNative->amx, &ret, pNative->func)) != AMX_ERR_NONE)
+	Debugger *pDebugger = (Debugger *)pNative->amx->userdata[UD_DEBUGGER];
+	if (pDebugger)
+		pDebugger->BeginExec();
+	err=amx_Exec(pNative->amx, &ret, pNative->func);
+	if (err != AMX_ERR_NONE)
 	{
-		g_NativeStack.pop();
+		if (pDebugger && pDebugger->ErrorExists())
-		LogError(pNative->amx, err, "");
-		return 0;
-	}
-	if (g_errorNum)
 		{
-		g_NativeStack.pop();
+			//don't care
-		LogError(amx, g_errorNum, g_errorStr);
+		} else if (err != -1) {
-		return ret;
+			//nothing logged the error
+			LogError(pNative->amx, err, NULL);
 		}
+		pNative->amx->error = AMX_ERR_NONE;
+		//furthermore, log an error in the parent plugin.
+		LogError(amx, AMX_ERR_NATIVE, "Unhandled dynamic native error");
+	} else if (g_ErrorStk.front()) {
+		LogError(amx, g_ErrorStk.front(), g_errorStr);
+	}
+	if (pDebugger)
+		pDebugger->EndExec();
 	g_NativeStack.pop();
+	g_ErrorStk.pop();
+
+	pNative->caller = NULL;
 
 	return ret;
 }
@@ -133,7 +164,8 @@ static cell AMX_NATIVE_CALL log_error(AMX *amx, cell *params)
 	char *err = format_amxstring(amx, params, 2, len);
 
 	_snprintf(g_errorStr, sizeof(g_errorStr), "%s", err);
-	g_errorNum = params[1];
+	g_ErrorStk.pop();
+	g_ErrorStk.push(params[1]);
 
 	return 1;
 }
@@ -146,7 +178,7 @@ static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -167,7 +199,7 @@ static cell AMX_NATIVE_CALL set_string(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -190,7 +222,7 @@ static cell AMX_NATIVE_CALL get_param(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -209,7 +241,7 @@ static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -230,7 +262,7 @@ static cell AMX_NATIVE_CALL set_param_byref(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -253,7 +285,7 @@ static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -279,7 +311,7 @@ static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -297,6 +329,70 @@ static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
 	return 1;
 }
 
+static cell AMX_NATIVE_CALL vdformat(AMX *amx, cell *params)
+{
+	if (!g_NativeStack.size())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
+		return 0;
+	}
+
+	regnative *pNative = g_NativeStack.front();
+
+	if (pNative->style)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
+		return 0;
+	}
+
+	int vargPos = static_cast<int>(params[4]);
+	int fargPos = static_cast<int>(params[3]);
+
+	/** get the parent parameter array */
+	cell *local_params = pNative->params;
+
+	cell max = local_params[0] / sizeof(cell);
+	if (vargPos > (int)max + 1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid vararg parameter passed: %d", vargPos);
+		return 0;
+	}
+	if (fargPos > (int)max + 1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid fmtarg parameter passed: %d", fargPos);
+		return 0;
+	}
+
+	/* get destination info */
+	cell *fmt;
+	if (fargPos == 0)
+	{
+		if (params[0] / sizeof(cell) != 5)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Expected fmtarg as fifth parameter, found none");
+			return 0;
+		}
+		fmt = get_amxaddr(amx, params[5]);
+	} else {
+		fmt = get_amxaddr(pNative->caller, pNative->params[fargPos]);
+	}
+	cell *realdest = get_amxaddr(amx, params[1]);
+	size_t maxlen = static_cast<size_t>(params[2]);
+	cell *dest = realdest;
+
+	/* if this is necessary... */
+	static cell cpbuf[4096];
+	dest = cpbuf;
+
+	/* perform format */
+	size_t total = atcprintf(dest, maxlen, fmt, pNative->caller, local_params, &vargPos);
+
+	/* copy back */
+	memcpy(realdest, dest, (total+1) * sizeof(cell));
+
+	return total;
+}
+
 //This is basically right from dJeyL's lib_convert function
 //This awesome hack modifies the stack frame to have an address offset
 // that will align to the other plugin's memory.
@@ -308,7 +404,7 @@ static cell AMX_NATIVE_CALL param_convert(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.top();
+	regnative *pNative = g_NativeStack.front();
 	if (pNative->style != 1)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -331,7 +427,7 @@ static cell AMX_NATIVE_CALL register_library(AMX *amx, cell *params)
 	int len;
 	char *lib = get_amxstring(amx, params[1], 0, len);
 
-	AddPluginLibrary(lib);
+	AddLibrary(lib, LibType_Library, LibSource_Plugin, g_plugins.findPluginFast(amx));
 
 	return 1;
 }
@@ -358,6 +454,7 @@ static cell AMX_NATIVE_CALL register_native(AMX *amx, cell *params)
 	regnative *pNative = new regnative;
 	pNative->amx = amx;
 	pNative->func = idx;
+	pNative->caller = NULL;
 	
 	//we'll apply a safety buffer too
 	//make our function
@@ -384,27 +481,9 @@ static cell AMX_NATIVE_CALL register_native(AMX *amx, cell *params)
 	return 1;
 }
 
-bool LibraryExists(const char *name)
-{
-	for (size_t i=0; i<g_Libraries.size(); i++)
-	{
-		if (stricmp(g_Libraries[i].c_str(), name)==0)
-			return true;
-	}
-
-	return false;
-}
-
-void AddPluginLibrary(const char *name)
-{
-	String f(name);
-	g_Libraries.push_back(f);
-}
-
 void ClearPluginLibraries()
 {
-	g_Libraries.clear();
+	ClearLibraries(LibSource_Plugin);
-
 	for (size_t i=0; i<g_RegNatives.size(); i++)
 	{
 		delete [] g_RegNatives[i]->pfn;
@@ -430,6 +509,7 @@ AMX_NATIVE_INFO g_NativeNatives[] = {
 	{"set_float_byref", set_param_byref},
 	{"get_array_f",		get_array},
 	{"set_array_f",		set_array},
+	{"vdformat",		vdformat},
 	{"param_convert",	param_convert},
 	//////////////////////////
 	{NULL,				NULL},

amxmodx/natives.h

@@ -32,7 +32,9 @@
 #define _INCLUDE_NATIVES_H
 
 //only 16 for now sorry
+#if !defined CALLFUNC_MAXPARAMS
 #define CALLFUNC_MAXPARAMS 16
+#endif
 
 #define CALLFUNC_FLAG_BYREF			1
 #define CALLFUNC_FLAG_BYREF_REUSED	2
@@ -59,9 +61,7 @@ extern "C" int amxx_DynaFunc(AMX *amx, cell *params);
 extern "C" int amxx_DynaCodesize();
 
 AMX_NATIVE_INFO *BuildNativeTable();
-void AddPluginLibrary(const char *name);
 void ClearPluginLibraries();
-bool LibraryExists(const char *name);
 
 //I couldn't resist :)
 extern AMX_NATIVE_INFO g_NativeNatives[];

amxmodx/newmenus.cpp

@@ -32,13 +32,52 @@
 #include "newmenus.h"
 
 CVector<Menu *> g_NewMenus;
+CStack<int> g_MenuFreeStack;
 
 void ClearMenus()
 {
 	for (size_t i = 0; i < g_NewMenus.size(); i++)
+	{
 		delete g_NewMenus[i];
+	}
 	
 	g_NewMenus.clear();
+	while (!g_MenuFreeStack.empty())
+	{
+		g_MenuFreeStack.pop();
+	}
+}
+
+void validate_menu_text(char *str)
+{
+	if (!g_coloredmenus)
+	{
+		size_t offs = 0;
+		while (*str)
+		{
+			if (*str == '\\')
+			{
+				str++;
+				char c = tolower(*str);
+				if (c == 'r' || c == 'w'
+					|| c== 'w' || c == 'd')
+				{
+					str++;
+					offs += 2;
+					continue;
+				}
+			}
+			if (offs)
+			{
+				*(str-offs) = *str;
+			}
+			str++;
+		}
+		if (offs)
+		{
+			*(str-offs) = '\0';
+		}
+	}
 }
 
 Menu::Menu(const char *title, int mid, int tid)
@@ -46,12 +85,33 @@ Menu::Menu(const char *title, int mid, int tid)
 	m_Title.assign(title);
 	menuId = mid;
 	thisId = tid;
+
+	m_OptNames[abs(MENU_BACK)].assign("Back");
+	m_OptNames[abs(MENU_MORE)].assign("More");
+	m_OptNames[abs(MENU_EXIT)].assign("Exit");
+
+	m_OptOrders[0] = MENU_BACK;
+	m_OptOrders[1] = MENU_MORE;
+	m_OptOrders[2] = MENU_EXIT;
+
+	m_AlwaysExit = false;
+	m_NeverExit = false;
+	m_AutoColors = g_coloredmenus;
+
+	items_per_page = 7;
+	func = 0;
+	padding = 0;
+	isDestroying = false;
 }
 
 Menu::~Menu()
 {
 	for (size_t i = 0; i < m_Items.size(); i++)
+	{
 		delete m_Items[i];
+	}
+
+	unregisterSPForward(this->func);
 	
 	m_Items.clear();
 }
@@ -88,69 +148,112 @@ size_t Menu::GetItemCount()
 size_t Menu::GetPageCount()
 {
 	size_t items = GetItemCount();
-	page_t numPages = (items / MENUITEMS) + 1;
+	if (items_per_page == 0)
+	{
+		return 1;
+	}
 
-	if (!items)
+	return ((items/items_per_page) + ((items % items_per_page) ? 1 : 0));
-		return 0;
-
-	if (numPages % MENUITEMS == 0)
-		numPages--;
-
-	return numPages;
 }
 
 int Menu::PagekeyToItem(page_t page, item_t key)
 {
-	page_t pages = GetPageCount();
+	size_t start = page * items_per_page;
-	item_t numItems = GetItemCount();
+	size_t num_pages = GetPageCount();
 
-	if (page >= pages)
+	if (num_pages == 1 || !items_per_page)
+	{
+		if (key > m_Items.size())
 			return MENU_EXIT;
-
+		else
-	item_t start = page * 7;
+			return key-1;
-
+	} else {
+		//first page
 		if (page == 0)
 		{
-		item_t rem = numItems >= 7 ? 7 : numItems;
+			/* The algorithm for spaces here is same as a middle page. */
-		
+			item_t new_key = key;
-		if (key == rem)
+			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
+			{
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j] == 1)
+					{
+						if (!new_key)
+						{
+							break;
+						}
+						new_key--;
+					}
+					if (!new_key)
+					{
+						break;
+					}
+				}
+			}
+			key = new_key;
+			if (key == items_per_page + 1)
 			{
-			if (pages > 1)
 				return MENU_MORE;
-			else
+			} else if (key == items_per_page + 2) {
 				return MENU_EXIT;
+			} else {
+				return (start + key - 1);
 			}
-		else if (key == rem + 1)
+		} else if (page == num_pages - 1) {
+			//last page
+			size_t remaining = m_Items.size() - start;
+			/* We have to add one remaining for each "bumping" space */
+			for (size_t i=m_Items.size() - remaining; i<m_Items.size(); i++)
 			{
-			return MENU_EXIT;
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
-		}
-	}
-	else if (page == pages - 1)
 				{
-		//find number of remaining items
+					if (m_Items[i]->blanks[j] == 1)
-		//for example, 11 items on page 1... means start=7, 11-7=4
-		item_t rem = numItems - start;
-		//however, the last item is actually this -1, so...
-		if (key == rem)
 					{
-			return MENU_EXIT;
+						remaining++;
 					}
-		else if (key == rem + 1)
+				}
+			}
+			if (key == remaining + 1)
 			{
 				return MENU_BACK;
+			} else if (key == remaining + 2) {
+				return MENU_EXIT;
+			} else {
+				return (start + key - 1);
 			}
 		} else {
-		if (key == 7)
+			/* The algorithm for spaces here is a bit harder.  We have to subtract 
+			 * one from the key for each space we find along the way.
+			 */
+			item_t new_key = key;
+			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
 			{
-			return MENU_MORE;
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
-		} 
-		else if (key == 8)
 				{
-			return MENU_BACK;
+					if (m_Items[i]->blanks[j] == 1)
+					{
+						if (!new_key)
+						{
+							break;
+						}
+						new_key--;
+					}
+					if (!new_key)
+					{
+						break;
+					}
+				}
+			}
+			key = new_key;
+			if (key > items_per_page && (key-items_per_page<=3))
+			{
+				return m_OptOrders[key-items_per_page-1];
+			} else {
+				return (start + key - 1);
+			}
 		}
 	}
-
-	return (start + key);
 }
 
 bool Menu::Display(int player, page_t page)
@@ -187,21 +290,51 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	m_Text.clear();
 
 	char buffer[255];
-	if (g_coloredmenus)
+	if (items_per_page && (pages != 1))
+	{
+		if (m_AutoColors)
 			_snprintf(buffer, sizeof(buffer)-1, "\\y%s %d/%d\n\\w\n", m_Title.c_str(), page + 1, pages);
 		else
 			_snprintf(buffer, sizeof(buffer)-1, "%s %d/%d\n\n", m_Title.c_str(), page + 1, pages);
+	} else {
+		if (m_AutoColors)
+			_snprintf(buffer, sizeof(buffer)-1, "\\y%s\n\\w\n", m_Title.c_str());
+		else
+			_snprintf(buffer, sizeof(buffer)-1, "%s\n\n", m_Title.c_str());
+	}
 	
 	m_Text.append(buffer);
 
-	item_t start = page * 7;
+	enum
-	item_t end = 0;
-	if (start + 7 <= numItems)
 	{
-		end = start + 7;
+		Display_Back = (1<<0),
+		Display_Next = (1<<1),
+		Display_Exit = (1<<2),
+	};
+
+	int flags = Display_Back|Display_Next;
+	item_t start = page * items_per_page;
+	item_t end = 0;
+	if (items_per_page)
+	{
+		if (start + items_per_page >= numItems)
+		{
+			end = numItems - 1;
+			flags &= ~Display_Next;
 		} else {
-		end = numItems;
+			end = start + items_per_page - 1;
 		}
+		if (!m_NeverExit && (m_AlwaysExit || (page == 0 || page == pages-1)))
+			flags |= Display_Exit;
+	} else {
+		end = numItems - 1;
+		if (end > 10)
+			end = 10;
+		flags = 0;
+	}
+
+	if (page == 0)
+		flags &= ~Display_Back;
 	
 	menuitem *pItem = NULL;
 	
@@ -209,8 +342,9 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	keys = 0;
 	bool enabled = true;
 	int ret = 0;
+	int slots = 0;
 	
-	for (item_t i = start; i < end; i++)
+	for (item_t i = start; i <= end; i++)
 	{
 		pItem = m_Items[i];
 		
@@ -219,28 +353,37 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		
 		if (pItem->handler != -1)
 		{
-			ret = executeForwards(pItem->handler, player, thisId, i);
+			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i));
 			if (ret == ITEM_ENABLED)
+			{
 				enabled = true;
-			else if (ret == ITEM_DISABLED)
+			} else if (ret == ITEM_DISABLED) {
 				enabled = false;
 			}
+		}
 		
 		if (pItem->pfn)
 		{
 			ret = (pItem->pfn)(player, thisId, i);
 			if (ret == ITEM_ENABLED)
+			{
 				enabled = true;
-			else if (ret == ITEM_DISABLED)
+			} else if (ret == ITEM_DISABLED) {
 				enabled = false;
 			}
+		}
 		
 		if (enabled)
 		{
 			keys |= (1<<option);
-			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
+			if (m_AutoColors) 
+			{
+				_snprintf(buffer, sizeof(buffer)-1, "\\r%d.\\w %s\n", ++option, pItem->name.c_str());
 			} else {
-			if (g_coloredmenus)
+				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
+			}
+		} else {
+			if (m_AutoColors)
 			{
 				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", ++option, pItem->name.c_str());
 			} else {
@@ -248,38 +391,104 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 				option++;
 			}
 		}
-		m_Text.append(buffer);
+		slots++;
-	}
 
-	//now for a weird part >:o
+		m_Text.append(buffer);
-	//this will either be MORE or BACK..
+
-	keys |= (1<<option++);
+		//attach blanks
-	if ((page < pages - 1) && (pages > 1))
+		if (pItem->blanks.size())
 		{
-		_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "More");
+			for (size_t j=0; j<pItem->blanks.size(); j++)
-	} else {
+			{
-		_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Exit");
+				if (pItem->blanks[j] == 1)
+				{
+					option++;
+				}
+				m_Text.append("\n");
+				slots++;
+			}
+		}
 	}
 
-	m_Text.append(buffer);
+	if (padding == 1 && items_per_page)
+	{
+		int pad = items_per_page;
+		if (flags & Display_Back)
+		{
+			pad--;
+		}
+		if (flags & Display_Next)
+		{
+			pad--;
+		}
+		if (flags & Display_Exit)
+		{
+			pad--;
+		}
+		for (int i=slots+1; i<=pad; i++)
+		{
+			m_Text.append("\n");
+			option++;
+		}
+	}
 
-	if (pages > 1)
+	for (int i=0; i<3; i++)
+	{
+		switch (m_OptOrders[i])
+		{
+		case MENU_BACK:
+			{
+				if (flags & Display_Back)
 				{
 					keys |= (1<<option++);
-		if (pages == 0)
+					_snprintf(buffer, 
-		{
+						sizeof(buffer)-1, 
-			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Exit");
+						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-		} else {
+						option, 
-			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Back");
+						m_OptNames[abs(MENU_BACK)].c_str()
-		}
+						);
 					m_Text.append(buffer);
 				}
+				break;
+			}
+		case MENU_MORE:
+			{
+				if (flags & Display_Next)
+				{
+					keys |= (1<<option++);
+					_snprintf(buffer, 
+						sizeof(buffer)-1, 
+						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
+						option, 
+						m_OptNames[abs(MENU_MORE)].c_str()
+						);
+					m_Text.append(buffer);
+				}
+				break;
+			}
+		case MENU_EXIT:
+			{
+				if (flags & Display_Exit)
+				{
+					keys |= (1<<option++);
+					_snprintf(buffer, 
+						sizeof(buffer)-1, 
+						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
+						option, 
+						m_OptNames[abs(MENU_EXIT)].c_str()
+						);
+					m_Text.append(buffer);
+				}
+				break;
+			}
+		}
+	}
 	
 	return m_Text.c_str();
 }
 
-#define GETMENU(p) if (p >= (int)g_NewMenus.size() || p < 0) { \
+#define GETMENU(p) if (p >= (int)g_NewMenus.size() || p < 0 || !g_NewMenus[p] || g_NewMenus[p]->isDestroying) { \
-	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d", p); \
+	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.size()); \
 	return 0; } \
 	Menu *pMenu = g_NewMenus[p];
 
@@ -289,6 +498,7 @@ 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);
 
 	int func = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
@@ -302,10 +512,44 @@ static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
 	int id = g_menucmds.registerMenuId(title, amx);
 	g_menucmds.registerMenuCmd(g_plugins.findPluginFast(amx), id, 1023, func);
 
-	Menu *pMenu = new Menu(title, id, (int)g_NewMenus.size());
+	Menu *pMenu = new Menu(title, id, 0);
-	g_NewMenus.push_back(pMenu);
 
+	pMenu->func = func;
+
+	if (g_MenuFreeStack.empty())
+	{
+		g_NewMenus.push_back(pMenu);
+		pMenu->thisId = (int)g_NewMenus.size() - 1;
 		return (int)g_NewMenus.size() - 1;
+	} else {
+		int pos = g_MenuFreeStack.front();
+		g_MenuFreeStack.pop();
+		g_NewMenus[pos] = pMenu;
+		pMenu->thisId = pos;
+		return pos;
+	}
+}
+
+static cell AMX_NATIVE_CALL menu_addblank(AMX *amx, cell *params)
+{
+	GETMENU(params[1]);
+
+	if (params[2] && (!pMenu->items_per_page && pMenu->GetItemCount() >= 10))
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Non-paginated menus are limited to 10 items.");
+		return 0;
+	}
+
+	if (!pMenu->m_Items.size())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Blanks can only be added after items.");
+		return 0;
+	}
+
+	menuitem *item = pMenu->m_Items[pMenu->m_Items.size() - 1];
+	item->blanks.push_back(params[2]);
+
+	return 1;
 }
 
 //Adds an item to the menu (returns current item count - 1)
@@ -318,7 +562,14 @@ static cell AMX_NATIVE_CALL menu_additem(AMX *amx, cell *params)
 
 	GETMENU(params[1]);
 
+	if (!pMenu->items_per_page && pMenu->GetItemCount() >= 10)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Non-paginated menus are limited to 10 items.");
+		return 0;
+	}
+
 	name = get_amxstring(amx, params[2], 0, len);
+	validate_menu_text(name);
 	cmd = get_amxstring(amx, params[3], 1, len);
 	access = params[4];
 
@@ -354,6 +605,10 @@ static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
 	
 	int player = params[1];
 	int page = params[3];
+	CPlayer* pPlayer = GET_PLAYER_POINTER_I(player);
+	
+	// This will set the expire time of the menu to infinite
+	pPlayer->menuexpire = INFINITE;
 
 	return pMenu->Display(player, page);
 }
@@ -467,10 +722,221 @@ static cell AMX_NATIVE_CALL menu_item_setcall(AMX *amx, cell *params)
 	return 1;
 }
 
+static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
+{
+	GETMENU(params[1]);
+
+	int len = params[0] / sizeof(cell);
+	if (len < 3)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Expected 3 parameters");
+		return 0;
+	}
+
+	switch (params[2])
+	{
+	case MPROP_PERPAGE:
+		{
+			cell count = *get_amxaddr(amx, params[3]);
+			if (count < 0 || count > 7)
+			{
+				LogError(amx, AMX_ERR_NATIVE, "Cannot set %d items per page", count);
+				return 0;
+			}
+			pMenu->items_per_page = count;
+			break;
+		}
+	case MPROP_BACKNAME:
+		{
+			char *str = get_amxstring(amx, params[3], 0, len);
+			validate_menu_text(str);
+			pMenu->m_OptNames[abs(MENU_BACK)].assign(str);
+			break;
+		}
+	case MPROP_NEXTNAME:
+		{
+			char *str = get_amxstring(amx, params[3], 0, len);
+			validate_menu_text(str);
+			pMenu->m_OptNames[abs(MENU_MORE)].assign(str);
+			break;
+		}
+	case MPROP_EXITNAME:
+		{
+			char *str = get_amxstring(amx, params[3], 0, len);
+			validate_menu_text(str);
+			pMenu->m_OptNames[abs(MENU_EXIT)].assign(str);
+			break;
+		}
+	case MPROP_TITLE:
+		{
+			char *str = get_amxstring(amx, params[3], 0, len);
+			int old = pMenu->menuId;
+			g_menucmds.removeMenuId(old);
+			pMenu->m_Title.assign(str);
+			pMenu->menuId = g_menucmds.registerMenuId(str, amx);
+			g_menucmds.registerMenuCmd(
+				g_plugins.findPluginFast(amx),
+				pMenu->menuId,
+				1023,
+				pMenu->func);
+			CPlayer *pl;
+			/**
+			 * NOTE - this is actually bogus
+			 *  the client's screen won't actually match the cmd here 
+			 *  I think, this scenario needs to be tested. 
+			 */
+			for (int i=1; i<=gpGlobals->maxClients; i++)
+			{
+				pl = GET_PLAYER_POINTER_I(i);
+				if (pl->menu == old)
+					pl->menu = pMenu->menuId;
+			}
+			break;
+		}
+	case MPROP_EXITALL:
+		{
+			cell ans = *get_amxaddr(amx, params[3]);
+			if (ans == 1)
+			{
+				pMenu->m_AlwaysExit = true;
+				pMenu->m_NeverExit = false;
+			} else if (ans == 0) {
+				pMenu->m_AlwaysExit = false;
+				pMenu->m_NeverExit = false;
+			} else if (ans == -1) {
+				pMenu->m_NeverExit = true;
+				pMenu->m_AlwaysExit = false;
+			}
+			break;
+		}
+	case MPROP_ORDER:
+		{
+			cell *addr = get_amxaddr(amx, params[3]);
+			pMenu->m_OptOrders[0] = addr[0];
+			pMenu->m_OptOrders[1] = addr[1];
+			pMenu->m_OptOrders[2] = addr[2];
+			break;
+		}
+	case MPROP_NOCOLORS:
+		{
+			pMenu->m_AutoColors = *get_amxaddr(amx, params[3]) ? true : false;
+			break;
+		}
+	case MPROP_PADMENU:
+		{
+			pMenu->padding = *get_amxaddr(amx, params[3]);
+			break;
+		}
+	default:
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Invalid menu setting: %d", params[1]);
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
+#define GETMENU_R(p) if (p >= (int)g_NewMenus.size() || p < 0 || !g_NewMenus[p]) { \
+	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.size()); \
+	return 0; } \
+	Menu *pMenu = g_NewMenus[p];
+
+static cell AMX_NATIVE_CALL menu_cancel(AMX *amx, cell *params)
+{
+	int index = params[1];
+
+	if (index < 1 || index > gpGlobals->maxClients)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Player %d is not valid", index);
+		return 0;
+	}
+
+	CPlayer *player = GET_PLAYER_POINTER_I(index);
+	if (!player->ingame)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Played %d is not in game", index);
+		return 0;
+	}
+
+	int menu = player->newmenu;
+	if (menu < 0 || menu >= (int)g_NewMenus.size() || !g_NewMenus[menu])
+		return 0;
+
+	Menu *pMenu = g_NewMenus[menu];
+
+	player->newmenu = -1;
+	player->menu = 0;
+	executeForwards(pMenu->func, 
+		static_cast<cell>(index),
+		static_cast<cell>(pMenu->thisId),
+		static_cast<cell>(MENU_EXIT));
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL menu_destroy(AMX *amx, cell *params)
+{
+	GETMENU_R(params[1]);
+
+	if (pMenu->isDestroying)
+		return 0;	//prevent infinite recursion
+
+	pMenu->isDestroying = true;
+	g_menucmds.removeMenuId(pMenu->menuId);
+	CPlayer *player;
+	for (int i=1; i<=gpGlobals->maxClients; i++)
+	{
+		player = GET_PLAYER_POINTER_I(i);
+		if (player->newmenu == pMenu->thisId)
+		{
+			player->newmenu = -1;
+			player->menu = 0;
+			executeForwards(pMenu->func, 
+				static_cast<cell>(i), 
+				static_cast<cell>(pMenu->thisId),
+				static_cast<cell>(MENU_EXIT));
+		}
+	}
+	g_NewMenus[params[1]] = NULL;
+	delete pMenu;
+	g_MenuFreeStack.push(params[1]);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL player_menu_info(AMX *amx, cell *params)
+{
+	if (params[1] < 1 || params[1] > gpGlobals->maxClients)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid player id %d", params[1]);
+		return 0;
+	}
+
+	CPlayer *player = GET_PLAYER_POINTER_I(params[1]);
+	if (!player->ingame)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Player %d is not ingame", params[1]);
+		return 0;
+	}
+
+	cell *m = get_amxaddr(amx, params[2]);
+	cell *n = get_amxaddr(amx, params[3]);
+
+	*m = player->menu;
+	*n = player->newmenu;
+
+	if ( (*m != 0 && *m != -1) || (*n != -1))
+		return 1;
+
+	return 0;
+}
+
 AMX_NATIVE_INFO g_NewMenuNatives[] = 
 {
 	{"menu_create",				menu_create},
 	{"menu_additem",			menu_additem},
+	{"menu_addblank",			menu_addblank},
 	{"menu_pages",				menu_pages},
 	{"menu_items",				menu_items},
 	{"menu_display",			menu_display},
@@ -480,5 +946,9 @@ AMX_NATIVE_INFO g_NewMenuNatives[] =
 	{"menu_item_setcall",		menu_item_setcall},
 	{"menu_item_setcmd",		menu_item_setcmd},
 	{"menu_item_setname",		menu_item_setname},
+	{"menu_destroy",			menu_destroy},
+	{"menu_setprop",			menu_setprop},
+	{"menu_cancel",				menu_cancel},
+	{"player_menu_info",		player_menu_info},
 	{NULL,						NULL},
 };

amxmodx/newmenus.h

@@ -39,7 +39,16 @@
 #define	ITEM_ENABLED	1
 #define ITEM_DISABLED	2
 
-#define	MENUITEMS		7
+
+#define MPROP_PERPAGE	1
+#define MPROP_BACKNAME	2
+#define MPROP_NEXTNAME	3
+#define MPROP_EXITNAME	4
+#define MPROP_TITLE		5
+#define MPROP_EXITALL	6
+#define MPROP_ORDER		7
+#define MPROP_NOCOLORS	8
+#define MPROP_PADMENU	9
 
 typedef int (*MENUITEM_CALLBACK)(int, int, int);
 
@@ -53,6 +62,8 @@ struct menuitem
 	
 	MENUITEM_CALLBACK pfn;
 	size_t id;
+
+	CVector<int> blanks;
 };
 
 typedef unsigned int menu_t;
@@ -75,29 +86,27 @@ public:
 	
 	int PagekeyToItem(page_t page, item_t key);
 	int GetMenuMenuid();
-private:
+public:
 	CVector<menuitem * > m_Items;
-	
 	String m_Title;
 	String m_Text;
 
+	String m_OptNames[4];
+	int m_OptOrders[3];
+
+	bool m_AlwaysExit;
+	bool m_NeverExit;
+	bool m_AutoColors;
+	
 	int menuId;
 	int thisId;
+	int func;
+	int padding;
+	bool isDestroying;
+public:
+	unsigned int items_per_page;
 };
 
-/*Menu *CreateMenu(const char *title);
-Menu *GetMenuById(menu_t menu);
-menuitem *GetMenuItem(menu_t menu, item_t item);
-size_t GetMenuPages(menu_t menu);
-size_t GetMenuItems(menu_t menu);
-menuitem *AddMenuItem(menu_t menu, const char *name, const char *cmd, int access);
-bool DisplayMenu(menu_t menu, int player, page_t page);
-int MenuPagekeyToItem(menu_t menu, page_t page, int key);
-int FindByMenuid(int menuid);
-int GetMenuMenuid(menu_t menu);
-const char *GetItemName(menu_t menu, item_t item);
-const char *GetItemCmd(menu_t menu, item_t item);*/
-
 void ClearMenus();
 
 extern CVector<Menu *> g_NewMenus;

amxmodx/optimizer.cpp

@@ -0,0 +1,123 @@
+#include <string.h>
+#include "optimizer.h"
+
+int g_opt_level = 0;
+
+#define OP_SYSREQ_C		123
+#define OP_NOP			134
+#define OP_FLOAT_MUL	138
+#define OP_FLOAT_DIV	139
+#define OP_FLOAT_ADD	140
+#define OP_FLOAT_SUB	141
+#define OP_FLOAT_TO		142
+#define OP_FLOAT_ROUND	143
+#define OP_FLOAT_CMP	144
+
+cell op_trans_table[N_Total_FloatOps] =
+{
+	OP_FLOAT_MUL,
+	OP_FLOAT_DIV,
+	OP_FLOAT_ADD,
+	OP_FLOAT_SUB,
+	OP_FLOAT_TO,
+	OP_FLOAT_ROUND,
+	OP_FLOAT_CMP
+};
+
+void OnBrowseRelocate(AMX *amx, cell *oplist, cell *cip)
+{
+	char *codeptr = (char *)amx->base + (long)(((AMX_HEADER *)amx->base)->cod);
+
+	//jump to the parameter;
+	codeptr += *cip;
+	
+	int native = -1;
+	cell n_offs = *(cell *)codeptr;
+	optimizer_s *opt = (optimizer_s *)amx->usertags[UT_OPTIMIZER];
+    for (int i=0; i<N_Total_FloatOps; i++)
+	{
+		if (opt->natives[i] == n_offs)
+		{
+			native = i;
+			break;
+		}
+	}
+
+	if (native != -1)
+	{
+		//we're patching this:
+		// 0x7B 0x??   SYSREQ.C float???
+		//with:
+		// 0x8A        FLOAT.MUL
+		// 0x86	       NOP
+		cell new_opcodes[2];
+		new_opcodes[0] = op_trans_table[native];
+		new_opcodes[1] = OP_NOP;
+		codeptr -= sizeof(cell);
+#if defined __GNUC__ || defined ASM32 || defined JIT
+		*(cell *)codeptr = oplist[new_opcodes[0]];
+		*(cell *)(codeptr + sizeof(cell)) = oplist[new_opcodes[1]];
+#else
+		*(cell *)codeptr = new_opcodes[0];
+		*(cell *)(codeptr + sizeof(cell)) = new_opcodes[1];
+#endif
+	}
+
+	*cip += sizeof(cell);
+	
+	return;
+}
+
+#define FIND_NATIVE(name, bind) \
+	if (amx_FindNative(amx, name, &index) != AMX_ERR_NOTFOUND) \
+		opt->natives[bind] = index;
+
+void _Setup_Optimizer_Stage2(AMX *amx, cell *oplist, cell *cip)
+{
+	int index;
+
+	amx->usertags[UT_BROWSEHOOK] = (void *)OnBrowseRelocate;
+
+	optimizer_s *opt = new optimizer_s;
+	
+	for (int i=0; i<N_Total_FloatOps; i++)
+		opt->natives[i] = -1;
+
+	amx->usertags[UT_OPTIMIZER] = (void *)opt;
+
+	if (g_opt_level & 1)
+	{
+		FIND_NATIVE("floatmul", N_Float_Mul);
+		FIND_NATIVE("floatdiv", N_Float_Div);
+		FIND_NATIVE("floatadd", N_Float_Add);
+		FIND_NATIVE("floatsub", N_Float_Sub);
+	}
+	if (g_opt_level & 4)
+	{
+		FIND_NATIVE("float", N_Float_To);
+		FIND_NATIVE("floatround", N_Float_Round);
+	}
+	if (g_opt_level & 2)
+	{
+#if !defined AMD64
+		if (amxx_CpuSupport())
+		{
+#endif
+			FIND_NATIVE("floatcmp", N_Float_Cmp);
+#if !defined AMD64
+		} else {
+			g_opt_level &= ~(2);
+		}
+#endif
+	}
+	/* we don't do these yet because of radix stuff >:\ */
+	//FIND_NATIVE("floatsin", N_Float_Sin);
+	//FIND_NATIVE("floatcos", N_Float_Cos);
+	//FIND_NATIVE("floattan", N_Float_Tan);
+}
+
+void SetupOptimizer(AMX *amx)
+{
+	amx->usertags[UT_BROWSEHOOK] = (void *)_Setup_Optimizer_Stage2;
+}
+

amxmodx/optimizer.h

@@ -0,0 +1,29 @@
+#ifndef _INCLUDE_AMXMODX_OPTIMIZER_H
+#define _INCLUDE_AMXMODX_OPTIMIZER_H
+
+#include "amx.h"
+
+enum
+{
+	N_Float_Mul=0,
+	N_Float_Div,
+	N_Float_Add,
+	N_Float_Sub,
+	N_Float_To,
+	N_Float_Round,
+	N_Float_Cmp,
+	/* ------------ */
+	N_Total_FloatOps,
+};
+
+struct optimizer_s
+{
+	int natives[N_Total_FloatOps];
+};
+
+void SetupOptimizer(AMX *amx);
+extern "C" int amxx_CpuSupport();
+
+extern int g_opt_level;
+
+#endif //_INCLUDE_AMXMODX_OPTIMIZER_H

amxmodx/sdk/amxxmodule.cpp

@@ -2430,11 +2430,14 @@ static amxx_module_info_s g_ModuleInfo =
 #else // MODULE_RELOAD_ON_MAPCHANGE
 	0,
 #endif // MODULE_RELOAD_ON_MAPCHANGE
-	MODULE_LOGTAG
+	MODULE_LOGTAG,
+	MODULE_LIBRARY,
+	MODULE_LIBCLASS
 };
 
 // Storage for the requested functions
 PFN_ADD_NATIVES				g_fn_AddNatives;
+PFN_ADD_NEW_NATIVES			g_fn_AddNewNatives;
 PFN_BUILD_PATHNAME			g_fn_BuildPathname;
 PFN_BUILD_PATHNAME_R		g_fn_BuildPathnameR;
 PFN_GET_AMXADDR				g_fn_GetAmxAddr;
@@ -2502,6 +2505,18 @@ PFN_FORMAT					g_fn_Format;
 PFN_REGISTERFUNCTION		g_fn_RegisterFunction;
 PFN_REQ_FNPTR				g_fn_RequestFunction;
 PFN_AMX_PUSH				g_fn_AmxPush;
+PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
+PFN_PLAYER_PROP_ADDR		g_fn_PlayerPropAddr;
+PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
+PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
+PFN_FINDLIBRARY				g_fn_FindLibrary;
+PFN_ADDLIBRARIES			g_fn_AddLibraries;
+PFN_REMOVELIBRARIES			g_fn_RemoveLibraries;
+PFN_OVERRIDENATIVES			g_fn_OverrideNatives;
+PFN_GETLOCALINFO			g_fn_GetLocalInfo;
+PFN_AMX_REREGISTER			g_fn_AmxReRegister;
+PFN_REGISTERFUNCTIONEX		g_fn_RegisterFunctionEx;
+PFN_MESSAGE_BLOCK			g_fn_MessageBlock;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2552,6 +2567,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("MergeDefinitionFile", g_fn_MergeDefinition_File, PFN_MERGEDEFINITION_FILE);
 	REQFUNC("Format", g_fn_Format, PFN_FORMAT);
 	REQFUNC("RegisterFunction", g_fn_RegisterFunction, PFN_REGISTERFUNCTION);
+	REQFUNC("RegisterFunctionEx", g_fn_RegisterFunctionEx, PFN_REGISTERFUNCTIONEX);
 
 	// Amx scripts
 	REQFUNC("GetAmxScript", g_fn_GetAmxScript, PFN_GET_AMXSCRIPT);
@@ -2577,6 +2593,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 
 	// Natives / Forwards
 	REQFUNC("AddNatives", g_fn_AddNatives, PFN_ADD_NATIVES);
+	REQFUNC("AddNewNatives", g_fn_AddNewNatives, PFN_ADD_NEW_NATIVES);
 	REQFUNC("RaiseAmxError", g_fn_RaiseAmxError, PFN_RAISE_AMXERROR);
 	REQFUNC("RegisterForward", g_fn_RegisterForward, PFN_REGISTER_FORWARD);
 	REQFUNC("RegisterSPForward", g_fn_RegisterSPForward, PFN_REGISTER_SPFORWARD);
@@ -2611,6 +2628,20 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS);
 	REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT);
 	REQFUNC("amx_Push", g_fn_AmxPush, PFN_AMX_PUSH);
+	REQFUNC("SetPlayerTeamInfo", g_fn_SetTeamInfo, PFN_SET_TEAM_INFO);
+	REQFUNC("PlayerPropAddr", g_fn_PlayerPropAddr, PFN_PLAYER_PROP_ADDR);
+	REQFUNC("RegAuthFunc", g_fn_RegAuthFunc, PFN_REG_AUTH_FUNC);
+	REQFUNC("UnregAuthFunc", g_fn_UnregAuthFunc, PFN_UNREG_AUTH_FUNC);
+
+	//Added in 1.75 
+	REQFUNC("FindLibrary", g_fn_FindLibrary, PFN_FINDLIBRARY);
+	REQFUNC("AddLibraries", g_fn_AddLibraries, PFN_ADDLIBRARIES);
+	REQFUNC("RemoveLibraries", g_fn_RemoveLibraries, PFN_REMOVELIBRARIES);
+	REQFUNC("OverrideNatives", g_fn_OverrideNatives, PFN_OVERRIDENATIVES);
+	REQFUNC("GetLocalInfo", g_fn_GetLocalInfo, PFN_GETLOCALINFO);
+	REQFUNC("AmxReregister", g_fn_AmxReRegister, PFN_AMX_REREGISTER);
+
+	REQFUNC("MessageBlock", g_fn_MessageBlock, PFN_MESSAGE_BLOCK);
 
 #ifdef MEMORY_TEST
 	// Memory
@@ -2646,14 +2677,27 @@ C_DLLEXPORT int AMXX_PluginsLoaded()
 	return AMXX_OK;
 }
 
+C_DLLEXPORT void AMXX_PluginsUnloaded()
+{
+#ifdef FN_AMXX_PLUGINSUNLOADED
+	FN_AMXX_PLUGINSUNLOADED();
+#endif // FN_AMXX_PLUGINSUNLOADED
+}
+
+C_DLLEXPORT void AMXX_PluginsUnloading()
+{
+#ifdef FN_AMXX_PLUGINSUNLOADING
+	FN_AMXX_PLUGINSUNLOADING();
+#endif // FN_AMXX_PLUGINSUNLOADING
+}
+
 // Advanced MF functions
 void MF_Log(const char *fmt, ...)
 {
-	// :TODO: Overflow possible here
 	char msg[3072];
 	va_list arglst;
 	va_start(arglst, fmt);
-	vsprintf(msg, fmt, arglst);
+	vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
 	va_end(arglst);
 
 	g_fn_Log("[%s] %s", MODULE_LOGTAG, msg);
@@ -2661,11 +2705,10 @@ void MF_Log(const char *fmt, ...)
 
 void MF_LogError(AMX *amx, int err, const char *fmt, ...)
 {
-	// :TODO: Overflow possible here
 	char msg[3072];
 	va_list arglst;
 	va_start(arglst, fmt);
-	vsprintf(msg, fmt, arglst);
+	vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
 	va_end(arglst);
 
 	g_fn_LogErrorFunc(amx, err, "[%s] %s", MODULE_LOGTAG, msg);
@@ -2733,6 +2776,16 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetPlayerEdict(0);
 	MF_Format("", 4, "str");
 	MF_RegisterFunction(NULL, "");
+	MF_RegisterFunctionEx(NULL, "");
+	MF_SetPlayerTeamInfo(0, 0, "");
+	MF_PlayerPropAddr(0, 0);
+	MF_RegAuthFunc(NULL);
+	MF_UnregAuthFunc(NULL);
+	MF_FindLibrary(NULL, LibType_Class);
+	MF_AddLibraries(NULL, LibType_Class, NULL);
+	MF_RemoveLibraries(NULL);
+	MF_OverrideNatives(NULL, NULL);
+	MF_MessageBlock(0, 0, NULL);
 }
 #endif
 
@@ -2912,20 +2965,20 @@ void	operator delete[](void *reportedAddress)
 #else
 
 #if !defined NO_ALLOC_OVERRIDES && !defined MEMORY_TEST && !defined WIN32
-void * ::operator new(size_t size) {
+void * operator new(size_t size) {
 	return(calloc(1, size)); 
 }
 
-void * ::operator new[](size_t size) {
+void * operator new[](size_t size) {
 	return(calloc(1, size)); 
 }
 
-void ::operator delete(void * ptr) {
+void operator delete(void * ptr) {
 	if(ptr)
 		free(ptr);
 }
 
-void ::operator delete[](void * ptr) {
+void operator delete[](void * ptr) {
 	if(ptr)
 		free(ptr);
 }

amxmodx/sdk/amxxmodule.h

@@ -22,7 +22,7 @@
 #ifndef __linux__
 #define DLLEXPORT __declspec(dllexport)
 #else
-#define DLLEXPORT
+#define DLLEXPORT __attribute__((visibility("default")))
 #define LINUX
 #endif
 
@@ -34,7 +34,8 @@
 // module interface version was 1
 // 2 - added logtag to struct (amxx1.1-rc1)
 // 3 - added new tagAMX structure (amxx1.5)
-#define AMXX_INTERFACE_VERSION 3
+// 4 - added new 'library' setting for direct loading
+#define AMXX_INTERFACE_VERSION 4
 
 // amxx module info
 struct amxx_module_info_s
@@ -44,6 +45,8 @@ struct amxx_module_info_s
 	const char *version;
 	int reload;				// reload on mapchange when nonzero
 	const char *logtag;		// added in version 2
+	const char *library;	// added in version 4
+	const char *libclass;	// added in version 4
 };
 
 // return values from functions called by amxx
@@ -156,6 +159,134 @@ typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
 	#pragma warning(disable:4103)  /* disable warning message 4103 that complains
 	                                * about pragma pack in a header file */
 	#pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
+
+	#if _MSC_VER >= 1400
+		#if !defined NO_MSVC8_AUTO_COMPAT
+
+			/* Disable deprecation warnings concerning unsafe CRT functions */
+			#if !defined _CRT_SECURE_NO_DEPRECATE
+				#define _CRT_SECURE_NO_DEPRECATE
+			#endif
+
+			/* Replace the POSIX function with ISO C++ conformant ones as they are now deprecated */
+			#define access _access
+			#define cabs _cabs
+			#define cgets _cgets
+			#define chdir _chdir
+			#define chmod _chmod
+			#define chsize _chsize
+			#define close _close
+			#define cprintf _cprintf
+			#define cputs _cputts
+			#define creat _creat
+			#define cscanf _cscanf
+			#define cwait _cwait
+			#define dup _dup
+			#define dup2 _dup2
+			#define ecvt _ecvt
+			#define eof _eof
+			#define execl _execl
+			#define execle _execle
+			#define execlp _execlp
+			#define execlpe _execlpe
+			#define execv _execv
+			#define execve _execv
+			#define execvp _execvp
+			#define execvpe _execvpe
+			#define fcloseall _fcloseall
+			#define fcvt _fcvt
+			#define fdopen _fdopen
+			#define fgetchar _fgetchar
+			#define filelength _filelength
+			#define fileno _fileno
+			#define flushall _flushall
+			#define fputchar _fputchar
+			#define gcvt _gcvt
+			#define getch _getch
+			#define getche _getche
+			#define getcwd _getcwd
+			#define getpid _getpid
+			#define getw _getw
+			#define hypot _hypot
+			#define inp _inp
+			#define inpw _inpw
+			#define isascii __isascii
+			#define isatty _isatty
+			#define iscsym __iscsym
+			#define iscsymf __iscsymf
+			#define itoa _itoa
+			#define j0 _j0
+			#define j1 _j1
+			#define jn _jn
+			#define kbhit _kbhit
+			#define lfind _lfind
+			#define locking _locking
+			#define lsearch _lsearch
+			#define lseek _lseek
+			#define ltoa _ltoa
+			#define memccpy _memccpy
+			#define memicmp _memicmp
+			#define mkdir _mkdir
+			#define mktemp _mktemp
+			#define open _open
+			#define outp _outp
+			#define outpw _outpw
+			#define putch _putch
+			#define putenv _putenv
+			#define putw _putw
+			#define read _read
+			#define rmdir _rmdir
+			#define rmtmp _rmtmp
+			#define setmode _setmode
+			#define sopen _sopen
+			#define spawnl _spawnl
+			#define spawnle _spawnle
+			#define spawnlp _spawnlp
+			#define spawnlpe _spawnlpe
+			#define spawnv _spawnv
+			#define spawnve _spawnve
+			#define spawnvp _spawnvp
+			#define spawnvpe _spawnvpe
+			#define strcmpi _strcmpi
+			#define strdup _strdup
+			#define stricmp _stricmp
+			#define strlwr _strlwr
+			#define strnicmp _strnicmp
+			#define strnset _strnset
+			#define strrev _strrev
+			#define strset _strset
+			#define strupr _strupr
+			#define swab _swab
+			#define tell _tell
+			#define tempnam _tempnam
+			#define toascii __toascii
+			#define tzset _tzset
+			#define ultoa _ultoa
+			#define umask _umask
+			#define ungetch _ungetch
+			#define unlink _unlink
+			#define wcsdup _wcsdup
+			#define wcsicmp _wcsicmp
+			#define wcsicoll _wcsicoll
+			#define wcslwr _wcslwr
+			#define wcsnicmp _wcsnicmp
+			#define wcsnset _wcsnset
+			#define wcsrev _wcsrev
+			#define wcsset _wcsset
+			#define wcsupr _wcsupr
+			#define write _write
+			#define y0 _y0
+			#define y1 _y1
+			#define yn _yn
+
+			/* Disable deprecation warnings because MSVC8 seemingly thinks the ISO C++ conformant 
+			 * functions above are deprecated. */
+			#pragma warning (disable:4996)
+				
+		#endif
+	#else
+		#define vsnprintf _vsnprintf
+	#endif
 #endif
 
 
@@ -1904,6 +2035,14 @@ void FN_AMXX_DETACH(void);
 void FN_AMXX_PLUGINSLOADED(void);
 #endif // FN_AMXX_PLUGINSLOADED
 
+#ifdef FN_AMXX_PLUGINSUNLOADING
+void FN_AMXX_PLUGINSUNLOADING(void);
+#endif // FN_AMXX_PLUGINSUNLOADING
+
+#ifdef FN_AMXX_PLUGINSUNLOADED
+void FN_AMXX_PLUGINSUNLOADED(void);
+#endif // FN_AMXX_PLUGINSUNLOADED
+
 // *** Types ***
 typedef void* (*PFN_REQ_FNPTR)(const char * /*name*/);
 
@@ -1927,8 +2066,45 @@ enum ForwardParam
 	FP_ARRAY,						// array; use the return value of prepareArray.
 };
 
+enum PlayerProp
+{
+	Player_Name,		//String
+	Player_Ip,			//String
+	Player_Team,		//String
+	Player_Ingame,		//bool
+	Player_Authorized,	//bool
+	Player_Vgui,		//bool
+	Player_Time,		//float
+	Player_Playtime,	//float
+	Player_MenuExpire,	//float
+	Player_Weapons,		//struct{int,int}[32]
+	Player_CurrentWeapon,	//int
+	Player_TeamID,			//int
+	Player_Deaths,			//int
+	Player_Aiming,			//int
+	Player_Menu,			//int
+	Player_Keys,			//int
+	Player_Flags,			//int[32]
+	Player_Newmenu,			//int
+	Player_NewmenuPage,		//int
+};
+
+enum LibType
+{
+	LibType_Library,
+	LibType_Class
+};
+
+#define MSGBLOCK_SET	0
+#define MSGBLOCK_GET	1
+#define BLOCK_NOT 0
+#define BLOCK_ONCE 1
+#define BLOCK_SET 2
+
+typedef void (*AUTHORIZEFUNC)(int player, const char *authstring);
 
 typedef int				(*PFN_ADD_NATIVES)				(const AMX_NATIVE_INFO * /*list*/);
+typedef int				(*PFN_ADD_NEW_NATIVES)			(const AMX_NATIVE_INFO * /*list*/);
 typedef char *			(*PFN_BUILD_PATHNAME)			(const char * /*format*/, ...);
 typedef char *			(*PFN_BUILD_PATHNAME_R)			(char * /*buffer*/, size_t /* maxlen */, const char * /* format */, ...);
 typedef cell *			(*PFN_GET_AMXADDR)				(AMX * /*amx*/, cell /*offset*/);
@@ -1978,6 +2154,7 @@ typedef edict_t *		(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
 #else
 typedef void *			(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
 #endif
+typedef void *			(*PFN_PLAYER_PROP_ADDR)			(int /*id*/, int /*prop*/);
 
 #ifdef MEMORY_TEST
 typedef void *			(*PFN_ALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
@@ -2003,8 +2180,20 @@ typedef	void			(*PFN_MERGEDEFINITION_FILE)		(const char * /*filename*/);
 typedef const char *	(*PFN_FORMAT)					(const char * /*fmt*/, ... /*params*/);
 typedef void			(*PFN_REGISTERFUNCTION)			(void * /*pfn*/, const char * /*desc*/);
 typedef	int				(*PFN_AMX_PUSH)					(AMX * /*amx*/, cell /*value*/);
+typedef	int				(*PFN_SET_TEAM_INFO)			(int /*player */, int /*teamid */, const char * /*name */);
+typedef void			(*PFN_REG_AUTH_FUNC)			(AUTHORIZEFUNC);
+typedef void			(*PFN_UNREG_AUTH_FUNC)			(AUTHORIZEFUNC);
+typedef int				(*PFN_FINDLIBRARY)				(const char * /*name*/, LibType /*type*/);
+typedef size_t			(*PFN_ADDLIBRARIES)				(const char * /*name*/, LibType /*type*/, void * /*parent*/);
+typedef size_t			(*PFN_REMOVELIBRARIES)			(void * /*parent*/);
+typedef void			(*PFN_OVERRIDENATIVES)			(AMX_NATIVE_INFO * /*natives*/, const char * /*myname*/);
+typedef const char *	(*PFN_GETLOCALINFO)				(const char * /*name*/, const char * /*def*/);
+typedef int				(*PFN_AMX_REREGISTER)			(AMX * /*amx*/, AMX_NATIVE_INFO * /*list*/, int /*list*/);
+typedef void *			(*PFN_REGISTERFUNCTIONEX)		(void * /*pfn*/, const char * /*desc*/);
+typedef void			(*PFN_MESSAGE_BLOCK)			(int /* mode */, int /* message */, int * /* opt */);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
+extern PFN_ADD_NEW_NATIVES			g_fn_AddNewNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
 extern PFN_BUILD_PATHNAME_R			g_fn_BuildPathnameR;
 extern PFN_GET_AMXADDR				g_fn_GetAmxAddr;
@@ -2066,11 +2255,24 @@ extern PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 extern PFN_REGISTERFUNCTION			g_fn_RegisterFunction;
 extern PFN_REQ_FNPTR				g_fn_RequestFunction;
 extern PFN_AMX_PUSH					g_fn_AmxPush;
+extern PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
+extern PFN_PLAYER_PROP_ADDR			g_fn_PlayerPropAddr;
+extern PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
+extern PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
+extern PFN_FINDLIBRARY				g_fn_FindLibrary;
+extern PFN_ADDLIBRARIES				g_fn_AddLibraries;
+extern PFN_REMOVELIBRARIES			g_fn_RemoveLibraries;
+extern PFN_OVERRIDENATIVES			g_fn_OverrideNatives;
+extern PFN_GETLOCALINFO				g_fn_GetLocalInfo;
+extern PFN_AMX_REREGISTER			g_fn_AmxReRegister;
+extern PFN_REGISTERFUNCTIONEX		g_fn_RegisterFunctionEx;
+extern PFN_MESSAGE_BLOCK			g_fn_MessageBlock;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
 // They understand #if 0 so we use #ifdef MAY_NEVER_BE_DEFINED
 int				MF_AddNatives				(const AMX_NATIVE_INFO *list) { }
+int				MF_AddNewNatives			(const AMX_NATIVE_INFO *list) { }
 char *			MF_BuildPathname			(const char * format, ...) { }
 char *			MF_BuildPathnameR			(char *buffer, size_t maxlen, const char *fmt, ...) { }
 cell *			MF_GetAmxAddr				(AMX * amx, cell offset) { }
@@ -2126,9 +2328,22 @@ void			MF_RegisterFunction			(void *pfn, const char *description) { }
 void *			MF_RequestFunction			(const char *description) { }
 int				MF_AmxPush					(AMX *amx, cell *params) { }
 int				MF_AmxExec					(AMX *amx, cell *retval, int idx) { }
+int				MF_SetPlayerTeamInfo		(int id, int teamid, const char *teamname) { }
+void *			MF_PlayerPropAddr			(int id, int prop) { }
+void			MF_RegAuthFunc				(AUTHORIZEFUNC fn) { }
+void			MF_UnregAuthFunc			(AUTHORIZEFUNC fn) { }
+int				MF_FindLibrary				(const char *name, LibType type) { }
+size_t			MF_AddLibraries				(const char *name, LibType type, void *parent) { }
+size_t			MF_RemoveLibraries			(void *parent) { }
+void			MF_OverrideNatives			(AMX_NATIVE_INFO *natives, const char *myname) { }
+const char *	MF_GetLocalInfo				(const char *name, const char *def) { }
+int				MF_AmxReRegister			(AMX *amx, AMX_NATIVE_INFO *list, int number) { return 0; }
+void *			MF_RegisterFunctionEx		(void *pfn, const char *description) { }
+void *			MF_MessageBlock				(int mode, int msg, int *opt) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
+#define MF_AddNewNatives g_fn_AddNewNatives
 #define MF_BuildPathname g_fn_BuildPathname
 #define MF_BuildPathnameR g_fn_BuildPathnameR
 #define MF_FormatAmxString g_fn_FormatAmxString
@@ -2189,8 +2404,20 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_GetPlayerEdict g_fn_GetPlayerEdict
 #define MF_Format g_fn_Format
 #define MF_RegisterFunction g_fn_RegisterFunction
-#define MF_RequestFunction g_fn_RequestFunction;
+#define MF_RequestFunction g_fn_RequestFunction
 #define MF_AmxPush g_fn_AmxPush
+#define	MF_SetPlayerTeamInfo g_fn_SetTeamInfo
+#define MF_PlayerPropAddr g_fn_PlayerPropAddr
+#define MF_RegAuthFunc g_fn_RegAuthFunc
+#define MF_UnregAuthFunc g_fn_UnregAuthFunc
+#define MF_FindLibrary g_fn_FindLibrary
+#define MF_AddLibraries g_fn_AddLibraries
+#define MF_RemoveLibraries g_fn_RemoveLibraries
+#define MF_OverrideNatives g_fn_OverrideNatives
+#define MF_GetLocalInfo g_fn_GetLocalInfo
+#define MF_AmxReRegister g_fn_AmxReRegister
+#define MF_RegisterFunctionEx g_fn_RegisterFunctionEx
+#define MF_MessageBlock g_fn_MessageBlock
 
 #ifdef MEMORY_TEST
 /*** Memory ***/

amxmodx/sdk/moduleconfig.h

@@ -3,12 +3,24 @@
 #ifndef __MODULECONFIG_H__
 #define __MODULECONFIG_H__
 
-// Module info
+/** Module info
+ * -The logtag is the tag that the module's log messages will be
+ *   prepended with.
+ * -The library is the name that the #pragma library
+ *   message will have prepended.
+ * -The library class is the class of libraries that 
+ *   a module belongs to (like DBI).  Keep it "" to 
+ *   ignore.
+ * -For both library and library class, you can use a comma
+ *   to add multiple entries.
+ */
 #define MODULE_NAME "--ENTER NAME HERE--"
 #define MODULE_VERSION "--ENTER VERSION HERE--"
 #define MODULE_AUTHOR "--ENTER AUTHOR HERE--"
 #define MODULE_URL "--ENTER URL HERE--"
 #define MODULE_LOGTAG "--ENTER LOGTAG HERE--"
+#define MODULE_LIBRARY "--ENTER LIBRARY HERE--"
+#define MODULE_LIBCLASS ""
 // If you want the module not to be reloaded on mapchange, remove / comment out the next line
 #define MODULE_RELOAD_ON_MAPCHANGE
 
@@ -31,18 +43,35 @@
 // It allows you to compile without libstdc++.so as a dependency
 // #define NO_ALLOC_OVERRIDES
 
-// - AMXX Init functions
+// Uncomment this if you are using MSVC8 or greater and want to fix some of the compatibility issues yourself 
-// Also consider using FN_META_*
+// #define NO_MSVC8_AUTO_COMPAT
-// AMXX query
+
+/** 
+ * AMXX Init functions
+ * Also consider using FN_META_*
+ */
+
+/** AMXX query */
 //#define FN_AMXX_QUERY OnAmxxQuery
-// AMXX attach
+
-//   Do native functions init here (MF_AddNatives)
+/** AMXX attach
+ * Do native functions init here (MF_AddNatives)
+ */
 //#define FN_AMXX_ATTACH OnAmxxAttach
-// AMXX detach
+
+/** AMXX Detach (unload) */
 //#define FN_AMXX_DETACH OnAmxxDetach
-// All plugins loaded
+
-//   Do forward functions init here (MF_RegisterForward)
+/** All plugins loaded
-// #define FN_AMXX_PLUGINSLOADED OnPluginsLoaded
+ * Do forward functions init here (MF_RegisterForward)
+ */
+//#define FN_AMXX_PLUGINSLOADED OnPluginsLoaded
+
+/** All plugins are about to be unloaded */
+//#define FN_AMXX_PLUGINSUNLOADING OnPluginsUnloading
+
+/** All plugins are now unloaded */
+//#define FN_AMXX_PLUGINSUNLOADED OnPluginsUnloaded
 
 /**** METAMOD ****/
 // If your module doesn't use metamod, you may close the file now :)

amxmodx/sh_list.h

@@ -0,0 +1,297 @@
+/* ======== SourceMM ========
+* Copyright (C) 2004-2005 Metamod:Source Development Team
+* No warranties of any kind
+*
+* License: zlib/libpng
+*
+* Author(s): David "BAILOPAN" Anderson
+* ============================
+*/
+
+#ifndef _INCLUDE_SMM_LIST_H
+#define _INCLUDE_SMM_LIST_H
+
+// MSVC8 fix for offsetof macro redefition warnings
+#ifdef _MSC_VER 
+	#if _MSC_VER >= 1400
+		#undef offsetof
+	#endif
+#endif
+
+#include <new>
+#include <malloc.h>
+
+//namespace SourceHook
+//{
+	//This class is from CSDM for AMX Mod X
+	/*
+		A circular, doubly-linked list with one sentinel node
+
+		Empty:
+			m_Head = sentinel
+			m_Head->next = m_Head;
+			m_Head->prev = m_Head;
+		One element:
+			m_Head = sentinel
+			m_Head->next = node1
+			m_Head->prev = node1
+			node1->next = m_Head
+			node1->prev = m_Head
+		Two elements:
+			m_Head = sentinel
+			m_Head->next = node1
+			m_Head->prev = node2
+			node1->next = node2
+			node1->prev = m_Head
+			node2->next = m_Head
+			node2->prev = node1
+	*/
+	template <class T>
+	class List
+	{
+	public:
+		class iterator;
+		friend class iterator;
+		class ListNode
+		{
+		public:
+			ListNode(const T & o) : obj(o) { };
+			ListNode() { };
+			T obj;
+			ListNode *next;
+			ListNode *prev;
+		};
+	private:
+		// Initializes the sentinel node.
+		// BAIL used malloc instead of new in order to bypass the need for a constructor.
+		ListNode *_Initialize()
+		{
+			ListNode *n = (ListNode *)malloc(sizeof(ListNode));
+			n->next = n;
+			n->prev = n;
+			return n;
+		}
+	public:
+		List() : m_Head(_Initialize()), m_Size(0)
+		{
+		}
+		List(const List &src) : m_Head(_Initialize()), m_Size(0)
+		{
+			iterator iter;
+			for (iter=src.begin(); iter!=src.end(); iter++)
+				push_back( (*iter) );
+		}
+		~List()
+		{
+			clear();
+
+			// Don't forget to free the sentinel
+			if (m_Head)
+			{
+				free(m_Head);
+				m_Head = NULL;
+			}
+		}
+		void push_back(const T &obj)
+		{
+			ListNode *node = new ListNode(obj);
+
+			node->prev = m_Head->prev;
+			node->next = m_Head;
+			m_Head->prev->next = node;
+			m_Head->prev = node;
+
+			m_Size++;
+		}
+		size_t size()
+		{
+			return m_Size;
+		}
+
+		void clear()
+		{
+			ListNode *node = m_Head->next;
+			ListNode *temp;
+			m_Head->next = m_Head;
+			m_Head->prev = m_Head;
+
+			// Iterate through the nodes until we find g_Head (the sentinel) again
+			while (node != m_Head)
+			{
+				temp = node->next;
+				delete node;
+				node = temp;
+			}
+			m_Size = 0;
+		}
+		bool empty()
+		{
+			return (m_Size == 0);
+		}
+		T & back()
+		{
+			return m_Head->prev->obj;
+		}
+	private:
+		ListNode *m_Head;
+		size_t m_Size;
+	public:
+		class iterator
+		{
+		friend class List;
+		public:
+			iterator()
+			{
+				m_This = NULL;
+			}
+			iterator(const List &src)
+			{
+				m_This = src.m_Head;
+			}
+			iterator(ListNode *n) : m_This(n)
+			{
+			}
+			iterator(const iterator &where)
+			{
+				m_This = where.m_This;
+			}
+			//pre decrement
+			iterator & operator--()
+			{
+				if (m_This)
+					m_This = m_This->prev;
+				return *this;
+			}
+			//post decrement
+			iterator operator--(int)
+			{
+				iterator old(*this);
+				if (m_This)
+					m_This = m_This->prev;
+				return old;
+			}	
+			
+			//pre increment
+			iterator & operator++()
+			{
+				if (m_This)
+					m_This = m_This->next;
+				return *this;
+			}
+			//post increment
+			iterator operator++(int)
+			{
+				iterator old(*this);
+				if (m_This)
+					m_This = m_This->next;
+				return old;
+			}
+			
+			const T & operator * () const
+			{
+				return m_This->obj;
+			}
+			T & operator * ()
+			{
+				return m_This->obj;
+			}
+			
+			T * operator -> ()
+			{
+				return &(m_This->obj);
+			}
+			const T * operator -> () const
+			{
+				return &(m_This->obj);
+			}
+			
+			bool operator != (const iterator &where) const
+			{
+				return (m_This != where.m_This);
+			}
+			bool operator ==(const iterator &where) const
+			{
+				return (m_This == where.m_This);
+			}
+		private:
+			ListNode *m_This;
+		};
+	public:
+		iterator begin() const
+		{
+			return iterator(m_Head->next);
+		}
+		iterator end() const
+		{
+			return iterator(m_Head);
+		}
+		iterator erase(iterator &where)
+		{
+			ListNode *pNode = where.m_This;
+			iterator iter(where);
+			iter++;
+
+
+			// Works for all cases: empty list, erasing first element, erasing tail, erasing in the middle...
+			pNode->prev->next = pNode->next;
+			pNode->next->prev = pNode->prev;
+
+			delete pNode;
+			m_Size--;
+
+			return iter;
+		}
+
+		iterator insert(iterator where, const T &obj)
+		{
+			// Insert obj right before where
+
+			ListNode *node = new ListNode(obj);
+			ListNode *pWhereNode = where.m_This;
+			
+			pWhereNode->prev->next = node;
+			node->prev = pWhereNode->prev;
+			pWhereNode->prev = node;
+			node->next = pWhereNode;
+
+			m_Size++;
+
+			return iterator(node);
+		}
+
+	public:
+		void remove(const T & obj)
+		{
+			iterator b;
+			for (b=begin(); b!=end(); b++)
+			{
+				if ( (*b) == obj )
+				{
+					erase( b );
+					break;
+				}
+			}
+		}
+		template <typename U>
+		iterator find(const U & equ)
+		{
+			iterator iter;
+			for (iter=begin(); iter!=end(); iter++)
+			{
+				if ( (*iter) == equ )
+					return iter;
+			}
+			return end();
+		}
+		List & operator =(const List &src)
+		{
+			clear();
+			iterator iter;
+			for (iter=src.begin(); iter!=src.end(); iter++)
+				push_back( (*iter) );
+			return *this;
+		}
+	};
+//};	//NAMESPACE
+
+#endif //_INCLUDE_CSDM_LIST_H

amxmodx/sh_stack.h

@@ -0,0 +1,219 @@
+/* ======== SourceMM ========
+* Copyright (C) 2004-2005 Metamod:Source Development Team
+* No warranties of any kind
+*
+* License: zlib/libpng
+*
+* Author(s): Pavol "PM OnoTo" Marko
+* ============================
+*/
+
+#ifndef __SH_STACK_H__
+#define __SH_STACK_H__
+
+#define SH_STACK_DEFAULT_SIZE 4
+
+//namespace SourceHook
+//{/
+	// Vector
+	template <class T> class CStack
+	{
+		T *m_Elements;
+		size_t m_AllocatedSize;
+		size_t m_UsedSize;
+	public:
+		friend class iterator;
+		class iterator
+		{
+			CStack<T> *m_pParent;
+			size_t m_Index;
+		public:
+			iterator(CStack<T> *pParent, size_t id) : m_pParent(pParent), m_Index(id)
+			{
+			}
+
+			iterator(CStack<T> *pParent) : m_pParent(pParent), m_Index(0)
+			{
+			}
+			
+			iterator() : m_pParent(NULL), m_Index(0)
+			{
+			}
+
+			T &operator *()
+			{
+				return m_pParent->m_Elements[m_Index];
+			}
+			const T &operator *() const
+			{
+				return m_pParent->m_Elements[m_Index];
+			}
+			
+			T * operator->()
+			{
+				return m_pParent->m_Elements + m_Index;
+			}
+
+			const T * operator->() const
+			{
+				return m_pParent->m_Elements + m_Index;
+			}
+
+			iterator & operator++()		// preincrement
+			{
+				++m_Index;
+				return (*this);
+			}
+
+			iterator operator++(int)	// postincrement
+			{
+				iterator tmp = *this;
+				++m_Index;
+				return tmp;
+			}
+
+			iterator & operator--()		// predecrement
+			{
+				--m_Index;
+				return (*this);
+			}
+
+			iterator operator--(int)	// postdecrememnt
+			{
+				iterator tmp = *this;
+				--m_Index;
+				return tmp;
+			}
+
+			bool operator==(const iterator & right) const
+			{
+				return (m_pParent == right.m_pParent && m_Index == right.m_Index);
+			}
+
+			bool operator!=(const iterator & right) const
+			{
+				return !(*this == right);
+			}
+		};
+		CStack() : m_Elements(new T[SH_STACK_DEFAULT_SIZE]),
+			m_AllocatedSize(SH_STACK_DEFAULT_SIZE),
+			m_UsedSize(0)
+		{
+		}
+		CStack(size_t size) : m_Elements(new T[size]),
+			m_AllocatedSize(size),
+			m_UsedSize(0)
+		{
+		}
+
+		CStack(const CStack &other) : m_Elements(NULL),
+			m_AllocatedSize(0),
+			m_UsedSize(0)
+		{
+			reserve(other.m_AllocatedSize);
+			m_UsedSize = other.m_UsedSize;
+			for (size_t i = 0; i < m_UsedSize; ++i)
+				m_Elements[i] = other.m_Elements[i];
+		}
+
+		~CStack()
+		{
+			if (m_Elements)
+				delete [] m_Elements;
+		}
+		
+		void operator=(const CStack &other)
+		{
+			if (m_AllocatedSize < other.m_AllocatedSize)
+			{
+				if (m_Elements)
+					delete [] m_Elements;
+				m_Elements = new T[other.m_AllocatedSize];
+				m_AllocatedSize = other.m_AllocatedSize;
+			}
+			m_UsedSize = other.m_UsedSize;
+			for (size_t i = 0; i < m_UsedSize; ++i)
+				m_Elements[i] = other.m_Elements[i];
+		}
+
+		bool push(const T &val)
+		{
+			if (m_UsedSize + 1 == m_AllocatedSize)
+			{
+				// zOHNOES! REALLOCATE!
+				m_AllocatedSize *= 2;
+				T *newElements = new T[m_AllocatedSize];
+				if (!newElements)
+				{
+					m_AllocatedSize /= 2;
+					return false;
+				}
+				if (m_Elements)
+				{
+					for (size_t i = 0; i < m_UsedSize; ++i)
+						newElements[i] = m_Elements[i];
+					delete [] m_Elements;
+				}
+				m_Elements = newElements;
+			}
+			m_Elements[m_UsedSize++] = val;
+			return true;
+		}
+		void pop()
+		{
+			--m_UsedSize;
+		}
+
+		T &front()
+		{
+			return m_Elements[m_UsedSize - 1];
+		}
+
+		const T &front() const
+		{
+			return m_Elements[m_UsedSize - 1];
+		}
+
+		iterator begin()
+		{
+			return iterator(this, 0);
+		}
+		iterator end()
+		{
+			return iterator(this, m_UsedSize);
+		}
+
+		size_t size()
+		{
+			return m_UsedSize;
+		}
+		size_t capacity()
+		{
+			return m_AllocatedSize;
+		}
+		bool empty()
+		{
+			return m_UsedSize == 0 ? true : false;
+		}
+		bool reserve(size_t size)
+		{
+			if (size > m_AllocatedSize)
+			{
+				T *newElements = new T[size];
+				if (!newElements)
+					return false;
+				if (m_Elements)
+				{
+					for (size_t i = 0; i < m_UsedSize; ++i)
+						newElements[i] = m_Elements[i];
+					delete [] m_Elements;
+				}
+				m_Elements = newElements;
+				m_AllocatedSize = size;
+			}
+			return true;
+		}
+	};
+//};	//namespace SourceHook
+
+#endif

amxmodx/sh_tinyhash.h

@@ -0,0 +1,526 @@
+/* ======== SourceMM ========
+* Copyright (C) 2004-2005 Metamod:Source Development Team
+* No warranties of any kind
+*
+* License: zlib/libpng
+*
+* Author(s): David "BAILOPAN" Anderson
+* ============================
+*/
+
+#ifndef _INCLUDE_SH_TINYHASH_H_
+#define _INCLUDE_SH_TINYHASH_H_
+
+#include "sh_list.h"
+
+#define _T_INIT_HASH_SIZE	512
+
+//namespace SourceHook
+//{
+	template <class K>
+	int HashFunction(const K & k);
+
+	template <class K>
+	int Compare(const K & k1, const K & k2);
+
+	template <class U, class K>
+	int CompareAlt(const U &k1, const K &k2);
+
+	template <class U>
+	int HashAlt(const U &u);
+
+	/**
+	 * This is a tiny, growable hash class.
+	 * Meant for quick and dirty dictionaries only!
+	 */
+	template <class K, class V>
+	class THash
+	{
+	public:
+		struct THashNode
+		{
+			THashNode(const K & k, const V & v) :
+				key(k), val(v)
+				{
+				};
+			THashNode & operator =(const THashNode &other)
+			{
+				key = other.key;
+				val = other.val;
+			}
+			K key;
+			V val;
+		};
+		typedef List<THashNode *> *	NodePtr;
+	public:
+		class const_iterator;
+		THash() : m_Buckets(NULL), m_numBuckets(0), m_percentUsed(0.0f), m_items(0)
+		{
+			_Refactor();
+		}
+		THash(const THash &other) : m_Buckets(new NodePtr[other.m_numBuckets]),
+			m_numBuckets(other.m_numBuckets), m_percentUsed(other.m_percentUsed), m_items(0)
+		{
+			for (size_t i=0; i<m_numBuckets; i++)
+					m_Buckets[i] = NULL;
+			for (const_iterator iter = other.begin(); iter != other.end(); ++iter)
+				_FindOrInsert(iter->key)->val = iter->val;
+		}
+		void operator=(const THash &other)
+		{
+			clear();
+			for (const_iterator iter = other.begin(); iter != other.end(); ++iter)
+				_FindOrInsert(iter->key)->val = iter->val;
+		}
+
+		~THash()
+		{
+			_Clear();
+		}
+		void clear()
+		{
+			_Clear();
+			_Refactor();
+		}
+		size_t size()
+		{
+			return m_items;
+		}
+		size_t GetBuckets()
+		{
+			return m_numBuckets;
+		}
+		float PercentUsed()
+		{
+			return m_percentUsed;
+		}
+		V & operator [](const K & key)
+		{
+			THashNode *pNode = _FindOrInsert(key);
+			return pNode->val;
+		}
+	private:
+		void _Clear()
+		{
+			typename List<THashNode *>::iterator iter, end;
+			for (size_t i=0; i<m_numBuckets; i++)
+			{
+				if (m_Buckets[i])
+				{
+					end = m_Buckets[i]->end();
+					iter = m_Buckets[i]->begin();
+					while (iter != end)
+					{
+						delete (*iter);
+						iter++;
+					}
+					delete m_Buckets[i];
+					m_Buckets[i] = NULL;
+				}
+			}
+			if (m_Buckets)
+				delete [] m_Buckets;
+			m_Buckets = NULL;
+			m_numBuckets = 0;
+			m_items = 0;
+		}
+	public:
+		template <typename U>
+		V & AltFindOrInsert(const U & ukey)
+		{
+			size_t place = HashAlt(ukey) % m_numBuckets;
+			THashNode *pNode = NULL;
+			if (!m_Buckets[place])
+			{
+				m_Buckets[place] = new List<THashNode *>;
+				pNode = new THashNode(ukey, V());
+				m_Buckets[place]->push_back(pNode);
+				m_percentUsed += (1.0f / (float)m_numBuckets);
+				m_items++;
+			} else {
+				typename List<THashNode *>::iterator iter;
+				for (iter=m_Buckets[place]->begin(); iter!=m_Buckets[place]->end(); iter++)
+				{
+					if (CompareAlt(ukey, (*iter)->key) == 0)
+						return (*iter)->val;
+				}
+				pNode = new THashNode(ukey, V());
+				m_Buckets[place]->push_back(pNode);
+				m_items++;
+			}
+			if (PercentUsed() > 0.75f)
+				_Refactor();
+			return pNode->val;
+		}
+	private:
+		THashNode *_FindOrInsert(const K & key)
+		{
+			size_t place = HashFunction(key) % m_numBuckets;
+			THashNode *pNode = NULL;
+			if (!m_Buckets[place])
+			{
+				m_Buckets[place] = new List<THashNode *>;
+				pNode = new THashNode(key, V());
+				m_Buckets[place]->push_back(pNode);
+				m_percentUsed += (1.0f / (float)m_numBuckets);
+				m_items++;
+			} else {
+				typename List<THashNode *>::iterator iter;
+				for (iter=m_Buckets[place]->begin(); iter!=m_Buckets[place]->end(); iter++)
+				{
+					if (Compare((*iter)->key, key) == 0)
+						return (*iter);
+				}
+				//node does not exist
+				pNode = new THashNode(key, V());
+				m_Buckets[place]->push_back(pNode);
+				m_items++;
+			}
+			if (PercentUsed() > 0.75f)
+				_Refactor();
+			return pNode;
+		}
+		void _Refactor()
+		{
+			m_percentUsed = 0.0f;
+			if (!m_numBuckets)
+			{
+				m_numBuckets = _T_INIT_HASH_SIZE;
+				m_Buckets = new NodePtr[m_numBuckets];
+				for (size_t i=0; i<m_numBuckets; i++)
+					m_Buckets[i] = NULL;
+			} else {
+				size_t oldSize = m_numBuckets;
+				m_numBuckets *= 2;
+				typename List<THashNode *>::iterator iter;
+				size_t place;
+				THashNode *pHashNode;
+				NodePtr *temp = new NodePtr[m_numBuckets];
+				for (size_t i=0; i<m_numBuckets; i++)
+					temp[i] = NULL;
+				//look in old hash table
+				for (size_t i=0; i<oldSize; i++)
+				{
+					//does a bucket have anything?
+					if (m_Buckets[i])
+					{
+						//go through the list of items
+						for (iter = m_Buckets[i]->begin(); iter != m_Buckets[i]->end(); iter++)
+						{
+							pHashNode = (*iter);
+							//rehash it with the new bucket filter
+							place = HashFunction(pHashNode->key) % m_numBuckets;
+							//add it to the new hash table
+							if (!temp[place])
+							{
+								temp[place] = new List<THashNode *>;
+								m_percentUsed += (1.0f / (float)m_numBuckets);
+							}
+							temp[place]->push_back(pHashNode);
+						}
+						//delete that bucket!
+						delete m_Buckets[i];
+						m_Buckets[i] = NULL;
+					}
+				}
+				//reassign bucket table
+				delete [] m_Buckets;
+				m_Buckets = temp;
+			}
+		}
+	public:
+		friend class iterator;
+		friend class const_iterator;
+		class iterator
+		{
+			friend class THash;
+		public:
+			iterator() : curbucket(-1), hash(NULL), end(true)
+			{
+			};
+			iterator(THash *h) : curbucket(-1), hash(h), end(false)
+			{
+				if (!h->m_Buckets)
+					end = true;
+				else
+					_Inc();
+			};
+			//pre increment
+			iterator & operator++()
+			{
+				_Inc();
+				return *this;
+			}
+			//post increment
+			iterator operator++(int)
+			{
+				iterator old(*this);
+				_Inc();
+				return old;
+			}
+			const THashNode & operator * () const
+			{
+				return *(*iter);
+			}
+			THashNode & operator * ()
+			{
+				return *(*iter);
+			}
+			const THashNode * operator ->() const
+			{
+				return (*iter);
+			}
+			THashNode * operator ->()
+			{
+				return (*iter);
+			}
+			bool operator ==(const iterator &where) const
+			{
+				if (where.hash == this->hash
+					&& where.end == this->end
+					&&
+					 (this->end ||
+					   ((where.curbucket == this->curbucket)
+						&& (where.iter == iter))
+						 ))
+					return true;
+				return false;
+			}
+			bool operator !=(const iterator &where) const
+			{
+				return !( (*this) == where );
+			}
+
+			void erase()
+			{
+				if (end || !hash || curbucket < 0 || curbucket >= static_cast<int>(hash->m_numBuckets))
+					return;
+
+				// Remove this element and move to the next one
+				iterator tmp = *this;
+				++tmp;
+				delete (*iter);
+				hash->m_Buckets[curbucket]->erase(iter);
+				*this = tmp;
+
+				// :TODO: Maybe refactor to a lower size if required
+
+				m_items--;
+			}
+		private:
+			void _Inc()
+			{
+				if (end || !hash || curbucket >= static_cast<int>(hash->m_numBuckets))
+					return;
+				if (curbucket < 0)
+				{
+					for (int i=0; i<(int)hash->m_numBuckets; i++)
+					{
+						if (hash->m_Buckets[i])
+						{
+							iter = hash->m_Buckets[i]->begin();
+							if (iter == hash->m_Buckets[i]->end())
+								continue;
+							curbucket = i;
+							break;
+						}
+					}
+					if (curbucket < 0)
+						end = true;
+				} else {
+					if (iter != hash->m_Buckets[curbucket]->end())
+						iter++;
+					if (iter == hash->m_Buckets[curbucket]->end())
+					{
+						int oldbucket = curbucket;
+						for (int i=curbucket+1; i<(int)hash->m_numBuckets; i++)
+						{
+							if (hash->m_Buckets[i])
+							{
+								iter = hash->m_Buckets[i]->begin();
+								if (iter == hash->m_Buckets[i]->end())
+									continue;
+								curbucket = i;
+								break;
+							}
+						}
+						if (curbucket == oldbucket)
+							end = true;
+					}
+				}
+			}
+		private:
+			int curbucket;
+			typename List<THashNode *>::iterator iter;
+			THash *hash;
+			bool end;
+		};
+		class const_iterator
+		{
+			friend class THash;
+		public:
+			const_iterator() : curbucket(-1), hash(NULL), end(true)
+			{
+			};
+			const_iterator(const THash *h) : curbucket(-1), hash(h), end(false)
+			{
+				if (!h->m_Buckets)
+					end = true;
+				else
+					_Inc();
+			};
+			//pre increment
+			const_iterator & operator++()
+			{
+				_Inc();
+				return *this;
+			}
+			//post increment
+			const_iterator operator++(int)
+			{
+				iterator old(*this);
+				_Inc();
+				return old;
+			}
+			const THashNode & operator * () const
+			{
+				return *(*iter);
+			}
+			const THashNode * operator ->() const
+			{
+				return (*iter);
+			}
+			bool operator ==(const const_iterator &where) const
+			{
+				if (where.hash == this->hash
+					&& where.end == this->end
+					&&
+					 (this->end ||
+					   ((where.curbucket == this->curbucket)
+						&& (where.iter == iter))
+						 ))
+					return true;
+				return false;
+			}
+			bool operator !=(const const_iterator &where) const
+			{
+				return !( (*this) == where );
+			}
+		private:
+			void _Inc()
+			{
+				if (end || !hash || curbucket >= static_cast<int>(hash->m_numBuckets))
+					return;
+				if (curbucket < 0)
+				{
+					for (int i=0; i<(int)hash->m_numBuckets; i++)
+					{
+						if (hash->m_Buckets[i])
+						{
+							iter = hash->m_Buckets[i]->begin();
+							if (iter == hash->m_Buckets[i]->end())
+								continue;
+							curbucket = i;
+							break;
+						}
+					}
+					if (curbucket < 0)
+						end = true;
+				} else {
+					if (iter != hash->m_Buckets[curbucket]->end())
+						iter++;
+					if (iter == hash->m_Buckets[curbucket]->end())
+					{
+						int oldbucket = curbucket;
+						for (int i=curbucket+1; i<(int)hash->m_numBuckets; i++)
+						{
+							if (hash->m_Buckets[i])
+							{
+								iter = hash->m_Buckets[i]->begin();
+								if (iter == hash->m_Buckets[i]->end())
+									continue;
+								curbucket = i;
+								break;
+							}
+						}
+						if (curbucket == oldbucket)
+							end = true;
+					}
+				}
+			}
+		private:
+			int curbucket;
+			typename List<THashNode *>::iterator iter;
+			const THash *hash;
+			bool end;
+		};
+	public:
+		iterator begin()
+		{
+			return iterator(this);
+		}
+		iterator end()
+		{
+			iterator iter;
+			iter.hash = this;
+			return iter;
+		}
+
+		const_iterator begin() const
+		{
+			return const_iterator(this);
+		}
+		const_iterator end() const
+		{
+			const_iterator iter;
+			iter.hash = this;
+			return iter;
+		}
+
+		template <typename U>
+		iterator find(const U & u) const
+		{
+			iterator b = begin();
+			iterator e = end();
+			for (iterator iter = b; iter != e; iter++)
+			{
+				if ( (*iter).key == u )
+					return iter;
+			}
+			return end();
+		}
+		template <typename U>
+		iterator find(const U & u)
+		{
+			iterator b = begin();
+			iterator e = end();
+			for (iterator iter = b; iter != e; iter++)
+			{
+				if ( (*iter).key == u )
+					return iter;
+			}
+			return end();
+		}
+
+		iterator erase(iterator where)
+		{
+			where.erase();
+			return where;
+		}
+		template <typename U>
+		void erase(const U & u)
+		{
+			iterator iter = find(u);
+			if (iter == end())
+				return;
+			iter.erase();
+		}
+	private:
+		NodePtr	*m_Buckets;
+		size_t m_numBuckets;
+		float m_percentUsed;
+		size_t m_items;
+	};
+//};
+
+#endif //_INCLUDE_SH_TINYHASH_H_

amxmodx/sorting.cpp

@@ -0,0 +1,359 @@
+#include "amxmodx.h"
+#include <stdlib.h>
+
+/***********************************
+ *   About the double array hack   *
+     ***************************   
+
+ Double arrays in Pawn are vectors offset by the current offset.  For example:
+
+ new array[2][2]
+
+   In this array, index 0 contains the offset from the current offset which
+ results in the final vector [2] (at [0][2]).  Meaning, to dereference [1][2], 
+ it is equivalent to:
+
+ address = &array[1] + array[1] + 2 * sizeof(cell)
+
+   The fact that each offset is from the _current_ position rather than the _base_
+ position is very important.  It means that if you to try to swap vector positions,
+ the offsets will no longer match, because their current position has changed.  A 
+ simple and ingenious way around this is to back up the positions in a separate array,
+ then to overwrite each position in the old array with absolute indices.  Pseudo C++ code:
+
+ cell *array; //assumed to be set to the 2+D array
+ cell *old_offsets = new cell[2];
+ for (int i=0; i<2; i++)
+ {
+    old_offsets = array[i];
+	array[i] = i;
+ }
+
+   Now, you can swap the array indices with no problem, and do a reverse-lookup to find the original addresses.
+ After sorting/modification is done, you must relocate the new indices.  For example, if the two vectors in our
+ demo array were swapped, array[0] would be 1 and array[1] would be 0.  This is invalid to the virtual machine.
+ Luckily, this is also simple -- all the information is there.
+
+ for (int i=0; i<2; i++)
+ {
+	//get the # of the vector we want to relocate in
+	cell vector_index = array[i];			
+	//get the real address of this vector
+	char *real_address = (char *)array + (vector_index * sizeof(cell)) + old_offsets[vector_index];
+	//calc and store the new distance offset
+	array[i] = real_address - ( (char *)array + (vector_index + sizeof(cell)) )
+ }
+
+ Note that the inner expression can be heavily reduced; it is expanded for readability.
+ **********************************/
+
+enum SortOrder
+{
+	Sort_Ascending = 0,
+	Sort_Descending = 1,
+};
+
+int sort_ints_asc(const void *int1, const void *int2)
+{
+	return (*(int *)int1) - (*(int *)int2);
+}
+
+int sort_ints_desc(const void *int1, const void *int2)
+{
+	return (*(int *)int2) - (*(int *)int1);
+}
+
+static cell AMX_NATIVE_CALL SortIntegers(AMX *amx, cell *params)
+{
+	cell *array = get_amxaddr(amx, params[1]);
+	cell array_size = params[2];
+	cell type = params[3];
+
+	if (type == Sort_Ascending)
+	{
+		qsort(array, array_size, sizeof(cell), sort_ints_asc);
+	} else {
+		qsort(array, array_size, sizeof(cell), sort_ints_desc);
+	}
+
+	return 1;
+}
+
+int sort_floats_asc(const void *float1, const void *float2)
+{
+	REAL r1 = *(REAL *)float1;
+	REAL r2 = *(REAL *)float2;
+	
+	if (r1 < r2)
+	{
+		return -1;
+	} else if (r2 < r1) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+int sort_floats_desc(const void *float1, const void *float2)
+{
+	REAL r1 = *(REAL *)float1;
+	REAL r2 = *(REAL *)float2;
+
+	if (r1 < r2)
+	{
+		return 1;
+	} else if (r2 < r1) {
+		return -1;
+	} else {
+		return 0;
+	}
+}
+
+static cell AMX_NATIVE_CALL SortFloats(AMX *amx, cell *params)
+{
+	cell *array = get_amxaddr(amx, params[1]);
+	cell array_size = params[2];
+	cell type = params[3];
+
+	if (type == Sort_Ascending)
+	{
+		qsort(array, array_size, sizeof(cell), sort_floats_asc);
+	} else {
+		qsort(array, array_size, sizeof(cell), sort_floats_desc);
+	}
+
+	return 1;
+}
+
+static cell *g_CurStringArray = NULL;
+static cell *g_CurRebaseMap = NULL;
+
+int sort_strings_asc(const void *blk1, const void *blk2)
+{
+	cell reloc1 = *(cell *)blk1;
+	cell reloc2 = *(cell *)blk2;
+	
+	register cell *str1 = (cell *)((char *)(&g_CurStringArray[reloc1]) + g_CurRebaseMap[reloc1]);
+	register cell *str2 = (cell *)((char *)(&g_CurStringArray[reloc2]) + g_CurRebaseMap[reloc2]);
+
+	while (*str1 == *str2++)
+	{
+		if (*str1++ == 0)
+		{
+			return 0;
+		}
+	}
+
+	return (*str1 - *(str2 - 1));
+}
+
+int sort_strings_desc(const void *blk1, const void *blk2)
+{
+	cell reloc1 = *(cell *)blk1;
+	cell reloc2 = *(cell *)blk2;
+
+	register cell *str1 = (cell *)((char *)(&g_CurStringArray[reloc1]) + g_CurRebaseMap[reloc1]);
+	register cell *str2 = (cell *)((char *)(&g_CurStringArray[reloc2]) + g_CurRebaseMap[reloc2]);
+
+	while (*str1 == *str2++)
+	{
+		if (*str1++ == 0)
+		{
+			return 0;
+		}
+	}
+
+	return (*(str2 - 1) - *str1);
+}
+
+static cell AMX_NATIVE_CALL SortStrings(AMX *amx, cell *params)
+{
+	cell *array = get_amxaddr(amx, params[1]);
+	cell array_size = params[2];
+	cell type = params[3];
+
+	/** HACKHACK - back up the old indices, replace the indices with something easier */
+	cell amx_addr, *phys_addr;
+	int err;
+	if ((err=amx_Allot(amx, array_size, &amx_addr, &phys_addr)) != AMX_ERR_NONE)
+	{
+		LogError(amx, err, "Ran out of memory");
+		return 0;
+	}
+
+	g_CurStringArray = array;
+	g_CurRebaseMap = phys_addr;
+
+	for (int i=0; i<array_size; i++)
+	{
+		phys_addr[i] = array[i];
+		array[i] = i;
+	}
+
+	if (type == Sort_Ascending)
+	{
+		qsort(array, array_size, sizeof(cell), sort_strings_asc);
+	} else {
+		qsort(array, array_size, sizeof(cell), sort_strings_desc);
+	}
+
+	/* END HACKHACK - restore what we damaged so Pawn doesn't throw up.
+	 * We'll browse through each index of the array and patch up the distance.
+	 */
+	for (int i=0; i<array_size; i++)
+	{
+		/* Compute the final address of the old array and subtract the new location.
+		 * This is the fixed up distance.
+		 */
+		array[i] = ((char *)&array[array[i]] + phys_addr[array[i]]) - (char *)&array[i];
+	}
+
+	amx_Release(amx, amx_addr);
+
+	g_CurStringArray = NULL;
+	g_CurRebaseMap = NULL;
+
+	return 1;
+}
+
+struct sort_info
+{
+	int pfn;
+	cell data_addr;
+	cell data_size;
+	cell array_addr;
+	cell *array_base;
+	cell *array_remap;
+	AMX *amx;
+};
+
+static CStack<sort_info *> g_AMXSortStack;
+
+int sort1d_amx_custom(const void *elem1, const void *elem2)
+{
+	cell c1 = *(cell *)elem1;
+	cell c2 = *(cell *)elem2;
+	sort_info *pInfo = g_AMXSortStack.front();
+
+	return executeForwards(pInfo->pfn, c1, c2, pInfo->array_addr, pInfo->data_addr, pInfo->data_size);
+}
+
+static cell AMX_NATIVE_CALL SortCustom1D(AMX *amx, cell *params)
+{
+	cell *array = get_amxaddr(amx, params[1]);
+	cell array_size = params[2];
+	int len;
+	const char *funcname = get_amxstring(amx, params[3], 0, len);
+
+	int pfn = registerSPForwardByName(amx, funcname, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+	if (pfn < 0)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "The public function \"%s\" was not found.", funcname);
+		return 0;
+	}
+
+	sort_info *pInfo = new sort_info;
+
+	pInfo->pfn = pfn;
+	pInfo->data_addr = params[4];
+	pInfo->data_size = params[5];
+	pInfo->array_addr = params[1];
+	pInfo->array_remap = NULL;
+	pInfo->array_base = NULL;
+
+	g_AMXSortStack.push(pInfo);
+	qsort(array, array_size, sizeof(cell), sort1d_amx_custom);
+	g_AMXSortStack.pop();
+
+	delete pInfo;
+
+	return 1;
+}
+
+int sort2d_amx_custom(const void *elem1, const void *elem2)
+{
+	cell c1 = *(cell *)elem1;
+	cell c2 = *(cell *)elem2;
+	sort_info *pInfo = g_AMXSortStack.front();
+
+	cell c1_addr = pInfo->array_addr + (c1 * sizeof(cell)) + pInfo->array_remap[c1];
+	cell c2_addr = pInfo->array_addr + (c2 * sizeof(cell)) + pInfo->array_remap[c2];
+
+	//cell *c1_r = get_amxaddr(pInfo->amx, c1_addr);
+	//cell *c2_r = get_amxaddr(pInfo->amx, c2_addr);
+
+	return executeForwards(pInfo->pfn, c1_addr, c2_addr, pInfo->array_addr, pInfo->data_addr, pInfo->data_size);
+}
+
+static cell AMX_NATIVE_CALL SortCustom2D(AMX *amx, cell *params)
+{
+	cell *array = get_amxaddr(amx, params[1]);
+	cell array_size = params[2];
+	int len;
+	const char *funcname = get_amxstring(amx, params[3], 0, len);
+
+	/** back up the old indices, replace the indices with something easier */
+	cell amx_addr, *phys_addr;
+	int err;
+	if ((err=amx_Allot(amx, array_size, &amx_addr, &phys_addr)) != AMX_ERR_NONE)
+	{
+		LogError(amx, err, "Ran out of memory");
+		return 0;
+	}
+
+	int pfn = registerSPForwardByName(amx, funcname, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+	if (pfn < 0)
+	{
+		amx_Release(amx, amx_addr);
+		LogError(amx, AMX_ERR_NATIVE, "The public function \"%s\" was not found.", funcname);
+		return 0;
+	}
+
+	sort_info *pInfo = new sort_info;
+
+	pInfo->pfn = pfn;
+	pInfo->data_addr = params[4];
+	pInfo->data_size = params[5];
+	pInfo->array_addr = params[1];
+	pInfo->amx = amx;
+
+	/** Same process as in strings, back up the old indices for later fixup */
+	pInfo->array_base = array;
+	pInfo->array_remap = phys_addr;
+	
+	for (int i=0; i<array_size; i++)
+	{
+		phys_addr[i] = array[i];
+		array[i] = i;
+	}
+
+	g_AMXSortStack.push(pInfo);
+	qsort(array, array_size, sizeof(cell), sort2d_amx_custom);
+	g_AMXSortStack.pop();
+
+	/** Fixup process! */
+	for (int i=0; i<array_size; i++)
+	{
+		/* Compute the final address of the old array and subtract the new location.
+		 * This is the fixed up distance.
+		 */
+		array[i] = ((char *)&array[array[i]] + phys_addr[array[i]]) - (char *)&array[i];
+	}
+
+	amx_Release(amx, amx_addr);
+	unregisterSPForward(pInfo->pfn);
+	delete pInfo;
+
+	return 1;
+}
+
+AMX_NATIVE_INFO g_SortNatives[] = 
+{
+	{"SortIntegers",			SortIntegers},
+	{"SortFloats",				SortFloats},
+	{"SortStrings",				SortStrings},
+	{"SortCustom1D",			SortCustom1D},
+	{"SortCustom2D",			SortCustom2D},
+
+	{NULL,						NULL},
+};

amxmodx/srvcmd.cpp

@@ -39,7 +39,7 @@ void amx_command()
 	{
 
 		print_srvconsole("Currently loaded plugins:\n");
-		print_srvconsole("       %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
+		print_srvconsole("       %-23.22s %-8.7s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
 
 		int plugins = 0;
 		int	running = 0;
@@ -52,18 +52,23 @@ void amx_command()
 			if ((*a).isValid() && !(*a).isPaused()) 
 				++running;
 
-			print_srvconsole(" [%3d] %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
+			print_srvconsole(" [%3d] %-23.22s %-8.7s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
 			++a;
 		}
 
 		a = g_plugins.begin();
 
+		int num = 0;
 		while (a)
 		{
+			num++;
 			if ((*a).getStatusCode() == ps_bad_load)
 			{
 				//error
-				print_srvconsole("Load fails: %s\n", (*a).getError());
+				print_srvconsole("(%3d) Load fails: %s\n", num, (*a).getError());
+			} else if ( (*a).getStatusCode() == ps_error) {
+				//error
+				print_srvconsole("(%3d) Error: %s\n", num, (*a).getError());
 			}
 			++a;
 		}
@@ -137,8 +142,11 @@ void amx_command()
 	}
 	else if (!strcmp(cmd, "version")) 
 	{
-		print_srvconsole("%s %s\n", Plugin_info.name, Plugin_info.version);
+		print_srvconsole("%s %s (%s)\n", Plugin_info.name, Plugin_info.version, Plugin_info.url);
-		print_srvconsole("Authors: %s  (%s)\n", "Felix \"SniperBeamer\" Geyer, David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko, Jonny \"Got His Gun\" Bergstrom, and Lukasz \"SidLuke\" Wlasinski.", Plugin_info.url);
+		print_srvconsole("Authors:\n\tDavid \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko\n");
+		print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n");
+		print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n");
+		print_srvconsole("\tBorja \"faluco\" Ferrer, Scott \"Damaged Soul\" Ehlert\n");
 		print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__);
 #if defined JIT && !defined ASM32
 		print_srvconsole("Core mode: JIT Only\n");
@@ -245,7 +253,6 @@ void amx_command()
 
 void plugin_srvcmd()
 {
-	cell ret = 0;
 	const char* cmd = CMD_ARGV(0);
 				
 	CmdMngr::iterator a = g_commands.srvcmdbegin();
@@ -254,7 +261,8 @@ void plugin_srvcmd()
 	{
 		if ((*a).matchCommand(cmd) && (*a).getPlugin()->isExecutable((*a).getFunction()))
 		{
-			cell ret = executeForwards((*a).getFunction(), g_srvindex, (*a).getFlags(), (*a).getId());
+			cell ret = executeForwards((*a).getFunction(), static_cast<cell>(g_srvindex),
+				static_cast<cell>((*a).getFlags()), static_cast<cell>((*a).getId()));
 			if (ret) break;
 		}
 		++a;

amxmodx/string.cpp

@@ -31,6 +31,9 @@
 
 #include <ctype.h>
 #include "amxmodx.h"
+#include "format.h"
+#include "binlog.h"
+#include "amxmod_compat.h"
 
 const char* stristr(const char* str, const char* substr)
 {
@@ -56,7 +59,18 @@ const char* stristr(const char* str, const char* substr)
 
 char* format_amxstring(AMX *amx, cell *params, int parm, int& len)
 {
+#if !defined BINLOG_ENABLED
 	return g_langMngr.FormatAmxString(amx, params, parm, len);
+#else
+	char *ans = g_langMngr.FormatAmxString(amx, params, parm, len);
+	if (g_binlog_level & 4)
+	{
+		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
+		if (pl)
+			g_BinLog.WriteOp(BinLog_FormatString, pl->getId(), parm, len, ans);
+	}
+	return ans;
+#endif
 }
 
 int amxstring_len(cell* a)
@@ -76,8 +90,17 @@ cell* get_amxaddr(AMX *amx, cell amx_addr)
 
 int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max)
 {
-	cell* dest = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
+	register cell* dest = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
-	cell* start = dest;
+	register cell* start = dest;
+
+#if defined BINLOG_ENABLED
+	if (g_binlog_level & 2)
+	{
+		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
+		if (pl)
+			g_BinLog.WriteOp(BinLog_SetString, pl->getId(), amx_addr, max, source);
+	}
+#endif
 	
 	while (max-- && *source)
 		*dest++ = (cell)*source++;
@@ -87,16 +110,74 @@ int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max)
 	return dest - start;
 }
 
-char* get_amxstring(AMX *amx, cell amx_addr, int id, int& len)
+extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, int maxlen)
+{
+	register cell *source = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
+	register char *dest = destination;
+	char *start = dest;
+
+	if ( (amx->flags & AMX_FLAG_OLDFILE) &&
+		(*source & BCOMPAT_TRANSLATE_BITS) )
+	{
+		const char *def, *key;
+		if (!translate_bcompat(amx, source, &key, &def))
+		{
+			goto normal_string;
+		}
+		while (maxlen-- && *def)
+			*dest++=(*source++);
+	} else {
+normal_string:
+		while (maxlen-- && *source)
+			*dest++=(char)(*source++);
+	}
+
+	*dest = '\0';
+
+#if defined BINLOG_ENABLED
+	if (g_binlog_level & 2)
+	{
+		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
+		if (pl)
+			g_BinLog.WriteOp(BinLog_GetString, pl->getId(), amx_addr, destination);
+	}
+#endif
+
+	return dest - start;
+}
+
+char *get_amxstring(AMX *amx, cell amx_addr, int id, int& len)
 {
 	static char buffor[4][3072];
 	register cell* source = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
 	register char* dest = buffor[id];
 	char* start = dest;
 
+	if ( (amx->flags & AMX_FLAG_OLDFILE) &&
+		 (*source & BCOMPAT_TRANSLATE_BITS) )
+	{
+		const char *def, *key;
+		if (!translate_bcompat(amx, source, &key, &def))
+		{
+			goto normal_string;
+		}
+		while ( (*dest++ = (*def++)) );
+		len = --dest - start;
+	} else {
+normal_string:
 		while ((*dest++=(char)(*source++)));
 
 		len = --dest - start;
+	}
+
+#if defined BINLOG_ENABLED
+	if (g_binlog_level & 2)
+	{
+		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
+		if (pl)
+			g_BinLog.WriteOp(BinLog_GetString, pl->getId(), amx_addr, start);
+	}
+#endif
 	
 	return start;
 }
@@ -146,62 +227,61 @@ char* parse_arg(char** line, int& state)
 	return arg;
 }
 
+bool fastcellcmp(cell *a, cell *b, cell len)
+{
+	while (len--)
+	{
+		if (*a++ != *b++)
+			return false;
+	}
+
+	return true;
+}
+
 static cell AMX_NATIVE_CALL replace(AMX *amx, cell *params) /* 4 param */
 {
-	static char buffor[3072];
+	cell *text = get_amxaddr(amx, params[1]);
+	cell len = params[2];
+	cell *what = get_amxaddr(amx, params[3]);
+	cell *with = get_amxaddr(amx, params[4]);
+	cell *textptr = text;
 
-	cell *a = get_amxaddr(amx, params[1]);
+	int withLen = amxstring_len(with);
-	cell *b = get_amxaddr(amx, params[3]);
+	int whatLen = amxstring_len(what);
-	cell *c = get_amxaddr(amx, params[4]);
+	int textLen = amxstring_len(text);
 
-	int iMain = amxstring_len(a);
+	if (whatLen > textLen)
-	int iWhat = amxstring_len(b);
+		return 0;
-	int iWith = amxstring_len(c);
-	int iPot = iMain + iWith - iWhat;
 
-	if (iPot >= params[2])
+	if (whatLen < 1)
 	{
-		amx_RaiseError(amx,AMX_ERR_NATIVE);
+		LogError(amx, AMX_ERR_NATIVE, "No search string specified.");
 		return 0;
 	}
 
-	char *d = buffor;
+	if (textLen - whatLen + withLen > len)
-	cell *x, *y, *z = a, *l = a;
-	int p = 0;
-	
-	while (*a)
 	{
-		if (*a == *b)
+		LogError(amx, AMX_ERR_NATIVE, "replace() buffer not big enough (%d>=%d)", (textLen - whatLen + withLen), len);
-		{
+		return 0;
-			x = a + 1;
-			y = b + 1;
-			p = 1;
-			if (!*y) break;
-			
-			while (*x == *y)
-			{
-				x++; y++; p++;
-				if (!*y) break;
 	}
 
-			if (!*y) break;
+	cell browsed = 0;
-			p = 0;
+	while (*text && (browsed <= (textLen-whatLen)))
-			*d++ = (char)*a++;
-			continue;
-		}
-		*d++ = (char)*a++;
-	}
-
-	if (p)
 	{
-		while (*c) *d++ = (char)*c++;
+		if (*text == *what)
-		a += p;
+		{
-		while (*a) *d++ = (char)*a++;
+			if (fastcellcmp(text, what, whatLen))
-		*d = 0;
+			{
-		d = buffor;
+				cell *saveptr = text + whatLen;
-		while (*d) *z++ = *d++;
+				cell restlen = textLen - (browsed + whatLen);
-		*z = 0;
+				textptr = text + withLen;
-		return (z - l);
+				memmove(textptr, saveptr, (restlen + 1) * sizeof(cell));
+				memcpy(text, with, withLen * sizeof(cell));
+				return (textLen - whatLen + withLen);
+			}
+		}
+		text++;
+		browsed++;
 	}
 	
 	return 0;
@@ -363,15 +443,42 @@ static cell AMX_NATIVE_CALL add(AMX *amx, cell *params) /* 4 param */
 static cell AMX_NATIVE_CALL copy(AMX *amx, cell *params) /* 4 param */
 {
 	cell *src = get_amxaddr(amx, params[3]);
-	cell *dest = get_amxaddr(amx, params[1]);
-	cell *start = dest;
 	int c = params[2];
 
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		if (*src & BCOMPAT_TRANSLATE_BITS)
+		{
+			const char *key, *def;
+			if (!translate_bcompat(amx, src, &key, &def))
+			{
+				goto normal_string;
+			}
+			cell *dest = get_amxaddr(amx, params[1]);
+			cell *start = dest;
+			while (c-- && *def)
+			{
+				*dest++ = static_cast<cell>(*def++);
+			}
+			*dest = '\0';
+
+			return dest-start;
+		} else {
+			goto normal_string;
+		}
+	} else {
+normal_string:
+		cell *dest = get_amxaddr(amx, params[1]);
+		cell *start = dest;
+		
 		while (c-- && *src)
-		*dest++ =* src++;
+		{
-	*dest = 0;
+			*dest++ = *src++;
+		}
+		*dest = '\0';
 
 		return (dest - start);
+	}
 }
 
 static cell AMX_NATIVE_CALL copyc(AMX *amx, cell *params) /* 4 param */
@@ -448,10 +555,73 @@ static cell AMX_NATIVE_CALL equali(AMX *amx, cell *params) /* 3 param */
 	return (f - l) ? 0 : 1;
 }
 
+static cell g_cpbuf[4096];
+
+static cell AMX_NATIVE_CALL formatex(AMX *amx, cell *params)
+{
+	cell *buf = get_amxaddr(amx, params[1]);
+	size_t maxlen = static_cast<size_t>(params[2]);
+    cell *fmt = get_amxaddr(amx, params[3]);
+	int param = 4;
+	size_t total = atcprintf(buf, maxlen, fmt, amx, params, &param);
+	return static_cast<cell>(total);
+}
+
 static cell AMX_NATIVE_CALL format(AMX *amx, cell *params) /* 3 param */
 {
-	int len;
+	cell *buf = get_amxaddr(amx, params[1]);
-	return set_amxstring(amx, params[1], format_amxstring(amx, params, 3, len), params[2]);
+	cell *fmt = get_amxaddr(amx, params[3]);
+	size_t maxlen = params[2];
+	/** 
+	 * SPECIAL CASE - check if the buffers overlap.
+	 *  some users, for whatever reason, do things like:
+	 *  format(buf, 255, buf....
+	 *  this is considered "deprecated" but we have to support it.
+	 * we do this by checking to see if reading from buf will overlap
+	 */
+	cell addr_start = params[1];
+	cell addr_end = params[1] + maxlen * sizeof(cell);
+	cell max = params[0] / sizeof(cell);
+	bool copy = false;
+	for (cell i = 3; i <= max; i++)
+	{
+		//does this clip the bounds?!?!? WELL, DOES IT!?!?! i am a loud dog
+		if (params[i] >= addr_start && params[i] <= addr_end)
+		{
+			copy = true;
+			break;
+		}
+	}
+	if (copy)
+		buf = g_cpbuf;
+	int param = 4;
+	size_t total = 0;
+
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		if (*fmt & BCOMPAT_TRANSLATE_BITS)
+		{
+			const char *key, *def;
+			if (!translate_bcompat(amx, fmt, &key, &def))
+			{
+				goto normal_string;
+			}
+			total = atcprintf(buf, maxlen, def, amx, params, &param);
+		} else {
+			goto normal_string;
+		}
+	} else {
+normal_string:
+		total = atcprintf(buf, maxlen, fmt, amx, params, &param);
+	}
+
+	if (copy)
+	{
+		/* copy back */
+		cell *old = get_amxaddr(amx, params[1]);
+		memcpy(old, g_cpbuf, (total+1) * sizeof(cell));
+	}
+	return total;
 }
 
 static cell AMX_NATIVE_CALL parse(AMX *amx, cell *params) /* 3 param */
@@ -664,73 +834,66 @@ static cell AMX_NATIVE_CALL amx_strtok(AMX *amx, cell *params)
 //strbreak(String[], First[], FirstLen, Rest[], RestLen)
 static cell AMX_NATIVE_CALL strbreak(AMX *amx, cell *params)	/* 5 param */
 {
-	bool quote_flag = false;
+	int _len;
-	bool done_flag = false;
+	bool in_quote = false;
-	int left_pos = 0;
+	bool had_quotes = false;
-	int right_pos = 0;
+	size_t i = 0;
-	int l = 0;
+	size_t beg = 0;
-	unsigned int i = 0;
-	char hold = '"';
 
-	char *string = get_amxstring(amx, params[1], 0, l);
+	char *string = get_amxstring(amx, params[1], 0, _len);
-	char *left = new char[strlen(string) + 1];
+	cell *left = get_amxaddr(amx, params[2]);
-	char *right = new char[strlen(string) + 1];
+	cell *right = get_amxaddr(amx, params[4]);
 	int LeftMax = params[3];
 	int RightMax = params[5];
 
-	for (i = 0; i < (unsigned int)l; i++)
+	size_t len = (size_t)_len;
-	{
-		if (string[i] == '"' && !quote_flag)
-		{
-			quote_flag = true;
-		}
-		else if (string[i] == '"' && quote_flag)
-		{
-			quote_flag = false;
-		}
 
-		if (isspace(string[i]) && !quote_flag && !done_flag)
+    while (isspace(string[i]) && i<len)
-		{
-			done_flag = true;
 		i++;
-		}
+    beg = i;
-		
+	for (; i<len; i++)
-		if (!done_flag && string[i]!='"')
 	{
-			if (left_pos < LeftMax)
+		if (string[i] == '"' && !in_quote)
 		{
-				left[left_pos] = string[i];
+			in_quote = (had_quotes = true);
-				
+		} else if (string[i] == '"' && in_quote) {
-				if (left[left_pos] == '\'')
+			in_quote = false;
-				{
+			if (i == len-1)
-					left[left_pos] = hold;
+				goto do_copy;
-				}
-				
-				left_pos++;
 		} else {
-				done_flag = true;
+			if (isspace(string[i]) && !in_quote)
-			}
-		} else {
-			if (right_pos < RightMax && string[i]!='"')
 			{
-				right[right_pos] = string[i];
+do_copy:
-				
+				size_t pos = i;
-				if (right[right_pos] == '\'')
+				while (isspace(string[i]))
+					i++;
+				const char *start = had_quotes ? &(string[beg+1]) : &(string[beg]);
+				size_t _end = had_quotes ? (i==len-1 ? 1 : 2) : 0;
+				size_t end = (pos - _end > (size_t)LeftMax) ? (size_t)LeftMax : pos - _end;
+				size_t to_go = end-beg;
+				if (end && to_go)
 				{
-					right[right_pos] = hold;
+					while (to_go--)
+						*left++ = (cell)*start++;
 				}
-				
+				*left = '\0';
-				right_pos++;
+				end = (len-i+1 > (size_t)RightMax) ? (size_t)RightMax : len-i+1;
+                if (end)
+				{
+					start = &(string[i]);
+					while (end--)
+						*right++ = (cell)*start++;
+				}
+				*right = '\0';
+				return 1;
 			}
 		}
 	}
 
-	left[left_pos] = '\0';
+	//if we got here, there was nothing to break
-	right[right_pos] = '\0';
+	set_amxstring(amx, params[2], &(string[beg]), LeftMax);
-	set_amxstring(amx, params[2], left, params[3]);
+	if (RightMax)
-	set_amxstring(amx, params[4], right, params[5]);
+		*right = '\0';
-	delete [] left;
-	delete [] right;
 
 	return 1;
 }
@@ -742,7 +905,7 @@ static cell AMX_NATIVE_CALL format_args(AMX *amx, cell *params)
 	
 	if (pos < 0)
 	{
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
+		LogError(amx, AMX_ERR_NATIVE, "Pos has to be a positive number");
 		return 0;
 	}
 
@@ -773,7 +936,6 @@ static cell AMX_NATIVE_CALL is_alpha(AMX *amx, cell *params)
 
 static cell AMX_NATIVE_CALL amx_ucfirst(AMX *amx, cell *params)
 {
-	int len = 0;
 	cell *str = get_amxaddr(amx, params[1]);
 	
 	if (!isalpha((char)str[0]) || !(str[0] & (1<<5)))
@@ -841,7 +1003,7 @@ static cell AMX_NATIVE_CALL n_strcmp(AMX *amx, cell *params)
 	char *str1 = get_amxstring(amx, params[1], 0, len);
 	char *str2 = get_amxstring(amx, params[2], 1, len);
 
-	if (params[1])
+	if (params[3])
 		return stricmp(str1, str2);
 	else
 		return strcmp(str1, str2);
@@ -854,7 +1016,6 @@ static cell AMX_NATIVE_CALL n_strfind(AMX *amx, cell *params)
 	int sublen;
 	char *sub = get_amxstring(amx, params[2], 1, sublen);
 
-	bool found = false;
 	bool igcase = params[3] ? true : false;
 	
 	if (igcase)
@@ -874,7 +1035,6 @@ static cell AMX_NATIVE_CALL n_strfind(AMX *amx, cell *params)
 	if (params[4] > len)
 		return -1;
 
-	char *pos = &(str[params[4]]);
 	char *find = strstr(str, sub);
 
 	if (!find)
@@ -883,6 +1043,67 @@ static cell AMX_NATIVE_CALL n_strfind(AMX *amx, cell *params)
 	return (find - str);
 }
 
+static cell AMX_NATIVE_CALL vformat(AMX *amx, cell *params)
+{
+	int vargPos = static_cast<int>(params[4]);
+
+	/** get the parent parameter array */
+	AMX_HEADER *hdr = (AMX_HEADER *)amx->base;
+	cell *local_params = (cell *)(
+		(char *)amx->base + (cell)hdr->dat +
+		(cell)amx->frm + (2 * sizeof(cell))
+		);
+
+	cell max = local_params[0] / sizeof(cell);
+	if (vargPos > (int)max + 1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid vararg parameter passed: %d", vargPos);
+		return 0;
+	}
+	
+	/**
+	 * check for bounds clipping
+	 */
+	cell addr_start = params[1];
+	cell addr_end = addr_start + params[2];
+	bool copy = false;
+	for (int i = vargPos; i <= max; i++)
+	{
+		//does this clip the bounds?
+		if ( (local_params[i] >= addr_start)
+			&& (local_params[i] <= addr_end) )
+		{
+			copy = true;
+			break;
+		}
+	}
+
+	/* get destination info */
+	cell *fmt = get_amxaddr(amx, params[3]);
+	cell *realdest = get_amxaddr(amx, params[1]);
+	size_t maxlen = static_cast<size_t>(params[2]);
+	cell *dest = realdest;
+
+	/* if this is necessary... */
+	static cell cpbuf[4096];
+	if (copy)
+		dest = cpbuf;
+
+	/* perform format */
+	size_t total = atcprintf(dest, maxlen, fmt, amx, local_params, &vargPos);
+
+	/* copy back */
+	if (copy)
+	{
+		memcpy(realdest, dest, (total+1) * sizeof(cell));
+	}
+
+	return total;
+}
+
+
+
+
 AMX_NATIVE_INFO string_Natives[] =
 {
 	{"add",				add},
@@ -893,6 +1114,7 @@ AMX_NATIVE_INFO string_Natives[] =
 	{"equal",			equal},
 	{"equali",			equali},
 	{"format",			format},
+	{"formatex",		formatex},
 	{"format_args",		format_args},
 	{"isdigit",			is_digit},
 	{"isalnum",			is_alnum},
@@ -917,5 +1139,6 @@ AMX_NATIVE_INFO string_Natives[] =
 	{"strcmp",			n_strcmp},
 	{"str_to_float",	str_to_float},
 	{"float_to_str",	float_to_str},
+	{"vformat",			vformat},
 	{NULL,				NULL}
 };

amxmodx/strptime.cpp

@@ -14,6 +14,16 @@
 #define strnicmp strncasecmp
 #endif
 
+#if _MSC_VER
+	#if _MSC_VER >= 1400
+		// MSVC8 - Replace POSIX stricmp with ISO C++ conformant one as it is deprecated
+		#define stricmp _stricmp
+
+		// Need this because of some stupid bug
+		#pragma warning (disable : 4996)
+	#endif
+#endif
+
 // this file does not include amxmodx.h, so we have to include the memory manager here
 #ifdef MEMORY_TEST
 #include "mmgr/mmgr.h"

amxmodx/util.cpp

@@ -32,7 +32,7 @@
 #include <time.h>
 #include "amxmodx.h"
 
-#ifdef __linux__
+#if defined __linux__ && !defined _vsnprintf
 	#define _vsnprintf vsnprintf
 #endif
 
@@ -347,3 +347,4 @@ void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1,
 	// unset the global "fake" flag
 	g_fakecmd.fake = false;
 }
+

amxmodx/vector.cpp

@@ -0,0 +1,205 @@
+/* AMX Mod X
+*
+* by the AMX Mod X Development Team
+*  originally developed by OLO
+*
+*
+*  This program is free software; you can redistribute it and/or modify it
+*  under the terms of the GNU General Public License as published by the
+*  Free Software Foundation; either version 2 of the License, or (at
+*  your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful, but
+*  WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+*  General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License
+*  along with this program; if not, write to the Free Software Foundation,
+*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*
+*  In addition, as a special exception, the author gives permission to
+*  link the code of this program with the Half-Life Game Engine ("HL
+*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
+*  L.L.C ("Valve"). You must obey the GNU General Public License in all
+*  respects for all of the code used other than the HL Engine and MODs
+*  from Valve. If you modify this file, you may extend this exception
+*  to your version of the file, but you are not obligated to do so. If
+*  you do not wish to do so, delete this exception statement from your
+*  version.
+*/
+
+#include "amxmodx.h"
+
+#define ANGLEVECTORS_FORWARD	1
+#define ANGLEVECTORS_RIGHT		2
+#define ANGLEVECTORS_UP			3
+
+static cell AMX_NATIVE_CALL get_distance(AMX *amx, cell *params)
+{
+	cell *cpVec1 = get_amxaddr(amx, params[1]);
+	cell *cpVec2 = get_amxaddr(amx, params[2]);
+
+	Vector vec1 = Vector((float)cpVec1[0], (float)cpVec1[1], (float)cpVec1[2]);
+	Vector vec2 = Vector((float)cpVec2[0], (float)cpVec2[1], (float)cpVec2[2]);
+
+	int iDist = (int)((vec1 - vec2).Length());
+
+	return iDist;
+}
+
+static cell AMX_NATIVE_CALL get_distance_f(AMX *amx, cell *params)
+{
+	cell *cpVec1 = get_amxaddr(amx, params[1]);
+	cell *cpVec2 = get_amxaddr(amx, params[2]);
+
+	Vector vec1 = Vector((float)amx_ctof(cpVec1[0]), (float)amx_ctof(cpVec1[1]), (float)amx_ctof(cpVec1[2]));
+	Vector vec2 = Vector((float)amx_ctof(cpVec2[0]), (float)amx_ctof(cpVec2[1]), (float)amx_ctof(cpVec2[2]));
+
+	REAL fDist = (REAL) (vec1 - vec2).Length();
+
+	return amx_ftoc(fDist);
+}
+
+static cell AMX_NATIVE_CALL VelocityByAim(AMX *amx, cell *params)
+{
+	int iEnt = params[1];
+	int iVelocity = params[2];
+	cell *vRet = get_amxaddr(amx, params[3]);
+	Vector vVector = Vector(0, 0, 0);
+	edict_t *pEnt = NULL;
+
+	if (iEnt < 0 || iEnt > gpGlobals->maxEntities)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Entity out of range (%d)", iEnt);
+		return 0;
+	}
+	else
+	{
+		if (iEnt > 0 && iEnt <= gpGlobals->maxClients)
+		{
+			if (!GET_PLAYER_POINTER_I(iEnt)->ingame)
+			{
+				LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (not ingame)", iEnt);
+				return 0;
+			}
+			pEnt = GET_PLAYER_POINTER_I(iEnt)->pEdict;
+		} else {
+			pEnt = INDEXENT(iEnt);
+		}
+	}
+
+	if (!pEnt)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d (nullent)", iEnt);
+		return 0;
+	}
+
+	MAKE_VECTORS(pEnt->v.v_angle);
+	vVector = gpGlobals->v_forward * iVelocity;
+
+	vRet[0] = FloatToCell(vVector.x);
+	vRet[1] = FloatToCell(vVector.y);
+	vRet[2] = FloatToCell(vVector.z);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL vector_to_angle(AMX *amx, cell *params)
+{
+	cell *cAddr = get_amxaddr(amx, params[1]);
+
+	REAL fX = amx_ctof(cAddr[0]);
+	REAL fY = amx_ctof(cAddr[1]);
+	REAL fZ = amx_ctof(cAddr[2]);
+
+	Vector vVector = Vector(fX, fY, fZ);
+	Vector vAngle = Vector(0, 0, 0);
+	VEC_TO_ANGLES(vVector, vAngle);
+
+	cell *vRet = get_amxaddr(amx, params[2]);
+
+	vRet[0] = FloatToCell(vAngle.x);
+	vRet[1] = FloatToCell(vAngle.y);
+	vRet[2] = FloatToCell(vAngle.z);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL angle_vector(AMX *amx, cell *params)
+{
+	Vector v_angles, v_forward, v_right, v_up, v_return;
+
+	cell *vCell = get_amxaddr(amx, params[1]);
+	v_angles.x = amx_ctof(vCell[0]);
+	v_angles.y = amx_ctof(vCell[1]);
+	v_angles.z = amx_ctof(vCell[2]);
+
+	g_engfuncs.pfnAngleVectors(v_angles, v_forward, v_right, v_up);
+
+	switch (params[2])
+	{
+	case ANGLEVECTORS_FORWARD:
+		v_return = v_forward;
+		break;
+	case ANGLEVECTORS_RIGHT:
+		v_return = v_right;
+		break;
+	case ANGLEVECTORS_UP:
+		v_return = v_up;
+		break;
+	}
+
+	vCell = get_amxaddr(amx, params[3]);
+	vCell[0] = FloatToCell(v_return.x);
+	vCell[1] = FloatToCell(v_return.y);
+	vCell[2] = FloatToCell(v_return.z);
+
+	return 1;
+}
+
+static cell AMX_NATIVE_CALL vector_length(AMX *amx, cell *params)
+{
+	cell *cAddr = get_amxaddr(amx, params[1]);
+
+	REAL fX = amx_ctof(cAddr[0]);
+	REAL fY = amx_ctof(cAddr[1]);
+	REAL fZ = amx_ctof(cAddr[2]);
+
+	Vector vVector = Vector(fX, fY, fZ);
+
+	REAL fLength = vVector.Length();
+
+	return amx_ftoc(fLength);
+}
+
+static cell AMX_NATIVE_CALL vector_distance(AMX *amx, cell *params)
+{
+	cell *cAddr = get_amxaddr(amx, params[1]);
+	cell *cAddr2 = get_amxaddr(amx, params[2]);
+
+	REAL fX = amx_ctof(cAddr[0]);
+	REAL fY = amx_ctof(cAddr[1]);
+	REAL fZ = amx_ctof(cAddr[2]);
+	REAL fX2 = amx_ctof(cAddr2[0]);
+	REAL fY2 = amx_ctof(cAddr2[1]);
+	REAL fZ2 = amx_ctof(cAddr2[2]);
+
+	Vector vVector = Vector(fX, fY, fZ);
+	Vector vVector2 = Vector(fX2, fY2, fZ2);
+
+	REAL fLength = (vVector - vVector2).Length();
+
+	return amx_ftoc(fLength);
+}
+
+AMX_NATIVE_INFO vector_Natives[] = {
+	{"get_distance",		get_distance},
+	{"get_distance_f",		get_distance_f},
+	{"velocity_by_aim",		VelocityByAim},
+	{"vector_to_angle",		vector_to_angle},
+	{"angle_vector",		angle_vector},
+	{"vector_length",		vector_length},
+	{"vector_distance",		vector_distance},
+	{NULL,					NULL},
+};

amxmodx/version.rc

@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,0,0
+ FILEVERSION 1,7,6,2
- PRODUCTVERSION 1,6,0,0
+ PRODUCTVERSION 1,7,6,2
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "AMX Mod X"
             VALUE "FileDescription", "AMX Mod X"
-            VALUE "FileVersion", "1.60"
+            VALUE "FileVersion", "1.76b"
             VALUE "InternalName", "amxmodx"
-            VALUE "LegalCopyright", "Copyright (c) 2004-2005, AMX Mod X Dev Team"
+            VALUE "LegalCopyright", "Copyright (c) 2004-2006, AMX Mod X Dev Team"
             VALUE "OriginalFilename", "amxmodx_mm.dll"
             VALUE "ProductName", "AMX Mod X"
-            VALUE "ProductVersion", "1.60"
+            VALUE "ProductVersion", "1.76b"
         END
     END
     BLOCK "VarFileInfo"

compiler/amxxpc/Makefile

@@ -3,9 +3,9 @@
 
 ### EDIT BELOW FOR OTHER PROJECTS ###
 
-OPT_FLAGS = -O3 -funroll-loops -s -pipe
+OPT_FLAGS = -O3 -funroll-loops -s -pipe -fno-strict-aliasing
 DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
+CPP = gcc-4.1
 BINARY = amxxpc
 
 OBJECTS = amx.cpp amxxpc.cpp Binary.cpp

compiler/amxxpc/amxxpc.cpp

@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 	}
 
 	pc_printf("Welcome to the AMX Mod X %s Compiler.\n", VERSION_STRING);
-	pc_printf("Copyright (c) 1997-2005 ITB CompuPhase, AMX Mod X Team\n\n");
+	pc_printf("Copyright (c) 1997-2006 ITB CompuPhase, AMX Mod X Team\n\n");
 	
 	if (argc < 2)
 	{

compiler/amxxpc/amxxpc.h

@@ -1,9 +1,7 @@
 #ifndef _AMXXSC_INCLUDE_H
 #define _AMXXSC_INCLUDE_H
 
-#define VERSION_STRING		"1.60-300"
+#define VERSION_STRING		"1.76-300"
-#define VERSION				03000
-#define MAGIC_HEADER		0x414D5842
 #define MAGIC_HEADER2		0x414D5858
 #define	MAGIC_VERSION		0x0300
 

compiler/libpc300/Makefile

@@ -3,13 +3,14 @@
 
 ### EDIT BELOW FOR OTHER PROJECTS ###
 
-OPT_FLAGS = -O3 -funroll-loops -s -pipe
+OPT_FLAGS = -O3 -funroll-loops -s -pipe -fno-strict-aliasing -fvisibility=hidden
 DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
+CPP = gcc-4.1
 NAME = amxxpc
 
 OBJECTS = sc1.c sc2.c sc3.c sc4.c sc5.c sc6.c sc7.c scvars.c scmemfil.c \
-	scstate.c sclist.c sci18n.c scexpand.c pawncc.c libpawnc.c prefix.c
+	scstate.c sclist.c sci18n.c scexpand.c pawncc.c libpawnc.c prefix.c \
+	memfile.c
 
 LINK = -lpthread
 

compiler/libpc300/libpawnc.c

@@ -52,7 +52,7 @@
   __declspec (dllexport)
   void EXCOMPILER(int argc, char **argv)
 # else
-  void extern EXCOMPILER(int argc, char **argv)
+  void extern __attribute__((visibility("default"))) EXCOMPILER(int argc, char **argv)
 # endif
   {
 	  pc_compile(argc, argv);
@@ -70,7 +70,7 @@
  __declspec (dllexport)
 int pc_printf(const char *message,...)
 #else
-extern int pc_printf(const char *message,...)
+extern int __attribute__((visibility("default"))) pc_printf(const char *message,...)
 #endif
 #else
 int pc_printf(const char *message, ...)

compiler/libpc300/libpc300.vcproj

@@ -4,6 +4,7 @@
 	Version="7.10"
 	Name="libpc300"
 	ProjectGUID="{19B72687-080B-437A-917A-12AEB0031635}"
+	RootNamespace="libpc300"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -309,6 +310,9 @@
 			<File
 				RelativePath=".\libpawnc.c">
 			</File>
+			<File
+				RelativePath=".\memfile.c">
+			</File>
 			<File
 				RelativePath=".\sc1.c">
 			</File>
@@ -356,6 +360,9 @@
 			<File
 				RelativePath=".\amx.h">
 			</File>
+			<File
+				RelativePath=".\memfile.h">
+			</File>
 			<File
 				RelativePath=".\sc.h">
 			</File>
@@ -367,6 +374,12 @@
 			<File
 				RelativePath=".\libpawnc.rc">
 			</File>
+			<File
+				RelativePath=".\sc5.scp">
+			</File>
+			<File
+				RelativePath=".\sc7.scp">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

compiler/libpc300/memfile.c

@@ -0,0 +1,105 @@
+#include "memfile.h"
+#include <string.h>
+#include "osdefs.h"
+
+memfile_t *memfile_creat(const char *name, size_t init)
+{
+	memfile_t mf;
+	memfile_t *pmf;
+
+	mf.size = init;
+	mf.base = (char *)malloc(init);
+	mf.usedoffs = 0;
+	if (!mf.base)
+	{
+		return NULL;
+	}
+
+	mf.offs = 0;
+	mf._static = 0;
+
+	pmf = (memfile_t *)malloc(sizeof(memfile_t));
+	memcpy(pmf, &mf, sizeof(memfile_t));
+
+	pmf->name = strdup(name);
+
+	return pmf;
+}
+
+void memfile_destroy(memfile_t *mf)
+{
+	if (!mf->_static)
+	{
+		free(mf->name);
+		free(mf->base);
+		free(mf);
+	}
+}
+
+void memfile_seek(memfile_t *mf, long seek)
+{
+	mf->offs = seek;
+}
+
+long memfile_tell(memfile_t *mf)
+{
+	return mf->offs;
+}
+
+size_t memfile_read(memfile_t *mf, void *buffer, size_t maxsize)
+{
+	if (!maxsize || mf->offs >= mf->usedoffs)
+	{
+		return 0;
+	}
+
+	if (mf->usedoffs - mf->offs < (long)maxsize)
+	{
+		maxsize = mf->usedoffs - mf->offs;
+		if (!maxsize)
+		{
+			return 0;
+		}
+	}
+
+	memcpy(buffer, mf->base + mf->offs, maxsize);
+
+	mf->offs += maxsize;
+
+	return maxsize;
+}
+
+int memfile_write(memfile_t *mf, void *buffer, size_t size)
+{
+	if (mf->offs + size > mf->size)
+	{
+		size_t newsize = (mf->size + size) * 2;
+		if (mf->_static)
+		{
+			char *oldbase = mf->base;
+			mf->base = (char *)malloc(newsize);
+			if (!mf->base)
+			{
+				return 0;
+			}
+			memcpy(mf->base, oldbase, mf->size);
+		} else {
+			mf->base = (char *)realloc(mf->base, newsize);
+			if (!mf->base)
+			{
+				return 0;
+			}
+		}
+		mf->_static = 0;
+		mf->size = newsize;
+	}
+	memcpy(mf->base + mf->offs, buffer, size);
+	mf->offs += size;
+
+	if (mf->offs > mf->usedoffs)
+	{
+		mf->usedoffs = mf->offs;
+	}
+
+	return 1;
+}

compiler/libpc300/memfile.h

@@ -0,0 +1,23 @@
+#ifndef _INCLUDE_MEMFILE_H
+#define _INCLUDE_MEMFILE_H
+
+#include <malloc.h>
+
+typedef struct memfile_s
+{
+	char *name;
+	char *base;
+	long offs;
+	long usedoffs;
+	size_t size;
+	int _static;
+} memfile_t;
+
+memfile_t *memfile_creat(const char *name, size_t init);
+void memfile_destroy(memfile_t *mf);
+void memfile_seek(memfile_t *mf, long seek);
+int memfile_write(memfile_t *mf, void *buffer, size_t size);
+size_t memfile_read(memfile_t *mf, void *buffer, size_t maxsize);
+long memfile_tell(memfile_t *mf);
+
+#endif //_INCLUDE_MEMFILE_H

compiler/libpc300/sc.h

@@ -446,7 +446,7 @@ int pc_enablewarning(int number,int enable);
  __declspec (dllexport)
 int pc_printf(const char *message,...);
 #else
-extern int pc_printf(const char *message,...);
+extern int __attribute__((visibility("default"))) pc_printf(const char *message,...);
 #endif
 #else
 int pc_printf(const char *message, ...) INVISIBLE;

compiler/libpc300/sc1.c

@@ -61,8 +61,10 @@
   #include <windows.h>
 #endif
 
+#include <time.h>
+
 #include "sc.h"
-#define VERSION_STR "3.0.3367"
+#define VERSION_STR "3.0.3367-amxx"
 #define VERSION_INT 0x300
 
 static void resetglobals(void);
@@ -125,6 +127,7 @@ static void dostate(void);
 static void addwhile(int *ptr);
 static void delwhile(void);
 static int *readwhile(void);
+static void inst_datetime_defines(void);
 
 static int lastst     = 0;      /* last executed statement type */
 static int nestlevel  = 0;      /* number of active (open) compound statements */
@@ -382,6 +385,23 @@ long pc_lengthbin(void *handle)
 
 #endif  /* !defined NO_MAIN */
 
+void inst_datetime_defines()
+{
+  char date[64];
+  char ltime[64];
+  time_t td;
+  struct tm *curtime;
+
+  time(&td);
+  curtime = localtime(&td);
+
+  strftime(date, 31, "\"%m/%d/%Y\"", curtime);
+  strftime(ltime, 31, "\"%H:%M:%S\"", curtime);
+
+  insert_subst("__DATE__", date, 8);
+  insert_subst("__TIME__", ltime, 8);
+}
+
 
 /*  "main" of the compiler
  */
@@ -531,6 +551,7 @@ int pc_compile(int argc, char *argv[])
     delete_symbols(&glbtab,0,TRUE,FALSE);
     #if !defined NO_DEFINE
       delete_substtable();
+      inst_datetime_defines();
     #endif
     resetglobals();
     sc_ctrlchar=sc_ctrlchar_org;
@@ -545,7 +566,6 @@ int pc_compile(int argc, char *argv[])
     fline=skipinput;            /* reset line number */
     sc_reparse=FALSE;           /* assume no extra passes */
     sc_status=statFIRST;        /* resetglobals() resets it to IDLE */
-
     if (strlen(incfname)>0) {
       if (strcmp(incfname,sDEF_PREFIX)==0) {
         plungefile(incfname,FALSE,TRUE);    /* parse "default.inc" */
@@ -595,6 +615,7 @@ int pc_compile(int argc, char *argv[])
   delete_symbols(&glbtab,0,TRUE,FALSE);
   #if !defined NO_DEFINE
     delete_substtable();
+    inst_datetime_defines();
   #endif
   resetglobals();
   sc_ctrlchar=sc_ctrlchar_org;
@@ -1227,7 +1248,10 @@ static void setconfig(char *root)
       GetModuleFileName(NULL,path,_MAX_PATH);
     #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
       /* see www.autopackage.org for the BinReloc module */
-      strncpy(path,SELFPATH,sizeof path);
+      ptr = SELFPATH;
+      if (!ptr)
+        ptr = root;
+      strncpy(path,ptr,sizeof path);
     #else
       if (root!=NULL)
         strncpy(path,root,sizeof path); /* path + filename (hopefully) */
@@ -3300,9 +3324,8 @@ static int newfunc(char *firstname,int firsttag,int fpublic,int fstatic,int stoc
 
 static int argcompare(arginfo *a1,arginfo *a2)
 {
-  int result,level,i;
+  int result=1,level,i;
 
-  result= strcmp(a1->name,a2->name)==0;     /* name */
   if (result)
     result= a1->ident==a2->ident;           /* type/class */
   if (result)

compiler/libpc300/sc2.c

@@ -1016,8 +1016,29 @@ static int command(void)
           } /* if */
         } else if (strcmp(str,"dynamic")==0) {
           preproc_expr(&sc_stksize,NULL);
-        } else if (strcmp(str,"library")==0) {
+		} else if ( !strcmp(str,"library") ||
-          char name[sNAMEMAX+1];
+                    !strcmp(str, "reqlib") ||
+                    !strcmp(str, "reqclass") ||
+                    !strcmp(str, "loadlib") ||
+                    !strcmp(str, "explib") || 
+                    !strcmp(str, "expclass") || 
+                    !strcmp(str, "defclasslib") ) {
+          char name[sNAMEMAX+1],sname[sNAMEMAX+1];
+          const char *prefix = "";
+          sname[0] = '\0';
+          sname[1] = '\0';
+          if (!strcmp(str, "reqlib"))
+            prefix = "?rl_";
+          else if (!strcmp(str, "reqclass"))
+            prefix = "?rc_";
+          else if (!strcmp(str, "loadlib"))
+            prefix = "?f_";
+          else if (!strcmp(str, "explib"))
+            prefix = "?el_";
+          else if (!strcmp(str, "expclass"))
+            prefix = "?ec_";
+          else if (!strcmp(str, "defclasslib"))
+            prefix = "?d_";
           while (*lptr<=' ' && *lptr!='\0')
             lptr++;
           if (*lptr=='"') {
@@ -1027,6 +1048,20 @@ static int command(void)
             for (i=0; i<sizeof name && (alphanum(*lptr) || *lptr=='-'); i++,lptr++)
               name[i]=*lptr;
             name[i]='\0';
+            if (!strncmp(str, "exp", 3) || !strncmp(str, "def", 3))
+            {
+              while (*lptr && isspace(*lptr))
+                lptr++;
+              for (i=1; i<sizeof sname && alphanum(*lptr); i++,lptr++)
+                sname[i]=*lptr;
+              sname[i] = '\0';
+              if (!sname[1])
+              {
+                error(45);
+              } else {
+                sname[0] = '_';
+              }
+			}
           } /* if */
           if (strlen(name)==0) {
             curlibrary=NULL;
@@ -1034,8 +1069,22 @@ static int command(void)
             pc_addlibtable=FALSE;
           } else {
             /* add the name if it does not yet exist in the table */
-            if (find_constval(&libname_tab,name,0)==NULL)
+            char newname[sNAMEMAX+1];
-              curlibrary=append_constval(&libname_tab,name,0,0);
+            if (strlen(name) + strlen(prefix) + strlen(sname) <= sNAMEMAX)
+			{
+              strcpy(newname, prefix);
+              strcat(newname, name);
+              strcat(newname, sname);
+              if (newname[0] != '?')
+			  {
+                if (find_constval(&libname_tab,newname,0)==NULL)
+			    {
+                  curlibrary=append_constval(&libname_tab,newname,0,0);
+			    }
+			  } else {
+                exporttag(pc_addtag(newname));
+			  }
+			}
           } /* if */
         } else if (strcmp(str,"pack")==0) {
           cell val;
@@ -1189,6 +1238,7 @@ static int command(void)
 #endif
 #if !defined NO_DEFINE
   case tpDEFINE: {
+    int flag=0;
     ret=CMD_DEFINE;
     if (!SKIPPING) {
       char *pattern,*substitution;
@@ -1200,7 +1250,13 @@ static int command(void)
         lptr++;
       start=lptr;       /* save starting point of the match pattern */
       count=0;
-      while (*lptr>' ' && *lptr!='\0') {
+      while (*lptr!='\0') {
+        if (*lptr=='(')
+          flag=1;
+        if (flag && *lptr==')')
+          flag=0;
+        if (!flag && *lptr<=' ')
+          break;
         litchar(&lptr,0); /* litchar() advances "lptr" and handles escape characters */
         count++;
       } /* while */

compiler/libpc300/sc3.c

@@ -375,7 +375,13 @@ static int skim(int *opstr,void (*testfunc)(int),int dropval,int endval,
         droplab=getlabel();
       } /* if */
       dropout(lvalue,testfunc,droplab,lval);
+      if (!lvalue && sc_intest && (lval->ident==iARRAY || lval->ident==iREFARRAY)) {
+        error(33, lval->sym ? (lval->sym->name ? lval->sym->name : "-unknown") : "-unknown-");  /* array was not indexed in an expression */
+      }
     } else if (hits) {                       /* no (more) identical operators */
+      if (!lvalue && sc_intest && (lval->ident==iARRAY || lval->ident==iREFARRAY)) {
+        error(33, lval->sym ? (lval->sym->name ? lval->sym->name : "-unknown") : "-unknown-");  /* array was not indexed in an expression */
+      }
       dropout(lvalue,testfunc,droplab,lval); /* found at least one operator! */
       ldconst(endval,sPRI);
       jumplabel(endlab=getlabel());
@@ -987,6 +993,8 @@ static int hier13(value *lval)
     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) {
@@ -1003,6 +1011,10 @@ static int hier13(value *lval)
     sc_allowtags=(short)POPSTK_I();     /* restore */
     jumplabel(flab2);
     setlabel(flab1);
+    if (orig_heap!=decl_heap) {
+      diff1=abs(decl_heap-orig_heap);
+      decl_heap=orig_heap;
+    }
     needtoken(':');
     if (hier13(&lval2))
       rvalue(&lval2);
@@ -1011,10 +1023,10 @@ static int hier13(value *lval)
     array1= (lval->ident==iARRAY || lval->ident==iREFARRAY);
     array2= (lval2.ident==iARRAY || lval2.ident==iREFARRAY);
     if (array1 && !array2) {
-      char *ptr=(lval->sym->name!=NULL) ? lval->sym->name : "-unknown-";
+      char *ptr=(lval->sym!=NULL && lval->sym->name!=NULL) ? lval->sym->name : "-unknown-";
       error(33,ptr);            /* array must be indexed */
     } else if (!array1 && array2) {
-      char *ptr=(lval2.sym->name!=NULL) ? lval2.sym->name : "-unknown-";
+      char *ptr=(lval2.sym!=NULL && lval2.sym->name!=NULL) ? lval2.sym->name : "-unknown-";
       error(33,ptr);            /* array must be indexed */
     } /* if */
     /* ??? if both are arrays, should check dimensions */
@@ -1025,6 +1037,15 @@ static int hier13(value *lval)
       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;
@@ -1593,7 +1614,7 @@ restart:
       error(76);                /* invalid function call, or syntax error */
     } /* if */
     return FALSE;
-  } /* if */
+  }
   return lvalue;
 }
 
@@ -1896,7 +1917,7 @@ static int nesting=0;
       if (matchtoken('_')) {
         arglist[argpos]=ARG_IGNORED;  /* flag argument as "present, but ignored" */
         if (arg[argidx].ident==0 || arg[argidx].ident==iVARARGS) {
-          error(202);             /* argument count mismatch */
+          error(88);             /* argument count mismatch */
         } else if (!arg[argidx].hasdefault) {
           error(34,nargs+1);      /* argument has no default value */
         } /* if */
@@ -1912,7 +1933,7 @@ static int nesting=0;
         lvalue=hier14(&lval);
         switch (arg[argidx].ident) {
         case 0:
-          error(202);             /* argument count mismatch */
+          error(88);             /* argument count mismatch */
           break;
         case iVARARGS:
           /* always pass by reference */
@@ -1920,7 +1941,7 @@ static int nesting=0;
             assert(lval.sym!=NULL);
             if ((lval.sym->usage & uCONST)!=0 && (arg[argidx].usage & uCONST)==0) {
               /* treat a "const" variable passed to a function with a non-const
-               * "variable argument list" as a constant here */
+               * "variable argument flist" as a constant here */
               assert(lvalue);
               rvalue(&lval);      /* get value in PRI */
               setheap_pri();      /* address of the value on the heap in PRI */
@@ -2132,7 +2153,7 @@ static int nesting=0;
       markexpr(sPARM,NULL,0);   /* mark the end of a sub-expression */
       nest_stkusage++;
     } else {
-      error(202,argidx);        /* argument count mismatch */
+      error(88,argidx);        /* argument count mismatch */
     } /* if */
     if (arglist[argidx]==ARG_UNHANDLED)
       nargs++;

compiler/libpc300/sc5.scp

@@ -125,7 +125,8 @@ static char *errmsg[] = {
 /*084*/  "state conflict: one of the states is already assigned to another implementation (symbol \"%s\")\n",
 /*085*/  "no states are defined for function \"%s\"\n",
 /*086*/  "unknown automaton \"%s\"\n",
-/*087*/  "unknown state \"%s\" for automaton \"%s\"\n"
+/*087*/  "unknown state \"%s\" for automaton \"%s\"\n",
+/*088*/  "number of arguments does not match definition\n"
 #else
   "\267pect\233\277k\210:\242\312bu\202fo\217\206\216\012",
   "\201l\223\247s\203g\361\326\373\202(\254\355\201) c\350f\246\356w ea\273 \042c\342e\042\012",
@@ -213,7 +214,8 @@ static char *errmsg[] = {
   "\326\200\302flict: \201\200\300\266\200\326\325\274\212\222ad\223a\250gn\233\277 a\221\266\270i\357l\373\320\231\364",
   "\376\326\325\204\200\323\233f\254\251\216\012",
   "\217k\221w\346au\277\334\201\311",
-  "\217k\221w\346\326\200\216 f\254au\277\334\201\311"
+  "\217k\221w\346\326\200\216 f\254au\277\334\201\311",
+  "\374\270\300\265t\207do\325\241\334\273 \323i\213\012"
 #endif
        };
 

compiler/libpc300/sclist.c

@@ -236,6 +236,15 @@ static stringlist includepaths = {NULL, NULL};  /* directory list for include fi
 
 SC_FUNC stringlist *insert_path(char *path)
 {
+  char *extra_path = malloc(strlen(path) + 16);
+  strcpy(extra_path, path);
+#if defined __linux__
+  strcat(extra_path, "/amxmod_compat/");
+#else if defined WIN32 || defined _WIN32
+  strcat(extra_path, "\\amxmod_compat\\");
+#endif
+  insert_string(&includepaths, extra_path);
+  free(extra_path);
   return insert_string(&includepaths,path);
 }
 

compiler/libpc300/scmemfil.c

@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include "memfile.h"
 
 #if defined FORTIFY
   #include "fortify.h"
@@ -44,11 +45,7 @@
  *   buffer points to the "file name"
  *   bufpos is the current "file pointer"
  */
-typedef struct tagMEMFILE {
+typedef memfile_t MEMFILE;
-  struct tagMEMFILE *next;
-  unsigned char *buffer;
-  long bufpos;
-} MEMFILE;
 #define tMEMFILE  1
 
 #include "sc.h"
@@ -56,33 +53,12 @@ typedef struct tagMEMFILE {
 
 MEMFILE *mfcreate(char *filename)
 {
-  MEMFILE *mf;
+  return memfile_creat(filename, 4096);
-
-  /* create a first block that only holds the name */
-  mf=(MEMFILE*)malloc(sizeof(MEMFILE));
-  if (mf==NULL)
-    return NULL;
-  memset(mf,0,sizeof(MEMFILE));
-  mf->buffer=(unsigned char*)strdup(filename);
-  if (mf->buffer==NULL) {
-    free(mf);
-    return NULL;
-  } /* if */
-  return mf;
 }
 
 void mfclose(MEMFILE *mf)
 {
-  MEMFILE *next;
+  memfile_destroy(mf);
-
-  assert(mf!=NULL);
-  while (mf!=NULL) {
-    next=mf->next;
-    assert(mf->buffer!=NULL);
-    free(mf->buffer);
-    free(mf);
-    mf=next;
-  } /* while */
 }
 
 int mfdump(MEMFILE *mf)
@@ -92,19 +68,12 @@ int mfdump(MEMFILE *mf)
 
   assert(mf!=NULL);
   /* create the file */
-  fp=fopen((char*)mf->buffer,"wb");
+  fp=fopen(mf->name, "wb");
   if (fp==NULL)
     return 0;
 
   okay=1;
-  mf=mf->next;
+  okay = okay & (fwrite(mf->base, mf->usedoffs, 1, fp)==(size_t)mf->usedoffs);
-  while (mf!=NULL) {
-    assert(mf->buffer!=NULL);
-    /* all blocks except the last should be fully filled */
-    assert(mf->next==NULL || (unsigned long)mf->bufpos==BUFFERSIZE);
-    okay=okay && fwrite(mf->buffer,1,(size_t)mf->bufpos,fp)==(size_t)mf->bufpos;
-    mf=mf->next;
-  } /* while */
 
   fclose(fp);
   return okay;
@@ -112,19 +81,7 @@ int mfdump(MEMFILE *mf)
 
 long mflength(MEMFILE *mf)
 {
-  long length;
+  return mf->usedoffs;
-
-  assert(mf!=NULL);
-  /* find the size of the memory file */
-  length=0L;
-  mf=mf->next;          /* skip initial block */
-  while (mf!=NULL) {
-    assert(mf->next==NULL || (unsigned long)mf->bufpos==BUFFERSIZE);
-    length+=mf->bufpos;
-    mf=mf->next;
-  } /* while */
-
-  return length;
 }
 
 long mfseek(MEMFILE *mf,long offset,int whence)
@@ -132,7 +89,7 @@ long mfseek(MEMFILE *mf,long offset,int whence)
   long length;
 
   assert(mf!=NULL);
-  if (mf->next==NULL)
+  if (mf->usedoffs == 0)
     return 0L;          /* early exit: not a single byte in the file */
 
   /* find the size of the memory file */
@@ -143,7 +100,7 @@ long mfseek(MEMFILE *mf,long offset,int whence)
   case SEEK_SET:
     break;
   case SEEK_CUR:
-    offset+=mf->bufpos;
+    offset+=mf->offs;
     break;
   case SEEK_END:
     assert(offset<=0);
@@ -158,136 +115,18 @@ long mfseek(MEMFILE *mf,long offset,int whence)
     offset=length;
 
   /* set new position and return it */
-  mf->bufpos=offset;
+  memfile_seek(mf, offset);
   return offset;
 }
 
 unsigned int mfwrite(MEMFILE *mf,unsigned char *buffer,unsigned int size)
 {
-  long length;
+  return (memfile_write(mf, buffer, size) ? size : 0);
-  long numblocks;
-  int blockpos,blocksize;
-  unsigned int bytes;
-  MEMFILE *block;
-
-  assert(mf!=NULL);
-
-  /* see whether more memory must be allocated */
-  length=mflength(mf);
-  assert(mf->bufpos>=0 && mf->bufpos<=length);
-  numblocks=(length+BUFFERSIZE-1)/BUFFERSIZE;   /* # allocated blocks */
-  while (mf->bufpos+size>numblocks*BUFFERSIZE) {
-    /* append a block */
-    MEMFILE *last;
-    block=(MEMFILE*)malloc(sizeof(MEMFILE));
-    if (block==NULL)
-      return 0;
-    memset(block,0,sizeof(MEMFILE));
-    block->buffer=(unsigned char*)malloc(BUFFERSIZE);
-    if (block->buffer==NULL) {
-      free(block);
-      return 0;
-    } /* if */
-    for (last=mf; last->next!=NULL; last=last->next)
-      /* nothing */;
-    assert(last!=NULL);
-    assert(last->next==NULL);
-    last->next=block;
-    numblocks++;
-  } /* while */
-
-  if (size==0)
-    return 0;
-
-  /* find the block to start writing to */
-  numblocks=mf->bufpos/BUFFERSIZE;      /* # blocks to skip */
-  block=mf->next;
-  while (numblocks-->0) {
-    assert(block!=NULL);
-    block=block->next;
-  } /* while */
-  assert(block!=NULL);
-
-  /* copy into memory */
-  bytes=0;
-  blockpos=(int)(mf->bufpos % BUFFERSIZE);
-  do {
-    blocksize=BUFFERSIZE-blockpos;
-    assert(blocksize>=0);
-    if ((unsigned int)blocksize>size)
-      blocksize=size;
-
-    assert(block!=NULL);
-    memcpy(block->buffer+blockpos,buffer,blocksize);
-    buffer+=blocksize;
-    size-=blocksize;
-    bytes+=blocksize;
-
-    if (blockpos+blocksize>block->bufpos)
-      block->bufpos=blockpos+blocksize;
-    assert(block->bufpos>=0 && (unsigned long)block->bufpos<=BUFFERSIZE);
-    block=block->next;
-    blockpos=0;
-  } while (size>0);
-
-  /* adjust file pointer */
-  mf->bufpos+=bytes;
-
-  return bytes;
 }
 
 unsigned int mfread(MEMFILE *mf,unsigned char *buffer,unsigned int size)
 {
-  long length;
+  return memfile_read(mf, buffer, size);
-  long numblocks;
-  int blockpos,blocksize;
-  unsigned int bytes;
-  MEMFILE *block;
-
-  assert(mf!=NULL);
-
-  /* adjust the size to read */
-  length=mflength(mf);
-  assert(mf->bufpos>=0 && mf->bufpos<=length);
-  if (mf->bufpos+size>(unsigned long)length)
-    size=(int)(length-mf->bufpos);
-  assert(mf->bufpos+size<=(unsigned long)length);
-  if (size==0)
-    return 0;
-
-  /* find the block to start reading from */
-  numblocks=mf->bufpos/BUFFERSIZE;      /* # blocks to skip */
-  block=mf->next;
-  while (numblocks-->0) {
-    assert(block!=NULL);
-    block=block->next;
-  } /* while */
-  assert(block!=NULL);
-
-  /* copy out of memory */
-  bytes=0;
-  blockpos=(int)(mf->bufpos % BUFFERSIZE);
-  do {
-    blocksize=BUFFERSIZE-blockpos;
-    if ((unsigned int)blocksize>size)
-      blocksize=size;
-
-    assert(block!=NULL);
-    assert(block->bufpos>=0 && (unsigned long)block->bufpos<=BUFFERSIZE);
-    assert(blockpos+blocksize<=block->bufpos);
-    memcpy(buffer,block->buffer+blockpos,blocksize);
-    buffer+=blocksize;
-    size-=blocksize;
-    bytes+=blocksize;
-
-    block=block->next;
-    blockpos=0;
-  } while (size>0);
-
-  /* adjust file pointer */
-  mf->bufpos+=bytes;
-
-  return bytes;
 }
 
 char *mfgets(MEMFILE *mf,char *string,unsigned int size)