Tagged 1.8.1.

Also did the following:
* Removed -fPIC from all Linux makefiles
* AMXX build tool now also moved over to VS 2005
* AMXX build tool binary renamed from "AMXXRelease" to "builder"
* MSVC project files now can use environment variables to point to the paths of the Metamod headers and HL SDK: $(METAMOD) and $(HLSDK) respectively

amxmodx/CCmd.cpp

@@ -124,8 +124,6 @@ CmdMngr::Command* CmdMngr::getCmd(long int id, int type, int access)
 
 int CmdMngr::getCmdNum(int type, int access)
 {
-	if ((access == buf_access) && (type == buf_type))
-		return buf_num;			// once calculated don't have to be done again
 
 	buf_access = access;
 	buf_type = type;

amxmodx/CCmd.h

@@ -78,7 +78,7 @@ public:
 		inline bool matchCommandLine(const char* cmd, const char* arg) 	{ return (!stricmp(command.c_str() + prefix, cmd + prefix) && (argument.empty() || !stricmp(argument.c_str(), arg))); }
 		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.c_str(), cmd)); }
 		inline int getFunction() const { return function; }
-		inline bool gotAccess(int f) const { return (!flags || ((flags & f) == flags)); }
+		inline bool gotAccess(int f) const { return (!flags || ((flags & f) != 0)); }
 		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
 		inline bool isViewable() const { return listable; }
 		inline int getFlags() const { return flags; }

amxmodx/CFlagManager.cpp

@@ -0,0 +1,418 @@
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "sh_list.h"
+#include "CString.h"
+
+#include "amxmodx.h"
+
+#include "CFlagManager.h"
+
+void CFlagManager::SetFile(const char *Filename)
+{
+
+	m_strConfigFile.assign(g_mod_name.c_str());
+	m_strConfigFile.append("/");
+	m_strConfigFile.append(get_localinfo("amxx_configsdir","addons/amxmodx/configs"));
+	m_strConfigFile.append("/");
+	m_strConfigFile.append(Filename);
+
+
+	CreateIfNotExist();
+}
+
+const int CFlagManager::LoadFile(const int force)
+{
+	CheckIfDisabled();
+	// If we're disabled get the hell out.  now.
+	if (m_iDisabled)
+	{
+		return 0;
+	}
+	// if we're not forcing this, and NeedToLoad says we dont have to
+	// then just stop
+	if (!force && !NeedToLoad())
+	{
+		return 0;
+	};
+
+	this->Clear();
+
+
+	// We need to load the file
+
+	FILE *File;
+
+	File=fopen(m_strConfigFile.c_str(),"r");
+
+	if (!File)
+	{
+		AMXXLOG_Log("[AMXX] FlagManager: Cannot open file \"%s\" (FILE pointer null!)",m_strConfigFile.c_str());
+		return -1;
+	};
+
+	// Trying to copy this almost exactly as other configs are read...
+	String Line;
+
+	char Command[256];
+	char Flags[256];
+
+	String TempLine;
+	while (!feof(File))
+	{
+
+		Line._fread(File);
+
+		char *nonconst=const_cast<char *>(Line.c_str());
+
+
+		// Strip out comments
+		while (*nonconst)
+		{
+			if (*nonconst==';') // End the line at comments
+			{
+				*nonconst='\0';
+			}
+			else
+			{
+				nonconst++;
+			}
+		};
+
+		Command[0]='\0';
+		Flags[0]='\0';
+
+		// Extract the command
+		TempLine.assign(Line.c_str());
+
+		nonconst=const_cast<char *>(TempLine.c_str());
+
+		char *start=NULL;
+		char *end=NULL;
+
+		// move up line until the first ", mark this down as the start
+		// then find the second " and mark it down as the end
+		while (*nonconst!='\0')
+		{
+			if (*nonconst=='"')
+			{
+				if (start==NULL)
+				{
+					start=nonconst+1;
+				}
+				else
+				{
+					end=nonconst;
+					goto done_with_command;
+				}
+			}
+			nonconst++;
+		}
+done_with_command:
+
+		// invalid line?
+		if (start==NULL || end==NULL)
+		{
+			// TODO: maybe warn for an invalid non-commented line?
+			continue;
+		}
+
+		*end='\0';
+
+		strncpy(Command,start,sizeof(Command)-1);
+
+
+		// Now do the same thing for the flags
+		nonconst=++end;
+
+		start=NULL;
+		end=NULL;
+
+		// move up line until the first ", mark this down as the start
+		// then find the second " and mark it down as the end
+		while (*nonconst!='\0')
+		{
+			if (*nonconst=='"')
+			{
+				if (start==NULL)
+				{
+					start=nonconst+1;
+				}
+				else
+				{
+					end=nonconst;
+					goto done_with_flags;
+				}
+			}
+			nonconst++;
+		}
+done_with_flags:
+		// invalid line?
+		if (start==NULL || end==NULL)
+		{
+			// TODO: maybe warn for an invalid non-commented line?
+			continue;
+		}
+
+		*end='\0';
+
+		strncpy(Flags,start,sizeof(Flags)-1);
+
+
+
+		//if (!isalnum(*Command))
+		if (*Command == '"' || 
+			*Command == '\0')
+		{
+			continue;
+		};
+
+		// Done sucking the command and flags out of the line
+		// now insert this command into the linked list
+
+		AddFromFile(const_cast<const char*>(&Command[0]),&Flags[0]);
+
+		nonconst=const_cast<char *>(Line.c_str());
+		*nonconst='\0';
+	};
+
+
+	fclose(File);
+
+
+	return 1;
+}
+
+/**
+ * This gets called from LoadFile
+ * Do NOT flag the entries as NeedToWrite
+ * No comment is passed from the file because
+ * this should never get written
+ */
+void CFlagManager::AddFromFile(const char *Command, const char *Flags)
+{
+
+	CFlagEntry *Entry=new CFlagEntry;
+
+	Entry->SetName(Command);
+	Entry->SetFlags(Flags);
+
+	// Link it
+	m_FlagList.push_back(Entry);
+
+};
+
+
+void CFlagManager::LookupOrAdd(const char *Command, int &Flags, AMX *Plugin)
+{
+	if (m_iDisabled) // if disabled in core.ini stop
+	{
+		return;
+	}
+	
+
+	int TempFlags=Flags;
+	if (TempFlags==-1)
+	{
+		TempFlags=0;
+	}
+
+	List<CFlagEntry *>::iterator	 iter;
+	List<CFlagEntry *>::iterator	 end;
+
+	iter=m_FlagList.begin();
+	end=m_FlagList.end();
+
+	while (iter!=end)
+	{
+		if (strcmp((*iter)->GetName()->c_str(),Command)==0)
+		{
+			CFlagEntry *Entry=(*iter);
+
+			if (Entry->IsHidden()) // "!" flag, exclude this function
+			{
+				return;
+			}
+			// Found, byref the new flags
+			Flags=Entry->Flags();
+
+			// Move it to the back of the list for faster lookup for the rest
+			m_FlagList.erase(iter);
+
+			m_FlagList.push_back(Entry);
+			return;
+		}
+		iter++;
+	}
+
+	// was not found, add it
+
+	CFlagEntry *Entry=new CFlagEntry;
+
+	Entry->SetName(Command);
+	Entry->SetFlags(TempFlags);
+
+	if (Plugin)
+	{
+		CPluginMngr::CPlugin* a = g_plugins.findPluginFast(Plugin);
+
+		if (a)
+		{
+			Entry->SetComment(a->getName());
+		}
+	}
+
+	// This entry was added from a register_* native
+	// it needs to be written during map change
+	Entry->SetNeedWritten(1);
+
+	// Link it
+	m_FlagList.push_back(Entry);
+
+}
+void CFlagManager::WriteCommands(void)
+{
+	List<CFlagEntry *>::iterator	 iter;
+	List<CFlagEntry *>::iterator	 end;
+	FILE							*File;
+	int								 NeedToRead=0;
+
+	// First off check the modified time of this file
+	// if it matches the stored modified time, then update
+	// after we write so we do not re-read next map
+	struct stat TempStat;
+
+	stat(m_strConfigFile.c_str(),&TempStat);
+
+
+
+	if (TempStat.st_mtime != m_Stat.st_mtime)
+	{
+		NeedToRead=1;
+	};
+
+
+	File=fopen(m_strConfigFile.c_str(),"a");
+	
+	if (!File)
+	{
+		return;
+	}
+
+	iter=m_FlagList.begin();
+	end=m_FlagList.end();
+
+
+
+	while (iter!=end)
+	{
+		if ((*iter)->NeedWritten())
+		{
+			if ((*iter)->GetComment()->size())
+			{
+				fprintf(File,"\"%s\" \t\"%s\" ; %s\n",(*iter)->GetName()->c_str(),(*iter)->GetFlags()->c_str(),(*iter)->GetComment()->c_str());
+			}
+			else
+			{
+				fprintf(File,"\"%s\" \t\"%s\"\n",(*iter)->GetName()->c_str(),(*iter)->GetFlags()->c_str());
+			}
+			(*iter)->SetNeedWritten(0);
+		}
+		++iter;
+	};
+
+	fclose(File);
+
+
+	// If NeedToRead was 0, then update the timestamp
+	// that was saved so we do not re-read this file
+	// next map
+	if (!NeedToRead)
+	{
+		stat(m_strConfigFile.c_str(),&TempStat);
+
+		m_Stat.st_mtime=TempStat.st_mtime;
+
+	}
+
+}
+
+int CFlagManager::ShouldIAddThisCommand(const AMX *amx, const cell *params, const char *cmdname) const
+{
+
+	// If flagmanager is disabled then ignore this
+	if (m_iDisabled)
+	{
+		return 0;
+	}
+	
+	
+	// If 5th param exists it was compiled after this change was made
+	// if it does not exist, try our logic at the end of this function
+	// 5th param being > 0 means explicit yes
+	// < 0 means auto detect (default is -1), treat it like there was no 5th param
+	// 0 means explicit no
+
+	if ((params[0] / sizeof(cell)) >= 5)
+	{
+		if (params[5]>0) // This command was explicitly told to be included
+		{
+			return 1;
+		}
+		else if (params[5]==0) // this command was explicitly told to NOT be used
+		{
+			return 0;
+		}
+	}
+
+	// auto detect if we should use this command
+
+	// if command access is -1 (default, not set to ADMIN_ALL or any other access), then no
+	if (params[3]==-1)
+	{
+		return 0;
+	}
+
+
+	// if command is (or starts with) "say", then no
+	if (strncmp(cmdname,"say",3)==0)
+	{
+		return 0;
+	}
+
+
+	// else use it
+	return 1;
+};
+
+
+void CFlagManager::Clear(void)
+{
+	List<CFlagEntry *>::iterator	 iter;
+	List<CFlagEntry *>::iterator	 end;
+
+	iter=m_FlagList.begin();
+	end=m_FlagList.end();
+
+	while (iter!=end)
+	{
+		delete (*iter);
+
+		++iter;
+	}
+
+	m_FlagList.clear();
+};
+
+void CFlagManager::CheckIfDisabled(void)
+{
+	if (atoi(get_localinfo("disableflagman","0"))==0)
+	{
+		m_iDisabled=0;
+	}
+	else
+	{
+		m_iDisabled=1;
+	}
+};

amxmodx/CFlagManager.h

@@ -0,0 +1,218 @@
+#ifndef CFLAGMANAGER_H
+#define CFLAGMANAGER_H
+
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "sh_list.h"
+#include "CString.h"
+
+#include "amxmodx.h"
+
+class CFlagEntry
+{
+private:
+	String			m_strName;			// command name ("amx_slap")
+	String			m_strFlags;			// string flags ("a","b")
+	String          m_strComment;		// comment to write ("; admincmd.amxx")
+	int				m_iFlags;			// bitmask flags
+	int				m_iNeedWritten;		// write this command on map change?
+	int				m_iHidden;			// set to 1 when the command is set to "!" access in
+										// the .ini file: this means do not process this command
+
+public:
+
+	CFlagEntry()
+	{
+		m_iNeedWritten=0;
+		m_iFlags=0;
+		m_iHidden=0;
+	};
+	const int NeedWritten(void) const
+	{
+		return m_iNeedWritten;
+	};
+
+	void SetNeedWritten(const int i=1)
+	{
+		m_iNeedWritten=i;
+	};
+
+	const String *GetName(void) const
+	{
+		return &m_strName;
+	};
+
+	const String *GetFlags(void) const
+	{
+		return &m_strFlags;
+	};
+	const String *GetComment(void) const
+	{
+		return &m_strComment;
+	};
+
+	const int Flags(void) const
+	{
+		return m_iFlags;
+	};
+
+	void SetName(const char *data)
+	{
+		m_strName.assign(data);
+	};
+	void SetFlags(const char *flags)
+	{
+		// If this is a "!" entry then stop
+		if (flags && flags[0]=='!')
+		{
+			SetHidden(1);
+			return;
+		}
+
+		m_strFlags.assign(flags);
+		m_iFlags=UTIL_ReadFlags(flags);
+	};
+	void SetFlags(const int flags)
+	{
+		m_iFlags=flags;
+
+		char FlagsString[32];
+		UTIL_GetFlags(FlagsString, flags);
+
+		m_strFlags.assign(FlagsString);
+	};
+	void SetComment(const char *comment)
+	{
+		m_strComment.assign(comment);
+	};
+	void SetHidden(int i=1)
+	{
+		m_iHidden=i;
+	};
+	int IsHidden(void) const
+	{
+		return m_iHidden;
+	};
+};
+class CFlagManager
+{
+private:
+	List<CFlagEntry *>		 m_FlagList;
+	String					 m_strConfigFile;
+	struct stat				 m_Stat;
+	int						 m_iForceRead;
+	int						 m_iDisabled;
+	
+
+	void CreateIfNotExist(void) const
+	{
+		FILE *fp;
+		
+		fp=fopen(m_strConfigFile.c_str(),"r");
+
+		if (!fp)
+		{
+			// File does not exist, create the header
+			fp=fopen(m_strConfigFile.c_str(),"a");
+
+			if (fp)
+			{
+				fprintf(fp,"; This file will store the commands used by plugins, and their access level\n");
+				fprintf(fp,"; To change the access of a command, edit the flags beside it and then\n");
+				fprintf(fp,";   change the server's map.\n;\n");
+				fprintf(fp,"; Example: If I wanted to change the amx_slap access to require\n");
+				fprintf(fp,";          RCON access (flag \"l\") I would change this:\n");
+				fprintf(fp,";          \"amx_slap\"  \"e\" ; admincmd.amxx\n");
+				fprintf(fp,";          To this:\n");
+				fprintf(fp,";          \"amx_slap\"  \"l\" ; admincmd.amxx\n;\n");
+				fprintf(fp,"; To disable a specific command from being used with the command manager\n");
+				fprintf(fp,";   and to only use the plugin-specified access set the flag to \"!\"\n;\n");
+				fprintf(fp,"; NOTE: The plugin name at the end is just for reference to what plugin\n");
+				fprintf(fp,";       uses what commands.  It is ignored.\n\n");
+				fclose(fp);
+			};
+		}
+	};
+	/**
+	 * Returns 1 if the timestamp for the file is different than the one we have loaded
+	 * 0 otherwise
+	 */
+	inline int NeedToLoad(void)
+	{
+		struct stat TempStat;
+
+		stat(m_strConfigFile.c_str(),&TempStat);
+
+		// If the modified timestamp does not match the stored
+		// timestamp than we need to re-read this file.
+		// Otherwise, ignore the file.
+		if (TempStat.st_mtime != m_Stat.st_mtime)
+		{
+			// Save down the modified timestamp
+			m_Stat.st_mtime=TempStat.st_mtime;
+			return 1;
+		};
+
+		return 0;
+
+	};
+public:
+
+	CFlagManager()
+	{
+		memset(&m_Stat,0x0,sizeof(struct stat));
+		m_iDisabled=0;
+		m_iForceRead=0;
+	};
+	~CFlagManager()
+	{
+	};
+
+	/**
+	 * Sets the filename in relation to amxmodx/configs
+	 */
+	void SetFile(const char *Filename="cmdaccess.ini");
+
+	const char *GetFile(void) const	{ return m_strConfigFile.c_str(); };
+	
+	/**
+	 * Parse the file, and load all entries
+	 * Returns 1 on success, 0 on refusal (no need to), and -1 on error
+	 */
+	const int LoadFile(const int force=0);
+
+	/**
+	 * Checks if the command exists in the list
+	 * If it does, it byrefs the flags for it
+	 * If it does not, it adds it to the list
+	 * These are added from register_*cmd calls
+	 */
+	void LookupOrAdd(const char *Command, int &Flags, AMX *Plugin);
+
+
+	/**
+	 * Write the commands back to the file
+	 */
+	void WriteCommands(void);
+
+	/**
+	 * Add this straight from the cmdaccess.ini file
+	 */
+	void AddFromFile(const char *Command, const char *Flags);
+
+	/**
+	 * Checks if this command should be added to flagman or not
+	 * This is only checked when adding commands from the register_* natives
+	 * If an admin manually adds a command to cmdaccess.ini it will be used
+	 *   regardless of whatever this function would say should be done with it
+	 */
+	int ShouldIAddThisCommand(const AMX *amx, const cell *params, const char *cmdname) const;
+
+	void Clear(void);
+
+	void CheckIfDisabled(void);
+};
+
+#endif // CFLAGMANAGER_H

amxmodx/CForward.cpp

@@ -33,7 +33,7 @@
 #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;
@@ -43,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;
@@ -69,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++)
@@ -85,7 +89,7 @@ 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)
 			{
@@ -126,7 +130,7 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 			}
 			
 			// exec
-			cell retVal;
+			cell retVal = 0;
 #if defined BINLOG_ENABLED
 			g_BinLog.WriteOp(BinLog_CallPubFunc, (*iter).pPlugin->getId(), iter->func);
 #endif
@@ -222,6 +226,8 @@ void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *para
 	name[0] = '\0';
 	amx_GetPublic(amx, func, name);
 	m_Name.assign(name);
+	m_ToDelete = false;
+	m_InExec = false;
 }
 
 void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
@@ -232,6 +238,8 @@ void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const Forwar
 	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
 	isFree = false;
 	m_Name.assign(funcName);
+	m_ToDelete = false;
+	m_InExec = false;
 }
 
 cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
@@ -244,13 +252,15 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	cell realParams[FORWARD_MAX_PARAMS];
 	cell *physAddrs[FORWARD_MAX_PARAMS];
 
-	if (!m_HasFunc)
+	if (!m_HasFunc || m_ToDelete)
 		return 0;
 
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(m_Amx);
 	if (!pPlugin->isExecutable(m_Func))
 		return 0;
 
+	m_InExec = true;
+
 	Debugger *pDebugger = (Debugger *)m_Amx->userdata[UD_DEBUGGER];
 	if (pDebugger)
 		pDebugger->BeginExec();
@@ -352,16 +362,20 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 		}
 	}
 
+	m_InExec = false;
+
 	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);
 	
@@ -446,7 +460,20 @@ bool CForwardMngr::isIdValid(int id) const
 
 cell CForwardMngr::executeForwards(int id, cell *params)
 {
-	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : m_Forwards[id >> 1]->execute(params, m_TmpArrays);
+	int retVal;
+	if (id & 1)
+	{
+		CSPForward *fwd = m_SPForwards[id >> 1];
+		retVal = fwd->execute(params, m_TmpArrays);
+		if (fwd->m_ToDelete)
+		{
+			fwd->m_ToDelete = false;
+			unregisterSPForward(id);
+		}
+	} else {
+		retVal = m_Forwards[id >> 1]->execute(params, m_TmpArrays);
+	}
+
 	m_TmpArraysNum = 0;
 	
 	return retVal;
@@ -454,9 +481,22 @@ cell CForwardMngr::executeForwards(int id, cell *params)
 
 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();
@@ -464,6 +504,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);
 }
 
@@ -499,20 +543,63 @@ void CForwardMngr::unregisterSPForward(int id)
 {
 	//make sure the id is valid
 	if (!isIdValid(id) || m_SPForwards.at(id >> 1)->isFree)
+	{
 		return;
+	}
 
-	m_SPForwards.at(id >> 1)->isFree = true;
+	CSPForward *fwd = m_SPForwards.at(id >> 1);
+
+	if (fwd->m_InExec)
+	{
+		fwd->m_ToDelete = true;
+	} else {
+		fwd->isFree = true;
 		m_FreeSPForwards.push(id);
+	}
 }
 
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num)
+int CForwardMngr::duplicateSPForward(int id)
+{
+	if (!isIdValid(id) || m_SPForwards.at(id >> 1)->isFree)
+	{
+		return -1;
+	}
+
+	CSPForward *fwd = m_SPForwards.at(id >> 1);
+	
+	return registerSPForward(fwd->m_Func, fwd->m_Amx, fwd->m_NumParams, fwd->m_ParamTypes);
+}
+
+int CForwardMngr::isSameSPForward(int id1, int id2)
+{
+	if (!isIdValid(id1) || !isIdValid(id2))
+	{
+		return false;
+	}
+
+	CSPForward *fwd1 = m_SPForwards.at(id1 >> 1);
+	CSPForward *fwd2 = m_SPForwards.at(id2 >> 1);
+
+	if (fwd1->isFree || fwd2->isFree)
+	{
+		return false;
+	}
+
+	return ((fwd1->m_Amx == fwd2->m_Amx)
+			&& (fwd1->m_Func == fwd2->m_Func)
+			&& (fwd1->m_NumParams == fwd2->m_NumParams));
+}
+
+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);
+	return g_forwards.registerForward(funcName, et, num, params, fwd_type);
 }
 
 int registerForward(const char *funcName, ForwardExecType et, ...)

amxmodx/CForward.h

@@ -51,6 +51,10 @@
 
 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
@@ -107,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);
@@ -139,6 +143,7 @@ public:
 // Single plugin forward
 class CSPForward
 {
+	friend class CForwardMngr;
 	const char *m_FuncName;
 	int m_NumParams;
 	
@@ -148,6 +153,8 @@ class CSPForward
 	int m_Func;
 	bool m_HasFunc;
 	String m_Name;
+	bool m_InExec;
+	bool m_ToDelete;
 
 public:
 	bool isFree;
@@ -203,13 +210,15 @@ 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);
 	
 	// Unregister single plugin forward
 	void unregisterSPForward(int id);
+	int duplicateSPForward(int id);
+	int isSameSPForward(int id1, int id2);
 	
 	// execute forward
 	cell executeForwards(int id, cell *params);
@@ -227,7 +236,7 @@ public:
 
 // (un)register forward
 int registerForward(const char *funcName, ForwardExecType et, ...);
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num);
+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, ...);

amxmodx/CLang.cpp

@@ -33,6 +33,7 @@
 #include "amxmodx.h"
 #include "CLang.h"
 #include "format.h"
+#include "amxmod_compat.h"
 
 #ifdef __linux__
 #define _snprintf snprintf
@@ -65,7 +66,10 @@ int HashFunction<String>(const String &k)
 	unsigned long hash = 5381;
 	register const char *str = k.c_str();
 	register char c;
-	while (c = *str++) hash = ((hash << 5) + hash) + c; // hash*33 + c
+	while ((c = *str++)) 
+	{
+		hash = ((hash << 5) + hash) + c; // hash*33 + c
+	}
 	return hash;
 }
 
@@ -75,7 +79,10 @@ int HashAlt<const char *>(char const * const &k)
 	unsigned long hash = 5381;
 	register const char *str = k;
 	register char c;
-	while (c = *str++) hash = ((hash << 5) + hash) + c; // hash*33 + c
+	while ((c = *str++)) 
+	{
+		hash = ((hash << 5) + hash) + c; // hash*33 + c
+	}
 	return hash;
 }
 
@@ -250,7 +257,7 @@ int CLangMngr::GetKeyEntry(const char *key)
 	return val.index;
 }
 
-int CLangMngr::AddKeyEntry(String &key)
+int CLangMngr::AddKeyEntry(const char *key)
 {
 	keytbl_val val;
 	val.index = static_cast<int>(KeyList.size());
@@ -263,6 +270,11 @@ int CLangMngr::AddKeyEntry(String &key)
 	return val.index;
 }
 
+int CLangMngr::AddKeyEntry(String &key)
+{
+    return AddKeyEntry(key.c_str());
+}
+
 int CLangMngr::GetKeyEntry(String &key)
 {
 	keytbl_val &val = KeyTable[key];
@@ -276,7 +288,23 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 	static char outbuf[4096];
 	cell *addr = get_amxaddr(amx, params[parm++]);
 
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		if (*addr & BCOMPAT_TRANSLATE_BITS)
+		{
+			const char *key, *def;
+			if (!translate_bcompat(amx, addr, &key, &def))
+			{
+				goto normal_string;
+			}
+			len = atcprintf(outbuf, sizeof(outbuf)-1, def, amx, params, &parm);
+		} else {
+			goto normal_string;
+		}
+	} else {
+normal_string:
 		len = atcprintf(outbuf, sizeof(outbuf)-1, addr, amx, params, &parm);
+	}
 
 	return outbuf;
 }
@@ -353,7 +381,7 @@ int CLangMngr::MergeDefinitionFile(const char *file)
 	CQueue<sKeyDef> Defq;
 	String buf;
 	char language[3];
-	sKeyDef tmpEntry;
+	sKeyDef tmpEntry = {NULL, 0};
 
 	while (!feof(fp))
 	{
@@ -570,7 +598,7 @@ bool CLangMngr::LangExists(const char *langName)
 	char buf[3] = {0};
 	int i = 0;
 	
-	while (buf[i] = tolower(*langName++))
+	while ((buf[i] = tolower(*langName++)))
 	{	
 		if (++i == 2)
 			break;

amxmodx/CLang.h

@@ -127,9 +127,11 @@ class CLangMngr
 	public:
 		void AddEntry(int key, const char *definition);
 	};
-
+public:
 	// Merge definitions into a language
 	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);
 
@@ -160,11 +162,11 @@ public:
 	// Get index
 	int GetKeyEntry(String &key);
 	int GetKeyEntry(const char *key);
-	int GetKeyIndex(const char *key);
 	// Get key from index
 	const char *GetKey(int key);
 	// Add key
 	int AddKeyEntry(String &key);
+	int AddKeyEntry(const char *key);
 
 	// Get the number of languages
 	int GetLangsNum();

amxmodx/CMenu.cpp

@@ -35,13 +35,15 @@
 // *****************************************************
 // class MenuMngr
 // *****************************************************
-MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f)
+MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f, bool new_menu)
 {
 	plugin = a;
 	keys = k;
 	menuid = mi;
-	function = f;
 	next = 0;
+	is_new_menu = new_menu;
+
+	function = f;
 }
 
 MenuMngr::~MenuMngr() 
@@ -61,66 +63,47 @@ 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);
 	
 	if (id)
+	{
 		return id;
+	}
 	
 	headid = new MenuIdEle(n, a, headid);
 	
-	if (!headid)
-		return 0;			// :TODO: Better error report
-	
 	return headid->id;
 }
 
-void MenuMngr::registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f) 
+void MenuMngr::registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f, bool from_new_menu) 
 {
-	MenuCommand** temp = &headcmd;
-	while (*temp) temp = &(*temp)->next;
-	*temp = new MenuCommand(a, mi, k, f);
+	MenuCommand **temp = &headcmd;
+	if (from_new_menu)
+	{
+		MenuCommand *ptr;
+		while (*temp)
+		{
+			ptr = *temp;
+			if (ptr->is_new_menu
+				&& ptr->plugin == a
+				&& ptr->menuid == mi)
+			{
+				if (g_forwards.isSameSPForward(ptr->function, f))
+				{
+					return;
+				}
+			}
+			temp = &(*temp)->next;
+		}
+	} else {
+		while (*temp)
+		{
+			temp = &(*temp)->next;
+		}
+	}
+	*temp = new MenuCommand(a, mi, k, f, from_new_menu);
 }
 
 void MenuMngr::clear()
@@ -140,4 +123,13 @@ void MenuMngr::clear()
 	}
 }
 
