Tagged 1.70

amxmodx/CCmd.cpp

@@ -124,6 +124,8 @@ 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) != 0)); }
+		inline bool gotAccess(int f) const { return (!flags || ((flags & f) == flags)); }
 		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
 		inline bool isViewable() const { return listable; }
 		inline int getFlags() const { return flags; }

amxmodx/CFlagManager.cpp

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

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

@@ -31,9 +31,8 @@
 
 #include "amxmodx.h"
 #include "debugger.h"
-#include "binlog.h"
 
-CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes, int fwd_type)
+CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes)
 {
 	m_FuncName = name;
 	m_ExecType = et;
@@ -43,17 +42,11 @@ 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;
@@ -62,8 +55,6 @@ CForward::CForward(const char *name, ForwardExecType et, int numParams, const Fo
 			m_Funcs.push_back(tmp);
 		}
 	}
-
-	m_Name.assign(name);
 }
 
 cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
@@ -75,6 +66,8 @@ 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++)
@@ -89,7 +82,7 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 				pDebugger->BeginExec();
 			
 			// handle strings & arrays
-			int i;
+			int i, ax = 0;
 			
 			for (i = 0; i < m_NumParams; ++i)
 			{
@@ -130,10 +123,7 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 			}
 			
 			// exec
-			cell retVal = 0;
+			cell retVal;
-#if defined BINLOG_ENABLED
-			g_BinLog.WriteOp(BinLog_CallPubFunc, (*iter).pPlugin->getId(), iter->func);
-#endif
 			int err = amx_Exec(amx, &retVal, iter->func);
 			
 			// log runtime error, if any
@@ -216,18 +206,12 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 
 void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
 {
-	char name[sNAMEMAX];
 	m_Func = func;
 	m_Amx = amx;
 	m_NumParams = numParams;
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = true;
 	isFree = false;
-	name[0] = '\0';
-	amx_GetPublic(amx, func, name);
-	m_Name.assign(name);
-	m_ToDelete = false;
-	m_InExec = false;
 }
 
 void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
@@ -237,9 +221,6 @@ void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const Forwar
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
 	isFree = false;
-	m_Name.assign(funcName);
-	m_ToDelete = false;
-	m_InExec = false;
 }
 
 cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
@@ -252,15 +233,13 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	cell realParams[FORWARD_MAX_PARAMS];
 	cell *physAddrs[FORWARD_MAX_PARAMS];
 
-	if (!m_HasFunc || m_ToDelete)
+	if (!m_HasFunc)
 		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();
@@ -305,9 +284,6 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	
 	// exec
 	cell retVal;
-#if defined BINLOG_ENABLED
-	g_BinLog.WriteOp(BinLog_CallPubFunc, pPlugin->getId(), m_Func);
-#endif
 	int err = amx_Exec(m_Amx, &retVal, m_Func);
 	
 	if (err != AMX_ERR_NONE)
@@ -362,20 +338,16 @@ 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 fwd_type)
+int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam * paramTypes)
 {
 	int retVal = m_Forwards.size() << 1;
-	CForward *tmp = new CForward(funcName, et, numParams, paramTypes, fwd_type);
+	CForward *tmp = new CForward(funcName, et, numParams, paramTypes);
 	
 	if (!tmp)
-	{
 		return -1;				// should be invalid
-	}
 	
 	m_Forwards.push_back(tmp);
 	
@@ -460,43 +432,12 @@ bool CForwardMngr::isIdValid(int id) const
 
 cell CForwardMngr::executeForwards(int id, cell *params)
 {
-	int retVal;
+	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : m_Forwards[id >> 1]->execute(params, m_TmpArrays);
-	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;
 }
 
-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();
@@ -504,10 +445,6 @@ 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);
 }
 
@@ -543,63 +480,20 @@ void CForwardMngr::unregisterSPForward(int id)
 {
 	//make sure the id is valid
 	if (!isIdValid(id) || m_SPForwards.at(id >> 1)->isFree)
-	{
 		return;
-	}
 
-	CSPForward *fwd = m_SPForwards.at(id >> 1);
+	m_SPForwards.at(id >> 1)->isFree = true;
-
+	m_FreeSPForwards.push(id);
-	if (fwd->m_InExec)
-	{
-		fwd->m_ToDelete = true;
-	} else {
-		fwd->isFree = true;
-		m_FreeSPForwards.push(id);
-	}
 }
 
-int CForwardMngr::duplicateSPForward(int id)
+int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num)
-{
-	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, fwd_type);
+	return g_forwards.registerForward(funcName, et, num, params);
 }
 
 int registerForward(const char *funcName, ForwardExecType et, ...)

amxmodx/CForward.h

@@ -51,10 +51,6 @@
 
 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
@@ -97,7 +93,6 @@ class CForward
 	const char *m_FuncName;
 	ForwardExecType m_ExecType;
 	int m_NumParams;
-	String m_Name;
 	
 	struct AMXForward
 	{
@@ -111,7 +106,7 @@ class CForward
 	ForwardParam m_ParamTypes[FORWARD_MAX_PARAMS];
 
 public:
-	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes, int fwd_type=FORWARD_ALL);
+	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes);
 	CForward() {}		// leaves everything unitialized'
 	
 	cell execute(cell *params, ForwardPreparedArray *preparedArrays);
@@ -125,11 +120,6 @@ public:
 	{
 		return m_Funcs.size();
 	}
-
-	const char *getFuncName() const
-	{
-		return m_Name.c_str();
-	}
 	
 	ForwardParam getParamType(int paramId) const
 	{
@@ -143,7 +133,6 @@ public:
 // Single plugin forward
 class CSPForward
 {
-	friend class CForwardMngr;
 	const char *m_FuncName;
 	int m_NumParams;
 	
@@ -152,9 +141,6 @@ class CSPForward
 	
 	int m_Func;
 	bool m_HasFunc;
-	String m_Name;
-	bool m_InExec;
-	bool m_ToDelete;
 
 public:
 	bool isFree;
@@ -174,11 +160,6 @@ public:
 	{
 		return (m_HasFunc) ? 1 : 0;
 	}
-
-	const char *getFuncName() const
-	{
-		return m_Name.c_str();
-	}
 	
 	ForwardParam getParamType(int paramId) const
 	{
@@ -210,15 +191,13 @@ public:
 
 	// Interface
 	// Register normal forward
-	int registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam *paramTypes, int fwd_type=FORWARD_ALL);
+	int registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam *paramTypes);
 	// 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);
@@ -228,7 +207,6 @@ public:
 	bool isSPForward(int id) const;			// check whether forward is single plugin
 	int getParamsNum(int id) const;			// get num of params of a forward
 	int getFuncsNum(int id) const;			// get num of found functions of a forward
-	const char *getFuncName(int id) const;	// get the function name
 	
 	ForwardParam getParamType(int id, int paramId) const;
 	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack);		// prepare array
@@ -236,7 +214,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 fwd_type=FORWARD_ALL);
+int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num);
 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,7 +33,6 @@
 #include "amxmodx.h"
 #include "CLang.h"
 #include "format.h"
-#include "amxmod_compat.h"
 
 #ifdef __linux__
 #define _snprintf snprintf
@@ -48,6 +47,41 @@
 #define INSERT_STRING		3
 #define INSERT_NEWLINE		4
 
+// dictionary format is Fast-Format-Hash-Lookup, v6
+#define MAGIC_HDR			0x4646484C
+#define FFHL_VERSION		6
+#define FFHL_MIN_VERSION	6
+
+/*version history:
+	* 1 (BAILOPAN) - Simplest form possible, no reverse
+	* 2 (BAILOPAN) - One language per file with full reverse
+	* 3 (PM OnoTo) - 2^32 languages per file with full reverse
+	* 4 (BAILOPAN) - Optimized by separating and relocating tables (normalization)
+	* 5 (BAILOPAN) - Removed hash storage
+	* 6 (BAILOPAN) - Arbitrary bump to force reparse.
+FORMAT:
+Magic					4bytes
+Version					1byte
+Number of Keys			4bytes
+Number of Languages		4bytes
+LANG INFO TABLE[]		
+	Language Name		2bytes
+	Offset				4bytes
+KEY TABLE[]
+	Key Lookup Offset	4bytes
+LANGUAGES TABLE[]
+	Language[]
+		Definitions		4bytes
+		Key	#			4bytes	(0-index into key table)
+		Def Offset		4bytes
+KEY LOOKUP TABLE[]
+	Key length			1byte
+	Key string			variable
+DEF LOOKUP TABLE[]
+	Def length			2bytes
+	Def string			variable
+	*/
+
 template<>
 int Compare<String>(const String &k1, const String &k2)
 {
@@ -66,10 +100,7 @@ int HashFunction<String>(const String &k)
 	unsigned long hash = 5381;
 	register const char *str = k.c_str();
 	register char c;
-	while ((c = *str++)) 
+	while (c = *str++) hash = ((hash << 5) + hash) + c; // hash*33 + c
-	{
-		hash = ((hash << 5) + hash) + c; // hash*33 + c
-	}
 	return hash;
 }
 
@@ -79,10 +110,7 @@ int HashAlt<const char *>(char const * const &k)
 	unsigned long hash = 5381;
 	register const char *str = k;
 	register char c;
-	while ((c = *str++)) 
+	while (c = *str++) hash = ((hash << 5) + hash) + c; // hash*33 + c
-	{
-		hash = ((hash << 5) + hash) + c; // hash*33 + c
-	}
 	return hash;
 }
 
@@ -221,11 +249,76 @@ const char * CLangMngr::CLang::GetDef(int key, int &status)
 	return def.definition->c_str();
 }
 
+// Assumes fp is set to the right position
+bool CLangMngr::CLang::SaveDefinitions(FILE *fp, uint32_t &curOffset)
+{
+	unsigned short defLen = 0;
+	String *pdef;
+	
+	THash<int, defentry>::iterator iter;
+	for (iter=m_LookUpTable.begin(); iter!=m_LookUpTable.end(); iter++)
+	{
+		pdef = iter->val.definition;
+		if (!pdef)
+			continue;
+		defLen = pdef->size();
+		fwrite((void *)&defLen, sizeof(unsigned short), 1, fp);
+		curOffset += sizeof(unsigned short);
+		fwrite(pdef->c_str(), sizeof(char), defLen, fp);
+		curOffset += defLen;
+	}
+
+	return true;
+}
+
 int CLangMngr::CLang::Entries()
 {
 	return m_entries;
 }
 
+// Assumes fp is set to the right position
+bool CLangMngr::CLang::Save(FILE *fp, int &defOffset, uint32_t &curOffset)
+{
+	uint32_t keynum = 0;
+	uint32_t size = 0;
+	String *pdef;
+
+	//:TODO: remove this loop and assertion, use m_entries for size
+	THash<int, defentry>::iterator iter;
+	for (iter=m_LookUpTable.begin(); iter!=m_LookUpTable.end(); iter++)
+	{
+		if (iter->val.definition)
+			size++;
+	}
+
+	assert(size == m_entries);
+
+	fwrite((void*)&size, sizeof(uint32_t), 1, fp);
+	curOffset += sizeof(uint32_t);
+
+	for (iter=m_LookUpTable.begin(); iter!=m_LookUpTable.end(); iter++)
+	{
+		keynum = iter->key;
+		pdef = iter->val.definition;
+		if (!pdef)
+			continue;
+		fwrite((void *)&keynum, sizeof(uint32_t), 1, fp);
+		curOffset += sizeof(uint32_t);
+		fwrite((void *)&defOffset, sizeof(uint32_t), 1, fp);
+		curOffset += sizeof(uint32_t);
+		defOffset += sizeof(short);
+		defOffset += pdef->size();
+	}
+
+	return true;
+}
+
+// assumes fp is set to the right position
+bool CLangMngr::CLang::Load(FILE *fp)
+{
+	return true;
+}
+
 /******** CLangMngr *********/
 
 inline String &make_string(const char *str)
@@ -257,9 +350,9 @@ int CLangMngr::GetKeyEntry(const char *key)
 	return val.index;
 }
 
-int CLangMngr::AddKeyEntry(const char *key)
+int CLangMngr::AddKeyEntry(String &key)
 {
-	keytbl_val val;
+    keytbl_val val;
 	val.index = static_cast<int>(KeyList.size());
 
 	String *pString = new String(key);
@@ -270,11 +363,6 @@ int CLangMngr::AddKeyEntry(const char *key)
 	return val.index;
 }
 
-int CLangMngr::AddKeyEntry(String &key)
-{
-    return AddKeyEntry(key.c_str());
-}
-
 int CLangMngr::GetKeyEntry(String &key)
 {
 	keytbl_val &val = KeyTable[key];
@@ -288,27 +376,40 @@ 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)
+	len = atcprintf(outbuf, sizeof(outbuf)-1, addr, amx, params, &parm);
-	{
-		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;
 }
 
+const char *CLangMngr::Format(const char *fmt, ...)
+{
+	va_list ap;
+	va_start(ap, fmt);
+	const char *retVal = FormatString(fmt, ap);
+	va_end(ap);
+	
+	return retVal;
+}
+
+#undef CHECK_PTR
+#undef CHECK_OUTPR
+#undef ZEROTERM
+#undef NEXT_PARAM
+
+#define CHECK_PTR(ptr, start, bufsize) if ((ptr) - (start) >= (bufsize)) { \
+	AMXXLOG_Log("[AMXX] Buffer overflow in formatting"); \
+	outbuf[0] = 0; \
+	return outbuf; }
+#define CHECK_OUTPTR(offset) CHECK_PTR(outptr+offset, outbuf, sizeof(outbuf))
+#define ZEROTERM(buf) buf[(sizeof(buf)/sizeof(buf[0]))-1]=0;
+#define NEXT_PARAM()
+
+//this is not implemented....
+char *CLangMngr::FormatString(const char *fmt, va_list &ap)
+{
+	return "";
+}
+
 void CLangMngr::MergeDefinitions(const char *lang, CQueue<sKeyDef> &tmpVec)
 {
 	CLang * language = GetLang(lang);
@@ -381,7 +482,7 @@ int CLangMngr::MergeDefinitionFile(const char *file)
 	CQueue<sKeyDef> Defq;
 	String buf;
 	char language[3];
-	sKeyDef tmpEntry = {NULL, 0};
+	sKeyDef tmpEntry;
 
 	while (!feof(fp))
 	{
@@ -537,6 +638,286 @@ void CLangMngr::InvalidateCache()
 	FileList.clear();
 }
 
+bool CLangMngr::Save(const char *filename)
+{
+	FILE *fp = fopen(filename, "wb");
+
+	if (!fp)
+		return false;
+
+	uint32_t magic = MAGIC_HDR;
+	unsigned char version = FFHL_VERSION;
+	uint32_t langNum = m_Languages.size();
+	const char *langName = 0;
+	uint32_t curOffset = 0;
+	uint32_t keyNum = KeyList.size();
+	uint32_t ktbSize = KeyList.size() * sizeof(uint32_t);
+	uint32_t ltbSize = m_Languages.size() * ((sizeof(char)*2) + sizeof(uint32_t));
+
+	fwrite((void *)&magic, sizeof(uint32_t), 1, fp);
+	fwrite((void *)&version, sizeof(unsigned char), 1, fp);
+	fwrite((void *)&keyNum, sizeof(uint32_t), 1, fp);
+	fwrite((void *)&langNum, sizeof(uint32_t), 1, fp);
+
+	curOffset += sizeof(uint32_t);
+	curOffset += sizeof(unsigned char);
+	curOffset += sizeof(uint32_t);
+	curOffset += sizeof(uint32_t);
+
+	uint32_t langOffset = curOffset + ktbSize + ltbSize;
+	for (unsigned int i = 0; i < m_Languages.size(); i++)
+	{
+		langName = m_Languages[i]->GetName();
+		fwrite(langName, sizeof(char), 2, fp);
+		curOffset += sizeof(char) * 2;
+		fwrite((void *)&langOffset, sizeof(uint32_t), 1, fp);
+		langOffset += sizeof(uint32_t) + (m_Languages[i]->Entries() * (sizeof(uint32_t) * 2));
+		curOffset += sizeof(uint32_t);
+	}
+	
+	//Note - langOffset now points to the start of key lookup table
+	uint32_t keyHash = 0;
+	uint32_t keyOffset = langOffset;
+	for (unsigned int i = 0; i < KeyList.size(); i++)
+	{
+		fwrite((void*)&keyOffset, sizeof(uint32_t), 1, fp);
+		curOffset += sizeof(uint32_t);
+		keyOffset += sizeof(char);
+		keyOffset += KeyList[i]->size();
+	}
+
+	//Note - now keyOffset points toward the start of the def table
+	int defOffset = keyOffset;
+	for (unsigned int i = 0; i < m_Languages.size(); i++)
+	{
+		m_Languages[i]->Save(fp, defOffset, curOffset);
+	}
+
+	//Now, defOffset points toward the END of the file
+	//curoffset should point toward the key table, so...
+	unsigned char keyLen = 0;
+	for (unsigned int i = 0; i < KeyList.size(); i++)
+	{
+		keyLen = KeyList[i]->size();
+		fwrite((void*)&keyLen, sizeof(unsigned char), 1, fp);
+		curOffset += sizeof(unsigned char);
+		fwrite(KeyList[i]->c_str(), sizeof(char), keyLen, fp);
+		curOffset += sizeof(char) * keyLen;
+	}
+
+	//Finally, write the def table
+	// It's assumed no orders changed...
+	for (unsigned int i = 0; i < m_Languages.size(); i++)
+	{
+		m_Languages[i]->SaveDefinitions(fp, curOffset);
+	}
+
+	fclose(fp);
+
+	//done!
+	return true;
+}
+
+bool CLangMngr::SaveCache(const char *filename)
+{
+	FILE *fp = fopen(filename, "wb");
+	if (!fp)
+	{
+		return false;
+	}
+
+	CVector<md5Pair *>::iterator i;
+	short dictCount = FileList.size();
+	char len = 0;
+	
+	fwrite((void *)&dictCount, sizeof(short), 1, fp);
+
+	for (i = FileList.begin(); i != FileList.end(); i++)
+	{
+		len = (*i)->file.size();
+		fwrite((void *)&len, sizeof(char), 1, fp);
+		fwrite((*i)->file.c_str(), sizeof(char), len, fp);
+		fwrite((*i)->val.c_str(), sizeof(char), 32, fp);
+	}
+
+	fclose(fp);
+
+	return true;
+}
+
+#define CACHEREAD(expr, type) \
+	if (! (expr==1) ) { \
+		FileList.clear(); \
+		fclose(fp); \
+		return false; \
+	}
+#define CACHEREAD_S(expr, size) \
+	if (! (expr==size) ) { \
+		FileList.clear(); \
+		fclose(fp); \
+		return false; \
+	}
+
+bool CLangMngr::LoadCache(const char *filename)
+{
+	FILE *fp = fopen(filename, "rb");
+	if (!fp)
+	{
+		return false;
+	}
+
+	short dictCount = 0;
+	char len = 0;
+	char buf[255];
+	char md5[34];
+	CACHEREAD(fread((void*)&dictCount, sizeof(short), 1, fp), short);
+	md5Pair *p = 0;
+
+	for (int i = 1; i <= dictCount; i++)
+	{
+		CACHEREAD(fread((void*)&len, sizeof(char), 1, fp), char);
+		CACHEREAD_S(fread(buf, sizeof(char), len, fp), len);
+		buf[len] = 0;
+		CACHEREAD_S(fread(md5, sizeof(char), 32, fp), 32);
+		md5[32] = 0;
+		p = new md5Pair;
+		p->file.assign(buf);
+		p->val.assign(md5);
+		FileList.push_back(p);
+		p = 0;
+	}
+
+	fclose(fp);
+
+	return true;
+}
+
+#define DATREAD(expr, type) \
+	if (! (expr==1) ) { \
+		Clear(); \
+		fclose(fp); \
+		return false; \
+	}
+#define DATREAD_S(expr, size) \
+	if (! (expr==size) ) { \
+		Clear(); \
+		fclose(fp); \
+		return false; \
+	}
+
+bool CLangMngr::Load(const char *filename)
+{
+	Clear();
+
+	FILE *fp = fopen(filename, "rb");
+	
+	if (!fp)
+		return false;
+
+	uint32_t magic = 0;
+	uint32_t langCount = 0;
+	uint32_t keycount = 0;
+	char version = 0;
+
+	fseek(fp, 0, SEEK_END);
+	long size = ftell(fp);
+	rewind(fp);
+
+	DATREAD(fread((void*)&magic, sizeof(uint32_t), 1, fp), uint32_t);
+	if (magic != MAGIC_HDR)
+		return false;
+
+	DATREAD(fread((void*)&version, sizeof(char), 1, fp), char);
+	if (version > FFHL_VERSION || version < FFHL_MIN_VERSION)
+		return false;
+
+	DATREAD(fread((void*)&keycount, sizeof(uint32_t), 1, fp), uint32_t);
+	DATREAD(fread((void*)&langCount, sizeof(uint32_t), 1, fp), uint32_t);
+
+	uint32_t *LangOffsets = new uint32_t[langCount];
+	char langname[3];
+	
+	for (unsigned int i = 0; i < langCount; i++)
+	{
+		DATREAD_S(fread(langname, sizeof(char), 2, fp), 2);
+		langname[2] = 0;
+		GetLang(langname);	//this will initialize for us
+		DATREAD(fread((void *)&(LangOffsets[i]), sizeof(uint32_t), 1, fp), uint32_t);
+	}
+
+	//we should now be at the key table
+	int ktbOffset = ftell(fp);
+	unsigned char keylen;
+	char keybuf[255];
+	uint32_t bogus;
+	uint32_t keyoffset, save;
+	String _tmpkey;
+	
+	for (unsigned i = 0; i < keycount; i++)
+	{
+		if (version == 4)
+			fread((void*)&(bogus), sizeof(uint32_t), 1, fp);
+		DATREAD(fread((void*)&keyoffset, sizeof(uint32_t), 1, fp), uint32_t);
+		if (keyoffset > size-sizeof(uint32_t))
+		{
+			Clear();
+			fclose(fp);
+			return false;
+		}
+		save = ftell(fp);
+		fseek(fp, keyoffset, SEEK_SET);
+		DATREAD(fread((void*)&keylen, sizeof(char), 1, fp), char);
+		DATREAD_S(fread(keybuf, sizeof(char), keylen, fp), keylen);
+		keybuf[keylen] = 0;
+		_tmpkey.assign(keybuf);
+		AddKeyEntry(_tmpkey);
+		fseek(fp, save, SEEK_SET);		//bring back to next key
+	}
+
+	//we should now be at the languages table
+	uint32_t numentries;
+	uint32_t keynum;
+	uint32_t defoffset;
+	unsigned short deflen;
+	char valbuf[4096];
+	
+	for (unsigned int i = 0; i < langCount; i++)
+	{
+		DATREAD(fread((void*)&numentries, sizeof(uint32_t), 1, fp), uint32_t);
+		
+		for (unsigned int j = 0; j < numentries; j++)
+		{
+			DATREAD(fread((void *)&keynum, sizeof(uint32_t), 1, fp), uint32_t);
+			if (version == 4)
+			{
+				DATREAD(fread((void *)&bogus, sizeof(uint32_t), 1, fp), uint32_t);
+			}
+			DATREAD(fread((void *)&defoffset, sizeof(uint32_t), 1, fp), uint32_t);
+			if (defoffset > size-sizeof(uint32_t))
+			{
+				Clear();
+				fclose(fp);
+				return false;
+			}
+			save = ftell(fp);
+			fseek(fp, defoffset, SEEK_SET);
+			DATREAD(fread((void *)&deflen, sizeof(unsigned short), 1, fp), short);
+			//:TODO: possible string overflow here.
+			DATREAD_S(fread(valbuf, sizeof(char), deflen, fp), deflen);
+			valbuf[deflen] = 0;
+			m_Languages[i]->AddEntry(keynum, valbuf);
+			fseek(fp, save, SEEK_SET);	//bring back to next entry
+		}
+	}
+
+	fclose(fp);
+
+	delete [] LangOffsets;
+	
+    //we're done!
+	return true;
+}
+
 CLangMngr::~CLangMngr()
 {
 	Clear();
@@ -598,7 +979,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

@@ -111,6 +111,11 @@ class CLangMngr
 		
 		// Get language name
 		const char *GetName() { return m_LanguageName; }
+		// Save to file
+		bool Save(FILE *fp, int &defOffset, uint32_t &curOffset);
+		bool SaveDefinitions(FILE *fp, uint32_t &curOffset);
+		// Load
+		bool Load(FILE *fp);
 		void SetMngr(CLangMngr *l) { m_LMan = l; }
 		// Get number of entries
 		int Entries();
@@ -127,11 +132,9 @@ 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);
 
@@ -156,17 +159,27 @@ public:
 	int MergeDefinitionFile(const char *file);
 	// Get a definition from a lang name and a key
 	const char *GetDef(const char *langName, const char *key, int &status);
+	// Format a string
+	const char *Format(const char *src, ...);
 	// Format a string for an AMX plugin
 	char *FormatAmxString(AMX *amx, cell *params, int parm, int &len);
+	char *FormatString(const char *fmt, va_list &ap);
+	// Save
+	bool Save(const char *filename);
+	// Load
+	bool Load(const char *filename);
+	// Cache
+	bool LoadCache(const char *filename);
+	bool SaveCache(const char *filename);
 	void InvalidateCache();
 	// 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,15 +35,13 @@
 // *****************************************************
 // class MenuMngr
 // *****************************************************
-MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f, bool new_menu)
+MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f)
 {
 	plugin = a;
 	keys = k;
 	menuid = mi;
-	next = 0;
-	is_new_menu = new_menu;
-
 	function = f;
+	next = 0;
 }
 
 MenuMngr::~MenuMngr() 