+MenuMngr::iterator MenuMngr::SetWatchIter(MenuMngr::iterator iter)
+{
+	MenuMngr::iterator old = m_watch_iter;
+
+	m_watch_iter = iter;
+
+	return old;
+}
+
 int MenuMngr::MenuIdEle::uniqueid = 0;

amxmodx/CMenu.h

@@ -66,29 +66,34 @@ private:
 		int menuid;
 		int keys;
 		int function;
+		int is_new_menu;
 		
 		MenuCommand* next;
-		MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f);
+		MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f, bool new_menu=false);
 	public:
 		inline int getFunction() { return function; }
 		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
-		inline bool matchCommand(int m, int k) { return ((m == menuid) && (keys & k)); }
+		inline bool matchCommand(int m, int k)
+		{
+			return ((m == menuid) && (keys & k));
+		}
 	} *headcmd;
 	
 public:
-	MenuMngr() { headid = 0; headcmd = 0; }
+	MenuMngr() : m_watch_iter(end())
+		{ headid = NULL; headcmd = NULL; }
 	~MenuMngr();
 
 	// Interface
 
 	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 registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f, bool from_new_menu=false);
 	void clear();
 
 	class iterator
 	{
+		friend class MenuMngr;
 		MenuCommand* a;
 	public:
 		iterator(MenuCommand*aa) : a(aa) {}
@@ -101,6 +106,13 @@ public:
 	
 	inline iterator begin() const { return iterator(headcmd); }
 	inline iterator end() const { return iterator(0); }
+
+	MenuMngr::iterator SetWatchIter(MenuMngr::iterator iter);
+	inline MenuMngr::iterator GetWatchIter() { return m_watch_iter; }
+private:
+	MenuMngr::iterator m_watch_iter;
 };
 
+extern MenuMngr g_menucmds;
+
 #endif //MENUS_H

amxmodx/CMisc.cpp

@@ -40,7 +40,6 @@ void CPlayer::Init(edict_t* e, int i)
 	pEdict = e;
 	initialized = false;
 	ingame = false;
-	bot = false;
 	authorized = false;
 
 	current = 0;
@@ -88,7 +87,6 @@ void CPlayer::Disconnect()
 	}
 	queries.clear();
 
-	bot = 0;
 	menu = 0;
 	newmenu = -1;
 }
@@ -117,7 +115,6 @@ bool CPlayer::Connect(const char* connectname, const char* ipaddress)
 	name.assign(connectname);
 	ip.assign(ipaddress);
 	time = gpGlobals->time;
-	bot = IsBot();
 	death_killer = 0;
 	menu = 0;
 	newmenu = -1;

amxmodx/CMisc.h

@@ -58,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;
 };
 
 // *****************************************************
@@ -83,7 +84,6 @@ public:
 
 	bool initialized;
 	bool ingame;
-	bool bot;
 	bool authorized;
 	bool vgui;	
 
@@ -118,7 +118,6 @@ public:
 	cell hudmap[5];
 	
 	Vector lastTrace;
-	Vector thisTrace;
 	Vector lastHit;
 	
 	List<ClientCvarQuery_Info *> queries;
@@ -131,7 +130,18 @@ public:
 
 	inline bool IsBot()
 	{
-		return ((pEdict->v.flags & FL_FAKECLIENT) ? true : false);
+		if ((pEdict->v.flags & FL_FAKECLIENT) == FL_FAKECLIENT)
+		{
+			return true;
+		}
+		
+		const char *auth = GETPLAYERAUTHID(pEdict); 	 
+		if (auth && (strcmp(auth, "BOT") == 0)) 	 
+		{
+			return true;
+		}
+		
+		return false;
 	}
 
 	inline bool IsAlive()
@@ -286,4 +296,87 @@ public:
 	inline bool isNewTeam() { return newTeam ? true : false; }
 };
 
+class CAdminData
+{
+private:
+	cell		m_AuthData[44];
+	cell		m_Password[32];
+	cell		m_Flags;
+	cell		m_Access;
+public:
+
+	CAdminData()
+	{
+		m_AuthData[0]=0;
+		m_Password[0]=0;
+		m_Flags=0;
+		m_Access=0;
+	};
+
+	void SetAccess(cell Access)
+	{
+		m_Access=Access;
+	};
+	cell GetAccess(void) const
+	{
+		return m_Access;
+	};
+
+	void SetFlags(cell Flags)
+	{
+		m_Flags=Flags;
+	};
+	cell GetFlags(void) const
+	{
+		return m_Flags;
+	};
+
+	void SetAuthID(const cell *Input)
+	{
+		unsigned int i=0;
+		while (i<sizeof(m_AuthData)-1)
+		{
+			if ((m_AuthData[i++]=*Input++)==0)
+			{
+				return;
+			}
+		}
+
+		m_AuthData[sizeof(m_AuthData)-1]=0;
+
+	};
+	const cell *GetAuthID(void) const
+	{
+		return &m_AuthData[0];
+	};
+
+	void SetPass(const cell *Input)
+	{
+		unsigned int i=0;
+		while (i<sizeof(m_Password)-1)
+		{
+			if ((m_Password[i++]=*Input++)==0)
+			{
+				return;
+			}
+		}
+
+		m_Password[sizeof(m_Password)-1]=0;
+
+	};
+	const cell *GetPass(void) const
+	{
+		return &m_Password[0];
+	};
+
+	CAdminData & operator = (const CAdminData &src)
+	{
+		this->SetAccess(src.GetAccess());
+		this->SetFlags(src.GetFlags());
+		this->SetAuthID(src.GetAuthID());
+		this->SetPass(src.GetPass());
+
+		return *this;
+	}
+};
 #endif //CMISC_H

amxmodx/CModule.cpp

@@ -39,6 +39,7 @@
 // New
 typedef void* (*PFN_REQ_FNPTR)(const char * /*name*/);
 typedef int (FAR *QUERYMOD_NEW)(int * /*ifvers*/, amxx_module_info_s * /*modInfo*/);
+typedef int (FAR *CHECKGAME_NEW)(const char *);
 typedef int (FAR *ATTACHMOD_NEW)(PFN_REQ_FNPTR /*reqFnptrFunc*/);
 typedef int (FAR *DETACHMOD_NEW)(void);
 typedef void (FAR *PLUGINSLOADED_NEW)(void);
@@ -89,6 +90,7 @@ void CModule::clear(bool clearFilename)
 
 	m_DestroyableIndexes.clear();
 	m_Natives.clear();
+	m_NewNatives.clear();
 }
 
 bool CModule::attachMetamod(const char *mmfile, PLUG_LOADTIME now)
@@ -218,6 +220,9 @@ bool CModule::queryModule()
 	m_Handle = DLLOAD(m_Filename.c_str());		// load file
 	if (!m_Handle)
 	{
+#if defined __linux__
+		AMXXLOG_Log("[AMXX] Module \"%s\" failed to load (%s)", m_Filename.c_str(), dlerror());
+#endif
 		m_Status = MODULE_BADLOAD;
 		return false;
 	}
@@ -292,6 +297,33 @@ bool CModule::queryModule()
 			return false;
 		}
 
+
+		// Lastly, check to see if this module is able to load on this game mod
+		CHECKGAME_NEW checkGame_New = (CHECKGAME_NEW)DLPROC(m_Handle, "AMXX_CheckGame");
+
+		if (checkGame_New)
+		{
+			// This is an optional check; do not fail modules that do not have it
+			int ret = checkGame_New(g_mod_name.c_str());
+
+			if (ret != AMXX_GAME_OK)
+			{
+				switch (ret)
+				{
+				case AMXX_GAME_BAD:
+					AMXXLOG_Log("[AMXX] Module \"%s\" (version \"%s\") reported that it cannot load on game \"%s\"", m_Filename.c_str(), getVersion(), g_mod_name.c_str());
+					m_Status = MODULE_BADGAME;
+					break;
+				default:
+					AMXXLOG_Log("[AMXX] Module \"%s\" (version \"%s\") returned an unknown CheckGame code (value: %d)", m_Filename.c_str(), getVersion(), ret);
+					m_Status = MODULE_BADLOAD;
+					break;
+				}
+
+				return false;
+			}
+		}
+
 		m_Status = MODULE_QUERY;
 		return true;
 	} else {
@@ -399,6 +431,7 @@ const char* CModule::getStatus() const
 		case MODULE_NEWER:		return "newer";
 		case MODULE_INTERROR:	return "internal err";
 		case MODULE_NOT64BIT:	return "not 64bit";
+		case MODULE_BADGAME:	return "bad game";
 		default:				break;
 	}
 	

amxmodx/CModule.h

@@ -49,7 +49,8 @@ enum MODULE_STATUS
 	MODULE_NEWER,			// newer interface
 	MODULE_INTERROR,		// Internal error
 	MODULE_FUNCNOTPRESENT,	// Function not present
-	MODULE_NOT64BIT			// Not 64 bit compatible
+	MODULE_NOT64BIT,		// Not 64 bit compatible
+	MODULE_BADGAME,			// Module cannot load on the current game mod
 };
 
 struct amxx_module_info_s
@@ -68,6 +69,9 @@ struct amxx_module_info_s
 #define AMXX_PARAM				2			/* Invalid parameter */
 #define AMXX_FUNC_NOT_PRESENT	3			/* Function not present */
 
+#define AMXX_GAME_OK			0			/* Module can load on this game. */
+#define AMXX_GAME_BAD			1			/* Module cannot load on this game. */
+
 #define AMXX_INTERFACE_VERSION	4
 
 class CModule 
@@ -117,6 +121,7 @@ public:
 	void CallPluginsUnloading();
 
 	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;
 };
 

amxmodx/CPlugin.cpp

@@ -81,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) 
 	{
-		AMXXLOG_Log("[AMXX] Plugins list not found (file \"%s\")", filename);
+		if (warn)
+		{
+			AMXXLOG_Error("[AMXX] Plugins list not found (file \"%s\")", filename);
+		}
 		return 1;
 	}
 	
@@ -99,6 +102,8 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 	
 	String line;
 
+	List<String *>::iterator block_iter;
+
 	while (!feof(fp)) 
 	{
 		pluginName[0] = '\0';
@@ -122,13 +127,37 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 		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;
+		}
+
+		if (findPlugin(pluginName) != NULL)
+		{
+			continue;
+		}
+
 		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, debugFlag);
 		
 		if (plugin->getStatusCode() == ps_bad_load)
@@ -136,14 +165,12 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 			char errorMsg[255];
 			sprintf(errorMsg, "%s (plugin \"%s\")", error, pluginName);
 			plugin->setError(errorMsg);
-			AMXXLOG_Log("[AMXX] %s", plugin->getError());
+			AMXXLOG_Error("[AMXX] %s", plugin->getError());
 		}
 	}
 
 	fclose(fp);
 
-	InvalidateCache();
-
 	return pCounter;
 }
 
@@ -161,6 +188,14 @@ void CPluginMngr::clear()
 		delete [] pNatives;
 		pNatives = NULL;
 	}
+
+	List<String *>::iterator iter = m_BlockList.begin();
+	while (iter != m_BlockList.end())
+	{
+		delete (*iter);
+		iter = m_BlockList.erase(iter);
+	}
+	m_BlockList.clear();
 }
 
 CPluginMngr::CPlugin* CPluginMngr::findPlugin(AMX *amx)
@@ -201,6 +236,17 @@ CPluginMngr::CPlugin* CPluginMngr::findPlugin(const char* name)
 	return a;
 }
 
+void CPluginMngr::CPlugin::AddToFailCounter(unsigned int i)
+{
+	failcounter += i;
+	if ((failcounter >= 3)
+		&& (status ))
+	{
+		errorMsg.assign("This plugin is non-GPL which violates AMX Mod X's license.");
+		status = ps_bad_load;
+	}
+}
+
 const char* CPluginMngr::CPlugin::getStatus() const
 {
 	switch (status)
@@ -228,6 +274,7 @@ CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int
 {
 	const char* unk = "unknown";
 	
+	failcounter = 0;
 	title.assign(unk);
 	author.assign(unk);
 	version.assign(unk);
@@ -387,15 +434,17 @@ 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)
@@ -417,7 +466,8 @@ char *CPluginMngr::ReadIntoOrFromCache(const char *file, size_t &bufsize)
 
 	pl->file = new CAmxxReader(file, sizeof(cell));
 	pl->buffer = NULL;
-	if (pl->file->GetStatus() != CAmxxReader::Err_None)
+	if (pl->file->GetStatus() != CAmxxReader::Err_None ||
+		pl->file->IsOldFile())
 	{
 		delete pl->file;
 		delete pl;
@@ -616,7 +666,9 @@ void CPluginMngr::CALMFromFile(const char *file)
 	{
 		fgets(line, sizeof(line)-1, fp);
 		if (line[0] == ';' || line[0] == '\n' || line[0] == '\0')
+		{
 			continue;
+		}
 
 		/** quick hack */
 		char *ptr = line;
@@ -635,8 +687,28 @@ void CPluginMngr::CALMFromFile(const char *file)
 		pluginName[0] = '\0';
 		sscanf(rline.c_str(), "%s", pluginName);
 
-		if (!isalnum(*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);
 

amxmodx/CPlugin.h

@@ -71,6 +71,7 @@ public:
 		String author;
 		String errorMsg;
 		
+		unsigned int failcounter;
 		int m_PauseFwd;
 		int m_UnpauseFwd;
 		int paused_fun;
@@ -98,9 +99,11 @@ public:
 		inline void setError(const char* n) { errorMsg.assign(n); }
 		inline bool isValid() const { return (status >= ps_paused); }
 		inline bool isPaused() const { return ((status == ps_paused) || (status == ps_stopped)); }
+		inline bool isStopped() const { return (status == ps_stopped); }
 		inline bool isExecutable(int id) const { return (isValid() && !isPaused());	}
 		
 		void Finalize();
+		void AddToFailCounter(unsigned int i);
 		void pausePlugin();
 		void unpausePlugin();
 		void pauseFunction(int id);
@@ -125,7 +128,7 @@ 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);
 	
 	inline CPlugin* findPluginFast(AMX *amx) { return (CPlugin*)(amx->userdata[UD_FINDPLUGIN]); }
 	CPlugin* findPlugin(AMX *amx);
@@ -165,6 +168,7 @@ public:
 	void CALMFromFile(const char *file);
 private:
 	List<plcache_entry *> m_plcache;
+	List<String *> m_BlockList;
 };
 
 #endif //PLUGIN_H

amxmodx/CString.h

@@ -129,7 +129,7 @@ public:
 	}
 
 	//Added this for amxx inclusion
-	bool empty()
+	bool empty() const
 	{
 		if (!v)
 			return true;
@@ -140,7 +140,7 @@ public:
 		return false;
 	}
 
-	size_t size()
+	size_t size() const
 	{
 		if (v)
 			return strlen(v);

amxmodx/CVector.h

@@ -37,12 +37,20 @@
 // Vector
 template <class T> class CVector
 {
-	bool Grow()
+	bool Grow(size_t amount)
 	{
 		// automatic grow
 		size_t newSize = m_Size * 2;
+
 		if (newSize == 0)
-			newSize = 8;					// a good init value
+		{
+			newSize = 8;
+		}
+
+		while (m_CurrentUsedSize + amount > newSize)
+		{
+			newSize *= 2;
+		}
 		T *newData = new T[newSize];
 		if (!newData)
 			return false;
@@ -57,13 +65,17 @@ template <class T> class CVector
 		return true;
 	}
 
-	bool GrowIfNeeded()
+	bool GrowIfNeeded(size_t amount)
 	{
-		if (m_CurrentUsedSize >= m_Size)
-			return Grow();
+		if (m_CurrentUsedSize + amount >= m_Size)
+		{
+			return Grow(amount);
+		}
 		else
+		{
 			return true;
 		}
+	}
 
 	bool ChangeSize(size_t size)
 	{
@@ -329,14 +341,13 @@ public:
 
 	bool push_back(const T & elem)
 	{
-		++m_CurrentUsedSize;
-		if (!GrowIfNeeded())
+		if (!GrowIfNeeded(1))
 		{
-			--m_CurrentUsedSize;
 			return false;
 		}
 
-		m_Data[m_CurrentUsedSize - 1] = elem;
+		m_Data[m_CurrentUsedSize++] = elem;
+
 		return true;
 	}
 
@@ -434,13 +445,13 @@ public:
 
 		size_t ofs = where - begin();
 
-		++m_CurrentUsedSize;
-		if (!GrowIfNeeded())
+		if (!GrowIfNeeded(1))
 		{
-			--m_CurrentUsedSize;
 			return false;
 		}
 
+		++m_CurrentUsedSize;
+
 		where = begin() + ofs;
 
 		// Move subsequent entries

amxmodx/Makefile

@@ -1,14 +1,14 @@
 #(C)2004-2005 AMX Mod X Development Team
 # Makefile written by David "BAILOPAN" Anderson
 
-HLSDK = ../hlsdk/SourceCode
-MM_ROOT = ../metamod/metamod
+HLSDK = ../../hlsdk
+MM_ROOT = ../../metamod/metamod
 
 ### EDIT BELOW FOR OTHER PROJECTS ###
 
-OPT_FLAGS = -O2 -funroll-loops -s -fomit-frame-pointer -pipe
+OPT_FLAGS = -O2 -fno-strict-aliasing -funroll-loops -s -fomit-frame-pointer -pipe -DNDEBUG
 DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
+CPP = gcc-4.1
 NAME = amxmodx
 
 BIN_SUFFIX_32 = mm_i386.so
@@ -19,13 +19,21 @@ OBJECTS = meta_api.cpp CFile.cpp CVault.cpp vault.cpp float.cpp file.cpp modules
 	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 \
-	optimizer.cpp format.cpp messages.cpp libraries.cpp vector.cpp
+	optimizer.cpp format.cpp messages.cpp libraries.cpp vector.cpp sorting.cpp \
+	amxmod_compat.cpp nongpl_matches.cpp CFlagManager.cpp datastructs.cpp \
+	trie_natives.cpp
 
-LINK = /lib/libstdc++.a
+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)
@@ -41,7 +49,7 @@ ifeq "$(BINLOG)" "true"
 	CFLAGS += -DBINLOG_ENABLED
 endif
 
-CFLAGS += -DLINUX -DNDEBUG -fPIC -Wno-deprecated -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
+CFLAGS += -DLINUX -DAMX_NOPROPLIST -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
 
 ifeq "$(AMD64)" "true"
 	BINARY = $(NAME)_$(BIN_SUFFIX_64)
@@ -55,6 +63,7 @@ else
 	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
 	LINK += -lz
 	OPT_FLAGS += -march=i586
+	CFLAGS += -m32
 endif
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)

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
@@ -803,7 +803,7 @@ static void expand(unsigned char *code, long codesize, long memsize)
     do {
       codesize--;
       /* no input byte should be shifted out completely */
-      assert(shift<8*sizeof(cell));
+      assert(shift<static_cast<int>(8*sizeof(cell)));
       /* we work from the end of a sequence backwards; the final code in
        * a sequence may not have the continuation bit set */
       assert(shift>0 || (code[(size_t)codesize] & 0x80)==0);
@@ -973,26 +973,25 @@ int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code)
   memcpy(native_code, amx->base, ((AMX_HEADER *)(amx->base))->cod);
   hdr = (AMX_HEADER *)native_code;
 
+  
+
   /* JIT rulz! (TM) */
   /* MP: added check for correct compilation */
   //Fixed bug (thanks T(+)rget)
   if ((res = asm_runJIT(amx->base, reloc_table, native_code)) == 0) 
   {
-    /* update the required memory size (the previous value was a
-     * conservative estimate, now we know the exact size)
-     */
-    amx->code_size = (hdr->dat + hdr->stp + 3) & ~3;
     /* The compiled code is relocatable, since only relative jumps are
      * used for destinations within the generated code and absoulute
      * addresses for jumps into the runtime, which is fixed in memory.
      */
     amx->base = (unsigned char*) native_code;
     amx->cip = hdr->cip;
-    amx->hea = hdr->hea;
-    amx->stp = hdr->stp - sizeof(cell);
 	/* 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;
+	*(cell *)((char*)native_code + hdr->dat + amx->stp - sizeof(cell)) = 0;
+	/* update the required memory size (the previous value was a
+	 * conservative estimate, now we know the exact size)
+	 */
+	amx->code_size = (hdr->dat + amx->stp + sizeof(cell)) & ~3;
   } /* if */
 
   return (res == 0) ? AMX_ERR_NONE : AMX_ERR_INIT_JIT;

amxmodx/amx.h

@@ -214,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 {
@@ -265,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    amx_version   PACKED; /* required version of the AMX */
+  char    file_version;         /* file format version */
+  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 */
@@ -322,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 */

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    amx_version   PACKED; /* required version of the AMX */
+  char    file_version;         /* file format version */
+  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 */
-} AMX_DBG_FILE          PACKED;
+  const char name[1];           /* ASCII string, zero-terminated */
+} 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    vclass        PACKED; /* class of symbol (global/local) */
+  char    ident;                /* kind of symbol (function/variable) */
+  char    vclass;               /* class of symbol (global/local) */
   int16_t dim           PACKED; /* number of dimensions */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_SYMBOL        PACKED;
+  const char name[1];           /* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_TAG           PACKED;
+  const char name[1];           /* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_MACHINE       PACKED;
+  const char name[1];           /* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_STATE         PACKED;
+  const char name[1];           /* ASCII string, zero-terminated */
+} 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/amxjitsn.asm

@@ -2122,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
 

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

@@ -65,7 +65,6 @@
 #include "CLogEvent.h"
 #include "CForward.h"
 #include "CCmd.h"
-#include "CMenu.h"
 #include "CEvent.h"
 #include "CLang.h"
 #include "fakemeta.h"
@@ -73,7 +72,6 @@
 
 #define AMXXLOG_Log g_log.Log
 #define AMXXLOG_Error g_log.LogError
-#define AMX_VERSION	"1.75"
 
 extern AMX_NATIVE_INFO core_Natives[];
 extern AMX_NATIVE_INFO time_Natives[];
@@ -85,6 +83,8 @@ 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[];
+extern AMX_NATIVE_INFO g_DataStructNatives[];
 
 #ifndef __linux__
 #define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
@@ -114,6 +114,14 @@ extern AMX_NATIVE_INFO vector_Natives[];
 	#define INFINITE 0xFFFFFFFF
 #endif
 
+#ifndef __linux__
+	#define PATH_SEP_CHAR		'\\'
+	#define ALT_SEP_CHAR		'/'
+#else
+	#define PATH_SEP_CHAR		'/'
+	#define ALT_SEP_CHAR		'\\'
+#endif
+
 #ifndef GETPLAYERAUTHID
 #define GETPLAYERAUTHID     (*g_engfuncs.pfnGetPlayerAuthId)
 #endif
@@ -174,7 +182,6 @@ extern CList<CPlayer*> g_auth;
 extern EventsMngr g_events;
 extern Grenades g_grenades;
 extern LogEventsMngr g_logevents;
-extern MenuMngr g_menucmds;
 extern CLangMngr g_langMngr;
 extern String g_log_dir;
 extern String g_mod_name;
@@ -338,6 +345,14 @@ struct func_s
 	const char *desc;
 };
 
+enum AdminProperty
+{
+	Admin_Auth = 0,
+	Admin_Password,
+	Admin_Access,
+	Admin_Flags
+};
+
 extern enginefuncs_t *g_pEngTable;
 
 #endif // AMXMODX_H

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;
 };
@@ -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

@@ -44,11 +44,14 @@
 	#define	vsnprintf	_vsnprintf
 #endif
 
+#include "svn_version.h"
+
 CLog::CLog()
 {
 	m_LogType = 0;
 	m_LogFile.clear();
 	m_FoundError = false;
+	m_LoggedErrMap = false;
 }
 
 CLog::~CLog()
@@ -94,11 +97,13 @@ void CLog::CreateNewFile()
 	tm *curTime = localtime(&td);
 
 	char file[256];
+	char name[256];
 	int i = 0;
 	
 	while (true)
 	{
-		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);
+		snprintf(name, sizeof(name), "%s/L%02d%02d%03d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i);
+		build_pathname_r(file, sizeof(file)-1, "%s", name);
 		FILE *pTmpFile = fopen(file, "r");			// open for reading to check whether the file exists
 		
 		if (!pTmpFile)
@@ -117,7 +122,7 @@ void CLog::CreateNewFile()
 		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
 		SET_LOCALINFO("amxx_logging", "0");
 	} else {
-		fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
+		fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, SVN_VERSION_STRING);
 		fclose(fp);
 	}
 }
@@ -147,17 +152,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, ...)
@@ -199,7 +204,7 @@ void CLog::Log(const char *fmt, ...)
 				}
 			}
 		} else {
-			build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday);
+			build_pathname_r(file, sizeof(file)-1, "%s/L%04d%02d%02d.log", g_log_dir.c_str(), (curTime->tm_year + 1900), curTime->tm_mon + 1, curTime->tm_mday);
 			pF = fopen(file, "a+");
 		}
 		
@@ -215,9 +220,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;
@@ -231,9 +234,12 @@ void CLog::Log(const char *fmt, ...)
 void CLog::LogError(const char *fmt, ...)
 {
 	static char file[256];
+	static char name[256];
 
 	if (m_FoundError)
+	{
 		return;
+	}
 
 	// get time
 	time_t td;
@@ -248,15 +254,22 @@ void CLog::LogError(const char *fmt, ...)
 
 	va_list arglst;
 	va_start(arglst, fmt);
-	vsnprintf(msg, 3071, fmt, arglst);
+	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);
+	snprintf(name, sizeof(name), "%s/error_%04d%02d%02d.log", g_log_dir.c_str(), curTime->tm_year + 1900, curTime->tm_mon + 1, curTime->tm_mday);
+	build_pathname_r(file, sizeof(file)-1, "%s", name);
 	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\") (file \"%s\")\n", date, STRING(gpGlobals->mapname), name);
+			m_LoggedErrMap = true;
+		}
 		fprintf(pF, "L %s: %s\n", date, msg);
 		fclose(pF);
 	} else {

amxmodx/amxxlog.h

@@ -37,6 +37,7 @@ 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);

amxmodx/binlog.cpp

@@ -3,11 +3,40 @@
 #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");
@@ -110,6 +139,21 @@ void BinLog::WriteOp(BinLogOp op, int plug, ...)
 	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:
@@ -126,10 +170,19 @@ void BinLog::WriteOp(BinLogOp op, int plug, ...)
 		}
 	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:
@@ -150,14 +203,32 @@ void BinLog::WriteOp(BinLogOp op, int plug, ...)
 		}
 	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:
@@ -229,17 +300,37 @@ void BinLog::WritePluginDB(FILE *fp)
 		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;
+			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);

amxmodx/binlog.h

@@ -6,7 +6,7 @@
 #include "CString.h"
 
 #define BINLOG_MAGIC	0x414D424C
-#define BINLOG_VERSION	0x0200
+#define BINLOG_VERSION	0x0300
 
 /**
  * Format of binlog:
@@ -17,8 +17,14 @@
  * [
  *  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
  *  ]
@@ -33,17 +39,18 @@
  *  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>
+	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>
-	BinLog_SetLine,		//<int32 line no#>
+	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 ...>

amxmodx/datastructs.cpp

@@ -0,0 +1,608 @@
+/* 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"
+#include "datastructs.h"
+
+
+// Note: All handles start at 1. 0 and below are invalid handles.
+//       This way, a plugin that doesn't initialize a vector or
+//       string will not be able to modify another plugin's data
+//       on accident.
+CVector<CellVector*> VectorHolder;
+
+
+// Array:ArrayCreate(cellsize=1, reserved=32);
+static cell AMX_NATIVE_CALL ArrayCreate(AMX* amx, cell* params)
+{
+	// params[1] (cellsize) is how big in cells each element is.
+	// this MUST be greater than 0!
+	int cellsize=params[1];
+
+	// params[2] (reserved) is how many elements to allocate
+	// immediately when the list is created.
+	// this MUST be greater than 0!
+	int reserved=params[2];
+
+	if (cellsize<=0)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid array size (%d)", cellsize);
+		return -1;
+	}
+	if (reserved<=0)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid reserved size (%d)", reserved);
+		return -1;
+	}
+
+	// Scan through the vector list to see if any are NULL.
+	// NULL means the vector was previously destroyed.
+	for (unsigned int i=0; i < VectorHolder.size(); ++i)
+	{
+		if (VectorHolder[i]==NULL)
+		{
+			VectorHolder[i]=new CellVector(cellsize);
+			VectorHolder[i]->Grow(reserved);
+			return i + 1;
+		}
+	}
+
+	// None are NULL, create a new vector
+	CellVector* NewVector=new CellVector(cellsize);
+	NewVector->Grow(reserved);
+
+	VectorHolder.push_back(NewVector);
+
+	return VectorHolder.size();
+}
+// ArrayClear(Array:which)
+static cell AMX_NATIVE_CALL ArrayClear(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	vec->Clear();
+
+	return 1;
+}
+// ArraySize(Array:which)
+static cell AMX_NATIVE_CALL ArraySize(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	return vec->Size();
+}
+// ArrayGetArray(Array:which, item, any:output[]);
+static cell AMX_NATIVE_CALL ArrayGetArray(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	if (vec->GetArray(params[2],get_amxaddr(amx, params[3]))!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
+		return 0;
+	}
+
+	return 1;
+}
+// ArrayGetCell(Array:which, item, any:&output);
+static cell AMX_NATIVE_CALL ArrayGetCell(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	cell ret;
+	if (vec->GetCell(params[2],&ret)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
+		return 0;
+	}
+
+	return ret;
+}
+// ArrayGetString(Array:which, item, any:output[], size);
+static cell AMX_NATIVE_CALL ArrayGetString(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	if (vec->GetString(params[2],get_amxaddr(amx, params[3]),params[4])!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
+		return 0;
+	}
+
+	return 1;
+}
+// ArraySetArray(Array:which, item, any:output[]);
+static cell AMX_NATIVE_CALL ArraySetArray(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	if (vec->SetArray(params[2],get_amxaddr(amx, params[3]))!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
+		return 0;
+	}
+
+	return 1;
+}
+// ArraySetCell(Array:which, item, any:&output);
+static cell AMX_NATIVE_CALL ArraySetCell(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	if (vec->SetCell(params[2], params[3])!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
+		return 0;
+	}
+
+	return 1;
+}
+// ArraySetString(Array:which, item, any:output[]);
+static cell AMX_NATIVE_CALL ArraySetString(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	if (vec->SetString(params[2],get_amxaddr(amx, params[3]))!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid cellvector handle provided (%d:%d:%d)", params[1], params[2], vec->Size());
+		return 0;
+	}
+
+	return 1;
+}
+// ArrayPushArray(Array:which, any:output[]);
+static cell AMX_NATIVE_CALL ArrayPushArray(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	vec->SetArray(vec->Push(),get_amxaddr(amx, params[2]));
+
+	return 1;
+}
+// ArrayPushCell(Array:which, &any:output);
+static cell AMX_NATIVE_CALL ArrayPushCell(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	vec->SetCell(vec->Push(), params[2]);
+
+	return 1;
+}
+// ArrayPushString(Array:which, any:output[]);
+static cell AMX_NATIVE_CALL ArrayPushString(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec==NULL)
+	{
+		return 0;
+	}
+
+	vec->SetString(vec->Push(),get_amxaddr(amx, params[2]));
+
+	return 1;
+}
+static cell AMX_NATIVE_CALL ArrayGetStringHandle(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (vec == NULL)
+	{
+		return 0;
+	}
+
+	cell* ptr=vec->GetCellPointer(params[2]);
+
+	if (ptr == NULL)
+	{
+		return 0;
+	}
+
+	return reinterpret_cast<cell>(ptr);
+
+}
+// ArrayInsertArrayAfter(Array:which, item, const value[])
+static cell AMX_NATIVE_CALL ArrayInsertArrayAfter(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	int item=params[2]+1;
+
+	if (vec->ShiftUpFrom(item)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertArrayAfter (%d:%d)", params[1], vec->Size());
+		return 0;
+	}
+
+	vec->SetArray(item, get_amxaddr(amx, params[3]));
+
+	return 1;
+}
+// ArrayInsertCellAfter(Array:which, item, value[])
+static cell AMX_NATIVE_CALL ArrayInsertCellAfter(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	int item=params[2]+1;
+
+	if (vec->ShiftUpFrom(item)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertCellAfter (%d:%d)", params[1], vec->Size());
+		return 0;
+	}
+
+	vec->SetCell(item, params[3]);
+
+	return 1;
+}
+// ArrayInsertStringAfter(Array:which, item, const value[])
+static cell AMX_NATIVE_CALL ArrayInsertStringAfter(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	int item=params[2]+1;
+
+	if (vec->ShiftUpFrom(item)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertStringAfter (%d:%d)", params[1], vec->Size());
+		return 0;
+	}
+
+	vec->SetString(item, get_amxaddr(amx, params[3]));
+
+	return 1;
+}
+// ArrayInsertArrayBefore(Array:which, item, const value[])
+static cell AMX_NATIVE_CALL ArrayInsertArrayBefore(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	int item=params[2];
+
+	if (item==vec->Size())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertArrayBefore (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+	if (vec->ShiftUpFrom(item)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertArrayBefore (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+
+	vec->SetArray(item, get_amxaddr(amx, params[3]));
+
+	return 1;
+}
+// ArrayInsertCellBefore(Array:which, item, const value)
+static cell AMX_NATIVE_CALL ArrayInsertCellBefore(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	int item=params[2];
+
+	if (item==vec->Size())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertCellBefore (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+	if (vec->ShiftUpFrom(item)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertCellBefore (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+
+	vec->SetCell(item, params[3]);
+
+	return 1;
+}
+// ArrayInsertStringBefore(Array:which, item, const value[])
+static cell AMX_NATIVE_CALL ArrayInsertStringBefore(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	int item=params[2];
+
+	if (item==vec->Size())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertStringBefore (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+	if (vec->ShiftUpFrom(item)!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayInsertStringBefore (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+
+	vec->SetString(item, get_amxaddr(amx, params[3]));
+
+	return 1;
+}
+
+// ArraySwap(Array:which, item1, item2)
+static cell AMX_NATIVE_CALL ArraySwap(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+	if (vec->Swap(params[2], params[3])!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArraySwap (%d , %d:%d)",params[2], params[3], vec->Size());
+		return 0;
+	}
+
+	return 1;
+}
+
+// ArrayDeleteItem(Array:which, item);
+static cell AMX_NATIVE_CALL ArrayDeleteItem(AMX* amx, cell* params)
+{
+	CellVector* vec=HandleToVector(amx, params[1]);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	if (vec->Delete(params[2])!=1)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid item specified in ArrayDeleteItem (%d:%d)", params[2], vec->Size());
+		return 0;
+	}
+	return 1;
+}
+
+
+// ArrayDestroy(Array:&which)
+static cell AMX_NATIVE_CALL ArrayDestroy(AMX* amx, cell* params)
+{
+	// byref the handle here so we can zero it out after destroying
+	// this way they cannot accidentally reuse it
+	cell* handle=get_amxaddr(amx,params[1]);
+	CellVector* vec=HandleToVector(amx, *handle);
+
+	if (!vec)
+	{
+		return 0;
+	}
+
+	delete vec;
+
+	VectorHolder[*handle-1]=NULL;
+
+	*handle=0;
+
+	return 1;
+}
+
+typedef struct ArraySort_s
+{
+	int    handle;
+	int    forward;
+	cell   data;
+	cell   size;
+
+} ArraySort_t;
+
+static CStack<ArraySort_t *> ArraySortStack;
+
+int SortArrayList(const void *itema, const void *itemb)
+{
+	ArraySort_t *Info = ArraySortStack.front();
+
+	return executeForwards(Info->forward, Info->handle, *((int *)itema), *((int *)itemb), Info->data, Info->size);
+
+}
+// native ArraySort(Array:array, const comparefunc[], data[]="", data_size=0);
+static cell AMX_NATIVE_CALL ArraySort(AMX* amx, cell* params)
+{
+	int handle=params[1];
+	CellVector* vec=HandleToVector(amx, handle);
+
+	if (!vec)
+	{
+		return 0;
+	}
+	
+	// This is kind of a cheating way to go about this but...
+	// Create an array of integers as big as however many elements are in the vector.
+	// Pass that array to qsort
+	// After the array is sorted out, then create a NEW cellvector
+	// and copy in the old data in the order of what was sorted
+	int len;
+	char* FuncName=get_amxstring(amx, params[2], 0, len);
+	// MySortFunc(Array:array, item1, item2, const data[], data_size)
+	int Forward = registerSPForwardByName(amx, FuncName, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
+	if (Forward < 0)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "The public function \"%s\" was not found.", FuncName);
+		return 0;
+	}
+
+	int *IntList=new int[vec->Size()];
+
+	for (int i=0; i< vec->Size(); i++)
+	{
+		IntList[i]=i;
+	}
+
+	ArraySort_t *Info=new ArraySort_t;
+
+	Info->handle=handle;
+	Info->forward=Forward;
+	Info->data=params[3];
+	Info->size=params[4];
+
+	ArraySortStack.push(Info);
+	qsort(IntList, vec->Size(), sizeof(int), SortArrayList);
+	ArraySortStack.pop();
+
+	CellVector* newvec=new CellVector(vec->GetCellCount());
+
+	// Set the new vector's values
+	for (int i=0; i< vec->Size(); i++)
+	{
+		if (newvec->SetArray(newvec->Push(), vec->GetCellPointer(IntList[i]))!=1)
+		{
+			// This should never happen..
+			LogError(amx, AMX_ERR_NATIVE, "Failed to SetArray in ArraySort (i=%d, IntList=%d)",i,IntList[i]);
+
+			return 0;
+		}
+	}
+
+	// Delete the old vector
+	delete vec;
+
+	// Now save the new vector in its handle location
+	VectorHolder[handle-1]=newvec;
+
+	// Cleanup
+	delete Info;
+	delete IntList;
+
+	unregisterSPForward(Forward);
+
+	return 1;
+}
+
+
+
+AMX_NATIVE_INFO g_DataStructNatives[] = 
+{
+	{ "ArrayCreate",				ArrayCreate },
+	{ "ArrayClear",					ArrayClear },
+	{ "ArraySize",					ArraySize },
+	{ "ArrayGetArray",				ArrayGetArray },
+	{ "ArrayGetCell",				ArrayGetCell },
+	{ "ArrayGetString",				ArrayGetString },
+	{ "ArraySetArray",				ArraySetArray },
+	{ "ArraySetCell",				ArraySetCell },
+	{ "ArraySetString",				ArraySetString },
+	{ "ArrayPushArray",				ArrayPushArray },
+	{ "ArrayPushCell",				ArrayPushCell },
+	{ "ArrayPushString",			ArrayPushString },
+	{ "ArrayInsertArrayAfter",		ArrayInsertArrayAfter },
+	{ "ArrayInsertCellAfter",		ArrayInsertCellAfter },
+	{ "ArrayInsertStringAfter",		ArrayInsertStringAfter },
+	{ "ArrayInsertArrayBefore",		ArrayInsertArrayBefore },
+	{ "ArrayInsertCellBefore",		ArrayInsertCellBefore },
+	{ "ArrayInsertStringBefore",	ArrayInsertStringBefore },
+	{ "ArraySwap",					ArraySwap },
+	{ "ArrayDeleteItem",			ArrayDeleteItem },
+	{ "ArrayGetStringHandle",		ArrayGetStringHandle },
+	{ "ArrayDestroy",				ArrayDestroy },
+	{ "ArraySort",					ArraySort },
+
+	{ NULL,							NULL }
+};

amxmodx/datastructs.h

@@ -0,0 +1,323 @@
+/* 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.
+*/
+
+#ifndef DATASTRUCTS_H
+#define DATASTRUCTS_H
+
+class CellVector
+{
+private:
+	cell*  data;       // allocated with malloc
+	size_t cellcount;  // how many cells per element
+	size_t cursize;    // current size of the vector (maximum elements)
+	size_t count;      // how many units of the vector are in use
+	
+public:
+	CellVector(): data(NULL), cellcount(0), cursize(0), count(0)
+	{
+	};
+	CellVector(int cellsize): data(NULL), cellcount(cellsize), cursize(0), count(0)
+	{
+	};
+	~CellVector()
+	{
+		if (data)
+		{
+			free(data);
+		}
+	};
+	size_t GetCellCount()
+	{
+		return cellcount;
+	};
+	void Grow(size_t howmany)
+	{
+		cursize+=howmany;
+		if (data)
+		{
+			data=(cell*)realloc(data, (sizeof(cell) * cellcount) * cursize);
+		}
+		else
+		{
+			data=(cell*)malloc((sizeof(cell) * cellcount) * cursize);
+		}
+	};
+	void FreeUnused(void)
+	{
+		if (cursize != count &&
+			data != NULL)
+		{
+			cursize=count;
+			data=(cell*)realloc(data, cursize * (sizeof(cell) * cellcount));
+		}
+	};
+	// Returns 1 on success
+	// 0 on out of bounds.
+	int GetArray(size_t which, cell* output)
+	{
+		// make sure it is in bounds.
+		if (which >= count)
+		{
+			return 0;
+		}
+		// align output data
+		cell* out=data + (cellcount * which);
+		
+		memcpy(output, out, sizeof(cell) * cellcount);
+
+		return 1;
+	};
+	// Returns 1 on success
+	// 0 on out of bounds
+	int GetCell(size_t which, cell* output)
+	{
+		// check bounds
+		if (which >= count)
+		{
+			return 0;
+		}
+		*output=*(data + (cellcount * which));
+
+		return 1;
+	}
+	// Returns 1 on success
+	// 0 on out of bounds
+	int GetString(size_t which, cell* output, size_t size)
+	{
+		// check bounds
+		if (which >= count)
+		{
+			return 0;
+		}
+		cell* out=data + (cellcount * which);
+
+		size_t count=cellcount;
+
+		while (size-- && 
+			count-- &&
+			(*output++=*out++)!='\0')
+			/* do nothing */ ;
+
+		// If size is zero here, then the string was never null terminated.
+		if (size==0)
+		{
+			*out='\0';
+		}
+
+		return 1;
+	}
+	// Returns 1 on success
+	// 0 on out of bounds
+	int SetArray(size_t which, cell* output)
+	{
+		if (which >= count)
+		{
+			return 0;
+		}
+		// align output
+		cell* out=data + (cellcount * which);
+
+		memcpy(out, output, sizeof(cell) * cellcount);
+
+		return 1;
+	};
+	// Returns 1 on success
+	// 0 on out of bounds
+	int SetCell(size_t which, cell output)
+	{
+		if (which >= count)
+		{
+			return 0;
+		}
+		// align output
+		*(data + (cellcount * which))=output;
+
+		return 1;
+	};
+	// Returns 1 on success
+	// 0 on out of bounds
+	int SetString(size_t which, cell* output)
+	{
+		if (which >= count)
+		{
+			return 0;
+		}
+		// align output
+		cell* out=data + (cellcount * which);
+
+		memcpy(out, output, sizeof(cell) * cellcount);
+
+		// now force a null terminator on the last entry.
+		out+=(cellcount - 1);
+		*out='\0';
+
+		return 1;
+	};
+	int Push()
+	{
+		if (count >= cursize)
+		{
+			// Grow in 8s to cause less reallocation
+			this->Grow(8);
+		};
+		
+		this->count++;
+
+		return this->count-1;
+	};
+	int Size() 
+	{
+		return this->count;
+	};
+	void Clear()
+	{
+		free(data);
+		data=(cell*)malloc(sizeof(cell) * cellcount);
+		cursize=1;
+		count=0;
+	};
+	cell* GetCellPointer(size_t which)
+	{
+		if (which >= count)
+		{
+			return NULL;
+		}
+		return data + (which * cellcount);
+	};
+	// Shifts all items from this item, and including this item up 1.
+	int ShiftUpFrom(size_t which)
+	{
+		// No point shifting this.
+		if (this->count < 0 ||
+			which > this->count)
+		{
+
+			return 0;
+		}
+		// First make a new item.
+		this->Push();
+
+		// If we got an InsertAfter(lastitem), then which will equal this->count - 1
+		// all we needed to do was Push()
+		if (which == this->count || 
+			which == this->count - 1)
+		{
+			return 1;
+		}
+
+		// Allocate a temporary buffer to store data in
+		size_t tempbuffsize=(sizeof(cell) * cellcount) * (this->count - which);
+
+		cell* temp=(cell*)malloc(tempbuffsize); 
+
+		// Copy old data to temp buffer
+		memcpy(temp, GetCellPointer(which), tempbuffsize);
+
+		// Now copy temp buffer to adjusted location
+		memcpy(GetCellPointer(which+1), temp, tempbuffsize);
+
+		// cleanup
+		free(temp);
+
+		return 1;
+
+	};
+	// Shifts all items from this item, and including this item down 1.
+	// This deletes the item specified.
+	int Delete(size_t which)
+	{
+		// No point shifting this.
+		if (this->count < 0 ||
+			which >= this->count)
+		{
+			return 0;
+		}
+
+
+		for (size_t i=which; i<this->count - 1; i++)
+		{
+			memcpy(GetCellPointer(i), GetCellPointer(i + 1), sizeof(cell) * cellcount);
+		}
+		this->count--;
+		return 1;
+	};
+	int Swap(size_t item1, size_t item2)
+	{
+		if (item1 >= this->count ||
+			item2 >= this->count)
+		{
+			return 0;
+		}
+
+		// Make a temp buffer to store item2
+		cell* temp=(cell*)malloc(sizeof(cell) * cellcount);
+		memcpy(temp, GetCellPointer(item2), sizeof(cell) * cellcount);
+		
+		// copy item1 to item2
+		memcpy(GetCellPointer(item2), GetCellPointer(item1), sizeof(cell) * cellcount);
+
+		// copy item2 to item1
+		memcpy(GetCellPointer(item1), temp, sizeof(cell) * cellcount);
+
+		// Cleanup
+		free(temp);
+
+		return 1;
+	};
+
+};
+
+extern CVector<CellVector*> VectorHolder;
+
+
+inline CellVector* HandleToVector(AMX* amx, int handle)
+{
+	if (handle <= 0 ||
+		handle > (int)VectorHolder.size())
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid array handle provided (%d)", handle);
+
+		return NULL;
+	}
+
+	CellVector* ret=VectorHolder[handle-1];
+
+	if (ret == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid array handle provided (%d)", handle);
+
+		return NULL;
+	}
+
+	return ret;
+}
+
+
+#endif

amxmodx/debugger.cpp

@@ -289,7 +289,7 @@ void Debugger::BeginExec()
 	{
 		Tracer *pTracer = new Tracer();
 		m_pCalls.push_back(pTracer);
-		assert(m_Top == (m_pCalls.size() - 1));
+		assert(m_Top == static_cast<int>(m_pCalls.size() - 1));
 	}
 
 	m_pCalls[m_Top]->Reset();
@@ -388,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();
-	cell cip = _CipAsVa(m_pAmx->cip);
-	cell *p_cip = NULL;
+	//trace_info_t *pTrace = pTracer->GetEnd();
+	//cell cip = _CipAsVa(m_pAmx->cip);
+	//cell *p_cip = NULL;
 	int amx_err = AMX_ERR_NONE;
 
 	size += _snprintf(buffer, maxLength, "Run time error %d: %s ", error, gen_err);
@@ -608,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)
@@ -622,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)

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;
@@ -176,7 +176,7 @@ public:
 	trace_info_t *GetTrace() const { return m_pTrace; }
 	const char *GetFmtCache() { return m_FmtCache.c_str(); }
 	
-	bool IsNativeFiltering() { return (m_iNatFunc > 0); }
+	bool IsNativeFiltering() { return (m_iNatFunc > -1); }
 	bool InNativeFilter() { return m_InNativeFilter; }
 private:
 	AMX *m_pAmx;

amxmodx/emsg.cpp

@@ -30,6 +30,7 @@
 */
 
 #include "amxmodx.h"
+#include "CMenu.h"
 
 int gmsgAmmoPickup;
 int gmsgAmmoX;
@@ -92,9 +93,10 @@ void Client_ShowMenu(void* mValue)
 	}
 }
 
+extern bool g_bmod_tfc;
 void Client_TeamInfo(void* mValue)
 {
-	if (mPlayer) return;
+	if (mPlayer && !g_bmod_tfc) return;
 	static int index;
 
 	switch (mState++)
@@ -107,6 +109,7 @@ void Client_TeamInfo(void* mValue)
 			char* msg = (char*)mValue;
 			g_players[index].team.assign(msg);
 			g_teamsIds.registerTeam(msg, -1);
+			break;
 	}
 }
 
@@ -209,10 +212,16 @@ void Client_CurWeapon(void* mValue)
 		case 2:
 			if (!mPlayer) return;
 			if (!iState || (iId < 1 || iId >= MAX_WEAPONS)) break;
-			mPlayer->weapons[iId].clip = *(int*)mValue;
 			mPlayer->current = iId;
+
+			
+			if (*(int*)mValue < mPlayer->weapons[iId].clip && // Only update the lastHit vector if the clip size is decreasing
+				*(int*)mValue != -1) // But not if it's a melee weapon
+			{
 				mPlayer->lastHit = mPlayer->lastTrace;
 			}
+			mPlayer->weapons[iId].clip = *(int*)mValue;
+	}
 }
 
 void Client_AmmoX(void* mValue)

amxmodx/file.cpp

@@ -358,7 +358,7 @@ static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
 
 static cell AMX_NATIVE_CALL amx_fopen(AMX *amx, cell *params)
 {
-	int len, j = -1;
+	int len;
 	char *file = build_pathname("%s", get_amxstring(amx, params[1], 1, len));
 	char *flags = get_amxstring(amx, params[2], 0, len);
 
@@ -385,7 +385,7 @@ static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 			char *a = new char[blocks];
 			char *ptr = a;
 			while (btmp--)
-				*a++ = static_cast<char>(*addr++);
+				*ptr++ = static_cast<char>(*addr++);
 			size_t res = fwrite(a, sizeof(char), blocks, fp);
 			delete [] a;
 			return res;
@@ -395,7 +395,7 @@ static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 			short *a = new short[blocks];
 			short *ptr = a;
 			while (btmp--)
-				*a++ = static_cast<short>(*addr++);
+				*ptr++ = static_cast<short>(*addr++);
 			size_t res = fwrite(a, sizeof(short), blocks, fp);
 			delete [] a;
 			return res;
@@ -405,7 +405,7 @@ static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 			int *a = new int[blocks];
 			int *ptr = a;
 			while (btmp--)
-				*a++ = static_cast<int>(*addr++);
+				*ptr++ = static_cast<int>(*addr++);
 			size_t res = fwrite(a, sizeof(int), blocks, fp);
 			delete [] a;
 			return res;
@@ -438,7 +438,7 @@ static cell AMX_NATIVE_CALL amx_fwrite(AMX *amx, cell *params)
 	case 4:
 		{
 			int c = static_cast<int>(params[2]);
-			return fwrite(&c, sizeof(short), 1, fp);
+			return fwrite(&c, sizeof(int), 1, fp);
 		}
 	}
 
@@ -516,7 +516,7 @@ static cell AMX_NATIVE_CALL amx_fread_blocks(AMX *amx, cell *params)
 
 	cell *addr = get_amxaddr(amx, params[2]);
 	size_t blocks = params[3];
-	switch (params[3])
+	switch (params[4])
 	{
 	case 1:	//char
 		{
@@ -682,13 +682,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]);
@@ -802,16 +802,59 @@ static cell AMX_NATIVE_CALL amx_rmdir(AMX *amx, cell *params)
 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(fold, fnew) == 0);
+	return (rename(f_old_r, f_new_r) == 0);
 #elif defined WIN32
-	return MoveFileA(fold, fnew);
+	return MoveFileA(f_old_r, f_new_r);
 #endif
 }
 