@@ -63,47 +61,66 @@ 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, bool from_new_menu) 
+void MenuMngr::registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f) 
 {
-	MenuCommand **temp = &headcmd;
+	MenuCommand** temp = &headcmd;
-	if (from_new_menu)
+	while (*temp) temp = &(*temp)->next;
-	{
+	*temp = new MenuCommand(a, mi, k, f);
-		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()
@@ -123,13 +140,4 @@ 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,34 +66,29 @@ private:
 		int menuid;
 		int keys;
 		int function;
-		int is_new_menu;
 		
 		MenuCommand* next;
-		MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f, bool new_menu=false);
+		MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f);
 	public:
 		inline int getFunction() { return function; }
 		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
-		inline bool matchCommand(int m, int k)
+		inline bool matchCommand(int m, int k) { return ((m == menuid) && (keys & k)); }
-		{
-			return ((m == menuid) && (keys & k));
-		}
 	} *headcmd;
 	
 public:
-	MenuMngr() : m_watch_iter(end())
+	MenuMngr() { headid = 0; headcmd = 0; }
-		{ headid = NULL; headcmd = NULL; }
 	~MenuMngr();
 
 	// Interface
 
 	int findMenuId(const char* name, AMX* a = 0);
 	int registerMenuId(const char* n, AMX* a);
-	void registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f, bool from_new_menu=false);
+	void removeMenuId(int id);
+	void registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f);
 	void clear();
 
 	class iterator
 	{
-		friend class MenuMngr;
 		MenuCommand* a;
 	public:
 		iterator(MenuCommand*aa) : a(aa) {}
@@ -106,13 +101,6 @@ 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,6 +40,7 @@ void CPlayer::Init(edict_t* e, int i)
 	pEdict = e;
 	initialized = false;
 	ingame = false;
+	bot = false;
 	authorized = false;
 
 	current = 0;
@@ -87,6 +88,7 @@ void CPlayer::Disconnect()
 	}
 	queries.clear();
 
+	bot = 0;
 	menu = 0;
 	newmenu = -1;
 }
@@ -115,6 +117,7 @@ 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,7 +58,6 @@ 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;
 };
 
 // *****************************************************
@@ -84,6 +83,7 @@ public:
 
 	bool initialized;
 	bool ingame;
+	bool bot;
 	bool authorized;
 	bool vgui;	
 
@@ -118,6 +118,7 @@ public:
 	cell hudmap[5];
 	
 	Vector lastTrace;
+	Vector thisTrace;
 	Vector lastHit;
 	
 	List<ClientCvarQuery_Info *> queries;
@@ -130,18 +131,7 @@ public:
 
 	inline bool IsBot()
 	{
-		if ((pEdict->v.flags & FL_FAKECLIENT) == FL_FAKECLIENT)
+		return ((pEdict->v.flags & FL_FAKECLIENT) ? true : false);
-		{
-			return true;
-		}
-		
-		const char *auth = GETPLAYERAUTHID(pEdict); 	 
-		if (auth && (strcmp(auth, "BOT") == 0)) 	 
-		{
-			return true;
-		}
-		
-		return false;
 	}
 
 	inline bool IsAlive()
@@ -296,87 +286,4 @@ 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

@@ -30,7 +30,6 @@
 */
 
 #include "amxmodx.h"
-#include "libraries.h"
 
 #ifndef FAR
 	#define FAR
@@ -39,12 +38,9 @@
 // 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);
-typedef void (*PLUGINSUNLOADED_NEW)(void);
-typedef void (*PLUGINSUNLOADING_NEW)(void);
 
 // *****************************************************
 // class CModule
@@ -83,14 +79,7 @@ void CModule::clear(bool clearFilename)
 	m_InfoNew.reload = 0;
 	m_MissingFunc = NULL;
 
-	for (size_t i=0; i<m_DestroyableIndexes.size(); i++)
-	{
-		delete [] m_Natives[m_DestroyableIndexes[i]];
-	}
-
-	m_DestroyableIndexes.clear();
 	m_Natives.clear();
-	m_NewNatives.clear();
 }
 
 bool CModule::attachMetamod(const char *mmfile, PLUG_LOADTIME now)
@@ -113,53 +102,6 @@ bool CModule::attachMetamod(const char *mmfile, PLUG_LOADTIME now)
 	return true;
 }
 
-//this ugly function is ultimately something like O(n^4).
-//sigh.  it shouldn't be needed.
-void CModule::rewriteNativeLists(AMX_NATIVE_INFO *list)
-{
-	AMX_NATIVE_INFO *curlist;
-	for (size_t i=0; i<m_Natives.size(); i++)
-	{
-		curlist = m_Natives[i];
-		bool changed = false;
-		bool found = false;
-		CVector<size_t> newlist;
-		for (size_t j=0; curlist[j].func != NULL; j++)
-		{
-			found = false;
-			for (size_t k=0; list[k].func != NULL; k++)
-			{
-				if (strcmp(curlist[j].name, list[k].name) == 0)
-				{
-					found = true;
-					break;
-				}
-			}
-			if (found)
-			{
-				changed = true;
-				//don't break, we have to search it all
-			} else {
-				newlist.push_back(j);
-			}
-		}
-		if (changed)
-		{
-			//now build the new list
-			AMX_NATIVE_INFO *rlist = new AMX_NATIVE_INFO[newlist.size()+1];
-			for (size_t j=0; j<newlist.size(); j++)
-			{
-				rlist[j].func = curlist[newlist[j]].func;
-				rlist[j].name = curlist[newlist[j]].name;
-			}
-			rlist[newlist.size()].func = NULL;
-			rlist[newlist.size()].name = NULL;
-			m_Natives[i] = rlist;
-			m_DestroyableIndexes.push_back(i);
-		}
-	}
-}
-
 bool CModule::attachModule()
 {
 	// old & new
@@ -184,7 +126,7 @@ bool CModule::attachModule()
 		{
 			case AMXX_OK:
 				m_Status = MODULE_LOADED;
-				break;
+				return true;
 			case AMXX_PARAM:
 				AMXXLOG_Log("[AMXX] Internal Error: Module \"%s\" (version \"%s\") retured \"Invalid parameter\" from Attach func.", m_Filename.c_str(), getVersion());
 				m_Status = MODULE_INTERROR;
@@ -202,13 +144,6 @@ bool CModule::attachModule()
 		m_Status = MODULE_BADLOAD;
 	}
 
-	if (m_Status == MODULE_LOADED)
-	{
-		AddLibrariesFromString(m_InfoNew.library, LibType_Library, LibSource_Module, this);
-		AddLibrariesFromString(m_InfoNew.libclass, LibType_Class, LibSource_Module, this);
-		return true;
-	}
-
 	return false;
 }
 
@@ -220,9 +155,6 @@ 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;
 	}
@@ -252,36 +184,10 @@ bool CModule::queryModule()
 				return false;
 			case AMXX_IFVERS:
 				if (ifVers < AMXX_INTERFACE_VERSION)
-				{
+					m_Status = MODULE_OLD;
-					//backwards compat for new defs
+				else
-					if (ifVers == 3)
-					{
-						g_ModuleCallReason = ModuleCall_Query;
-						g_CurrentlyCalledModule = this;
-						retVal = (*queryFunc_New)(&ifVers, &m_InfoNew);
-                        g_CurrentlyCalledModule = NULL;
-						g_ModuleCallReason = ModuleCall_NotCalled;
-						if (retVal == AMXX_OK)
-						{
-							m_InfoNew.library = m_InfoNew.logtag;
-							if (StrCaseStr(m_InfoNew.library, "sql") 
-								|| StrCaseStr(m_InfoNew.library, "dbi"))
-							{
-								m_InfoNew.libclass = "DBI";
-							} else {
-								m_InfoNew.libclass = "";
-							}
-							break;
-						}
-						return false;
-					} else {
-						m_Status = MODULE_OLD;
-						return false;
-					}
-				} else {
 					m_Status = MODULE_NEWER;
-					return false;
+				return false;
-				}
 			case AMXX_OK:
 				break;
 			default:
@@ -297,33 +203,6 @@ 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 {
@@ -338,8 +217,6 @@ bool CModule::detachModule()
 	if (m_Status != MODULE_LOADED)
 		return false;
 
-	RemoveLibraries(this);
-
 	if (m_Amxx)
 	{
 		DETACHMOD_NEW detachFunc_New = (DETACHMOD_NEW)DLPROC(m_Handle, "AMXX_Detach");
@@ -367,38 +244,6 @@ bool CModule::detachModule()
 	return true;
 }
 
-void CModule::CallPluginsUnloaded()
-{
-	if (m_Status != MODULE_LOADED)
-		return;
-
-	if (!m_Handle)
-		return;
-
-	PLUGINSUNLOADED_NEW func = (PLUGINSUNLOADED_NEW)DLPROC(m_Handle, "AMXX_PluginsUnloaded");
-
-	if (!func)
-		return;
-
-	func();
-}
-
-void CModule::CallPluginsUnloading()
-{
-	if (m_Status != MODULE_LOADED)
-		return;
-
-	if (!m_Handle)
-		return;
-
-	PLUGINSUNLOADING_NEW func = (PLUGINSUNLOADING_NEW)DLPROC(m_Handle, "AMXX_PluginsUnloading");
-
-	if (!func)
-		return;
-
-	func();
-}
-
 void CModule::CallPluginsLoaded()
 {
 	if (m_Status != MODULE_LOADED)
@@ -431,7 +276,6 @@ 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,8 +49,7 @@ 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
@@ -60,8 +59,6 @@ struct amxx_module_info_s
 	const char *version;
 	int reload;				// reload on mapchange when nonzero
 	const char *logtag;		//added in version 2
-	const char *library;	// added in version 4
-	const char *libclass;	// added in version 4
 };
 
 #define AMXX_OK					0			/* no error */
@@ -69,10 +66,7 @@ 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_INTERFACE_VERSION	3
-#define AMXX_GAME_BAD			1			/* Module cannot load on this game. */
-
-#define AMXX_INTERFACE_VERSION	4
 
 class CModule 
 {
@@ -96,7 +90,6 @@ public:
 	bool attachModule();
 	bool queryModule();
 	bool detachModule();
-	void rewriteNativeLists(AMX_NATIVE_INFO *list);
 
 #ifndef FAKEMETA
 	bool attachMetamod(const char *mmfile, PLUG_LOADTIME now);
@@ -117,12 +110,8 @@ public:
 	inline bool IsMetamod() { return m_Metamod; }
 	
 	void CallPluginsLoaded();
-	void CallPluginsUnloaded();
-	void CallPluginsUnloading();
 
-	CVector<AMX_NATIVE_INFO*> m_Natives;
+	CList<AMX_NATIVE_INFO*> m_Natives;
-	CVector<AMX_NATIVE_INFO*> m_NewNatives; // Natives for new (AMXX, not AMX) plugins only
-	CVector<size_t> m_DestroyableIndexes;
 };
 
 #endif //CMODULE_H

amxmodx/CPlugin.cpp

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

amxmodx/CPlugin.h

@@ -32,11 +32,6 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include "CString.h"
-#include "sh_list.h"
-#include "amx.h"
-#include "amxxfile.h"
-
 // *****************************************************
 // class CPluginMngr
 // *****************************************************
@@ -71,7 +66,6 @@ public:
 		String author;
 		String errorMsg;
 		
-		unsigned int failcounter;
 		int m_PauseFwd;
 		int m_UnpauseFwd;
 		int paused_fun;
@@ -99,11 +93,9 @@ 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);
@@ -119,7 +111,7 @@ private:
 	int pCounter;
 public:
 	CPluginMngr() { head = 0; pCounter = 0; pNatives = NULL; m_Finalized=false;}
-	~CPluginMngr() { clear(); InvalidateCache(); }
+	~CPluginMngr() { clear(); }
 
 	bool m_Finalized;
 	AMX_NATIVE_INFO *pNatives;
@@ -128,7 +120,7 @@ public:
 
 	CPlugin* loadPlugin(const char* path, const char* name, char* error, int debug);
 	void unloadPlugin(CPlugin** a);
-	int loadPluginsFromFile(const char* filename, bool warn=true);
+	int loadPluginsFromFile(const char* filename);
 	
 	inline CPlugin* findPluginFast(AMX *amx) { return (CPlugin*)(amx->userdata[UD_FINDPLUGIN]); }
 	CPlugin* findPlugin(AMX *amx);
@@ -153,22 +145,6 @@ public:
 	
 	inline iterator begin() const { return iterator(head); }
 	inline iterator end() const { return iterator(0); }
-public:
-	struct plcache_entry
-	{
-		CAmxxReader *file;
-		size_t bufsize;
-		char *buffer;
-		String path;
-	};
-	char *ReadIntoOrFromCache(const char *file, size_t &bufsize);
-	void InvalidateCache();
-	void InvalidateFileInCache(const char *file, bool freebuf);
-	void CacheAndLoadModules(const char *plugin);
-	void CALMFromFile(const char *file);
-private:
-	List<plcache_entry *> m_plcache;
-	List<String *> m_BlockList;
 };
 
 #endif //PLUGIN_H

amxmodx/CString.h

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

amxmodx/CTask.cpp

@@ -34,6 +34,16 @@
 
 /*********************** CTask ***********************/
 