+static cell LoadFileForMe(AMX *amx, cell *params)
+{
+	int len;
+	char *file = get_amxstring(amx, params[1], 0, len);
+	char path[256];
+
+	build_pathname_r(path, sizeof(path), "%s", file);
+
+	byte *addr = LOAD_FILE_FOR_ME(path, &len);
+	if (addr == NULL)
+	{
+		return -1;
+	}
+
+	cell *buffer = get_amxaddr(amx, params[2]);
+	cell maxlength = params[3];
+	cell *bytes_avail = get_amxaddr(amx, params[4]);
+
+	*bytes_avail = len;
+
+	cell count;
+	for (count = 0; count < len && count < maxlength; count++)
+	{
+		buffer[count] = addr[count];
+	}
+
+	FREE_FILE(addr);
+
+	return count;
+}
+
 AMX_NATIVE_INFO file_Natives[] =
 {
 	{"delete_file",		delete_file},
@@ -847,5 +890,6 @@ AMX_NATIVE_INFO file_Natives[] =
 	{"rmdir",			amx_rmdir},
 	{"fputs",			amx_fputs},
 	{"rename_file",		amx_rename},
+	{"LoadFileForMe",	LoadFileForMe},
 	{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

@@ -1,5 +1,7 @@
 #include "amxmodx.h"
 #include "format.h"
+#include "datastructs.h"
+#include "amxmod_compat.h"
 
 //Adapted from Quake3's vsprintf
 // thanks to cybermind for linking me to this :)
@@ -17,6 +19,7 @@
 #define SHORTINT	0x00000040		/* short integer */
 #define ZEROPAD		0x00000080		/* zero (as opposed to blank) pad */
 #define FPT			0x00000100		/* floating point number */
+#define UPPERDIGITS	0x00000200		/* make alpha digits uppercase */
 #define to_digit(c)		((c) - '0')
 #define is_digit(c)		((unsigned)to_digit(c) <= 9)
 #define to_char(n)		((n) + '0')
@@ -157,71 +160,169 @@ void AddString(U **buf_p, size_t &maxlen, const cell *string, int width, int pre
 }
 
 template <typename U>
-void AddFloat(U **buf_p, size_t &maxlen, double fval, int width, int prec)
+void AddFloat(U **buf_p, size_t &maxlen, double fval, int width, int prec, int flags)
+{
+	int digits;				// non-fraction part digits
+	double tmp;				// temporary
+	U *buf = *buf_p;			// output buffer pointer
+	int val;				// temporary
+	int sign = 0;				// 0: positive, 1: negative
+	int fieldlength;			// for padding
+	int significant_digits = 0;		// number of significant digits written
+	const int MAX_SIGNIFICANT_DIGITS = 16;
+
+	// default precision
+	if (prec < 0)
+	{
+		prec = 6;
+	}
+
+	// get the sign
+	if (fval < 0)
+	{
+		fval = -fval;
+		sign = 1;
+	}
+
+	// compute whole-part digits count
+	digits = (int)log10(fval) + 1;
+
+	// Only print 0.something if 0 < fval < 1
+	if (digits < 1)
+	{
+		digits = 1;
+	}
+
+	// compute the field length
+	fieldlength = digits + prec + ((prec > 0) ? 1 : 0) + sign;
+
+	// minus sign BEFORE left padding if padding with zeros
+	if (sign && maxlen && (flags & ZEROPAD))
+	{
+		*buf++ = '-';
+		maxlen--;
+	}
+
+	// right justify if required
+	if ((flags & LADJUST) == 0)
+	{
+		while ((fieldlength < width) && maxlen)
+		{
+			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+			width--;
+			maxlen--;
+		}
+	}
+
+	// minus sign AFTER left padding if padding with spaces
+	if (sign && maxlen && !(flags & ZEROPAD))
+	{
+		*buf++ = '-';
+		maxlen--;
+	}
+
+	// write the whole part
+	tmp = pow(10.0, digits-1);
+	while ((digits--) && maxlen)
+	{
+		if (++significant_digits > MAX_SIGNIFICANT_DIGITS)
+		{
+			*buf++ = '0';
+		}
+		else
+		{
+			val = (int)(fval / tmp);
+			*buf++ = '0' + val;
+			fval -= val * tmp;
+			tmp *= 0.1;
+		}
+		maxlen--;
+	}
+
+	// write the fraction part
+	if (maxlen)
+	{
+		*buf++ = '.';
+		maxlen--;
+	}
+
+	tmp = pow(10.0, prec);
+
+	fval *= tmp;
+	while (prec-- && maxlen)
+	{
+		if (++significant_digits > MAX_SIGNIFICANT_DIGITS)
+		{
+			*buf++ = '0';
+		}
+		else
+		{
+			tmp *= 0.1;
+			val = (int)(fval / tmp);
+			*buf++ = '0' + val;
+			fval -= val * tmp;
+		}
+		maxlen--;
+	}
+
+	// left justify if required
+	if (flags & LADJUST)
+	{
+		while ((fieldlength < width) && maxlen)
+		{
+			// right-padding only with spaces, ZEROPAD is ignored
+			*buf++ = ' ';
+			width--;
+			maxlen--;
+		}
+	}
+
+	// update parent's buffer pointer
+	*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;
-	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;
 
+	if( !(flags & LADJUST) )
+	{
 		while (digits < width && maxlen)
 		{
-		*buf++ = ' ';
+			*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;
-
-	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>
@@ -231,15 +332,21 @@ void AddInt(U **buf_p, size_t &maxlen, int val, int width, int flags)
 	int		digits;
 	int		signedVal;
 	U		*buf;
+	unsigned int unsignedVal;
 
 	digits = 0;
 	signedVal = val;
 	if (val < 0)
-		val = -val;
+	{
+		/* we want the unsigned version */
+		unsignedVal = abs(val);
+	} else {
+		unsignedVal = val;
+	}
 	do {
-		text[digits++] = '0' + val % 10;
-		val /= 10;
-	} while (val);
+		text[digits++] = '0' + unsignedVal % 10;
+		unsignedVal /= 10;
+	} while (unsignedVal);
 
 	if (signedVal < 0)
 		text[digits++] = '-';
@@ -275,6 +382,66 @@ void AddInt(U **buf_p, size_t &maxlen, int val, int width, int flags)
 	*buf_p = buf;
 }
 
+template <typename U>
+void AddHex(U **buf_p, size_t &maxlen, unsigned int val, int width, int flags)
+{
+	U		text[32];
+	int		digits;
+	U		*buf;
+	U		digit;
+	int		hexadjust;
+
+	if (flags & UPPERDIGITS)
+	{
+		hexadjust = 'A' - '9' - 1;
+	} else {
+		hexadjust = 'a' - '9' - 1;
+	}
+
+	digits = 0;
+	do
+	{
+		digit = ('0' + val % 16);
+		if (digit > '9')
+		{
+			digit += hexadjust;
+		}
+
+		text[digits++] = digit;
+		val /= 16;
+	} 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 D, typename S>
 size_t atcprintf(D *buffer, size_t maxlen, const S *format, AMX *amx, cell *params, int *param)
 {
@@ -352,6 +519,7 @@ reswitch:
 		case 'c':
 			CHECK_ARGS(0);
 			*buf_p++ = static_cast<D>(*get_amxaddr(amx, params[arg]));
+			llen--;
 			arg++;
 			break;
 		case 'd':
@@ -360,13 +528,62 @@ reswitch:
 			AddInt(&buf_p, llen, *get_amxaddr(amx, params[arg]), width, flags);
 			arg++;
 			break;
-		case 'f':
+		case 'u':
 			CHECK_ARGS(0);
-			AddFloat(&buf_p, llen, amx_ctof(*get_amxaddr(amx, params[arg])), width, prec);
+			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, flags);
+			arg++;
+			break;
+		case 'X':
+			CHECK_ARGS(0);
+			flags |= UPPERDIGITS;
+			AddHex(&buf_p, llen, static_cast<unsigned int>(*get_amxaddr(amx, params[arg])), width, flags);
+			arg++;
+			break;
+		case 'x':
+			CHECK_ARGS(0);
+			AddHex(&buf_p, llen, static_cast<unsigned int>(*get_amxaddr(amx, params[arg])), width, flags);
+			arg++;
+			break;
+		case 'a':
+			{
+				CHECK_ARGS(0);
+				// %a is passed a pointer directly to a cell string.
+				cell* ptr=reinterpret_cast<cell*>(*get_amxaddr(amx, params[arg]));
+				if (!ptr)
+				{
+					LogError(amx, AMX_ERR_NATIVE, "Invalid vector string handle provided (%d)", *get_amxaddr(amx, params[arg]));
+					return 0;
+				}
+
+				AddString(&buf_p, llen, ptr, 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;

amxmodx/format.h

@@ -5,4 +5,7 @@
 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/libraries.cpp

@@ -184,7 +184,7 @@ LibError RunLibCommand(const LibDecoder *enc)
 
 	if ( (enc->cmd == LibCmd_ReqLib) || (enc->cmd == LibCmd_ReqClass) )
 	{
-		LibType expect;
+		LibType expect = LibType_Library;
 
 		if (enc->cmd == LibCmd_ReqLib)
 			expect = LibType_Library;
@@ -202,7 +202,7 @@ LibError RunLibCommand(const LibDecoder *enc)
 		}
 		if (expect == LibType_Library)
 			return LibErr_NoLibrary;
-		else if (expect = LibType_Class)
+		else if (expect == LibType_Class)
 			return LibErr_NoClass;
 
 		return LibErr_NoLibrary;

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

@@ -2,7 +2,8 @@
 #include "messages.h"
 
 Message Msg;
-CVector<int> msgHooks[256];
+//CVector<int> msgHooks[256];
+RegisteredMessage msgHooks[256];
 int msgBlocks[256] = {BLOCK_NOT};
 int msgDest;
 int msgType;
@@ -16,7 +17,7 @@ void ClearMessages()
 {
 	for (size_t i=0; i<MAX_MESSAGES; i++)
 	{
-		msgHooks[i].clear();
+		msgHooks[i].Clear();
 		msgBlocks[i] = BLOCK_NOT;
 	}
 }
@@ -200,7 +201,7 @@ void C_MessageBegin(int msg_dest, int msg_type, const float *pOrigin, edict_t *e
 		inblock = true;
 		msgType = msg_type;
 		RETURN_META(MRES_SUPERCEDE);
-	} else if (msgHooks[msg_type].size()) {
+	} else if (msgHooks[msg_type].Hooked()) {
 		inhook = true;
 		msgDest = msg_dest;
 		msgType = msg_type;
@@ -318,8 +319,8 @@ void C_WriteEntity(int iValue)
 
 void C_MessageEnd(void)
 {
-	int mres = 0, mresB = 0;
-	unsigned int i = 0;
+	int mres = 0;
+	
 	if (inblock)
 	{
 		inblock = false;
@@ -329,12 +330,17 @@ void C_MessageEnd(void)
 		}
 		RETURN_META(MRES_SUPERCEDE);
 	} else if (inhook) {
+
+		mres = msgHooks[msgType].Execute((cell)msgType, (cell)msgDest, (cell)ENTINDEX(msgpEntity));
+
+		/*
 		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)
 		{
@@ -477,7 +483,7 @@ static cell AMX_NATIVE_CALL register_message(AMX *amx, cell *params)
 		int id = registerSPForwardByName(amx, name, FP_CELL, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
 		if (id != -1)
 		{
-			msgHooks[params[1]].push_back(id);
+			msgHooks[params[1]].AddHook(id);
 			return id;
 		} else {
 			LogError(amx, AMX_ERR_NOTFOUND, "Could not find function \"%s\"", name);
@@ -488,6 +494,29 @@ static cell AMX_NATIVE_CALL register_message(AMX *amx, cell *params)
 	return 0;
 }
 
+// unregister_message(msgid, msghandle)
+static cell AMX_NATIVE_CALL unregister_message(AMX *amx, cell *params)
+{
+	if (!Msg.Ready())
+		Msg.Init();
+
+	if (params[1]>0 && params[1] < 256)
+	{
+		int id = params[2];
+		if (id != -1)
+		{
+			msgHooks[params[1]].RemoveHook(id);
+			return id;
+		} else {
+			LogError(amx, AMX_ERR_NOTFOUND, "Invalid registered message handle");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+
 static cell AMX_NATIVE_CALL set_msg_block(AMX *amx, cell *params)
 {
 	int msgid = params[1];
@@ -775,6 +804,7 @@ AMX_NATIVE_INFO msg_Natives[] =
 	{"write_string",		write_string},
 
 	{"register_message",	register_message},
+	{"unregister_message",	unregister_message},
 
 	{"set_msg_block",		set_msg_block},
 	{"get_msg_block",		get_msg_block},

amxmodx/messages.h

@@ -6,13 +6,146 @@
 #include "amx.h"
 #include "CVector.h"
 #include "CString.h"
+#include "sh_stack.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
 
+class RegisteredMessage
+{
+private:
+	CVector<int> m_Forwards;
+	CStack<int> m_InExecution;
+	bool m_Cleanup;
+
+public:
+	RegisteredMessage() : m_Cleanup(false) { } 
+	~RegisteredMessage() { this->Clear(); }
+
+	void AddHook(int fwd)
+	{
+		m_Forwards.push_back(fwd);
+	}
+	bool RemoveHook(int fwd)
+	{
+		// Don't erase a forward if we're in the middle of execution; this
+		// could throw off the iterator that is going through the forwards
+		// and executing them.  Instead, unregister the forward and set it
+		// to -1 from within the vector.
+		if (m_InExecution.size())
+		{
+			this->m_Cleanup = true;
+
+			CVector<int>::iterator iter = m_Forwards.begin();
+			CVector<int>::iterator end = m_Forwards.end();
+			while (iter != end)
+			{
+				if (*iter == fwd)
+				{
+					if (*iter != -1)
+					{
+						unregisterSPForward(*iter);
+					}
+					*iter = -1;
+					return true;
+				}
+				else
+				{
+					iter++;
+				}
+			}
+		
+		}
+		else
+		{
+			CVector<int>::iterator iter = m_Forwards.begin();
+			CVector<int>::iterator end = m_Forwards.end();
+			while (iter != end)
+			{
+				if (*iter == fwd)
+				{
+					if (fwd != -1)
+					{
+						unregisterSPForward(fwd);
+
+						m_Forwards.erase(iter);
+
+						return true;
+					}
+					else
+					{
+						// -1 could be in here more than once
+						m_Forwards.erase(iter);
+					}
+				}
+				else
+				{
+					iter++;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	void Clear()
+	{
+		while (m_InExecution.size())
+		{
+			m_InExecution.pop();
+		}
+		for (size_t i = 0; i < m_Forwards.size(); i++)
+		{
+			int fwd = m_Forwards[i];
+
+			if (fwd != -1)
+			{
+				unregisterSPForward(m_Forwards[i]);
+			}
+		}
+
+		m_Forwards.clear();
+	}
+
+	cell Execute(cell type, cell dest, cell entity)
+	{
+		m_InExecution.push(1);
+		cell res = 0;
+		cell thisres = 0;
+		for (size_t i = 0; i < m_Forwards.size(); i++)
+		{
+			int fwd = m_Forwards[i];
+
+			if (fwd != -1)
+			{
+				thisres = executeForwards(fwd, type, dest, entity);
+				if (thisres > res)
+				{
+					res = thisres;
+				}
+
+			}
+		}
+
+		m_InExecution.pop();
+
+		if (m_InExecution.size() == 0 && m_Cleanup)
+		{
+			this->RemoveHook(-1);
+		}
+
+		return res;
+	}
+	bool Hooked() const
+	{
+		return m_Forwards.size() != 0;
+	}
+};
 enum msgtype
 {
 	arg_byte = 1,
@@ -74,7 +207,7 @@ void C_WriteString(const char *sz);
 void C_WriteEntity(int iValue);
 void C_MessageEnd(void);
 
-extern CVector<int> msgHooks[256];
+extern RegisteredMessage msgHooks[256];
 extern int msgBlocks[256];
 
 void ClearMessages();

amxmodx/meta_api.cpp

@@ -39,23 +39,30 @@
 
 #include "amxmodx.h"
 #include "fakemeta.h"
+#include "CMenu.h"
 #include "newmenus.h"
 #include "natives.h"
 #include "binlog.h"
 #include "optimizer.h"
 #include "libraries.h"
 #include "messages.h"
+#include "amxmod_compat.h"
+
+#include "datastructs.h"
+#include "CFlagManager.h"
+#include "svn_version.h"
+#include "trie_natives.h"
 
 plugin_info_t Plugin_info = 
 {
 	META_INTERFACE_VERSION,		// ifvers
 	"AMX Mod X",				// name
-	AMX_VERSION,				// version
+	SVN_VERSION_STRING,			// version
 	__DATE__,					// date
 	"AMX Mod X Dev Team",		// author
 	"http://www.amxmodx.org",	// url
 	"AMXX",						// logtag
-	PT_ANYTIME,					// (when) loadable
+	PT_STARTUP,					// (when) loadable
 	PT_ANYTIME,					// (when) unloadable
 };
 
@@ -72,6 +79,7 @@ void (*function)(void*);
 void (*endfunction)(void*);
 
 extern List<AUTHORIZEFUNC> g_auth_funcs;
+extern CVector<CAdminData *> DynamicAdmins;
 
 CLog g_log;
 CForwardMngr g_forwards;
@@ -85,7 +93,7 @@ CPlayer* mPlayer;
 CPluginMngr g_plugins;
 CTaskMngr g_tasksMngr;
 CmdMngr g_commands;
-
+CFlagManager FlagMan;
 EventsMngr g_events;
 Grenades g_grenades;
 LogEventsMngr g_logevents;
@@ -95,6 +103,7 @@ String g_log_dir;
 String g_mod_name;
 XVars g_xvars;
 
+bool g_bmod_tfc;
 bool g_bmod_cstrike;
 bool g_bmod_dod;
 bool g_dontprecache;
@@ -170,16 +179,18 @@ void ParseAndOrAdd(CStack<String *> & files, const char *name)
 	}
 }
 
-void BuildPluginFileList(CStack<String *> & files)
+void BuildPluginFileList(const char *initialdir, CStack<String *> & files)
 {
 	char path[255];
 #if defined WIN32
-	build_pathname_r(path, sizeof(path)-1, "%s/*.ini", get_localinfo("amxx_configsdir", "addons/amxmodx/configs"));
+	build_pathname_r(path, sizeof(path)-1, "%s/*.ini", initialdir);
 	_finddata_t fd;
 	intptr_t handle = _findfirst(path, &fd);
 
 	if (handle < 0)
+	{
 		return;
+	}
 
 	while (!_findnext(handle, &fd))
 	{
@@ -188,12 +199,14 @@ void BuildPluginFileList(CStack<String *> & files)
 
 	_findclose(handle);
 #elif defined __linux__
-	build_pathname_r(path, sizeof(path)-1, "%s/", get_localinfo("amxx_configsdir", "addons/amxmodx/configs"));
+	build_pathname_r(path, sizeof(path)-1, "%s/", initialdir);
 	struct dirent *ep;
 	DIR *dp;
 
 	if ((dp = opendir(path)) == NULL)
+	{
 		return;
+	}
 
 	while ( (ep=readdir(dp)) != NULL )
 	{
@@ -204,6 +217,41 @@ void BuildPluginFileList(CStack<String *> & files)
 #endif
 }
 
+//Loads a plugin list into the Plugin Cache and Load Modules cache
+void LoadExtraPluginsToPCALM(const char *initialdir)
+{
+	CStack<String *> files;
+	BuildPluginFileList(initialdir, files);
+	char path[255];
+	while (!files.empty())
+	{
+		String *pString = files.front();
+		snprintf(path, sizeof(path)-1, "%s/%s", 
+			initialdir,
+			pString->c_str());
+		g_plugins.CALMFromFile(path);
+		delete pString;
+		files.pop();
+	}
+}
+
+void LoadExtraPluginsFromDir(const char *initialdir)
+{
+	CStack<String *> files;
+	char path[255];
+	BuildPluginFileList(initialdir, files);
+	while (!files.empty())
+	{
+		String *pString = files.front();
+		snprintf(path, sizeof(path)-1, "%s/%s", 
+			initialdir,
+			pString->c_str());
+		g_plugins.loadPluginsFromFile(path);
+		delete pString;
+		files.pop();
+	}
+}
+
 // Precache	stuff from force consistency calls
 // or check	for	pointed	files won't	be done
 int	C_PrecacheModel(char *s)
@@ -268,11 +316,27 @@ const char*	get_localinfo(const char* name, const char* def)
 	const char* b = LOCALINFO((char*)name);
 
 	if (b == 0 || *b == 0)
+	{
 		SET_LOCALINFO((char*)name, (char*)(b = def));
+	}
 
 	return b;
 }
 
+const char*	get_localinfo_r(const char *name, const char *def, char buffer[], size_t maxlength)
+{
+	const char* b = LOCALINFO((char*)name);
+
+	if (b == 0 || *b == 0)
+	{
+		SET_LOCALINFO((char*)name, (char*)(b = def));
+	}
+
+	snprintf(buffer, maxlength, "%s", b);
+
+	return buffer;
+}
+
 // Very	first point	at map load
 // Load	AMX	modules	for	new	native functions
 // Initialize AMX stuff	and	load it's plugins from plugins.ini list
@@ -280,7 +344,9 @@ const char*	get_localinfo(const char* name, const char* def)
 int	C_Spawn(edict_t *pent)
 {
 	if (g_initialized)
+	{
 		RETURN_META_VALUE(MRES_IGNORED, 0);
+	}
 
 	g_activated = false;
 	g_initialized = true;
@@ -292,6 +358,22 @@ int	C_Spawn(edict_t *pent)
 	hostname = CVAR_GET_POINTER("hostname");
 	mp_timelimit = CVAR_GET_POINTER("mp_timelimit");
 
+	// Fix for crashing on mods that do not have mp_timelimit
+	if (mp_timelimit == NULL)
+	{
+		static cvar_t timelimit_holder;
+
+		timelimit_holder.name = "mp_timelimit";
+		timelimit_holder.string = "0";
+		timelimit_holder.flags = 0;
+		timelimit_holder.value = 0.0;
+
+		CVAR_REGISTER(&timelimit_holder);
+
+		mp_timelimit = &timelimit_holder;
+
+	}
+
 	g_forwards.clear();
 
 	g_log.MapChange();
@@ -314,26 +396,62 @@ int	C_Spawn(edict_t *pent)
 	get_localinfo("amxx_configsdir", "addons/amxmodx/configs");
 	get_localinfo("amxx_customdir", "addons/amxmodx/custom");
 
+	// make sure bcompat localinfos are set
+	get_localinfo("amx_basedir", "addons/amxmodx");
+	get_localinfo("amx_configdir", "addons/amxmodx/configs");
+	get_localinfo("amx_langdir", "addons/amxmodx/data/amxmod-lang");
+	get_localinfo("amx_modulesdir", "addons/amxmodx/modules");
+	get_localinfo("amx_pluginsdir", "addons/amxmodx/plugins");
+	get_localinfo("amx_logdir", "addons/amxmodx/logs");
+
+	FlagMan.LoadFile();
+
+	for (unsigned int i=0; i<VectorHolder.size(); i++)
+	{
+		delete VectorHolder[i];
+	};
+	VectorHolder.clear();
+
+	g_TrieHandles.clear();
+	char map_pluginsfile_path[256];
+	char prefixed_map_pluginsfile[256];
+	char configs_dir[256];
+
 	// ###### Load modules
 	loadModules(get_localinfo("amxx_modules", "addons/amxmodx/configs/modules.ini"), PT_ANYTIME);
+
+	get_localinfo_r("amxx_configsdir", "addons/amxmodx/configs", configs_dir, sizeof(configs_dir)-1);
 	g_plugins.CALMFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
-	CStack<String *> files;
-	BuildPluginFileList(files);
-	char path[255];
-	while (!files.empty())
+	LoadExtraPluginsToPCALM(configs_dir);
+	char temporaryMap[64], *tmap_ptr;
+
+	snprintf(temporaryMap, sizeof(temporaryMap), "%s", STRING(gpGlobals->mapname));
+
+	prefixed_map_pluginsfile[0] = '\0';
+	if ((tmap_ptr = strchr(temporaryMap, '_')) != NULL)
 	{
-		String *pString = files.front();
-		snprintf(path, sizeof(path)-1, "%s/%s", 
-			get_localinfo("amxx_configsdir", "addons/amxmodx/configs"),
-			pString->c_str());
-		g_plugins.CALMFromFile(path);
-		delete pString;
-		files.pop();
+		// this map has a prefix
+
+		*tmap_ptr = '\0';
+		snprintf(prefixed_map_pluginsfile, 
+			sizeof(prefixed_map_pluginsfile),
+			"%s/maps/plugins-%s.ini",
+			configs_dir,
+			temporaryMap);
+		g_plugins.CALMFromFile(prefixed_map_pluginsfile);
 	}
+
+	snprintf(map_pluginsfile_path, 
+		sizeof(map_pluginsfile_path),
+		"%s/maps/plugins-%s.ini",
+		configs_dir,
+		STRING(gpGlobals->mapname));
+	g_plugins.CALMFromFile(map_pluginsfile_path);
+
 	int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat
 	
 	// Set some info about amx version and modules
-	CVAR_SET_STRING(init_amxmodx_version.name, AMX_VERSION);
+	CVAR_SET_STRING(init_amxmodx_version.name, SVN_VERSION_STRING);
 	char buffer[32];
 	sprintf(buffer, "%d", loaded);
 	CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
@@ -365,20 +483,17 @@ int	C_Spawn(edict_t *pent)
 	if (!g_opt_level)
 		g_opt_level = 7;
 
-	// ###### Load AMX scripts
+	// ###### Load AMX Mod X plugins
 	g_plugins.loadPluginsFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
-	BuildPluginFileList(files);
-	while (!files.empty())
+	LoadExtraPluginsFromDir(configs_dir);
+	g_plugins.loadPluginsFromFile(map_pluginsfile_path, false);
+	if (prefixed_map_pluginsfile[0] != '\0')
 	{
-		String *pString = files.front();
-		snprintf(path, sizeof(path)-1, "%s/%s", 
-			get_localinfo("amxx_configsdir", "addons/amxmodx/configs"),
-			pString->c_str());
-		g_plugins.loadPluginsFromFile(path);
-		delete pString;
-		files.pop();
+		g_plugins.loadPluginsFromFile(prefixed_map_pluginsfile, false);
 	}
+
 	g_plugins.Finalize();
+	g_plugins.InvalidateCache();
 
 	// Register forwards
 	FF_PluginInit = registerForward("plugin_init", ET_IGNORE, FP_DONE);
@@ -592,10 +707,19 @@ void C_ServerDeactivate_Post()
 
 	ClearMessages();
 	
+	// Flush the dynamic admins list
+	for (size_t iter=DynamicAdmins.size();iter--; )
+	{
+		delete DynamicAdmins[iter];
+	}
+
+	DynamicAdmins.clear();
 	for (unsigned int i=0; i<g_hudsync.size(); i++)
 		delete [] g_hudsync[i];
 	g_hudsync.clear();
 
+	FlagMan.WriteCommands();
+
 	// last memreport
 #ifdef MEMORY_TEST
 	if (g_memreport_enabled)
@@ -662,7 +786,7 @@ void C_ServerDeactivate_Post()
 BOOL C_ClientConnect_Post(edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[128])
 {
 	CPlayer* pPlayer = GET_PLAYER_POINTER(pEntity);
-	if (!pPlayer->bot)
+	if (!pPlayer->IsBot())
 	{
 		bool a = pPlayer->Connect(pszName, pszAddress);
 		executeForwards(FF_ClientConnect, static_cast<cell>(pPlayer->index));
@@ -710,7 +834,7 @@ void C_ClientDisconnect(edict_t *pEntity)
 void C_ClientPutInServer_Post(edict_t *pEntity)
 {
 	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	if (!pPlayer->bot)
+	if (!pPlayer->IsBot())
 	{
 		pPlayer->PutInServer();
 		++g_players_num;
@@ -730,9 +854,7 @@ void C_ClientUserInfoChanged_Post(edict_t *pEntity, char *infobuffer)
 	if (pPlayer->ingame)
 	{
 		pPlayer->name.assign(name);			//	Make sure player have name up to date
-	}
-	else if (pPlayer->IsBot())
-	{
+	} else if (pPlayer->IsBot()) {
 		pPlayer->Connect(name, "127.0.0.1"/*CVAR_GET_STRING("net_address")*/);
 
 		executeForwards(FF_ClientConnect, static_cast<cell>(pPlayer->index));
@@ -781,10 +903,11 @@ void C_ClientCommand(edict_t *pEntity)
 			
 			sprintf(buf, "%s %s\n", Plugin_info.name, Plugin_info.version);
 			CLIENT_PRINT(pEntity, print_console, buf);
-			len = sprintf(buf, "Authors: David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko, Felix \"SniperBeamer\" Geyer\n");
-			len += sprintf(&buf[len], "Authors: Jonny \"Got His Gun\" Bergstrom, Lukasz \"SidLuke\" Wlasinski\n");
+			len = sprintf(buf, "Authors: \n         David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko, Felix \"SniperBeamer\" Geyer\n");
+			len += sprintf(&buf[len], "         Jonny \"Got His Gun\" Bergstrom, Lukasz \"SidLuke\" Wlasinski\n");
 			CLIENT_PRINT(pEntity, print_console, buf);
-			len = sprintf(buf, "Authors: Christian \"Basic-Master\" Hammacher, Borja \"faluco\" Ferrer\n");
+			len = sprintf(buf, "         Christian \"Basic-Master\" Hammacher, Borja \"faluco\" Ferrer\n");
+			len += sprintf(&buf[len], "         Scott \"Damaged Soul\" Ehlert\n");
 			len += sprintf(&buf[len], "Compiled: %s\nURL:http://www.amxmodx.org/\n", __DATE__ ", " __TIME__);
 			CLIENT_PRINT(pEntity, print_console, buf);
 #ifdef JIT
@@ -843,50 +966,66 @@ void C_ClientCommand(edict_t *pEntity)
 			int menuid = pPlayer->menu;
 			pPlayer->menu = 0;
 
-			MenuMngr::iterator a = g_menucmds.begin();
-
-			while (a)
-			{
-				if ((*a).matchCommand(menuid, bit_key) && (*a).getPlugin()->isExecutable((*a).getFunction()))
-				{
+			/* First, do new menus */
+			int func_was_executed = -1;
 			if (pPlayer->newmenu != -1)
 			{
 				int menu = pPlayer->newmenu;
 				pPlayer->newmenu = -1;
 
-						if (menu >= 0 && menu < (int)g_NewMenus.size())
+				if (menu >= 0 && menu < (int)g_NewMenus.size() && g_NewMenus[menu])
 				{
 					Menu *pMenu = g_NewMenus[menu];
 					int item = pMenu->PagekeyToItem(pPlayer->page, pressed_key+1);
-
 					if (item == MENU_BACK)
 					{
 						pMenu->Display(pPlayer->index, pPlayer->page - 1);
 					} else if (item == MENU_MORE) {
 						pMenu->Display(pPlayer->index, pPlayer->page + 1);
 					} else {
-								ret = executeForwards((*a).getFunction(), static_cast<cell>(pPlayer->index), static_cast<cell>(menu), static_cast<cell>(item));
-								
+						ret = executeForwards(pMenu->func, static_cast<cell>(pPlayer->index), static_cast<cell>(menu), static_cast<cell>(item));
 						if (ret & 2)
+						{
 							result = MRES_SUPERCEDE;
-								else if (ret & 1)
+						} else if (ret & 1) {
 							RETURN_META(MRES_SUPERCEDE);
 						}
 					}
-						if (pPlayer->newmenu != -1)
-							break;
-					} else {
+					/**
+					 * No matter what we marked it as executed, since the callback styles are 
+					 * entirely different.  After all, this is a backwards compat shim.
+					 */
+					func_was_executed = pMenu->func;
+				}
+			}		
+
+			/* Now, do old menus */
+			MenuMngr::iterator a = g_menucmds.begin();
+
+			while (a)
+			{
+				g_menucmds.SetWatchIter(a);
+				if ((*a).matchCommand(menuid, bit_key) 
+					&& (*a).getPlugin()->isExecutable((*a).getFunction())
+					&& (func_was_executed == -1 
+						|| !g_forwards.isSameSPForward(func_was_executed, (*a).getFunction()))
+					)
+				{
 					ret = executeForwards((*a).getFunction(), static_cast<cell>(pPlayer->index),
 						static_cast<cell>(pressed_key), 0);
 					
 					if (ret & 2) result = MRES_SUPERCEDE;
 					if (ret & 1) RETURN_META(MRES_SUPERCEDE);
 				}
-				}
+				if (g_menucmds.GetWatchIter() != a)
+				{
+					a = g_menucmds.GetWatchIter();
+				} else {
 					++a;
 				}
 			}
 		}
+	}
 
 	/* check for PLUGIN_HANDLED_MAIN and block hl call if needed */
 	RETURN_META(result);
@@ -999,20 +1138,6 @@ void C_MessageBegin_Post(int msg_dest, int msg_type, const float *pOrigin, edict
 {
 	if (ed)
 	{
-		if (gmsgBattery == msg_type && g_bmod_cstrike)
-		{
-			void* ptr = GET_PRIVATE(ed);
-#ifdef __linux__
-			int *z = (int*)ptr + 0x171;
-#else
-			int *z = (int*)ptr + 0x16C;
-#endif
-			int stop = (int)ed->v.armorvalue;
-			
-			*z = stop;
-			ed->v.armorvalue = (float)stop;
-		}
-
 		mPlayerIndex = ENTINDEX(ed);
 		mPlayer	= GET_PLAYER_POINTER_I(mPlayerIndex);
 	} else {
@@ -1154,17 +1279,18 @@ void C_TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t
 		if (ptr->pHit && (ptr->pHit->v.flags & (FL_CLIENT | FL_FAKECLIENT)))
 			pPlayer->aiming = ptr->iHitgroup;
 			
-		pPlayer->lastTrace = pPlayer->thisTrace;
-		pPlayer->thisTrace = ptr->vecEndPos;
+		pPlayer->lastTrace = ptr->vecEndPos;
 	}
 
 	RETURN_META(MRES_IGNORED);
 }
 
-void C_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...)
+void C_AlertMessage(ALERT_TYPE atype, char *szFmt, ...)
 {
 	if (atype != at_logged)
+	{
 		RETURN_META(MRES_IGNORED);
+	}
 
 	/* There are also more messages but we want only logs
 	at_notice,
@@ -1175,8 +1301,11 @@ void C_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...)
 	at_logged		// Server print to console ( only in multiplayer games ).
 	*/
 
+	cell retVal = 0;
+
 	// execute logevents and plugin_log forward
-	if (g_logevents.logEventsExist() || FF_PluginLog >= 0)
+	if (g_logevents.logEventsExist()
+		|| g_forwards.getFuncsNum(FF_PluginLog))
 	{
 		va_list	logArgPtr;
 		va_start(logArgPtr, szFmt);
@@ -1185,12 +1314,16 @@ void C_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...)
 		g_logevents.parseLogString();
 
 		if (g_logevents.logEventsExist())
+		{
 			g_logevents.executeLogEvents();
+		}
 
-		cell retVal = executeForwards(FF_PluginLog);
+		retVal = executeForwards(FF_PluginLog);
+	}
 
 	if (retVal)
-			RETURN_META(MRES_HANDLED);
+	{
+		RETURN_META(MRES_SUPERCEDE);
 	}
 
     RETURN_META(MRES_IGNORED);
@@ -1324,7 +1457,7 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
 
 	// ###### Print short GPL
 	print_srvconsole("\n   AMX Mod X version %s Copyright (c) 2004-2006 AMX Mod X Development Team \n"
-					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMX_VERSION);
+					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING);
 	print_srvconsole("   This is free software and you are welcome to redistribute it under \n"
 					 "   certain conditions; type 'amxx gpl' for details.\n  \n");
 
@@ -1353,6 +1486,8 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
 
 	GET_HOOK_TABLES(PLID, &g_pEngTable, NULL, NULL);
 
+	FlagMan.SetFile("cmdaccess.ini");
+	
 	return (TRUE);
 }
 
@@ -1523,6 +1658,7 @@ C_DLLEXPORT	int	GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
 	} else {
 		g_bmod_cstrike = false;
 		g_bmod_dod = !stricmp(g_mod_name.c_str(), "dod");
+		g_bmod_tfc = !stricmp(g_mod_name.c_str(), "tfc");
 	}
 
 	meta_engfuncs.pfnCmd_Argc = C_Cmd_Argc;
@@ -1544,6 +1680,8 @@ C_DLLEXPORT	int	GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
 	meta_engfuncs.pfnWriteShort = C_WriteShort;
 	meta_engfuncs.pfnWriteString = C_WriteString;
 
+	meta_engfuncs.pfnAlertMessage = C_AlertMessage;
+
 	memcpy(pengfuncsFromEngine, &meta_engfuncs, sizeof(enginefuncs_t));
 
 	return 1;
@@ -1565,7 +1703,6 @@ C_DLLEXPORT	int	GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine,	int
 	meta_engfuncs_post.pfnWriteCoord = C_WriteCoord_Post;
 	meta_engfuncs_post.pfnWriteString = C_WriteString_Post;
 	meta_engfuncs_post.pfnWriteEntity = C_WriteEntity_Post;
-	meta_engfuncs_post.pfnAlertMessage = C_AlertMessage_Post;
 	meta_engfuncs_post.pfnRegUserMsg = C_RegUserMsg_Post;
 
 	memcpy(pengfuncsFromEngine, &meta_engfuncs_post, sizeof(enginefuncs_t));

amxmodx/modules.cpp

@@ -48,6 +48,8 @@
 #include "binlog.h"
 #include "libraries.h"
 #include "messages.h"
+#include "amxmod_compat.h"
+#include "trie_natives.h"
 
 CList<CModule, const char*> g_modules;
 CList<CScript, AMX*> g_loadedscripts;
@@ -165,6 +167,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 	*error = 0;
 	size_t bufSize;
 	*program = (void *)g_plugins.ReadIntoOrFromCache(filename, bufSize);
+	bool oldfile = false;
 	if (!*program)
 	{
 		CAmxxReader reader(filename, PAWN_CELL_SIZE / 8);
@@ -218,6 +221,8 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 				strcpy(error, "Unknown error");
 				return (amx->error = AMX_ERR_NOTFOUND);
 		}
+
+		oldfile = reader.IsOldFile();
 	} else {
 		g_plugins.InvalidateFileInCache(filename, false);
 	}
@@ -313,7 +318,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 		//set this again because amx_Init() erases it!
 		amx->flags |= AMX_FLAG_JITC;
 		amx->flags &= (~AMX_FLAG_DEBUG);
-		amx->sysreq_d = NULL;
+		amx->sysreq_d = 0;
 #endif
 	}
 
@@ -369,6 +374,17 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 	}
 #endif
 