+int CTaskMngr::CTask::getTaskId() const
+{
+	return m_iId;
+}
+
+CPluginMngr::CPlugin *CTaskMngr::CTask::getPlugin() const
+{
+	return m_pPlugin;
+}
+
 void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
 {
 	clear();
@@ -43,7 +53,6 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 	m_iFunc = iFunc;
 	m_iId = iId;
 	m_fBase = fBase;
-	m_bInExecute = false;
 
 	if (iFlags & 2)
 	{
@@ -141,7 +150,6 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 		//only bother calling if we have something to call
 		if (!(m_bLoop && !m_iRepeat))
 		{
-			m_bInExecute = true;
 			if (m_iParamLen)	// call with parameters
 			{
 				cell arr = prepareCellArray(m_pParams, m_iParamLen);
@@ -149,7 +157,6 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 			} else {
 				executeForwards(m_iFunc, m_iId);
 			}
-			m_bInExecute = false;
 		}
 	
 		if (isFree())
@@ -186,7 +193,6 @@ CTaskMngr::CTask::CTask()
 	m_bLoop = false;
 	m_bAfterStart =	false;
 	m_bBeforeEnd = false;
-	m_bInExecute = false;
 
 	m_fNextExecTime = 0.0f;
 

amxmodx/CTask.h

@@ -45,7 +45,6 @@ private:
 		int m_iFunc;
 		int m_iRepeat;
 		
-		bool m_bInExecute;
 		bool m_bLoop;
 		bool m_bAfterStart;
 		bool m_bBeforeEnd;
@@ -62,15 +61,13 @@ private:
 		void clear();
 		bool isFree() const;
 
-		inline CPluginMngr::CPlugin *getPlugin() const { return m_pPlugin; }
+		CPluginMngr::CPlugin *getPlugin() const;
-		inline AMX *getAMX() const { return m_pPlugin->getAMX(); }
+		int getTaskId() const;
-		inline int getTaskId() const { return m_iId; }
 
 		void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
 
 		void changeBase(float fNewBase);
 		void resetNextExecTime(float fCurrentTime);
-		inline bool inExecute() const { return m_bInExecute; }
 
 		bool shouldRepeat();
 
@@ -95,11 +92,9 @@ private:
 		friend bool operator == (const CTask &left, const CTaskDescriptor &right)
 		{
 			if (right.m_bFree)
-				return (left.isFree() && !left.inExecute());
+				return left.isFree();
 			
-			return (!left.isFree()) && 
+			return !left.isFree() && (right.m_pAmx ? left.getPlugin()->getAMX() == right.m_pAmx : true) && left.getTaskId() == right.m_iId;
-					(right.m_pAmx ? left.getAMX() == right.m_pAmx : true) && 
-					(left.getTaskId() == right.m_iId);
 		}
 	};
 

amxmodx/CVector.h

@@ -37,20 +37,12 @@
 // Vector
 template <class T> class CVector
 {
-	bool Grow(size_t amount)
+	bool Grow()
 	{
 		// 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;
@@ -65,16 +57,12 @@ template <class T> class CVector
 		return true;
 	}
 
-	bool GrowIfNeeded(size_t amount)
+	bool GrowIfNeeded()
 	{
-		if (m_CurrentUsedSize + amount >= m_Size)
+		if (m_CurrentUsedSize >= m_Size)
-		{
+			return Grow();
-			return Grow(amount);
-		}
 		else
-		{
 			return true;
-		}
 	}
 
 	bool ChangeSize(size_t size)
@@ -341,13 +329,14 @@ public:
 
 	bool push_back(const T & elem)
 	{
-		if (!GrowIfNeeded(1))
+		++m_CurrentUsedSize;
+		if (!GrowIfNeeded())
 		{
+			--m_CurrentUsedSize;
 			return false;
 		}
 
-		m_Data[m_CurrentUsedSize++] = elem;
+		m_Data[m_CurrentUsedSize - 1] = elem;
-
 		return true;
 	}
 
@@ -445,13 +434,13 @@ public:
 
 		size_t ofs = where - begin();
 
-		if (!GrowIfNeeded(1))
+		++m_CurrentUsedSize;
+		if (!GrowIfNeeded())
 		{
+			--m_CurrentUsedSize;
 			return false;
 		}
 
-		++m_CurrentUsedSize;
-
 		where = begin() + ofs;
 
 		// Move subsequent entries

amxmodx/Makefile

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

amxmodx/amx.cpp

@@ -22,9 +22,9 @@
  */
 
 #define AMX_NODYNALOAD
-#define AMX_ANSIONLY
+#define	AMX_ANSIONLY
 
-#if !defined __linux__ && BUILD_PLATFORM == WINDOWS && BUILD_TYPE == RELEASE && BUILD_COMPILER == MSVC && PAWN_CELL_SIZE == 64
+#if 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
@@ -462,24 +462,8 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
 
   amx->error=AMX_ERR_NONE;
 
-#if defined BINLOG_ENABLED
-  binlogfuncs_t *logfuncs = (binlogfuncs_t *)amx->usertags[UT_BINLOGS];
-  if (logfuncs)
-  {
-	  logfuncs->pfnLogNative(amx, index, (int)(params[0] / sizeof(cell)));
-	  logfuncs->pfnLogParams(amx, params);
-  }
-#endif //BINLOG_ENABLED
-
   *result = f(amx,params);
 
-#if defined BINLOG_ENABLED
-  if (logfuncs)
-  {
-	  logfuncs->pfnLogReturn(amx, *result);
-  }
-#endif
-
   return amx->error;
 }
 #endif /* defined AMX_INIT */
@@ -803,7 +787,7 @@ static void expand(unsigned char *code, long codesize, long memsize)
     do {
       codesize--;
       /* no input byte should be shifted out completely */
-      assert(shift<static_cast<int>(8*sizeof(cell)));
+      assert(shift<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);
@@ -844,6 +828,19 @@ int AMXAPI amx_Init(AMX *amx, void *program)
 {
   AMX_HEADER *hdr;
   BROWSEHOOK hook = NULL;
+  #if (defined _Windows || defined LINUX || defined __FreeBSD__ || defined __OpenBSD__) && !defined AMX_NODYNALOAD
+    char libname[sNAMEMAX+8];  /* +1 for '\0', +3 for 'amx' prefix, +4 for extension */
+    #if defined _Windows
+      typedef int (FAR WINAPI *AMX_ENTRY)(AMX _FAR *amx);
+      HINSTANCE hlib;
+    #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
+      typedef int (*AMX_ENTRY)(AMX *amx);
+      void *hlib;
+    #endif
+    int numlibraries,i;
+    AMX_FUNCSTUB *lib;
+    AMX_ENTRY libinit;
+  #endif
 
   if ((amx->flags & AMX_FLAG_RELOC)!=0)
     return AMX_ERR_INIT;  /* already initialized (may not do so twice) */
@@ -853,6 +850,22 @@ int AMXAPI amx_Init(AMX *amx, void *program)
    * multi-byte words
    */
   assert(check_endian());
+  #if BYTE_ORDER==BIG_ENDIAN
+    amx_Align32((uint32_t*)&hdr->size);
+    amx_Align16(&hdr->magic);
+    amx_Align16((uint16_t*)&hdr->flags);
+    amx_Align16((uint16_t*)&hdr->defsize);
+    amx_Align32((uint32_t*)&hdr->cod);
+    amx_Align32((uint32_t*)&hdr->dat);
+    amx_Align32((uint32_t*)&hdr->hea);
+    amx_Align32((uint32_t*)&hdr->stp);
+    amx_Align32((uint32_t*)&hdr->cip);
+    amx_Align32((uint32_t*)&hdr->publics);
+    amx_Align32((uint32_t*)&hdr->natives);
+    amx_Align32((uint32_t*)&hdr->libraries);
+    amx_Align32((uint32_t*)&hdr->pubvars);
+    amx_Align32((uint32_t*)&hdr->tags);
+  #endif
 
   if (hdr->magic!=AMX_MAGIC)
     return AMX_ERR_FORMAT;
@@ -873,7 +886,13 @@ int AMXAPI amx_Init(AMX *amx, void *program)
   } /* if */
   if (hdr->stp<=0)
     return AMX_ERR_FORMAT;
-
+  #if BYTE_ORDER==BIG_ENDIAN
+    if ((hdr->flags & AMX_FLAG_COMPACT)==0) {
+      ucell *code=(ucell *)((unsigned char *)program+(int)hdr->cod);
+      while (code<(ucell *)((unsigned char *)program+(int)hdr->hea))
+        swapcell(code++);
+    } /* if */
+  #endif
   assert((hdr->flags & AMX_FLAG_COMPACT)!=0 || hdr->hea == hdr->size);
   if ((hdr->flags & AMX_FLAG_COMPACT)!=0) {
     #if AMX_COMPACTMARGIN > 2
@@ -900,12 +919,108 @@ int AMXAPI amx_Init(AMX *amx, void *program)
     amx->callback=amx_Callback;
   amx->data=NULL;
 
+  /* also align all addresses in the public function, public variable,
+   * public tag and native function tables --offsets into the name table
+   * (if present) must also be swapped.
+   */
+  #if BYTE_ORDER==BIG_ENDIAN
+  { /* local */
+    AMX_FUNCSTUB *fs;
+    int i,num;
+
+    fs=GETENTRY(hdr,natives,0);
+    num=NUMENTRIES(hdr,natives,libraries);
+    for (i=0; i<num; i++) {
+      amx_AlignCell(&fs->address);      /* redundant, because it should be zero */
+      if (USENAMETABLE(hdr))
+        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
+    fs=GETENTRY(hdr,publics,0);
+    assert(hdr->publics<=hdr->natives);
+    num=NUMENTRIES(hdr,publics,natives);
+    for (i=0; i<num; i++) {
+      amx_AlignCell(&fs->address);
+      if (USENAMETABLE(hdr))
+        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
+    fs=GETENTRY(hdr,pubvars,0);
+    assert(hdr->pubvars<=hdr->tags);
+    num=NUMENTRIES(hdr,pubvars,tags);
+    for (i=0; i<num; i++) {
+      amx_AlignCell(&fs->address);
+      if (USENAMETABLE(hdr))
+        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+
+    fs=GETENTRY(hdr,tags,0);
+    if (hdr->file_version<7) {
+      assert(hdr->tags<=hdr->cod);
+      num=NUMENTRIES(hdr,tags,cod);
+    } else {
+      assert(hdr->tags<=hdr->nametable);
+      num=NUMENTRIES(hdr,tags,nametable);
+    } /* if */
+    for (i=0; i<num; i++) {
+      amx_AlignCell(&fs->address);
+      if (USENAMETABLE(hdr))
+        amx_AlignCell(&((AMX_FUNCSTUBNT*)fs)->nameofs);
+      fs=(AMX_FUNCSTUB*)((unsigned char *)fs+hdr->defsize);
+    } /* for */
+  } /* local */
+  #endif
+
   /* relocate call and jump instructions */
   hook = (BROWSEHOOK)amx->usertags[UT_BROWSEHOOK];
   if (hook)
 	  hook(amx, NULL, NULL);
   amx_BrowseRelocate(amx);
 
+  /* load any extension modules that the AMX refers to */
+  #if (defined _Windows || defined LINUX || defined __FreeBSD__ || defined __OpenBSD__) && !defined AMX_NODYNALOAD
+    hdr=(AMX_HEADER *)amx->base;
+    numlibraries=NUMENTRIES(hdr,libraries,pubvars);
+    for (i=0; i<numlibraries; i++) {
+      lib=GETENTRY(hdr,libraries,i);
+      strcpy(libname,"amx");
+      strcat(libname,GETENTRYNAME(hdr,lib));
+      #if defined _Windows
+        strcat(libname,".dll");
+        #if defined __WIN32__
+          hlib=LoadLibraryA(libname);
+        #else
+          hlib=LoadLibrary(libname);
+          if (hlib<=HINSTANCE_ERROR)
+            hlib=NULL;
+        #endif
+      #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
+        strcat(libname,".so");
+        hlib=dlopen(libname,RTLD_NOW);
+      #endif
+      if (hlib!=NULL) {
+        /* a library that cannot be loaded or that does not have the required
+         * initialization function is simply ignored
+         */
+        char funcname[sNAMEMAX+9]; /* +1 for '\0', +4 for 'amx_', +4 for 'Init' */
+        strcpy(funcname,"amx_");
+        strcat(funcname,GETENTRYNAME(hdr,lib));
+        strcat(funcname,"Init");
+        #if defined _Windows
+          libinit=(AMX_ENTRY)GetProcAddress(hlib,funcname);
+        #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
+          libinit=(AMX_ENTRY)dlsym(hlib,funcname);
+        #endif
+        if (libinit!=NULL)
+          libinit(amx);
+      } /* if */
+      lib->address=(ucell)hlib;
+    } /* for */
+  #endif
+
   return AMX_ERR_NONE;
 }
 
@@ -973,25 +1088,26 @@ 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;
-	/* also put a sentinel for strings at the top the stack */
+    amx->hea = hdr->hea;
-	*(cell *)((char*)native_code + hdr->dat + amx->stp - sizeof(cell)) = 0;
+    amx->stp = hdr->stp - sizeof(cell);
-	/* update the required memory size (the previous value was a
+    /* also put a sentinel for strings at the top the stack */
-	 * conservative estimate, now we know the exact size)
+    *(cell *)((char*)native_code + hdr->dat + hdr->stp - sizeof(cell)) = 0;
-	 */
+    amx->stk = amx->stp;
-	amx->code_size = (hdr->dat + amx->stp + sizeof(cell)) & ~3;
   } /* if */
 
   return (res == 0) ? AMX_ERR_NONE : AMX_ERR_INIT_JIT;
@@ -1480,36 +1596,6 @@ int AMXAPI amx_RegisterToAny(AMX *amx, AMX_NATIVE f)
   return err;
 }
 
-int AMXAPI amx_Reregister(AMX *amx, const AMX_NATIVE_INFO *list, int number)
-{
-  AMX_FUNCSTUB *func;
-  AMX_HEADER *hdr;
-  int i,numnatives,count=0;
-  AMX_NATIVE funcptr;
-
-  hdr=(AMX_HEADER *)amx->base;
-  assert(hdr!=NULL);
-  assert(hdr->magic==AMX_MAGIC);
-  assert(hdr->natives<=hdr->libraries);
-  numnatives=NUMENTRIES(hdr,natives,libraries);
-
-  count=0;
-  func=GETENTRY(hdr,natives,0);
-  for (i=0; i<numnatives; i++) {
-    if (func->address!=0) {
-      /* this function is located */
-      funcptr=(list!=NULL) ? findfunction(GETENTRYNAME(hdr,func),list,number) : NULL;
-      if (funcptr!=NULL)
-      {
-        func->address=(ucell)funcptr;
-        count++;
-      }
-    } /* if */
-    func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
-  } /* for */
-  return count;
-}
-
 int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *list, int number)
 {
   AMX_FUNCSTUB *func;
@@ -1530,12 +1616,12 @@ int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *list, int number)
       /* this function is not yet located */
       funcptr=(list!=NULL) ? findfunction(GETENTRYNAME(hdr,func),list,number) : NULL;
       if (funcptr!=NULL)
-      {
+	  {
         func->address=(ucell)funcptr;
       } else {
         no_function = GETENTRYNAME(hdr,func);
         err=AMX_ERR_NOTFOUND;
-       }
+	  }
     } /* if */
     func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
   } /* for */

amxmodx/amx.h

@@ -166,14 +166,6 @@ typedef int (AMXAPI *AMX_NATIVE_FILTER)(struct tagAMX *amx, int index);
   #pragma warning(disable:4103)  /* disable warning message 4103 that complains
                                   * about pragma pack in a header file */
   #pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
-
-	#if _MSC_VER >= 1400
-		// MSVC8 - Replace POSIX stricmp with ISO C++ conformant one as it is deprecated
-		#define stricmp _stricmp
-
-		// Need this because of some stupid bug
-		#pragma warning (disable : 4996)
-	#endif
 #endif
 
 /* Some compilers do not support the #pragma align, which should be fine. Some
@@ -214,7 +206,7 @@ typedef struct tagAMX_NATIVE_INFO {
 
 typedef struct tagAMX_FUNCSTUB {
   ucell address         PACKED;
-  char name[sEXPMAX+1];
+  char name[sEXPMAX+1]  PACKED;
 } PACKED AMX_FUNCSTUB;
 
 typedef struct tagFUNCSTUBNT {
@@ -265,8 +257,8 @@ typedef struct tagAMX {
 typedef struct tagAMX_HEADER {
   int32_t size          PACKED; /* size of the "file" */
   uint16_t magic        PACKED; /* signature */
-  char    file_version;         /* file format version */
+  char    file_version  PACKED; /* file format version */
-  char    amx_version;          /* required version of the AMX */
+  char    amx_version   PACKED; /* 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,7 +314,6 @@ 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 */
@@ -345,7 +336,6 @@ enum {
 #define	UT_NATIVE		3
 #define UT_OPTIMIZER	2
 #define UT_BROWSEHOOK	1
-#define UT_BINLOGS		0
 
 typedef void (*BROWSEHOOK)(AMX *amx, cell *oplist, cell *cip);
 
@@ -411,7 +401,6 @@ int AMXAPI amx_PushArray(AMX *amx, cell *amx_addr, cell **phys_addr, const cell
 int AMXAPI amx_PushString(AMX *amx, cell *amx_addr, cell **phys_addr, const char *string, int pack, int use_wchar);
 int AMXAPI amx_RaiseError(AMX *amx, int error);
 int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
-int AMXAPI amx_Reregister(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
 int AMXAPI amx_RegisterToAny(AMX *amx, AMX_NATIVE f);
 int AMXAPI amx_Release(AMX *amx, cell amx_addr);
 int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
@@ -451,15 +440,6 @@ int AMXAPI amx_GetStringOld(char *dest,const cell *source,int use_wchar);
   #endif
 #endif
 
-#if defined BINLOG_ENABLED
-typedef struct tagBINLOG
-{
-	void	(*pfnLogNative)(AMX *amx, int native, int params);
-	void	(*pfnLogReturn)(AMX *amx, cell retval);
-	void	(*pfnLogParams)(AMX *amx, cell *params);
-} binlogfuncs_t;
-#endif
-
 #ifdef  __cplusplus
 }
 #endif

amxmodx/amxdbg.h

@@ -65,8 +65,8 @@ extern  "C" {
 typedef struct tagAMX_DBG_HDR {
   int32_t size          PACKED; /* size of the debug information chunk */
   uint16_t magic        PACKED; /* signature, must be 0xf1ef */
-  char    file_version;         /* file format version */
+  char    file_version  PACKED; /* file format version */
-  char    amx_version;          /* required version of the AMX */
+  char    amx_version   PACKED; /* 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 */
-} PACKED AMX_DBG_HDR;
+} AMX_DBG_HDR           PACKED;
 #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];           /* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_FILE;
+} AMX_DBG_FILE          PACKED;
 
 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 */
-} PACKED AMX_DBG_LINE;
+} AMX_DBG_LINE          PACKED;
 
 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;                /* kind of symbol (function/variable) */
+  char    ident         PACKED; /* kind of symbol (function/variable) */
-  char    vclass;               /* class of symbol (global/local) */
+  char    vclass        PACKED; /* class of symbol (global/local) */
   int16_t dim           PACKED; /* number of dimensions */
-  const char name[1];           /* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_SYMBOL;
+} AMX_DBG_SYMBOL        PACKED;
 
 typedef struct tagAMX_DBG_SYMDIM {
   int16_t tag           PACKED; /* tag for the array dimension */
   ucell   size          PACKED; /* size of the array dimension */
-} PACKED AMX_DBG_SYMDIM;
+} AMX_DBG_SYMDIM        PACKED;
 
 typedef struct tagAMX_DBG_TAG {
   int16_t tag           PACKED; /* tag id */
-  const char name[1];           /* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_TAG;
+} AMX_DBG_TAG           PACKED;
 
 typedef struct tagAMX_DBG_MACHINE {
   int16_t automaton     PACKED; /* automaton id */
   ucell address         PACKED; /* address of state variable */
-  const char name[1];           /* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_MACHINE;
+} AMX_DBG_MACHINE       PACKED;
 
 typedef struct tagAMX_DBG_STATE {
   int16_t state         PACKED; /* state id */
   int16_t automaton     PACKED; /* automaton id */
-  const char name[1];           /* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_STATE;
+} AMX_DBG_STATE         PACKED;
 
 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;
-} PACKED AMX_DBG;
+} AMX_DBG                           PACKED;
 
 #if !defined iVARIABLE
   #define iVARIABLE  1  /* cell that has an address and that can be fetched directly (lvalue) */

amxmodx/amxexecn.asm

@@ -1473,23 +1473,11 @@ OP_FLOAT_ROUND:
 		mov     [ebp], eax
 		fldcw   [ebp]
 		;calculate
-		sub     esp,4
+		push    0
 		fld     dword [edi+ecx+4]
-		test    edx,edx
-		jz      .correct
-		jmp     .skip_correct
-	.correct:
-		fadd    st0
-		fadd    dword [g_round_nearest]
-		fistp   dword [esp]
-		pop     eax
-		sar     eax,1
-		jmp     .done
-	.skip_correct:
 		frndint
 		fistp   dword [esp]
 		pop     eax
-	.done:
 		pop     edx
 		;restore bits
 		pop     ebp
@@ -1605,8 +1593,6 @@ Start_DATA
 
 lodb_and DD     0ffh, 0ffffh, 0, 0ffffffffh
 
-g_round_nearest	DD	0.5
-
 		GLOBAL g_flags
 g_flags:
 		DD		-1
@@ -1754,10 +1740,10 @@ _amx_opcodelist DD OP_INVALID
         DD      OP_SYSREQ_D
         DD      OP_SYMTAG
         DD      OP_BREAK
-        DD      OP_FLOAT_MUL
+        DD		OP_FLOAT_MUL
-        DD      OP_FLOAT_DIV
+        DD		OP_FLOAT_DIV
-        DD      OP_FLOAT_ADD
+		DD		OP_FLOAT_ADD
-        DD      OP_FLOAT_SUB
+		DD		OP_FLOAT_SUB
-        DD      OP_FLOAT_TO
+		DD		OP_FLOAT_TO
-        DD      OP_FLOAT_ROUND
+		DD		OP_FLOAT_ROUND
-        DD      OP_FLOAT_CMP
+		DD		OP_FLOAT_CMP

amxmodx/amxjitsn.asm

@@ -1962,23 +1962,11 @@ OP_FLOAT_ROUND:
 		mov     [ebp], eax
 		fldcw   [ebp]
 		;calculate
-		sub     esp,4
+		push    0
 		fld     dword [esi+4]
-		test    edx,edx
-		jz      .correct
-		jmp     .skip_correct
-	.correct:
-		fadd    st0
-		fadd    dword [g_round_nearest]
-		fistp   dword [esp]
-		pop     eax
-		sar     eax,1
-		jmp     .done
-	.skip_correct:
 		frndint
 		fistp   dword [esp]
 		pop     eax
-	.done:
 		pop     edx
 		;restore bits
 		pop     ebp
@@ -2122,9 +2110,7 @@ err_heaplow:
 _CHKMARGIN_HEAP:
         cmp     esi,stp
         jg      err_stacklow
-        mov     ebp,amx
+        cmp     dword hea,0
-        mov     ebp,[ebp+_hlw]
-        cmp     dword hea,ebp
         jl      err_heaplow
         ret
 
@@ -2436,10 +2422,6 @@ g_flagsjit:
 		DD		-1
 		DD		0
 		DD		1
-		
-global g_round_nearest
-g_round_nearest:
-		DD		0.5
 
 global amx_opcodelist_jit, _amx_opcodelist_jit
 

amxmodx/amxmod_compat.cpp

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

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

@@ -42,13 +42,8 @@
 #include <extdll.h>
 #include <meta_api.h>
 
-#ifdef _MSC_VER
+#ifdef MEMORY_TEST
-	// MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated
+	#include "mmgr/mmgr.h"
-	#if _MSC_VER >= 1400
-		#define unlink _unlink	
-		#define mkdir _mkdir
-		#define strdup _strdup
-	#endif
 #endif
 
 #include "md5.h"
@@ -65,13 +60,14 @@
 #include "CLogEvent.h"
 #include "CForward.h"
 #include "CCmd.h"
+#include "CMenu.h"
 #include "CEvent.h"
 #include "CLang.h"
 #include "fakemeta.h"
 #include "amxxlog.h"
 
 #define AMXXLOG_Log g_log.Log
-#define AMXXLOG_Error g_log.LogError
+#define AMX_VERSION	"1.70"
 
 extern AMX_NATIVE_INFO core_Natives[];
 extern AMX_NATIVE_INFO time_Natives[];
@@ -81,10 +77,6 @@ extern AMX_NATIVE_INFO file_Natives[];
 extern AMX_NATIVE_INFO float_Natives[];
 extern AMX_NATIVE_INFO string_Natives[];
 extern AMX_NATIVE_INFO vault_Natives[];
-extern AMX_NATIVE_INFO msg_Natives[];
-extern AMX_NATIVE_INFO vector_Natives[];
-extern AMX_NATIVE_INFO g_SortNatives[];
-extern AMX_NATIVE_INFO g_DataStructNatives[];
 
 #ifndef __linux__
 #define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
@@ -114,14 +106,6 @@ extern AMX_NATIVE_INFO g_DataStructNatives[];
 	#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
@@ -182,6 +166,7 @@ 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;
@@ -272,8 +257,6 @@ enum CountModulesMode
 
 int countModules(CountModulesMode mode);
 void modules_callPluginsLoaded();
-void modules_callPluginsUnloaded();
-void modules_callPluginsUnloading();
 
 cell* get_amxaddr(AMX *amx, cell amx_addr);
 char* build_pathname(char *fmt, ...);
@@ -345,14 +328,4 @@ 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/amxtime.cpp

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

amxmodx/amxxfile.cpp

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

amxmodx/amxxfile.h

@@ -92,7 +92,6 @@ 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,14 +44,10 @@
 	#define	vsnprintf	_vsnprintf
 #endif
 
-#include "svn_version.h"
-
 CLog::CLog()
 {
 	m_LogType = 0;
 	m_LogFile.clear();
-	m_FoundError = false;
-	m_LoggedErrMap = false;
 }
 
 CLog::~CLog()
@@ -96,15 +92,11 @@ void CLog::CreateNewFile()
 	time(&td);
 	tm *curTime = localtime(&td);
 
-	char file[256];
-	char name[256];
 	int i = 0;
 	
 	while (true)
 	{
-		snprintf(name, sizeof(name), "%s/L%02d%02d%03d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i);
+		FILE *pTmpFile = fopen(m_LogFile.c_str(), "r");			// open for reading to check whether the file exists
-		build_pathname_r(file, sizeof(file)-1, "%s", name);
-		FILE *pTmpFile = fopen(file, "r");			// open for reading to check whether the file exists
 		
 		if (!pTmpFile)
 			break;
@@ -112,7 +104,6 @@ void CLog::CreateNewFile()
 		fclose(pTmpFile);
 		++i;
 	}
-	m_LogFile.assign(file);
 	
 	// Log logfile start
 	FILE *fp = fopen(m_LogFile.c_str(), "w");
@@ -122,7 +113,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\") (version \"%s\")\n", name, SVN_VERSION_STRING);
+		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);
 		fclose(fp);
 	}
 }
@@ -152,17 +143,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) {
-		Log("-------- Mapchange to %s --------", STRING(gpGlobals->mapname));
-	} else {
-		return;
 	}
+	else if (m_LogType == 1)
+	{
+		Log("-------- Mapchange to %s --------", STRING(gpGlobals->mapname));
+	}
+	else
+		return;
 }
 
 void CLog::Log(const char *fmt, ...)
@@ -204,7 +195,7 @@ void CLog::Log(const char *fmt, ...)
 				}
 			}
 		} else {
-			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);
+			build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday);
 			pF = fopen(file, "a+");
 		}
 		
@@ -220,7 +211,9 @@ 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;
@@ -230,55 +223,3 @@ void CLog::Log(const char *fmt, ...)
 		ALERT(at_logged, "%s\n", msg_);
 	}
 }