+	if (oldfile)
+	{
+		amx->flags |= AMX_FLAG_OLDFILE;
+	} else {
+		cell addr;
+		if (amx_FindPubVar(amx, "__b_old_plugin", &addr) == AMX_ERR_NONE)
+		{
+			amx->flags |= AMX_FLAG_OLDFILE;
+		}
+	}
+
 	CScript* aa = new CScript(amx, *program, filename);
 
 	g_loadedscripts.put(aa);
@@ -542,6 +558,12 @@ int set_amxnatives(AMX* amx, char error[128])
 		{
 			amx_Register(amx, cm->m_Natives[i], -1);
 		}
+
+		for (size_t i = 0; i < cm->m_NewNatives.size(); i++)
+		{
+			if (!(amx->flags & AMX_FLAG_OLDFILE))
+				amx_Register(amx, cm->m_NewNatives[i], -1);
+		}
 	}
 
 	amx_Register(amx, string_Natives, -1);
@@ -556,6 +578,14 @@ int set_amxnatives(AMX* amx, char error[128])
 	amx_Register(amx, g_DebugNatives, -1);
 	amx_Register(amx, msg_Natives, -1);
 	amx_Register(amx, vector_Natives, -1);
+	amx_Register(amx, g_SortNatives, -1);
+	amx_Register(amx, g_DataStructNatives, -1);
+	amx_Register(amx, trie_Natives, -1);
+	
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		amx_Register(amx, g_BcompatNatives, -1);
+	}
 
 	//we're not actually gonna check these here anymore
 	amx->flags |= AMX_FLAG_PRENIT;
@@ -571,7 +601,7 @@ int set_amxnatives(AMX* amx, char error[128])
 		if ((err = amx_Exec(amx, &retval, idx)) != AMX_ERR_NONE)
 		{
 			Debugger::GenericMessage(amx, err);
-			AMXXLOG_Log("An error occurred in plugins_native. This is dangerous!");
+			AMXXLOG_Log("An error occurred in plugin_natives. This is dangerous!");
 		}
 	}
 
@@ -584,7 +614,9 @@ int set_amxnatives(AMX* amx, char error[128])
 
 int unload_amxscript(AMX* amx, void** program)
 {	
+#if !defined AMD64
 	int flags = amx->flags;
+#endif
 
 	Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
 	if (pDebugger)
@@ -692,13 +724,7 @@ char* build_pathname(char *fmt, ...)
 {
 	static char string[256];
 	int b;
-	int a = b = snprintf(string, 255, 
-#ifndef __linux__
-		"%s\\", 
-#else
-		"%s/", 
-#endif
-		g_mod_name.c_str());
+	int a = b = snprintf(string, 255, "%s%c", g_mod_name.c_str(), PATH_SEP_CHAR);
 
 	va_list argptr;
 	va_start(argptr, fmt);
@@ -710,11 +736,10 @@ char* build_pathname(char *fmt, ...)
 
 	while (*path) 
 	{
-#ifndef __linux__
-		if (*path == '/') *path = '\\';
-#else
-		if (*path == '\\') *path = '/';
-#endif
+		if (*path == ALT_SEP_CHAR)
+		{
+			*path = PATH_SEP_CHAR;
+		}
 		++path;
 	}
 
@@ -723,13 +748,7 @@ char* build_pathname(char *fmt, ...)
 
 char *build_pathname_r(char *buffer, size_t maxlen, char *fmt, ...)
 {
-	snprintf(buffer, maxlen, 
-#ifdef __linux__
-		"%s/", 
-#else
-		"%s\\", 
-#endif
-		g_mod_name.c_str());
+	snprintf(buffer, maxlen, "%s%c", g_mod_name.c_str(), PATH_SEP_CHAR);
 
 	size_t len = strlen(buffer);
 	char *ptr = buffer + len;
@@ -741,11 +760,10 @@ char *build_pathname_r(char *buffer, size_t maxlen, char *fmt, ...)
 
 	while (*ptr) 
 	{
-#ifndef __linux__
-		if (*ptr == '/') *ptr = '\\';
-#else
-		if (*ptr == '\\') *ptr = '/';
-#endif
+		if (*ptr == ALT_SEP_CHAR)
+		{
+			*ptr = PATH_SEP_CHAR;
+		}
 		++ptr;
 	}
 
@@ -766,23 +784,16 @@ char* build_pathname_addons(char *fmt, ...)
 
 	while (*path) 
 	{
-#ifndef __linux__
-		if (*path == '/') *path = '\\';
-#else
-		if (*path == '\\') *path = '/';
-#endif
+		if (*path == ALT_SEP_CHAR)
+		{
+			*path = PATH_SEP_CHAR;
+		}
 		++path;
 	}
 
 	return string;
 }
 
-#if defined WIN32
-#define SEPCHAR '\\'
-#elif defined __linux__
-#define SEPCHAR '/'
-#endif
-
 bool ConvertModuleName(const char *pathString, String &path)
 {
 	String local;
@@ -800,7 +811,7 @@ bool ConvertModuleName(const char *pathString, String &path)
 	/* run to filename instead of dir */
 	char *ptr = tmpname;
 	ptr = tmpname + len - 1;
-	while (ptr >= tmpname && *ptr != SEPCHAR)
+	while (ptr >= tmpname && *ptr != PATH_SEP_CHAR)
 		ptr--;
 	if (ptr >= tmpname)
 	{
@@ -861,7 +872,7 @@ bool ConvertModuleName(const char *pathString, String &path)
 	}
 
 	path.assign(orig_path);
-	path.append(SEPCHAR);
+	path.append(PATH_SEP_CHAR);
 	path.append(tmpname);
 	path.append("_amxx");
 #if defined __linux__
@@ -947,6 +958,9 @@ bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify, bool no
 	case MODULE_NOT64BIT:
 		report_error(1, "[AMXX] Module \"%s\" is not 64 bit compatible.", path.c_str());
 		break;
+	case MODULE_BADGAME:
+		report_error(1, "[AMXX] Module \"%s\" cannot load on game \"%s\"", path.c_str(), g_mod_name.c_str());
+		break;
 	default:
 		error = false;
 		break;
@@ -1175,6 +1189,18 @@ int MNF_AddNatives(AMX_NATIVE_INFO* natives)
 	return TRUE;
 }
 
+int MNF_AddNewNatives(AMX_NATIVE_INFO *natives)
+{
+	CList<CModule, const char *>::iterator a = g_modules.begin();
+
+	if (!g_CurrentlyCalledModule || g_ModuleCallReason != ModuleCall_Attach)
+		return FALSE;				// may only be called from attach
+
+	g_CurrentlyCalledModule->m_NewNatives.push_back(natives);
+
+	return TRUE;
+}
+
 const char *MNF_GetModname(void)
 {
 	// :TODO: Do we have to do this?? 
@@ -1194,7 +1220,7 @@ AMX *MNF_GetAmxScript(int id)
 	while (iter && id--)
 		++iter;
 
-	if (iter == NULL)
+	if (iter == 0)
 		return NULL;
 	
 	return (*iter).getAMX();
@@ -1207,7 +1233,7 @@ const char *MNF_GetAmxScriptName(int id)
 	while (iter && id--)
 		++iter;
 
-	if (iter == NULL)
+	if (iter == 0)
 		return NULL;
 	
 	return (*iter).getName();
@@ -1537,7 +1563,9 @@ extern "C" void LogError(AMX *amx, int err, const char *fmt, ...)
 #if defined BINLOG_ENABLED
 	CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
 	if (pl)
+	{
 		g_BinLog.WriteOp(BinLog_NativeError, pl->getId(), err, msg_buffer);
+	}
 #endif
 
 	//give the plugin first chance to handle any sort of error
@@ -1546,14 +1574,19 @@ extern "C" void LogError(AMX *amx, int err, const char *fmt, ...)
 	if (pHandler->InNativeFilter())
 	{
 		if (pDebugger)
+		{
 			pDebugger->EndExec();
+		}
 	} else {
 		if (pHandler)
 		{
 			if (pHandler->IsHandling())
 			{
 				if (fmt != NULL)
+				{
 					pHandler->SetErrorMsg(msg_buffer);
+				}
+
 				return;
 			}
 			
@@ -1569,10 +1602,15 @@ extern "C" void LogError(AMX *amx, int err, const char *fmt, ...)
 	if (!pDebugger)
 	{
 		if (fmt)
+		{
 			AMXXLOG_Error("%s", msg_buffer);
+		}
 		
 		Debugger::GenericMessage(amx, err);
+		if (err != AMX_ERR_EXIT)
+		{
 			AMXXLOG_Error("[AMXX] To enable debug mode, add \"debug\" after the plugin name in plugins.ini (without quotes).");
+		}
 		//destroy original error code so the original is not displayed again
 	} else {
 		pDebugger->SetTracedError(err);
@@ -1727,6 +1765,33 @@ const char *MNF_GetLocalInfo(char *name, const char *def)
 	return get_localinfo(name, def);
 }
 
+void MNF_MessageBlock(int mode, int msg, int *opt)
+{
+	switch (mode)
+	{
+	case MSGBLOCK_SET:
+		{
+			if (msg < 0 || msg > MAX_MESSAGES || opt == NULL)
+			{
+				return;
+			}
+			int _opt = msgBlocks[msg];
+			msgBlocks[msg] = *opt;
+			*opt = _opt;
+			break;
+		}
+	case MSGBLOCK_GET:
+		{
+			if (msg < 0 || msg > MAX_MESSAGES || opt == NULL)
+			{
+				return;
+			}
+			*opt = msgBlocks[msg];
+			break;
+		}
+	}
+}
+
 void *MNF_PlayerPropAddr(int id, int prop)
 {
 	if (id < 1 || id > gpGlobals->maxClients)
@@ -1828,6 +1893,7 @@ void Module_CacheFunctions()
 
 	// Natives / Forwards
 	REGISTER_FUNC("AddNatives", MNF_AddNatives)
+	REGISTER_FUNC("AddNewNatives", MNF_AddNewNatives)
 	REGISTER_FUNC("RaiseAmxError", amx_RaiseError)
 	REGISTER_FUNC("RegisterForward", registerForward)
 	REGISTER_FUNC("RegisterSPForward", registerSPForward)
@@ -1876,6 +1942,8 @@ void Module_CacheFunctions()
 	REGISTER_FUNC("OverrideNatives", MNF_OverrideNatives);
 	REGISTER_FUNC("GetLocalInfo", MNF_GetLocalInfo);
 
+	REGISTER_FUNC("MessageBlock", MNF_MessageBlock);
+
 #ifdef MEMORY_TEST
 	REGISTER_FUNC("Allocator", m_allocator)
 	REGISTER_FUNC("Deallocator", m_deallocator)

amxmodx/modules.h

@@ -38,7 +38,7 @@
 #ifndef __linux__
 	#define DLLEXPORT __declspec(dllexport)
 #else
-	#define DLLEXPORT
+	#define DLLEXPORT __attribute__((visibility("default")))
 	#define WINAPI
 #endif
 

amxmodx/msvc/.cvsignore

@@ -1,12 +0,0 @@
-amxmodx.sln
-amxmodx.suo
-amxmodx.aps
-amxmodx.ncb
-Debug
-JITDebug
-JITMemtestRelease
-JITRelease
-MaximalSpeed
-MemtestDebug
-MemtestRelease
-Release

amxmodx/msvc/amxmodx_mm.dsp

@@ -1,292 +0,0 @@
-# Microsoft Developer Studio Project File - Name="amxmodx_mm" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=amxmodx_mm - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "amxmodx_mm.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "amxmodx_mm.mak" CFG="amxmodx_mm - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "amxmodx_mm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "amxmodx_mm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "amxmodx_mm - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "release"
-# PROP Intermediate_Dir "release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\metamod\metamod" /I "..\..\hlsdk\sourcecode\common" /I "..\..\hlsdk\sourcecode\engine" /I "..\..\hlsdk\sourcecode\dlls" /I "..\..\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\amxmodx_mm.def" /out:"release/amxx_mm.dll" /libpath:"..\extra\lib_win32"
-# Begin Custom Build
-TargetPath=.\release\amxx_mm.dll
-TargetName=amxx_mm
-InputPath=.\release\amxx_mm.dll
-SOURCE="$(InputPath)"
-
-"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(TargetPath) D:\SIERRA\Half-Life\cstrike\addons\amx\dlls
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "amxmodx_mm - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "debug"
-# PROP Intermediate_Dir "debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /Zp4 /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod\metamod" /I "..\...\hlsdk\sourcecode\common" /I "..\...\hlsdk\sourcecode\engine" /I "..\...\hlsdk\sourcecode\dlls" /I "..\...\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\amxmodx_mm.def" /out:"debug/amxx_mm.dll" /pdbtype:sept /libpath:"..\extra\lib_win32"
-# SUBTRACT LINK32 /incremental:no /nodefaultlib
-# Begin Custom Build
-TargetPath=.\debug\amxx_mm.dll
-TargetName=amxx_mm
-InputPath=.\debug\amxx_mm.dll
-SOURCE="$(InputPath)"
-
-"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(TargetPath) D:\SIERRA\Half-Life\cstrike\addons\amx\dlls
-
-# End Custom Build
-
-!ENDIF 
-
-# Begin Target
-
-# Name "amxmodx_mm - Win32 Release"
-# Name "amxmodx_mm - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\amx.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\amxcore.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\amxmodx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\amxtime.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\amxxlog.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CCmd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CEvent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CFile.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CForward.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CLogEvent.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CMenu.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CMisc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CModule.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CPlugin.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CString.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CTask.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CVault.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\emsg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\file.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\float.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\meta_api.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\modules.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\power.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\srvcmd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\string.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\strptime.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\util.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\vault.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\amxmodx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CCmd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CEvent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CFile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CForward.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CList.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CLogEvent.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CMenu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CMisc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CModule.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CPlugin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CString.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CTask.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CVault.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\modules.h
-# End Source File
-# End Group
-# End Target
-# End Project

amxmodx/msvc/amxmodx_mm.dsw

@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "amxmodx_mm"=.\amxmodx_mm.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

amxmodx/msvc/amxmodx_mm.sln

@@ -1,27 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx", "amxmodx_mm.vcproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		JITDebug = JITDebug
-		JITDebugBinLog = JITDebugBinLog
-		JITRelease = JITRelease
-		JITReleaseBinLog = JITReleaseBinLog
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.ActiveCfg = JITDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.Build.0 = JITDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.ActiveCfg = JITDebugBinLog|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}.JITReleaseBinLog.ActiveCfg = JITReleaseBinLog|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog.Build.0 = JITReleaseBinLog|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

amxmodx/msvc/amxmodx_mm.vcproj

@@ -1,673 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="amxmodx"
-	ProjectGUID="{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
-	RootNamespace="amxmodx"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="JITDebug|Win32"
-			OutputDirectory="JITDebug"
-			IntermediateDirectory="JITDebug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitdebug/amxmodx.pch"
-				AssemblerListingLocation=".\jitdebug/"
-				ObjectFile=".\jitdebug/"
-				ProgramDataBaseFileName=".\jitdebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<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/amxmodx_mm.pdb"
-				ImportLibrary=".\jitdebug/amxmodx_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="JITRelease|Win32"
-			OutputDirectory="JITRelease"
-			IntermediateDirectory="JITRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			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"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitrelease/amxmodx.pch"
-				AssemblerListingLocation=".\jitrelease/"
-				ObjectFile=".\jitrelease/"
-				ProgramDataBaseFileName=".\jitrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<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"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb"
-				GenerateMapFile="TRUE"
-				ImportLibrary=".\jitrelease/amxmodx_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="JITDebugBinLog|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;BINLOG_ENABLED"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitdebugbinlog/amxmodx.pch"
-				AssemblerListingLocation=".\jitdebugbinlog/"
-				ObjectFile=".\jitdebugbinlog/"
-				ProgramDataBaseFileName=".\jitdebugbinlog/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<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="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="JITReleaseBinLog|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			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;BINLOG_ENABLED"
-				IgnoreStandardIncludePath="FALSE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitreleasebinlog/amxmodx.pch"
-				AssemblerListingLocation=".\jitreleasebinlog/"
-				ObjectFile=".\jitreleasebinlog/"
-				ProgramDataBaseFileName=".\jitreleasebinlog/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<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"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_bl_mm.pdb"
-				GenerateMapFile="TRUE"
-				ImportLibrary=".\jitreleasebinlog/amxmodx_bl_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>
-	</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="..\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="..\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="..\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"
-			Filter="">
-			<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"
-				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>
-	</Globals>
-</VisualStudioProject>

amxmodx/msvc8/amxmodx_mm.vcproj

@@ -47,7 +47,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="&quot;$(METAMOD)&quot;;&quot;$(HLSDK)\common&quot;;&quot;$(HLSDK)\engine&quot;;&quot;$(HLSDK)\dlls&quot;;&quot;$(HLSDK)\pm_shared&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -85,7 +85,7 @@
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
@@ -153,7 +153,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				AdditionalIncludeDirectories="&quot;$(METAMOD)&quot;;&quot;$(HLSDK)\common&quot;;&quot;$(HLSDK)\engine&quot;;&quot;$(HLSDK)\dlls&quot;;&quot;$(HLSDK)\pm_shared&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;_CRT_SECURE_NO_DEPRECATE"
 				IgnoreStandardIncludePath="false"
 				StringPooling="true"
@@ -192,7 +192,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb"
@@ -257,7 +257,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="&quot;$(METAMOD)&quot;;&quot;$(HLSDK)\common&quot;;&quot;$(HLSDK)\engine&quot;;&quot;$(HLSDK)\dlls&quot;;&quot;$(HLSDK)\pm_shared&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -295,7 +295,7 @@
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitdebugbinlog/amxmodx_bl_mm.pdb"
@@ -363,7 +363,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				AdditionalIncludeDirectories="&quot;$(METAMOD)&quot;;&quot;$(HLSDK)\common&quot;;&quot;$(HLSDK)\engine&quot;;&quot;$(HLSDK)\dlls&quot;;&quot;$(HLSDK)\pm_shared&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE"
 				IgnoreStandardIncludePath="false"
 				StringPooling="true"
@@ -401,7 +401,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT;LIBC"
+				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_bl_mm.pdb"
@@ -453,6 +453,10 @@
 				RelativePath="..\amxdbg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\amxmod_compat.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\amxmodx.cpp"
 				>
@@ -501,6 +505,10 @@
 				RelativePath="..\CFile.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\CFlagManager.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\CForward.cpp"
 				>
@@ -605,6 +613,10 @@
 				RelativePath="..\newmenus.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\nongpl_matches.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\optimizer.cpp"
 				>
@@ -613,6 +625,10 @@
 				RelativePath="..\power.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\sorting.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\srvcmd.cpp"
 				>
@@ -641,6 +657,10 @@
 				RelativePath="..\strptime.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\trie_natives.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\util.cpp"
 				>
@@ -666,6 +686,10 @@
 				RelativePath="..\amxdbg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\amxmod_compat.h"
+				>
+			</File>
 			<File
 				RelativePath="..\amxmodx.h"
 				>
@@ -694,6 +718,10 @@
 				RelativePath="..\CFile.h"
 				>
 			</File>
+			<File
+				RelativePath="..\CFlagManager.h"
+				>
+			</File>
 			<File
 				RelativePath="..\CForward.h"
 				>
@@ -746,6 +774,14 @@
 				RelativePath="..\CVector.h"
 				>
 			</File>
+			<File
+				RelativePath="..\datastructs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\datastructs.h"
+				>
+			</File>
 			<File
 				RelativePath="..\debugger.h"
 				>
@@ -766,10 +802,6 @@
 				RelativePath="..\md5.h"
 				>
 			</File>
-			<File
-				RelativePath="..\menus.h"
-				>
-			</File>
 			<File
 				RelativePath="..\messages.h"
 				>
@@ -786,6 +818,10 @@
 				RelativePath="..\newmenus.h"
 				>
 			</File>
+			<File
+				RelativePath="..\nongpl_matches.h"
+				>
+			</File>
 			<File
 				RelativePath="..\optimizer.h"
 				>
@@ -806,6 +842,14 @@
 				RelativePath="..\sh_tinyhash.h"
 				>
 			</File>
+			<File
+				RelativePath="..\svn_version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\trie_natives.h"
+				>
+			</File>
 			<File
 				RelativePath="..\zlib\zconf.h"
 				>
@@ -908,6 +952,118 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Pawn Includes"
+			>
+			<File
+				RelativePath="..\..\plugins\include\amxconst.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\amxmisc.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\amxmodx.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\core.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\file.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\float.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\lang.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\message_const.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\message_stocks.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\messages.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\sorting.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\string.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\svn_version.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\time.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\vault.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\vector.inc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\plugins\include\xs.inc"
+				>
+			</File>
+			<Filter
+				Name="AMX Mod Compat"
+				>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\amxmod.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\maths.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\mysql.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\translator.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\Vexd_Utilities.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\VexdUM.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\VexdUM_const.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\VexdUM_stock.inc"
+					>
+				</File>
+				<File
+					RelativePath="..\..\plugins\include\amxmod_compat\xtrafun.inc"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

amxmodx/natives.cpp

@@ -33,6 +33,7 @@
 #include "natives.h"
 #include "debugger.h"
 #include "libraries.h"
+#include "format.h"
 
 #ifdef __linux__
 #include <malloc.h>
@@ -45,12 +46,16 @@
 //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;
 static char g_errorStr[512] = {0};
 bool g_Initialized = false;
 
+/* Stack stuff */
+regnative *g_pCurNative = NULL;
+AMX *g_pCaller = NULL;
+cell g_Params[CALLFUNC_MAXPARAMS];
+int g_CurError = AMX_ERR_NONE;
+
 int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 {
 	if (idx < 0 || idx >= (int)g_RegNatives.size())
@@ -78,37 +83,55 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 		return 0;
 	}
 
-	if (pNative->caller)
+	/* Save old values on ZE STACK */
+	AMX *pSaveCaller = g_pCaller;
+	cell saveParams[CALLFUNC_MAXPARAMS];
+	regnative *pSaveNative = g_pCurNative;
+	int saveError = g_CurError;
+
+	if (pSaveNative)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Bug caught! Please contact the AMX Mod X Dev Team.");
-		return 0;
+		for (ucell i = 0; i <= g_Params[0] / sizeof(cell); i++)
+		{
+			saveParams[i] = g_Params[i];
+		}
 	}
 
-	//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;
+	/* Save current info */
+	g_CurError = AMX_ERR_NONE;
+	g_pCaller = amx;
+	g_pCurNative = pNative;
 
 	int err = 0;
 	cell ret = 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--)
-			pNative->params[i] = params[i];
+		for (int i=numParams; i>=0; i--)
+		{
+			g_Params[i] = params[i];
+		}
 	} else if (pNative->style == 1) {
-		//use dJeyL's system .. very clever!
+		/**
+		 * use dJeyL's system .. very clever!
+		 * NOTE: clever, but doesn't work at all since the JIT does bounds checking
+		 * this should REALLY be deprecated
+		 */
 		for (int i=numParams; i>=1; i--)
+		{
 			amx_Push(pNative->amx, params[i]);
 		}
+	}
+
 	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)
 	{
 		if (pDebugger && pDebugger->ErrorExists())
@@ -121,15 +144,26 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 		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);
+	} else if (g_CurError != AMX_ERR_NONE) {
+		LogError(amx, g_CurError, g_errorStr);
 	}