-
-void CLog::LogError(const char *fmt, ...)
-{
-	static char file[256];
-	static char name[256];
-
-	if (m_FoundError)
-	{
-		return;
-	}
-
-	// get time
-	time_t td;
-	time(&td);
-	tm *curTime = localtime(&td);
-
-	char date[32];
-	strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
-
-	// msg
-	static char msg[3072];
-
-	va_list arglst;
-	va_start(arglst, fmt);
-	vsnprintf(msg, sizeof(msg)-1, fmt, arglst);
-	va_end(arglst);
-
-	FILE *pF = NULL;
-	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 {
-		ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Error Logging disabled for this map.\n", file);
-		m_FoundError = true;
-		return;
-	}
-
-	// print on server console
-	print_srvconsole("L %s: %s\n", date, msg);
-}
-

amxmodx/amxxlog.h

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

amxmodx/binlog.cpp

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

amxmodx/binlog.h

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

amxmodx/datastructs.cpp

@@ -1,608 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#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

@@ -1,323 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#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

@@ -31,7 +31,6 @@
 
 #include "amxmodx.h"
 #include "debugger.h"
-#include "binlog.h"
 
 #if !defined WIN32 && !defined _WIN32
 #define _snprintf snprintf
@@ -289,7 +288,7 @@ void Debugger::BeginExec()
 	{
 		Tracer *pTracer = new Tracer();
 		m_pCalls.push_back(pTracer);
-		assert(m_Top == static_cast<int>(m_pCalls.size() - 1));
+		assert(m_Top == (m_pCalls.size() - 1));
 	}
 
 	m_pCalls[m_Top]->Reset();
@@ -308,19 +307,6 @@ void Debugger::StepI()
 {
 	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
 
-#if defined BINLOG_ENABLED
-	if (g_binlog_level & 32)
-	{
-		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(m_pAmx);
-		if (pl)
-		{
-			long line;
-			dbg_LookupLine(m_pAmxDbg, m_pAmx->cip, &line);
-			g_BinLog.WriteOp(BinLog_SetLine, pl->getId(), (int)(line + 1));
-		}
-	}
-#endif
-
 	m_pCalls[m_Top]->StepI(m_pAmx->frm, m_pAmx->cip);
 }
 
@@ -388,9 +374,9 @@ int Debugger::FormatError(char *buffer, size_t maxLength)
 	int error = pTracer->m_Error;
 	const char *gen_err = GenericError(error);
 	int size = 0;
-	//trace_info_t *pTrace = pTracer->GetEnd();
+	trace_info_t *pTrace = pTracer->GetEnd();
-	//cell cip = _CipAsVa(m_pAmx->cip);
+	cell cip = _CipAsVa(m_pAmx->cip);
-	//cell *p_cip = NULL;
+	cell *p_cip = NULL;
 	int amx_err = AMX_ERR_NONE;
 
 	size += _snprintf(buffer, maxLength, "Run time error %d: %s ", error, gen_err);
@@ -556,15 +542,15 @@ void Debugger::Clear()
 void Debugger::DisplayTrace(const char *message)
 {
 	if (message != NULL)
-		AMXXLOG_Error("%s", message);
+		AMXXLOG_Log("%s", message);
 
 	char buffer[512];
 	FormatError(buffer, sizeof(buffer)-1);
 
 	const char *filename = _GetFilename();
 
-	AMXXLOG_Error("[AMXX] Displaying debug trace (plugin \"%s\")", filename);
+	AMXXLOG_Log("[AMXX] Displaying debug trace (plugin \"%s\")", filename);
-	AMXXLOG_Error("[AMXX] %s", buffer);
+	AMXXLOG_Log("[AMXX] %s", buffer);
 	
 	int count = 0;
 	long lLine;
@@ -573,7 +559,7 @@ void Debugger::DisplayTrace(const char *message)
 	while (pTrace)
 	{
 		GetTraceInfo(pTrace, lLine, function, file);
-		AMXXLOG_Error(
+		AMXXLOG_Log(
 			"[AMXX]    [%d] %s::%s (line %d)",
 			count,
 			file,
@@ -608,7 +594,6 @@ 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)
@@ -623,15 +608,7 @@ 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\") - debug not enabled!", error, filename);
-	{
-		_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)
@@ -642,14 +619,12 @@ void Debugger::GenericMessage(AMX *amx, int err)
 	Debugger::FmtGenericMsg(amx, err, buffer, sizeof(buffer)-1);
 
 	if (buffer[0] != '\0')
-		AMXXLOG_Error("[AMXX] %s", buffer);
+		AMXXLOG_Log("[AMXX] %s", buffer);
 }
 
 Debugger::~Debugger()
 {
 	Clear();
-	dbg_FreeInfo(m_pAmxDbg);
-	delete m_pAmxDbg;
 }
 
 int Handler::SetErrorHandler(const char *function)
@@ -658,7 +633,7 @@ int Handler::SetErrorHandler(const char *function)
 	
 	error = amx_FindPublic(m_pAmx, function, &m_iErrFunc);
 
-	if (error != AMX_ERR_NONE && m_iErrFunc < 0)
+	if (error != AMX_ERR_NONE && m_iErrFunc < 1)
 		m_iErrFunc = -1;
 
 	return error;
@@ -670,7 +645,7 @@ int Handler::SetModuleFilter(const char *function)
 	
 	error = amx_FindPublic(m_pAmx, function, &m_iModFunc);
 
-	if (error != AMX_ERR_NONE && m_iModFunc < 0)
+	if (error != AMX_ERR_NONE && m_iModFunc < 1)
 		m_iModFunc = -1;
 
 	return error;
@@ -704,9 +679,9 @@ const char *Handler::GetLastMsg()
 	return m_MsgCache.c_str();
 }
 
-int Handler::HandleModule(const char *module, bool isClass)
+int Handler::HandleModule(const char *module)
 {
-	if (m_iModFunc < 0)
+	if (m_iModFunc < 1)
 		return 0;
 
 	/**
@@ -720,7 +695,6 @@ int Handler::HandleModule(const char *module, bool isClass)
 
 	//temporarily set prenit
 	m_pAmx->flags |= AMX_FLAG_PRENIT;
-	amx_Push(m_pAmx, isClass ? 1 : 0);
 	amx_PushString(m_pAmx, &hea_addr, &phys_addr, module, 0, 0);
 	int err = amx_Exec(m_pAmx, &retval, m_iModFunc);
 	amx_Release(m_pAmx, hea_addr);
@@ -774,7 +748,7 @@ int Handler::HandleNative(const char *native, int index, int trap)
 		}
 		if (!trap)
 		{
-			AMXXLOG_Error("[AMXX] Runtime failure %d occurred in native filter.  Aborting plugin load.", err);
+			AMXXLOG_Log("[AMXX] Runtime failure %d occurred in native filter.  Aborting plugin load.", err);
 			return 0;
 		}
 		//handle this manually.
@@ -785,7 +759,7 @@ int Handler::HandleNative(const char *native, int index, int trap)
 		} else if (err != -1) {
 			LogError(m_pAmx, err, NULL);
 		}
-		AMXXLOG_Error("[AMXX] NOTE: Runtime failures in native filters are not good!");
+		AMXXLOG_Log("[AMXX] NOTE: Runtime failures in native filters are not good!");
 		retval = 0;
 	}
 	if (!trap)
@@ -845,10 +819,10 @@ int Handler::HandleError(const char *msg)
 			pDebugger->DisplayTrace(msg);
 		} else {
 			if (GetLastMsg())
-				AMXXLOG_Error("%s", GetLastMsg());
+				AMXXLOG_Log("%s", GetLastMsg());
 			Debugger::GenericMessage(m_pAmx, err);
 		}
-		AMXXLOG_Error("[AMXX] NOTE: Runtime failures in an error filter are not good!");
+		AMXXLOG_Log("[AMXX] NOTE: Runtime failures in an error filter are not good!");
 	}
 
 	if (pDebugger)
@@ -876,7 +850,7 @@ static cell AMX_NATIVE_CALL set_error_filter(AMX *amx, cell *params)
 	if (!pHandler)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Error("[AMXX] Plugin not initialized correctly.");
+		AMXXLOG_Log("[AMXX] Plugin not initialized correctly.");
 		return 0;
 	}
 
@@ -884,7 +858,7 @@ static cell AMX_NATIVE_CALL set_error_filter(AMX *amx, cell *params)
 	if (err != AMX_ERR_NONE)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Error("[AMXX] Function not found: %s", function);
+		AMXXLOG_Log("[AMXX] Function not found: %s", function);
 		return 0;
 	}
 
@@ -964,7 +938,7 @@ static cell AMX_NATIVE_CALL set_native_filter(AMX *amx, cell *params)
 	if (!pHandler)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Error("[AMXX] Plugin not initialized correctly.");
+		AMXXLOG_Log("[AMXX] Plugin not initialized correctly.");
 		return 0;
 	}
 
@@ -983,7 +957,7 @@ static cell AMX_NATIVE_CALL set_native_filter(AMX *amx, cell *params)
 	if (err != AMX_ERR_NONE)
 	{
 		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Error("[AMXX] Function not found: %s", function);
+		AMXXLOG_Log("[AMXX] Function not found: %s", function);
 		return 0;
 	}
 

amxmodx/debugger.h

@@ -50,7 +50,7 @@ public:
 		
 		struct trace_info
 		{
-			trace_info() : cip(0), frm(0), next(NULL), prev(NULL), used(false) {};
+			trace_info() : cip(0), frm(0), used(false), next(NULL), prev(NULL) {};
 			
 			cell cip;
 			cell frm;
@@ -167,7 +167,7 @@ public:
 public:
 	int HandleError(const char *msg);
 	int HandleNative(const char *native, int index, int trap);
-	int HandleModule(const char *module, bool isClass=false);
+	int HandleModule(const char *module);
 public:
 	bool IsHandling() const { return m_Handling; }
 	void SetErrorMsg(const char *msg);
@@ -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 > -1); }
+	bool IsNativeFiltering() { return (m_iNatFunc > 0); }
 	bool InNativeFilter() { return m_InNativeFilter; }
 private:
 	AMX *m_pAmx;

amxmodx/emsg.cpp

@@ -30,7 +30,6 @@
 */
 
 #include "amxmodx.h"
-#include "CMenu.h"
 
 int gmsgAmmoPickup;
 int gmsgAmmoX;
@@ -93,10 +92,9 @@ void Client_ShowMenu(void* mValue)
 	}
 }
 
-extern bool g_bmod_tfc;
 void Client_TeamInfo(void* mValue)
 {
-	if (mPlayer && !g_bmod_tfc) return;
+	if (mPlayer) return;
 	static int index;
 
 	switch (mState++)
@@ -109,7 +107,6 @@ void Client_TeamInfo(void* mValue)
 			char* msg = (char*)mValue;
 			g_players[index].team.assign(msg);
 			g_teamsIds.registerTeam(msg, -1);
-			break;
 	}
 }
 
@@ -212,15 +209,9 @@ void Client_CurWeapon(void* mValue)
 		case 2:
 			if (!mPlayer) return;
 			if (!iState || (iId < 1 || iId >= MAX_WEAPONS)) break;
-			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;
+			mPlayer->current = iId;
+			mPlayer->lastHit = mPlayer->lastTrace;
 	}
 }
 

amxmodx/file.cpp

@@ -51,6 +51,8 @@
 #include <io.h>
 #endif
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 
 CVector<FILE *> FileList;
@@ -139,7 +141,7 @@ static cell AMX_NATIVE_CALL read_file(AMX *amx, cell *params) /* 5 param */
 	
 	if ((fp =fopen(build_pathname("%s", szFile), "r")) == NULL)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Couldn't read file \"%s\"", szFile);
+		amx_RaiseError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -183,7 +185,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 	{
 		if ((pFile = fopen(sFile, "a")) == NULL)
 		{
-			LogError(amx, AMX_ERR_NATIVE, "Couldn't write file \"%s\"", sFile);
+			amx_RaiseError(amx, AMX_ERR_NATIVE);
 			return 0;
 		}
 		
@@ -199,7 +201,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 	{
 		if ((pFile = fopen(sFile, "w")) == NULL)
 		{
-			LogError(amx, AMX_ERR_NATIVE, "Couldn't write file \"%s\"", sFile);
+			amx_RaiseError(amx, AMX_ERR_NATIVE);
 			return 0;
 		}
 		
@@ -219,7 +221,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 
 	if ((pTemp = tmpfile()) == NULL)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Couldn't create temp file");
+		amx_RaiseError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -249,7 +251,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 	// now rewrite because file can be now smaller...
 	if ((pFile = fopen(sFile, "w")) == NULL)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Couldn't write file \"%s\"", sFile);
+		amx_RaiseError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -305,7 +307,27 @@ static cell AMX_NATIVE_CALL dir_exists(AMX *amx, cell *params) /* 1 param */
 	char *sFile = get_amxstring(amx, params[1], 0, iLen);
 	char *file = build_pathname("%s", sFile);
 
-	return DirExists(file) ? 1 : 0;
+#if defined WIN32 || defined _WIN32
+	DWORD attr = GetFileAttributes(file);
+	
+	if (attr == INVALID_FILE_ATTRIBUTES)
+		return 0;
+	
+	if (attr == FILE_ATTRIBUTE_DIRECTORY)
+		return 1;
+	
+	return 0;
+#else
+	struct stat s;
+	
+	if (stat(file, &s) != 0)
+		return 0;
+	
+	if (S_ISDIR(s.st_mode))
+		return 1;
+	
+	return 0;
+#endif
 }
 
 static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
@@ -358,7 +380,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;
+	int len, j = -1;
 	char *file = build_pathname("%s", get_amxstring(amx, params[1], 1, len));
 	char *flags = get_amxstring(amx, params[2], 0, len);
 
@@ -385,7 +407,7 @@ static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 			char *a = new char[blocks];
 			char *ptr = a;
 			while (btmp--)
-				*ptr++ = static_cast<char>(*addr++);
+				*a++ = static_cast<char>(*addr++);
 			size_t res = fwrite(a, sizeof(char), blocks, fp);
 			delete [] a;
 			return res;
@@ -395,7 +417,7 @@ static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 			short *a = new short[blocks];
 			short *ptr = a;
 			while (btmp--)
-				*ptr++ = static_cast<short>(*addr++);
+				*a++ = static_cast<short>(*addr++);
 			size_t res = fwrite(a, sizeof(short), blocks, fp);
 			delete [] a;
 			return res;
@@ -405,7 +427,7 @@ static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
 			int *a = new int[blocks];
 			int *ptr = a;
 			while (btmp--)
-				*ptr++ = static_cast<int>(*addr++);
+				*a++ = static_cast<int>(*addr++);
 			size_t res = fwrite(a, sizeof(int), blocks, fp);
 			delete [] a;
 			return res;
@@ -438,7 +460,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(int), 1, fp);
+			return fwrite(&c, sizeof(short), 1, fp);
 		}
 	}
 
@@ -516,7 +538,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[4])
+	switch (params[3])
 	{
 	case 1:	//char
 		{
@@ -554,18 +576,6 @@ static cell AMX_NATIVE_CALL amx_fread_blocks(AMX *amx, cell *params)
 	return 0;
 }
 
-static cell AMX_NATIVE_CALL amx_fputs(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	int len;
-	char *str = get_amxstring(amx, params[2], 0, len);
-	return fputs(str, fp);
-}
-
 static cell AMX_NATIVE_CALL amx_fgets(AMX *amx, cell *params)
 {
 	FILE *fp = (FILE *)params[1];
@@ -682,13 +692,13 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
 	DIR *dp = opendir(dirname);
 	
 	if (!dp)
-		return 0;
+		return NULL;
 	struct dirent *ep = readdir(dp);
 	
 	if (!ep)
 	{
 		closedir(dp);
-		return 0;
+		return NULL;
 	}
 	
 	set_amxstring(amx, params[2], ep->d_name, params[3]);
@@ -751,110 +761,6 @@ static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
 #endif
 }
 
-//native fgetc( file );
-static cell AMX_NATIVE_CALL amx_fgetc(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	return fgetc(fp);
-}
-
-//native fputc( file, data );
-static cell AMX_NATIVE_CALL amx_fputc(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	return fputc(static_cast<int>(params[2]), fp);
-}
-
-//native ungetc( file, data );
-static cell AMX_NATIVE_CALL amx_ungetc(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	return ungetc(static_cast<int>(params[2]), fp);
-}
-
-#if defined __linux__
-#define _rmdir rmdir
-#endif
-
-static cell AMX_NATIVE_CALL amx_rmdir(AMX *amx, cell *params)
-{
-	int len;
-	char* sFile = build_pathname("%s", get_amxstring(amx, params[1], 0, len));
-
-	if (_rmdir(sFile) != 0)
-		return 0;
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL amx_rename(AMX *amx, cell *params)
-{
-	int len;
-	char f_old_r[260];
-	char f_new_r[260];
-
-	char *fold = get_amxstring(amx, params[1], 0, len);
-	char *fnew = get_amxstring(amx, params[2], 1, len);
-
-	if (params[0] / sizeof(cell) == 3 && params[3])
-	{
-		build_pathname_r(f_old_r, sizeof(f_old_r)-1, "%s", fold);
-		build_pathname_r(f_new_r, sizeof(f_new_r)-1, "%s", fnew);
-	} else {
-		snprintf(f_old_r, sizeof(f_old_r)-1, "%s", fold);
-		snprintf(f_new_r, sizeof(f_new_r)-1, "%s", fnew);
-	}
-
-#if defined __linux__
-	return (rename(f_old_r, f_new_r) == 0);
-#elif defined WIN32
-	return MoveFileA(f_old_r, f_new_r);
-#endif
-}
-
-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},
@@ -879,17 +785,10 @@ AMX_NATIVE_INFO file_Natives[] =
 	{"ftell",			amx_ftell},
 	{"filesize",		amx_filesize},
 	{"unlink",			delete_file},
-	{"build_pathname",	amx_build_pathname},
+	{"build_pathname", amx_build_pathname},
 	{"dir_exists",		dir_exists},
 	{"open_dir",		amx_open_dir},
 	{"close_dir",		amx_close_dir},
 	{"next_file",		amx_get_dir},
-	{"fgetc",			amx_fgetc},
-	{"fputc",			amx_fputc},
-	{"fungetc",			amx_ungetc},
-	{"rmdir",			amx_rmdir},
-	{"fputs",			amx_fputs},
-	{"rename_file",		amx_rename},
-	{"LoadFileForMe",	LoadFileForMe},
 	{NULL,				NULL}
 };

amxmodx/float.cpp

@@ -368,6 +368,7 @@ 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);
@@ -424,54 +425,6 @@ 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
@@ -504,9 +457,6 @@ 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,7 +1,5 @@
 #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 :)
@@ -19,7 +17,6 @@
 #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')
@@ -83,14 +80,14 @@ const char *translate(AMX *amx, cell amxaddr, const char *key)
 		const char *testlang = amx_mldebug->string;
 		if (!g_langMngr.LangExists(testlang))
 		{
-			AMXXLOG_Error("[AMXX] \"%s\" is an invalid debug language", testlang);
+			AMXXLOG_Log("[AMXX] \"%s\" is an invalid debug language", testlang);
 			validlang = false;
 		}
 				
 		g_langMngr.GetDef(testlang, key, debug_status);
 				
 		if (validlang && debug_status == ERR_BADKEY)
-			AMXXLOG_Error("[AMXX] Language key \"%s\" not found for language \"%s\", check \"%s\"", key, testlang, GetFileName(amx));
+			AMXXLOG_Log("[AMXX] Language key \"%s\" not found for language \"%s\", check \"%s\"", key, testlang, GetFileName(amx));
 	}
 				
 	if (def == NULL)
@@ -99,7 +96,7 @@ const char *translate(AMX *amx, cell amxaddr, const char *key)
 		{
 			if (status == ERR_BADLANG && (BadLang_Table.AltFindOrInsert(pLangName).last + 120.0f < gpGlobals->time))
 			{
-				AMXXLOG_Error("[AMXX] Language \"%s\" not found", pLangName);
+				AMXXLOG_Log("[AMXX] Language \"%s\" not found", pLangName);
 				BadLang_Table.AltFindOrInsert(pLangName).last = gpGlobals->time;
 			}
 		}
@@ -160,169 +157,71 @@ 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, int flags)
+void AddFloat(U **buf_p, size_t &maxlen, double fval, int width, int prec)
-{
-	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)
 	{
-		while (digits < width && maxlen)
+		*buf++ = ' ';
-		{
+		width--;
-			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+		maxlen--;
-			width--;
-			maxlen--;
-		}
 	}
 
 	while (digits-- && maxlen)
 	{
 		*buf++ = text[digits];
-		width--;
 		maxlen--;
 	}
 
-	if (flags & LADJUST)
+	*buf_p = buf;
+
+	if (prec < 0)
+		prec = 6;
+	// write the fraction
+	digits = 0;
+	while (digits < prec)
 	{
-		while (width-- && maxlen)
+		fval -= (int) fval;
-		{
+		fval *= 10.0;
-			*buf++ = (flags & ZEROPAD) ? '0' : ' ';
+		val = (int) fval;
-			maxlen--;
+		text[digits++] = '0' + val % 10;
-		}
 	}
 
-	*buf_p = buf;
+	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>
@@ -332,21 +231,15 @@ 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' + unsignedVal % 10;
+		text[digits++] = '0' + val % 10;
-		unsignedVal /= 10;
+		val /= 10;
-	} while (unsignedVal);
+	} while (val);
 
 	if (signedVal < 0)
 		text[digits++] = '-';