-	if (pDebugger)
-		pDebugger->EndExec();
-	g_NativeStack.pop();
-	g_ErrorStk.pop();
 
-	pNative->caller = NULL;
+	if (pDebugger)
+	{
+		pDebugger->EndExec();
+	}
+
+	/* Restore everything */
+	g_pCurNative = pSaveNative;
+	g_CurError = saveError;
+	g_pCaller = pSaveCaller;
+	if (pSaveNative)
+	{
+		for (ucell i = 0; i <= saveParams[0] / sizeof(cell); i++)
+		{
+			g_Params[i] = saveParams[i];
+		}
+	}
 
 	return ret;
 }
@@ -137,7 +171,9 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 AMX_NATIVE_INFO *BuildNativeTable()
 {
 	if (g_RegNatives.size() < 1)
+	{
 		return NULL;
+	}
 
 	AMX_NATIVE_INFO *pNatives = new AMX_NATIVE_INFO[g_RegNatives.size() + 1];
 
@@ -163,8 +199,7 @@ 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_ErrorStk.pop();
-	g_ErrorStk.push(params[1]);
+	g_CurError = params[1];
 
 	return 1;
 }
@@ -172,13 +207,12 @@ static cell AMX_NATIVE_CALL log_error(AMX *amx, cell *params)
 //get_string(param, dest[], len)
 static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
@@ -186,20 +220,19 @@ static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
 	int p = params[1];
 
 	int len;
-	char *str = get_amxstring(pNative->caller, pNative->params[p], 0, len);
+	char *str = get_amxstring(g_pCaller, g_Params[p], 0, len);
 	return set_amxstring(amx, params[2], str, params[3]);
 }
 
 //set_string(param, source[], maxlen)
 static cell AMX_NATIVE_CALL set_string(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
@@ -209,46 +242,44 @@ static cell AMX_NATIVE_CALL set_string(AMX *amx, cell *params)
 	int len;
 	char *str = get_amxstring(amx, params[2], 0, len);
 
-	return set_amxstring(pNative->caller, pNative->params[p], str, params[3]);
+	return set_amxstring(g_pCaller, g_Params[p], str, params[3]);
 }
 
 //get a byvalue parameter
 //get_param(num)
 static cell AMX_NATIVE_CALL get_param(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	return pNative->params[p];
+	return g_Params[p];
 }
 
 //get_param_byref(num)
 static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
+	cell *addr = get_amxaddr(g_pCaller, g_Params[p]);
 
 	return addr[0];
 }
@@ -256,20 +287,19 @@ static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
 //set_param_byref(num, val)
 static cell AMX_NATIVE_CALL set_param_byref(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
+	cell *addr = get_amxaddr(g_pCaller, g_Params[p]);
 
 	addr[0] = params[2];
 
@@ -279,20 +309,19 @@ static cell AMX_NATIVE_CALL set_param_byref(AMX *amx, cell *params)
 //get_array(param, dest[], size)
 static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *source = get_amxaddr(pNative->caller, pNative->params[p]);
+	cell *source = get_amxaddr(g_pCaller, g_Params[p]);
 	cell *dest = get_amxaddr(amx, params[2]);
 
 	int size = params[3];
@@ -305,20 +334,19 @@ static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
 //set_array(param, source[], size)
 static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
+	if (g_pCurNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *dest = get_amxaddr(pNative->caller, pNative->params[p]);
+	cell *dest = get_amxaddr(g_pCaller, g_Params[p]);
 	cell *source = get_amxaddr(amx, params[2]);
 
 	int size = params[3];
@@ -328,26 +356,84 @@ 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_pCurNative || (g_pCurNative->amx != amx))
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
+		return 0;
+	}
+
+	if (g_pCurNative->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]);
+
+	cell max = g_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(g_pCaller, g_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, g_pCaller, g_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.
 //I've no idea how he thought of this, but it's great.  No idea how well it works.
 static cell AMX_NATIVE_CALL param_convert(AMX *amx, cell *params)
 {
-	if (!g_NativeStack.size())
+	if (!g_pCurNative || (g_pCurNative->amx != amx))
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style != 1)
+	if (g_pCurNative->style != 1)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	cell p = params[1];
 
-	AMX *caller = pNative->caller;
+	AMX *caller = g_pCaller;
 
 	unsigned char *data =amx->base+(int)((AMX_HEADER *)amx->base)->dat;
 	unsigned char *realdata = caller->base+(int)((AMX_HEADER *)caller->base)->dat;
@@ -389,7 +475,6 @@ 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
@@ -444,6 +529,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

@@ -50,9 +50,7 @@ struct regnative
 	String name;
 	char *pfn;
 	int func;
-	AMX *caller;
 	int style;
-	cell params[CALLFUNC_MAXPARAMS];
 };
 
 extern "C" void amxx_DynaInit(void *ptr);

amxmodx/newmenus.cpp

@@ -29,6 +29,7 @@
 */
 
 #include "amxmodx.h"
+#include "CMenu.h"
 #include "newmenus.h"
 
 CVector<Menu *> g_NewMenus;
@@ -37,11 +38,15 @@ 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)
@@ -56,7 +61,7 @@ void validate_menu_text(char *str)
 				str++;
 				char c = tolower(*str);
 				if (c == 'r' || c == 'w'
-					|| c== 'w' || c == 'd')
+					|| c== 'y' || c == 'd')
 				{
 					str++;
 					offs += 2;
@@ -64,42 +69,51 @@ void validate_menu_text(char *str)
 				}
 			}
 			if (offs)
+			{
 				*(str-offs) = *str;
+			}
 			str++;
 		}
 		if (offs)
+		{
 			*(str-offs) = '\0';
 		}
+	}
 }
 
-Menu::Menu(const char *title, int mid, int tid)
+Menu::Menu(const char *title, AMX *amx, int fid) : m_Title(title), m_ItemColor("\\r"), 
+m_NeverExit(false), m_AutoColors(g_coloredmenus), thisId(0), func(fid), 
+isDestroying(false), items_per_page(7)
 {
-	m_Title.assign(title);
-	menuId = mid;
-	thisId = tid;
+	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
+	menuId = g_menucmds.registerMenuId(title, amx);
+
+	if (strcmp(pPlugin->getName(), "war3ft.amxx") == 0)
+	{
+		const char *version = pPlugin->getVersion();
+		if (strncmp(pPlugin->getVersion(), "3.0 RC", 6) == 0
+			&& atoi(&version[6]) <= 8)
+		{
+			g_menucmds.registerMenuCmd(
+				g_plugins.findPluginFast(amx), 
+				menuId, 
+				-1, 
+				g_forwards.duplicateSPForward(fid), 
+				true);
+		}
+	}
 
 	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);
 	
@@ -139,7 +153,9 @@ size_t Menu::GetPageCount()
 {
 	size_t items = GetItemCount();
 	if (items_per_page == 0)
+	{
 		return 1;
+	}
 
 	return ((items/items_per_page) + ((items % items_per_page) ? 1 : 0));
 }
@@ -152,34 +168,123 @@ int Menu::PagekeyToItem(page_t page, item_t key)
 	if (num_pages == 1 || !items_per_page)
 	{
 		if (key > m_Items.size())
+		{
 			return MENU_EXIT;
-		else
+		} else {
 			return key-1;
+		}
 	} else {
 		//first page
 		if (page == 0)
 		{
-			if (key == items_per_page + 1)
-				return MENU_MORE;
-			else if (key == items_per_page + 2)
-				return MENU_EXIT;
-			else
-				return (start + key - 1);
-		} else if (page == num_pages - 1) {
-			//last page
-			size_t remaining = m_Items.size() - start;
-			if (key == remaining + 1)
+			/* The algorithm for spaces here is same as a middle page. */
+			item_t new_key = key;
+			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
 			{
-				return MENU_BACK;
-			} else if (key == remaining + 2) {
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j].EatNumber())
+					{
+						if (!new_key)
+						{
+							break;
+						}
+						new_key--;
+					}
+					if (!new_key)
+					{
+						break;
+					}
+				}
+			}
+			key = new_key;
+			if (key == items_per_page + 2)
+			{
+				return MENU_MORE;
+			} else if (key == items_per_page + 3) {
 				return MENU_EXIT;
 			} else {
 				return (start + key - 1);
 			}
+		} else if (page == num_pages - 1) {
+			//last page
+			item_t item_tracker = 0; //  tracks how many valid items we have passed so far.
+			size_t remaining = m_Items.size() - start;
+			item_t new_key = key;
+			
+			// For every item that takes up a slot (item or padded blank)
+			// we subtract one from new key.
+			// For every item (not blanks), we increase item_tracker.
+			// When new_key equals 0, item_tracker will then be set to
+			// whatever valid item was selected.
+			for (size_t i=m_Items.size() - remaining; i<m_Items.size(); i++)
+			{
+				item_tracker++;
+				
+				if (new_key<=1) // If new_key is 0, or will be 0 after the next decrease
+				{
+					new_key=0;
+					break;
+				}
+				
+				new_key--;
+				
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j].EatNumber())
+					{
+						new_key--;
+					}
+					if (!new_key)
+					{
+						break;
+					}
+				}
+			}
+			// If new_key doesn't equal zero, then a back/exit button was pressed.
+			if (new_key!=0)
+			{
+				if (key == items_per_page + 1)
+				{
+					return MENU_BACK;
+				}
+				else if (key == items_per_page + 3)
+				{
+					return MENU_EXIT;
+				}
+				// MENU_MORE should never happen here.
+			}
+			// otherwise our item is now start + item_tracker - 1
+			return (start + item_tracker - 1);
 		} else {
+			/* 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+items_per_page-1) && i<m_Items.size(); i++)
+			{
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j].EatNumber())
+					{
+						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];
+				unsigned int num = key - items_per_page - 1;
+				static int map[] = {MENU_BACK, MENU_MORE, MENU_EXIT};
+				return map[num];
 			} else {
 				return (start + key - 1);
 			}
@@ -240,10 +345,10 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	{
 		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)
@@ -255,17 +360,18 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		} else {
 			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;
 	
@@ -274,46 +380,66 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	bool enabled = true;
 	int ret = 0;
 	int slots = 0;
+	int option_display = 0;
 	
 	for (item_t i = start; i <= end; i++)
 	{
+		// reset enabled
+		enabled = true;
 		pItem = m_Items[i];
 		
 		if (pItem->access && !(pItem->access & g_players[player].flags[0]))
+		{
 			enabled = false;
+		}
 		
 		if (pItem->handler != -1)
 		{
 			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i));
 			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);
+		}
+		
+		option_display = ++option;
+		if (option_display == 10)
+		{
+			option_display = 0;
+		}
+
+		if (enabled)
+		{
 			if (m_AutoColors) 
-				_snprintf(buffer, sizeof(buffer)-1, "\\r%d.\\w %s\n", ++option, pItem->name.c_str());
-			else
-				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
+			{
+				_snprintf(buffer, sizeof(buffer)-1, "%s%d.\\w %s\n", m_ItemColor.c_str(),option_display, pItem->name.c_str());
+			} else {
+				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option_display, pItem->name.c_str());
+			}
 		} else {
 			if (m_AutoColors)
 			{
-				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", ++option, pItem->name.c_str());
+				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", option_display, pItem->name.c_str());
 			} else {
 				_snprintf(buffer, sizeof(buffer)-1, "#. %s\n", pItem->name.c_str());
-				option++;
 			}
 		}
 		slots++;
@@ -325,80 +451,121 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 		{
 			for (size_t j=0; j<pItem->blanks.size(); j++)
 			{
-				if (pItem->blanks[j] == 1)
+				if (pItem->blanks[j].EatNumber())
+				{
 					option++;
+				}
+				m_Text.append(pItem->blanks[j].GetDisplay());
 				m_Text.append("\n");
 				slots++;
 			}
 		}
 	}
 
-	if (padding == 1 && items_per_page)
+	if (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++)
+		/* Pad spaces until we reach the end of the max possible items */
+		for (unsigned int i=(unsigned)slots; i<items_per_page; i++)
 		{
 			m_Text.append("\n");
 			option++;
 		}
-	}
+		/* Make sure there is at least one visual pad */
+		m_Text.append("\n");
 
-	for (int i=0; i<3; i++)
-	{
-		switch (m_OptOrders[i])
-		{
-		case MENU_BACK:
+		/* Don't bother if there is only one page */
+		if (pages > 1)
 		{
 			if (flags & Display_Back)
 			{
 				keys |= (1<<option++);
+				if (m_AutoColors)
+				{
 					_snprintf(buffer, 
 						sizeof(buffer)-1, 
-						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						option, 
-						m_OptNames[abs(MENU_BACK)].c_str()
-						);
-					m_Text.append(buffer);
+						"%s%d. \\w%s\n", 
+						m_ItemColor.c_str(), 
+						option == 10 ? 0 : option, 
+						m_OptNames[abs(MENU_BACK)].c_str());
+				} else {
+					_snprintf(buffer, 
+						sizeof(buffer)-1, 
+						"%d. %s\n", 
+						option == 10 ? 0 : option, 
+						m_OptNames[abs(MENU_BACK)].c_str());
 				}
-				break;
-			}
-		case MENU_MORE:
+			} else {
+				option++;
+				if (m_AutoColors)
 				{
+					_snprintf(buffer,
+						sizeof(buffer)-1,
+						"\\d%d. %s\n\\w",
+						option == 10 ? 0 : option,
+						m_OptNames[abs(MENU_BACK)].c_str());
+				} else {
+					_snprintf(buffer, sizeof(buffer)-1, "#. %s\n", m_OptNames[abs(MENU_BACK)].c_str());
+				}
+			}
+			m_Text.append(buffer);
+	
 			if (flags & Display_Next)
 			{
 				keys |= (1<<option++);
+				if (m_AutoColors)
+				{
 					_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);
+						"%s%d. \\w%s\n", 
+						m_ItemColor.c_str(), 
+						option == 10 ? 0 : option, 
+						m_OptNames[abs(MENU_MORE)].c_str());
+				} else {
+					_snprintf(buffer, 
+						sizeof(buffer)-1, 
+						"%d. %s\n", 
+						option == 10 ? 0 : option, 
+						m_OptNames[abs(MENU_MORE)].c_str());
 				}
-				break;
-			}
-		case MENU_EXIT:
+			} else {
+				option++;
+				if (m_AutoColors)
 				{
-				if (flags & Display_Exit)
+					_snprintf(buffer,
+						sizeof(buffer)-1,
+						"\\d%d. %s\n\\w",
+						option == 10 ? 0 : option,
+						m_OptNames[abs(MENU_MORE)].c_str());
+				} else {
+					_snprintf(buffer, sizeof(buffer)-1, "#. %s\n", m_OptNames[abs(MENU_MORE)].c_str());
+				}
+			}
+			m_Text.append(buffer);
+		} else {
+			/* Keep padding */
+			option += 2;
+		}
+
+		if (!m_NeverExit)
 		{
 			keys |= (1<<option++);
+			if (m_AutoColors)
+			{
 				_snprintf(buffer, 
 					sizeof(buffer)-1, 
-						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						option, 
-						m_OptNames[abs(MENU_EXIT)].c_str()
-						);
+					"%s%d. \\w%s\n", 
+					m_ItemColor.c_str(), 
+					option == 10 ? 0 : option, 
+					m_OptNames[abs(MENU_EXIT)].c_str());
+			} else {
+				_snprintf(buffer, 
+					sizeof(buffer)-1, 
+					"%d. %s\n", 
+					option == 10 ? 0 : option, 
+					m_OptNames[abs(MENU_EXIT)].c_str());
+			}
 			m_Text.append(buffer);
 		}
-				break;
-			}
-		}
 	}
 	
 	return m_Text.c_str();
@@ -426,27 +593,21 @@ static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
 		return 0;
 	}
 
-	int id = g_menucmds.registerMenuId(title, amx);
-	g_menucmds.registerMenuCmd(g_plugins.findPluginFast(amx), id, 1023, func);
-
-	Menu *pMenu = new Menu(title, id, 0);
-
-	pMenu->func = func;
+	Menu *pMenu = new Menu(title, amx, 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;
 	}
-}
 
+	return pMenu->thisId;
+}
 static cell AMX_NATIVE_CALL menu_addblank(AMX *amx, cell *params)
 {
 	GETMENU(params[1]);
@@ -464,7 +625,51 @@ static cell AMX_NATIVE_CALL menu_addblank(AMX *amx, cell *params)
 	}
 
 	menuitem *item = pMenu->m_Items[pMenu->m_Items.size() - 1];
-	item->blanks.push_back(params[2]);
+
+	BlankItem a;
+
+	a.SetBlank();
+
+	if (params[2] == 1)
+		a.SetEatNumber(true);
+
+	else
+		a.SetEatNumber(false);
+
+	item->blanks.push_back(a);
+
+	return 1;
+}
+static cell AMX_NATIVE_CALL menu_addtext(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];
+
+	BlankItem a;
+
+	int len;
+	a.SetText(get_amxstring(amx, params[2], 0, len));
+
+	if (params[3] == 1)
+		a.SetEatNumber(true);
+
+	else
+		a.SetEatNumber(false);
+
+	item->blanks.push_back(a);
 
 	return 1;
 }
@@ -524,6 +729,36 @@ static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
 	int page = params[3];
 	CPlayer* pPlayer = GET_PLAYER_POINTER_I(player);
 	
+	/* If the stupid handler keeps drawing menus, 
+	 * We need to keep cancelling them.  But we put in a quick infinite loop
+	 * counter to prevent this from going nuts.
+	 */
+	int menu;
+	int loops = 0;
+	while ((menu = pPlayer->newmenu) >= 0)
+	{
+		if ((size_t)menu >= g_NewMenus.size() || !g_NewMenus[menu])
+		{
+			break;
+		}
+
+		Menu *pOther = g_NewMenus[menu];
+
+		pPlayer->newmenu = -1;
+		pPlayer->menu = 0;
+		executeForwards(pOther->func, 
+			static_cast<cell>(player),
+			static_cast<cell>(pOther->thisId),
+			static_cast<cell>(MENU_EXIT));
+
+		/* Infinite loop counter */
+		if (++loops >= 10)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Plugin called menu_display when item=MENU_EXIT");
+			return 0;
+		}
+	}
+
 	// This will set the expire time of the menu to infinite
 	pPlayer->menuexpire = INFINITE;
 
@@ -652,6 +887,13 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 
 	switch (params[2])
 	{
+	case MPROP_SET_NUMBER_COLOR:
+		{
+			char *str = get_amxstring(amx, params[3], 0, len);
+			validate_menu_text(str);
+			pMenu->m_ItemColor.assign(str);
+			break;
+		}
 	case MPROP_PERPAGE:
 		{
 			cell count = *get_amxaddr(amx, params[3]);
@@ -687,51 +929,23 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 	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)
+			if (ans == 1 || ans == 0)
 			{
-				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];
+			/* Ignored as of 1.8.0 */
 			break;
 		}
 	case MPROP_NOCOLORS:
@@ -741,7 +955,7 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 		}
 	case MPROP_PADMENU:
 		{
-			pMenu->padding = *get_amxaddr(amx, params[3]);
+			/* Ignored as of 1.8.0 */
 			break;
 		}
 	default:
@@ -797,10 +1011,12 @@ 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++)
 	{
@@ -843,8 +1059,16 @@ static cell AMX_NATIVE_CALL player_menu_info(AMX *amx, cell *params)
 	*m = player->menu;
 	*n = player->newmenu;
 
+	if (params[0] / sizeof(cell) == 4)
+	{
+		cell *addr = get_amxaddr(amx, params[4]);
+		*addr = player->page;
+	}
+
 	if ( (*m != 0 && *m != -1) || (*n != -1))
+	{
 		return 1;
+	}
 
 	return 0;
 }
@@ -854,6 +1078,7 @@ AMX_NATIVE_INFO g_NewMenuNatives[] =
 	{"menu_create",				menu_create},
 	{"menu_additem",			menu_additem},
 	{"menu_addblank",			menu_addblank},
+	{"menu_addtext",			menu_addtext},
 	{"menu_pages",				menu_pages},
 	{"menu_items",				menu_items},
 	{"menu_display",			menu_display},

amxmodx/newmenus.h

@@ -39,6 +39,7 @@
 #define	ITEM_ENABLED	1
 #define ITEM_DISABLED	2
 
+#define MAX_MENU_ITEMS		10
 
 #define MPROP_PERPAGE	1
 #define MPROP_BACKNAME	2
@@ -49,9 +50,50 @@
 #define MPROP_ORDER		7
 #define MPROP_NOCOLORS	8
 #define MPROP_PADMENU	9
+#define MPROP_SET_NUMBER_COLOR	10
 
 typedef int (*MENUITEM_CALLBACK)(int, int, int);
 
+class BlankItem
+{
+private:
+	char *m_text;
+	bool m_num;
+public:
+	BlankItem() : m_text(NULL), m_num(false) { }
+	BlankItem(BlankItem &src) { this->copyFrom(src); } 
+	~BlankItem() { free(m_text); }
+
+	void copyFrom(BlankItem &src)
+	{
+		m_text = src.m_text;
+		m_num = src.m_num;
+		src.m_text = NULL; // stop the src from freeing the buffer
+	}
+	BlankItem &operator = (const BlankItem &src) { this->copyFrom(const_cast<BlankItem&>(src)); return *this; }
+
+	/* is this text instead of a blank */
+	bool IsText() { return m_text != NULL; }
+
+	/* is this a blank instead of text */
+	bool IsBlank() { return m_text == NULL; }
+
+	/* does this item take up a number */
+	bool EatNumber() { return m_num; }
+
+	/* the text this item is to display */
+	const char *GetDisplay() { return m_text == NULL ? "" : m_text; }
+
+	/* sets this item to use a blank */
+	void SetBlank() { free(m_text); m_text = NULL; }
+
+	/* sets this item to display text */
+	void SetText(const char *text) { free(m_text); m_text = strdup(text);  }
+
+	/* sets whether or not this item takes up a line */
+	void SetEatNumber(bool val) { m_num = val; }
+
+};
 struct menuitem
 {
 	String name;
@@ -63,7 +105,7 @@ struct menuitem
 	MENUITEM_CALLBACK pfn;
 	size_t id;
 
-	CVector<int> blanks;
+	CVector<BlankItem> blanks;
 };
 
 typedef unsigned int menu_t;
@@ -73,7 +115,7 @@ typedef unsigned int page_t;
 class Menu
 {
 public:
-	Menu(const char *title, int menuId, int thisId);
+	Menu(const char *title, AMX *amx, int fid);
 	~Menu();
 	
 	menuitem *GetMenuItem(item_t item);
@@ -92,16 +134,14 @@ public:
 	String m_Text;
 
 	String m_OptNames[4];
-	int m_OptOrders[3];
 
-	bool m_AlwaysExit;
+	String m_ItemColor;
 	bool m_NeverExit;
 	bool m_AutoColors;
 	
 	int menuId;
 	int thisId;
 	int func;
-	int padding;
 	bool isDestroying;
 public:
 	unsigned int items_per_page;

amxmodx/nongpl_matches.cpp

@@ -0,0 +1,23 @@
+#include <string.h>
+#include "nongpl_matches.h"
+
+NONGPL_PLUGIN_T NONGPL_PLUGIN_LIST[] = 
+{
+	{"Live", "CZ Gun Game", "czgungame.amxx"},
+	{"Live", "AMXX Gun Game", "czgungame.amxx"},
+	{NULL, NULL, NULL},
+};
+
+NONGPL_CVAR_T NONGPL_CVAR_LIST[] = 
+{
+	{"gg_mode", 0},
+	{"gg_warmuptimer", 0},
+	{"gg_ff", 0},
+	{"gg_fflevel", 0},
+	{"gg_stats", 0},
+	{"gg_dm", 0},
+	{"gg_turbo", 0},
+	{"amx_ggreset", 1},
+	{"amx_gg", 1},
+	{NULL, 0},
+};

amxmodx/nongpl_matches.h

@@ -0,0 +1,51 @@
+/* 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.
+*/
+
+#ifndef _INCLUDE_AMXMODX_NONGPL_MATCHES_H_
+#define _INCLUDE_AMXMODX_NONGPL_MATCHES_H_
+
+struct NONGPL_PLUGIN_T
+{
+	const char *author;
+	const char *title;
+	const char *filename;
+};
+
+struct NONGPL_CVAR_T
+{
+	const char *cvar;
+	int type;
+};
+
+extern NONGPL_PLUGIN_T NONGPL_PLUGIN_LIST[];
+extern NONGPL_CVAR_T NONGPL_CVAR_LIST[];
+
+#endif //_INCLUDE_AMXMODX_NONGPL_MATCHES_H_

amxmodx/optimizer.cpp

@@ -110,7 +110,7 @@ void _Setup_Optimizer_Stage2(AMX *amx, cell *oplist, cell *cip)
 		}
 #endif
 	}
-	//we don't do these yet because of radix stuff >:\
+	/* 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);

amxmodx/sdk/amxxmodule.cpp

@@ -2284,7 +2284,7 @@ C_DLLEXPORT int Meta_Query(char *ifvers, plugin_info_t **pPlugInfo, mutil_funcs_
 	}
 
 #ifdef FN_META_QUERY
-	return FN_META_QUERY();
+	FN_META_QUERY();
 #endif	// FN_META_QUERY
 
 	return 1;
@@ -2327,7 +2327,7 @@ C_DLLEXPORT int Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
 	}
 
 #ifdef FN_META_DETACH
-	return FN_META_DETACH();
+	FN_META_DETACH();
 #endif	// FN_META_DETACH
 	return TRUE;
 }
@@ -2374,7 +2374,7 @@ C_DLLEXPORT void __stdcall GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine,
 	gpGlobals = pGlobals;
 	// NOTE!  Have to call logging function _after_ copying into g_engfuncs, so
 	// that g_engfuncs.pfnAlertMessage() can be resolved properly, heh. :)
-	UTIL_LogPrintf("[%s] dev: called: GiveFnptrsToDll\n", Plugin_info.logtag);
+	// UTIL_LogPrintf("[%s] dev: called: GiveFnptrsToDll\n", Plugin_info.logtag);
 	// --> ** Function core
 
 #ifdef _MSC_VER
@@ -2437,6 +2437,7 @@ static amxx_module_info_s g_ModuleInfo =
 
 // 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;
@@ -2515,6 +2516,7 @@ 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)
@@ -2546,6 +2548,14 @@ C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo
 // request optional function
 #define REQFUNC_OPT(name, fptr, type) fptr = (type)reqFnptrFunc(name)
 
+C_DLLEXPORT int AMXX_CheckGame(const char *game)
+{
+#ifdef FN_AMXX_CHECKGAME
+	return FN_AMXX_CHECKGAME(game);
+#else
+	return AMXX_GAME_OK;
+#endif
+}
 C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 {
 	// Check pointer
@@ -2591,6 +2601,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);
@@ -2638,6 +2649,8 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	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
 	REQFUNC_OPT("Allocator", g_fn_Allocator, PFN_ALLOCATOR);
@@ -2780,6 +2793,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
 	MF_OverrideNatives(NULL, NULL);
+	MF_MessageBlock(0, 0, NULL);
 }
 #endif
 

amxmodx/sdk/amxxmodule.h

@@ -10,6 +10,7 @@
 // config
 #include "moduleconfig.h"
 
+#include <stddef.h> // size_t
 // metamod include files
 #ifdef USE_METAMOD
 #include <extdll.h>
@@ -22,7 +23,7 @@
 #ifndef __linux__
 #define DLLEXPORT __declspec(dllexport)
 #else
-#define DLLEXPORT
+#define DLLEXPORT __attribute__((visibility("default")))
 #define LINUX
 #endif
 
@@ -55,6 +56,9 @@ struct amxx_module_info_s
 #define AMXX_PARAM				2			/* Invalid parameter */
 #define AMXX_FUNC_NOT_PRESENT	3			/* Function not present */
 