@@ -382,66 +275,6 @@ 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)
 {
@@ -519,7 +352,6 @@ reswitch:
 		case 'c':
 			CHECK_ARGS(0);
 			*buf_p++ = static_cast<D>(*get_amxaddr(amx, params[arg]));
-			llen--;
 			arg++;
 			break;
 		case 'd':
@@ -528,62 +360,13 @@ reswitch:
 			AddInt(&buf_p, llen, *get_amxaddr(amx, params[arg]), width, flags);
 			arg++;
 			break;
-		case 'u':
-			CHECK_ARGS(0);
-			AddUInt(&buf_p, llen, static_cast<unsigned int>(*get_amxaddr(amx, params[arg])), width, flags);
-			arg++;
-			break;
 		case 'f':
 			CHECK_ARGS(0);
-			AddFloat(&buf_p, llen, amx_ctof(*get_amxaddr(amx, params[arg])), width, prec, flags);
+			AddFloat(&buf_p, llen, amx_ctof(*get_amxaddr(amx, params[arg])), width, prec);
 			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,7 +5,4 @@
 template <typename D, typename S>
 size_t atcprintf(D *buffer, size_t maxlen, const S *format, AMX *amx, cell *params, int *param);
 
-const char *translate(AMX *amx, cell amxaddr, const char *key);
-bool translate_bcompat(AMX *amx, cell *source, const char **_key, const char **_def);
-
 #endif //_INCLUDE_FORMATTING_H

amxmodx/helpers-x86.asm

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

amxmodx/libraries.cpp

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

amxmodx/libraries.h

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

amxmodx/md5.cpp

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

amxmodx/messages.cpp

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

amxmodx/messages.h

@@ -1,216 +0,0 @@
-#ifndef _MSGS_INCLUDE_H
-#define _MSGS_INCLUDE_H
-
-#include <extdll.h>
-#include <meta_api.h>
-#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,
-	arg_char,
-	arg_short,
-	arg_long,
-	arg_angle,
-	arg_coord,
-	arg_string,
-	arg_entity,
-};
-
-struct msgparam
-{
-	msgtype type;
-	union
-	{
-		REAL fData;
-		int iData;
-	} v;
-	String szData;
-};
-
-class Message
-{
-public:
-	Message();
-	~Message();
-	void AddParam(float data, msgtype type);
-	void AddParam(int data, msgtype type);
-	void AddParam(const char *data, msgtype type);
-	void SetParam(size_t index, float data);
-	void SetParam(size_t index, int data);
-	void SetParam(size_t index, const char *data);
-	const char *GetParamString(size_t index);
-	float GetParamFloat(size_t index);
-	bool Ready();
-	void Init();
-	int GetParamInt(size_t index);
-	msgtype GetParamType(size_t index);
-	void Reset();
-	void Send();
-	size_t Params();
-private:
-	msgparam *AdvPtr();
-private:
-	CVector<msgparam *> m_Params;
-	size_t m_CurParam;
-};
-
-void C_MessageBegin(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed);
-void C_WriteByte(int iValue);
-void C_WriteChar(int iValue);
-void C_WriteShort(int iValue);
-void C_WriteLong(int iValue);
-void C_WriteAngle(float flValue);
-void C_WriteCoord(float flValue);
-void C_WriteString(const char *sz);
-void C_WriteEntity(int iValue);
-void C_MessageEnd(void);
-
-extern RegisteredMessage msgHooks[256];
-extern int msgBlocks[256];
-
-void ClearMessages();
-
-#endif //_MSGS_INCLUDE_H
-

amxmodx/meta_api.cpp

@@ -33,36 +33,23 @@
 
 #if defined WIN32
 #include <direct.h>
-#else
-#include <dirent.h>
 #endif
 
 #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
-	SVN_VERSION_STRING,			// version
+	AMX_VERSION,				// version
 	__DATE__,					// date
 	"AMX Mod X Dev Team",		// author
 	"http://www.amxmodx.org",	// url
 	"AMXX",						// logtag
-	PT_STARTUP,					// (when) loadable
+	PT_ANYTIME,					// (when) loadable
 	PT_ANYTIME,					// (when) unloadable
 };
 
@@ -79,7 +66,6 @@ void (*function)(void*);
 void (*endfunction)(void*);
 
 extern List<AUTHORIZEFUNC> g_auth_funcs;
-extern CVector<CAdminData *> DynamicAdmins;
 
 CLog g_log;
 CForwardMngr g_forwards;
@@ -93,7 +79,7 @@ CPlayer* mPlayer;
 CPluginMngr g_plugins;
 CTaskMngr g_tasksMngr;
 CmdMngr g_commands;
-CFlagManager FlagMan;
+
 EventsMngr g_events;
 Grenades g_grenades;
 LogEventsMngr g_logevents;
@@ -103,7 +89,6 @@ 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;
@@ -162,96 +147,6 @@ int FF_InconsistentFile = -1;
 int FF_ClientAuthorized = -1;
 int FF_ChangeLevel = -1;
 
-void ParseAndOrAdd(CStack<String *> & files, const char *name)
-{
-	if (strncmp(name, "plugins-", 8) == 0)
-	{
-#if !defined WIN32
-		size_t len = strlen(name);
-		if (strcmp(&name[len-4], ".ini") == 0)
-		{
-#endif
-			String *pString = new String(name);
-			files.push(pString);
-#if !defined WIN32
-		}
-#endif
-	}
-}
-
-void BuildPluginFileList(const char *initialdir, CStack<String *> & files)
-{
-	char path[255];
-#if defined WIN32
-	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))
-	{
-		ParseAndOrAdd(files, fd.name);
-	}
-
-	_findclose(handle);
-#elif defined __linux__
-	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 )
-	{
-		ParseAndOrAdd(files, ep->d_name);
-	}
-
-	closedir (dp);
-#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)
@@ -316,27 +211,11 @@ 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
@@ -344,9 +223,7 @@ const char*	get_localinfo_r(const char *name, const char *def, char buffer[], si
 int	C_Spawn(edict_t *pent)
 {
 	if (g_initialized)
-	{
 		RETURN_META_VALUE(MRES_IGNORED, 0);
-	}
 
 	g_activated = false;
 	g_initialized = true;
@@ -358,22 +235,6 @@ 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();
@@ -381,6 +242,15 @@ int	C_Spawn(edict_t *pent)
 	// ###### Initialize task manager
 	g_tasksMngr.registerTimers(&gpGlobals->time, &mp_timelimit->value, &g_game_timeleft);
 
+	// ###### Load lang
+	char file[256];
+	if (!g_langMngr.Load(build_pathname_r(file, sizeof(file) - 1, "%s/languages.dat", get_localinfo("amxmodx_datadir", "addons/amxmodx/data"))))
+	{
+		g_langMngr.InvalidateCache();
+	} else {
+		g_langMngr.LoadCache(build_pathname_r(file, sizeof(file) - 1, "%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+	}
+
 	// ###### Initialize commands prefixes
 	g_commands.registerPrefix("amx");
 	g_commands.registerPrefix("amxx");
@@ -396,68 +266,17 @@ 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"));
-	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)
-	{
-		// 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, SVN_VERSION_STRING);
+	CVAR_SET_STRING(init_amxmodx_version.name, AMX_VERSION);
 	char buffer[32];
 	sprintf(buffer, "%d", loaded);
 	CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
 
 	// ###### Load Vault
-	char file[255];
 	g_vault.setSource(build_pathname_r(file, sizeof(file) - 1, "%s", get_localinfo("amxx_vault", "addons/amxmodx/configs/vault.ini")));
 	g_vault.loadVault();
 	
@@ -479,21 +298,9 @@ int	C_Spawn(edict_t *pent)
 	// Set server flags
 	memset(g_players[0].flags, -1, sizeof(g_players[0].flags));
 
-	g_opt_level = atoi(get_localinfo("optimizer", "7"));
+	// ###### Load AMX scripts
-	if (!g_opt_level)
-		g_opt_level = 7;
-
-	// ###### Load AMX Mod X plugins
 	g_plugins.loadPluginsFromFile(get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini"));
-	LoadExtraPluginsFromDir(configs_dir);
-	g_plugins.loadPluginsFromFile(map_pluginsfile_path, false);
-	if (prefixed_map_pluginsfile[0] != '\0')
-	{
-		g_plugins.loadPluginsFromFile(prefixed_map_pluginsfile, false);
-	}
-
 	g_plugins.Finalize();
-	g_plugins.InvalidateCache();
 
 	// Register forwards
 	FF_PluginInit = registerForward("plugin_init", ET_IGNORE, FP_DONE);
@@ -510,15 +317,6 @@ int	C_Spawn(edict_t *pent)
 	FF_ClientAuthorized = registerForward("client_authorized", ET_IGNORE, FP_CELL, FP_DONE);
 	FF_ChangeLevel = registerForward("server_changelevel", ET_STOP, FP_STRING, FP_DONE);
 
-#if defined BINLOG_ENABLED
-	if (!g_BinLog.Open())
-	{
-		LOG_ERROR(PLID, "Binary log failed to open.");
-	}
-	g_binlog_level = atoi(get_localinfo("bin_logging", "17"));
-	g_binlog_maxsize = atoi(get_localinfo("max_binlog_size", "20"));
-#endif
-
 	modules_callPluginsLoaded();
 
 	// ###### Call precache forward function
@@ -632,6 +430,11 @@ void C_ServerActivate_Post(edict_t *pEdictList, int edictCount, int clientMax)
 	executeForwards(FF_PluginInit);
 	executeForwards(FF_PluginCfg);
 
+	// ###### Save lang
+	char file[256];
+	g_langMngr.Save(build_pathname_r(file, sizeof(file) - 1, "%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+	g_langMngr.SaveCache(build_pathname_r(file, sizeof(file) - 1, "%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+
 	// Correct time in Counter-Strike and other mods (except DOD)
 	if (!g_bmod_dod)
 		g_game_timeleft = 0;
@@ -683,8 +486,6 @@ void C_ServerDeactivate_Post()
 {
 	if (!g_initialized)
 		RETURN_META(MRES_IGNORED);
-
-	modules_callPluginsUnloading();
 	
 	detachReloadModules();
 	g_auth.clear();
@@ -703,23 +504,17 @@ void C_ServerDeactivate_Post()
 	g_xvars.clear();
 	g_plugins.clear();
 	ClearPluginLibraries();
-	modules_callPluginsUnloaded();
-
-	ClearMessages();
 	
-	// Flush the dynamic admins list
+	char file[256];
-	for (size_t iter=DynamicAdmins.size();iter--; )
+	
-	{
+	g_langMngr.Save(build_pathname_r(file, sizeof(file) - 1, "%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
-		delete DynamicAdmins[iter];
+	g_langMngr.SaveCache(build_pathname_r(file, sizeof(file) - 1, "%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
-	}
+	g_langMngr.Clear();
 
-	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)
@@ -774,10 +569,6 @@ void C_ServerDeactivate_Post()
 	}
 #endif // MEMORY_TEST
 
-#if defined BINLOG_ENABLED
-	g_BinLog.Close();
-#endif
-
 	g_initialized = false;
 
 	RETURN_META(MRES_IGNORED);
@@ -786,7 +577,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->IsBot())
+	if (!pPlayer->bot)
 	{
 		bool a = pPlayer->Connect(pszName, pszAddress);
 		executeForwards(FF_ClientConnect, static_cast<cell>(pPlayer->index));
@@ -834,7 +625,7 @@ void C_ClientDisconnect(edict_t *pEntity)
 void C_ClientPutInServer_Post(edict_t *pEntity)
 {
 	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	if (!pPlayer->IsBot())
+	if (!pPlayer->bot)
 	{
 		pPlayer->PutInServer();
 		++g_players_num;
@@ -854,7 +645,9 @@ 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));
@@ -903,11 +696,10 @@ 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: \n         David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko, Felix \"SniperBeamer\" Geyer\n");
+			len = sprintf(buf, "Authors: David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko, Felix \"SniperBeamer\" Geyer\n");
-			len += sprintf(&buf[len], "         Jonny \"Got His Gun\" Bergstrom, Lukasz \"SidLuke\" Wlasinski\n");
+			len += sprintf(&buf[len], "Authors: Jonny \"Got His Gun\" Bergstrom, Lukasz \"SidLuke\" Wlasinski\n");
 			CLIENT_PRINT(pEntity, print_console, buf);
-			len = sprintf(buf, "         Christian \"Basic-Master\" Hammacher, Borja \"faluco\" Ferrer\n");
+			len = sprintf(buf, "Authors: 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
@@ -966,63 +758,47 @@ void C_ClientCommand(edict_t *pEntity)
 			int menuid = pPlayer->menu;
 			pPlayer->menu = 0;
 
-			/* 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() && 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(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) {
-							RETURN_META(MRES_SUPERCEDE);
-						}
-					}
-					/**
-					 * 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()))
-				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),
+					if (pPlayer->newmenu != -1)
-						static_cast<cell>(pressed_key), 0);
+					{
-					
+						int menu = pPlayer->newmenu;
-					if (ret & 2) result = MRES_SUPERCEDE;
+						pPlayer->newmenu = -1;
-					if (ret & 1) RETURN_META(MRES_SUPERCEDE);
+						
-				}
+						if (menu >= 0 && menu < (int)g_NewMenus.size())
-				if (g_menucmds.GetWatchIter() != a)
+						{
-				{
+							Menu *pMenu = g_NewMenus[menu];
-					a = g_menucmds.GetWatchIter();
+							int item = pMenu->PagekeyToItem(pPlayer->page, pressed_key+1);
-				} else {
+
-					++a;
+							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));
+								
+								if (ret & 2)
+									result = MRES_SUPERCEDE;
+								else if (ret & 1)
+									RETURN_META(MRES_SUPERCEDE);
+							}
+						}
+						if (pPlayer->newmenu != -1)
+							break;
+					} else {
+						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);
+					}
 				}
+				++a;
 			}
 		}
 	}
@@ -1138,6 +914,20 @@ 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 {
@@ -1279,18 +1069,17 @@ 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 = ptr->vecEndPos;
+		pPlayer->lastTrace = pPlayer->thisTrace;
+		pPlayer->thisTrace = ptr->vecEndPos;
 	}
 
 	RETURN_META(MRES_IGNORED);
 }
 
-void C_AlertMessage(ALERT_TYPE atype, char *szFmt, ...)
+void C_AlertMessage_Post(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,
@@ -1301,11 +1090,8 @@ void C_AlertMessage(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()
+	if (g_logevents.logEventsExist() || FF_PluginLog >= 0)
-		|| g_forwards.getFuncsNum(FF_PluginLog))
 	{
 		va_list	logArgPtr;
 		va_start(logArgPtr, szFmt);
@@ -1314,19 +1100,15 @@ void C_AlertMessage(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);
 	}
 
-	if (retVal)
+	RETURN_META(MRES_IGNORED);
-	{
-		RETURN_META(MRES_SUPERCEDE);
-	}
-
-    RETURN_META(MRES_IGNORED);
 }
 
 void C_ChangeLevel(char *map, char *what)
@@ -1457,7 +1239,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", SVN_VERSION_STRING);
+					 "   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMX_VERSION);
 	print_srvconsole("   This is free software and you are welcome to redistribute it under \n"
 					 "   certain conditions; type 'amxx gpl' for details.\n  \n");
 
@@ -1484,10 +1266,6 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
 	// This will also call modules Meta_Query and Meta_Attach functions
 	loadModules(get_localinfo("amxx_modules", "addons/amxmodx/configs/modules.ini"), now);
 
-	GET_HOOK_TABLES(PLID, &g_pEngTable, NULL, NULL);
-
-	FlagMan.SetFile("cmdaccess.ini");
-	
 	return (TRUE);
 }
 
@@ -1499,8 +1277,6 @@ C_DLLEXPORT	int	Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON	reason)
 		return (FALSE);
 	}
 
-	modules_callPluginsUnloading();
-
 	g_auth.clear();
 	g_forwards.clear();
 	g_commands.clear();
@@ -1517,11 +1293,6 @@ C_DLLEXPORT	int	Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON	reason)
 	g_xvars.clear();
 	g_plugins.clear();
 	g_cvars.clear();
-	g_langMngr.Clear();
-
-	ClearMessages();
-
-	modules_callPluginsUnloaded();
 
 	detachModules();
 
@@ -1529,9 +1300,6 @@ C_DLLEXPORT	int	Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON	reason)
 
 	Module_UncacheFunctions();
 
-	ClearLibraries(LibSource_Plugin);
-	ClearLibraries(LibSource_Module);
-
 	return (TRUE);
 }
 
@@ -1658,7 +1426,6 @@ 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;
@@ -1668,20 +1435,6 @@ C_DLLEXPORT	int	GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
 	meta_engfuncs.pfnPrecacheSound = C_PrecacheSound;
 	meta_engfuncs.pfnChangeLevel = C_ChangeLevel;
 
-	/* message stuff from messages.h/cpp */
-	meta_engfuncs.pfnMessageBegin = C_MessageBegin;
-	meta_engfuncs.pfnMessageEnd = C_MessageEnd;
-	meta_engfuncs.pfnWriteAngle = C_WriteAngle;
-	meta_engfuncs.pfnWriteByte = C_WriteByte;
-	meta_engfuncs.pfnWriteChar = C_WriteChar;
-	meta_engfuncs.pfnWriteCoord = C_WriteCoord;
-	meta_engfuncs.pfnWriteEntity = C_WriteEntity;
-	meta_engfuncs.pfnWriteLong = C_WriteLong;
-	meta_engfuncs.pfnWriteShort = C_WriteShort;
-	meta_engfuncs.pfnWriteString = C_WriteString;
-
-	meta_engfuncs.pfnAlertMessage = C_AlertMessage;
-
 	memcpy(pengfuncsFromEngine, &meta_engfuncs, sizeof(enginefuncs_t));
 
 	return 1;
@@ -1703,6 +1456,7 @@ 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.h

@@ -38,7 +38,7 @@
 #ifndef __linux__
 	#define DLLEXPORT __declspec(dllexport)
 #else
-	#define DLLEXPORT __attribute__((visibility("default")))
+	#define DLLEXPORT
 	#define WINAPI
 #endif
 
@@ -72,20 +72,12 @@ typedef enum
 }  PlayerProp;
 
 int CheckModules(AMX *amx, char error[128]);
-bool LoadModule(const char *shortname, PLUG_LOADTIME now, bool simplify=true, bool noFileBail=false);
 const char *StrCaseStr(const char *as, const char *bs);
 
 class Debugger;
 Debugger *DisableDebugHandler(AMX *amx);
 void EnableDebugHandler(AMX *amx, Debugger *pd);
 
-bool DirExists(const char *dir);
 const char* GetFileName(AMX *amx);
 
-inline cell FloatToCell(float input)
-{
-	REAL output = input;
-	return *(cell *)&output;
-}
-
 #endif // __MODULES_H__

amxmodx/msvc/.cvsignore

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

amxmodx/msvc/amxmodx_mm.dsp

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

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

@@ -0,0 +1,39 @@
+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
+		Debug = Debug
+		JITDebug = JITDebug
+		JITMemtestRelease = JITMemtestRelease
+		JITRelease = JITRelease
+		MaximalSpeed = MaximalSpeed
+		MemtestDebug = MemtestDebug
+		MemtestRelease = MemtestRelease
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.ActiveCfg = Debug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.Build.0 = Debug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.ActiveCfg = JITDebug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.Build.0 = JITDebug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITMemtestRelease.ActiveCfg = JITMemtestRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITMemtestRelease.Build.0 = JITMemtestRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.ActiveCfg = JITRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.Build.0 = JITRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MaximalSpeed.ActiveCfg = MaximalSpeed|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MaximalSpeed.Build.0 = MaximalSpeed|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestDebug.ActiveCfg = MemtestDebug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestDebug.Build.0 = MemtestDebug|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestRelease.ActiveCfg = MemtestRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestRelease.Build.0 = MemtestRelease|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release.ActiveCfg = Release|Win32
+		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

amxmodx/msvc/amxmodx_mm.vcproj

@@ -0,0 +1,975 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="amxmodx"
+	ProjectGUID="{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				StructMemberAlignment="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\debug/amxmodx.pch"
+				AssemblerListingLocation=".\debug/"
+				ObjectFile=".\debug/"
+				ProgramDataBaseFileName=".\debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="..\JIT\natives-x86.obj ..\zlib\zlib.lib"
+				OutputFile="debug/amxmodx_mm.dll"
+				Version="0.1"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
+				ImportLibrary=".\debug/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\debug/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\release/amxmodx.pch"
+				AssemblerListingLocation=".\release/"
+				ObjectFile=".\release/"
+				ProgramDataBaseFileName=".\release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
+				OutputFile="release/amxmodx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="LIBC"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile=".\release/amxx_mm.pdb"
+				ImportLibrary=".\release/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="MemtestDebug|Win32"
+			OutputDirectory="MemtestDebug"
+			IntermediateDirectory="MemtestDebug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				StructMemberAlignment="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\memtestdebug/amxmodx.pch"
+				AssemblerListingLocation=".\memtestdebug/"
+				ObjectFile=".\memtestdebug/"
+				ProgramDataBaseFileName=".\memtestdebug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
+				OutputFile="memtestdebug/amxmodx_mm.dll"
+				Version="1.6.5.0"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\memtestdebug/amxx_mm.pdb"
+				ImportLibrary=".\memtestdebug/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\debug/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="MemtestRelease|Win32"
+			OutputDirectory="MemtestRelease"
+			IntermediateDirectory="MemtestRelease"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\memtestrelease/amxmodx.pch"
+				AssemblerListingLocation=".\memtestrelease/"
+				ObjectFile=".\memtestrelease/"
+				ProgramDataBaseFileName=".\memtestrelease/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
+				OutputFile="memtestrelease/amxmodx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\memtestrelease/amxx_mm.pdb"
+				GenerateMapFile="TRUE"
+				MapExports="TRUE"
+				ImportLibrary=".\memtestrelease/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="JITDebug|Win32"
+			OutputDirectory="JITDebug"
+			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="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
+				ImportLibrary=".\jitdebug/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\debug/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="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/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="JITMemtestRelease|Win32"
+			OutputDirectory="JITMemtestRelease"
+			IntermediateDirectory="JITMemtestRelease"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST;JIT;ASM32;PAWN_CELL_SIZE=32"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\jitmemtestrelease/amxmodx.pch"
+				AssemblerListingLocation=".\jitmemtestrelease/"
+				ObjectFile=".\jitmemtestrelease/"
+				ProgramDataBaseFileName=".\jitmemtestrelease/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				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="jitmemtestrelease/amxmodx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				IgnoreDefaultLibraryNames="MSVCRT"
+				ModuleDefinitionFile=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\jitmemtestrelease/amxx_mm.pdb"
+				ImportLibrary=".\jitmemtestrelease/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="MaximalSpeed|Win32"
+			OutputDirectory="MaximalSpeed"
+			IntermediateDirectory="MaximalSpeed"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				OptimizeForProcessor="2"
+				OptimizeForWindowsApplication="TRUE"
+				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT"
+				StringPooling="TRUE"
+				RuntimeLibrary="4"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\MaximalSpeed/amxmodx.pch"
+				AssemblerListingLocation=".\MaximalSpeed/"
+				ObjectFile=".\MaximalSpeed/"
+				ProgramDataBaseFileName=".\MaximalSpeed/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				OutputFile="MaximalSpeed/amxmodx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile=".\MaximalSpeede/amxx_mm.pdb"
+				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</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="..\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">
+				<FileConfiguration
+					Name="JITRelease|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						AssemblerOutput="0"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\CVault.cpp">
+			</File>
+			<File
+				RelativePath="..\debugger.cpp">
+			</File>
+			<File
+				RelativePath="..\emsg.cpp">
+			</File>
+			<File
+				RelativePath="..\fakemeta.cpp">
+				<FileConfiguration
+					Name="MemtestDebug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						GeneratePreprocessedFile="0"/>
+				</FileConfiguration>
+			</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>
+			</File>
+			<File
+				RelativePath="..\md5.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>
+			</File>
+			<File
+				RelativePath="..\strptime.cpp">
+			</File>
+			<File
+				RelativePath="..\util.cpp">
+			</File>
+			<File
+				RelativePath="..\vault.cpp">
+			</File>
+			<Filter
+				Name="mmgr"
+				Filter="">
+				<File
+					RelativePath="..\mmgr\mmgr.cpp">
+					<FileConfiguration
+						Name="Debug|Win32"
+						ExcludedFromBuild="TRUE">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						ExcludedFromBuild="TRUE">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="JITDebug|Win32"
+						ExcludedFromBuild="TRUE">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="JITRelease|Win32"
+						ExcludedFromBuild="TRUE">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="MaximalSpeed|Win32"
+						ExcludedFromBuild="TRUE">
+						<Tool
+							Name="VCCLCompilerTool"/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<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="..\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="..\md5.h">
+			</File>
+			<File
+				RelativePath="..\menus.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
+				Name="mmgr"
+				Filter="">
+				<File
+					RelativePath="..\mmgr\mmgr.h">
+				</File>
+				<File
+					RelativePath="..\mmgr\nommgr.h">
+				</File>
+			</Filter>
+		</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="..\natives-amd64.asm">
+			</File>
+			<File
+				RelativePath="..\natives-x86.asm">
+			</File>
+		</Filter>
+		<Filter
+			Name="SDK"
+			Filter="">
+			<File
+				RelativePath="..\sdk\amxxmodule.cpp">
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="MemtestDebug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="MemtestRelease|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITDebug|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITRelease|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="JITMemtestRelease|Win32"
+					ExcludedFromBuild="TRUE">
+					<Tool
+						Name="VCCLCompilerTool"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="MaximalSpeed|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.sln

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

amxmodx/natives.cpp

@@ -32,8 +32,6 @@
 #include "sh_stack.h"
 #include "natives.h"
 #include "debugger.h"
-#include "libraries.h"
-#include "format.h"
 
 #ifdef __linux__
 #include <malloc.h>
@@ -46,16 +44,13 @@
 //With the exception for param_convert, which was written by
 // Julien "dJeyL" Laurent
 
+CStack<int> g_ErrorStk;
 CVector<regnative *> g_RegNatives;
+CStack<regnative *> g_NativeStack;
+CVector<String> g_Libraries;
 static char g_errorStr[512] = {0};
 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())
@@ -73,65 +68,30 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 		return 0;
 	}
 
+	//parameter stack
+	pNative->caller = amx;
+
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
-	CPluginMngr::CPlugin *pNativePlugin = g_plugins.findPluginFast(pNative->amx);
-
-	if (!pNativePlugin->isExecutable(pNative->func))
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Called dynanative into a paused plugin.");
-		pPlugin->setStatus(ps_paused);
-		return 0;
-	}
-
-	/* Save old values on ZE STACK */
-	AMX *pSaveCaller = g_pCaller;
-	cell saveParams[CALLFUNC_MAXPARAMS];
-	regnative *pSaveNative = g_pCurNative;
-	int saveError = g_CurError;
-
-	if (pSaveNative)
-	{
-		for (ucell i = 0; i <= g_Params[0] / sizeof(cell); i++)
-		{
-			saveParams[i] = g_Params[i];
-		}
-	}
-
-	/* 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>=0; i--)
-		{
-			g_Params[i] = params[i];
-		}
-	} else if (pNative->style == 1) {
-		/**
-		 * 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--)
-		{
+			pNative->params[i] = params[i];
+	} else if (pNative->style == 1) {
+		//use dJeyL's system .. very clever!
+		for (int i=numParams; i>=1; i--)
 			amx_Push(pNative->amx, params[i]);
-		}
 	}
-
 	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())
@@ -144,26 +104,13 @@ 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_CurError != AMX_ERR_NONE) {
+	} else if (g_ErrorStk.front()) {
-		LogError(amx, g_CurError, g_errorStr);
+		LogError(amx, g_ErrorStk.front(), g_errorStr);
 	}
-
 	if (pDebugger)
-	{
 		pDebugger->EndExec();
-	}
+	g_NativeStack.pop();
-
+	g_ErrorStk.pop();
-	/* 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;
 }
@@ -171,9 +118,7 @@ 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];
 
@@ -199,7 +144,8 @@ static cell AMX_NATIVE_CALL log_error(AMX *amx, cell *params)
 	char *err = format_amxstring(amx, params, 2, len);
 
 	_snprintf(g_errorStr, sizeof(g_errorStr), "%s", err);
-	g_CurError = params[1];
+	g_ErrorStk.pop();
+	g_ErrorStk.push(params[1]);
 
 	return 1;
 }
@@ -207,12 +153,13 @@ 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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
@@ -220,19 +167,20 @@ static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
 	int p = params[1];
 
 	int len;
-	char *str = get_amxstring(g_pCaller, g_Params[p], 0, len);
+	char *str = get_amxstring(pNative->caller, pNative->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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
@@ -242,44 +190,46 @@ 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(g_pCaller, g_Params[p], str, params[3]);
+	return set_amxstring(pNative->caller, pNative->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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	return g_Params[p];
+	return pNative->params[p];
 }
 
 //get_param_byref(num)
 static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
 {
-	if (!g_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *addr = get_amxaddr(g_pCaller, g_Params[p]);
+	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
 
 	return addr[0];
 }
@@ -287,19 +237,20 @@ 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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *addr = get_amxaddr(g_pCaller, g_Params[p]);
+	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
 
 	addr[0] = params[2];
 
@@ -309,19 +260,20 @@ 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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *source = get_amxaddr(g_pCaller, g_Params[p]);
+	cell *source = get_amxaddr(pNative->caller, pNative->params[p]);
 	cell *dest = get_amxaddr(amx, params[2]);
 
 	int size = params[3];
@@ -334,19 +286,20 @@ 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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	int p = params[1];
 
-	cell *dest = get_amxaddr(g_pCaller, g_Params[p]);
+	cell *dest = get_amxaddr(pNative->caller, pNative->params[p]);
 	cell *source = get_amxaddr(amx, params[2]);
 
 	int size = params[3];
@@ -356,84 +309,26 @@ 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_pCurNative || (g_pCurNative->amx != amx))
+	if (!g_NativeStack.size())
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	if (g_pCurNative->style != 1)
+	regnative *pNative = g_NativeStack.front();
+	if (pNative->style != 1)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
 		return 0;
 	}
 	cell p = params[1];
 
-	AMX *caller = g_pCaller;
+	AMX *caller = pNative->caller;
 
 	unsigned char *data =amx->base+(int)((AMX_HEADER *)amx->base)->dat;
 	unsigned char *realdata = caller->base+(int)((AMX_HEADER *)caller->base)->dat;
@@ -448,7 +343,7 @@ static cell AMX_NATIVE_CALL register_library(AMX *amx, cell *params)
 	int len;
 	char *lib = get_amxstring(amx, params[1], 0, len);
 
-	AddLibrary(lib, LibType_Library, LibSource_Plugin, g_plugins.findPluginFast(amx));
+	AddPluginLibrary(lib);
 
 	return 1;
 }
@@ -501,9 +396,27 @@ static cell AMX_NATIVE_CALL register_native(AMX *amx, cell *params)
 	return 1;
 }
 
+bool LibraryExists(const char *name)
+{
+	for (size_t i=0; i<g_Libraries.size(); i++)
+	{
+		if (stricmp(g_Libraries[i].c_str(), name)==0)
+			return true;
+	}
+
+	return false;
+}
+
+void AddPluginLibrary(const char *name)
+{
+	String f(name);
+	g_Libraries.push_back(f);
+}
+
 void ClearPluginLibraries()
 {
-	ClearLibraries(LibSource_Plugin);
+	g_Libraries.clear();
+
 	for (size_t i=0; i<g_RegNatives.size(); i++)
 	{
 		delete [] g_RegNatives[i]->pfn;
@@ -529,7 +442,6 @@ 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,7 +50,9 @@ struct regnative
 	String name;
 	char *pfn;
 	int func;
+	AMX *caller;
 	int style;
+	cell params[CALLFUNC_MAXPARAMS];
 };
 
 extern "C" void amxx_DynaInit(void *ptr);
@@ -59,7 +61,9 @@ extern "C" int amxx_DynaFunc(AMX *amx, cell *params);
 extern "C" int amxx_DynaCodesize();
 
 AMX_NATIVE_INFO *BuildNativeTable();
+void AddPluginLibrary(const char *name);
 void ClearPluginLibraries();
+bool LibraryExists(const char *name);
 
 //I couldn't resist :)
 extern AMX_NATIVE_INFO g_NativeNatives[];

amxmodx/newmenus.cpp

@@ -29,7 +29,6 @@
 */
 
 #include "amxmodx.h"
-#include "CMenu.h"
 #include "newmenus.h"
 
 CVector<Menu *> g_NewMenus;
@@ -38,15 +37,11 @@ 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)
@@ -61,7 +56,7 @@ void validate_menu_text(char *str)
 				str++;
 				char c = tolower(*str);
 				if (c == 'r' || c == 'w'
-					|| c== 'y' || c == 'd')
+					|| c== 'w' || c == 'd')
 				{
 					str++;
 					offs += 2;
@@ -69,51 +64,42 @@ void validate_menu_text(char *str)
 				}
 			}
 			if (offs)
-			{
 				*(str-offs) = *str;
-			}
 			str++;
 		}
 		if (offs)
-		{
 			*(str-offs) = '\0';
-		}
 	}
 }
 
-Menu::Menu(const char *title, AMX *amx, int fid) : m_Title(title), m_ItemColor("\\r"), 
+Menu::Menu(const char *title, int mid, int tid)
-m_NeverExit(false), m_AutoColors(g_coloredmenus), thisId(0), func(fid), 
-isDestroying(false), items_per_page(7)
 {
-	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
+	m_Title.assign(title);
-	menuId = g_menucmds.registerMenuId(title, amx);
+	menuId = mid;
-
+	thisId = tid;
-	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);
 	
@@ -153,9 +139,7 @@ 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));
 }