+#define AMXX_GAME_OK			0			/* This module can load on the current game mod. */
+#define AMXX_GAME_BAD			1			/* This module can not load on the current game mod. */
+
 // *** Small stuff ***
 // The next section is copied from the amx.h file
 // Copyright (c) ITB CompuPhase, 1997-2005
@@ -1077,7 +1081,7 @@ void FN_AlertMessage(ALERT_TYPE atype, char *szFmt, ...);
 #endif // FN_AlertMessage
 
 #ifdef FN_EngineFprintf
-void FN_EngineFprintf(FILE *pfile, char *szFmt, ...);
+void FN_EngineFprintf(void *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf
 
 #ifdef FN_PvAllocEntPrivateData
@@ -1141,11 +1145,11 @@ void FN_GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigin, flo
 #endif // FN_GetBonePosition
 
 #ifdef FN_FunctionFromName
-unsigned long FN_FunctionFromName(const char *pName);
+uint32 FN_FunctionFromName(const char *pName);
 #endif // FN_FunctionFromName
 
 #ifdef FN_NameForFunction
-const char *FN_NameForFunction(unsigned long function);
+const char *FN_NameForFunction(uint32);
 #endif // FN_NameForFunction
 
 #ifdef FN_ClientPrintf
@@ -1189,7 +1193,7 @@ CRC32_t FN_CRC32_Final(CRC32_t pulCRC);
 #endif // FN_CRC32_Final
 
 #ifdef FN_RandomLong
-long FN_RandomLong(long lLow, long lHigh);
+int32 FN_RandomLong(int32 lLow, int32 lHigh);
 #endif // FN_RandomLong
 
 #ifdef FN_RandomFloat
@@ -1658,11 +1662,11 @@ void FN_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...);
 #endif // FN_AlertMessage_Post
 
 #ifdef FN_EngineFprintf_Post
-void FN_EngineFprintf_Post(FILE *pfile, char *szFmt, ...);
+void FN_EngineFprintf_Post(void *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf_Post
 
 #ifdef FN_PvAllocEntPrivateData_Post
-void *FN_PvAllocEntPrivateData_Post(edict_t *pEdict, long cb);
+void *FN_PvAllocEntPrivateData_Post(edict_t *pEdict, int32 cb);
 #endif // FN_PvAllocEntPrivateData_Post
 
 #ifdef FN_PvEntPrivateData_Post
@@ -1722,11 +1726,11 @@ void FN_GetBonePosition_Post(const edict_t *pEdict, int iBone, float *rgflOrigin
 #endif // FN_GetBonePosition_Post
 
 #ifdef FN_FunctionFromName_Post
-unsigned long FN_FunctionFromName_Post(const char *pName);
+uint32 FN_FunctionFromName_Post(const char *pName);
 #endif // FN_FunctionFromName_Post
 
 #ifdef FN_NameForFunction_Post
-const char *FN_NameForFunction_Post(unsigned long function);
+const char *FN_NameForFunction_Post(uint32);
 #endif // FN_NameForFunction_Post
 
 #ifdef FN_ClientPrintf_Post
@@ -1770,7 +1774,7 @@ CRC32_t FN_CRC32_Final_Post(CRC32_t pulCRC);
 #endif // FN_CRC32_Final_Post
 
 #ifdef FN_RandomLong_Post
-long FN_RandomLong_Post(long lLow, long lHigh);
+int32 FN_RandomLong_Post(int32 lLow, int32 lHigh);
 #endif // FN_RandomLong_Post
 
 #ifdef FN_RandomFloat_Post
@@ -2023,6 +2027,10 @@ int FN_ShouldCollide_Post(edict_t *pentTouched, edict_t *pentOther);
 void FN_AMXX_QUERY(void);
 #endif // FN_AMXX_QUERY
 
+#ifdef FN_AMXX_CHECKGAME
+int FN_AMXX_CHECKGAME(const char *);
+#endif // FN_AMXX_CHECKGAME
+
 #ifdef FN_AMXX_ATTACH
 void FN_AMXX_ATTACH(void);
 #endif // FN_AMXX_ATTACH
@@ -2095,9 +2103,16 @@ enum LibType
 	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*/);
@@ -2183,8 +2198,10 @@ typedef void			(*PFN_OVERRIDENATIVES)			(AMX_NATIVE_INFO * /*natives*/, const ch
 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;
@@ -2257,11 +2274,13 @@ 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) { }
@@ -2328,9 +2347,11 @@ 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
@@ -2404,6 +2425,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #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

@@ -54,6 +54,12 @@
 /** AMXX query */
 //#define FN_AMXX_QUERY OnAmxxQuery
 
+/** AMXX Check Game - module API is NOT available here.
+ * Return AMXX_GAME_OK if this module can load on the game, AMXX_GAME_BAD if it cannot.
+ * syntax: int AmxxCheckGame(const char *game)
+ */
+//#define FN_AMXX_CHECKGAME AmxxCheckGame
+
 /** AMXX attach
  * Do native functions init here (MF_AddNatives)
  */

amxmodx/sorting.cpp

@@ -0,0 +1,360 @@
+#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();
+
+	unregisterSPForward(pfn);
+	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("       %-23.22s %-8.7s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
+		print_srvconsole("       %-23.22s %-11.10s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
 
 		int plugins = 0;
 		int	running = 0;
@@ -52,7 +52,7 @@ void amx_command()
 			if ((*a).isValid() && !(*a).isPaused()) 
 				++running;
 
-			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());
+			print_srvconsole(" [%3d] %-23.22s %-11.10s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
 			++a;
 		}
 
@@ -82,13 +82,29 @@ void amx_command()
 		CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin);
 
 		if (plugin && plugin->isValid()) 
+		{
+			if (plugin->isPaused())
+			{
+				if (plugin->isStopped())
+				{
+					print_srvconsole("Plugin \"%s\" is stopped and may not be paused.\n",plugin->getName());
+				}
+				else
+				{
+					print_srvconsole("Plugin \"%s\" is already paused.\n",plugin->getName());
+				}
+			}
+			else
 			{
 				plugin->pausePlugin();
 				print_srvconsole("Paused plugin \"%s\"\n", plugin->getName());
 			}
+		}
 		else 
+		{
 			print_srvconsole("Couldn't find plugin matching \"%s\"\n", sPlugin);
 		}
+	}
 	else if (!strcmp(cmd, "unpause") && CMD_ARGC() > 2) 
 	{
 		const char* sPlugin = CMD_ARGV(2);
@@ -96,15 +112,22 @@ void amx_command()
 		CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin);
 
 		if (plugin && plugin->isValid() && plugin->isPaused()) 
+		{
+			if (plugin->isStopped())
+			{
+				print_srvconsole("Plugin \"%s\" is stopped and may not be unpaused.\n", plugin->getName());
+			}
+			else
 			{
 				plugin->unpausePlugin();
 				print_srvconsole("Unpaused plugin \"%s\"\n", plugin->getName());
 			}
+		}
 		else if (!plugin)
 		{
 			print_srvconsole("Couldn't find plugin matching \"%s\"\n", sPlugin);
 		} else {
-			print_srvconsole("Plugin %s can't be unpaused right now.", sPlugin);
+			print_srvconsole("Plugin %s can't be unpaused right now.\n", sPlugin);
 		}
 	}
 	else if (!strcmp(cmd, "cvars")) 
@@ -114,10 +137,25 @@ void amx_command()
 
 		int ammount = 0;
 
+		if (CMD_ARGC() > 2) // Searching for cvars registered to a plugin
+		{
+			const char* targetname = CMD_ARGV(2);
+			size_t len = strlen(targetname);
+			for (CList<CCVar>::iterator a = g_cvars.begin(); a; ++a)
+			{
+				if (strncmp((*a).getPluginName(), targetname, len) == 0)
+				{
+					print_srvconsole(" [%3d] %-24.23s %-24.23s %-16.15s\n", ++ammount, (*a).getName(), CVAR_GET_STRING((*a).getName()), (*a).getPluginName());
+				}
+			}
+		}
+		else // No search
+		{
 			for (CList<CCVar>::iterator a = g_cvars.begin(); a; ++a)
 			{
 				print_srvconsole(" [%3d] %-24.23s %-24.23s %-16.15s\n", ++ammount, (*a).getName(), CVAR_GET_STRING((*a).getName()), (*a).getPluginName());
 			}
+		}
 		
 		print_srvconsole("%d cvars\n", ammount);
 	}
@@ -131,22 +169,38 @@ void amx_command()
 
 		CmdMngr::iterator a = g_commands.begin(CMD_ConsoleCommand);
 
+		if (CMD_ARGC() > 2) // Searching for commands registered to a plugin
+		{
+			const char* targetname = CMD_ARGV(2);
+			size_t len = strlen(targetname);
+			while (a)
+			{
+				if (strncmp((*a).getPlugin()->getName(), targetname, len) == 0)
+				{
+					UTIL_GetFlags(access, (*a).getFlags());
+					print_srvconsole(" [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n", ++ammount, (*a).getCmdLine(), access, (*a).getCmdType(), (*a).getPlugin()->getName());
+				}
+				++a;
+			}
+		}
+		else // No search
+		{
 			while (a)
 			{
 				UTIL_GetFlags(access, (*a).getFlags());
 				print_srvconsole(" [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n", ++ammount, (*a).getCmdLine(), access, (*a).getCmdType(), (*a).getPlugin()->getName());
 				++a;
 			}
-
+		}
 		print_srvconsole("%d commands\n",ammount);
 	}
 	else if (!strcmp(cmd, "version")) 
 	{
 		print_srvconsole("%s %s (%s)\n", Plugin_info.name, Plugin_info.version, Plugin_info.url);
-		print_srvconsole("Authors: David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko\n");
+		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\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");
@@ -161,7 +215,7 @@ void amx_command()
 	else if (!strcmp(cmd, "modules"))
 	{
 		print_srvconsole("Currently loaded modules:\n");
-		print_srvconsole("      %-23.22s %-8.7s %-20.19s %-11.10s\n", "name", "version", "author", "status");
+		print_srvconsole("      %-23.22s %-11.10s %-20.19s %-11.10s\n", "name", "version", "author", "status");
 
 		int running = 0;
 		int modules = 0;
@@ -174,7 +228,7 @@ void amx_command()
 				++running;
 			++modules;
 
-			print_srvconsole(" [%2d] %-23.22s %-8.7s %-20.19s %-11.10s\n", modules, (*a).getName(), (*a).getVersion(), (*a).getAuthor(), (*a).getStatus());
+			print_srvconsole(" [%2d] %-23.22s %-11.10s %-20.19s %-11.10s\n", modules, (*a).getName(), (*a).getVersion(), (*a).getAuthor(), (*a).getStatus());
 			++a;
 		}
 
@@ -244,8 +298,8 @@ void amx_command()
 		print_srvconsole("   gpl                    - print the license\n");
 		print_srvconsole("   plugins                - list plugins currently loaded\n");
 		print_srvconsole("   modules                - list modules currently loaded\n");
-		print_srvconsole("   cvars                  - list cvars registered by plugins\n");
-		print_srvconsole("   cmds                   - list commands registered by plugins\n");
+		print_srvconsole("   cvars [ plugin ]       - list cvars registered by plugins\n");
+		print_srvconsole("   cmds [ plugin ]        - list commands registered by plugins\n");
 		print_srvconsole("   pause < plugin >       - pause a running plugin\n");
 		print_srvconsole("   unpause < plugin >     - unpause a previously paused plugin\n");
 	}
@@ -253,7 +307,6 @@ void amx_command()
 
 void plugin_srvcmd()
 {
-	cell ret = 0;
 	const char* cmd = CMD_ARGV(0);
 				
 	CmdMngr::iterator a = g_commands.srvcmdbegin();

amxmodx/string.cpp

@@ -33,6 +33,7 @@
 #include "amxmodx.h"
 #include "format.h"
 #include "binlog.h"
+#include "amxmod_compat.h"
 
 const char* stristr(const char* str, const char* substr)
 {
@@ -115,8 +116,21 @@ extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, in
 	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';
 
@@ -132,16 +146,29 @@ extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, in
 	return dest - start;
 }
 
-char* get_amxstring(AMX *amx, cell amx_addr, int id, int& len)
+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)
@@ -416,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 */
@@ -541,7 +595,26 @@ static cell AMX_NATIVE_CALL format(AMX *amx, cell *params) /* 3 param */
 	if (copy)
 		buf = g_cpbuf;
 	int param = 4;
-	size_t total = atcprintf(buf, maxlen, fmt, amx, params, &param);
+	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 */
@@ -863,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)))
@@ -944,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)
@@ -964,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)

amxmodx/svn_version.h

@@ -0,0 +1,8 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+#define SVN_VERSION_STRING		"1.8.1.3746"
+#define SVN_VERSION_DWORD		1,8,1,3746
+#define SVN_VERSION_PRODUCT		"1.8.1"
+
+#endif //_INCLUDE_SVN_VERSION_H_

amxmodx/svn_version.tpl

@@ -0,0 +1,8 @@
+#ifndef _INCLUDE_SVN_VERSION_H_
+#define _INCLUDE_SVN_VERSION_H_
+
+#define SVN_VERSION_STRING		"$PMAJOR$.$PMINOR$.$PREVISION$.$GLOBAL_BUILD$"
+#define SVN_VERSION_DWORD		$PMAJOR$,$PMINOR$,$PREVISION$,$GLOBAL_BUILD$
+#define SVN_VERSION_PRODUCT		"$PMAJOR$.$PMINOR$.$PREVISION$"
+
+#endif //_INCLUDE_SVN_VERSION_H_

amxmodx/trie_natives.cpp

@@ -0,0 +1,316 @@
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "amxmodx.h"
+#include "sm_trie_tpl.h"
+#include "trie_natives.h"
+
+#ifndef NDEBUG
+size_t trie_free_count = 0;
+size_t trie_malloc_count = 0;
+#endif
+
+TrieHandles g_TrieHandles;
+typedef KTrie<TrieData> celltrie;
+
+void triedata_dtor(TrieData *ptr)
+{
+	ptr->freeCells();
+}
+// native Trie:TrieCreate();
+static cell AMX_NATIVE_CALL TrieCreate(AMX *amx, cell *params)
+{
+	return static_cast<cell>(g_TrieHandles.create());
+}
+
+// native Trie::TrieClear(Trie:handle);
+static cell AMX_NATIVE_CALL TrieClear(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+	t->run_destructor(triedata_dtor);
+	t->clear();
+	return 1;
+}
+// native TrieSetCell(Trie:handle, const key[], any:value);
+static cell AMX_NATIVE_CALL TrieSetCell(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+	TrieData *td = NULL;
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+
+	if ((td = t->retrieve(key)) == NULL)
+	{
+		TrieData dummy;
+		t->insert(key, dummy);
+
+		td = t->retrieve(key);
+
+		// should never, ever happen
+		if (td == NULL)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Couldn't KTrie::retrieve(), handle: %d", params[1]);
+			return 0;
+		}
+	}
+	
+	td->setCell(params[3]);
+	
+	return 1;
+}
+// native TrieSetString(Trie:handle, const key[], const data[]);
+static cell AMX_NATIVE_CALL TrieSetString(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+	TrieData *td = NULL;
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+
+	if ((td = t->retrieve(key)) == NULL)
+	{
+		TrieData dummy;
+		t->insert(key, dummy);
+		td = t->retrieve(key);
+
+		// should never, ever happen
+		if (td == NULL)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Couldn't KTrie::retrieve(), handle: %d", params[1]);
+			return 0;
+		}
+
+	}
+	
+	td->setString(get_amxaddr(amx, params[3]));
+	return 1;
+}
+// native TrieSetArray(Trie:handle, const key[], const any:buffer[], buffsize)
+static cell AMX_NATIVE_CALL TrieSetArray(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[2]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+	TrieData *td = NULL;
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+
+	if ((td = t->retrieve(key)) == NULL)
+	{
+		TrieData dummy;
+		t->insert(key, dummy);
+		td = t->retrieve(key);
+
+		// should never, ever happen
+		if (td == NULL)
+		{
+			LogError(amx, AMX_ERR_NATIVE, "Couldn't KTrie::retrieve(), handle: %d", params[1]);
+			return 0;
+		}
+
+	}
+
+	td->setArray(get_amxaddr(amx, params[3]), params[4]);
+
+	return 1;
+}
+// native bool:TrieGetCell(Trie:handle, const key[], &any:value);
+static cell AMX_NATIVE_CALL TrieGetCell(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+
+	TrieData *td = NULL;
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+
+	if ((td = t->retrieve(key)) == NULL)
+	{
+		return 0;
+	}
+	cell *ptr = get_amxaddr(amx, params[3]);
+	if (!td->getCell(ptr))
+	{
+		return 0;
+	}
+	return 1;
+}
+// native bool:TrieGetString(Trie:handle, const key[], buff[], len);
+static cell AMX_NATIVE_CALL TrieGetString(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+
+	TrieData *td = NULL;
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+
+	if ((td = t->retrieve(key)) == NULL)
+	{
+		return 0;
+	}
+	cell *ptr = get_amxaddr(amx, params[3]);
+	if (!td->getString(ptr, params[4]))
+	{
+		return 0;
+	}
+	return 1;
+}
+// native bool:TrieGetArray(Trie:handle, const key[], any:buff[], len);
+static cell AMX_NATIVE_CALL TrieGetArray(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+
+	TrieData *td = NULL;
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+
+	if ((td = t->retrieve(key)) == NULL)
+	{
+		return 0;
+	}
+	cell *ptr = get_amxaddr(amx, params[3]);
+	if (!td->getArray(ptr, params[4]))
+	{
+		return 0;
+	}
+	return 1;
+}
+// native bool:TrieKeyExists(Trie:handle, const key[]);
+static cell AMX_NATIVE_CALL TrieKeyExists(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+	return t->retrieve(key) != NULL ? 1 : 0;
+}
+
+// native bool:TrieDeleteKey(Trie:handle, const key[]);
+static cell AMX_NATIVE_CALL TrieDeleteKey(AMX *amx, cell *params)
+{
+	celltrie *t = g_TrieHandles.lookup(params[1]);
+
+	if (t == NULL)
+	{
+		LogError(amx, AMX_ERR_NATIVE, "Invalid trie handle provided (%d)", params[1]);
+		return 0;
+	}
+
+
+	int len;
+	const char *key = get_amxstring(amx, params[2], 0, len);
+	TrieData *td = t->retrieve(key);
+
+	if (td != NULL)
+	{
+		td->freeCells();
+	}
+	return t->remove(key) ? 1 : 0;
+}
+//native TrieDestroy(&Trie:handle)
+static cell AMX_NATIVE_CALL TrieDestroy(AMX *amx, cell *params)
+{
+	cell *ptr = get_amxaddr(amx, params[1]);
+
+	celltrie *t = g_TrieHandles.lookup(*ptr);
+
+	if (t == NULL)
+	{
+		return 0;
+	}
+	t->run_destructor(triedata_dtor);
+	if (g_TrieHandles.destroy(*ptr))
+	{
+		*ptr = 0;
+		return 1;
+	}
+	return 0;
+
+}
+#ifndef NDEBUG
+static cell AMX_NATIVE_CALL TrieMallocCount(AMX *amx, cell *params)
+{
+	return trie_malloc_count;
+}
+static cell AMX_NATIVE_CALL TrieFreeCount(AMX *amx, cell *params)
+{
+	return trie_free_count;
+}
+#endif
+AMX_NATIVE_INFO trie_Natives[] =
+{
+	{ "TrieCreate",		TrieCreate },
+	{ "TrieClear",		TrieClear },
+
+	{ "TrieSetCell",	TrieSetCell },
+	{ "TrieSetString",	TrieSetString },
+	{ "TrieSetArray",	TrieSetArray },
+
+	{ "TrieGetCell",	TrieGetCell },
+	{ "TrieGetString",	TrieGetString },
+	{ "TrieGetArray",	TrieGetArray },
+
+	{ "TrieDeleteKey",	TrieDeleteKey },
+	{ "TrieKeyExists",	TrieKeyExists },
+	{ "TrieDestroy",	TrieDestroy },
+
+#ifndef NDEBUG
+	{ "TrieMallocCount",	TrieMallocCount },
+	{ "TrieFreeCount",	TrieFreeCount },
+#endif
+
+	{ NULL,			NULL }
+};
+

amxmodx/trie_natives.h

@@ -0,0 +1,211 @@
+#ifndef _TRIE_NATIVES_H_
+#define _TRIE_NATIVES_H_
+
+#include "amxmodx.h"
+#include "sm_trie_tpl.h"
+#include "CVector.h"
+
+#define TRIE_DATA_UNSET 	0
+#define TRIE_DATA_CELL		1
+#define TRIE_DATA_STRING	2
+#define TRIE_DATA_ARRAY		3
+
+#ifndef NDEBUG
+extern size_t trie_malloc_count;
+extern size_t trie_free_count;
+#endif
+
+class TrieData
+{
+private:
+	cell *m_data;
+	cell m_cell;
+	cell m_cellcount;
+	int m_type;
+
+	void needCells(cell cellcount)
+	{
+		if (m_cellcount < cellcount)
+		{
+			if (m_data != NULL)
+			{
+				free(m_data);
+#ifndef NDEBUG
+				trie_free_count++;
+#endif
+			}
+			size_t neededbytes = cellcount * sizeof(cell);
+			m_data = static_cast<cell *>(malloc(neededbytes));
+
+#ifndef NDEBUG
+			trie_malloc_count++;
+#endif
+			m_cellcount = cellcount;
+		}
+	}
+public:
+	void freeCells()
+	{
+		if (m_data)
+		{
+#ifndef NDEBUG
+			trie_free_count++;
+#endif
+			free(m_data);
+			m_data = NULL;
+		}
+		m_cellcount = 0;
+	}
+	TrieData() : m_data(NULL), m_cell(0), m_cellcount(0), m_type(TRIE_DATA_UNSET) { }
+	TrieData(const TrieData &src) : m_data(src.m_data),
+					m_cell(src.m_cell),
+					m_cellcount(src.m_cellcount),
+					m_type(src.m_type) { }
+	~TrieData() { }
+
+	int getType() { return m_type; }
+
+	void setCell(cell value)
+	{
+		freeCells();
+
+		m_cell = value;
+		m_type = TRIE_DATA_CELL;
+	}
+	void setString(cell *value)
+	{
+		cell len = 0;
+
+		cell *p = value;
+
+		while (*p++ != 0)
+		{
+			len++;
+		}
+		len += 1; // zero terminator
+		needCells(len);
+		memcpy(m_data, value, sizeof(cell) * len);
+
+		m_type = TRIE_DATA_STRING;
+	}
+	void setArray(cell *value, cell size)
+	{
+		if (size <= 0)
+			return;
+
+		needCells(size);
+		memcpy(m_data, value, sizeof(cell) * size);
+
+		m_type = TRIE_DATA_ARRAY;
+	}
+	bool getCell(cell *out)
+	{
+		if (m_type == TRIE_DATA_CELL)
+		{
+			*out = m_cell;
+			return true;
+		}
+
+		return false;
+	}
+	bool getString(cell *out, cell max)
+	{
+		if (m_type == TRIE_DATA_STRING && max >= 0)
+		{
+			memcpy(out, m_data, (max > m_cellcount ? m_cellcount : max) * sizeof(cell));
+			return true;
+		}
+		return false;
+	}
+	bool getArray(cell *out, cell max)
+	{
+		if (m_type == TRIE_DATA_ARRAY && max >= 0)
+		{
+			memcpy(out, m_data, (max > m_cellcount ? m_cellcount : max) * sizeof(cell));
+			return true;
+		}
+		return false;
+	}
+	void clear()
+	{
+		freeCells();
+		m_type = TRIE_DATA_UNSET;
+	}
+};
+
+class TrieHandles
+{
+private:
+	CVector< KTrie< TrieData > *> m_tries;
+
+public:
+	TrieHandles() { }
+	~TrieHandles()
+	{
+		this->clear();
+	}
+
+	void clear()
+	{
+		for (size_t i = 0; i < m_tries.size(); i++)
+		{
+			if (m_tries[i] != NULL)
+			{
+				delete m_tries[i];
+			}
+		}
+
+		m_tries.clear();
+	}
+	KTrie<TrieData> *lookup(int handle)
+	{
+		handle--;
+
+		if (handle < 0 || handle >= static_cast<int>(m_tries.size()))
+		{
+			return NULL;
+		}
+
+		return m_tries[handle];
+	}
+	int create()
+	{
+		for (size_t i = 0; i < m_tries.size(); i++)
+		{
+			if (m_tries[i] == NULL)
+			{
+				// reuse handle
+				m_tries[i] = new KTrie<TrieData>;
+
+				return static_cast<int>(i) + 1;
+			}
+		}
+		m_tries.push_back(new KTrie<TrieData>);
+		return m_tries.size();
+	}
+	bool destroy(int handle)
+	{
+		handle--;
+
+		if (handle < 0 || handle >= static_cast<int>(m_tries.size()))
+		{
+			return false;
+		}
+
+		if (m_tries[handle] == NULL)
+		{
+			return false;
+		}
+		delete m_tries[handle];
+		m_tries[handle] = NULL;
+
+		return true;
+	}
+};
+
+
+extern TrieHandles g_TrieHandles;
+extern AMX_NATIVE_INFO trie_Natives[];
+
+#endif
+

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

@@ -141,13 +141,16 @@ static cell AMX_NATIVE_CALL angle_vector(AMX *amx, cell *params)
 	{
 	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 = get_amxaddr(amx, params[3]);
 	vCell[0] = FloatToCell(v_return.x);
 	vCell[1] = FloatToCell(v_return.y);
 	vCell[2] = FloatToCell(v_return.z);

amxmodx/version.rc

@@ -1,12 +1,12 @@
 // Microsoft Visual C++ generated resource script.
 //
-
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winres.h"
+#include "svn_version.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,5,0
- PRODUCTVERSION 1,7,5,0
+ FILEVERSION SVN_VERSION_DWORD
+ PRODUCTVERSION SVN_VERSION_DWORD
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -44,12 +44,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "AMX Mod X"
             VALUE "FileDescription", "AMX Mod X"
-            VALUE "FileVersion", "1.75"
+            VALUE "FileVersion", SVN_VERSION_STRING
             VALUE "InternalName", "amxmodx"
-            VALUE "LegalCopyright", "Copyright (c) 2004-2006, AMX Mod X Dev Team"
+            VALUE "LegalCopyright", "Copyright (c) 2004-2007, AMX Mod X Dev Team"
             VALUE "OriginalFilename", "amxmodx_mm.dll"
             VALUE "ProductName", "AMX Mod X"
-            VALUE "ProductVersion", "1.75"
+            VALUE "ProductVersion", SVN_VERSION_PRODUCT
         END
     END
     BLOCK "VarFileInfo"

amxmodx/zlib/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -23,15 +23,17 @@
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateCopy           z_deflateCopy
 #  define deflateReset          z_deflateReset
-#  define deflatePrime  z_deflatePrime
 #  define deflateParams         z_deflateParams
 #  define deflateBound          z_deflateBound
+#  define deflatePrime          z_deflatePrime
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateSetDictionary  z_inflateSetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateCopy           z_inflateCopy
 #  define inflateReset          z_inflateReset
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
 #  define compress              z_compress
 #  define compress2             z_compress2
 #  define compressBound         z_compressBound
@@ -39,7 +41,12 @@
 #  define adler32               z_adler32
 #  define crc32                 z_crc32
 #  define get_crc_table         z_get_crc_table
+#  define zError                z_zError
 
+#  define alloc_func            z_alloc_func
+#  define free_func             z_free_func
+#  define in_func               z_in_func
+#  define out_func              z_out_func
 #  define Byte                  z_Byte
 #  define uInt                  z_uInt
 #  define uLong                 z_uLong
@@ -61,8 +68,10 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
 #    define WIN32
+#  endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
@@ -293,7 +302,7 @@ typedef uLong FAR uLongf;
 #endif
 
 #if defined(__OS400__)
-#define NO_vsnprintf
+#  define NO_vsnprintf
 #endif
 
 #if defined(__MVS__)

compiler/amxxpc/Makefile

@@ -3,14 +3,14 @@
 
 ### 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
 
-LINK = -lz /lib/libstdc++.a
+LINK = -lz /lib32/libstdc++.a
 
 INCLUDE = -I.  -L.
 
@@ -27,14 +27,14 @@ CFLAGS += -DLINUX -DNDEBUG -Wno-deprecated -fexceptions -DHAVE_STDINT_H -DAMX_AN
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
+	$(CPP) $(INCLUDE) $(CFLAGS) -m32 -o $@ -c $<
 
 all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) amxxpc
 
 amxxpc: $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(CPP) $(INCLUDE) $(CFLAGS) -m32 $(OBJ_LINUX) $(LINK) -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
 default: all
 

compiler/amxxpc/amx.h

@@ -212,7 +212,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 {
@@ -260,8 +260,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    amx_version   PACKED; /* required version of the AMX */
+  char    file_version; 		/* file format version */
+  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 */

compiler/amxxpc/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    amx_version   PACKED; /* required version of the AMX */
+  char    file_version; 		/* file format version */
+  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;
+} 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 */
-} AMX_DBG_FILE          PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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;
+} 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    vclass        PACKED; /* class of symbol (global/local) */
+  char    ident;				/* kind of symbol (function/variable) */
+  char    vclass; 				/* class of symbol (global/local) */
   int16_t dim           PACKED; /* number of dimensions */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_SYMBOL        PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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;
+} AMX_DBG_SYMDIM;
 
 typedef struct tagAMX_DBG_TAG {
   int16_t tag           PACKED; /* tag id */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_TAG           PACKED;
+  const char name[1];			/* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_MACHINE       PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_STATE         PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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;
+} AMX_DBG;
 
 #if !defined iVARIABLE
   #define iVARIABLE  1  /* cell that has an address and that can be fetched directly (lvalue) */

compiler/amxxpc/amxxpc.cpp

@@ -12,6 +12,13 @@
 #include "amxxpc.h"
 #include "Binary.h"
 
+#ifdef _MSC_VER
+	// MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated
+	#if _MSC_VER >= 1400
+		#define unlink _unlink	
+	#endif
+#endif
+
 static PRINTF pc_printf = NULL;
 
 void ReadFileIntoPl(abl *pl, FILE *fp);

compiler/amxxpc/amxxpc.h

@@ -1,7 +1,7 @@
 #ifndef _AMXXSC_INCLUDE_H
 #define _AMXXSC_INCLUDE_H
 
-#define VERSION_STRING		"1.75-300"
+#define VERSION_STRING		"1.8.1-300"
 #define MAGIC_HEADER2		0x414D5858
 #define	MAGIC_VERSION		0x0300
 

compiler/amxxpc/amxxpc.sln

@@ -1,21 +1,20 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxxpc", "amxxpc.vcproj", "{39412290-D01C-472F-A439-AB5592A04C08}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{39412290-D01C-472F-A439-AB5592A04C08}.Debug.ActiveCfg = Debug|Win32
-		{39412290-D01C-472F-A439-AB5592A04C08}.Debug.Build.0 = Debug|Win32
-		{39412290-D01C-472F-A439-AB5592A04C08}.Release.ActiveCfg = Release|Win32
-		{39412290-D01C-472F-A439-AB5592A04C08}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.Build.0 = Debug|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.ActiveCfg = Release|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

compiler/amxxpc/amxxpc.vcproj

@@ -1,111 +1,178 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="amxxpc"
 	ProjectGUID="{39412290-D01C-472F-A439-AB5592A04C08}"
-	Keyword="Win32Proj">
+	RootNamespace="amxxpc"
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="$(OutDir)/amxxpc.exe"
 				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/amxxpc.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				RuntimeLibrary="0"
 				StructMemberAlignment="0"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="zlib.lib"
 				OutputFile="$(OutDir)/amxxpc.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -114,58 +181,75 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\amx.cpp">
+				RelativePath=".\amx.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\amxxpc.cpp">
+				RelativePath=".\amxxpc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\Binary.cpp">
+				RelativePath=".\Binary.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\amx.h">
+				RelativePath=".\amx.h"
+				>
 			</File>
 			<File
-				RelativePath=".\amxdbg.h">
+				RelativePath=".\amxdbg.h"
+				>
 			</File>
 			<File
-				RelativePath=".\amxxpc.h">
+				RelativePath=".\amxxpc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Binary.h">
+				RelativePath=".\Binary.h"
+				>
 			</File>
 			<File
-				RelativePath=".\osdefs.h">
+				RelativePath=".\osdefs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\resource.h">
+				RelativePath=".\resource.h"
+				>
 			</File>
 			<File
-				RelativePath=".\resource1.h">
+				RelativePath=".\resource1.h"
+				>
 			</File>
 			<File
-				RelativePath=".\sclinux.h">
+				RelativePath=".\sclinux.h"
+				>
 			</File>
 			<File
-				RelativePath=".\zconf.h">
+				RelativePath=".\zconf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\zlib.h">
+				RelativePath=".\zlib.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\amxxpc1.rc">
+				RelativePath=".\amxxpc1.rc"
+				>
 			</File>
 		</Filter>
 	</Files>

compiler/amxxpc/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2003 Jean-loup Gailly.
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -23,15 +23,17 @@
 #  define deflateSetDictionary  z_deflateSetDictionary
 #  define deflateCopy           z_deflateCopy
 #  define deflateReset          z_deflateReset
-#  define deflatePrime  z_deflatePrime
 #  define deflateParams         z_deflateParams
 #  define deflateBound          z_deflateBound
+#  define deflatePrime          z_deflatePrime
 #  define inflateInit2_         z_inflateInit2_
 #  define inflateSetDictionary  z_inflateSetDictionary
 #  define inflateSync           z_inflateSync
 #  define inflateSyncPoint      z_inflateSyncPoint
 #  define inflateCopy           z_inflateCopy
 #  define inflateReset          z_inflateReset
+#  define inflateBack           z_inflateBack
+#  define inflateBackEnd        z_inflateBackEnd
 #  define compress              z_compress
 #  define compress2             z_compress2
 #  define compressBound         z_compressBound
@@ -39,7 +41,12 @@
 #  define adler32               z_adler32
 #  define crc32                 z_crc32
 #  define get_crc_table         z_get_crc_table
+#  define zError                z_zError
 
+#  define alloc_func            z_alloc_func
+#  define free_func             z_free_func
+#  define in_func               z_in_func
+#  define out_func              z_out_func
 #  define Byte                  z_Byte
 #  define uInt                  z_uInt
 #  define uLong                 z_uLong
@@ -61,8 +68,10 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#  ifndef WIN32
 #    define WIN32
+#  endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
@@ -293,7 +302,7 @@ typedef uLong FAR uLongf;
 #endif
 
 #if defined(__OS400__)
-#define NO_vsnprintf
+#  define NO_vsnprintf
 #endif
 
 #if defined(__MVS__)

compiler/amxxpc/zlib.h

@@ -1,7 +1,7 @@
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.1, November 17th, 2003
+  version 1.2.3, July 18th, 2005
 
-  Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -37,8 +37,8 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.1"
-#define ZLIB_VERNUM 0x1210
+#define ZLIB_VERSION "1.2.3"
+#define ZLIB_VERNUM 0x1230
 
 /*
      The 'zlib' compression library provides in-memory compression and
@@ -53,24 +53,22 @@ extern "C" {
   application must provide more input and/or consume the output
   (providing more output space) before each call.
 
-     The compressed data format used by the in-memory functions is the zlib
-  format, which is a zlib wrapper documented in RFC 1950, wrapped around a
-  deflate stream, which is itself documented in RFC 1951.
+     The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
 
      The library also supports reading and writing files in gzip (.gz) format
   with an interface similar to that of stdio using the functions that start
   with "gz".  The gzip format is different from the zlib format.  gzip is a
   gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
 
+     This library can optionally read and write gzip streams in memory as well.
+
      The zlib format was designed to be compact and fast for use in memory
   and on communications channels.  The gzip format was designed for single-
   file compression on file systems, has a larger header than zlib to maintain
   directory information, and uses a different, slower check method than zlib.
 
-     This library does not provide any functions to write gzip files in memory.
-  However such functions could be easily written using zlib's deflate function,
-  the documentation in the gzip RFC, and the examples in gzio.c.
-
      The library does not install any signal handler. The decoder checks
   the consistency of the compressed data, so the library should never
   crash even in case of corrupted input.
@@ -97,13 +95,36 @@ typedef struct z_stream_s {
     free_func  zfree;   /* used to free the internal state */
     voidpf     opaque;  /* private data object passed to zalloc and zfree */
 
-    int     data_type;  /* best guess about the data type: ascii or binary */
+    int     data_type;  /* best guess about the data type: binary or text */
     uLong   adler;      /* adler32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 
 typedef z_stream FAR *z_streamp;
 
+/*
+     gzip header information passed to and from zlib routines.  See RFC 1952
+  for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+    int     text;       /* true if compressed data believed to be text */
+    uLong   time;       /* modification time */
+    int     xflags;     /* extra flags (not used when writing a gzip file) */
+    int     os;         /* operating system */
+    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
+    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
+    uInt    extra_max;  /* space at extra (only when reading header) */
+    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
+    uInt    name_max;   /* space at name (only when reading header) */
+    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
+    uInt    comm_max;   /* space at comment (only when reading header) */
+    int     hcrc;       /* true if there was or will be a header crc */
+    int     done;       /* true when done reading gzip header (not used
+                           when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
 /*
    The application must update next_in and avail_in when avail_in has
    dropped to zero. It must update next_out and avail_out when avail_out
@@ -168,11 +189,13 @@ typedef z_stream FAR *z_streamp;
 #define Z_FILTERED            1
 #define Z_HUFFMAN_ONLY        2
 #define Z_RLE                 3
+#define Z_FIXED               4
 #define Z_DEFAULT_STRATEGY    0
 /* compression strategy; see deflateInit2() below for details */
 
 #define Z_BINARY   0
-#define Z_ASCII    1
+#define Z_TEXT     1
+#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
 #define Z_UNKNOWN  2
 /* Possible values of the data_type field (though see inflate()) */
 
@@ -246,6 +269,10 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   and with zero avail_out, it must be called again after making room in the
   output buffer because there might be more output pending.
 
+    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+  decide how much data to accumualte before producing output, in order to
+  maximize compression.
+
     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
   flushed to the output buffer and the output is aligned on a byte boundary, so
   that the decompressor can get all input data available so far. (In particular
@@ -257,7 +284,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
   restart from this point if previous compressed data has been damaged or if
   random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
+  compression.
 
     If deflate returns with avail_out == 0, this function must be called again
   with the same value of the flush parameter and more output space (updated
@@ -282,8 +309,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
 
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
+    deflate() may update strm->data_type if it can make a good guess about
+  the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
   binary. This field is only for information purposes and does not affect
   the compression algorithm in any manner.
 
@@ -365,11 +392,11 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
     The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
   Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
   output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  if and when it get to the next deflate block boundary. When decoding the zlib
-  or gzip format, this will cause inflate() to return immediately after the
-  header and before the first block. When doing a raw inflate, inflate() will
-  go ahead and process the first block, and will return when it gets to the end
-  of that block, or when it runs out of data.
+  if and when it gets to the next deflate block boundary. When decoding the
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
 
     The Z_BLOCK option assists in appending to or combining deflate streams.
   Also to assist in this, on return inflate() will set strm->data_type to the
@@ -401,7 +428,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
   because Z_BLOCK is used.
 
      If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm-adler to the adler32 checksum of the dictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
   chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
   strm->adler to the adler32 checksum of all output produced so far (that is,
   total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
@@ -478,7 +505,8 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    16 to windowBits to write a simple gzip header and trailer around the
    compressed data instead of a zlib wrapper. The gzip header will have no
    file name, no extra data, no comment, no modification time (set to zero),
-   no header crc, and the operating system will be set to 255 (unknown).
+   no header crc, and the operating system will be set to 255 (unknown).  If a
+   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
 
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state. memLevel=1 uses minimum memory but
@@ -497,7 +525,9 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
    Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as
    Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy
    parameter only affects the compression ratio but not the correctness of the
-   compressed output even if it is not set appropriately.
+   compressed output even if it is not set appropriately.  Z_FIXED prevents the
+   use of dynamic Huffman codes, allowing for a simpler decoder for special
+   applications.
 
       deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
@@ -526,7 +556,9 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
    deflateInit or deflateInit2, a part of the dictionary may in effect be
    discarded, for example if the dictionary is larger than the window size in
    deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
+   put at the end of the dictionary, not at the front. In addition, the
+   current implementation of deflate will use at most the window size minus
+   262 bytes of the provided dictionary.
 
      Upon return of this function, strm->adler is set to the adler32 value
    of the dictionary; the decompressor may later use this value to determine
@@ -592,6 +624,23 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
    if strm->avail_out was zero.
 */
 
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+                                    int good_length,
+                                    int max_lazy,
+                                    int nice_length,
+                                    int max_chain));
+/*
+     Fine tune deflate's internal compression parameters.  This should only be
+   used by someone who understands the algorithm used by zlib's deflate for
+   searching for the best matching string, and even then only by the most
+   fanatic optimizer trying to squeeze out the last compressed bit for their
+   specific input data.  Read the deflate.c source code for the meaning of the
+   max_lazy, good_length, nice_length, and max_chain parameters.
+
+     deflateTune() can be called after deflateInit() or deflateInit2(), and
+   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
 ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
                                        uLong sourceLen));
 /*
@@ -617,6 +666,30 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
    stream state was inconsistent.
 */
 
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      deflateSetHeader() provides gzip header information for when a gzip
+   stream is requested by deflateInit2().  deflateSetHeader() may be called
+   after deflateInit2() or deflateReset() and before the first call of
+   deflate().  The text, time, os, extra field, name, and comment information
+   in the provided gz_header structure are written to the gzip header (xflag is
+   ignored -- the extra flags are set according to the compression level).  The
+   caller must assure that, if not Z_NULL, name and comment are terminated with
+   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+   available there.  If hcrc is true, a gzip header crc is included.  Note that
+   the current versions of the command-line version of gzip (up through version
+   1.3.x) do not support header crc's, and will report that it is a "multi-part
+   gzip file" and give up.
+
+      If deflateSetHeader is not used, the default gzip header has text false,
+   the time set to zero, and os set to 255, with no extra, name, or comment
+   fields.  The gzip header is returned to the default state by deflateReset().
+
+      deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
 /*
 ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
                                      int  windowBits));
@@ -649,14 +722,15 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
      windowBits can also be greater than 15 for optional gzip decoding. Add
    32 to windowBits to enable zlib and gzip decoding with automatic header
    detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
 
      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
 */
 
 ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
@@ -664,11 +738,14 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
                                              uInt  dictLength));
 /*
      Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
+   sequence. This function must be called immediately after a call of inflate,
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   can be determined from the adler32 value returned by that call of inflate.
+   The compressor and decompressor must use exactly the same dictionary (see
+   deflateSetDictionary).  For raw inflate, this function can be called
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
 
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (such as NULL dictionary) or the stream state is
@@ -719,8 +796,64 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+                                     int bits,
+                                     int value));
 /*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
+     This function inserts bits in the inflate input stream.  The intent is
+  that this function is used to start inflating at a bit position in the
+  middle of a byte.  The provided bits will be used before any bytes are used
+  from next_in.  This function should only be used with raw inflate, and
+  should be used before the first inflate() call after inflateInit2() or
+  inflateReset().  bits must be less than or equal to 16, and that many of the
+  least significant bits of value will be inserted in the input.
+
+      inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+                                         gz_headerp head));
+/*
+      inflateGetHeader() requests that gzip header information be stored in the
+   provided gz_header structure.  inflateGetHeader() may be called after
+   inflateInit2() or inflateReset(), and before the first call of inflate().
+   As inflate() processes the gzip stream, head->done is zero until the header
+   is completed, at which time head->done is set to one.  If a zlib stream is
+   being decoded, then head->done is set to -1 to indicate that there will be
+   no gzip header information forthcoming.  Note that Z_BLOCK can be used to
+   force inflate() to return immediately after header processing is complete
+   and before any actual data is decompressed.
+
+      The text, time, xflags, and os fields are filled in with the gzip header
+   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
+   was valid if done is set to one.)  If extra is not Z_NULL, then extra_max
+   contains the maximum number of bytes to write to extra.  Once done is true,
+   extra_len contains the actual extra field length, and extra contains the
+   extra field, or that field truncated if extra_max is less than extra_len.
+   If name is not Z_NULL, then up to name_max characters are written there,
+   terminated with a zero unless the length is greater than name_max.  If
+   comment is not Z_NULL, then up to comm_max characters are written there,
+   terminated with a zero unless the length is greater than comm_max.  When
+   any of extra, name, or comment are not Z_NULL and the respective field is
+   not present in the header, then that field is set to Z_NULL to signal its
+   absence.  This allows the use of deflateSetHeader() with the returned
+   structure to duplicate the header.  However if those fields are set to
+   allocated memory, then the application will need to save those pointers
+   elsewhere so that they can be eventually freed.
+
+      If inflateGetHeader is not used, then the header information is simply
+   discarded.  The header is always checked for validity, including the header
+   CRC if present.  inflateReset() will reset the process to discard the header
+   information.  The application would need to call inflateGetHeader() again to
+   retrieve the header from the next gzip stream.
+
+      inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+   stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
                                         unsigned char FAR *window));
 
      Initialize the internal stream state for decompression using inflateBack()
@@ -744,7 +877,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits,
 typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
 typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
 
-ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
                                     in_func in, void FAR *in_desc,
                                     out_func out, void FAR *out_desc));
 /*
@@ -813,7 +946,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm,
    that inflateBack() cannot return Z_OK.
 */
 
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm));
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
 /*
      All memory allocated by inflateBackInit() is freed.
 
@@ -1087,6 +1220,12 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file));
    input stream, otherwise zero.
 */
 
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+     Returns 1 if file is being read directly without decompression, otherwise
+   zero.
+*/
+
 ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
 /*
      Flushes all pending output if necessary, closes the compressed file
@@ -1119,7 +1258,6 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
 */
 
 ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
    return the updated checksum. If buf is NULL, this function returns
@@ -1135,12 +1273,21 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
      if (adler != original_adler) error();
 */
 
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+                                          z_off_t len2));
+/*
+     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
+   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
+   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.
+*/
+
 ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
 /*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
+     Update a running CRC-32 with the bytes buf[0..len-1] and return the
+   updated CRC-32. If buf is NULL, this function returns the required initial
+   value for the for the crc. Pre- and post-conditioning (one's complement) is
+   performed within this function so it shouldn't be done by the application.
    Usage example:
 
      uLong crc = crc32(0L, Z_NULL, 0);
@@ -1151,6 +1298,16 @@ ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
      if (crc != original_crc) error();
 */
 
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+/*
+     Combine two CRC-32 check values into one.  For two sequences of bytes,
+   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
+   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+   len2.
+*/
+
 
                         /* various hacks, don't look :) */
 
@@ -1167,7 +1324,7 @@ ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
                                       int stream_size));
 ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
                                       const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
                                          unsigned char FAR *window,
                                          const char *version,
                                          int stream_size));
@@ -1189,7 +1346,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
-ZEXTERN const char   * ZEXPORT zError           OF((int err));
+ZEXTERN const char   * ZEXPORT zError           OF((int));
 ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
 ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
 

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
 
@@ -25,13 +26,13 @@ else
 	CFLAGS += -DPAWN_CELL_SIZE=32 
 endif
 
-CFLAGS += -DLINUX -DNDEBUG -fPIC -DHAVE_STDINT_H -DENABLE_BINRELOC -DNO_MAIN -DPAWNC_DLL -static-libgcc
+CFLAGS += -DLINUX -DNDEBUG -DHAVE_STDINT_H -DENABLE_BINRELOC -DNO_MAIN -DPAWNC_DLL -static-libgcc
 
 CFLAGS += $(OPT_FLAGS)
 OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o)
 
 $(BIN_DIR)/%.o: %.c
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
+	$(CPP) $(INCLUDE) $(CFLAGS) -m32 -o $@ -c $<
 
 all:
 	mkdir -p Release32
@@ -40,7 +41,7 @@ all:
 	$(MAKE) pawn_make PAWN64=true
 
 pawn_make: $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(CPP) $(INCLUDE) $(CFLAGS) -m32 $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
 
 debug:	
 	$(MAKE) all DEBUG=true

compiler/libpc300/amx.h

@@ -21,6 +21,15 @@
  *  Version: $Id$
  */
 
+#ifdef _MSC_VER
+	// MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated
+	#if _MSC_VER >= 1400	
+		#define access _access
+		#define chdir _chdir
+		#define stricmp _stricmp
+	#endif
+#endif
+
 #if defined FREEBSD && !defined __FreeBSD__
   #define __FreeBSD__
 #endif
@@ -212,7 +221,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 {
@@ -260,8 +269,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    amx_version   PACKED; /* required version of the AMX */
+  char    file_version; 		/* file format version */
+  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 */

compiler/libpc300/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    amx_version   PACKED; /* required version of the AMX */
+  char    file_version; 		/* file format version */
+  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;
+} 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 */
-} AMX_DBG_FILE          PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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;
+} 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    vclass        PACKED; /* class of symbol (global/local) */
+  char    ident;				/* kind of symbol (function/variable) */
+  char    vclass; 				/* class of symbol (global/local) */
   int16_t dim           PACKED; /* number of dimensions */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_SYMBOL        PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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;
+} AMX_DBG_SYMDIM;
 
 typedef struct tagAMX_DBG_TAG {
   int16_t tag           PACKED; /* tag id */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_TAG           PACKED;
+  const char name[1];			/* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_MACHINE       PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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 */
-} AMX_DBG_STATE         PACKED;
+  const char name[1]; 			/* ASCII string, zero-terminated */
+} 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;
+} AMX_DBG;
 
 #if !defined iVARIABLE
   #define iVARIABLE  1  /* cell that has an address and that can be fetched directly (lvalue) */

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.sln

@@ -1,33 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpc300", "libpc300.vcproj", "{19B72687-080B-437A-917A-12AEB0031635}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Debug32 = Debug32
-		Debug64 = Debug64
-		Release = Release
-		Release32 = Release32
-		Release64 = Release64
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug32|Win32 = Debug32|Win32
+		Debug64|Win32 = Debug64|Win32
+		Release32|Win32 = Release32|Win32
+		Release64|Win32 = Release64|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug.ActiveCfg = Release|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug.Build.0 = Release|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug32.ActiveCfg = Debug32|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug32.Build.0 = Debug32|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug64.ActiveCfg = Debug64|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug64.Build.0 = Debug64|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Release.ActiveCfg = Release|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Release.Build.0 = Release|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Release32.ActiveCfg = Release32|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Release32.Build.0 = Release32|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Release64.ActiveCfg = Release64|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Release64.Build.0 = Release64|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19B72687-080B-437A-917A-12AEB0031635}.Debug32|Win32.ActiveCfg = Debug32|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Debug32|Win32.Build.0 = Debug32|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Debug64|Win32.ActiveCfg = Debug64|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Debug64|Win32.Build.0 = Debug64|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Release32|Win32.ActiveCfg = Release32|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Release32|Win32.Build.0 = Release32|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Release64|Win32.ActiveCfg = Release64|Win32
+		{19B72687-080B-437A-917A-12AEB0031635}.Release64|Win32.Build.0 = Release64|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

compiler/libpc300/libpc300.vcproj

@@ -1,303 +1,335 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="libpc300"
 	ProjectGUID="{19B72687-080B-437A-917A-12AEB0031635}"
 	RootNamespace="libpc300"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/libpc300.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/libpc300.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<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"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/libpc300.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
 		<Configuration
 			Name="Release32|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/amxxpc32.dll"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release64|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=64;NO_MAIN"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=64;NO_MAIN;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/amxxpc64.dll"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug32|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN"
-				MinimalRebuild="TRUE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="1"
 				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/amxxpc32.dll"
 				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/libpc300.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug64|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=64;NO_MAIN"
-				MinimalRebuild="TRUE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=64;NO_MAIN;_CRT_SECURE_NO_DEPRECATE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="1"
 				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/amxxpc64.dll"
 				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/libpc300.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -306,73 +338,103 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\libpawnc.c">
+				RelativePath=".\libpawnc.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc1.c">
+				RelativePath=".\memfile.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc2.c">
+				RelativePath=".\sc1.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc3.c">
+				RelativePath=".\sc2.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc4.c">
+				RelativePath=".\sc3.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc5.c">
+				RelativePath=".\sc4.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc6.c">
+				RelativePath=".\sc5.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sc7.c">
+				RelativePath=".\sc6.c"
+				>
 			</File>
 			<File
-				RelativePath=".\scexpand.c">
+				RelativePath=".\sc7.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sci18n.c">
+				RelativePath=".\scexpand.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sclist.c">
+				RelativePath=".\sci18n.c"
+				>
 			</File>
 			<File
-				RelativePath=".\scmemfil.c">
+				RelativePath=".\sclist.c"
+				>
 			</File>
 			<File
-				RelativePath=".\scstate.c">
+				RelativePath=".\scmemfil.c"
+				>
 			</File>
 			<File
-				RelativePath=".\scvars.c">
+				RelativePath=".\scstate.c"
+				>
+			</File>
+			<File
+				RelativePath=".\scvars.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\amx.h">
+				RelativePath=".\amx.h"
+				>
 			</File>
 			<File
-				RelativePath=".\sc.h">
+				RelativePath=".\memfile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sc.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\libpawnc.rc">
+				RelativePath=".\libpawnc.rc"
+				>
 			</File>
 			<File
-				RelativePath=".\sc5.scp">
+				RelativePath=".\sc5.scp"
+				>
 			</File>
 			<File
-				RelativePath=".\sc7.scp">
+				RelativePath=".\sc7.scp"
+				>
 			</File>
 		</Filter>
 	</Files>

compiler/libpc300/memfile.c

@@ -0,0 +1,109 @@
+#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));
+
+	#if defined _MSC_VER
+	pmf->name = _strdup(name);
+	#else
+	pmf->name = strdup(name);
+	#endif
+
+	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,31 @@
+#ifndef _INCLUDE_MEMFILE_H
+#define _INCLUDE_MEMFILE_H
+
+#ifdef _MSC_VER
+	// MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated
+	#if _MSC_VER >= 1400	
+		#define strdup _strdup
+		#pragma warning(disable : 4996)
+	#endif
+#endif
+
+#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;
@@ -785,6 +785,8 @@ SC_VDECL short sc_is_utf8;    /* is this source file in UTF-8 encoding */
 SC_VDECL constvalue sc_automaton_tab; /* automaton table */
 SC_VDECL constvalue sc_state_tab;     /* state table */
 
+SC_VDECL int pc_anytag;
+
 SC_VDECL FILE *inpf;          /* file read from (source or include) */
 SC_VDECL FILE *inpf_org;      /* main source file */
 SC_VDECL FILE *outf;          /* file written to */