@@ -167,124 +151,35 @@ int Menu::PagekeyToItem(page_t page, item_t key)
 
 	if (num_pages == 1 || !items_per_page)
 	{
-		if (key > m_Items.size())
+		if (m_AlwaysExit && key > m_Items.size())
-		{
 			return MENU_EXIT;
-		} else {
+		else
 			return key-1;
-		}
 	} else {
 		//first page
 		if (page == 0)
 		{
-			/* The algorithm for spaces here is same as a middle page. */
+			if (key == items_per_page + 1)
-			item_t new_key = key;
-			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
-			{
-				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
-				{
-					if (m_Items[i]->blanks[j].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) {
+			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)
+			{
+				return MENU_BACK;
+			} else if (key == remaining + 2) {
 				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))
 			{
-				unsigned int num = key - items_per_page - 1;
+				return m_OptOrders[key-items_per_page-1];
-				static int map[] = {MENU_BACK, MENU_MORE, MENU_EXIT};
-				return map[num];
 			} else {
 				return (start + key - 1);
 			}
@@ -326,18 +221,10 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	m_Text.clear();
 
 	char buffer[255];
-	if (items_per_page && (pages != 1))
+	if (m_AutoColors)
-	{
+		_snprintf(buffer, sizeof(buffer)-1, "\\y%s %d/%d\n\\w\n", m_Title.c_str(), page + 1, pages);
-		if (m_AutoColors)
+	else
-			_snprintf(buffer, sizeof(buffer)-1, "\\y%s %d/%d\n\\w\n", m_Title.c_str(), page + 1, pages);
+		_snprintf(buffer, sizeof(buffer)-1, "%s %d/%d\n\n", m_Title.c_str(), page + 1, pages);
-		else
-			_snprintf(buffer, sizeof(buffer)-1, "%s %d/%d\n\n", m_Title.c_str(), page + 1, pages);
-	} else {
-		if (m_AutoColors)
-			_snprintf(buffer, sizeof(buffer)-1, "\\y%s\n\\w\n", m_Title.c_str());
-		else
-			_snprintf(buffer, sizeof(buffer)-1, "%s\n\n", m_Title.c_str());
-	}
 	
 	m_Text.append(buffer);
 
@@ -345,10 +232,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)
@@ -360,18 +247,17 @@ 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;
 	
@@ -380,66 +266,46 @@ 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());
-				_snprintf(buffer, sizeof(buffer)-1, "%s%d.\\w %s\n", m_ItemColor.c_str(),option_display, pItem->name.c_str());
+			else
-			} else {
+				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
-				_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_display, pItem->name.c_str());
+				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", ++option, pItem->name.c_str());
 			} else {
 				_snprintf(buffer, sizeof(buffer)-1, "#. %s\n", pItem->name.c_str());
+				option++;
 			}
 		}
 		slots++;
@@ -451,120 +317,79 @@ 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].EatNumber())
+				if (pItem->blanks[j] == 1)
-				{
 					option++;
-				}
-				m_Text.append(pItem->blanks[j].GetDisplay());
 				m_Text.append("\n");
 				slots++;
 			}
 		}
 	}
 
-	if (items_per_page)
+	if (padding == 1 && items_per_page)
 	{
-		/* Pad spaces until we reach the end of the max possible items */
+		int pad = items_per_page;
-		for (unsigned int i=(unsigned)slots; i<items_per_page; i++)
+		if (flags & Display_Back)
+			pad--;
+		if (flags & Display_Next)
+			pad--;
+		if (flags & Display_Exit)
+			pad--;
+		for (int i=slots+1; i<=pad; i++)
 		{
 			m_Text.append("\n");
 			option++;
 		}
-		/* Make sure there is at least one visual pad */
+	}
-		m_Text.append("\n");
 
-		/* Don't bother if there is only one page */
+	for (int i=0; i<3; i++)
-		if (pages > 1)
+	{
+		switch (m_OptOrders[i])
 		{
-			if (flags & Display_Back)
+		case MENU_BACK:
 			{
-				keys |= (1<<option++);
+				if (flags & Display_Back)
-				if (m_AutoColors)
 				{
+					keys |= (1<<option++);
 					_snprintf(buffer, 
 						sizeof(buffer)-1, 
-						"%s%d. \\w%s\n", 
+						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						m_ItemColor.c_str(), 
+						option, 
-						option == 10 ? 0 : option, 
+						m_OptNames[abs(MENU_BACK)].c_str()
-						m_OptNames[abs(MENU_BACK)].c_str());
+						);
-				} else {
+					m_Text.append(buffer);
-					_snprintf(buffer, 
-						sizeof(buffer)-1, 
-						"%d. %s\n", 
-						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_BACK)].c_str());
-				}
-			} 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());
 				}
+				break;
 			}
-			m_Text.append(buffer);
+		case MENU_MORE:
-	
-			if (flags & Display_Next)
 			{
-				keys |= (1<<option++);
+				if (flags & Display_Next)
-				if (m_AutoColors)
 				{
+					keys |= (1<<option++);
 					_snprintf(buffer, 
 						sizeof(buffer)-1, 
-						"%s%d. \\w%s\n", 
+						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						m_ItemColor.c_str(), 
+						option, 
-						option == 10 ? 0 : option, 
+						m_OptNames[abs(MENU_MORE)].c_str()
-						m_OptNames[abs(MENU_MORE)].c_str());
+						);
-				} else {
+					m_Text.append(buffer);
-					_snprintf(buffer, 
-						sizeof(buffer)-1, 
-						"%d. %s\n", 
-						option == 10 ? 0 : option, 
-						m_OptNames[abs(MENU_MORE)].c_str());
-				}
-			} else {
-				option++;
-				if (m_AutoColors)
-				{
-					_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());
 				}
+				break;
 			}
-			m_Text.append(buffer);
+		case MENU_EXIT:
-		} else {
-			/* Keep padding */
-			option += 2;
-		}
-
-		if (!m_NeverExit)
-		{
-			keys |= (1<<option++);
-			if (m_AutoColors)
 			{
-				_snprintf(buffer, 
+				if (flags & Display_Exit)
-					sizeof(buffer)-1, 
+				{
-					"%s%d. \\w%s\n", 
+					keys |= (1<<option++);
-					m_ItemColor.c_str(), 
+					_snprintf(buffer, 
-					option == 10 ? 0 : option, 
+						sizeof(buffer)-1, 
-					m_OptNames[abs(MENU_EXIT)].c_str());
+						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-			} else {
+						option, 
-				_snprintf(buffer, 
+						m_OptNames[abs(MENU_EXIT)].c_str()
-					sizeof(buffer)-1, 
+						);
-					"%d. %s\n", 
+					m_Text.append(buffer);
-					option == 10 ? 0 : option, 
+				}
-					m_OptNames[abs(MENU_EXIT)].c_str());
+				break;
 			}
-			m_Text.append(buffer);
 		}
 	}
 	
@@ -593,21 +418,27 @@ static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
 		return 0;
 	}
 
-	Menu *pMenu = new Menu(title, amx, func);
+	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;
 
 	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]);
@@ -625,51 +456,7 @@ 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;
 }
@@ -729,36 +516,6 @@ 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;
 
@@ -887,13 +644,6 @@ 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]);
@@ -929,23 +679,51 @@ 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 || ans == 0)
+			if (ans == 1)
 			{
+				pMenu->m_AlwaysExit = true;
+				pMenu->m_NeverExit = false;
+			} else if (ans == 0) {
+				pMenu->m_AlwaysExit = false;
 				pMenu->m_NeverExit = false;
 			} else if (ans == -1) {
 				pMenu->m_NeverExit = true;
+				pMenu->m_AlwaysExit = false;
 			}
 			break;
 		}
 	case MPROP_ORDER:
 		{
-			/* Ignored as of 1.8.0 */
+			cell *addr = get_amxaddr(amx, params[3]);
+			pMenu->m_OptOrders[0] = addr[0];
+			pMenu->m_OptOrders[1] = addr[1];
+			pMenu->m_OptOrders[2] = addr[2];
 			break;
 		}
 	case MPROP_NOCOLORS:
@@ -955,7 +733,7 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 		}
 	case MPROP_PADMENU:
 		{
-			/* Ignored as of 1.8.0 */
+			pMenu->padding = *get_amxaddr(amx, params[3]);
 			break;
 		}
 	default:
@@ -973,62 +751,27 @@ static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
 	return 0; } \
 	Menu *pMenu = g_NewMenus[p];
 
-static cell AMX_NATIVE_CALL menu_cancel(AMX *amx, cell *params)
-{
-	int index = params[1];
-
-	if (index < 1 || index > gpGlobals->maxClients)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Player %d is not valid", index);
-		return 0;
-	}
-
-	CPlayer *player = GET_PLAYER_POINTER_I(index);
-	if (!player->ingame)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Played %d is not in game", index);
-		return 0;
-	}
-
-	int menu = player->newmenu;
-	if (menu < 0 || menu >= (int)g_NewMenus.size() || !g_NewMenus[menu])
-		return 0;
-
-	Menu *pMenu = g_NewMenus[menu];
-
-	player->newmenu = -1;
-	player->menu = 0;
-	executeForwards(pMenu->func, 
-		static_cast<cell>(index),
-		static_cast<cell>(pMenu->thisId),
-		static_cast<cell>(MENU_EXIT));
-
-	return 1;
-}
-
 static cell AMX_NATIVE_CALL menu_destroy(AMX *amx, cell *params)
 {
 	GETMENU_R(params[1]);
 
 	if (pMenu->isDestroying)
-	{
 		return 0;	//prevent infinite recursion
-	}
 
 	pMenu->isDestroying = true;
-
+	g_menucmds.removeMenuId(pMenu->menuId);
 	CPlayer *player;
 	for (int i=1; i<=gpGlobals->maxClients; i++)
 	{
 		player = GET_PLAYER_POINTER_I(i);
 		if (player->newmenu == pMenu->thisId)
 		{
-			player->newmenu = -1;
-			player->menu = 0;
 			executeForwards(pMenu->func, 
 				static_cast<cell>(i), 
 				static_cast<cell>(pMenu->thisId),
 				static_cast<cell>(MENU_EXIT));
+			player->newmenu = -1;
+			player->menu = 0;
 		}
 	}
 	g_NewMenus[params[1]] = NULL;
@@ -1059,16 +802,8 @@ 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;
 }
@@ -1078,7 +813,6 @@ 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},
@@ -1090,7 +824,6 @@ AMX_NATIVE_INFO g_NewMenuNatives[] =
 	{"menu_item_setname",		menu_item_setname},
 	{"menu_destroy",			menu_destroy},
 	{"menu_setprop",			menu_setprop},
-	{"menu_cancel",				menu_cancel},
 	{"player_menu_info",		player_menu_info},
 	{NULL,						NULL},
 };

amxmodx/newmenus.h

@@ -39,7 +39,6 @@
 #define	ITEM_ENABLED	1
 #define ITEM_DISABLED	2
 
-#define MAX_MENU_ITEMS		10
 
 #define MPROP_PERPAGE	1
 #define MPROP_BACKNAME	2
@@ -50,50 +49,9 @@
 #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;
@@ -105,7 +63,7 @@ struct menuitem
 	MENUITEM_CALLBACK pfn;
 	size_t id;
 
-	CVector<BlankItem> blanks;
+	CVector<int> blanks;
 };
 
 typedef unsigned int menu_t;
@@ -115,7 +73,7 @@ typedef unsigned int page_t;
 class Menu
 {
 public:
-	Menu(const char *title, AMX *amx, int fid);
+	Menu(const char *title, int menuId, int thisId);
 	~Menu();
 	
 	menuitem *GetMenuItem(item_t item);
@@ -134,14 +92,16 @@ public:
 	String m_Text;
 
 	String m_OptNames[4];
+	int m_OptOrders[3];
 
-	String m_ItemColor;
+	bool m_AlwaysExit;
 	bool m_NeverExit;
 	bool m_AutoColors;
 	
 	int menuId;
 	int thisId;
 	int func;
+	int padding;
 	bool isDestroying;
 public:
 	unsigned int items_per_page;

amxmodx/nongpl_matches.cpp

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

@@ -1,51 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#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

@@ -1,8 +1,6 @@
 #include <string.h>
 #include "optimizer.h"
 
-int g_opt_level = 0;
-
 #define OP_SYSREQ_C		123
 #define OP_NOP			134
 #define OP_FLOAT_MUL	138
@@ -84,33 +82,15 @@ void _Setup_Optimizer_Stage2(AMX *amx, cell *oplist, cell *cip)
 		opt->natives[i] = -1;
 
 	amx->usertags[UT_OPTIMIZER] = (void *)opt;
-
+	
-	if (g_opt_level & 1)
+	FIND_NATIVE("floatmul", N_Float_Mul);
-	{
+	FIND_NATIVE("floatdiv", N_Float_Div);
-		FIND_NATIVE("floatmul", N_Float_Mul);
+	FIND_NATIVE("floatadd", N_Float_Add);
-		FIND_NATIVE("floatdiv", N_Float_Div);
+	FIND_NATIVE("floatsub", N_Float_Sub);
-		FIND_NATIVE("floatadd", N_Float_Add);
+	FIND_NATIVE("float", N_Float_To);
-		FIND_NATIVE("floatsub", N_Float_Sub);
+	FIND_NATIVE("floatround", N_Float_Round);
-	}
+	FIND_NATIVE("floatcmp", N_Float_Cmp);
-	if (g_opt_level & 4)
+	//we don't do these yet because of radix stuff >:\
-	{
-		FIND_NATIVE("float", N_Float_To);
-		FIND_NATIVE("floatround", N_Float_Round);
-	}
-	if (g_opt_level & 2)
-	{
-#if !defined AMD64
-		if (amxx_CpuSupport())
-		{
-#endif
-			FIND_NATIVE("floatcmp", N_Float_Cmp);
-#if !defined AMD64
-		} else {
-			g_opt_level &= ~(2);
-		}
-#endif
-	}
-	/* we don't do these yet because of radix stuff >:\ */
 	//FIND_NATIVE("floatsin", N_Float_Sin);
 	//FIND_NATIVE("floatcos", N_Float_Cos);
 	//FIND_NATIVE("floattan", N_Float_Tan);

amxmodx/optimizer.h

@@ -22,8 +22,5 @@ struct optimizer_s
 };
 
 void SetupOptimizer(AMX *amx);
-extern "C" int amxx_CpuSupport();
-
-extern int g_opt_level;
 
 #endif //_INCLUDE_AMXMODX_OPTIMIZER_H

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
-	FN_META_QUERY();
+	return 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
-	FN_META_DETACH();
+	return 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
@@ -2430,14 +2430,11 @@ static amxx_module_info_s g_ModuleInfo =
 #else // MODULE_RELOAD_ON_MAPCHANGE
 	0,
 #endif // MODULE_RELOAD_ON_MAPCHANGE
-	MODULE_LOGTAG,
+	MODULE_LOGTAG
-	MODULE_LIBRARY,
-	MODULE_LIBCLASS
 };
 
 // Storage for the requested functions
 PFN_ADD_NATIVES				g_fn_AddNatives;
-PFN_ADD_NEW_NATIVES			g_fn_AddNewNatives;
 PFN_BUILD_PATHNAME			g_fn_BuildPathname;
 PFN_BUILD_PATHNAME_R		g_fn_BuildPathnameR;
 PFN_GET_AMXADDR				g_fn_GetAmxAddr;
@@ -2509,14 +2506,6 @@ PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
 PFN_PLAYER_PROP_ADDR		g_fn_PlayerPropAddr;
 PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
 PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
-PFN_FINDLIBRARY				g_fn_FindLibrary;
-PFN_ADDLIBRARIES			g_fn_AddLibraries;
-PFN_REMOVELIBRARIES			g_fn_RemoveLibraries;
-PFN_OVERRIDENATIVES			g_fn_OverrideNatives;
-PFN_GETLOCALINFO			g_fn_GetLocalInfo;
-PFN_AMX_REREGISTER			g_fn_AmxReRegister;
-PFN_REGISTERFUNCTIONEX		g_fn_RegisterFunctionEx;
-PFN_MESSAGE_BLOCK			g_fn_MessageBlock;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2548,14 +2537,6 @@ 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
@@ -2575,7 +2556,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("MergeDefinitionFile", g_fn_MergeDefinition_File, PFN_MERGEDEFINITION_FILE);
 	REQFUNC("Format", g_fn_Format, PFN_FORMAT);
 	REQFUNC("RegisterFunction", g_fn_RegisterFunction, PFN_REGISTERFUNCTION);
-	REQFUNC("RegisterFunctionEx", g_fn_RegisterFunctionEx, PFN_REGISTERFUNCTIONEX);
 
 	// Amx scripts
 	REQFUNC("GetAmxScript", g_fn_GetAmxScript, PFN_GET_AMXSCRIPT);
@@ -2601,7 +2581,6 @@ 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);
@@ -2641,16 +2620,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("RegAuthFunc", g_fn_RegAuthFunc, PFN_REG_AUTH_FUNC);
 	REQFUNC("UnregAuthFunc", g_fn_UnregAuthFunc, PFN_UNREG_AUTH_FUNC);
 
-	//Added in 1.75 
-	REQFUNC("FindLibrary", g_fn_FindLibrary, PFN_FINDLIBRARY);
-	REQFUNC("AddLibraries", g_fn_AddLibraries, PFN_ADDLIBRARIES);
-	REQFUNC("RemoveLibraries", g_fn_RemoveLibraries, PFN_REMOVELIBRARIES);
-	REQFUNC("OverrideNatives", g_fn_OverrideNatives, PFN_OVERRIDENATIVES);
-	REQFUNC("GetLocalInfo", g_fn_GetLocalInfo, PFN_GETLOCALINFO);
-	REQFUNC("AmxReregister", g_fn_AmxReRegister, PFN_AMX_REREGISTER);
-
-	REQFUNC("MessageBlock", g_fn_MessageBlock, PFN_MESSAGE_BLOCK);
-
 #ifdef MEMORY_TEST
 	// Memory
 	REQFUNC_OPT("Allocator", g_fn_Allocator, PFN_ALLOCATOR);
@@ -2685,27 +2654,14 @@ C_DLLEXPORT int AMXX_PluginsLoaded()
 	return AMXX_OK;
 }
 
-C_DLLEXPORT void AMXX_PluginsUnloaded()
-{
-#ifdef FN_AMXX_PLUGINSUNLOADED
-	FN_AMXX_PLUGINSUNLOADED();
-#endif // FN_AMXX_PLUGINSUNLOADED
-}
-
-C_DLLEXPORT void AMXX_PluginsUnloading()
-{
-#ifdef FN_AMXX_PLUGINSUNLOADING
-	FN_AMXX_PLUGINSUNLOADING();
-#endif // FN_AMXX_PLUGINSUNLOADING
-}
-
 // Advanced MF functions
 void MF_Log(const char *fmt, ...)
 {
+	// :TODO: Overflow possible here
 	char msg[3072];
 	va_list arglst;
 	va_start(arglst, fmt);
-	vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
+	vsprintf(msg, fmt, arglst);
 	va_end(arglst);
 
 	g_fn_Log("[%s] %s", MODULE_LOGTAG, msg);
@@ -2713,10 +2669,11 @@ void MF_Log(const char *fmt, ...)
 
 void MF_LogError(AMX *amx, int err, const char *fmt, ...)
 {
+	// :TODO: Overflow possible here
 	char msg[3072];
 	va_list arglst;
 	va_start(arglst, fmt);
-	vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
+	vsprintf(msg, fmt, arglst);
 	va_end(arglst);
 
 	g_fn_LogErrorFunc(amx, err, "[%s] %s", MODULE_LOGTAG, msg);
@@ -2784,16 +2741,10 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetPlayerEdict(0);
 	MF_Format("", 4, "str");
 	MF_RegisterFunction(NULL, "");
-	MF_RegisterFunctionEx(NULL, "");
 	MF_SetPlayerTeamInfo(0, 0, "");
 	MF_PlayerPropAddr(0, 0);
 	MF_RegAuthFunc(NULL);
 	MF_UnregAuthFunc(NULL);
-	MF_FindLibrary(NULL, LibType_Class);
-	MF_AddLibraries(NULL, LibType_Class, NULL);
-	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL, NULL);
-	MF_MessageBlock(0, 0, NULL);
 }
 #endif
 

amxmodx/sdk/amxxmodule.h

@@ -10,7 +10,6 @@
 // config
 #include "moduleconfig.h"
 
-#include <stddef.h> // size_t
 // metamod include files
 #ifdef USE_METAMOD
 #include <extdll.h>
@@ -23,7 +22,7 @@
 #ifndef __linux__
 #define DLLEXPORT __declspec(dllexport)
 #else
-#define DLLEXPORT __attribute__((visibility("default")))
+#define DLLEXPORT
 #define LINUX
 #endif
 
@@ -35,8 +34,7 @@
 // module interface version was 1
 // 2 - added logtag to struct (amxx1.1-rc1)
 // 3 - added new tagAMX structure (amxx1.5)
-// 4 - added new 'library' setting for direct loading
+#define AMXX_INTERFACE_VERSION 3
-#define AMXX_INTERFACE_VERSION 4
 
 // amxx module info
 struct amxx_module_info_s
@@ -46,8 +44,6 @@ struct amxx_module_info_s
 	const char *version;
 	int reload;				// reload on mapchange when nonzero
 	const char *logtag;		// added in version 2
-	const char *library;	// added in version 4
-	const char *libclass;	// added in version 4
 };
 
 // return values from functions called by amxx
@@ -56,9 +52,6 @@ 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
@@ -160,137 +153,9 @@ typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
 #endif
 
 #if defined _MSC_VER
-	#pragma warning(disable:4103)  /* disable warning message 4103 that complains
+  #pragma warning(disable:4103)  /* disable warning message 4103 that complains
-	                                * about pragma pack in a header file */
+                                  * about pragma pack in a header file */
-	#pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
+  #pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
-
-	#if _MSC_VER >= 1400
-		#if !defined NO_MSVC8_AUTO_COMPAT
-
-			/* Disable deprecation warnings concerning unsafe CRT functions */
-			#if !defined _CRT_SECURE_NO_DEPRECATE
-				#define _CRT_SECURE_NO_DEPRECATE
-			#endif
-
-			/* Replace the POSIX function with ISO C++ conformant ones as they are now deprecated */
-			#define access _access
-			#define cabs _cabs
-			#define cgets _cgets
-			#define chdir _chdir
-			#define chmod _chmod
-			#define chsize _chsize
-			#define close _close
-			#define cprintf _cprintf
-			#define cputs _cputts
-			#define creat _creat
-			#define cscanf _cscanf
-			#define cwait _cwait
-			#define dup _dup
-			#define dup2 _dup2
-			#define ecvt _ecvt
-			#define eof _eof
-			#define execl _execl
-			#define execle _execle
-			#define execlp _execlp
-			#define execlpe _execlpe
-			#define execv _execv
-			#define execve _execv
-			#define execvp _execvp
-			#define execvpe _execvpe
-			#define fcloseall _fcloseall
-			#define fcvt _fcvt
-			#define fdopen _fdopen
-			#define fgetchar _fgetchar
-			#define filelength _filelength
-			#define fileno _fileno
-			#define flushall _flushall
-			#define fputchar _fputchar
-			#define gcvt _gcvt
-			#define getch _getch
-			#define getche _getche
-			#define getcwd _getcwd
-			#define getpid _getpid
-			#define getw _getw
-			#define hypot _hypot
-			#define inp _inp
-			#define inpw _inpw
-			#define isascii __isascii
-			#define isatty _isatty
-			#define iscsym __iscsym
-			#define iscsymf __iscsymf
-			#define itoa _itoa
-			#define j0 _j0
-			#define j1 _j1
-			#define jn _jn
-			#define kbhit _kbhit
-			#define lfind _lfind
-			#define locking _locking
-			#define lsearch _lsearch
-			#define lseek _lseek
-			#define ltoa _ltoa
-			#define memccpy _memccpy
-			#define memicmp _memicmp
-			#define mkdir _mkdir
-			#define mktemp _mktemp
-			#define open _open
-			#define outp _outp
-			#define outpw _outpw
-			#define putch _putch
-			#define putenv _putenv
-			#define putw _putw
-			#define read _read
-			#define rmdir _rmdir
-			#define rmtmp _rmtmp
-			#define setmode _setmode
-			#define sopen _sopen
-			#define spawnl _spawnl
-			#define spawnle _spawnle
-			#define spawnlp _spawnlp
-			#define spawnlpe _spawnlpe
-			#define spawnv _spawnv
-			#define spawnve _spawnve
-			#define spawnvp _spawnvp
-			#define spawnvpe _spawnvpe
-			#define strcmpi _strcmpi
-			#define strdup _strdup
-			#define stricmp _stricmp
-			#define strlwr _strlwr
-			#define strnicmp _strnicmp
-			#define strnset _strnset
-			#define strrev _strrev
-			#define strset _strset
-			#define strupr _strupr
-			#define swab _swab
-			#define tell _tell
-			#define tempnam _tempnam
-			#define toascii __toascii
-			#define tzset _tzset
-			#define ultoa _ultoa
-			#define umask _umask
-			#define ungetch _ungetch
-			#define unlink _unlink
-			#define wcsdup _wcsdup
-			#define wcsicmp _wcsicmp
-			#define wcsicoll _wcsicoll
-			#define wcslwr _wcslwr
-			#define wcsnicmp _wcsnicmp
-			#define wcsnset _wcsnset
-			#define wcsrev _wcsrev
-			#define wcsset _wcsset
-			#define wcsupr _wcsupr
-			#define write _write
-			#define y0 _y0
-			#define y1 _y1
-			#define yn _yn
-
-			/* Disable deprecation warnings because MSVC8 seemingly thinks the ISO C++ conformant 
-			 * functions above are deprecated. */
-			#pragma warning (disable:4996)
-				
-		#endif
-	#else
-		#define vsnprintf _vsnprintf
-	#endif
 #endif
 
 
@@ -1081,7 +946,7 @@ void FN_AlertMessage(ALERT_TYPE atype, char *szFmt, ...);
 #endif // FN_AlertMessage
 
 #ifdef FN_EngineFprintf
-void FN_EngineFprintf(void *pfile, char *szFmt, ...);
+void FN_EngineFprintf(FILE *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf
 
 #ifdef FN_PvAllocEntPrivateData
@@ -1145,11 +1010,11 @@ void FN_GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigin, flo
 #endif // FN_GetBonePosition
 
 #ifdef FN_FunctionFromName
-uint32 FN_FunctionFromName(const char *pName);
+unsigned long FN_FunctionFromName(const char *pName);
 #endif // FN_FunctionFromName
 
 #ifdef FN_NameForFunction
-const char *FN_NameForFunction(uint32);
+const char *FN_NameForFunction(unsigned long function);
 #endif // FN_NameForFunction
 
 #ifdef FN_ClientPrintf
@@ -1193,7 +1058,7 @@ CRC32_t FN_CRC32_Final(CRC32_t pulCRC);
 #endif // FN_CRC32_Final
 
 #ifdef FN_RandomLong
-int32 FN_RandomLong(int32 lLow, int32 lHigh);
+long FN_RandomLong(long lLow, long lHigh);
 #endif // FN_RandomLong
 
 #ifdef FN_RandomFloat
@@ -1662,11 +1527,11 @@ void FN_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...);
 #endif // FN_AlertMessage_Post
 
 #ifdef FN_EngineFprintf_Post
-void FN_EngineFprintf_Post(void *pfile, char *szFmt, ...);
+void FN_EngineFprintf_Post(FILE *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf_Post
 
 #ifdef FN_PvAllocEntPrivateData_Post
-void *FN_PvAllocEntPrivateData_Post(edict_t *pEdict, int32 cb);
+void *FN_PvAllocEntPrivateData_Post(edict_t *pEdict, long cb);
 #endif // FN_PvAllocEntPrivateData_Post
 
 #ifdef FN_PvEntPrivateData_Post
@@ -1726,11 +1591,11 @@ void FN_GetBonePosition_Post(const edict_t *pEdict, int iBone, float *rgflOrigin
 #endif // FN_GetBonePosition_Post
 
 #ifdef FN_FunctionFromName_Post
-uint32 FN_FunctionFromName_Post(const char *pName);
+unsigned long FN_FunctionFromName_Post(const char *pName);
 #endif // FN_FunctionFromName_Post
 
 #ifdef FN_NameForFunction_Post
-const char *FN_NameForFunction_Post(uint32);
+const char *FN_NameForFunction_Post(unsigned long function);
 #endif // FN_NameForFunction_Post
 
 #ifdef FN_ClientPrintf_Post
@@ -1774,7 +1639,7 @@ CRC32_t FN_CRC32_Final_Post(CRC32_t pulCRC);
 #endif // FN_CRC32_Final_Post
 
 #ifdef FN_RandomLong_Post
-int32 FN_RandomLong_Post(int32 lLow, int32 lHigh);
+long FN_RandomLong_Post(long lLow, long lHigh);
 #endif // FN_RandomLong_Post
 
 #ifdef FN_RandomFloat_Post
@@ -2027,10 +1892,6 @@ 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
@@ -2043,14 +1904,6 @@ void FN_AMXX_DETACH(void);
 void FN_AMXX_PLUGINSLOADED(void);
 #endif // FN_AMXX_PLUGINSLOADED
 
-#ifdef FN_AMXX_PLUGINSUNLOADING
-void FN_AMXX_PLUGINSUNLOADING(void);
-#endif // FN_AMXX_PLUGINSUNLOADING
-
-#ifdef FN_AMXX_PLUGINSUNLOADED
-void FN_AMXX_PLUGINSUNLOADED(void);
-#endif // FN_AMXX_PLUGINSUNLOADED
-
 // *** Types ***
 typedef void* (*PFN_REQ_FNPTR)(const char * /*name*/);
 
@@ -2097,22 +1950,9 @@ enum PlayerProp
 	Player_NewmenuPage,		//int
 };
 
-enum LibType
-{
-	LibType_Library,
-	LibType_Class
-};
-
-#define MSGBLOCK_SET	0
-#define MSGBLOCK_GET	1
-#define BLOCK_NOT 0
-#define BLOCK_ONCE 1
-#define BLOCK_SET 2
-
 typedef void (*AUTHORIZEFUNC)(int player, const char *authstring);
 
 typedef int				(*PFN_ADD_NATIVES)				(const AMX_NATIVE_INFO * /*list*/);
-typedef int				(*PFN_ADD_NEW_NATIVES)			(const AMX_NATIVE_INFO * /*list*/);
 typedef char *			(*PFN_BUILD_PATHNAME)			(const char * /*format*/, ...);
 typedef char *			(*PFN_BUILD_PATHNAME_R)			(char * /*buffer*/, size_t /* maxlen */, const char * /* format */, ...);
 typedef cell *			(*PFN_GET_AMXADDR)				(AMX * /*amx*/, cell /*offset*/);
@@ -2191,17 +2031,8 @@ typedef	int				(*PFN_AMX_PUSH)					(AMX * /*amx*/, cell /*value*/);
 typedef	int				(*PFN_SET_TEAM_INFO)			(int /*player */, int /*teamid */, const char * /*name */);
 typedef void			(*PFN_REG_AUTH_FUNC)			(AUTHORIZEFUNC);
 typedef void			(*PFN_UNREG_AUTH_FUNC)			(AUTHORIZEFUNC);
-typedef int				(*PFN_FINDLIBRARY)				(const char * /*name*/, LibType /*type*/);
-typedef size_t			(*PFN_ADDLIBRARIES)				(const char * /*name*/, LibType /*type*/, void * /*parent*/);
-typedef size_t			(*PFN_REMOVELIBRARIES)			(void * /*parent*/);
-typedef void			(*PFN_OVERRIDENATIVES)			(AMX_NATIVE_INFO * /*natives*/, const char * /*myname*/);
-typedef const char *	(*PFN_GETLOCALINFO)				(const char * /*name*/, const char * /*def*/);
-typedef int				(*PFN_AMX_REREGISTER)			(AMX * /*amx*/, AMX_NATIVE_INFO * /*list*/, int /*list*/);
-typedef void *			(*PFN_REGISTERFUNCTIONEX)		(void * /*pfn*/, const char * /*desc*/);
-typedef void			(*PFN_MESSAGE_BLOCK)			(int /* mode */, int /* message */, int * /* opt */);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
-extern PFN_ADD_NEW_NATIVES			g_fn_AddNewNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
 extern PFN_BUILD_PATHNAME_R			g_fn_BuildPathnameR;
 extern PFN_GET_AMXADDR				g_fn_GetAmxAddr;
@@ -2267,20 +2098,11 @@ extern PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
 extern PFN_PLAYER_PROP_ADDR			g_fn_PlayerPropAddr;
 extern PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
 extern PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
-extern PFN_FINDLIBRARY				g_fn_FindLibrary;
-extern PFN_ADDLIBRARIES				g_fn_AddLibraries;
-extern PFN_REMOVELIBRARIES			g_fn_RemoveLibraries;
-extern PFN_OVERRIDENATIVES			g_fn_OverrideNatives;
-extern PFN_GETLOCALINFO				g_fn_GetLocalInfo;
-extern PFN_AMX_REREGISTER			g_fn_AmxReRegister;
-extern PFN_REGISTERFUNCTIONEX		g_fn_RegisterFunctionEx;
-extern PFN_MESSAGE_BLOCK			g_fn_MessageBlock;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
 // They understand #if 0 so we use #ifdef MAY_NEVER_BE_DEFINED
 int				MF_AddNatives				(const AMX_NATIVE_INFO *list) { }
-int				MF_AddNewNatives			(const AMX_NATIVE_INFO *list) { }
 char *			MF_BuildPathname			(const char * format, ...) { }
 char *			MF_BuildPathnameR			(char *buffer, size_t maxlen, const char *fmt, ...) { }
 cell *			MF_GetAmxAddr				(AMX * amx, cell offset) { }
@@ -2340,18 +2162,9 @@ int				MF_SetPlayerTeamInfo		(int id, int teamid, const char *teamname) { }
 void *			MF_PlayerPropAddr			(int id, int prop) { }
 void			MF_RegAuthFunc				(AUTHORIZEFUNC fn) { }
 void			MF_UnregAuthFunc			(AUTHORIZEFUNC fn) { }
-int				MF_FindLibrary				(const char *name, LibType type) { }
-size_t			MF_AddLibraries				(const char *name, LibType type, void *parent) { }
-size_t			MF_RemoveLibraries			(void *parent) { }
-void			MF_OverrideNatives			(AMX_NATIVE_INFO *natives, const char *myname) { }
-const char *	MF_GetLocalInfo				(const char *name, const char *def) { }
-int				MF_AmxReRegister			(AMX *amx, AMX_NATIVE_INFO *list, int number) { return 0; }
-void *			MF_RegisterFunctionEx		(void *pfn, const char *description) { }
-void *			MF_MessageBlock				(int mode, int msg, int *opt) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
-#define MF_AddNewNatives g_fn_AddNewNatives
 #define MF_BuildPathname g_fn_BuildPathname
 #define MF_BuildPathnameR g_fn_BuildPathnameR
 #define MF_FormatAmxString g_fn_FormatAmxString
@@ -2418,14 +2231,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_PlayerPropAddr g_fn_PlayerPropAddr
 #define MF_RegAuthFunc g_fn_RegAuthFunc
 #define MF_UnregAuthFunc g_fn_UnregAuthFunc
-#define MF_FindLibrary g_fn_FindLibrary
-#define MF_AddLibraries g_fn_AddLibraries
-#define MF_RemoveLibraries g_fn_RemoveLibraries
-#define MF_OverrideNatives g_fn_OverrideNatives
-#define MF_GetLocalInfo g_fn_GetLocalInfo
-#define MF_AmxReRegister g_fn_AmxReRegister
-#define MF_RegisterFunctionEx g_fn_RegisterFunctionEx
-#define MF_MessageBlock g_fn_MessageBlock
 
 #ifdef MEMORY_TEST
 /*** Memory ***/

amxmodx/sdk/moduleconfig.h

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

amxmodx/sh_list.h

@@ -11,13 +11,6 @@
 #ifndef _INCLUDE_SMM_LIST_H
 #define _INCLUDE_SMM_LIST_H
 
-// MSVC8 fix for offsetof macro redefition warnings
-#ifdef _MSC_VER 
-	#if _MSC_VER >= 1400
-		#undef offsetof
-	#endif
-#endif
-
 #include <new>
 #include <malloc.h>
 

amxmodx/sorting.cpp

@@ -1,360 +0,0 @@
-#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 %-11.10s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
+		print_srvconsole("       %-18.17s %-8.7s %-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 %-11.10s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
+			print_srvconsole(" [%3d] %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
 			++a;
 		}
 
@@ -83,27 +83,11 @@ void amx_command()
 
 		if (plugin && plugin->isValid()) 
 		{
-			if (plugin->isPaused())
+			plugin->pausePlugin();
-			{
+			print_srvconsole("Paused plugin \"%s\"\n", plugin->getName());
-				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) 
 	{
@@ -113,21 +97,14 @@ void amx_command()
 
 		if (plugin && plugin->isValid() && plugin->isPaused()) 
 		{
-			if (plugin->isStopped())
+			plugin->unpausePlugin();
-			{
+			print_srvconsole("Unpaused plugin \"%s\"\n", plugin->getName());
-				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.\n", sPlugin);
+			print_srvconsole("Plugin %s can't be unpaused right now.", sPlugin);
 		}
 	}
 	else if (!strcmp(cmd, "cvars")) 
@@ -137,24 +114,9 @@ void amx_command()
 
 		int ammount = 0;
 
-		if (CMD_ARGC() > 2) // Searching for cvars registered to a plugin
+		for (CList<CCVar>::iterator a = g_cvars.begin(); a; ++a)
 		{
-			const char* targetname = CMD_ARGV(2);
+			print_srvconsole(" [%3d] %-24.23s %-24.23s %-16.15s\n", ++ammount, (*a).getName(), CVAR_GET_STRING((*a).getName()), (*a).getPluginName());
-			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);
@@ -169,38 +131,22 @@ void amx_command()
 
 		CmdMngr::iterator a = g_commands.begin(CMD_ConsoleCommand);
 
-		if (CMD_ARGC() > 2) // Searching for commands registered to a plugin
+		while (a)
 		{
-			const char* targetname = CMD_ARGV(2);
+			UTIL_GetFlags(access, (*a).getFlags());
-			size_t len = strlen(targetname);
+			print_srvconsole(" [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n", ++ammount, (*a).getCmdLine(), access, (*a).getCmdType(), (*a).getPlugin()->getName());
-			while (a)
+			++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:\n\tDavid \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko\n");
+		print_srvconsole("Authors: David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko\n");
 		print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n");
 		print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n");
-		print_srvconsole("\tBorja \"faluco\" Ferrer, Scott \"Damaged Soul\" Ehlert\n");
+		print_srvconsole("\tBorja \"faluco\" Ferrer\n");
 		print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__);
 #if defined JIT && !defined ASM32
 		print_srvconsole("Core mode: JIT Only\n");
@@ -215,7 +161,7 @@ void amx_command()
 	else if (!strcmp(cmd, "modules"))
 	{
 		print_srvconsole("Currently loaded modules:\n");
-		print_srvconsole("      %-23.22s %-11.10s %-20.19s %-11.10s\n", "name", "version", "author", "status");
+		print_srvconsole("      %-23.22s %-8.7s %-20.19s %-11.10s\n", "name", "version", "author", "status");
 
 		int running = 0;
 		int modules = 0;
@@ -228,7 +174,7 @@ void amx_command()
 				++running;
 			++modules;
 
-			print_srvconsole(" [%2d] %-23.22s %-11.10s %-20.19s %-11.10s\n", modules, (*a).getName(), (*a).getVersion(), (*a).getAuthor(), (*a).getStatus());
+			print_srvconsole(" [%2d] %-23.22s %-8.7s %-20.19s %-11.10s\n", modules, (*a).getName(), (*a).getVersion(), (*a).getAuthor(), (*a).getStatus());
 			++a;
 		}
 
@@ -298,8 +244,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 [ plugin ]       - list cvars registered by plugins\n");
+		print_srvconsole("   cvars                  - list cvars registered by plugins\n");
-		print_srvconsole("   cmds [ plugin ]        - list commands registered by plugins\n");
+		print_srvconsole("   cmds                   - 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");
 	}
@@ -307,6 +253,7 @@ void amx_command()
 
 void plugin_srvcmd()
 {
+	cell ret = 0;
 	const char* cmd = CMD_ARGV(0);
 				
 	CmdMngr::iterator a = g_commands.srvcmdbegin();

amxmodx/string.cpp

@@ -32,8 +32,6 @@
 #include <ctype.h>
 #include "amxmodx.h"
 #include "format.h"
-#include "binlog.h"
-#include "amxmod_compat.h"
 
 const char* stristr(const char* str, const char* substr)
 {
@@ -59,18 +57,7 @@ const char* stristr(const char* str, const char* substr)
 
 char* format_amxstring(AMX *amx, cell *params, int parm, int& len)
 {
-#if !defined BINLOG_ENABLED
 	return g_langMngr.FormatAmxString(amx, params, parm, len);
-#else
-	char *ans = g_langMngr.FormatAmxString(amx, params, parm, len);
-	if (g_binlog_level & 4)
-	{
-		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
-		if (pl)
-			g_BinLog.WriteOp(BinLog_FormatString, pl->getId(), parm, len, ans);
-	}
-	return ans;
-#endif
 }
 
 int amxstring_len(cell* a)
@@ -92,15 +79,6 @@ int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max)
 {
 	register cell* dest = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
 	register cell* start = dest;
-
-#if defined BINLOG_ENABLED
-	if (g_binlog_level & 2)
-	{
-		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
-		if (pl)
-			g_BinLog.WriteOp(BinLog_SetString, pl->getId(), amx_addr, max, source);
-	}
-#endif
 	
 	while (max-- && *source)
 		*dest++ = (cell)*source++;
@@ -115,69 +93,25 @@ extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, in
 	register cell *source = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
 	register char *dest = destination;
 	char *start = dest;
-
+	
-	if ( (amx->flags & AMX_FLAG_OLDFILE) &&
+	while (maxlen-- && *source)
-		(*source & BCOMPAT_TRANSLATE_BITS) )
+		*dest++=(char)(*source++);
-	{
-		const char *def, *key;
-		if (!translate_bcompat(amx, source, &key, &def))
-		{
-			goto normal_string;
-		}
-		while (maxlen-- && *def)
-			*dest++=(*source++);
-	} else {
-normal_string:
-		while (maxlen-- && *source)
-			*dest++=(char)(*source++);
-	}
 
 	*dest = '\0';
 
-#if defined BINLOG_ENABLED
-	if (g_binlog_level & 2)
-	{
-		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
-		if (pl)
-			g_BinLog.WriteOp(BinLog_GetString, pl->getId(), amx_addr, destination);
-	}
-#endif
-
 	return dest - start;
 }
 
-char *get_amxstring(AMX *amx, cell amx_addr, int id, int& len)
+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;
+	
+	while ((*dest++=(char)(*source++)));
 
-	if ( (amx->flags & AMX_FLAG_OLDFILE) &&
+	len = --dest - start;
-		 (*source & BCOMPAT_TRANSLATE_BITS) )
-	{
-		const char *def, *key;
-		if (!translate_bcompat(amx, source, &key, &def))
-		{
-			goto normal_string;
-		}
-		while ( (*dest++ = (*def++)) );
-		len = --dest - start;
-	} else {
-normal_string:
-		while ((*dest++=(char)(*source++)));
-
-		len = --dest - start;
-	}
-
-#if defined BINLOG_ENABLED
-	if (g_binlog_level & 2)
-	{
-		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(amx);
-		if (pl)
-			g_BinLog.WriteOp(BinLog_GetString, pl->getId(), amx_addr, start);
-	}
-#endif
 	
 	return start;
 }
@@ -345,7 +279,7 @@ static cell AMX_NATIVE_CALL numtostr(AMX *amx, cell *params) /* 3 param */
 {
 	char szTemp[32];
 	sprintf(szTemp, "%d", (int)params[1]);
-
+	
 	return set_amxstring(amx, params[2], szTemp, params[3]);
 }
 
@@ -443,42 +377,15 @@ 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)
+	while (c-- && *src)
-	{
+		*dest++ =* src++;
-		if (*src & BCOMPAT_TRANSLATE_BITS)
+	*dest = 0;
-		{
+	
-			const char *key, *def;
+	return (dest - start);
-			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';
-
-		return (dest - start);
-	}
 }
 
 static cell AMX_NATIVE_CALL copyc(AMX *amx, cell *params) /* 4 param */
@@ -595,26 +502,7 @@ static cell AMX_NATIVE_CALL format(AMX *amx, cell *params) /* 3 param */
 	if (copy)
 		buf = g_cpbuf;
 	int param = 4;
-	size_t total = 0;
+	size_t total = atcprintf(buf, maxlen, fmt, amx, params, &param);
-
-	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 */
@@ -869,7 +757,7 @@ do_copy:
 					i++;
 				const char *start = had_quotes ? &(string[beg+1]) : &(string[beg]);
 				size_t _end = had_quotes ? (i==len-1 ? 1 : 2) : 0;
-				size_t end = (pos - _end > (size_t)LeftMax) ? (size_t)LeftMax : pos - _end;
+				size_t end = (pos - _end > LeftMax) ? LeftMax : pos - _end;
 				size_t to_go = end-beg;
 				if (end && to_go)
 				{
@@ -877,7 +765,7 @@ do_copy:
 						*left++ = (cell)*start++;
 				}
 				*left = '\0';
-				end = (len-i+1 > (size_t)RightMax) ? (size_t)RightMax : len-i+1;
+				end = (len-i+1 > RightMax) ? RightMax : len-i+1;
                 if (end)
 				{
 					start = &(string[i]);
@@ -905,7 +793,7 @@ static cell AMX_NATIVE_CALL format_args(AMX *amx, cell *params)
 	
 	if (pos < 0)
 	{
-		LogError(amx, AMX_ERR_NATIVE, "Pos has to be a positive number");
+		amx_RaiseError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -936,6 +824,7 @@ 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)))
@@ -1016,6 +905,7 @@ 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)
@@ -1035,6 +925,7 @@ 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)
@@ -1043,67 +934,6 @@ static cell AMX_NATIVE_CALL n_strfind(AMX *amx, cell *params)
 	return (find - str);
 }
 
-static cell AMX_NATIVE_CALL vformat(AMX *amx, cell *params)
-{
-	int vargPos = static_cast<int>(params[4]);
-
-	/** get the parent parameter array */
-	AMX_HEADER *hdr = (AMX_HEADER *)amx->base;
-	cell *local_params = (cell *)(
-		(char *)amx->base + (cell)hdr->dat +
-		(cell)amx->frm + (2 * sizeof(cell))
-		);
-
-	cell max = local_params[0] / sizeof(cell);
-	if (vargPos > (int)max + 1)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid vararg parameter passed: %d", vargPos);
-		return 0;
-	}
-	
-	/**
-	 * check for bounds clipping
-	 */
-	cell addr_start = params[1];
-	cell addr_end = addr_start + params[2];
-	bool copy = false;
-	for (int i = vargPos; i <= max; i++)
-	{
-		//does this clip the bounds?
-		if ( (local_params[i] >= addr_start)
-			&& (local_params[i] <= addr_end) )
-		{
-			copy = true;
-			break;
-		}
-	}
-
-	/* get destination info */
-	cell *fmt = get_amxaddr(amx, params[3]);
-	cell *realdest = get_amxaddr(amx, params[1]);
-	size_t maxlen = static_cast<size_t>(params[2]);
-	cell *dest = realdest;
-
-	/* if this is necessary... */
-	static cell cpbuf[4096];
-	if (copy)
-		dest = cpbuf;
-
-	/* perform format */
-	size_t total = atcprintf(dest, maxlen, fmt, amx, local_params, &vargPos);
-
-	/* copy back */
-	if (copy)
-	{
-		memcpy(realdest, dest, (total+1) * sizeof(cell));
-	}
-
-	return total;
-}
-
-
-
-
 AMX_NATIVE_INFO string_Natives[] =
 {
 	{"add",				add},
@@ -1139,6 +969,5 @@ AMX_NATIVE_INFO string_Natives[] =
 	{"strcmp",			n_strcmp},
 	{"str_to_float",	str_to_float},
 	{"float_to_str",	float_to_str},
-	{"vformat",			vformat},
 	{NULL,				NULL}
 };

amxmodx/strptime.cpp

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

amxmodx/svn_version.h

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

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

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

@@ -1,211 +0,0 @@
-#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"
 
-#if defined __linux__ && !defined _vsnprintf
+#ifdef __linux__
 	#define _vsnprintf vsnprintf
 #endif
 
@@ -347,4 +347,3 @@ void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1,
 	// unset the global "fake" flag
 	g_fakecmd.fake = false;
 }
-

amxmodx/vector.cpp

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

amxmodx/version.rc

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

amxmodx/zlib/zconf.h

@@ -1,5 +1,5 @@
 /* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2003 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -13,50 +13,43 @@
  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
  */
 #ifdef Z_PREFIX
-#  define deflateInit_          z_deflateInit_
+#  define deflateInit_  z_deflateInit_
-#  define deflate               z_deflate
+#  define deflate       z_deflate
-#  define deflateEnd            z_deflateEnd
+#  define deflateEnd    z_deflateEnd
-#  define inflateInit_          z_inflateInit_
+#  define inflateInit_  z_inflateInit_
-#  define inflate               z_inflate
+#  define inflate       z_inflate
-#  define inflateEnd            z_inflateEnd
+#  define inflateEnd    z_inflateEnd
-#  define deflateInit2_         z_deflateInit2_
+#  define deflateInit2_ z_deflateInit2_
-#  define deflateSetDictionary  z_deflateSetDictionary
+#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy           z_deflateCopy
+#  define deflateCopy   z_deflateCopy
-#  define deflateReset          z_deflateReset
+#  define deflateReset  z_deflateReset
-#  define deflateParams         z_deflateParams
+#  define deflatePrime  z_deflatePrime
-#  define deflateBound          z_deflateBound
+#  define deflateParams z_deflateParams
-#  define deflatePrime          z_deflatePrime
+#  define deflateBound  z_deflateBound
-#  define inflateInit2_         z_inflateInit2_
+#  define inflateInit2_ z_inflateInit2_
-#  define inflateSetDictionary  z_inflateSetDictionary
+#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync           z_inflateSync
+#  define inflateSync   z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
+#  define inflateSyncPoint z_inflateSyncPoint
-#  define inflateCopy           z_inflateCopy
+#  define inflateCopy   z_inflateCopy
-#  define inflateReset          z_inflateReset
+#  define inflateReset  z_inflateReset
-#  define inflateBack           z_inflateBack
+#  define compress      z_compress
-#  define inflateBackEnd        z_inflateBackEnd
+#  define compress2     z_compress2
-#  define compress              z_compress
+#  define compressBound z_compressBound
-#  define compress2             z_compress2
+#  define uncompress    z_uncompress
-#  define compressBound         z_compressBound
+#  define adler32       z_adler32
-#  define uncompress            z_uncompress
+#  define crc32         z_crc32
-#  define adler32               z_adler32
+#  define get_crc_table z_get_crc_table
-#  define crc32                 z_crc32
-#  define get_crc_table         z_get_crc_table
-#  define zError                z_zError
 
-#  define alloc_func            z_alloc_func
+#  define Byte          z_Byte
-#  define free_func             z_free_func
+#  define uInt          z_uInt
-#  define in_func               z_in_func
+#  define uLong         z_uLong
-#  define out_func              z_out_func
+#  define Bytef         z_Bytef
-#  define Byte                  z_Byte
+#  define charf         z_charf
-#  define uInt                  z_uInt
+#  define intf          z_intf
-#  define uLong                 z_uLong
+#  define uIntf         z_uIntf
-#  define Bytef                 z_Bytef
+#  define uLongf        z_uLongf
-#  define charf                 z_charf
+#  define voidpf        z_voidpf
-#  define intf                  z_intf
+#  define voidp         z_voidp
-#  define uIntf                 z_uIntf
-#  define uLongf                z_uLongf
-#  define voidpf                z_voidpf
-#  define voidp                 z_voidp
 #endif
 
 #if defined(__MSDOS__) && !defined(MSDOS)
@@ -68,10 +61,8 @@
 #if defined(_WINDOWS) && !defined(WINDOWS)
 #  define WINDOWS
 #endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  ifndef WIN32
+#  define WIN32
-#    define WIN32
-#  endif
 #endif
 #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
 #  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
@@ -290,7 +281,7 @@ typedef uLong FAR uLongf;
 #  ifdef VMS
 #    include <unixio.h>   /* for off_t */
 #  endif
-#  define z_off_t off_t
+#  define z_off_t  off_t
 #endif
 #ifndef SEEK_SET
 #  define SEEK_SET        0       /* Seek from beginning of file.  */
@@ -298,11 +289,11 @@ typedef uLong FAR uLongf;
 #  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
 #endif
 #ifndef z_off_t
-#  define z_off_t long
+#  define  z_off_t long
 #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 -fno-strict-aliasing
+OPT_FLAGS = -O3 -funroll-loops -s -pipe
 DEBUG_FLAGS = -g -ggdb3
-CPP = gcc-4.1
+CPP = gcc
 BINARY = amxxpc
 
 OBJECTS = amx.cpp amxxpc.cpp Binary.cpp
 
-LINK = -lz /lib32/libstdc++.a
+LINK = -lz /lib/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) -m32 -o $@ -c $<
+	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
 
 all:
 	mkdir -p $(BIN_DIR)
 	$(MAKE) amxxpc
 
 amxxpc: $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(CFLAGS) -m32 $(OBJ_LINUX) $(LINK) -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(CPP) $(INCLUDE) $(CFLAGS) $(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];
+  char name[sEXPMAX+1]  PACKED;
 } 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; 		/* file format version */
+  char    file_version  PACKED; /* file format version */
-  char    amx_version; 			/* required version of the AMX */
+  char    amx_version   PACKED; /* 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; 		/* file format version */
+  char    file_version  PACKED; /* file format version */
-  char    amx_version; 			/* required version of the AMX */
+  char    amx_version   PACKED; /* 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;
+} AMX_DBG_HDR           PACKED;
 #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]; 			/* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_FILE;
+} AMX_DBG_FILE          PACKED;
 
 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;
+} AMX_DBG_LINE          PACKED;
 
 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;				/* kind of symbol (function/variable) */
+  char    ident         PACKED; /* kind of symbol (function/variable) */
-  char    vclass; 				/* class of symbol (global/local) */
+  char    vclass        PACKED; /* class of symbol (global/local) */
   int16_t dim           PACKED; /* number of dimensions */
-  const char name[1]; 			/* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_SYMBOL;
+} AMX_DBG_SYMBOL        PACKED;
 
 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;
+} AMX_DBG_SYMDIM        PACKED;
 
 typedef struct tagAMX_DBG_TAG {
   int16_t tag           PACKED; /* tag id */
-  const char name[1];			/* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_TAG;
+} AMX_DBG_TAG           PACKED;
 
 typedef struct tagAMX_DBG_MACHINE {
   int16_t automaton     PACKED; /* automaton id */
   ucell address         PACKED; /* address of state variable */
-  const char name[1]; 			/* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_MACHINE;
+} AMX_DBG_MACHINE       PACKED;
 
 typedef struct tagAMX_DBG_STATE {
   int16_t state         PACKED; /* state id */
   int16_t automaton     PACKED; /* automaton id */
-  const char name[1]; 			/* ASCII string, zero-terminated */
+  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_STATE;
+} AMX_DBG_STATE         PACKED;
 
 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;
+} AMX_DBG                           PACKED;
 
 #if !defined iVARIABLE
   #define iVARIABLE  1  /* cell that has an address and that can be fetched directly (lvalue) */

compiler/amxxpc/amxxpc.cpp

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

compiler/amxxpc/amxxpc.h

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

compiler/amxxpc/amxxpc.sln

@@ -1,20 +1,21 @@
-
+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(SolutionConfigurationPlatforms) = preSolution
+	GlobalSection(SolutionConfiguration) = preSolution
-		Debug|Win32 = Debug|Win32
+		Debug = Debug
-		Release|Win32 = Release|Win32
+		Release = Release
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+	GlobalSection(ProjectConfiguration) = postSolution
-		{39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Debug.ActiveCfg = Debug|Win32
-		{39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.Build.0 = Debug|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Debug.Build.0 = Debug|Win32
-		{39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.ActiveCfg = Release|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Release.ActiveCfg = Release|Win32
-		{39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.Build.0 = Release|Win32
+		{39412290-D01C-472F-A439-AB5592A04C08}.Release.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
+	GlobalSection(ExtensibilityGlobals) = postSolution
-		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
 	EndGlobalSection
 EndGlobal