Tagged 0.20-TP3

amxmodx/CCmd.cpp

@@ -35,9 +35,7 @@
 // *****************************************************
 // class CmdMngr
 // *****************************************************
-
-CmdMngr::CmdMngr()
-{ 
+CmdMngr::CmdMngr() { 
 	memset(sortedlists,0,sizeof(sortedlists));
 	srvcmdlist = 0;
 	clcmdlist = 0;
@@ -51,9 +49,10 @@ CmdMngr::CmdMngr()
 
 }
 
-CmdMngr::Command::Command(CPluginMngr::CPlugin* pplugin, const char* pcmd, const char* pinfo, int pflags, 
-							int pfunc, bool pviewable, CmdMngr* pparent) : commandline(pcmd), info(pinfo)
-{
+CmdMngr::Command::Command( CPluginMngr::CPlugin* pplugin,const char* pcmd, 
+			const char* pinfo , int pflags , int pfunc, 
+			bool pviewable, CmdMngr* pparent ) : commandline(pcmd) , info(pinfo) {
+
 	char szCmd[64], szArg[64];
 	*szCmd = 0; *szArg=0;
 	sscanf(pcmd,"%s %s",szCmd,szArg);
@@ -79,21 +78,17 @@ CmdMngr::Command* CmdMngr::registerCommand(CPluginMngr::CPlugin* plugin, int fun
   Command* b = new Command( plugin ,  cmd , info ,  level , func , listable,  this );
   if ( b == 0 ) return 0;
   setCmdLink( &sortedlists[0] , b );
-	
   return b;
 }
 
 CmdMngr::Command* CmdMngr::getCmd( long int id ,int type,  int access )
 {
 	//if ( id >= 1024 || id < 0 ) return (Command*)id;
-	if (id < 0)
-	{
-		for (CmdMngr::iterator a = begin(type); a ; ++a)
-		{
+	if ( id < 0 ){
+		for (CmdMngr::iterator a = begin( type ); a ; ++a){
 			if ( (*a).id == id )
 				return &(*a);
 		}
-		
 		return 0;
 	}
 
@@ -103,7 +98,9 @@ CmdMngr::Command* CmdMngr::getCmd(long int id, int type, int access)
 		buf_cmdaccess = access;
 		buf_cmdtype = type;
 		buf_cmdid = id;
-	} else {
+	}
+	else
+	{
 		int a = id;
 		id -= buf_cmdid;
 		buf_cmdid = a;
@@ -111,11 +108,17 @@ CmdMngr::Command* CmdMngr::getCmd(long int id, int type, int access)
 
 	while ( buf_cmdptr )
 	{
-		if ((*buf_cmdptr).gotAccess(access) && (*buf_cmdptr).getPlugin()->isExecutable((*buf_cmdptr).getFunction()) && (*buf_cmdptr).isViewable())
+		
+		if ( (*buf_cmdptr).gotAccess(  access ) && 
+			(*buf_cmdptr).getPlugin()->isExecutable( (*buf_cmdptr).getFunction()  )
+			&& (*buf_cmdptr).isViewable() )
 		{
+			
 			if ( id-- == 0 ) 
 				return &(*buf_cmdptr);
+			
 		}
+		
 		++buf_cmdptr;
 	}
 
@@ -135,7 +138,10 @@ int CmdMngr::getCmdNum(int type, int access)
 
 	while ( a )
 	{
-		if ((*a).gotAccess(access) && (*a).getPlugin()->isExecutable((*a).getFunction()) && (*a).isViewable())
+			
+		if ( (*a).gotAccess(  access ) && 
+			(*a).getPlugin()->isExecutable( (*a).getFunction()  ) 
+			&& (*a).isViewable() )
 				++buf_num;
 		++a;
 	}
@@ -163,18 +169,20 @@ void CmdMngr::setCmdLink(CmdLink** a, Command* c, bool sorted)
 
 		np->next = *a;
 		*a = np;
-	} else {
+	}
+	else 
+	{
 		while ( *a ) a = &(*a)->next;
 		*a = np;
 	}
+
+	
 }
 
 void CmdMngr::clearCmdLink( CmdLink** phead, bool pclear )
 {
-	while (*phead)
-	{
+	while( *phead ){
 		CmdLink* pp = (*phead)->next;
-		
 		if ( pclear ) delete (*phead)->cmd;
 		delete *phead;
 		*phead = pp;
@@ -183,51 +191,39 @@ void CmdMngr::clearCmdLink(CmdLink** phead, bool pclear)
 
 void CmdMngr::Command::setCmdType( int a ) 
 {
-	switch (a)
-	{
+	switch(a){
 	case CMD_ConsoleCommand: cmdtype |= 3; break;
 	case CMD_ClientCommand: cmdtype |= 1; break;
 	case CMD_ServerCommand: cmdtype |= 2; break;
 	}
-
-	if (cmdtype & 1)	// ClientCommand
-	{
+	if ( cmdtype & 1 ) { // ClientCommand
 		parent->setCmdLink( &parent->sortedlists[1] , this );
-		
 		if ( !parent->registerCmdPrefix(  this ) )
 			parent->setCmdLink( &parent->clcmdlist , this , false );
 	}
-	
-	if (cmdtype & 2)	// ServerCommand
-	{
+	if ( cmdtype & 2 ) { // ServerCommand
 		parent->setCmdLink( &parent->sortedlists[2] , this );
 		parent->setCmdLink( &parent->srvcmdlist , this , false );
 	}
 }
 
-const char* CmdMngr::Command::getCmdType() const
-{
-	switch (cmdtype)
-	{
+const char* CmdMngr::Command::getCmdType() const {
+	switch( cmdtype ){
 	case 1:	return"client";
 	case 2:	return "server";
 	case 3:	return "console";
 	}
-	
 	return "unknown";
 }
 
 bool CmdMngr::registerCmdPrefix( Command* cc )
 {
 	CmdPrefix** b = findPrefix( cc->getCommand() );
-
-	if (*b)
-	{
+	if (*b){
 		setCmdLink( &(*b)->list , cc , false );
 		cc->prefix = (*b)->name.size();
 		return true;
 	}
-	
 	return false;
 }
 
@@ -235,29 +231,22 @@ void CmdMngr::registerPrefix(const char* nn)
 {
 	if ( *nn == 0 ) return;
 	CmdPrefix** b = findPrefix( nn );
-	
 	if (*b) return;
 	*b = new CmdPrefix( nn , this );
 }
 
-CmdMngr::CmdPrefix** CmdMngr::findPrefix(const char* nn)
-{
+CmdMngr::CmdPrefix** CmdMngr::findPrefix(  const char* nn ){
 	CmdPrefix** aa = &prefixHead;
-	
-	while (*aa)
-	{
+	while(*aa){
 		if ( !strncmp( (*aa)->name.c_str(), nn, (*aa)->name.size() ) ) 
 			break;
 		aa=&(*aa)->next;
 	}
-	
 	return aa;
 }
 
-void CmdMngr::clearPrefix()
-{
-	while (prefixHead)
-	{
+void CmdMngr::clearPrefix(){
+	while(prefixHead){
 		CmdPrefix* a = prefixHead->next;
 		delete prefixHead;
 		prefixHead = a;
@@ -275,8 +264,7 @@ void CmdMngr::clear()
 	clearBufforedInfo();
 }
 
-void CmdMngr::clearBufforedInfo()
-{
+void CmdMngr::clearBufforedInfo() { 
 	buf_type = -1; 
 	buf_access = 0; 
 	buf_id = -1; 

amxmodx/CCmd.h

@@ -36,8 +36,7 @@
 // class CmdMngr
 // *****************************************************
 
-enum
-{
+enum {
 	CMD_ConsoleCommand,
 	CMD_ClientCommand,
 	CMD_ServerCommand
@@ -49,17 +48,14 @@ public:
 	class Command;
 	friend class Command;
 	
-	class Command
-	{
+	class Command {
 		friend class CmdMngr;
-		
 		CPluginMngr::CPlugin* plugin;
 		CmdMngr* parent;
 		String command;
 		String argument;
 		String commandline;
 		String info;
-		
 		bool listable;
 		int function;
 		int flags;
@@ -67,10 +63,10 @@ public:
 		int cmdtype;
 		int prefix;
 		static int uniqueid;
-		
 		Command( CPluginMngr::CPlugin* pplugin,const char* pcmd, const char* pinfo , int pflags , int pfunc, bool pviewable, CmdMngr* pparent );
 		~Command();
 	public:
+
 		inline const char* getCommand() { return command.c_str(); }
 		inline const char* getArgument() { return argument.c_str(); }
 		inline const char* getCmdInfo() { return info.c_str(); }
@@ -83,17 +79,17 @@ public:
 		inline bool isViewable() const { return listable; }
 		inline int getFlags() const { return flags; }
 		inline long int getId() const { return (long int)id; }
-		
 		const char* getCmdType() const;		
 		void setCmdType( int a );
+
 	};
 
 private:
+
 	struct CmdPrefix;
 	friend struct CmdPrefix;
 
-	struct CmdLink
-	{
+	struct CmdLink {
 		Command* cmd;
 		CmdLink* next;
 		CmdLink(Command* c): cmd(c), next(0) {}
@@ -103,8 +99,7 @@ private:
 	CmdLink* srvcmdlist;
 	CmdLink* clcmdlist;
 
-	struct CmdPrefix
-	{
+	struct CmdPrefix {
 		String name;
 		CmdMngr* parent;
 		CmdLink* list;
@@ -127,16 +122,13 @@ public:
 	// Interface
 
 	void registerPrefix( const char* nn );
-	
 	Command* registerCommand( CPluginMngr::CPlugin* plugin , int func , char* cmd ,  char* info , int level , bool listable );
 	Command* getCmd( long int id ,int type,  int access);
 	int getCmdNum( int type, int access );
-	
 	void clearBufforedInfo();
 	void clear();
 
-	class iterator
-	{
+	class iterator {
 		CmdLink *a;
 	public:
 		iterator(CmdLink*aa = 0) : a(aa) {}
@@ -146,30 +138,28 @@ public:
 		operator bool () const { return a ? true : false; }
 		Command& operator*() { return *a->cmd; }
 	};
-
-	inline iterator clcmdprefixbegin(const char* nn)
-	{
+	inline iterator clcmdprefixbegin(const char* nn){
 		CmdPrefix* a = *findPrefix(nn);
 		return iterator( a ? a->list : 0 );
 	}
-
 	inline iterator clcmdbegin() const {return iterator(clcmdlist);}
 	inline iterator srvcmdbegin() const {return iterator(srvcmdlist);}
 	inline iterator begin( int type ) const { return iterator(sortedlists[type]); }
 	inline iterator end() const { return iterator(0); }
 
 private:
+
 	int buf_cmdid;
 	int buf_cmdtype;
 	int buf_cmdaccess;
-	
 	iterator buf_cmdptr;
 
 	int buf_id;
 	int buf_type;
 	int buf_access;
 	int buf_num;
+
 };
 
-#endif //COMMANDS_H
+#endif
 

amxmodx/CEvent.cpp

@@ -48,7 +48,6 @@ EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin, int func, int flags)
 	m_FlagWorld = (flags & 1) ? true : false;						// flag a
 	m_FlagPlayer = (flags & 2) ? true : false;						// flag b
 	m_FlagOnce = (flags & 4) ? true : false;						// flag c
-	
 	if (flags & 24)
 	{
 		m_FlagAlive = (flags & 16) ? true : false;				// flag e
@@ -65,14 +64,12 @@ EventsMngr::ClEvent::~ClEvent()
 {
 	cond_t *tmp1 = m_Conditions;
 	cond_t *tmp2 = NULL;
-	
 	while (tmp1)
 	{
 		tmp2 = tmp1->next;
 		delete tmp1;
 		tmp1 = tmp2;
 	}
-	
 	m_Conditions = NULL;
 }
 
@@ -85,17 +82,14 @@ void EventsMngr::NextParam()
 
 	MsgDataEntry *tmp = NULL;
 	int tmpSize = 0;
-	
 	if (m_ParseVault)
 	{
 		// copy to tmp
 		tmp = new MsgDataEntry[m_ParseVaultSize];
-		
 		if (!tmp)
 		{
 			return;		// :TODO: Error report !!
 		}
-		
 		memcpy(tmp, m_ParseVault, m_ParseVaultSize * sizeof(MsgDataEntry));
 		tmpSize = m_ParseVaultSize;
 		delete [] m_ParseVault;
@@ -108,7 +102,6 @@ void EventsMngr::NextParam()
 		m_ParseVaultSize = INITIAL_PARSEVAULT_SIZE;
 
 	m_ParseVault = new MsgDataEntry[m_ParseVaultSize];
-	
 	if (tmp)
 	{
 		memcpy(m_ParseVault, tmp, tmpSize * sizeof(MsgDataEntry));
@@ -135,6 +128,7 @@ EventsMngr::~EventsMngr()
 	clearEvents();
 }
 
+
 CPluginMngr::CPlugin * EventsMngr::ClEvent::getPlugin()
 {
 	return m_Plugin;
@@ -176,7 +170,7 @@ void EventsMngr::ClEvent::registerFilter(char *filter)
 
 	// rest of line
 	tmpCond->sValue.assign(value);
-	tmpCond->fValue = static_cast<float>(atof(value));
+	tmpCond->fValue = atof(value);
 	tmpCond->iValue = atoi(value);
 	
 	tmpCond->next = NULL;
@@ -184,11 +178,10 @@ void EventsMngr::ClEvent::registerFilter(char *filter)
 	if (m_Conditions)
 	{
 		cond_t *tmp = m_Conditions;
-		
 		while (tmp->next)
 			tmp = tmp->next;
-		
 		tmp->next = tmpCond;
+
 	}
 	else
 		m_Conditions = tmpCond;
@@ -201,7 +194,6 @@ EventsMngr::ClEvent* EventsMngr::registerEvent(CPluginMngr::CPlugin* plugin, int
 		return NULL;
 
 	ClEvent *event = new ClEvent(plugin, func, flags);
-	
 	if (!event)
 		return NULL;
 
@@ -229,6 +221,7 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 		if ((*iter).m_Done)
 			continue;
 
+
 		if (!(*iter).m_Plugin->isExecutable((*iter).m_Func))
 		{
 			(*iter).m_Done = true;
@@ -254,7 +247,6 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 			(*iter).m_Done = true;
 			continue;
 		}
-		
 		m_ParseNotDone = true;
 	}
 
@@ -265,7 +257,6 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 		m_ParseVault[0].type = MSG_INTEGER;
 		m_ParseVault[0].iValue = index;
 	}
-	
 	m_ParseFun = &m_Events[msg_type];
 }
 
@@ -275,6 +266,7 @@ void EventsMngr::parseValue(int iValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
+
 	// grow if needed
 	++m_ParsePos;
 	NextParam();
@@ -292,7 +284,6 @@ void EventsMngr::parseValue(int iValue)
 		// loop through conditions
 		bool execute = false;
 		bool anyConditions = false;
-		
 		for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next)
 		{
 			if (condIter->paramId == m_ParsePos)
@@ -310,7 +301,6 @@ void EventsMngr::parseValue(int iValue)
 					break;
 			}
 		}
-		
 		if (anyConditions && !execute)
 			(*iter).m_Done = true;		// don't execute
 	}
@@ -322,6 +312,7 @@ void EventsMngr::parseValue(float fValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
+
 	// grow if needed
 	++m_ParsePos;
 	NextParam();
@@ -339,7 +330,6 @@ void EventsMngr::parseValue(float fValue)
 		// loop through conditions
 		bool execute = false;
 		bool anyConditions = false;
-		
 		for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next)
 		{
 			if (condIter->paramId == m_ParsePos)
@@ -352,12 +342,10 @@ void EventsMngr::parseValue(float fValue)
 				case '<': if (fValue < condIter->fValue) execute=true; break;
 				case '>': if (fValue > condIter->fValue) execute=true; break;
 				}
-				
 				if (execute)
 					break;
 			}
 		}
-		
 		if (anyConditions && !execute)
 			(*iter).m_Done = true;		// don't execute
 	}
@@ -386,7 +374,6 @@ void EventsMngr::parseValue(const char *sz)
 		// loop through conditions
 		bool execute = false;
 		bool anyConditions = false;
-		
 		for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next)
 		{
 			if (condIter->paramId == m_ParsePos)
@@ -398,12 +385,10 @@ void EventsMngr::parseValue(const char *sz)
 				case '!': if (strcmp(sz, condIter->sValue.c_str())) execute=true; break;
 				case '&': if (strstr(sz, condIter->sValue.c_str())) execute=true; break;
 				}
-				
 				if (execute)
 					break;
 			}
 		}
-		
 		if (anyConditions && !execute)
 			(*iter).m_Done = true;		// don't execute
 	}
@@ -411,11 +396,17 @@ void EventsMngr::parseValue(const char *sz)
 
 void EventsMngr::executeEvents()
 {
+	int err;
+
 	if (!m_ParseFun)
 	{
 		return;
 	}
 
+#ifdef ENABLEEXEPTIONS
+	try
+	{
+#endif		// #ifdef ENABLEEXEPTIONS
 		for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter)
 		{
 			if ( (*iter).m_Done ) 
@@ -425,8 +416,21 @@ void EventsMngr::executeEvents()
 			}
 
 			(*iter).m_Stamp = (float)*m_Timer;
-		executeForwards((*iter).m_Func, static_cast<cell>(m_ParseVault ? m_ParseVault[0].iValue : 0));
+
+			if ((err = amx_Exec((*iter).m_Plugin->getAMX(), NULL, (*iter).m_Func, 1, m_ParseVault ? m_ParseVault[0].iValue : 0)) != AMX_ERR_NONE)
+			{
+				AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, 
+					(*iter).m_Plugin->getAMX()->curline, (*iter).m_Plugin->getName());
 			}
+		}
+
+#ifdef ENABLEEXEPTIONS
+	}
+	catch( ... )
+	{
+		AMXXLOG_Log( "[AMXX] fatal error at event execution");
+	}
+#endif		// #ifdef ENABLEEXEPTIONS
 
 	m_CurrentMsgType = -1;
 	m_ParseFun = NULL;
@@ -481,9 +485,9 @@ float EventsMngr::getArgFloat(int a) const
 	switch(m_ParseVault[a].type)
 	{
 	case MSG_INTEGER:
-			return static_cast<float>(m_ParseVault[a].iValue);
+		return m_ParseVault[a].iValue;
 	case MSG_STRING:
-			return static_cast<float>(atof(m_ParseVault[a].sValue));
+		return atof(m_ParseVault[a].sValue);
 	default:
 		return m_ParseVault[a].fValue; 
 	}
@@ -495,7 +499,6 @@ void EventsMngr::clearEvents(void)
 	{
 		m_Events[i].clear();
 	}
-	
 	// delete parsevault
 	if (m_ParseVault)
 	{
@@ -523,7 +526,6 @@ int EventsMngr::getEventId(const char* msg)
 
 	// if msg is a number, return it
 	int pos = atoi(msg);
-	
 	if (pos != 0)
 		return pos;
 

amxmodx/CEvent.h

@@ -34,8 +34,7 @@
 
 #define MAX_AMX_REG_MSG MAX_REG_MSGS+16
  
-enum
-{
+enum {
 	CS_DEATHMSG = MAX_REG_MSGS,
 //	CS_ROUNDEND,
 //	CS_ROUNDSTART,
@@ -117,7 +116,6 @@ private:
 		const char* sValue;
 		MsgParamType type;
 	};
-
 	MsgDataEntry *m_ParseVault;
 	int m_ParseVaultSize;
 	void NextParam();				// make sure a new parameter can be added
@@ -142,13 +140,11 @@ public:
 	// Interface
 
 	ClEvent* registerEvent(CPluginMngr::CPlugin* plugin, int func, int flags, int msgid);
-	
 	void parserInit(int msg_type, float* timer, CPlayer* pPlayer, int index);
 	void parseValue(int iValue);
 	void parseValue(float fValue);
 	void parseValue(const char *sz);
 	void executeEvents();
-	
 	int getArgNum() const; //{ return (parsePos+1); }
 	const char* getArgString(int a) const;
 	int getArgInteger(int a) const;
@@ -158,4 +154,6 @@ public:
 	int getCurrentMsgType();
 };
 
-#endif //__CEVENTS_H__
+#endif // #ifdef __CEVENTS_H__
+
+

amxmodx/CFile.cpp

@@ -36,7 +36,6 @@
 // *****************************************************
 // class File
 // *****************************************************
-
 File::File( const char* n, const char* m )
 {
   fp = fopen( n , m );
@@ -71,6 +70,7 @@ File& operator<<(File& f, int n)
   return f;
 }
 
+
 File& operator<<( File& f, const char& c )
 {
   if ( f ) fputc( c , f.fp ) ;
@@ -96,7 +96,6 @@ int File::getline(char* buf, int sz)
 {
   int a = sz;
   char *origBuf = buf;
-	
   if ( *this )
   {
     int c;
@@ -124,3 +123,4 @@ File& File::skipWs()
   ungetc( c , fp );
   return *this;
 }
+

amxmodx/CFile.h

@@ -43,17 +43,16 @@ class File
 public:
 	File( const char* n, const char* m );
 	~File( );
-	
 	operator bool ( ) const;
-	
 	friend File& operator<<( File& f, const String& n );
 	friend File& operator<<( File& f, const char* n );
 	friend File& operator<<( File& f, const char& c );
 	friend File& operator<<( File& f, int n );
 	friend File& operator>>( File& f, String& n );
 	friend File& operator>>( File& f, char* n );
-	
 	int getline( char* buf, int sz );
-	
 	File& skipWs( );
 };
+
+
+

amxmodx/CForward.cpp

@@ -30,30 +30,19 @@
 */
 
 #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;
 	m_NumParams = numParams;
-	
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
-	
 	// 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 +51,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,86 +62,55 @@ 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++)
 	{
 		if (iter->pPlugin->isExecutable(iter->func))
 		{
-			// Get debug info
-			AMX *amx = (*iter).pPlugin->getAMX();
-			Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
-			
-			if (pDebugger)
-				pDebugger->BeginExec();
-			
 			// handle strings & arrays
 			int i;
-			
 			for (i = 0; i < m_NumParams; ++i)
 			{
 				if (m_ParamTypes[i] == FP_STRING || m_ParamTypes[i] == FP_STRINGEX)
 				{
-					const char *str = reinterpret_cast<const char*>(params[i]);
 					cell *tmp;
-					if (!str)
-						str = "";
-					amx_Allot(iter->pPlugin->getAMX(), (m_ParamTypes[i] == FP_STRING) ? strlen(str) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
-					amx_SetStringOld(tmp, str, 0, 0);
+					amx_Allot(iter->pPlugin->getAMX(),
+						(m_ParamTypes[i] == FP_STRING) ? strlen(reinterpret_cast<const char*>(params[i]))+1 : STRINGEX_MAXLENGTH,
+						&realParams[i], &tmp);
+					amx_SetString(tmp, (const char *)(params[i]), 0, 0);
 					physAddrs[i] = tmp;
 				}
 				else if (m_ParamTypes[i] == FP_ARRAY)
 				{
 					cell *tmp;
-					amx_Allot(amx, preparedArrays[params[i]].size, &realParams[i], &tmp);
+					amx_Allot(iter->pPlugin->getAMX(), preparedArrays[params[i]].size,
+						&realParams[i], &tmp);
 					physAddrs[i] = tmp;
-					
 					if (preparedArrays[params[i]].type == Type_Cell)
 					{
 						memcpy(tmp, preparedArrays[params[i]].ptr, preparedArrays[params[i]].size * sizeof(cell));
-					} else {
+					}
+					else
+					{
 						char *data = (char*)preparedArrays[params[i]].ptr;
-						
 						for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 							*tmp++ = (static_cast<cell>(*data++)) & 0xFF;
 					}
-				} else {
+				}
+				else
+				{
 					realParams[i] = params[i];
 				}
 			}
-			
-			//Push the parameters in reverse order. Weird, unfriendly part of Small 3.0!
-			for (i = m_NumParams-1; i >= 0; i--)
-			{
-				amx_Push(amx, realParams[i]);
-			}
-			
 			// exec
 			cell retVal;
-#if defined BINLOG_ENABLED
-			g_BinLog.WriteOp(BinLog_CallPubFunc, (*iter).pPlugin->getId(), iter->func);
-#endif
-			int err = amx_Exec(amx, &retVal, iter->func);
-			
+			int err = amx_Execv(iter->pPlugin->getAMX(), &retVal, iter->func, m_NumParams, realParams);
 			// log runtime error, if any
 			if (err != AMX_ERR_NONE)
-			{
-				//Did something else set an error?
-				if (pDebugger && pDebugger->ErrorExists())
-				{
-					//we don't care, something else logged the error.
-				}
-				else if (err != -1)
-				{
-					//nothing logged the error so spit it out anyway
-					LogError(amx, err, NULL);
-				}
-			}
-			
-			amx->error = AMX_ERR_NONE;
-			
-			if (pDebugger)
-				pDebugger->EndExec();
+				AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, iter->pPlugin->getAMX()->curline, iter->pPlugin->getName());
 
 			// cleanup strings & arrays
 			for (i = 0; i < m_NumParams; ++i)
@@ -166,25 +122,23 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 				else if (m_ParamTypes[i] == FP_STRINGEX)
 				{
 					// copy back
-					amx_GetStringOld(reinterpret_cast<char*>(params[i]), physAddrs[i], 0);
+					amx_GetString(reinterpret_cast<char*>(params[i]), physAddrs[i], 0);
 					amx_Release(iter->pPlugin->getAMX(), realParams[i]);
 				}
 				else if (m_ParamTypes[i] == FP_ARRAY)
 				{
 					// copy back
-					if (preparedArrays[params[i]].copyBack)
-					{
 					cell *tmp = physAddrs[i];
 					if (preparedArrays[params[i]].type == Type_Cell)
 					{
 						memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-						} else {
+					}
+					else
+					{
 						char *data = (char*)preparedArrays[params[i]].ptr;
-							
 						for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 							*data++ = static_cast<char>(*tmp++ & 0xFF);
 					}
-					}
 					amx_Release(iter->pPlugin->getAMX(), realParams[i]);
 				}
 			}
@@ -210,22 +164,16 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 			}
 		}
 	}
-	
 	return globRetVal;
 }
 
 void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
 {
-	char name[sNAMEMAX];
 	m_Func = func;
 	m_Amx = amx;
 	m_NumParams = numParams;
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = true;
-	isFree = false;
-	name[0] = '\0';
-	amx_GetPublic(amx, func, name);
-	m_Name.assign(name);
 }
 
 void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
@@ -234,15 +182,10 @@ void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const Forwar
 	m_NumParams = numParams;
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
-	isFree = false;
-	m_Name.assign(funcName);
 }
 
 cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 {
-	if (isFree)
-		return 0;
-	
 	const int STRINGEX_MAXLENGTH = 128;
 
 	cell realParams[FORWARD_MAX_PARAMS];
@@ -255,73 +198,45 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	if (!pPlugin->isExecutable(m_Func))
 		return 0;
 
-	Debugger *pDebugger = (Debugger *)m_Amx->userdata[UD_DEBUGGER];
-	if (pDebugger)
-		pDebugger->BeginExec();
-
 	// handle strings & arrays
 	int i;
-	
 	for (i = 0; i < m_NumParams; ++i)
 	{
 		if (m_ParamTypes[i] == FP_STRING || m_ParamTypes[i] == FP_STRINGEX)
 		{
-			const char *str = reinterpret_cast<const char*>(params[i]);
-			if (!str)
-				str = "";
 			cell *tmp;
-			amx_Allot(m_Amx, (m_ParamTypes[i] == FP_STRING) ? strlen(str) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
-			amx_SetStringOld(tmp, str, 0, 0);
+			amx_Allot(m_Amx,
+				(m_ParamTypes[i] == FP_STRING) ? strlen(reinterpret_cast<const char*>(params[i]))+1 : STRINGEX_MAXLENGTH,
+				&realParams[i], &tmp);
+			amx_SetString(tmp, (const char *)(params[i]), 0, 0);
 			physAddrs[i] = tmp;
 		}
 		else if (m_ParamTypes[i] == FP_ARRAY)
 		{
 			cell *tmp;
-			amx_Allot(m_Amx, preparedArrays[params[i]].size, &realParams[i], &tmp);
+			amx_Allot(m_Amx, preparedArrays[params[i]].size,
+				&realParams[i], &tmp);
 			physAddrs[i] = tmp;
-			
 			if (preparedArrays[params[i]].type == Type_Cell)
 			{
 				memcpy(tmp, preparedArrays[params[i]].ptr, preparedArrays[params[i]].size * sizeof(cell));
-			} else {
+			}
+			else
+			{
 				char *data = (char*)preparedArrays[params[i]].ptr;
-				
 				for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 					*tmp++ = (static_cast<cell>(*data++)) & 0xFF;
 			}
-		} else {
+		}
+		else
+		{
 			realParams[i] = params[i];
 		}
 	}
 
-	for (i = m_NumParams - 1; i >= 0; i--)
-		amx_Push(m_Amx, realParams[i]);
-	
 	// 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)
-	{
-		//Did something else set an error?
-		if (pDebugger && pDebugger->ErrorExists())
-		{
-			//we don't care, something else logged the error.
-		}
-		else if (err != -1)
-		{
-			//nothing logged the error so spit it out anyway
-			LogError(m_Amx, err, NULL);
-		}
-	}
-	
-	if (pDebugger)
-		pDebugger->EndExec();
-	
-	m_Amx->error = AMX_ERR_NONE;
+	amx_Execv(m_Amx, &retVal, m_Func, m_NumParams, realParams);
 
 	// cleanup strings & arrays
 	for (i = 0; i < m_NumParams; ++i)
@@ -333,25 +248,23 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 		else if (m_ParamTypes[i] == FP_STRINGEX)
 		{
 			// copy back
-			amx_GetStringOld(reinterpret_cast<char*>(params[i]), physAddrs[i], 0);
+			amx_GetString(reinterpret_cast<char*>(params[i]), physAddrs[i], 0);
 			amx_Release(m_Amx, realParams[i]);
 		}
 		else if (m_ParamTypes[i] == FP_ARRAY)
 		{
 			// copy back
-			if (preparedArrays[params[i]].copyBack)
-			{
 			cell *tmp = physAddrs[i];
 			if (preparedArrays[params[i]].type == Type_Cell)
 			{
 				memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-				} else {
+			}
+			else
+			{
 				char *data = (char*)preparedArrays[params[i]].ptr;
-					
 				for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 					*data++ = static_cast<char>(*tmp++ & 0xFF);
 			}
-			}
 			amx_Release(m_Amx, realParams[i]);
 		}
 	}
@@ -359,54 +272,34 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	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);
-	
 	return retVal;
 }
 
 int CForwardMngr::registerSPForward(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
 {
-	int retVal = -1;
+	int retVal = (m_SPForwards.size() << 1) | 1;
 	CSPForward *pForward;
-	
-	if (!m_FreeSPForwards.empty())
+	if (m_FreeSPForwards.size())
 	{
-		retVal = m_FreeSPForwards.front();
-		pForward = m_SPForwards[retVal >> 1];
+		 pForward = m_SPForwards[m_FreeSPForwards.back()];
+		 m_FreeSPForwards.pop_back();
 		 pForward->Set(func, amx, numParams, paramTypes);
-		
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		
-		m_FreeSPForwards.pop();
-	} else {
-		retVal = (m_SPForwards.size() << 1) | 1;
+	}
+	else
+	{
 		pForward = new CSPForward();
-		
 		if (!pForward)
 			return -1;
-		
 		pForward->Set(func, amx, numParams, paramTypes);
-		
-		if (pForward->getFuncsNum() == 0)
-		{
-			return -1;
-			delete pForward;
-		}
-					 
 		m_SPForwards.push_back(pForward);
 	}
-	
 	return retVal;
 }
 
@@ -414,80 +307,42 @@ int CForwardMngr::registerSPForward(const char *funcName, AMX *amx, int numParam
 {
 	int retVal = (m_SPForwards.size() << 1) | 1;
 	CSPForward *pForward;
-	
-	if (!m_FreeSPForwards.empty())
+	if (m_FreeSPForwards.size())
 	{
-		retVal = m_FreeSPForwards.front();
-		pForward = m_SPForwards[retVal>>1];			// >>1 because unregisterSPForward pushes the id which contains the sp flag
+		 pForward = m_SPForwards[m_FreeSPForwards.back()];
+		 m_FreeSPForwards.pop_back();
 		 pForward->Set(funcName, amx, numParams, paramTypes);
-		
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		
-		m_FreeSPForwards.pop();
-	} else {
+	}
+	else
+	{
 		pForward = new CSPForward();
-		
 		if (!pForward)
 			return -1;
-		
 		pForward->Set(funcName, amx, numParams, paramTypes);
-		
-		if (pForward->getFuncsNum() == 0)
-		{
-			delete pForward;
-			return -1;
-		}
-		
 		m_SPForwards.push_back(pForward);
 	}
-	
 	return retVal;
 }
 
 bool CForwardMngr::isIdValid(int id) const
 {
-	return (id >= 0) && ((id & 1) ? (static_cast<size_t>(id >> 1) < m_SPForwards.size()) : (static_cast<size_t>(id >> 1) < m_Forwards.size()));
+	return (id >= 0) && ((id & 1) ?
+		(static_cast<size_t>(id >> 1) < m_SPForwards.size()) :
+		(static_cast<size_t>(id >> 1) < m_Forwards.size()));
 }
 
 cell CForwardMngr::executeForwards(int id, cell *params)
 {
-	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : m_Forwards[id >> 1]->execute(params, m_TmpArrays);
+	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : 
+		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();
-}
-
-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);
+	return (id & 1) ? m_SPForwards[id >> 1]->getParamsNum() : 
+		m_Forwards[id >> 1]->getParamsNum();
 }
 
 void CForwardMngr::clear()
@@ -496,9 +351,7 @@ void CForwardMngr::clear()
 	{
 		delete *iter;
 	}
-	
 	SPForwardVec::iterator spIter;
-	
 	for (spIter = m_SPForwards.begin(); spIter != m_SPForwards.end(); ++spIter)
 	{
 		delete (*spIter);
@@ -506,10 +359,7 @@ void CForwardMngr::clear()
 
 	m_Forwards.clear();
 	m_SPForwards.clear();
-	
-	while (!m_FreeSPForwards.empty())
-		m_FreeSPForwards.pop();
-	
+	m_FreeSPForwards.clear();
 	m_TmpArraysNum = 0;
 }
 
@@ -520,120 +370,69 @@ bool CForwardMngr::isSPForward(int id) const
 
 void CForwardMngr::unregisterSPForward(int id)
 {
-	//make sure the id is valid
-	if (!isIdValid(id) || m_SPForwards.at(id >> 1)->isFree)
-		return;
-
-	m_SPForwards.at(id >> 1)->isFree = true;
-	m_FreeSPForwards.push(id);
-}
-
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num, int fwd_type)
-{
-	ForwardParam params[FORWARD_MAX_PARAMS];
-	
-	for (size_t i=0; i<num; i++)
-	{
-		params[i] = static_cast<ForwardParam>(list[i]);
-	}
-	
-	return g_forwards.registerForward(funcName, et, num, params, fwd_type);
+	m_FreeSPForwards.push_back(id);
 }
 
 int registerForward(const char *funcName, ForwardExecType et, ...)
 {
 	int curParam = 0;
-	
 	va_list argptr;
 	va_start(argptr, et);
-	
 	ForwardParam params[FORWARD_MAX_PARAMS];
 	ForwardParam tmp;
-	
 	while (true)
 	{
 		if (curParam == FORWARD_MAX_PARAMS)
 			break;
-		
 		tmp = (ForwardParam)va_arg(argptr, int);
-		
 		if (tmp == FP_DONE)
 			break;
-		
 		params[curParam] = tmp;
 		++curParam;
 	}
-	
 	va_end(argptr);
-	
 	return g_forwards.registerForward(funcName, et, curParam, params);
 }
 
-int registerSPForwardByNameC(AMX *amx, const char *funcName, cell *list, size_t num)
-{
-	ForwardParam params[FORWARD_MAX_PARAMS];
-	
-	for (size_t i=0; i<num; i++)
-		params[i] = static_cast<ForwardParam>(list[i]);
-
-	return g_forwards.registerSPForward(funcName, amx, num, params);
-}
-
 int registerSPForwardByName(AMX *amx, const char *funcName, ...)
 {
 	int curParam = 0;
-	
 	va_list argptr;
 	va_start(argptr, funcName);
-	
 	ForwardParam params[FORWARD_MAX_PARAMS];
 	ForwardParam tmp;
-	
 	while (true)
 	{
 		if (curParam == FORWARD_MAX_PARAMS)
 			break;
-		
 		tmp = (ForwardParam)va_arg(argptr, int);
-		
 		if (tmp == FP_DONE)
 			break;
-		
 		params[curParam] = tmp;
 		++curParam;
 	}
-	
 	va_end(argptr);
-	
 	return g_forwards.registerSPForward(funcName, amx, curParam, params);
 }
 
 int registerSPForward(AMX *amx, int func, ...)
 {
 	int curParam = 0;
-	
 	va_list argptr;
 	va_start(argptr, func);
-	
 	ForwardParam params[FORWARD_MAX_PARAMS];
 	ForwardParam tmp;
-	
 	while (true)
 	{
 		if (curParam == FORWARD_MAX_PARAMS)
 			break;
-		
 		tmp = (ForwardParam)va_arg(argptr, int);
-		
 		if (tmp == FP_DONE)
 			break;
-		
 		params[curParam] = tmp;
 		++curParam;
 	}
-	
 	va_end(argptr);
-	
 	return g_forwards.registerSPForward(func, amx, curParam, params);
 }
 
@@ -643,58 +442,38 @@ cell executeForwards(int id, ...)
 		return -1;
 
 	cell params[FORWARD_MAX_PARAMS];
-	
 	int paramsNum = g_forwards.getParamsNum(id);
-	
 	va_list argptr;
 	va_start(argptr, id);
-	
 	for (int i = 0; i < paramsNum && i < FORWARD_MAX_PARAMS; ++i)
 	{
-		if (g_forwards.getParamType(id, i) == FP_FLOAT)
+		if (params[i] == FP_FLOAT)
 		{
 			REAL tmp = (REAL)va_arg(argptr, double);			// floats get converted to doubles
 			params[i] = *(cell*)&tmp;
 		}
-		else
 		params[i] = (cell)va_arg(argptr, cell);
 	}
-	
 	va_end(argptr);
-	
 	return g_forwards.executeForwards(id, params);
 }
 
-cell CForwardMngr::prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack)
+cell CForwardMngr::prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type)
 {
-	if (m_TmpArraysNum >= FORWARD_MAX_PARAMS)
-	{
-#ifdef MEMORY_TEST
-		m_validateAllAllocUnits();
-#endif // MEMORY_TEST
-		
-		AMXXLOG_Log("[AMXX] Forwards with more than 32 parameters are not supported (tried to prepare array # %d).", m_TmpArraysNum + 1);
-		m_TmpArraysNum = 0;
-		
-		return -1;
-	}
-	
 	m_TmpArrays[m_TmpArraysNum].ptr = ptr;
 	m_TmpArrays[m_TmpArraysNum].size = size;
 	m_TmpArrays[m_TmpArraysNum].type = type;
-	m_TmpArrays[m_TmpArraysNum].copyBack = copyBack;
-
 	return m_TmpArraysNum++;
 }
 
-cell prepareCellArray(cell *ptr, unsigned int size, bool copyBack)
+cell prepareCellArray(cell *ptr, unsigned int size)
 {
-	return g_forwards.prepareArray((void*)ptr, size, Type_Cell, copyBack);
+	return g_forwards.prepareArray((void*)ptr, size, Type_Cell);
 }
 
-cell prepareCharArray(char *ptr, unsigned int size, bool copyBack)
+cell prepareCharArray(char *ptr, unsigned int size)
 {
-	return g_forwards.prepareArray((void*)ptr, size, Type_Char, copyBack);
+	return g_forwards.prepareArray((void*)ptr, size, Type_Char);
 }
 
 void unregisterSPForward(int id)

amxmodx/CForward.h

@@ -46,14 +46,7 @@
 #ifndef FORWARD_H
 #define FORWARD_H
 
-#include <stdarg.h>
-#include "sh_stack.h"
-
-const int FORWARD_MAX_PARAMS = 32;
-
-#define FORWARD_ONLY_OLD	1
-#define FORWARD_ONLY_NEW	2
-#define FORWARD_ALL			3
+const int FORWARD_MAX_PARAMS = 16;
 
 enum ForwardExecType
 {
@@ -84,11 +77,8 @@ enum ForwardArrayElemType
 struct ForwardPreparedArray
 {
 	void *ptr;
-	
 	ForwardArrayElemType type;
-	
 	unsigned int size;
-	bool copyBack;
 };
 
 // Normal forward
@@ -97,47 +87,27 @@ class CForward
 	const char *m_FuncName;
 	ForwardExecType m_ExecType;
 	int m_NumParams;
-	String m_Name;
-	
 	struct AMXForward
 	{
 		CPluginMngr::CPlugin *pPlugin;
 		int func;
 	};
-	
 	typedef CVector<AMXForward> AMXForwardList;
-	
 	AMXForwardList m_Funcs;
 	ForwardParam m_ParamTypes[FORWARD_MAX_PARAMS];
-
 public:
-	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes, int fwd_type=FORWARD_ALL);
-	CForward() {}		// leaves everything unitialized'
-	
+	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes);
+	CForward()
+	{ }			// leaves everything unitialized'
 	cell execute(cell *params, ForwardPreparedArray *preparedArrays);
-	
 	int getParamsNum() const
 	{
 		return m_NumParams;
 	}
-	
 	int getFuncsNum() const
 	{
 		return m_Funcs.size();
 	}
-
-	const char *getFuncName() const
-	{
-		return m_Name.c_str();
-	}
-	
-	ForwardParam getParamType(int paramId) const
-	{
-		if (paramId < 0 || paramId >= m_NumParams)
-			return FP_DONE;
-		
-		return m_ParamTypes[paramId];
-	}
 };
 
 // Single plugin forward
@@ -145,52 +115,31 @@ class CSPForward
 {
 	const char *m_FuncName;
 	int m_NumParams;
-	
 	ForwardParam m_ParamTypes[FORWARD_MAX_PARAMS];
 	AMX *m_Amx;
-	
 	int m_Func;
 	bool m_HasFunc;
-	String m_Name;
-
-public:
-	bool isFree;
 public:
 	CSPForward() { m_HasFunc = false; }
 	void Set(const char *funcName, AMX *amx, int numParams, const ForwardParam * paramTypes);
 	void Set(int func, AMX *amx, int numParams, const ForwardParam * paramTypes);
 
 	cell execute(cell *params, ForwardPreparedArray *preparedArrays);
-	
 	int getParamsNum() const
 	{
 		return m_NumParams;
 	}
-	
 	int getFuncsNum() const
 	{
 		return (m_HasFunc) ? 1 : 0;
 	}
-
-	const char *getFuncName() const
-	{
-		return m_Name.c_str();
-	}
-	
-	ForwardParam getParamType(int paramId) const
-	{
-		if (paramId < 0 || paramId >= m_NumParams)
-			return FP_DONE;
-		
-		return m_ParamTypes[paramId];
-	}
 };
 
 class CForwardMngr
 {
 	typedef CVector<CForward*> ForwardVec;
 	typedef CVector<CSPForward*> SPForwardVec;
-	typedef CStack<int> FreeSPVec;							// Free SP Forwards
+	typedef CVector<int> FreeSPVec;					// Free SP Forwards
 
 	ForwardVec m_Forwards;
 
@@ -203,44 +152,38 @@ public:
 
 	CForwardMngr()
 	{ m_TmpArraysNum = 0; }
-	~CForwardMngr() {}
+	~CForwardMngr()
+	{ }
 
 	// 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);
-	
 	// execute forward
 	cell executeForwards(int id, cell *params);
 	void clear();		// delete all forwards
-	
 	bool isIdValid(int id) const;			// check whether forward id is valid
 	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
+	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type);		// prepare array
 };
 
 // (un)register forward
 int registerForward(const char *funcName, ForwardExecType et, ...);
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num, int fwd_type=FORWARD_ALL);
 int registerSPForwardByName(AMX *amx, const char *funcName, ...);
-int registerSPForwardByNameC(AMX *amx, const char *funcName, cell *list, size_t num);
 int registerSPForward(AMX *amx, int func, ...);
 void unregisterSPForward(int id);
 
 // execute forwards
 cell executeForwards(int id, ...);
 // prepare array
-cell prepareCellArray(cell *ptr, unsigned int size, bool copyBack = false);
-cell prepareCharArray(char *ptr, unsigned int size, bool copyBack = false);
+cell prepareCellArray(cell *ptr, unsigned int size);
+cell prepareCharArray(char *ptr, unsigned int size);
+
+#endif
 
-#endif //FORWARD_H

amxmodx/CLang.h

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

amxmodx/CList.h

@@ -35,7 +35,6 @@
 // *****************************************************
 // class CList
 // *****************************************************
-
 // Linked list
 template <typename T, typename F = char* >
 class CList
@@ -66,10 +65,8 @@ private:
 		~CElement()
 		{
 			delete m_pObject;
-			
 			if (m_pNext)
 				m_pNext->m_pPrev = m_pPrev;
-			
 			if (m_pPrev)
 				m_pPrev->m_pNext = m_pNext;
 		}
@@ -113,7 +110,6 @@ public:
 	class iterator
 	{
 		friend class CList<T,F>;
-		
 		CList<T,F> *m_pList;			// The list that created this iterator
 		CElement *m_CurPos;				// Current position in the list
 	public:
@@ -166,7 +162,6 @@ public:
 		{
 			iterator tmp(*this);
 			m_CurPos = m_CurPos->next;
-			
 			return tmp;
 		}
 
@@ -181,7 +176,6 @@ public:
 		{
 			return m_pList->remove(*this);
 		}
-		
 		iterator put(T *obj)
 		{
 			return m_pList->put(obj, *this);
@@ -193,7 +187,6 @@ public:
 		m_pHead = NULL;
 		m_pTail = NULL;
 	}
-	
 	~CList<T,F>()
 	{
 		clear();
@@ -205,16 +198,12 @@ public:
 	iterator remove(iterator &where)
 	{
 		iterator tmp(where.GetNext());
-		
 		if (where.m_CurPos == m_pHead)
 			m_pHead = where.m_CurPos->GetNext();
-		
 		if (where.m_CurPos == m_pTail)
 			m_pTail = where.m_CurPos->GetPrev();
-		
 		delete where.m_CurPos;
 		where = tmp;
-		
 		return tmp;
 	}
 
@@ -223,36 +212,36 @@ public:
 	iterator put_back(T *pObj)
 	{
 		CElement *pTmp = new CElement(pObj);
-		
 		if (!m_pHead)
 		{
 			m_pHead = pTmp;
 			m_pTail = pTmp;
-		} else {
+		}
+		else
+		{
 			pTmp->SetNext(NULL);
 			pTmp->SetPrev(m_pTail);
 			m_pTail->SetNext(pTmp);
 			m_pTail = pTmp;
 		}
-		
 		return iterator(this, pTmp);
 	}
 
 	iterator put_front(T *pObj)
 	{
 		CElement *pTmp = new CElement(pObj);
-		
 		if (!m_pHead)
 		{
 			m_pHead = pTmp;
 			m_pTail = pTmp;
-		} else {
+		}
+		else
+		{
 			pTmp->SetNext(m_pHead);
 			pTmp->SetPrev(NULL);
 			m_pHead->SetPrev(pTmp);
 			m_pHead = pTmp;
 		}
-		
 		return iterator(this, pTmp);
 	}
 
@@ -268,7 +257,6 @@ public:
 	iterator put(T *pObj, iterator &where)
 	{
 		CElement *pTmp = new CElement(pObj);
-		
 		if (where.m_CurPos->GetNext())
 			where.m_CurPos->GetNext()->SetPrev(pTmp);
 		else		// where = tail
@@ -278,7 +266,6 @@ public:
 		pTmp->SetNext(where.m_CurPos->GetNext());
 
 		where.m_CurPos->SetNext(pTmp);
-		
 		return ++where;
 	}
 
@@ -302,7 +289,6 @@ public:
 				break;
 			++iter;
 		}
-		
 		return iter;
 	}
 
@@ -315,15 +301,13 @@ public:
 	{
 		iterator iter = begin();
 		int i=0;
-		
 		while (iter)
 		{
 			++i;
 			++iter;
 		}
-		
 		return i;
 	}
 };
+#endif
 
-#endif //CLIST_H

amxmodx/CLogEvent.cpp

@@ -35,149 +35,102 @@
 // *****************************************************
 // class LogEventsMngr
 // *****************************************************
-
-LogEventsMngr::LogEventsMngr()
-{
+LogEventsMngr::LogEventsMngr() {
   logCurrent = logCounter = 0;
   logcmplist = 0;
   arelogevents = false;
   memset( logevents, 0, sizeof(logevents) );
 }
 
-LogEventsMngr::~LogEventsMngr()
-{
+LogEventsMngr::~LogEventsMngr() {
   clearLogEvents();
 }
 
-int LogEventsMngr::CLogCmp::compareCondition(const char* string)
-{
+int LogEventsMngr::CLogCmp::compareCondition(const char* string){
   if ( logid == parent->logCounter )
     return result;
-	
   logid = parent->logCounter;
-	
-	if (in)
-		return result = strstr(string, text.c_str()) ? 0 : 1;
-	
+  if ( in ) return result = strstr( string , text.c_str() ) ? 0 : 1;
   return result = strcmp(string,text.c_str());
 }
 
-LogEventsMngr::CLogCmp* LogEventsMngr::registerCondition(char* filter)
-{
+LogEventsMngr::CLogCmp* LogEventsMngr::registerCondition(char* filter){
 	char* temp = filter;
 	// expand "1=message"
-
     while ( isdigit(*filter) )
 		++filter;
-
     bool in = (*filter=='&');
     *filter++ = 0;
     int pos = atoi(temp);
-	
-	if (pos < 0 || pos >= MAX_LOGARGS)
-		pos = 0;
-	
+	if ( pos < 0 || pos >= MAX_LOGARGS) pos = 0;
 	CLogCmp* c = logcmplist;
-	
-	while (c)
-	{
+	while( c ) {
 		if ( (c->pos==pos) && (c->in==in) && !strcmp(c->text.c_str(), filter))
 			return c;
 		c = c->next;
 	}
-	
 	return logcmplist = new CLogCmp( filter , in , pos , logcmplist,this );
 }
 
-void LogEventsMngr::CLogEvent::registerFilter(char* filter)
-{
+void LogEventsMngr::CLogEvent::registerFilter( char* filter ){
 	CLogCmp *cmp = parent->registerCondition( filter );
 	if ( cmp == 0 ) return;
-	
-	for (LogCond* c = filters; c; c = c->next)
-	{
-		if (c->argnum == cmp->pos)
-		{
+	for(LogCond* c = filters; c ; c = c->next){
+		if ( c->argnum == cmp->pos ){
 			c->list = new LogCondEle( cmp , c->list );
 			return;
 		}
 	}
-	
 	LogCondEle* aa = new LogCondEle( cmp , 0 );
-	
-	if (aa == 0)
-		return;
-
+	if ( aa == 0 ) return;
 	filters = new LogCond( cmp->pos , aa  , filters );
 }
 
-void LogEventsMngr::setLogString(char* frmt, va_list& vaptr)
-{
+void LogEventsMngr::setLogString( char* frmt, va_list& vaptr ) {
 	++logCounter;
 	int len = vsnprintf (logString, 255 , frmt, vaptr );
-	
-	if (len == - 1)
-	{
+	if ( len == - 1) {
 		len = 255;
 		logString[len] = 0;
 	}
-	
-	if (len)
-		logString[--len] = 0;
-	
+	if ( len ) logString[--len] = 0;
 	logArgc = 0;
 }
 
-void LogEventsMngr::setLogString(char* frmt, ...)
-{
+void LogEventsMngr::setLogString( char* frmt, ...  ) {
 	++logCounter;
 	va_list logArgPtr;
 	va_start ( logArgPtr , frmt );
 	int len = vsnprintf(logString, 255 , frmt, logArgPtr );
-	
-	if (len == - 1)
-	{
+	if ( len == - 1) {
 		len = 255;
 		logString[len] = 0;
 	}
-	
 	va_end ( logArgPtr );
-	
-	if (len)
-		logString[--len] = 0;
-	
+	if ( len ) logString[--len] = 0;
 	logArgc = 0;
 }
 
-void LogEventsMngr::parseLogString()
-{
+void LogEventsMngr::parseLogString(   ) {
   register const char* b = logString;
   register int a;
-	
-	while (*b && logArgc < MAX_LOGARGS)
-	{
+  while( *b && logArgc < MAX_LOGARGS ){
     a = 0;
-		
-		if (*b == '"')
-		{
+    if ( *b == '"' ) {
       ++b;
-			
       while ( *b && *b != '"' && a < 127 ) 
 		  logArgs[logArgc][a++] = *b++;
-			
       logArgs[logArgc++][a] = 0;
       if ( *b) b+=2; // thanks to double terminator
     }
-		else if (*b == '(')
-		{
+    else if ( *b == '('  ) {
       ++b;
-			
       while ( *b && *b != ')' && a < 127 ) 
 		  logArgs[logArgc][a++] = *b++;
-			
       logArgs[logArgc++][a] = 0;
       if ( *b) b+=2;
-		} else {
+    }
+    else {
       while ( *b && *b != '(' && *b != '"' && a < 127 ) 
 		  logArgs[logArgc][a++] = *b++;
       if ( *b ) --a;
@@ -190,91 +143,83 @@ LogEventsMngr::CLogEvent* LogEventsMngr::registerLogEvent(CPluginMngr::CPlugin*
 {
   if ( pos < 1 || pos > MAX_LOGARGS)
     return 0;
-
   arelogevents = true;
   CLogEvent** d = &logevents[pos];
-	
-	while (*d)
-		d = &(*d)->next;
-	
+  while(*d) d = &(*d)->next;
   return *d = new CLogEvent( plugin , func, this );
 }
 
 void LogEventsMngr::executeLogEvents()
 {
+    int err;
     bool valid;
-
-	for (CLogEvent* a = logevents[logArgc]; a; a = a->next)
-	{
+    for(CLogEvent* a = logevents[ logArgc ]; a ; a = a->next){
 		valid = true;
-		
-		for (CLogEvent::LogCond* b = a->filters; b; b = b->next)
-		{
+		for( CLogEvent::LogCond* b = a->filters; b ; b = b->next){
 			valid = false;
-
-			for (CLogEvent::LogCondEle* c = b->list; c; c = c->next)
-			{
-				if (c->cmp->compareCondition(logArgs[b->argnum]) == 0)
-				{
+			for( CLogEvent::LogCondEle* c = b->list; c ; c = c->next) {
+				if ( c->cmp->compareCondition( logArgs[b->argnum] ) == 0 ){
 					valid = true;
 					break;
 				}
 			}
-			
-			if (!valid) 
-				break;
+			if (!valid) break;
 		}
 		
-		if (valid)
+#ifdef ENABLEEXEPTIONS
+		try
 		{
-			executeForwards(a->func);
+#endif
+			
+			if (valid){
+				if ((err = amx_Exec(a->plugin->getAMX(), NULL , a->func , 0)) != AMX_ERR_NONE)
+					AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+						err,a->plugin->getAMX()->curline,a->plugin->getName());
 			}
+			
+#ifdef ENABLEEXEPTIONS
+		}
+		catch( ... )
+		{
+			AMXXLOG_Log( "[AMXX] fatal error at log forward function execution");
+		}
+#endif
+		
     }
 }
 
-void LogEventsMngr::clearLogEvents()
-{
+void LogEventsMngr::clearLogEvents(){
   logCurrent = logCounter = 0;
   arelogevents = false;
-	
-	for (int i = 0; i < MAX_LOGARGS + 1; ++i)
-	{
+  for(int i = 0; i < MAX_LOGARGS + 1; ++i){
     CLogEvent **a = &logevents[i];
-		while (*a)
-		{
+    while(*a){
       CLogEvent* bb = (*a)->next;
       delete *a;
       *a = bb;
     }
   }
-	
   clearConditions();
 }
 
-void LogEventsMngr::clearConditions()
-{
-	while (logcmplist)
-	{
+void LogEventsMngr::clearConditions() {
+  while (logcmplist){
     CLogCmp* a = logcmplist->next;
     delete logcmplist;
     logcmplist = a;
   }
 }
 
-LogEventsMngr::CLogEvent::LogCond::~LogCond()
-{
-	while (list)
-	{
+LogEventsMngr::CLogEvent::LogCond::~LogCond() {  
+	while( list ) {
 		LogCondEle* cc = list->next;
 		delete list;
 		list = cc;
 	}
 }
 
-LogEventsMngr::CLogEvent::~CLogEvent()
-{
-	while (filters)
-	{
+LogEventsMngr::CLogEvent::~CLogEvent() {
+	while( filters ) {
 		LogCond* cc = filters->next;
 		delete filters;
 		filters = cc;
@@ -284,35 +229,23 @@ LogEventsMngr::CLogEvent::~CLogEvent()
 LogEventsMngr::CLogEvent *LogEventsMngr::getValidLogEvent( CLogEvent * a )
 {
 	bool valid;
-	
-	while (a)
-	{
+	while(a){
 		valid = true;
-		
-		for (CLogEvent::LogCond* b = a->filters; b; b = b->next)
-		{
+		for( CLogEvent::LogCond* b = a->filters; b ; b = b->next){
 			valid = false;
-
-			for (CLogEvent::LogCondEle* c = b->list; c; c = c->next)
-			{
-				if (c->cmp->compareCondition(logArgs[b->argnum]) == 0)
-				{
+			for( CLogEvent::LogCondEle* c = b->list; c ; c = c->next) {
+				if ( c->cmp->compareCondition( logArgs[b->argnum] ) == 0 ){
 					valid = true;
 					break;
 				}
 			}
-			
 			if (!valid) break;
 		}
-		
-		if (!valid)
-		{
+		if (!valid){
 			a = a->next;
 			continue;
 		}
-		
 		return a;
 	}
-	
 	return 0;
 }

amxmodx/CLogEvent.h

@@ -40,8 +40,8 @@
 // class LogEventsMngr
 // *****************************************************
 
-class LogEventsMngr
-{
+class LogEventsMngr {
+
   char logString[256];
   char logArgs[MAX_LOGARGS][128];
   int logArgc;
@@ -53,6 +53,7 @@ public:
   class CLogCmp;
   class iterator;
   class CLogEvent;
+
   friend class CLogEvent;
   friend class CLogCmp;
   friend class iterator;
@@ -61,63 +62,50 @@ public:
   {
 	friend class LogEventsMngr;
 	friend class CLogEvent;
-		
 	LogEventsMngr* parent;
     String text;
-		
     int logid;
     int pos;
     int result;
     bool in;
-		
     CLogCmp *next;
-		
-		CLogCmp(const char* s, bool r, int p, CLogCmp *n, LogEventsMngr* mg) : text(s)
-		{
+    CLogCmp( const char* s, bool r, int p, CLogCmp *n, LogEventsMngr* mg ) : text(s) {
       logid = result = 0;
       pos = p;
 	  parent = mg;
       in = r;
       next = n;
     }
-	
   public:
+
 	int compareCondition(const char* string);
   };
 
 private:
+
   CLogCmp *logcmplist;
+
 public:
 
-	class CLogEvent
-	{
+  class CLogEvent {
 	friend class LogEventsMngr;
 	friend class iterator;
-		
-		struct LogCondEle
-		{
+	struct LogCondEle {
 		CLogCmp *cmp;
 		LogCondEle *next;
 		LogCondEle(CLogCmp *c, LogCondEle *n): cmp(c) , next(n) { }
 	};
-	
-		struct LogCond
-		{
+	struct LogCond {
 		int argnum;
-			
 		LogCondEle *list;
 		LogCond *next;
 		LogCond( int a , LogCondEle* ee , LogCond* n ) : argnum(a) , list(ee), next(n)  {}
 		~LogCond();
 	};
-		
     CPluginMngr::CPlugin *plugin;
-		
     int func;
-		
     LogCond *filters;
     LogEventsMngr* parent;
-		
     CLogEvent *next;
     CLogEvent(CPluginMngr::CPlugin *p,int f, LogEventsMngr* ppp) : plugin(p),func(f), filters(0),parent(ppp) ,next(0) { }
     ~CLogEvent();
@@ -128,51 +116,50 @@ public:
   };
 
 private:
+
   CLogEvent *logevents[MAX_LOGARGS+1];
   CLogEvent *getValidLogEvent( CLogEvent * a );
   CLogCmp* registerCondition(char* filter);
-	
   void clearConditions();
+
 public:
+
   LogEventsMngr();
   ~LogEventsMngr();
 
 	// Interface
+
+
   CLogEvent* registerLogEvent( CPluginMngr::CPlugin* plugin,  int func, int pos );
   inline bool logEventsExist() { return arelogevents; } 
-	
   void setLogString( char* frmt, va_list& vaptr );
   void setLogString( char* frmt , ... );
   void parseLogString(  );
   void executeLogEvents();
-	
   inline const char* getLogString() { return logString; }
   inline int getLogArgNum() { return logArgc; }
   inline const char* getLogArg( int i ) { return ( i < 0 || i >=  logArgc ) ? "" : logArgs[ i ]; }
   void clearLogEvents();
 
-	class iterator
-	{
+
+  class iterator {
 	  CLogEvent* a;
 	  LogEventsMngr* b;
-	
   public:
 	  inline iterator(CLogEvent*aa,LogEventsMngr* bb) : a(aa), b(bb) {}
-			
-		inline iterator& operator++()
-		{
+	  inline iterator& operator++() {
 		  a = b->getValidLogEvent( a->next );
 		  return *this;
 	  }
-
 	  inline bool operator==(const iterator& c) const { return a == c.a; }
 	  inline bool operator!=(const iterator& c) const  { return !operator==(c); }
 	  CLogEvent& operator*() { return *a; }
 	  operator bool ( ) const { return a ? true : false; }
   };
-	
   inline iterator begin() { return iterator(getValidLogEvent(logevents[ logArgc ]),this); }
   inline iterator end() { return iterator(0,this); }
 };
 
-#endif //LOGEVENTS_H
+#endif
+
+

amxmodx/CMenu.cpp

@@ -35,8 +35,7 @@
 // *****************************************************
 // class MenuMngr
 // *****************************************************
-MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f)
-{
+MenuMngr::MenuCommand::MenuCommand( CPluginMngr::CPlugin *a, int mi, int k, int f ) {
 	plugin = a;
 	keys = k;
 	menuid = mi;
@@ -47,72 +46,24 @@ MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f
 MenuMngr::~MenuMngr() 
 {
 	clear();
-	MenuMngr::MenuIdEle::uniqueid = 0;
 }
 
 int MenuMngr::findMenuId(const char* name, AMX* amx)
 {
-	for (MenuIdEle* b = headid; b; b = b->next)
-	{
-		if ((!amx || !b->amx || amx == b->amx) && strstr(name,b->name.c_str()))
+  for( MenuIdEle* b = headid; b ; b = b->next) {
+    if ( (!b->amx || amx == b->amx) && strstr(name,b->name.c_str()) )
       return b->id;
   }
-	
   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;
-	
+  if (id) return id;
   headid = new MenuIdEle( n, a , headid  );
-	
   if (!headid)
 	  return 0;			// :TODO: Better error report
-	
   return headid->id;
 }
 

amxmodx/CMenu.h

@@ -43,18 +43,17 @@ class MenuMngr
     String name;
     AMX* amx;
     MenuIdEle* next;
-		
 	int id;
 	static int uniqueid;
-		
-		MenuIdEle(const char* n, AMX* a, MenuIdEle* m) : name(n), amx(a), next(m)
-		{
+    MenuIdEle( const char* n, AMX* a, MenuIdEle* m ) : name( n ) , amx(a) , next( m ) {
 		id = ++uniqueid;
 	}
+	~MenuIdEle() { --uniqueid; }
   } *headid;
 
 public:
 	class iterator;
+
 private:
 
   class MenuCommand 
@@ -66,7 +65,6 @@ private:
 	  int menuid;
 	  int keys;
 	  int function;
-		
 	  MenuCommand* next;
 	  MenuCommand( CPluginMngr::CPlugin *a, int mi, int k, int f );
   public:
@@ -76,19 +74,19 @@ private:
   } *headcmd;
 	
 public:
+	
 	MenuMngr() { headid = 0;  headcmd = 0; }
 	~MenuMngr();
 
 	// Interface
 
+
 	int findMenuId(const char* name, AMX* a = 0);
 	int registerMenuId(const char* n, AMX* a );
-	void removeMenuId(int id);
 	void registerMenuCmd( CPluginMngr::CPlugin *a,int mi, int k , int f  );
 	void clear();
 
-	class iterator
-	{
+	class iterator {
 		MenuCommand* a;
 	public:
 		iterator(MenuCommand*aa) : a(aa) {}
@@ -98,9 +96,12 @@ public:
 		operator bool () const { return a ? true : false; }
 		MenuCommand& operator*() { return *a; }
 	};
-	
 	inline iterator begin() const { return iterator(headcmd); }
 	inline iterator end() const { return iterator(0); }
+	
+
 };
 
-#endif //MENUS_H
+#endif
+
+

amxmodx/CMisc.cpp

@@ -29,7 +29,6 @@
 *  version.
 */
 #include "amxmodx.h"
-#include "newmenus.h"
 // *****************************************************
 // class CPlayer
 // *****************************************************
@@ -40,8 +39,7 @@ void CPlayer::Init(edict_t* e, int i)
 	pEdict = e;
 	initialized = false;
 	ingame = false;
-	bot_value = false;
-	bot_cached = false;
+	bot = false;
 	authorized = false;
 
 	current = 0;
@@ -50,8 +48,6 @@ void CPlayer::Init(edict_t* e, int i)
 	aiming = 0;
 	menu = 0;
 	keys = 0;
-	menuexpire = 0.0;
-	newmenu = -1;
 	
 	death_weapon.clear();
 	name.clear();
@@ -59,105 +55,42 @@ void CPlayer::Init(edict_t* e, int i)
 	team.clear();
 }
 
-void CPlayer::Disconnect()
-{
+void CPlayer::Disconnect() {
   ingame = false;
   initialized = false;
   authorized = false;
-
-	if (newmenu != -1)
-	{
-		Menu *pMenu = g_NewMenus[newmenu];
-		if (pMenu)
-		{
-			//prevent recursion
-			newmenu = -1;
-			menu = 0;
-			executeForwards(pMenu->func, 
-				static_cast<cell>(ENTINDEX(pEdict)),
-				static_cast<cell>(pMenu->thisId),
-				static_cast<cell>(MENU_EXIT));
-		}
+  bot = 0;
 }
 
-	List<ClientCvarQuery_Info *>::iterator iter, end=queries.end();
-	for (iter=queries.begin(); iter!=end; iter++)
-	{
-		unregisterSPForward((*iter)->resultFwd);
-		delete [] (*iter)->params;
-		delete (*iter);
-	}
-	queries.clear();
-
-	bot_value = false;
-	bot_cached = false;
-	menu = 0;
-	newmenu = -1;
-}
-
-void CPlayer::PutInServer()
-{
+void CPlayer::PutInServer() {
   playtime = gpGlobals->time;
   ingame = true;
 }
-
-int CPlayer::NextHUDChannel()
-{
-	int ilow = 1;
-
-	for (int i=ilow+1; i<=4; i++)
-	{
-		if (channels[i] < channels[ilow])
-			ilow = i;
-	}
-
-	return ilow;
-}
-
-bool CPlayer::Connect(const char* connectname, const char* ipaddress)
-{
-	bot_value = false;
-	bot_cached = false;
+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;
-	
   memset(flags,0,sizeof(flags));
   memset(weapons,0,sizeof(weapons));
-	
   initialized = true;
   authorized = false;
 
-	for (int i=0; i<=4; i++)
-	{
-		channels[i] = 0.0f;
-		hudmap[i] = 0;
-	}
-
-	List<ClientCvarQuery_Info *>::iterator iter, end=queries.end();
-	for (iter=queries.begin(); iter!=end; iter++)
-	{
-		unregisterSPForward((*iter)->resultFwd);
-		delete [] (*iter)->params;
-		delete (*iter);
-	}
-	queries.clear();
-
   const char* authid = GETPLAYERAUTHID( pEdict );
 
-	if ((authid == 0) || (*authid == 0) || (strcmp(authid, "STEAM_ID_PENDING") == 0))
+  if ( (authid == 0) || (*authid == 0) 
+	  || (strcmp( authid , "STEAM_ID_PENDING") == 0) )
 	return true;
 
   return false;
 }
 
+
+
 // *****************************************************
 // class Grenades
 // *****************************************************
-
 void Grenades::put( edict_t* grenade, float time, int type, CPlayer* player  )
 {
   Obj* a = new Obj;
@@ -174,33 +107,30 @@ bool Grenades::find(edict_t* enemy, CPlayer** p, int& type)
 {
   bool found = false;
   Obj** a = &head;
-	
-	while (*a)
-	{
-		if ((*a)->time > gpGlobals->time)
-		{
-			if ((*a)->grenade == enemy)
-			{
+  while ( *a ){
+    if ( (*a)->time > gpGlobals->time ) {
+      if ( (*a)->grenade == enemy ) {
         found = true;
         (*p) = (*a)->player;
         type = (*a)->type;
       }
-		} else {
+    }
+    else {
       Obj* b = (*a)->next;
       delete *a;
       *a = b;
+
      continue;
+
     }
     a = &(*a)->next;
   }
-	
   return found;
 }
 
 void Grenades::clear()
 {
-	while (head)
-	{
+  while(head){
     Obj* a = head->next;
     delete head;
     head = a;
@@ -210,9 +140,7 @@ void Grenades::clear()
 // *****************************************************
 // class XVars
 // *****************************************************
-
-void XVars::clear()
-{
+void XVars::clear()  {
 	delete[] head;
 	head = 0;
 	num = 0;
@@ -221,8 +149,7 @@ void XVars::clear()
 
 int XVars::put( AMX* p, cell* v )
 {
-	for (int a = 0; a < num; ++a)
-	{
+  for(int a = 0; a < num; ++a) {
 	if ( (head[a].amx == p) && (head[a].value == v) )
 		return a;
   }
@@ -232,38 +159,29 @@ int XVars::put(AMX* p, cell* v)
 
   head[num].value = v;
   head[num].amx = p;
-	
   return num++;
 }
 
 int XVars::realloc_array( int nsize )
 {
 	XVarEle* me = new XVarEle[nsize];
-	
-	if (me)
-	{
+	if ( me ){
 		for(int a = 0 ; a < num; ++a)
 			me[a] = head[a];
-		
 		delete[] head;
 		head = me;
 		size = nsize;
 		return 0;
 	}
-	
 	return 1;
 }
 
 // *****************************************************
 // class TeamIds
 // *****************************************************
-
 TeamIds::TeamIds() { head = 0; newTeam = 0; }
-
-TeamIds::~TeamIds()
-{
-	while (head)
-	{
+TeamIds::~TeamIds() {
+    while( head ) {
 		TeamEle* a = head->next;
 		delete head;
 		head = a;
@@ -273,56 +191,42 @@ TeamIds::~TeamIds()
 void TeamIds::registerTeam( const char* n ,int s )
 {
     TeamEle** a = &head;
-	
-	while (*a)
-	{
-		if (strcmp((*a)->name.c_str(),n) == 0)
-		{
-			if (s != -1)
-			{
+    while( *a ){
+		if ( strcmp((*a)->name.c_str(),n) == 0 ){
+			if (s != -1){
 				(*a)->id = s;
 				newTeam &= ~(1<<(*a)->tid);				
 			}
-			
 			return;
 		}
 		a = &(*a)->next;
     }
-
     *a = new TeamEle( n , s );
-	
-	if (*a == 0)
-		return;
-	
+	if ( *a == 0 ) return;
     newTeam |= (1<<(*a)->tid);
 }
 
 int TeamIds::findTeamId( const char* n )
 {
 	TeamEle* a = head;
-	
-	while (a)
-	{
-		if (!stricmp(a->name.c_str(), n))
+    while( a ){
+		if ( !strcmpi(a->name.c_str(),n) )
 			return a->id;
 		a = a->next;
     }
-	
 	return -1;
 }
 
 int TeamIds::findTeamIdCase( const char* n)
 {
 	TeamEle* a = head;
-	
-	while (a)
-	{
+    while( a ){
 		if ( !strcmp(a->name.c_str(), n) )
 			return a->id;
 		a = a->next;
     }
-	
 	return -1;
 }
 
 char TeamIds::TeamEle::uid = 0;
+

amxmodx/CMisc.h

@@ -33,48 +33,38 @@
 #define CMISC_H
 
 #include "CList.h"
-#include "sh_list.h"
 
 // *****************************************************
 // class CCVar
 // *****************************************************
-
 class CCVar
 {
     cvar_t cvar;
     String name;
     String plugin;
-
 public:	
-	CCVar(const char* pname, const char* pplugin, int pflags, float pvalue) : name(pname), plugin(pplugin)
-	{
+    CCVar( const char* pname, const char* pplugin, 
+		int pflags, float pvalue ) : name(pname) , plugin(pplugin ) {
 		cvar.name = (char*)name.c_str();
 		cvar.flags = pflags;
 		cvar.string = "";
 		cvar.value = pvalue;
     }
-	
 	inline cvar_t* getCvar() { return &cvar; }
 	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;
 };
 
+
+
 // *****************************************************
 // class CPlayer
 // *****************************************************
 
-struct ClientCvarQuery_Info
-{
-	int resultFwd;
-	int requestId;
-	int paramLen;
-	cell *params;
-};
-
 class CPlayer 
 {
+	
 public:
 	edict_t* pEdict;
 	
@@ -84,17 +74,13 @@ public:
 
 	bool initialized;
 	bool ingame;
-	bool bot_cached;
-	bool bot_value;
+	bool bot;
 	bool authorized;
-	bool vgui;	
 	
 	float time;
 	float playtime;
-	float menuexpire;
 	
-	struct
-	{
+	struct {
 		int ammo;
 		int clip;
 	} weapons[MAX_WEAPONS];
@@ -113,55 +99,26 @@ public:
 	int death_victim;
 	bool death_tk;
 	String death_weapon;
-	int newmenu;
-	int page;
-
-	float channels[5];
-	cell hudmap[5];
 	
 	Vector lastTrace;
 	Vector thisTrace;
 	Vector lastHit;
 	
-	List<ClientCvarQuery_Info *> queries;
-
 	void Init( edict_t* e , int i );
 	void Disconnect();
 	void PutInServer();
-	
 	bool Connect(const char* connectname,const char* ipaddress);
 
-	inline bool IsBot()
-	{
-		if (!bot_cached)
-		{
-			bot_value = false;
-			if (pEdict->v.flags & FL_FAKECLIENT)
-			{
-				bot_value = true;
-				bot_cached = true;
-			} else {
-				const char *auth = GETPLAYERAUTHID(pEdict);
-				if (auth && (strcmp(auth, "BOT") == 0))
-				{
-					bot_value = true;
-					bot_cached = true;
-				}
-			}
+	inline bool IsBot(){
+		return ((pEdict->v.flags & FL_FAKECLIENT)?true:false);
 	}
 
-		return bot_value;
-	}
-
-	inline bool IsAlive()
-	{
+	inline bool IsAlive(){
 		return ((pEdict->v.deadflag==DEAD_NO)&&(pEdict->v.health>0));
 	}
 
 	inline void Authorize() { authorized = true; }
 
-	int NextHUDChannel();
-
 };
 
 // *****************************************************
@@ -179,10 +136,10 @@ class Grenades
     Obj* next;
   } *head;
 
+
 public:
   Grenades() { head = 0; }
   ~Grenades() { clear(); }
-	
   void put( edict_t* grenade, float time, int type, CPlayer* player  );
   bool find( edict_t* enemy, CPlayer** p, int& type );
   void clear();
@@ -191,23 +148,19 @@ public:
 // *****************************************************
 // class ForceObject
 // *****************************************************
-
-class ForceObject
-{
+class ForceObject {
     String filename;
     FORCE_TYPE type;
     Vector mins;
     Vector maxs;
     AMX* amx;
 public:
-	ForceObject(const char* n, FORCE_TYPE c, Vector& mi, Vector& ma, AMX* a) : filename(n), type(c), mins(mi), maxs(ma), amx(a) {}
-
+    ForceObject(const char* n, FORCE_TYPE c,Vector& mi, Vector& ma, AMX* a) :
+    filename(n) , type(c), mins(mi), maxs(ma), amx(a) {}
 	inline const char* getFilename() { return filename.c_str(); }
 	inline AMX* getAMX() { return amx; }
-	
 	Vector& getMin() { return mins; }
 	Vector& getMax() { return maxs; }
-	
 	inline FORCE_TYPE getForceType() { return type; }
 };
 
@@ -217,38 +170,30 @@ public:
 
 class XVars
 {
-	struct XVarEle
-	{
+  struct XVarEle  {
     AMX* amx;
     cell* value;
   };
   
   XVarEle* head;
-	
   int size;
   int num;
+
   int realloc_array( int nsize );
 
 public:
   XVars() {  num = 0;  size = 0;  head = 0; }
   ~XVars() { clear(); }
-	
   void clear();
   int put( AMX* a, cell* v );
-	
-	inline cell getValue(int a)
-	{
+  inline cell getValue( int a ) {
 	  return ( a >= 0 && a < num ) ? *(head[a].value) : 0;
   }
-
-	inline int setValue(int a, cell v)
-	{ 
-		if (a >= 0 && a < num)
-		{
+  inline int setValue( int a, cell v ) { 
+	  if ( a >= 0 && a < num ){
 		*(head[a].value) = v;
 		return 0;
 	  }
-
 	  return 1;
   }
 };
@@ -256,7 +201,6 @@ public:
 // *****************************************************
 // class CScript
 // *****************************************************
-
 class CScript
 {
 	String filename;
@@ -264,7 +208,6 @@ class CScript
 	void* code;
 public:
 	CScript(AMX* aa, void* cc,const char* ff):filename(ff),amx(aa),code(cc){}
-	
 	inline AMX* getAMX() { return amx; }
 	inline const char* getName() { return filename.c_str(); }
 	inline bool operator==( void* a ) { return (amx == (AMX*)a); }
@@ -274,22 +217,17 @@ public:
 // *****************************************************
 // class TeamIds
 // *****************************************************
-
 class TeamIds
 {
-	struct TeamEle
-	{
+  struct TeamEle {
     String name;
     int id;
 	char tid;
 	static char uid;
     TeamEle* next;
-		
-		TeamEle(const char* n, int& i) : name(n), id(i), next(0)
-		{
+    TeamEle(const char* n, int& i) : name(n) , id(i) , next(0) {
 		tid = uid++;
-		}
-		
+	};
 	~TeamEle(){ --uid; }
   } *head;
 
@@ -298,11 +236,15 @@ class TeamIds
 public:
   TeamIds();
   ~TeamIds();
-	
   void registerTeam( const char* n ,int s );
   int findTeamId( const char* n);
   int findTeamIdCase( const char* n);
   inline bool isNewTeam() { return newTeam ? true : false; }
 };
 
-#endif //CMISC_H
+
+
+#endif
+
+
+

amxmodx/CModule.cpp

@@ -30,28 +30,104 @@
 */
 
 #include "amxmodx.h"
-#include "libraries.h"
 
 #ifndef FAR
 #define FAR
 #endif
 
+// Old
+typedef int (FAR *QUERYMOD)(module_info_s**);
+typedef int (FAR *ATTACHMOD)(pfnamx_engine_g*,pfnmodule_engine_g*);
+typedef int (FAR *DETACHMOD)(void);
+
 // New
 typedef void* (*PFN_REQ_FNPTR)(const char * /*name*/);
 typedef int (FAR *QUERYMOD_NEW)(int * /*ifvers*/, amxx_module_info_s * /*modInfo*/);
 typedef int (FAR *ATTACHMOD_NEW)(PFN_REQ_FNPTR /*reqFnptrFunc*/);
 typedef int (FAR *DETACHMOD_NEW)(void);
 typedef void (FAR *PLUGINSLOADED_NEW)(void);
-typedef void (*PLUGINSUNLOADED_NEW)(void);
-typedef void (*PLUGINSUNLOADING_NEW)(void);
+
+// Old
+// These functions are needed since Small Abstract Machine 2.5.0
+int wamx_FindPublic(AMX *amx, char *name, int *index)
+{ return amx_FindPublic(amx, name, index); }
+
+int wamx_FindPubVar(AMX *amx, char *varname, cell *amx_addr)
+{ return amx_FindPubVar(amx, varname, amx_addr); }
+
+int wamx_GetString(char *dest, cell *source)
+{ return amx_GetString(dest, source, 0); }
+
+AMX_NATIVE_INFO *wamx_NativeInfo(char *name, AMX_NATIVE func)
+{ return amx_NativeInfo(name, func); }
+
+int wamx_SetString(cell *dest, char *source, int pack)
+{ return amx_SetString(dest, source, pack, 0); }
+
+pfnamx_engine_g engAmxFunc = {
+  amx_Align16,
+  amx_Align32,
+  amx_Allot,
+  amx_Callback,
+  amx_Clone,
+  amx_Debug,
+  amx_Exec,
+  amx_Execv,
+  wamx_FindPublic,
+  wamx_FindPubVar,
+  amx_FindTagId,
+  amx_Flags,
+  amx_GetAddr,
+  amx_GetPublic,
+  amx_GetPubVar,
+  wamx_GetString,
+  amx_GetTag,
+  amx_GetUserData,
+  amx_Init,
+  amx_InitJIT,
+  amx_MemInfo,
+  amx_NameLength,
+  wamx_NativeInfo,
+  amx_NumPublics,
+  amx_NumPubVars,
+  amx_NumTags,
+  amx_RaiseError,
+  amx_Register,
+  amx_Release,
+  amx_SetCallback,
+  amx_SetDebugHook,
+  wamx_SetString,
+  amx_SetUserData,
+  amx_StrLen,
+};
+
+pfnmodule_engine_g engModuleFunc = {
+  add_amxnatives,
+  build_pathname,
+  copy_amxmemory,
+  format_amxstring,
+  get_amxaddr,
+  get_amxscript,
+  get_amxscriptname,
+  get_amxstring,
+  get_modname,
+  load_amxscript,
+  print_srvconsole,
+  report_error,
+  set_amxnatives,
+  set_amxstring,
+  amxstring_len,
+  unload_amxscript,
+  alloc_amxmemory,
+  free_amxmemory,
+};
 
 // *****************************************************
 // class CModule
 // *****************************************************
 
-CModule::CModule(const char* fname)
+CModule::CModule(const char* fname) : m_Filename(fname)
 {
-	m_Filename.assign(fname);
 	clear(false);
 }
 
@@ -70,10 +146,11 @@ void CModule::clear(bool clearFilename)
 	m_Metamod = false;
 	m_Handle = NULL;
 	m_Status = MODULE_NONE;
-	
 	if (clearFilename)
 		m_Filename.assign("unknown");
 
+	// old
+	m_InfoOld = NULL;
 	// new
 	m_Amxx = false;
 	m_InfoNew.author = "unknown";
@@ -82,81 +159,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)
-{
-	void **handle;
-	void *dummy = NULL;
-
-	if (!m_Handle)
-		handle = &dummy;
-	else
-		handle = (void **)&m_Handle;
-
-	int res = LoadMetamodPlugin(mmfile, handle, now);
-
-	if (!res)
-	{
-		m_Metamod = false;
-	}
-
-	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()
@@ -172,7 +175,6 @@ bool CModule::attachModule()
 
 		if (!AttachFunc_New)
 			return false;
-		
 		g_ModuleCallReason = ModuleCall_Attach;
 		g_CurrentlyCalledModule = this;
 		int retVal = (*AttachFunc_New)(Module_ReqFnptr);
@@ -183,7 +185,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;
@@ -197,18 +199,17 @@ bool CModule::attachModule()
 			m_Status = MODULE_BADLOAD;
 			return false;
 		}
-	} else {
-		m_Status = MODULE_BADLOAD;
 	}
-
-	if (m_Status == MODULE_LOADED)
+	else
 	{
-		AddLibrariesFromString(m_InfoNew.library, LibType_Library, LibSource_Module, this);
-		AddLibrariesFromString(m_InfoNew.libclass, LibType_Class, LibSource_Module, this);
+		// old
+		ATTACHMOD AttachFunc = (ATTACHMOD)DLPROC(m_Handle, "AMX_Attach");
+
+		if (AttachFunc)
+			(*AttachFunc)(&engAmxFunc,&engModuleFunc);
+		m_Status = MODULE_LOADED;
 		return true;
 	}
-
-	return false;
 }
 
 bool CModule::queryModule()
@@ -229,7 +230,6 @@ bool CModule::queryModule()
 
 	// Try new interface first
 	QUERYMOD_NEW queryFunc_New = (QUERYMOD_NEW)DLPROC(m_Handle, "AMXX_Query");
-	
 	if (queryFunc_New)
 	{
 		m_Amxx = true;
@@ -239,7 +239,6 @@ bool CModule::queryModule()
 		int retVal = (*queryFunc_New)(&ifVers, &m_InfoNew);
 		g_CurrentlyCalledModule = NULL;
 		g_ModuleCallReason = ModuleCall_NotCalled;
-		
 		switch (retVal)
 		{
 		case AMXX_PARAM:
@@ -248,36 +247,10 @@ bool CModule::queryModule()
 			return false;
 		case AMXX_IFVERS:
 			if (ifVers < AMXX_INTERFACE_VERSION)
-				{
-					//backwards compat for new defs
-					if (ifVers == 3)
-					{
-						g_ModuleCallReason = ModuleCall_Query;
-						g_CurrentlyCalledModule = this;
-						retVal = (*queryFunc_New)(&ifVers, &m_InfoNew);
-                        g_CurrentlyCalledModule = NULL;
-						g_ModuleCallReason = ModuleCall_NotCalled;
-						if (retVal == AMXX_OK)
-						{
-							m_InfoNew.library = m_InfoNew.logtag;
-							if (StrCaseStr(m_InfoNew.library, "sql") 
-								|| StrCaseStr(m_InfoNew.library, "dbi"))
-							{
-								m_InfoNew.libclass = "DBI";
-							} else {
-								m_InfoNew.libclass = "";
-							}
-							break;
-						}
-						return false;
-					} else {
 				m_Status = MODULE_OLD;
-						return false;
-					}
-				} else {
+			else
 				m_Status = MODULE_NEWER;
 			return false;
-				}
 		case AMXX_OK:
 			break;
 		default:
@@ -295,10 +268,47 @@ bool CModule::queryModule()
 
 		m_Status = MODULE_QUERY;
 		return true;
-	} else {
-		m_Status = MODULE_NOQUERY;
-		m_Amxx = false;
+	}
+	else
+	{
+		// old interface not 64 bit compatible
+#if SMALL_CELL_SIZE == 64
+		m_Status = MODULE_NOT64BIT;
 		return false;
+#else
+		// Try old interface
+		QUERYMOD queryFunc_Old = (QUERYMOD)DLPROC(m_Handle,"AMX_Query"); // check what version
+		if (!queryFunc_Old)
+		{
+			m_Status = MODULE_NOQUERY;
+			return false;
+		}
+
+		(*queryFunc_Old)(&m_InfoOld);
+
+		if (!m_InfoOld)
+		{
+			m_Status = MODULE_NOINFO;
+			return false;
+		}
+
+		if (m_InfoOld->ivers != AMX_INTERFACE_VERSION)
+		{
+			m_Status = MODULE_OLD;
+			return false;
+		}
+
+		// Check for attach
+		if (!DLPROC(m_Handle, "AMX_Attach"))
+		{
+			m_Status = MODULE_NOATTACH;
+			return false;
+		}
+
+		m_InfoOld->serial = (long int)this;
+		m_Status = MODULE_QUERY;
+		return true;
+#endif
 	}
 }
 
@@ -307,12 +317,9 @@ 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");
-		
 		if (detachFunc_New)
 		{
 			g_ModuleCallReason = ModuleCall_Detach;
@@ -322,52 +329,17 @@ bool CModule::detachModule()
 			g_ModuleCallReason = ModuleCall_NotCalled;
 		}
 	}
-
-#ifndef FAKEMETA
-	if (IsMetamod())
+	else
 	{
-		UnloadMetamodPlugin(m_Handle);
+		DETACHMOD detachFunc_Old = (DETACHMOD)DLPROC(m_Handle, "AMX_Detach");
+		if (detachFunc_Old)
+			(*detachFunc_Old)();
 	}
-#endif
-	
 	DLFREE(m_Handle);
 	clear();
-	
 	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)
@@ -377,10 +349,8 @@ void CModule::CallPluginsLoaded()
 		return;
 
 	PLUGINSLOADED_NEW func = (PLUGINSLOADED_NEW)DLPROC(m_Handle, "AMXX_PluginsLoaded");
-	
 	if (!func)
 		return;
-	
 	func();
 }
 
@@ -402,6 +372,5 @@ const char* CModule::getStatus() const
 	case MODULE_NOT64BIT:	return "not 64bit";
 	default:		break;
 	}
-	
 	return "unknown";
 }

amxmodx/CModule.h

@@ -36,8 +36,7 @@
 #ifndef CMODULE_H
 #define CMODULE_H
 
-enum MODULE_STATUS
-{
+enum MODULE_STATUS {
   MODULE_NONE,				// No module loaded
   MODULE_QUERY,				// Query failed
   MODULE_BADLOAD,			// Bad file or the module writer messed something up ;]
@@ -58,25 +57,22 @@ struct amxx_module_info_s
 	const char *author;
 	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 */
 #define AMXX_IFVERS				1			/* interface version */
 #define AMXX_PARAM				2			/* Invalid parameter */
 #define AMXX_FUNC_NOT_PRESENT	3			/* Function not present */
 
-#define AMXX_INTERFACE_VERSION	4
+#define AMXX_INTERFACE_VERSION 1
 
 class CModule 
 {
 	String m_Filename;				// Filename
-	
 	bool m_Metamod;					// Using metamod?
 	bool m_Amxx;					// Using new module interface?
-	
+	module_info_s* m_InfoOld;		// module info (old module interface)
 	amxx_module_info_s m_InfoNew;	// module info (new module interface)
 	DLHANDLE m_Handle;				// handle
 	MODULE_STATUS m_Status;			// status
@@ -88,37 +84,30 @@ public:
 	~CModule();
 
 	// Interface
-	
 	bool attachModule();
 	bool queryModule();
 	bool detachModule();
-	void rewriteNativeLists(AMX_NATIVE_INFO *list);
-
-#ifndef FAKEMETA
-	bool attachMetamod(const char *mmfile, PLUG_LOADTIME now);
-#endif
-
 	const char* getStatus() const;
 	inline const char* getType() const { return m_Amxx ? "amxx" : (m_Metamod ? "amx&mm" : "amx"); }
-	inline const char* getAuthor() const { return m_InfoNew.author; }
-	inline const char* getVersion() const { return m_InfoNew.version; }
-	inline const char* getName() const { return m_InfoNew.name; }
+	inline const char* getAuthor() const { return m_Amxx ? (m_InfoNew.author) : (m_InfoOld ? m_InfoOld->author : "unknown"); }
+	inline const char* getVersion() const { return m_Amxx ? (m_InfoNew.version) : (m_InfoOld ? m_InfoOld->version : "unknown"); }
+	inline const char* getName() const { return m_Amxx ? (m_InfoNew.name) : (m_InfoOld ? m_InfoOld->name : "unknown"); }
+	inline module_info_s* getInfo() const { return m_InfoOld; }	// old
 	inline const amxx_module_info_s* getInfoNew() const { return &m_InfoNew; }	// new
 	inline int getStatusValue() { return m_Status; }
-	inline bool operator==(const char* fname) { return !strcmp(m_Filename.c_str(), fname); }
-	inline bool isReloadable() { return ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)); }
+	inline bool operator==( void* fname ) { return !strcmp( m_Filename.c_str() , (char*)fname );  }
+	inline bool isReloadable() { return m_Amxx ? ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)) : ( (m_Status==MODULE_LOADED) && (m_InfoOld->type==RELOAD_MODULE)); }
 	inline bool isAmxx() const { return m_Amxx; }
 	inline const char *getMissingFunc() const { return m_MissingFunc; }
 	inline const char *getFilename() { return m_Filename.c_str(); }
-	inline bool IsMetamod() { return m_Metamod; }
+	void CModule::CallPluginsLoaded();
 
-	void CallPluginsLoaded();
-	void CallPluginsUnloaded();
-	void CallPluginsUnloading();
-
-	CVector<AMX_NATIVE_INFO*> m_Natives;
-	CVector<AMX_NATIVE_INFO*> m_NewNatives; // Natives for new (AMXX, not AMX) plugins only
-	CVector<size_t> m_DestroyableIndexes;
+	CList<AMX_NATIVE_INFO*> m_Natives;
 };
 
-#endif //CMODULE_H
+
+
+#endif
+
+
+

amxmodx/CPlugin.cpp

@@ -33,370 +33,135 @@
 #include "CPlugin.h"
 #include "CForward.h"
 #include "CFile.h"
-#include "amx.h"
-#include "natives.h"
-#include "debugger.h"
-#include "libraries.h"
 
-extern const char *no_function;
-
-CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error, int debug)
-{	
+CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error) {	
 	CPlugin** a = &head;
-	
-	while (*a)
-		a = &(*a)->next;
-	
-	*a = new CPlugin(pCounter++, path, name, error, debug);
-	
-	return (*a);
+	while( *a ) a = &(*a)->next;
+	*a = new CPlugin( pCounter++ ,path,name,error);
+	return *error ? 0 : *a;
 }
 
-void CPluginMngr::unloadPlugin(CPlugin** a)
-{
+void CPluginMngr::unloadPlugin( CPlugin** a ) {
 	CPlugin* next = (*a)->next;
 	delete *a;
 	*a = next;
 	--pCounter;
 }
 
-void CPluginMngr::Finalize()
+int  CPluginMngr::loadPluginsFromFile( const char* filename )
 {
-	if (m_Finalized)
-		return;
-	
-	pNatives = BuildNativeTable();
-	CPlugin *a = head;
-	
-	while (a)
-	{
-		if (a->getStatusCode() == ps_running)
-		{
-			amx_Register(a->getAMX(), pNatives, -1);
-			a->Finalize();
-		}
-		a = a->next;
-	}
-	
-	m_Finalized = true;
-}
-
-int CPluginMngr::loadPluginsFromFile(const char* filename, bool warn)
-{
-	char file[256];
-	FILE *fp = fopen(build_pathname_r(file, sizeof(file) - 1, "%s", filename), "rt");
+	File fp( build_pathname("%s",filename) , "r" );
 
 	if ( !fp ) 
-	{
-		if (warn)
 	{
 		AMXXLOG_Log( "[AMXX] Plugins list not found (file \"%s\")",filename);
-		}
 		return 1;
 	}
 	
 	// Find now folder
-	char pluginName[256], error[256], debug[256];
-	int debugFlag = 0;
-	const char *pluginsDir = get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins");
+	char pluginName[256], line[256], error[256];
+	const char *pluginsDir = get_localinfo("amxx_pluginsdir", "addons/amxx/plugins");
 	
-	String line;
 	
-	List<String *>::iterator block_iter;
-
-	while (!feof(fp)) 
+	while ( fp.getline(line , 255 ) ) 
 	{
-		pluginName[0] = '\0';
+		*pluginName = 0;
+		sscanf(line,"%s",pluginName);
+		if (!isalnum(*pluginName))  continue;
 				
-		debug[0] = '\0';
-		debugFlag = 0;
+		CPlugin* plugin = loadPlugin( pluginsDir , pluginName  , error  );
 		
-		line.clear();
-		line._fread(fp);
-		/** quick hack */
-		char *ptr = const_cast<char *>(line.c_str());
-		while (*ptr)
-		{
-			if (*ptr == ';')
-			{
-				*ptr = '\0';
-			} else {
-				ptr++;
+		if (!plugin)
+			AMXXLOG_Log("[AMXX] %s (plugin \"%s\")", error, pluginName );
 	}
-		}
-		sscanf(line.c_str(), "%s %s", pluginName, debug);
-		
-		if (!isalnum(*pluginName))
-		{
-			continue;
-		}
-
-		if (isalnum(*debug) && !strcmp(debug, "debug"))
-		{
-			debugFlag = 1;
-		}
-
-		bool skip = false;
-		for (block_iter = m_BlockList.begin();
-			 block_iter != m_BlockList.end();
-			 block_iter++)
-		{
-			if ((*block_iter)->compare(pluginName) == 0)
-			{
-				skip = true;
-				break;
-			}
-		}
-
-		if (skip || !strcmp(debug, "disabled"))
-		{
-			continue;
-		}
-
-		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, debugFlag);
-		
-		if (plugin->getStatusCode() == ps_bad_load)
-		{
-			char errorMsg[255];
-			sprintf(errorMsg, "%s (plugin \"%s\")", error, pluginName);
-			plugin->setError(errorMsg);
-			AMXXLOG_Log("[AMXX] %s", plugin->getError());
-		}
-	}
-
-	fclose(fp);
 
 	return pCounter;
 }
 
-void CPluginMngr::clear()
-{
+void CPluginMngr::clear() {
 	CPlugin**a = &head;	
-	
 	while ( *a )
 		unloadPlugin(a);
-	
-	m_Finalized = false;
-	
-	if (pNatives)
-	{
-		delete [] pNatives;
-		pNatives = NULL;
 }
 
-	List<String *>::iterator iter = m_BlockList.begin();
-	while (iter != m_BlockList.end())
+CPluginMngr::CPlugin* CPluginMngr::findPluginFast(AMX *amx) 
 { 
-		delete (*iter);
-		iter = m_BlockList.erase(iter);
-	}
-	m_BlockList.clear();
-}
-
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(AMX *amx)
-{
-	CPlugin*a = head;
-	
+	return (CPlugin*)(amx->userdata[3]); 
+	/*CPlugin*a = head;
 	while ( a && &a->amx != amx )
 		a=a->next;
+	return a;*/
+}
 
+CPluginMngr::CPlugin* CPluginMngr::findPlugin(AMX *amx) {
+	CPlugin*a = head;
+	while ( a && &a->amx != amx )
+		a=a->next;
 	return a;
 }
 	
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(int index)
-{
+CPluginMngr::CPlugin* CPluginMngr::findPlugin(int index){
 	CPlugin*a = head;
-	
 	while ( a && index--)
 		a=a->next;
-	
 	return a;
 }
 	
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(const char* name)
-{
-	if (!name)
-		return 0;
-	
+CPluginMngr::CPlugin* CPluginMngr::findPlugin(const char* name) {
+	if (!name) return 0;
 	int len = strlen(name);
-	
-	if (!len)
-		return 0;
-	
+	if (!len) return 0;
 	CPlugin*a = head;
-	
 	while( a && strncmp(a->name.c_str(), name,len) )
 		a=a->next;
-	
 	return a;
 }
 
-const char* CPluginMngr::CPlugin::getStatus() const
-{
-	switch (status)
-	{
-		case ps_running: 
-		{
-			if (m_Debug)
-			{
-				return "debug";
-			} else {
-				return "running";
-			}
-			break;
-		}
+const char* CPluginMngr::CPlugin::getStatus() const {
+	switch(status){
+	case ps_running: return "running";
 	case ps_paused: return "paused";
 	case ps_bad_load: return "bad load";
 	case ps_stopped: return "stopped";
 	case ps_locked: return "locked";
 	}
-	
 	return "error";
 }
 
-CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int d) : name(n), title(n)
-{
+CPluginMngr::CPlugin::CPlugin(int i, const char* p,const char* n, char* e) : name(n), title(n) {
 	const char* unk = "unknown";
-	
 	title.assign(unk);
 	author.assign(unk);
 	version.assign(unk);
-	
-	char file[256];
-	char* path = build_pathname_r(file, sizeof(file) - 1, "%s/%s", p, n);
+	char* path = build_pathname("%s/%s",p,n);
 	code = 0;
-	memset(&amx, 0, sizeof(AMX));
-	int err = load_amxscript(&amx, &code, path, e, d);
-	
-	if (err == AMX_ERR_NONE)
-	{
-		status = ps_running;
-	} else {
-		status = ps_bad_load;
-	}
-	
-	amx.userdata[UD_FINDPLUGIN] = this;
+	int err = load_amxscript(&amx,&code,path,e );
+	if ( err == AMX_ERR_NONE ) status = ps_running;
+	else status = ps_bad_load;
+	amx.userdata[3] = this;
 	paused_fun = 0;
 	next = 0;
 	id = i;
-	
-	if (status == ps_running)
-	{
-		m_PauseFwd = registerSPForwardByName(&amx, "plugin_pause", FP_DONE);
-		m_UnpauseFwd = registerSPForwardByName(&amx, "plugin_unpause", FP_DONE);
-		
-		if (amx.flags & AMX_FLAG_DEBUG)
-		{
-			m_Debug = true;
-		} else {
-			m_Debug = false;
 }
-	}
-}
-
-CPluginMngr::CPlugin::~CPlugin()
-{
+CPluginMngr::CPlugin::~CPlugin( ){
 	unload_amxscript( &amx, &code );
 }
 
-int AMXAPI native_handler(AMX *amx, int index)
-{
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	char name[sNAMEMAX + 1];
-	amx_GetNative(amx, index, name);
-
-	return pHandler->HandleNative(name, index, 0);
-}
-
-static cell AMX_NATIVE_CALL invalid_native(AMX *amx, cell *params)
-{
-	//A script has accidentally called an invalid native! give them a
-	// first chance to block the resulting error.
-
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	//this should never happen
-	if (!pHandler)
-	{
-		LogError(amx, AMX_ERR_INVNATIVE, "Invalid native attempt");
-		return 0;
-	}
-
-	//this should never happen because this native won't be called
-	// if the plugin isn't filtering.
-	if (!pHandler->IsNativeFiltering())
-	{
-		LogError(amx, AMX_ERR_INVNATIVE, "Invalid native attempt");
-		return 0;
-	}
-
-	char name[sNAMEMAX + 1];
-	int native = (int)(_INT_PTR)(amx->usertags[UT_NATIVE]);
-	int err = amx_GetNative(amx, native, name);
-
-	if (err != AMX_ERR_NONE)
-		name[0] = '\0';
-
-	//1 - because we're trapping usage
-	if (!pHandler->HandleNative(name, native, 1))
-	{
-		amx->usertags[UT_NATIVE] = (void *)native;
-		LogError(amx, AMX_ERR_INVNATIVE, NULL);
-		return 0;
-	}
-
-	//Someday maybe allow native filters to write their own return value?
-	return 0;
-}
-
-void CPluginMngr::CPlugin::Finalize()
-{
-	char buffer[128];
-	int old_status = status;
-	
-	if (CheckModules(&amx, buffer))
-	{
-		if (amx_Register(&amx, core_Natives, -1) != AMX_ERR_NONE)
-		{
-			Handler *pHandler = (Handler *)amx.userdata[UD_HANDLER];
-			int res = 0;
-			
-			if (pHandler->IsNativeFiltering())
-				res = amx_CheckNatives(&amx, native_handler);
-			
-			if (!res)
-			{
-				status = ps_bad_load;
-				sprintf(buffer, "Plugin uses an unknown function (name \"%s\") - check your modules.ini.", no_function);
-				errorMsg.assign(buffer);
-				amx.error = AMX_ERR_NOTFOUND;
-			} else {
-				amx_RegisterToAny(&amx, invalid_native);
-			}
-		}
-	} else {
-		status = ps_bad_load;
-		errorMsg.assign(buffer);
-		amx.error = AMX_ERR_NOTFOUND;
-	}
-	
-	if (old_status != status)
-	{
-		AMXXLOG_Log("[AMXX] Plugin \"%s\" failed to load: %s", name.c_str(), errorMsg.c_str());
+void CPluginMngr::CPlugin::pauseFunction( int id ) { 
+	if (isValid()){
+		paused_fun |= (1<<id);
+		g_commands.clearBufforedInfo();
 	}
 }
 
-void CPluginMngr::CPlugin::pauseFunction(int id)
-{ 
+void CPluginMngr::CPlugin::unpauseFunction( int id ) {
+	if (isValid()) {
+		paused_fun &= ~(1<<id); 
+		g_commands.clearBufforedInfo();
+	}
 }
 
-void CPluginMngr::CPlugin::unpauseFunction(int id)
-{
-}
-
-void CPluginMngr::CPlugin::setStatus(int a)
-{ 
+void CPluginMngr::CPlugin::setStatus( int a   ) { 
 	status = a; 
 	g_commands.clearBufforedInfo(); // ugly way
 }
@@ -407,8 +172,16 @@ void CPluginMngr::CPlugin::pausePlugin()
 	if (isValid())
 	{
 		// call plugin_pause if provided
-		if (m_PauseFwd != -1)
-			executeForwards(m_PauseFwd);
+		int func;
+		cell retval;
+		if (amx_FindPublic(&amx, "plugin_pause", &func) == AMX_ERR_NONE)
+		{
+			if (isExecutable(func))
+			{
+
+				amx_Exec(&amx, &retval, func, 0);
+			}
+		}
 	
 		setStatus(ps_paused);
 	}
@@ -417,286 +190,20 @@ 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)
+		int func;
+		cell retval;
+		if (amx_FindPublic(&amx, "plugin_unpause", &func) == AMX_ERR_NONE)
 		{
-			executeForwards(m_UnpauseFwd);
-		}
-	}
-}
-
-char *CPluginMngr::ReadIntoOrFromCache(const char *file, size_t &bufsize)
+			if (isExecutable(func))
 			{
-	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);
+				amx_Exec(&amx, &retval, func, 0);
 			}
 		}
 	}
 }
-
-	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,27 +32,22 @@
 #ifndef PLUGIN_H
 #define PLUGIN_H
 
-#include "CString.h"
-#include "sh_list.h"
-#include "amx.h"
-#include "amxxfile.h"
-
 // *****************************************************
 // class CPluginMngr
 // *****************************************************
 
-enum
-{
-	ps_bad_load,	//Load failed
-	ps_error,	//Erroneous state
-	ps_locked,	//UNUSED
-	ps_paused,	//Plugin is temporarily paused
-	ps_stopped,	//Plugin is ... more temporarily paused
-	ps_running,	//Plugin is running
+enum {
+	ps_bad_load,
+	ps_error,
+	ps_paused,
+	ps_running,
+	ps_stopped,
+	ps_locked
 };
 
 class CPluginMngr
 {
+
 public:
 
 	class iterator;
@@ -64,80 +59,62 @@ public:
 	
 		AMX amx;
 		void* code;
-		
 		String name;
 		String version;
 		String title;
 		String author;
-		String errorMsg;
-		
-		int m_PauseFwd;
-		int m_UnpauseFwd;
 		int paused_fun;
 		int status;
 		CPlugin* next;
 		int id;
-		
-		CPlugin(int i, const char* p, const char* n, char* e, int d);
+		CPlugin(int i , const char* p,const char* n, char* e);
 		~CPlugin( );
 
-		bool m_Debug;
 	public:
+
 		inline const char* getName() { return name.c_str();}
 		inline const char* getVersion() { return version.c_str();}
 		inline const char* getTitle() { return title.c_str();}
 		inline const char* getAuthor() { return author.c_str();}
-		inline const char* getError() { return errorMsg.c_str();}
-		inline int getStatusCode() { return status; }
 		inline int getId() const { return id; }
 		inline AMX* getAMX() { return &amx; }
-		inline const AMX* getAMX() const { return &amx; }
 		inline void setTitle( const char* n ) { title.assign(n); }
 		inline void setAuthor( const char* n ) { author.assign(n); }
 		inline void setVersion( const char* n ) { version.assign(n); }
-		inline void setError(const char* n) { errorMsg.assign(n); }
-		inline bool isValid() const { return (status >= ps_paused); }
+		inline bool isValid() const { return ((status != ps_bad_load) && (status != ps_locked)); }
 		inline bool isPaused() const { return ( (status == ps_paused) || (status == ps_stopped)); }
-		inline bool isExecutable(int id) const { return (isValid() && !isPaused());	}
-		
-		void Finalize();
+		inline bool isFunctionPaused( int id ) const { return (paused_fun & (1<<id)) ? true : false; 	}
+		inline bool isExecutable(int id) const { 	return (isValid() && !isPaused() && !isFunctionPaused(id));	}
 		void pausePlugin();
 		void unpausePlugin();
 		void pauseFunction( int id );
 		void unpauseFunction( int id );
 		void setStatus( int a   );
-		
 		const char* getStatus() const;
-		inline bool isDebug() const { return m_Debug; }
 	}; 
 	
 private:	
 	CPlugin *head;
 	int pCounter;
-public:
-	CPluginMngr() { head = 0; pCounter = 0; pNatives = NULL; m_Finalized=false;}
-	~CPluginMngr() { clear(); InvalidateCache(); }
 
-	bool m_Finalized;
-	AMX_NATIVE_INFO *pNatives;
+
+public:
+	CPluginMngr() { head = 0; pCounter = 0; }
+	~CPluginMngr() { clear(); }
 
 	// Interface
 
-	CPlugin* loadPlugin(const char* path, const char* name, char* error, int debug);
+	CPlugin* loadPlugin(const char* path, const char* name, char* error);
 	void unloadPlugin( CPlugin** a );
-	int loadPluginsFromFile(const char* filename, bool warn=true);
-	
-	inline CPlugin* findPluginFast(AMX *amx) { return (CPlugin*)(amx->userdata[UD_FINDPLUGIN]); }
+	int loadPluginsFromFile( const char* filename );
+	CPlugin* findPluginFast(AMX *amx);
 	CPlugin* findPlugin(AMX *amx);
 	CPlugin* findPlugin(int index);
 	CPlugin* findPlugin(const char* name);
-	
 	inline int getPluginsNum() const { return pCounter; }
-	void Finalize();
 	void clear();
 
-	class iterator
-	{
+	class iterator {
 		CPlugin *a;
 	public:
 		iterator(CPlugin*aa) : a(aa) {}
@@ -147,25 +124,10 @@ public:
 		operator bool () const { return a ? true : false; }
 		CPlugin& operator*() { return *a; }
 	};
-	
 	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
+#endif
+
+

amxmodx/CQueue.h

@@ -45,17 +45,14 @@ public:
 			item = i;
 			next = n;
 		}
-		
 		CQueueItem *GetNext()
 		{
 			return next;
 		}
-		
 		T & GetItem()
 		{
 			return item;
 		}
-		
 		void SetNext(CQueueItem *n)
 		{
 			next = n;
@@ -122,8 +119,8 @@ public:
 private:
 	CQueueItem *mFirst;
 	CQueueItem *mLast;
-	
 	unsigned int mSize;
 };
 
 #endif //_INCLUDE_CQUEUE_H
+

amxmodx/CString.h

@@ -32,9 +32,6 @@
 #ifndef _INCLUDE_CSTRING_H
 #define _INCLUDE_CSTRING_H
 
-#include <string.h>
-#include <stdio.h>
-
 //by David "BAILOPAN" Anderson
 class String
 {
@@ -42,8 +39,10 @@ public:
 	String() 
 	{
 		v = NULL;
-		a_size = 0;
-		//assign("");
+		mSize = 0;
+		cSize = 0;
+		Grow(2);
+		assign("");
 	}
 
 	~String()
@@ -55,45 +54,41 @@ public:
 	String(const char *src) 
 	{
 		v = NULL; 
-		a_size = 0;
-		assign(src); 
+		mSize = 0; 
+		cSize = 0; assign(src); 
 	}
 
-	const char * _fread(FILE *fp) 	 
-	{ 	 
-		Grow(512, false); 	 
-		char *ret = fgets(v, 511, fp); 	 
-		return ret; 	 
-	}
-
-	String(const String &src) 
+	String(String &src) 
 	{
 		v = NULL;
-		a_size = 0;
+		mSize = 0;
+		cSize = 0;
 		assign(src.c_str()); 
 	}
 
 	const char *c_str() { return v?v:""; }
-
 	const char *c_str() const { return v?v:""; }
 
 	void append(const char *t)
 	{
-		Grow(size() + strlen(t) + 1);
+		Grow(cSize + strlen(t));
 		strcat(v, t);
+		cSize = strlen(v);
 	}
 
 	void append(const char c)
 	{
-		size_t len = size();
-		Grow(len + 2);
-		v[len] = c;
-		v[len + 1] = '\0';
+		Grow(cSize + 2);
+		v[cSize] = c;
+		v[++cSize] = 0;
 	}
 
 	void append(String &d)
 	{
-		append(d.c_str());
+		const char *t = d.c_str();
+		Grow(cSize + strlen(t));
+		strcat(v, t);
+		cSize = strlen(v);
 	}
 
 	void assign(const String &src)
@@ -105,58 +100,79 @@ public:
 	{
 		if (!d)
 		{
-			clear();
+			Grow(1);
+			cSize = 0;
+			strcpy(v, "");
+			return;
+		}
+		Grow(strlen(d));
+		if (v)
+		{
+			strcpy(v, d);
+			cSize = strlen(v);
 		} else {
-			size_t len = strlen(d);
-			Grow(len + 1, false);
-			memcpy(v, d, len);
-			v[len] = '\0';
+			cSize = 0;
 		}
 	}
 
 	void clear()
 	{
 		if (v)
-			v[0] = '\0';
+		{
+			v[0] = 0;
+			cSize = 0;
+		}
 	}
 
-	int compare (const char *d) const
+	int compare (const char *d)
 	{
-		if (!v)
-			return strcmp("", d);
-		else
+		if (v) {
+			if (d) {
 				return strcmp(v, d);
+			} else {
+				return strlen(v);
+			}
+		} else {
+			if (d) {
+				return strlen(d);
+			} else {
+				return 0;
+			}
+		}
 	}
 
 	//Added this for amxx inclusion
 	bool empty()
 	{
-		if (!v)
-			return true;
-
-		if (v[0] == '\0')
+		if (!v || !cSize)
 			return true;
 
 		return false;
 	}
 
-	size_t size()
+	int size()
 	{
-		if (v)
-			return strlen(v);
-		else
+		if (!v)
 			return 0;
+		return cSize;
+	}
+
+	const char * _fread(FILE *fp)
+	{
+		Grow(512);
+		char * ret = fgets(v, 511, fp);
+		cSize = strlen(v);
+		return ret;
 	}
 
 	int find(const char c, int index = 0)
 	{
-		int len = static_cast<int>(size());
-		if (len < 1)
+		if (!v)
 			return npos;
-		if (index >= len || index < 0)
+		if (index >= (int)cSize || index < 0)
 			return npos;
-		int i = 0;
-		for (i=index; i<len; i++)
+		unsigned int i = 0;
+		for (i=index; i<cSize; i++)
 		{
 			if (v[i] == c)
 			{
@@ -171,7 +187,7 @@ public:
 	{
 		if (c == '\f' || c == '\n' ||
 			c == '\t' || c == '\r' ||
-			c == '\v' || c == ' ')
+			c == 'v' || c == ' ')
 		{
 			return true;
 		}
@@ -179,40 +195,14 @@ public:
 		return false;
 	}
 	
-	void reparse_newlines()
-	{
-		size_t len = size();
-		int offs = 0;
-		char c;
-		if (!len)
-			return;
-		for (size_t i=0; i<len; i++)
-		{
-			c = v[i];
-			if (c == '^' && (i != len-1))
-			{
-				c = v[++i];
-				if (c == 'n')
-					c = '\n';
-				else if (c == 't')
-					c = '\t';
-				offs++;
-			}
-			v[i-offs] = c;
-		}
-		v[len-offs] = '\0';
-	}
-	
 	void trim()
 	{
 		if (!v)
 			return;
-
 		unsigned int i = 0;
 		unsigned int j = 0;
-		size_t len = strlen(v);
 
-		if (len == 1)
+		if (cSize == 1)
 		{
 			if (is_space(v[i]))
 			{
@@ -225,9 +215,9 @@ public:
 
 		if (is_space(c0))
 		{
-			for (i=0; i<len; i++)
+			for (i=0; i<cSize; i++)
 			{
-				if (!is_space(v[i]) || (is_space(v[i]) && ((unsigned char)i==len-1)))
+				if (!is_space(v[i]) || (is_space(v[i]) && ((unsigned char)i==cSize-1)))
 				{
 					erase(0, i);
 					break;
@@ -235,16 +225,16 @@ public:
 			}
 		}
 
-		len = strlen(v);
+		cSize = strlen(v);
 
-		if (len < 1)
+		if (cSize < 1)
 		{
 			return;
 		}
 
-		if (is_space(v[len-1]))
+		if (is_space(v[cSize-1]))
 		{
-			for (i=len-1; i>=0; i--)
+			for (i=cSize-1; i>=0; i--)
 			{
 				if (!is_space(v[i])
 					|| (is_space(v[i]) && i==0))
@@ -256,7 +246,7 @@ public:
 			}
 		}
 
-		if (len == 1)
+		if (cSize == 1)
 		{
 			if (is_space(v[0]))
 			{
@@ -266,22 +256,21 @@ public:
 		}
 	}
 
-	void erase(unsigned int start, int num = npos)
+	String & erase(unsigned int start, int num = npos)
 	{
 		if (!v)
-			return;
+			return (*this);
 		unsigned int i = 0;
-		size_t len = size();
 		//check for bounds
-		if (num == npos || start+num > len-start)
-			num = len - start;
+		if (num == npos || start+num > cSize-num+1)
+			num = cSize - start;
 		//do the erasing
 		bool copyflag = false;
-		for (i=0; i<len; i++)
+		for (i=0; i<cSize; i++)
 		{
 			if (i>=start && i<start+num)
 			{
-				if (i+num < len)
+				if (i+num < cSize)
 				{	
 					v[i] = v[i+num];
 				} else {
@@ -289,7 +278,7 @@ public:
 				}
 				copyflag = true;
 			} else if (copyflag) {
-				if (i+num < len)
+				if (i+num < cSize)
 				{
 					v[i] = v[i+num];
 				} else {
@@ -297,39 +286,38 @@ public:
 				}
 			}
 		}
-		len -= num;
-		v[len] = 0;
+		cSize -= num;
+		v[cSize] = 0;
+
+		return (*this);
 	}
 
 	String substr(unsigned int index, int num = npos)
 	{
-		if (!v)
-		{
-			String b("");
-			return b;
-		}
-
 		String ns;
 
-		size_t len = size();
-
-		if (index >= len || !v)
+		if (index >= cSize || !v)
 			return ns;
 		
 		if (num == npos)
 		{
-			num = len - index;
-		} else if (index+num >= len) {
-			num = len - index;
+			num = cSize - index;
+		} else if (index+num >= cSize) {
+			num = cSize - index;
 		}
 
-		unsigned int i = 0;
-		unsigned int nslen = num + 2;
-
-		ns.Grow(nslen);
+		unsigned int i = 0, j=0;
+		char *s = new char[cSize+1];
 
 		for (i=index; i<index+num; i++)
-			ns.append(v[i]);
+		{
+			s[j++] = v[i];
+		}
+		s[j] = 0;
+
+		ns.assign(s);
+
+		delete [] s;
 
 		return ns;
 	}
@@ -339,11 +327,10 @@ public:
 		if (!v)
 			return;
 		unsigned int i = 0;
-		size_t len = strlen(v);
-		for (i=0; i<len; i++)
+		for (i=0; i<cSize; i++)
 		{
 			if (v[i] >= 65 && v[i] <= 90)
-				v[i] &= ~(1<<5);
+				v[i] |= 32;
 		}
 	}
 
@@ -362,7 +349,7 @@ public:
 
 	char operator [] (unsigned int index)
 	{
-		if (index > size() || !v)
+		if (index > cSize)
 		{
 			return -1;
 		} else {
@@ -372,7 +359,7 @@ public:
 
 	int at(int a)
 	{
-		if (a < 0 || a >= (int)size() || !v)
+		if (a < 0 || a >= (int)cSize)
 			return -1;
 
 		return v[a];
@@ -380,7 +367,7 @@ public:
 
 	bool at(int at, char c)
 	{
-		if (at < 0 || at >= (int)size() || !v)
+		if (at < 0 || at >= (int)cSize)
 			return false;
 
 		v[at] = c;
@@ -389,23 +376,27 @@ public:
 	}
 
 private:
-	void Grow(unsigned int d, bool copy=true)
+	void Grow(unsigned int d)
 	{
-		if (d <= a_size)
+		if (d<1)
 			return;
-		char *n = new char[d + 1];
-		if (copy && v)
-			strcpy(n, v);
-		if (v)
+		if (d > mSize)
+		{
+			mSize = d + 16;	// allocate a buffer
+			char *t = new char[d+1];
+			if (v) {
+				strcpy(t, v);
+				t[cSize] = 0;
 				delete [] v;
-		else
-			strcpy(n, "");			
-		v = n;
-		a_size = d + 1;
+			}
+			v = t;
+			mSize = d;
+		}
 	}
 
 	char *v;
-	unsigned int a_size;
+	unsigned int mSize;
+	unsigned int cSize;
 public:
 	static const int npos = -1;
 };

amxmodx/CTask.cpp

@@ -33,29 +33,27 @@
 #include "CTask.h"
 
 /*********************** CTask ***********************/
-
-void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
+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, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
 {
-	clear();
 	m_bFree = false;
 
 	m_pPlugin = pPlugin;
 	m_iFunc = iFunc;
 	m_iId = iId;
 	m_fBase = fBase;
-	m_bInExecute = false;
-
-	if (iFlags & 2)
-	{
-		m_bLoop = true;
-		m_iRepeat = -1;
-	}
-	else if (iFlags & 1)
-	{
-		m_bLoop = true;
-		m_iRepeat = iRepeat;
-	}
 
+	m_iRepeat =		(iFlags & 1) ? iRepeat : 0;
+	m_bLoop =		(iFlags & 2) ?  true : false;
 	m_bAfterStart =	(iFlags & 4) ?  true : false;
 	m_bBeforeEnd =	(iFlags & 8) ?  true : false;
 
@@ -63,11 +61,14 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 
 	if (iParamsLen)
 	{
+		// also add a cell to the back with the value 0
 		m_iParamLen = iParamsLen + 1;
 		m_pParams = new cell[m_iParamLen];
 		memcpy(m_pParams, pParams, sizeof(cell)*iParamsLen);
 		m_pParams[iParamsLen] = 0;
-	} else {
+	}
+	else
+	{
 		m_iParamLen = 0;
 		m_pParams = NULL;
 	}
@@ -76,29 +77,8 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 void CTaskMngr::CTask::clear()
 {
 	m_bFree = true;
-
-	if (m_iFunc >= 0)
-	{
-		unregisterSPForward(m_iFunc);
-		m_iFunc = -1;
-	}
-
 	if (m_pParams)
-	{
 		delete [] m_pParams;
-		m_pParams = NULL;
-	}
-
-	m_pPlugin = NULL;
-	m_iId = 0;
-	m_fBase = 0.0f;
-
-	m_iRepeat =	0;
-	m_bLoop = false;
-	m_bAfterStart =	false;
-	m_bBeforeEnd = false;
-
-	m_fNextExecTime = 0.0f;
 }
 
 bool CTaskMngr::CTask::isFree() const
@@ -119,8 +99,6 @@ void CTaskMngr::CTask::resetNextExecTime(float fCurrentTime)
 void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft)
 {
 	bool execute=false;
-	bool done = false;
-	
 	if (m_bAfterStart)
 	{
 		if (fCurrentTime - fTimeLeft + 1.0f >= m_fBase)
@@ -132,66 +110,49 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 			execute = true;
 	}
 	else if (m_fNextExecTime <= fCurrentTime)
-	{
 		execute = true;
-	}
 
 	if (execute)
 	{
-		//only bother calling if we have something to call
-		if (!(m_bLoop && !m_iRepeat))
+		if (m_pPlugin->isExecutable(m_iFunc))
 		{
-			m_bInExecute = true;
+			int err;
 			if (m_iParamLen)	// call with parameters
 			{
-				cell arr = prepareCellArray(m_pParams, m_iParamLen);
-				executeForwards(m_iFunc, arr, m_iId);
-			} else {
-				executeForwards(m_iFunc, m_iId);
-			}
-			m_bInExecute = false;
-		}
+				cell amx_addr, *phys_addr;
+				if (amx_Allot(m_pPlugin->getAMX(), m_iParamLen, &amx_addr, &phys_addr) != AMX_ERR_NONE)
+					AMXXLOG_Log("[AMXX] Failed to allocate AMX memory (task \"%d\") (plugin \"%s\")", m_iId, m_pPlugin->getName());
+				else
+				{
+					copy_amxmemory(phys_addr, m_pParams, m_iParamLen);
+					if ((err = amx_Exec(m_pPlugin->getAMX(), NULL, m_iFunc, 2, amx_addr, m_iId)) != AMX_ERR_NONE)
+						AMXXLOG_Log("[AMXX] Run time error %d on line %ld (task \"%d\") (plugin \"%s\")", err, m_pPlugin->getAMX()->curline, m_iId, m_pPlugin->getName());
 
-		if (isFree())
-			return;
+					amx_Release(m_pPlugin->getAMX(), amx_addr);
+				}
+			}
+			else
+			{
+				if ((err = amx_Exec(m_pPlugin->getAMX(), NULL, m_iFunc, 1, m_iId)) != AMX_ERR_NONE)
+					AMXXLOG_Log("[AMXX] Run time error %d on line %ld (task \"%d\") (plugin \"%s\")", err, m_pPlugin->getAMX()->curline, m_iId, m_pPlugin->getName());
+			}
+		}
 
 		// set new exec time OR remove the task if needed
-		if (m_bLoop)
+		if (m_bLoop || (--m_iRepeat > 0))
 		{
-			if (m_iRepeat != -1 && --m_iRepeat <= 0)
-				done = true;
-		} else {
-			done = true;
-		}
-
-		if (done)
-		{
-			clear();
-		} else {
 			m_fNextExecTime += m_fBase;
 		}
+		else
+		{
+			m_bFree = true;
+		}
 	}
 }
 
 CTaskMngr::CTask::CTask()
 {
 	m_bFree = true;
-
-	m_pPlugin = NULL;
-	m_iFunc = -1;
-	m_iId = 0;
-	m_fBase = 0.0f;
-
-	m_iRepeat =	0;
-	m_bLoop = false;
-	m_bAfterStart =	false;
-	m_bBeforeEnd = false;
-	m_bInExecute = false;
-
-	m_fNextExecTime = 0.0f;
-
-	m_iParamLen = 0;
-	m_pParams = NULL;
 }
 
 CTaskMngr::CTask::~CTask()
@@ -200,7 +161,6 @@ CTaskMngr::CTask::~CTask()
 }
 
 /*********************** CTaskMngr ***********************/
-
 CTaskMngr::CTaskMngr()
 {
 	m_pTmr_CurrentTime = NULL;
@@ -208,11 +168,6 @@ CTaskMngr::CTaskMngr()
 	m_pTmr_TimeLeft = NULL;
 }
 
-CTaskMngr::~CTaskMngr()
-{
-	clear();
-}
-
 void CTaskMngr::registerTimers(float *pCurrentTime, float *pTimeLimit, float *pTimeLeft)
 {
 	m_pTmr_CurrentTime = pCurrentTime;
@@ -220,22 +175,21 @@ void CTaskMngr::registerTimers(float *pCurrentTime, float *pTimeLimit, float *pT
 	m_pTmr_TimeLeft = pTimeLeft;
 }
 
-void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
+void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
 {
 	// first, search for free tasks
 	TaskListIter iter = m_Tasks.find(CTaskDescriptor(0, NULL, true));
-	
 	if (iter)
 	{
 		// found: reuse it
 		iter->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
-	} else {
+	}
+	else
+	{
 		// not found: make a new one
 		CTask *pTmp = new CTask;
-		
 		if (!pTmp)
 			return;
-		
 		pTmp->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
 		m_Tasks.put(pTmp);
 	}
@@ -246,14 +200,12 @@ int CTaskMngr::removeTasks(int iId, AMX *pAmx)
 	CTaskDescriptor descriptor(iId, pAmx);
 	TaskListIter iter = m_Tasks.find(descriptor);
 	int i=0;
-	
 	while (iter)
 	{
 			iter->clear();
 			++i;
 			iter = m_Tasks.find(++iter, descriptor);
 	}
-	
 	return i;
 }
 
@@ -262,7 +214,6 @@ int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase)
 	CTaskDescriptor descriptor(iId, pAmx);
 	TaskListIter iter = m_Tasks.find(descriptor);
 	int i=0;
-	
 	while (iter)
 	{
 			iter->changeBase(fNewBase);
@@ -270,7 +221,6 @@ int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase)
 			++i;
 			iter = m_Tasks.find(++iter, descriptor);
 	}
-	
 	return i;
 }
 

amxmodx/CTask.h

@@ -39,40 +39,34 @@ private:
 	class CTask
 	{
 		// task settings
-		
 		CPluginMngr::CPlugin *m_pPlugin;
-		cell m_iId;
+		int m_iId;
 		int m_iFunc;
 		int m_iRepeat;
-		
-		bool m_bInExecute;
 		bool m_bLoop;
 		bool m_bAfterStart;
 		bool m_bBeforeEnd;
 		float m_fBase;		// for normal tasks, stores the interval, for the others, stores the amount of time before start / after end
 		int m_iParamLen;
-		
 		cell *m_pParams;
 		bool m_bFree;
 
 		// execution
 		float m_fNextExecTime;
 	public:
-		void set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime);
-		void clear();
-		bool isFree() const;
+		inline void set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime);
+		inline void clear();
+		inline bool isFree() const;
 
-		inline CPluginMngr::CPlugin *getPlugin() const { return m_pPlugin; }
-		inline AMX *getAMX() const { return m_pPlugin->getAMX(); }
-		inline int getTaskId() const { return m_iId; }
+		inline CPluginMngr::CPlugin *getPlugin() const;
+		inline int getTaskId() const;
 
-		void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
+		inline 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; }
+		inline void changeBase(float fNewBase);
+		inline void resetNextExecTime(float fCurrentTime);
 
-		bool shouldRepeat();
+		inline bool shouldRepeat();
 
 		CTask();
 		~CTask();
@@ -81,7 +75,7 @@ private:
 	class CTaskDescriptor
 	{
 	public:
-		cell m_iId;
+		int m_iId;
 		AMX *m_pAmx;
 		bool m_bFree;
 
@@ -95,36 +89,33 @@ 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()) && 
-					(right.m_pAmx ? left.getAMX() == right.m_pAmx : true) && 
-					(left.getTaskId() == right.m_iId);
+			return !left.isFree() &&
+				(right.m_pAmx ? left.getPlugin()->getAMX() == right.m_pAmx : true) &&
+				left.getTaskId() == right.m_iId;
 		}
 	};
 
 	/*** CTaskMngr priv members ***/
 	typedef CList<CTask, CTaskDescriptor> TaskList;
 	typedef TaskList::iterator TaskListIter;
-	
 	TaskList m_Tasks;
-	
 	float *m_pTmr_CurrentTime;
 	float *m_pTmr_TimeLimit;
 	float *m_pTmr_TimeLeft;
 public:
 	CTaskMngr();
-	~CTaskMngr();
 
 	void registerTimers(float *pCurrentTime, float *pTimeLimit, float *pTimeLeft);	// The timers will always point to the right value
-	void registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat);
-	
+	void registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat);
 	int removeTasks(int iId, AMX *pAmx);	// remove all tasks that match the id and amx
 	int changeTasks(int iId, AMX *pAmx, float fNewBase);	// change all tasks that match the id and amx
 	bool taskExists(int iId, AMX *pAmx);
-	
 	void startFrame();
 	void clear();
 };
 
-#endif //CTASK_H
+#endif
+
+

amxmodx/CVault.cpp

@@ -39,7 +39,6 @@
 // *****************************************************
 // class Vault
 // *****************************************************
-
 bool Vault::exists( const char* k )
 {
 	if ( *k == 0 ) return false;
@@ -66,10 +65,10 @@ void Vault::put(const char* k, const char* v)
 	}
 	else
 		*a = new Obj( k , v );
+
 }
 
-Vault::Obj::Obj(const char* k, const char* v): key(k), value(v), next(0)
-{
+Vault::Obj::Obj( const char* k,  const char* v): key(k) , value(v) , next(0) {
 	number = atoi(v);
 }
 
@@ -137,6 +136,7 @@ void Vault::setSource(const char* n)
 	path.assign(n);
 }
 
+
 bool Vault::loadVault(  )
 {
 	if ( path.empty() ) return false;

amxmodx/CVault.h

@@ -45,7 +45,6 @@ class Vault
   {
 	String key;
 	String value;
-		
 	int number;
     Obj *next;
 	Obj( const char* k,  const char* v);
@@ -63,21 +62,17 @@ public:
 	// Interface
 
   bool exists( const char* k );
-	
   void put(const char* k, const char* v);
   void remove( const char* k );
-	
   const char* get( const char* n );
   int get_number( const char* n );
   void setSource( const char* n );
-	
   bool loadVault( );
   bool saveVault( );
-	
   void clear();
 
-	class iterator
-	{
+
+  class iterator {
 	Obj * a;
   public:
 	iterator(Obj*aa) : a(aa) {}
@@ -92,4 +87,7 @@ public:
   inline iterator end() const { return iterator(0); }
 };
 
-#endif //VAULT_CUSTOM_H
+#endif
+
+
+

amxmodx/CVector.h

@@ -32,8 +32,6 @@
 #ifndef __CVECTOR_H__
 #define __CVECTOR_H__
 
-#include <assert.h>
-
 // Vector
 template <class T> class CVector
 {
@@ -48,8 +46,7 @@ template <class T> class CVector
 			return false;
 		if (m_Data)
 		{
-			for (size_t i=0; i<m_CurrentUsedSize; i++)
-				newData[i] = m_Data[i];
+			memcpy(newData, m_Data, m_Size * sizeof(T));
 			delete [] m_Data;
 		}
 		m_Data = newData;
@@ -70,58 +67,30 @@ template <class T> class CVector
 		// change size
 		if (size == m_Size)
 			return true;
-
-		if (!size)
-		{
-			if (m_Data)
-			{
-				delete [] m_Data;
-				m_Data = NULL;
-				m_Size = 0;
-			}
-			return true;
-		}
-
 		T *newData = new T[size];
 		if (!newData)
 			return false;
 		if (m_Data)
 		{
-			size_t end = (m_CurrentUsedSize < size) ? (m_CurrentUsedSize) : size;
-			for (size_t i=0; i<end; i++)
-				newData[i] = m_Data[i];
+			memcpy(newData, m_Data, (m_Size < size) ? (m_Size * sizeof(T)) : (size * sizeof(T)));
 			delete [] m_Data;
 		}
+		if (m_Size < size)
+			m_CurrentSize = size;
 		m_Data = newData;
 		m_Size = size;
-		if (m_CurrentUsedSize > m_Size)
-			m_CurrentUsedSize = m_Size;
-
 		return true;
 	}
 
 	void FreeMemIfPossible()
 	{
-		if (!m_Data)
-			return;
 
-		if (!m_CurrentUsedSize)
-		{
-			ChangeSize(0);
-			return;
-		}
-
-		size_t newSize = m_Size;
-		while (m_CurrentUsedSize <= newSize / 2)
-			newSize /= 2;
-
-		if (newSize != m_Size)
-			ChangeSize(newSize);
 	}
 protected:
 	T *m_Data;
 	size_t m_Size;
 	size_t m_CurrentUsedSize;
+	size_t m_CurrentSize;
 public:
 	class iterator
 	{
@@ -215,7 +184,7 @@ public:
 
 		iterator & operator-=(size_t offset)
 		{
-			m_Ptr -= offset;
+			m_Ptr += offset;
 			return (*this);
 		}
 
@@ -229,7 +198,7 @@ public:
 		iterator operator-(size_t offset) const
 		{
 			iterator tmp(*this);
-			tmp.m_Ptr -= offset;
+			tmp.m_Ptr += offset;
 			return tmp;
 		}
 		
@@ -280,11 +249,10 @@ public:
 	CVector<T>(const CVector<T> & other)
 	{
 		// copy data
-		m_Data = new T [other.m_CurrentUsedSize];
-		m_Size = other.m_CurrentUsedSize;
+		m_Data = new T [other.m_Size];
+		m_Size = other.m_Size;
 		m_CurrentUsedSize = other.m_CurrentUsedSize;
-		for (size_t i=0; i<other.m_CurrentUsedSize; i++)
-			m_Data[i] = other.m_Data[i];
+		memcpy(m_Data, other.m_Data, m_CurrentUsedSize * sizeof(T));
 	}
 
 	~CVector<T>()
@@ -303,12 +271,12 @@ public:
 		return m_Size;
 	}
 
-	iterator begin() const
+	iterator begin()
 	{
 		return iterator(m_Data);
 	}
 
-	iterator end() const
+	iterator end()
 	{
 		return iterator(m_Data + m_CurrentUsedSize);
 	}
@@ -316,15 +284,13 @@ public:
 	iterator iterAt(size_t pos)
 	{
 		if (pos > m_CurrentUsedSize)
-			assert(0);
+			ASSERT(0);
 		return iterator(m_Data + pos);
 	}
 
 	bool reserve(size_t newSize)
 	{
-		if (newSize > m_Size)
 		return ChangeSize(newSize);
-		return true;
 	}
 
 	bool push_back(const T & elem)
@@ -345,15 +311,14 @@ public:
 		--m_CurrentUsedSize;
 		if (m_CurrentUsedSize < 0)
 			m_CurrentUsedSize = 0;
-
-		FreeMemIfPossible();
+		// :TODO: free memory sometimes
 	}
 
 	bool resize(size_t newSize)
 	{
 		if (!ChangeSize(newSize))
 			return false;
-		m_CurrentUsedSize = newSize;
+		FreeMemIfPossible();
 		return true;
 	}
 
@@ -366,7 +331,7 @@ public:
 	{
 		if (pos > m_CurrentUsedSize)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[pos];
 	}
@@ -375,7 +340,7 @@ public:
 	{
 		if (pos > m_CurrentUsedSize)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[pos];
 	}
@@ -394,7 +359,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[0];
 	}
@@ -403,7 +368,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[0];
 	}
@@ -412,7 +377,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[m_CurrentUsedSize - 1];
 	}
@@ -421,18 +386,20 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[m_CurrentUsedSize - 1];
 	}
 
-	iterator insert(iterator where, const T & value)
+	bool insert(iterator where, const T & value)
 	{
+		// we have to insert before
+		// if it is begin, don't decrement
+		if (where != m_Data)
+			--where;
 		// validate iter
-		if (where < m_Data || where > (m_Data + m_CurrentUsedSize))
-			return iterator(0);
-
-		size_t ofs = where - begin();
+		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
+			return false;
 
 		++m_CurrentUsedSize;
 		if (!GrowIfNeeded())
@@ -441,50 +408,34 @@ public:
 			return false;
 		}
 
-		where = begin() + ofs;
-
-		// Move subsequent entries
-		for (T *ptr = m_Data + m_CurrentUsedSize - 2; ptr >= where.base(); --ptr)
-			*(ptr + 1) = *ptr;
-
-		*where.base() = value;
-
-		return where;
+		memmove(where.base() + 1, where.base(), m_CurrentUsedSize - (where - m_Data));
+		memcpy(where.base(), &value, sizeof(T));
+		return true;
 	}
 
-	iterator erase(iterator where)
+	void erase(iterator where)
 	{
 		// validate iter
 		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
-			return iterator(0);
-
-		size_t ofs = where - begin();
+			return false;
 
 		if (m_CurrentUsedSize > 1)
 		{
 			// move
-			T *theend = m_Data + m_CurrentUsedSize;
-			for (T *ptr = where.base() + 1; ptr < theend; ++ptr)
-				*(ptr - 1) = *ptr;
+			memmove(where.base(), where.base() + 1, m_CurrentUsedSize - 1);
 		}
 
 		--m_CurrentUsedSize;
-
-		FreeMemIfPossible();
-
-		return begin() + ofs;
+		// :TODO: free memory sometimes
 	}
 
 	void clear()
 	{
 		m_Size = 0;
 		m_CurrentUsedSize = 0;
-		if (m_Data)
-		{
 		delete [] m_Data;
 		m_Data = NULL;
 	}
-	}
 };
 
 #endif // __CVECTOR_H__

amxmodx/JIT/jits.def

@@ -0,0 +1,10 @@
+LIBRARY jits
+DESCRIPTION "JIT for AMX Mod X"
+EXPORTS
+	asm_runJIT		@1
+	getMaxCodeSize		@2
+	amx_exec_asm		@3
+	amx_opcodelist		@4
+SECTIONS
+	.data READ WRITE
+	.code EXECUTE

amxmodx/Makefile

@@ -1,118 +1,123 @@
-#(C)2004-2005 AMX Mod X Development Team
-# Makefile written by David "BAILOPAN" Anderson
+MODNAME = amxx_mm
+SRCFILES = meta_api.cpp CFile.cpp CString.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\
+CForward.cpp CPlugin.cpp CModule.cpp CMenu.cpp emsg.cpp util.cpp \
+amxcore.cpp amxtime.cpp power.cpp amxxlog.cpp fakemeta.cpp mmgr/mmgr.cpp \
+amxxfile.cpp CLang.cpp md5.cpp amx.cpp
+#use this for amd64, remove the above amx.cpp, and rename amx.cpp to amx.c
+#CSRCFILES = amx.c minilzo/minilzo.c
+CSRCFILES = minilzo/minilzo.c
 
-HLSDK = ../../hlsdk
-MM_ROOT = ../metamod/metamod
+EXTRA_LIBS_LINUX =
+EXTRA_LIBS_WIN32 =
+EXTRA_LIBDIRS_LINUX = -Lextra/lib_linux
+EXTRA_LIBDIRS_WIN32 = -Lextra/lib_win32
 
-### EDIT BELOW FOR OTHER PROJECTS ###
+EXTRA_INCLUDEDIRS = -Iextra/include
 
-OPT_FLAGS = -O2 -fno-strict-aliasing -funroll-loops -s -fomit-frame-pointer -pipe
-DEBUG_FLAGS = -g -ggdb3
-CPP = gcc-4.1
-NAME = amxmodx
+EXTRA_FLAGS = -Dstrcmpi=strcasecmp
 
-BIN_SUFFIX_32 = mm_i386.so
-BIN_SUFFIX_64 = mm_amd64.so
+SDKTOP=../hlsdk
+METADIR=../metamod/metamod
 
-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 \
-	amxmod_compat.cpp
 
-LINK = -lgcc -static-libgcc
+SDKSRC=$(SDKTOP)/SourceCode
+OBJDIR_LINUX=obj.linux
+OBJDIR_WIN32=obj.win32
+SRCDIR=.
 
-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)
+ifdef windir
+	OS=WIN32
 else
-	BIN_DIR = Release
-	CFLAGS = $(OPT_FLAGS)
+	OS=LINUX
 endif
 
-ifeq "$(BINLOG)" "true"
-	NAME := $(NAME)_bl
-	BIN_DIR := $(BIN_DIR)BinLog
-	OBJECTS += binlog.cpp
-	CFLAGS += -DBINLOG_ENABLED
-endif
-
-CFLAGS += -DLINUX -DNDEBUG -DAMX_NOPROPLIST -fPIC -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
-
-ifeq "$(AMD64)" "true"
-	BINARY = $(NAME)_$(BIN_SUFFIX_64)
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -DAMD64 -m64
-	LINK += -lz64
-	OBJECTS += JIT/natives-amd64.o
+CC_LINUX=gcc
+ifeq "$(OS)" "WIN32"
+	CC_WIN32=gcc
+	LD_WINDLL=dllwrap
+	DEFAULT=win32
+	CLEAN=clean_win32
 else
-	BINARY = $(NAME)_$(BIN_SUFFIX_32)
-	OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o
-	OBJECTS += JIT/helpers-x86.o
-	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
-	LINK += -lz
-	OPT_FLAGS += -march=i586
+	CC_WIN32=/usr/local/cross-tools/i386-mingw32msvc/bin/gcc
+	LD_WINDLL=/usr/local/cross-tools/bin/i386-mingw32msvc-dllwrap
+	DEFAULT=linux win32
+	CLEAN=clean_both
 endif
 
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
+#use this for AMD64
+#LIBFILE_LINUX = $(MODNAME)_amd64.so
+LIBFILE_LINUX = $(MODNAME)_i386.so
+LIBFILE_WIN32 = $(MODNAME).dll
+TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX)
+TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32)
 
-all:
-	mkdir -p $(BIN_DIR)
-	$(MAKE) amxmodx
+FILES_ALL = *.cpp *.h [A-Z]* *.rc
+ifeq "$(OS)" "LINUX"
+	ASRCFILES := $(shell ls -t $(SRCFILES))
+else
+	ASRCFILES := $(shell dir /b)
+endif
+OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o)
+OBJC_LINUX := $(CSRCFILES:%.c=$(OBJDIR_LINUX)/%.o)
+OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o)
+OBJC_WIN32 := $(CSRCFILES:%.c=$(OBJDIR_WIN32)/%.o)
 
-amd64:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true
+#use this for amd64
+#CCOPT = -m64 -g -ggdb3 -DHAVE_I64 -DSMALL_CELL_SIZE=64
+CCOPT = -march=i386 -s -DNDEBUG -O2 -fomit-frame-pointer -fno-exceptions -fno-rtti -ffast math
 
-amd64_debug:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true DEBUG=true
+INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS)
+CFLAGS=-Wall -Wno-unknown-pragmas
+ODEF = -DOPT_TYPE=\"optimized\"
+CFLAGS:=$(CCOPT) $(CFLAGS) $(ODEF) $(EXTRA_FLAGS)
 
-amd64_binlog:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true BINLOG=true
+DO_CC_LINUX=$(CC_LINUX) $(CFLAGS) -fPIC $(INCLUDEDIRS) -o $@ -c $<
+DO_CC_WIN32=$(CC_WIN32) $(CFLAGS) $(INCLUDEDIRS) -o $@ -c $<
+LINK_LINUX=$(CC_LINUX) $(CFLAGS) -shared -ldl -lm $(OBJ_LINUX) $(OBJC_LINUX) $(EXTRA_LIBDIRS_LINUX) $(EXTRA_LIBS_LINUX) -o $@
+LINK_WIN32=$(LD_WINDLL) -mwindows --def $(MODNAME).def --add-stdcall-alias $(OBJ_WIN32) $(OBJC_WIN32) $(EXTRA_LIBDIRS_WIN32) $(EXTRA_LIBS_WIN32) -o $@
 
-amd64_binlog_debug:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true BINLOG=true DEBUG=true
+$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.c
+	$(DO_CC_LINUX)
 
-binlog:
-	$(MAKE) all BINLOG=true
+$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.cpp
+	$(DO_CC_LINUX)
 
-binlog_debug:
-	$(MAKE) all BINLOG=true DEBUG=true
+$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.c
+	$(DO_CC_WIN32)
 
-amxmodx: $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
+$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.cpp
+	$(DO_CC_WIN32)
 
-debug:	
-	$(MAKE) all DEBUG=true
+default: $(DEFAULT)
+
+$(TARGET_LINUX): $(OBJDIR_LINUX) $(OBJ_LINUX) $(OBJC_LINUX)
+	$(LINK_LINUX)
+
+$(TARGET_WIN32): $(OBJDIR_WIN32) $(OBJ_WIN32) $(OBJC_WIN32)
+	$(LINK_WIN32)
+
+$(OBJDIR_LINUX):
+	mkdir $@
+	mkdir $@/mmgr
+
+$(OBJDIR_WIN32):
+	mkdir $@
+	mkdir $@/mmgr
+
+win32: $(TARGET_WIN32)
+
+linux: $(TARGET_LINUX)
+
+clean: $(CLEAN)
+
+clean_both:
+	-rm -f $(OBJDIR_LINUX)/*
+	-rm -f $(OBJDIR_WIN32)/*
+
+clean_win32:
+	del /q $(OBJDIR_WIN32)
 
-default: all
  
-clean:
-	rm -rf Release/*.o
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Release/$(NAME)_$(BIN_SUFFIX_64)
-	rm -rf ReleaseBinLog/*.o
-	rm -rf ReleaseBinLog/$(NAME)_bl_$(BIN_SUFFIX_32)
-	rm -rf ReleaseBinLog/$(NAME)_bl_$(BIN_SUFFIX_64)
-	rm -rf Debug/*.o
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32)
-	rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64)
-	rm -rf DebugBinLog/*.o
-	rm -rf DebugBinLog/$(NAME)_bl_$(BIN_SUFFIX_32)
-	rm -rf DebugBinLog/$(NAME)_bl_$(BIN_SUFFIX_64)

amxmodx/Makefile.pl

@@ -0,0 +1,223 @@
+#!/usr/bin/perl
+#(C)2004 AMX Mod X Development Team
+# by David "BAILOPAN" Anderson
+
+# output will occur in bin.x.proc
+# where x is debug or opt and proc is ix86 or amd64
+# You must use this script from the amxmodx src dir
+
+#options = 
+# jit - use the JIT
+# debug - enable gdb debugging
+# amd64 - compile for AMD64 (impiles no jit)
+# proc=ix86 - assumed not amd64
+# clean - clean the specifications above
+
+$PROJECT = "amxx_mm";
+$sdk = "../hlsdk/SourceCode";
+$mm = "../metamod/metamod";
+
+@CPP_SOURCE_FILES = ("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", "MMGR/MMGR.cpp", "amxxfile.cpp", "CLang.cpp", "md5.cpp", "emsg.cpp", "CForward.cpp", "CPlugin.cpp", "CModule.cpp", "CMenu.cpp", "util.cpp");
+
+@C_SOURCE_FILES = ();
+my %OPTIONS, %OPT;
+
+$OPT{"debug"} = "-g -ggdb";
+$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\"";
+
+$OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_shared -I$sdk/dlls";
+
+while ($cmd = shift)
+{
+	if ($cmd =~ /jit/)
+	{
+		if ($OPTIONS{"amd64"})
+		{
+			die "You cannot compile the JIT and AMD64 yet.\n";
+		} else {
+			$OPTIONS{"jit"} = 1;
+		}
+	} elsif ($cmd =~ /amd64/) {
+		if ($OPTIONS{"jit"})
+		{
+			die "You cannot compile the JIT and AMD64 yet.\n";
+		} else {
+			$OPTIONS{"amd64"} = 1;
+		}
+	} elsif ($cmd =~ /debug/) {
+		$OPTIONS{"debug"} = 1;
+	} elsif ($cmd =~ /proc=i(\d)86/) {
+		$proc = $1;
+		if ($OPTIONS{"amd64"})
+		{
+			die "You cannot compile for i".$proc."86 and AMD64.\n";
+		} else {
+			$OPTIONS{"proc"} = "i".$proc."86";
+		}
+	} elsif ($cmd =~ /clean/) {
+		$OPTIONS{"clean"} = 1;		
+	}
+}
+
+$gcc = `gcc --version`;
+if ($gcc =~ /2\.9/)
+{
+	`ln -s amx.cpp amx.c`;
+	push(@C_SOURCE_FILES, "amx.c");
+	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
+} else {
+	if ($OPTIONS{"amd64"})
+	{
+		`cp amx.cpp amx.c`;
+		push(@C_SOURCE_FILES, "amx.c");
+	} else {
+		push(@CPP_SOURCE_FILES, "amx.cpp");
+	}
+	$OPT{"opt"} .= " -falign-loops=2 -falign-jumps=2 -falign-functions=2";
+}
+
+if ($OPTIONS{"debug"})
+{
+	$cflags = $OPT{"debug"};
+} else {
+	if (!$OPTIONS{"amd64"})
+	{
+		$proc = $OPTIONS{"proc"};
+		if (!$proc)
+		{
+			$proc = 3;
+		}
+		$cflags = "-march=i".$proc."86 ".$OPT{"opt"};
+	} else {
+		$cflags = $OPT{"opt"};
+	}
+}
+
+if ($OPTIONS{"amd64"})
+{
+	$cflags .= " -m64 -DSMALL_CELL_SIZE=64 -DHAVE_I64 $cflags";
+}
+
+if ($OPTIONS{"jit"})
+{
+	$cflags .= "-DJIT";
+}
+
+if ($OPTIONS{"debug"})
+{
+	$outdir = "bin.debug";
+} else {
+	$outdir = "bin.opt";
+}
+
+if ($OPTIONS{"amd64"})
+{
+	$outdir .= ".amd64";
+	$bin = $PROJECT."_amd64.so";
+} else {
+	$proc = $OPTIONS{"proc"};
+	if ($proc)
+	{
+		$outdir .= ".i".$proc."86";
+		$bin = $PROJECT."_i".$proc."86.so";
+	} else {
+		$outdir .= ".i386";
+		$bin = $PROJECT."_i386.so";
+	}
+}
+
+if ($OPTIONS{"clean"})
+{
+	`rm $outdir/*.o`;
+	`rm $outdir/MMGR/*.o`;
+	`rm $outdir/minilzo/*.o`;
+	`rm $outdir/$bin`;
+	die("Project cleaned.\n");
+}
+
+#create the dirs
+#build link list
+my @LINK;
+for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
+{
+	$file = $CPP_SOURCE_FILES[$i];
+	$file =~ s/\.cpp/\.o/;
+	push(@LINK, $outdir."/".$file);
+}
+for ($i=0; $i<=$#C_SOURCE_FILES; $i++)
+{
+	$file = $C_SOURCE_FILES[$i];
+	$file =~ s/\.c/\.o/;
+	push(@LINK, $outdir."/".$file);
+}
+if ($OPTIONS{"jit"})
+{
+	push(@LINK, "JIT/jits.o");
+}
+
+if (!(-d $outdir))
+{
+	mkdir($outdir);
+}
+if (!(-d "$outdir/MMGR"))
+{
+	mkdir("$outdir/MMGR");
+}
+if (!(-d "$outdir/JIT"))
+{
+	mkdir("$outdir/JIT");
+}
+if (!(-d "$outdir/minilzo"))
+{
+	mkdir("$outdir/minilzo");
+}
+
+$inc = $OPTIONS{"include"};
+
+for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
+{
+	$file = $CPP_SOURCE_FILES[$i];
+	$ofile = $file;
+	$ofile =~ s/\.cpp/\.o/;
+	$ofile = "$outdir/$ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	if (-e $ofile)
+	{
+		$file_time = (stat($file))[9];
+		$ofile_time = (stat($file))[9];
+		if ($file_time > $ofile_time)
+		{
+			print "$gcc\n";
+			`$gcc`;
+		}
+	} else {
+		print "$gcc\n";
+		`$gcc`;
+	}
+}
+
+for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
+{
+	$file = $C_SOURCE_FILES[$i];
+	$ofile = $file;
+	$ofile =~ s/\.c/\.o/;
+	$ofile = "$outdir/$ofile";
+	$gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	if (-e $ofile)
+	{
+		$file_time = (stat($file))[9];
+		$ofile_time = (stat($file))[9];
+		if ($file_time > $ofile_time)
+		{
+			print "$gcc\n";
+			`$gcc`;
+		}
+	} else {
+		print "$gcc\n";
+		`$gcc`;
+	}
+}
+
+$gcc = "gcc $cflags -Lzlib/ -shared -ldl -lm @LINK -lz -o $outdir/$bin";
+print "$gcc\n";
+`$gcc`;

amxmodx/amx.h

@@ -1,6 +1,6 @@
-/*  Pawn Abstract Machine (for the Pawn language)
+/*  Abstract Machine for the Small compiler
  *
- *  Copyright (c) ITB CompuPhase, 1997-2005
+ *  Copyright (c) ITB CompuPhase, 1997-2004
  *
  *  This software is provided "as-is", without any express or implied warranty.
  *  In no event will the authors be held liable for any damages arising from
@@ -21,34 +21,22 @@
  *  Version: $Id$
  */
 
-#if defined FREEBSD && !defined __FreeBSD__
-  #define __FreeBSD__
-#endif
-#if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
-  #include <sclinux.h>
+#if defined __linux__
+  #include "sclinux.h"
 #endif
 
 #ifndef AMX_H_INCLUDED
 #define AMX_H_INCLUDED
 
-#if defined HAVE_STDINT_H
+//#define JIT
+
+#if defined __LCC__ || defined __DMC__ || defined __linux__
   #include <stdint.h>
-#else
-  #if defined __LCC__ || defined __DMC__ || defined LINUX
-    #if defined HAVE_INTTYPES_H
-      #include <inttypes.h>
-    #else
-      #include <stdint.h>
-    #endif
 #elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
   /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
    * here, these types are probably undefined.
    */
-    #if defined __MACH__
-      #include <ppc/types.h>
-      typedef unsigned short int  uint16_t;
-      typedef unsigned long int   uint32_t;
-    #elif defined __FreeBSD__
+  #if defined __FreeBSD__
     #include <inttypes.h>
   #else
     typedef short int           int16_t;
@@ -71,31 +59,17 @@
     #endif
   #endif
 #endif
-  #define HAVE_STDINT_H
-#endif
-#if defined _LP64 || defined WIN64 || defined _WIN64
-  #if !defined __64BIT__
-    #define __64BIT__
-  #endif
-#endif
 
-#if !defined arraysize
-  #define arraysize(array)  (sizeof(array) / sizeof((array)[0]))
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 /* || defined __MSDOS__ */
+  #if !defined alloca
+    #define alloca(n)   _alloca(n)
+  #endif
 #endif
 
 #ifdef  __cplusplus
 extern  "C" {
 #endif
 
-#if defined PAWN_DLL
-  #if !defined AMX_NATIVE_CALL
-    #define AMX_NATIVE_CALL __stdcall
-  #endif
-  #if !defined AMXAPI
-    #define AMXAPI          __stdcall
-  #endif
-#endif
-
 /* calling convention for native functions */
 #if !defined AMX_NATIVE_CALL
   #define AMX_NATIVE_CALL
@@ -106,8 +80,6 @@ extern  "C" {
     #define AMXAPI      __stdcall
   #elif defined CDECL
     #define AMXAPI      __cdecl
-  #elif defined GCC_HASCLASSVISIBILITY
-    #define AMXAPI __attribute__ ((visibility("default")))
   #else
     #define AMXAPI
   #endif
@@ -125,39 +97,45 @@ extern  "C" {
  *   5 (tagnames table)                         4
  *   6 (reformatted header)                     6
  *   7 (name table, opcodes SYMTAG & SYSREQ.D)  7
- *   8 (opcode STMT, renewed debug interface)   8
  */
-#define CUR_FILE_VERSION  8     /* current file version; also the current AMX version */
+#define CUR_FILE_VERSION  7     /* current file version; also the current AMX version */
 #define MIN_FILE_VERSION  6     /* lowest supported file format version for the current AMX version */
-#define MIN_AMX_VERSION   8     /* minimum AMX version needed to support the current file format */
+#define MIN_AMX_VERSION   7     /* minimum AMX version needed to support the current file format */
 
-#if !defined PAWN_CELL_SIZE
-  #define PAWN_CELL_SIZE 32     /* by default, use 32-bit cells */
+#if defined BIT16
+  #define SMALL_CELL_SIZE 16    /* for backward compatibility */
 #endif
-#if PAWN_CELL_SIZE==16
+#if !defined SMALL_CELL_SIZE
+  #define SMALL_CELL_SIZE 32    /* by default, use 32-bit cells */
+#endif
+#if SMALL_CELL_SIZE==16
   typedef uint16_t  ucell;
   typedef int16_t   cell;
-#elif PAWN_CELL_SIZE==32
+#elif SMALL_CELL_SIZE==32
   typedef uint32_t  ucell;
   typedef int32_t   cell;
-#define REAL	float
-#elif PAWN_CELL_SIZE==64
+#elif SMALL_CELL_SIZE==64
   typedef uint64_t  ucell;
   typedef int64_t   cell;
-#define REAL	double
 #else
-  #error Unsupported cell size (PAWN_CELL_SIZE)
+  #error Unsupported cell size (SMALL_CELL_SIZE)
 #endif
 
-#define UNPACKEDMAX   ((1L << (sizeof(cell)-1)*8) - 1)
-#define UNLIMITED     (~1u >> 1)
+#if SMALL_CELL_SIZE==32
+  #define REAL          float
+#elif SMALL_CELL_SIZE==64
+  #define REAL          double
+#else
+  #error Unsupported cell size
+#endif
+
+#define UNPACKEDMAX   ((1 << (sizeof(cell)-1)*8) - 1)
 
 struct tagAMX;
 typedef cell (AMX_NATIVE_CALL *AMX_NATIVE)(struct tagAMX *amx, cell *params);
 typedef int (AMXAPI *AMX_CALLBACK)(struct tagAMX *amx, cell index,
                                    cell *result, cell *params);
 typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
-typedef int (AMXAPI *AMX_NATIVE_FILTER)(struct tagAMX *amx, int index);
 #if !defined _FAR
   #define _FAR
 #endif
@@ -166,20 +144,12 @@ 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
  * compilers give a warning on unknown #pragmas, which is not so fine...
  */
-#if (defined SN_TARGET_PS2 || defined __GNUC__) && !defined AMX_NO_ALIGN
+#if defined SN_TARGET_PS2 || defined __GNUC__
   #define AMX_NO_ALIGN
 #endif
 
@@ -190,10 +160,8 @@ typedef int (AMXAPI *AMX_NATIVE_FILTER)(struct tagAMX *amx, int index);
 #endif
 
 #if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
+  #if defined __linux__
     #pragma pack(1)         /* structures must be packed (byte-aligned) */
-  #elif defined MACOS && defined __MWERKS__
-	#pragma options align=mac68k
   #else
     #pragma pack(push)
     #pragma pack(1)         /* structures must be packed (byte-aligned) */
@@ -203,10 +171,10 @@ typedef int (AMXAPI *AMX_NATIVE_FILTER)(struct tagAMX *amx, int index);
   #endif
 #endif
 
-typedef struct tagAMX_NATIVE_INFO {
+typedef struct {
   const char _FAR *name PACKED;
   AMX_NATIVE func       PACKED;
-} PACKED AMX_NATIVE_INFO;
+} AMX_NATIVE_INFO;
 
 #define AMX_USERNUM     4
 #define sEXPMAX         19      /* maximum name length for file version <= 6 */
@@ -214,19 +182,14 @@ typedef struct tagAMX_NATIVE_INFO {
 
 typedef struct tagAMX_FUNCSTUB {
   ucell address           PACKED;
-  char name[sEXPMAX+1];
-} PACKED AMX_FUNCSTUB;
-
-typedef struct tagFUNCSTUBNT {
-  ucell address         PACKED;
-  ucell nameofs      PACKED;	//we need this for amxx to be backwards comaptible
-} PACKED AMX_FUNCSTUBNT;
+  const char name[sEXPMAX+1] PACKED;
+} AMX_FUNCSTUB;
 
 /* The AMX structure is the internal structure for many functions. Not all
  * fields are valid at all times; many fields are cached in local variables.
  */
 typedef struct tagAMX {
-  unsigned char _FAR *base PACKED; /* points to the AMX header plus the code, optionally also the data */
+  unsigned char _FAR *base PACKED; /* points to the AMX header ("amxhdr") plus the code, optionally also the data */
   unsigned char _FAR *data PACKED; /* points to separate data+stack+heap, may be NULL */
   AMX_CALLBACK callback PACKED;
   AMX_DEBUG debug       PACKED; /* debug callback */
@@ -238,26 +201,30 @@ typedef struct tagAMX {
   cell stk              PACKED; /* stack pointer: relative to base + amxhdr->dat */
   cell stp              PACKED; /* top of the stack: relative to base + amxhdr->dat */
   int flags             PACKED; /* current status, see amx_Flags() */
+  /* for assertions and debug hook */
+  cell curline          PACKED;
+  cell curfile          PACKED;
+  int dbgcode           PACKED;
+  cell dbgaddr          PACKED;
+  cell dbgparam         PACKED;
+  char _FAR *dbgname    PACKED;
   /* user data */
-  void _FAR *usertags[AMX_USERNUM] PACKED;
-  //okay userdata[3] in AMX Mod X is for the CPlugin * pointer
-  //we're also gonna set userdata[2] to a special debug structure
-  //lastly, userdata[1] is for opcode_list from amx_BrowseRelocate
+  long usertags[AMX_USERNUM] PACKED;
   void _FAR *userdata[AMX_USERNUM] PACKED;
   /* native functions can raise an error */
   int error             PACKED;
-  /* passing parameters requires a "count" field */
-  int paramcount;
   /* the sleep opcode needs to store the full AMX status */
   cell pri              PACKED;
   cell alt              PACKED;
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
   cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
     int reloc_size      PACKED; /* required temporary buffer for relocations */
     long code_size      PACKED; /* estimated memory footprint of the native code */
-} PACKED AMX;
+  #endif
+} AMX;
 
 /* The AMX_HEADER structure is both the memory format as the file format. The
  * structure is used internaly.
@@ -265,8 +232,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    amx_version;          /* required version of the AMX */
+  char    file_version  PACKED; /* file format version */
+  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 */
@@ -279,10 +246,8 @@ typedef struct tagAMX_HEADER {
   int32_t libraries     PACKED; /* offset to the table of libraries */
   int32_t pubvars       PACKED; /* the "public variables" table */
   int32_t tags          PACKED; /* the "public tagnames" table */
-  int32_t nametable     PACKED; /* name table */
-} PACKED AMX_HEADER;
-
-//This is always the same for us
+  int32_t nametable     PACKED; /* name table, file version 7 only */
+} AMX_HEADER            PACKED;
 #define AMX_MAGIC       0xf1e0
 
 enum {
@@ -300,8 +265,6 @@ enum {
   AMX_ERR_NATIVE,       /* native function failed */
   AMX_ERR_DIVIDE,       /* divide by zero */
   AMX_ERR_SLEEP,        /* go into sleepmode - code can be restarted */
-  AMX_ERR_INVSTATE,     /* invalid state for this access */
-  AMX_ERR_INVNATIVE,	/* invalid native was used */
 
   AMX_ERR_MEMORY = 16,  /* out of memory */
   AMX_ERR_FORMAT,       /* invalid file format */
@@ -314,19 +277,27 @@ enum {
   AMX_ERR_INIT_JIT,     /* cannot initialize the JIT */
   AMX_ERR_PARAMS,       /* parameter error */
   AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
-  AMX_ERR_GENERAL,      /* general error (unknown or unspecific error) */
+};
+
+enum {
+  DBG_INIT,             /* query/initialize */
+  DBG_FILE,             /* file number in curfile, filename in name */
+  DBG_LINE,             /* line number in curline, file number in curfile */
+  DBG_SYMBOL,           /* address in dbgaddr, class/type in dbgparam */
+  DBG_CLRSYM,           /* stack address below which locals should be removed. stack address in stk */
+  DBG_CALL,             /* function call, address jumped to in dbgaddr */
+  DBG_RETURN,           /* function returns */
+  DBG_TERMINATE,        /* program ends, code address in dbgaddr, reason in dbgparam */
+  DBG_SRANGE,           /* symbol size and dimensions (arrays); level in dbgaddr (!); length in dbgparam */
+  DBG_SYMTAG,           /* tag of the most recent symbol (if non-zero), tag in dbgparam */
 };
 
 /*      AMX_FLAG_CHAR16   0x01     no longer used */
 #define AMX_FLAG_DEBUG    0x02  /* symbolic info. available */
 #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 */
-#define AMX_FLAG_BROWSE 0x4000  /* busy browsing */
+#define AMX_FLAG_BIGENDIAN 0x08 /* big endian encoding */
+#define AMX_FLAG_NOCHECKS  0x10 /* no array bounds checking */
+#define AMX_FLAG_BROWSE 0x4000  /* browsing/relocating or executing */
 #define AMX_FLAG_RELOC  0x8000  /* jump/call addresses relocated */
 
 #define AMX_EXEC_MAIN   -1      /* start at program entry point */
@@ -334,29 +305,16 @@ enum {
 
 #define AMX_USERTAG(a,b,c,d)    ((a) | ((b)<<8) | ((long)(c)<<16) | ((long)(d)<<24))
 
-#if !defined AMX_COMPACTMARGIN
-  #define AMX_COMPACTMARGIN 64
-#endif
-
-#define UD_FINDPLUGIN	3
-#define UD_DEBUGGER		2
-#define UD_OPCODELIST	1
-#define	UD_HANDLER		0
-#define	UT_NATIVE		3
-#define UT_OPTIMIZER	2
-#define UT_BROWSEHOOK	1
-#define UT_BINLOGS		0
-
-typedef void (*BROWSEHOOK)(AMX *amx, cell *oplist, cell *cip);
+#define AMX_EXPANDMARGIN  64
 
 /* for native functions that use floating point parameters, the following
  * two macros are convenient for casting a "cell" into a "float" type _without_
  * changing the bit pattern
  */
-#if PAWN_CELL_SIZE==32
+#if SMALL_CELL_SIZE==32
   #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
   #define amx_ctof(c)   ( * ((float*)&c) )  /* cell to float */
-#elif PAWN_CELL_SIZE==64
+#elif SMALL_CELL_SIZE==64
   #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
   #define amx_ctof(c)   ( * ((double*)&c) ) /* cell to float */
 #else
@@ -370,7 +328,7 @@ typedef void (*BROWSEHOOK)(AMX *amx, cell *oplist, cell *cip);
       amx_StrLen(amx_cstr_, &amx_length_);                                  \
       if (amx_length_ > 0 &&                                                \
           ((result) = (void*)alloca((amx_length_ + 1) * sizeof(*(result)))) != NULL) \
-        amx_GetString((char*)(result), amx_cstr_, sizeof(*(result))>1, amx_length_); \
+        amx_GetString((char*)(result), amx_cstr_, sizeof(*(result))>1);     \
       else (result) = NULL;                                                 \
     } while (0)
 
@@ -379,12 +337,20 @@ uint32_t * AMXAPI amx_Align32(uint32_t *v);
 #if defined _I64_MAX || defined HAVE_I64
   uint64_t * AMXAPI amx_Align64(uint64_t *v);
 #endif
+#if SMALL_CELL_SIZE==32
+#define amx_AlignCell amx_Align32
+#elif SMALL_CELL_SIZE==64
+#define amx_AlignCell amx_Align64
+#else
+#error Unsupported cell size
+#endif
 int AMXAPI amx_Allot(AMX *amx, int cells, cell *amx_addr, cell **phys_addr);
 int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params);
-int AMXAPI amx_CheckNatives(AMX *amx, AMX_NATIVE_FILTER nf);
 int AMXAPI amx_Cleanup(AMX *amx);
 int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data);
-int AMXAPI amx_Exec(AMX *amx, cell *retval, int index);
+int AMXAPI amx_Debug(AMX *amx); /* default debug procedure, does nothing */
+int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...);
+int AMXAPI amx_Execv(AMX *amx, cell *retval, int index, int numparams, cell params[]);
 int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index);
 int AMXAPI amx_FindPublic(AMX *amx, const char *funcname, int *index);
 int AMXAPI amx_FindPubVar(AMX *amx, const char *varname, cell *amx_addr);
@@ -394,7 +360,7 @@ int AMXAPI amx_GetAddr(AMX *amx,cell amx_addr,cell **phys_addr);
 int AMXAPI amx_GetNative(AMX *amx, int index, char *funcname);
 int AMXAPI amx_GetPublic(AMX *amx, int index, char *funcname);
 int AMXAPI amx_GetPubVar(AMX *amx, int index, char *varname, cell *amx_addr);
-int AMXAPI amx_GetString(char *dest,const cell *source, int use_wchar, size_t size);
+int AMXAPI amx_GetString(char *dest,const cell *source, int use_wchar);
 int AMXAPI amx_GetTag(AMX *amx, int index, char *tagname, cell *tag_id);
 int AMXAPI amx_GetUserData(AMX *amx, long tag, void **ptr);
 int AMXAPI amx_Init(AMX *amx, void *program);
@@ -406,60 +372,27 @@ int AMXAPI amx_NumNatives(AMX *amx, int *number);
 int AMXAPI amx_NumPublics(AMX *amx, int *number);
 int AMXAPI amx_NumPubVars(AMX *amx, int *number);
 int AMXAPI amx_NumTags(AMX *amx, int *number);
-int AMXAPI amx_Push(AMX *amx, cell value);
-int AMXAPI amx_PushArray(AMX *amx, cell *amx_addr, cell **phys_addr, const cell array[], int numcells);
-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_Register(AMX *amx, AMX_NATIVE_INFO *nativelist, int number);
 int AMXAPI amx_Release(AMX *amx, cell amx_addr);
 int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
 int AMXAPI amx_SetDebugHook(AMX *amx, AMX_DEBUG debug);
-int AMXAPI amx_SetString(cell *dest, const char *source, int pack, int use_wchar, size_t size);
+int AMXAPI amx_SetString(cell *dest, const char *source, int pack, int use_wchar);
 int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr);
-int AMXAPI amx_StrLen(const cell *cstring, int *length);
-int AMXAPI amx_UTF8Check(const char *string, int *length);
+int AMXAPI amx_StrLen(cell *cstring, int *length);
 int AMXAPI amx_UTF8Get(const char *string, const char **endptr, cell *value);
-int AMXAPI amx_UTF8Len(const cell *cstr, int *length);
 int AMXAPI amx_UTF8Put(char *string, char **endptr, int maxchars, cell value);
-int AMXAPI amx_GetLibraries(AMX *amx);
-const char *AMXAPI amx_GetLibrary(AMX *amx, int index, char *buffer, int len);
-int AMXAPI amx_SetStringOld(cell *dest,const char *source,int pack,int use_wchar);
-int AMXAPI amx_GetStringOld(char *dest,const cell *source,int use_wchar);
+int AMXAPI amx_UTF8Check(const char *string);
 
-#if PAWN_CELL_SIZE==16
-  #define amx_AlignCell(v) amx_Align16(v)
-#elif PAWN_CELL_SIZE==32
-  #define amx_AlignCell(v) amx_Align32(v)
-#elif PAWN_CELL_SIZE==64 && (defined _I64_MAX || defined HAVE_I64)
-  #define amx_AlignCell(v) amx_Align64(v)
-#else
-  #error Unsupported cell size
-#endif
-
-#define amx_RegisterFunc(amx, name, func) \
-  amx_Register((amx), amx_NativeInfo((name),(func)), 1);
 
 #if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
+  #if defined __linux__
     #pragma pack()    /* reset default packing */
-  #elif defined MACOS && defined __MWERKS__
-    #pragma options align=reset
   #else
     #pragma pack(pop) /* reset previous packing */
   #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/amx_mm.def

@@ -0,0 +1,11 @@
+; /usr/local/cross-tools/bin/i386-mingw32msvc-dlltool --base-file /tmp/cc4kB6s0.base --output-exp amx_mm.exp --dllname amx_mm.dll --output-def amx_mm.def --add-stdcall-alias --exclude-symbol=DllMainCRTStartup@12 --def /tmp/ccyI7I7K.def
+EXPORTS
+	GetEngineFunctions @ 1 ; 
+	GetEngineFunctions_Post @ 2 ; 
+	GetEntityAPI2 @ 3 ; 
+	GetEntityAPI2_Post @ 4 ; 
+	GiveFnptrsToDll = GiveFnptrsToDll@8 @ 5 ; 
+	GiveFnptrsToDll@8 @ 6 ; 
+	Meta_Attach @ 7 ; 
+	Meta_Detach @ 8 ; 
+	Meta_Query @ 9 ; 

amxmodx/amxcore.cpp

@@ -1,6 +1,6 @@
-/*  Core module for the Pawn AMX
+/*  Core module for the Small AMX
  *
- *  Copyright (c) ITB CompuPhase, 1997-2005
+ *  Copyright (c) ITB CompuPhase, 1997-2004
  *
  *  This software is provided "as-is", without any express or implied warranty.
  *  In no event will the authors be held liable for any damages arising from
@@ -34,7 +34,14 @@
 #include <string.h>
 #include <limits.h>
 #include <assert.h>
+
+// this file does not include amxmodx.h, so we have to include the memory manager here
+#ifdef MEMORY_TEST
+#include "mmgr/mmgr.h"
+#endif // MEMORY_TEST
+
 #include "amx.h"
+
 #if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined _Windows
   #include <windows.h>
 #endif
@@ -53,13 +60,14 @@
 # define _tcscpy        strcpy
 # define _tcsdup        strdup
 # define _tcslen        strlen
+# define _stprintf      sprintf
 #endif
 
 
 #define CHARBITS        (8*sizeof(char))
 typedef unsigned char   uchar;
 
-#if !defined AMX_NOPROPLIST
+#if !defined NOPROPLIST
 typedef struct _property_list {
   struct _property_list *next;
   cell id;
@@ -68,7 +76,7 @@ typedef struct _property_list {
   //??? safe AMX (owner of the property)
 } proplist;
 
-static proplist proproot = { NULL, 0, NULL, 0 };
+static proplist proproot = { NULL };
 
 static proplist *list_additem(proplist *root)
 {
@@ -134,13 +142,15 @@ static proplist *list_finditem(proplist *root,cell id,char *name,cell value,
 }
 #endif
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL numargs(AMX *amx, cell *params)
 {
   AMX_HEADER *hdr;
   uchar *data;
   cell bytes;
 
-  (void)params;
   hdr=(AMX_HEADER *)amx->base;
   data=amx->data ? amx->data : amx->base+(int)hdr->dat;
   /* the number of bytes is on the stack, at "frm + 2*cell" */
@@ -180,16 +190,18 @@ static cell AMX_NATIVE_CALL setarg(AMX *amx, cell *params)
   /* adjust the address in "value" in case of an array access */
   value+=params[2]*sizeof(cell);
   /* verify the address */
-  if (value<0 || value>=amx->hea && value<amx->stk)
+  if (value<0 || (value>=amx->hea && value<amx->stk))
     return 0;
   /* set the value indirectly */
   * (cell *)(data+(int)value) = params[3];
   return 1;
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL heapspace(AMX *amx,cell *params)
 {
-  (void)params;
   return amx->stk - amx->hea;
 }
 
@@ -208,22 +220,142 @@ static cell AMX_NATIVE_CALL funcidx(AMX *amx,cell *params)
     return 0;
   } /* if */
 
-  amx_GetString(name,cstr,0,UNLIMITED);
+  amx_GetString(name,cstr,0);
   err=amx_FindPublic(amx,name,&index);
   if (err!=AMX_ERR_NONE)
     index=-1;   /* this is not considered a fatal error */
   return index;
 }
 
+int amx_StrPack(cell *dest,cell *source)
+{
+  int len;
+
+  amx_StrLen(source,&len);
+  if ((ucell)*source>UNPACKEDMAX) {
+    /* source string is already packed */
+    while (len >= 0) {
+      *dest++ = *source++;
+      len-=sizeof(cell);
+    } /* while */
+  } else {
+    /* pack string, from bottom up */
+    cell c;
+    int i;
+    for (c=0,i=0; i<len; i++) {
+      assert((*source & ~0xffL)==0);
+      c=(c<<CHARBITS) | *source++;
+      if (i%sizeof(cell) == sizeof(cell)-1) {
+        *dest++=c;
+        c=0;
+      } /* if */
+    } /* for */
+    if (i%sizeof(cell) != 0)    /* store remaining packed characters */
+      *dest=c << (sizeof(cell)-i%sizeof(cell))*CHARBITS;
+    else
+      *dest=0;                  /* store full cell of zeros */
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+int amx_StrUnpack(cell *dest,cell *source)
+{
+  if ((ucell)*source>UNPACKEDMAX) {
+    /* unpack string, from top down (so string can be unpacked in place) */
+    cell c;
+    int i,len;
+    amx_StrLen(source,&len);
+    dest[len]=0;
+    for (i=len-1; i>=0; i--) {
+      c=source[i/sizeof(cell)] >> (sizeof(cell)-i%sizeof(cell)-1)*CHARBITS;
+      dest[i]=c & UCHAR_MAX;
+    } /* for */
+  } else {
+    /* source string is already unpacked */
+    while ((*dest++ = *source++) != 0)
+      /* nothing */;
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+static int verify_addr(AMX *amx,cell addr)
+{
+  int err;
+  cell *cdest;
+
+  err=amx_GetAddr(amx,addr,&cdest);
+  if (err!=AMX_ERR_NONE)
+    amx_RaiseError(amx,err);
+  return err;
+}
+
+static cell AMX_NATIVE_CALL core_strlen(AMX *amx,cell *params)
+{
+  cell *cptr;
+  int len = 0;
+
+  if (amx_GetAddr(amx,params[1],&cptr)==AMX_ERR_NONE)
+    amx_StrLen(cptr,&len);
+  return len;
+}
+
+static cell AMX_NATIVE_CALL strpack(AMX *amx,cell *params)
+{
+  cell *cdest,*csrc;
+  int len,needed,err;
+  size_t lastaddr;
+
+  /* calculate number of cells needed for (packed) destination */
+  amx_GetAddr(amx,params[2],&csrc);
+  amx_StrLen(csrc,&len);
+  needed=(len+sizeof(cell))/sizeof(cell);     /* # of cells needed */
+  assert(needed>0);
+  lastaddr=(size_t)(params[1]+sizeof(cell)*needed-1);
+  if (verify_addr(amx,(cell)lastaddr)!=AMX_ERR_NONE)
+    return 0;
+
+  amx_GetAddr(amx,params[1],&cdest);
+  err=amx_StrPack(cdest,csrc);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+static cell AMX_NATIVE_CALL strunpack(AMX *amx,cell *params)
+{
+  cell *cdest,*csrc;
+  int len,err;
+  size_t lastaddr;
+
+  /* calculate number of cells needed for (packed) destination */
+  amx_GetAddr(amx,params[2],&csrc);
+  amx_StrLen(csrc,&len);
+  assert(len>=0);
+  lastaddr=(size_t)(params[1]+sizeof(cell)*(len+1)-1);
+  if (verify_addr(amx,(cell)lastaddr)!=AMX_ERR_NONE)
+    return 0;
+
+  amx_GetAddr(amx,params[1],&cdest);
+  err=amx_StrUnpack(cdest,csrc);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL swapchars(AMX *amx,cell *params)
 {
   union {
     cell c;
-    #if PAWN_CELL_SIZE==16
+    #if SMALL_CELL_SIZE==16
       uchar b[2];
-    #elif PAWN_CELL_SIZE==32
+    #elif SMALL_CELL_SIZE==32
       uchar b[4];
-    #elif PAWN_CELL_SIZE==64
+    #elif SMALL_CELL_SIZE==64
       uchar b[8];
 	#else
 	  #error Unsupported cell size
@@ -231,21 +363,20 @@ static cell AMX_NATIVE_CALL swapchars(AMX *amx,cell *params)
   } value;
   uchar t;
 
-  (void)amx;
   assert((size_t)params[0]==sizeof(cell));
   value.c = params[1];
-  #if PAWN_CELL_SIZE==16
+  #if SMALL_CELL_SIZE==16
     t = value.b[0];
     value.b[0] = value.b[1];
     value.b[1] = t;
-  #elif PAWN_CELL_SIZE==32
+  #elif SMALL_CELL_SIZE==32
     t = value.b[0];
     value.b[0] = value.b[3];
     value.b[3] = t;
     t = value.b[1];
     value.b[1] = value.b[2];
     value.b[2] = t;
-  #elif PAWN_CELL_SIZE==64
+  #elif SMALL_CELL_SIZE==64
     t = value.b[0];
     value.b[0] = value.b[7];
     value.b[7] = t;
@@ -264,9 +395,11 @@ static cell AMX_NATIVE_CALL swapchars(AMX *amx,cell *params)
   return value.c;
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_tolower(AMX *amx,cell *params)
 {
-  (void)amx;
   #if defined __WIN32__ || defined _WIN32 || defined WIN32
     return (cell)CharLower((LPTSTR)params[1]);
   #elif defined _Windows
@@ -276,9 +409,11 @@ static cell AMX_NATIVE_CALL core_tolower(AMX *amx,cell *params)
   #endif
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_toupper(AMX *amx,cell *params)
 {
-  (void)amx;
   #if defined __WIN32__ || defined _WIN32 || defined WIN32
     return (cell)CharUpper((LPTSTR)params[1]);
   #elif defined _Windows
@@ -288,15 +423,19 @@ static cell AMX_NATIVE_CALL core_toupper(AMX *amx,cell *params)
   #endif
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_min(AMX *amx,cell *params)
 {
-  (void)amx;
   return params[1] <= params[2] ? params[1] : params[2];
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_max(AMX *amx,cell *params)
 {
-  (void)amx;
   return params[1] >= params[2] ? params[1] : params[2];
 }
 
@@ -312,7 +451,7 @@ static cell AMX_NATIVE_CALL core_clamp(AMX *amx,cell *params)
   return value;
 }
 
-#if !defined AMX_NOPROPLIST
+#if !defined NOPROPLIST
 static char *MakePackedString(cell *cptr)
 {
   int len;
@@ -320,21 +459,10 @@ static char *MakePackedString(cell *cptr)
 
   amx_StrLen(cptr,&len);
   dest=(char *)malloc(len+sizeof(cell));
-  amx_GetString(dest,cptr,0,UNLIMITED);
+  amx_GetString(dest,cptr,0);
   return dest;
 }
 
-static int verify_addr(AMX *amx,cell addr)
-{
-  int err;
-  cell *cdest;
-
-  err=amx_GetAddr(amx,addr,&cdest);
-  if (err!=AMX_ERR_NONE)
-    amx_RaiseError(amx,err);
-  return err;
-}
-
 static cell AMX_NATIVE_CALL getproperty(AMX *amx,cell *params)
 {
   cell *cstr;
@@ -352,7 +480,7 @@ static cell AMX_NATIVE_CALL getproperty(AMX *amx,cell *params)
       return 0;
     } /* if */
     amx_GetAddr(amx,params[4],&cstr);
-    amx_SetString(cstr,item->name,1,0,UNLIMITED);
+    amx_SetString(cstr,item->name,1,0);
   } /* if */
   free(name);
   return (item!=NULL) ? item->value : 0;
@@ -417,14 +545,12 @@ static cell AMX_NATIVE_CALL existproperty(AMX *amx,cell *params)
 }
 #endif
 
-#if !defined AMX_NORANDOM
 /* This routine comes from the book "Inner Loops" by Rick Booth, Addison-Wesley
  * (ISBN 0-201-47960-5). This is a "multiplicative congruential random number
  * generator" that has been extended to 31-bits (the standard C version returns
  * only 15-bits).
  */
-#define INITIAL_SEED  0xcaa938dbL
-static unsigned long IL_StandardRandom_seed = INITIAL_SEED; /* always use a non-zero seed */
+static unsigned long IL_StandardRandom_seed = 0L;
 #define IL_RMULT 1103515245L
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
@@ -436,7 +562,7 @@ static cell AMX_NATIVE_CALL core_random(AMX *amx,cell *params)
 
     /* one-time initialization (or, mostly one-time) */
     #if !defined SN_TARGET_PS2 && !defined _WIN32_WCE
-        if (IL_StandardRandom_seed == INITIAL_SEED)
+        if (IL_StandardRandom_seed == 0L)
             IL_StandardRandom_seed=(unsigned long)time(NULL);
     #endif
 
@@ -453,7 +579,6 @@ static cell AMX_NATIVE_CALL core_random(AMX *amx,cell *params)
         result %= params[1];
     return (cell)result;
 }
-#endif
 
 
 AMX_NATIVE_INFO core_Natives[] = {
@@ -462,13 +587,22 @@ AMX_NATIVE_INFO core_Natives[] = {
   { "setarg",        setarg },
   { "heapspace",     heapspace },
   { "funcidx",       funcidx },
+  { "strlen",        core_strlen },
+  { "strpack",       strpack },
+  { "strunpack",     strunpack },
   { "swapchars",     swapchars },
   { "tolower",       core_tolower },
   { "toupper",       core_toupper },
+  { "random",        core_random },
   { "min",           core_min },
   { "max",           core_max },
   { "clamp",         core_clamp },
-  { "random",        core_random },
+#if !defined NOPROPLIST
+  { "getproperty",   getproperty },
+  { "setproperty",   setproperty },
+  { "deleteproperty",delproperty },
+  { "existproperty", existproperty },
+#endif
   { NULL, NULL }        /* terminator */
 };
 
@@ -477,10 +611,12 @@ int AMXEXPORT amx_CoreInit(AMX *amx)
   return amx_Register(amx, core_Natives, -1);
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 int AMXEXPORT amx_CoreCleanup(AMX *amx)
 {
-  (void)amx;
-  #if !defined AMX_NOPROPLIST
+  #if !defined NOPROPLIST
     //??? delete only the properties owned by the AMX
     while (proproot.next!=NULL)
       list_delete(&proproot,proproot.next);

amxmodx/amxdbg.cpp

@@ -1,498 +0,0 @@
-/*  Pawn debugger interface
- *
- *  Support functions for debugger applications
- *
- *  Copyright (c) ITB CompuPhase, 2005
- *
- *  This software is provided "as-is", without any express or implied warranty.
- *  In no event will the authors be held liable for any damages arising from
- *  the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1.  The origin of this software must not be misrepresented; you must not
- *      claim that you wrote the original software. If you use this software in
- *      a product, an acknowledgment in the product documentation would be
- *      appreciated but is not required.
- *  2.  Altered source versions must be plainly marked as such, and must not be
- *      misrepresented as being the original software.
- *  3.  This notice may not be removed or altered from any source distribution.
- *
- *  Version: $Id$
- */
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include "osdefs.h"     /* for _MAX_PATH */
-#include "amx.h"
-#include "amxdbg.h"
-
-// this file does not include amxmodx.h, so we have to include the memory manager here
-#ifdef MEMORY_TEST
-#include "mmgr/mmgr.h"
-#endif // MEMORY_TEST
-
-int AMXAPI dbg_FreeInfo(AMX_DBG *amxdbg)
-{
-  assert(amxdbg != NULL);
-  if (amxdbg->hdr != NULL)
-    free(amxdbg->hdr);
-  if (amxdbg->filetbl != NULL)
-    free(amxdbg->filetbl);
-  if (amxdbg->symboltbl != NULL)
-    free(amxdbg->symboltbl);
-  if (amxdbg->tagtbl != NULL)
-    free(amxdbg->tagtbl);
-  if (amxdbg->automatontbl != NULL)
-    free(amxdbg->automatontbl);
-  if (amxdbg->statetbl != NULL)
-    free(amxdbg->statetbl);
-  memset(amxdbg, 0, sizeof(AMX_DBG));
-  return AMX_ERR_NONE;
-}
-
-void memread(void *dest, char **src, size_t size)
-{
-	void *ptr = *src;
-	memcpy(dest, ptr, size);
-	*src += size;
-}
-
-const char *ClipFileName(const char *inp)
-{
-	static char buffer[256];
-	size_t len = strlen(inp);
-	const char *ptr = inp;
-
-	for (size_t i=0; i<len; i++)
-	{
-		if ((inp[i] == '\\' || inp[i] == '/') && (i != len-1))
-			ptr = inp + i + 1;
-	}
-	strcpy(buffer, ptr);
-
-	return buffer;
-}
-
-//Note - I changed this function to read from memory instead.
-// -- BAILOPAN
-int AMXAPI dbg_LoadInfo(AMX_DBG *amxdbg, void *dbg_addr)
-{
-  AMX_DBG_HDR dbghdr;
-  unsigned char *ptr;
-  int index, dim;
-  AMX_DBG_SYMDIM *symdim;
-
-  assert(amxdbg != NULL);
-
-  char *addr = (char *)(dbg_addr);
-
-  memset(&dbghdr, 0, sizeof(AMX_DBG_HDR));
-  memread(&dbghdr, &addr, sizeof(AMX_DBG_HDR));
-
-  //brabbby graa gragghty graaahhhh
-  #if BYTE_ORDER==BIG_ENDIAN
-    amx_Align32((uint32_t*)&dbghdr.size);
-    amx_Align16(&dbghdr.magic);
-    amx_Align16(&dbghdr.flags);
-    amx_Align16(&dbghdr.files);
-    amx_Align16(&dbghdr.lines);
-    amx_Align16(&dbghdr.symbols);
-    amx_Align16(&dbghdr.tags);
-    amx_Align16(&dbghdr.automatons);
-    amx_Align16(&dbghdr.states);
-  #endif
-
-  if (dbghdr.magic != AMX_DBG_MAGIC)
-    return AMX_ERR_FORMAT;
-
-  /* allocate all memory */
-  memset(amxdbg, 0, sizeof(AMX_DBG));
-  amxdbg->hdr = (AMX_DBG_HDR *)malloc((size_t)dbghdr.size);
-  if (dbghdr.files > 0)
-    amxdbg->filetbl = (AMX_DBG_FILE **)malloc(dbghdr.files * sizeof(AMX_DBG_FILE *));
-  if (dbghdr.symbols > 0)
-    amxdbg->symboltbl = (AMX_DBG_SYMBOL **)malloc(dbghdr.symbols * sizeof(AMX_DBG_SYMBOL *));
-  if (dbghdr.tags > 0)
-    amxdbg->tagtbl = (AMX_DBG_TAG **)malloc(dbghdr.tags * sizeof(AMX_DBG_TAG *));
-  if (dbghdr.automatons > 0)
-    amxdbg->automatontbl = (AMX_DBG_MACHINE **)malloc(dbghdr.automatons * sizeof(AMX_DBG_MACHINE *));
-  if (dbghdr.states > 0)
-    amxdbg->statetbl = (AMX_DBG_STATE **)malloc(dbghdr.states * sizeof(AMX_DBG_STATE *));
-  if (amxdbg->hdr == NULL
-      || (dbghdr.files > 0 && amxdbg->filetbl == NULL)
-      || (dbghdr.symbols > 0 && amxdbg->symboltbl == NULL)
-      || (dbghdr.tags > 0 && amxdbg->tagtbl == NULL)
-      || (dbghdr.states > 0 && amxdbg->statetbl == NULL)
-      || (dbghdr.automatons > 0 && amxdbg->automatontbl == NULL))
-  {
-    dbg_FreeInfo(amxdbg);
-    return AMX_ERR_MEMORY;
-  } /* if */
-
-  /* load the entire symbolic information block into memory */
-  memcpy(amxdbg->hdr, &dbghdr, sizeof dbghdr);
-  ptr = (unsigned char *)(amxdbg->hdr + 1);
-  memread(ptr, &addr, (size_t)(dbghdr.size-sizeof(dbghdr)));
-
-  /* file table */
-  for (index = 0; index < dbghdr.files; index++) {
-    assert(amxdbg->filetbl != NULL);
-    amxdbg->filetbl[index] = (AMX_DBG_FILE *)ptr;
-    #if BYTE_ORDER==BIG_ENDIAN
-      amx_AlignCell(&amxdbg->filetbl[index]->address);
-    #endif
-    for (ptr = ptr + sizeof(AMX_DBG_FILE); *ptr != '\0'; ptr++)
-      /* nothing */;
-    ptr++;              /* skip '\0' too */
-  } /* for */
-
-  //debug("Files: %d\n", amxdbg->hdr->files);
-  for (index=0;index<amxdbg->hdr->files; index++)
-  {
-	  strcpy((char *)amxdbg->filetbl[index]->name, ClipFileName(amxdbg->filetbl[index]->name));
-	  //debug(" [%d] %s\n", index, amxdbg->filetbl[index]->name);
-  }
-
-  /* line table */
-  amxdbg->linetbl = (AMX_DBG_LINE*)ptr;
-  #if BYTE_ORDER==BIG_ENDIAN
-    for (index = 0; index < dbghdr.lines; index++) {
-      amx_AlignCell(&amxdbg->linetbl[index].address);
-      amx_Align32((uint32_t*)&amxdbg->linetbl[index].line);
-    } /* for */
-  #endif
-  ptr += dbghdr.lines * sizeof(AMX_DBG_LINE);
-
-  /* symbol table (plus index tags) */
-  for (index = 0; index < dbghdr.symbols; index++) {
-    assert(amxdbg->symboltbl != NULL);
-    amxdbg->symboltbl[index] = (AMX_DBG_SYMBOL *)ptr;
-    #if BYTE_ORDER==BIG_ENDIAN
-      amx_AlignCell(&amxdbg->symboltbl[index]->address);
-      amx_Align16((uint16_t*)&amxdbg->symboltbl[index]->tag);
-      amx_AlignCell(&amxdbg->symboltbl[index]->codestart);
-      amx_AlignCell(&amxdbg->symboltbl[index]->codeend);
-      amx_Align16((uint16_t*)&amxdbg->symboltbl[index]->dim);
-    #endif
-    for (ptr = ptr + sizeof(AMX_DBG_SYMBOL); *ptr != '\0'; ptr++)
-      /* nothing */;
-    ptr++;              /* skip '\0' too */
-    for (dim = 0; dim < amxdbg->symboltbl[index]->dim; dim++) {
-      symdim = (AMX_DBG_SYMDIM *)ptr;
-      amx_Align16((uint16_t*)&symdim->tag);
-      amx_AlignCell(&symdim->size);
-      ptr += sizeof(AMX_DBG_SYMDIM);
-    } /* for */
-  } /* for */
-
-  /* tag name table */
-  for (index = 0; index < dbghdr.tags; index++) {
-    assert(amxdbg->tagtbl != NULL);
-    amxdbg->tagtbl[index] = (AMX_DBG_TAG *)ptr;
-    #if BYTE_ORDER==BIG_ENDIAN
-      amx_Align16(&amxdbg->tagtbl[index]->tag);
-    #endif
-    for (ptr = ptr + sizeof(AMX_DBG_TAG) - 1; *ptr != '\0'; ptr++)
-      /* nothing */;
-    ptr++;              /* skip '\0' too */
-  } /* for */
-
-  /* automaton name table */
-  for (index = 0; index < dbghdr.automatons; index++) {
-    assert(amxdbg->automatontbl != NULL);
-    amxdbg->automatontbl[index] = (AMX_DBG_MACHINE *)ptr;
-    #if BYTE_ORDER==BIG_ENDIAN
-      amx_Align16(&amxdbg->automatontbl[index]->automaton);
-      amx_AlignCell(&amxdbg->automatontbl[index]->address);
-    #endif
-    for (ptr = ptr + sizeof(AMX_DBG_MACHINE) - 1; *ptr != '\0'; ptr++)
-      /* nothing */;
-    ptr++;              /* skip '\0' too */
-  } /* for */
-
-  /* state name table */
-  for (index = 0; index < dbghdr.states; index++) {
-    assert(amxdbg->statetbl != NULL);
-    amxdbg->statetbl[index] = (AMX_DBG_STATE *)ptr;
-    #if BYTE_ORDER==BIG_ENDIAN
-      amx_Align16(&amxdbg->statetbl[index]->state);
-      amx_Align16(&amxdbg->automatontbl[index]->automaton);
-    #endif
-    for (ptr = ptr + sizeof(AMX_DBG_STATE) - 1; *ptr != '\0'; ptr++)
-      /* nothing */;
-    ptr++;              /* skip '\0' too */
-  } /* for */
-
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_LookupFile(AMX_DBG *amxdbg, ucell address, const char **filename)
-{
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(filename != NULL);
-  *filename = NULL;
-  /* this is a simple linear look-up; a binary search would be possible too */
-  for (index = 0; index < amxdbg->hdr->files && amxdbg->filetbl[index]->address <= address; index++)
-    /* nothing */;
-  /* reset for overrun */
-  if (--index < 0)
-    return AMX_ERR_NOTFOUND;
-
-  *filename = amxdbg->filetbl[index]->name;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_LookupLine(AMX_DBG *amxdbg, ucell address, long *line)
-{
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(line != NULL);
-  *line = 0;
-  /* this is a simple linear look-up; a binary search would be possible too */
-  for (index = 0; index < amxdbg->hdr->lines && amxdbg->linetbl[index].address <= address; index++)
-    /* nothing */;
-  /* reset for overrun */
-  if (--index < 0)
-    return AMX_ERR_NOTFOUND;
-
-  *line = (long)amxdbg->linetbl[index].line;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_LookupFunction(AMX_DBG *amxdbg, ucell address, const char **funcname)
-{
-  /* dbg_LookupFunction() finds the function a code address is in. It can be
-   * used for stack walking, and for stepping through a function while stepping
-   * over sub-functions
-   */
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(funcname != NULL);
-  *funcname = NULL;
-  for (index = 0; index < amxdbg->hdr->symbols; index++) {
-    if (amxdbg->symboltbl[index]->ident == iFUNCTN
-        && amxdbg->symboltbl[index]->codestart <= address
-        && amxdbg->symboltbl[index]->codeend > address)
-      break;
-  } /* for */
-  if (index >= amxdbg->hdr->symbols)
-    return AMX_ERR_NOTFOUND;
-
-  *funcname = amxdbg->symboltbl[index]->name;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetTagName(AMX_DBG *amxdbg, int tag, const char **name)
-{
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(name != NULL);
-  *name = NULL;
-  for (index = 0; index < amxdbg->hdr->tags && amxdbg->tagtbl[index]->tag != tag; index++)
-    /* nothing */;
-  if (index >= amxdbg->hdr->tags)
-    return AMX_ERR_NOTFOUND;
-
-  *name = amxdbg->tagtbl[index]->name;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetAutomatonName(AMX_DBG *amxdbg, int automaton, const char **name)
-{
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(name != NULL);
-  *name = NULL;
-  for (index = 0; index < amxdbg->hdr->automatons && amxdbg->automatontbl[index]->automaton != automaton; index++)
-    /* nothing */;
-  if (index >= amxdbg->hdr->automatons)
-    return AMX_ERR_NOTFOUND;
-
-  *name = amxdbg->automatontbl[index]->name;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetStateName(AMX_DBG *amxdbg, int state, const char **name)
-{
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(name != NULL);
-  *name = NULL;
-  for (index = 0; index < amxdbg->hdr->states && amxdbg->statetbl[index]->state != state; index++)
-    /* nothing */;
-  if (index >= amxdbg->hdr->states)
-    return AMX_ERR_NOTFOUND;
-
-  *name = amxdbg->statetbl[index]->name;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetLineAddress(AMX_DBG *amxdbg, long line, const char *filename, ucell *address)
-{
-  /* Find a suitable "breakpoint address" close to the indicated line (and in
-   * the specified file). The address is moved up to the next "breakable" line
-   * if no "breakpoint" is available on the specified line. You can use function
-   * dbg_LookupLine() to find out at which precise line the breakpoint was set.
-   *
-   * The filename comparison is strict (case sensitive and path sensitive); the
-   * "filename" parameter should point into the "filetbl" of the AMX_DBG
-   * structure.
-   */
-  int file, index;
-  ucell bottomaddr,topaddr;
-
-  assert(amxdbg != NULL);
-  assert(filename != NULL);
-  assert(address != NULL);
-  *address = 0;
-
-  index = 0;
-  for (file = 0; file < amxdbg->hdr->files; file++) {
-    /* find the (next) mathing instance of the file */
-    if (strcmp(amxdbg->filetbl[file]->name, filename) != 0)
-      continue;
-    /* get address range for the current file */
-    bottomaddr = amxdbg->filetbl[file]->address;
-    topaddr = (file + 1 < amxdbg->hdr->files) ? amxdbg->filetbl[file+1]->address : (ucell)(cell)-1;
-    /* go to the starting address in the line table */
-    while (index < amxdbg->hdr->lines && amxdbg->linetbl[index].address < bottomaddr)
-      index++;
-    /* browse until the line is found or until the top address is exceeded */
-    while (index < amxdbg->hdr->lines
-           && amxdbg->linetbl[index].line < line
-           && amxdbg->linetbl[index].address < topaddr)
-      index++;
-    if (index >= amxdbg->hdr->lines)
-      return AMX_ERR_NOTFOUND;
-    if (amxdbg->linetbl[index].line >= line)
-      break;
-    /* if not found (and the line table is not yet exceeded) try the next
-     * instance of the same file (a file may appear twice in the file table)
-     */
-  } /* for */
-
-  if (strcmp(amxdbg->filetbl[file]->name, filename) != 0)
-    return AMX_ERR_NOTFOUND;
-
-  assert(index < amxdbg->hdr->lines);
-  *address = amxdbg->linetbl[index].address;
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetFunctionAddress(AMX_DBG *amxdbg, const char *funcname, const char *filename, ucell *address)
-{
-  /* Find a suitable "breakpoint address" close to the indicated line (and in
-   * the specified file). The address is moved up to the first "breakable" line
-   * in the function. You can use function dbg_LookupLine() to find out at which
-   * precise line the breakpoint was set.
-   *
-   * The filename comparison is strict (case sensitive and path sensitive); the
-   * "filename" parameter should point into the "filetbl" of the AMX_DBG
-   * structure. The function name comparison is case sensitive too.
-   */
-  int index, err;
-  const char *tgtfile;
-  ucell funcaddr;
-
-  assert(amxdbg != NULL);
-  assert(funcname != NULL);
-  assert(filename != NULL);
-  assert(address != NULL);
-  *address = 0;
-
-  index = 0;
-  for ( ;; ) {
-    /* find (next) matching function */
-    while (index < amxdbg->hdr->symbols
-           && (amxdbg->symboltbl[index]->ident != iFUNCTN || strcmp(amxdbg->symboltbl[index]->name, funcname) != 0))
-      index++;
-    if (index >= amxdbg->hdr->symbols)
-      return AMX_ERR_NOTFOUND;
-    /* verify that this line falls in the appropriate file */
-    err = dbg_LookupFile(amxdbg, amxdbg->symboltbl[index]->address, &tgtfile);
-    if (err == AMX_ERR_NONE || strcmp(filename, tgtfile) == 0)
-      break;
-    index++;            /* line is the wrong file, search further */
-  } /* for */
-
-  /* now find the first line in the function where we can "break" on */
-  assert(index < amxdbg->hdr->symbols);
-  funcaddr = amxdbg->symboltbl[index]->address;
-  for (index = 0; index < amxdbg->hdr->lines && amxdbg->linetbl[index].address < funcaddr; index++)
-    /* nothing */;
-
-  if (index >= amxdbg->hdr->lines)
-    return AMX_ERR_NOTFOUND;
-  *address = amxdbg->linetbl[index].address;
-
-  return AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetVariable(AMX_DBG *amxdbg, const char *symname, ucell scopeaddr, const AMX_DBG_SYMBOL **sym)
-{
-  ucell codestart,codeend;
-  int index;
-
-  assert(amxdbg != NULL);
-  assert(symname != NULL);
-  assert(sym != NULL);
-  *sym = NULL;
-
-  codestart = codeend = 0;
-  index = 0;
-  for ( ;; ) {
-    /* find (next) matching variable */
-    while (index < amxdbg->hdr->symbols
-           && (amxdbg->symboltbl[index]->ident == iFUNCTN || strcmp(amxdbg->symboltbl[index]->name, symname) != 0)
-           && (amxdbg->symboltbl[index]->codestart > scopeaddr || amxdbg->symboltbl[index]->codeend < scopeaddr))
-      index++;
-    if (index >= amxdbg->hdr->symbols)
-      break;
-    /* check the range, keep a pointer to the symbol with the smallest range */
-    if (strcmp(amxdbg->symboltbl[index]->name, symname) == 0
-        && (codestart == 0 && codeend == 0
-            || amxdbg->symboltbl[index]->codestart >= codestart && amxdbg->symboltbl[index]->codeend <= codeend))
-    {
-      *sym = amxdbg->symboltbl[index];
-      codestart = amxdbg->symboltbl[index]->codestart;
-      codeend = amxdbg->symboltbl[index]->codeend;
-    } /* if */
-    index++;
-  } /* for */
-
-  return (*sym == NULL) ? AMX_ERR_NOTFOUND : AMX_ERR_NONE;
-}
-
-int AMXAPI dbg_GetArrayDim(AMX_DBG *amxdbg, const AMX_DBG_SYMBOL *sym, const AMX_DBG_SYMDIM **symdim)
-{
-  /* retrieves a pointer to the array dimensions structures of an array symbol */
-  const char *ptr;
-
-  assert(amxdbg != NULL);
-  assert(sym != NULL);
-  assert(symdim != NULL);
-  *symdim = NULL;
-
-  if (sym->ident != iARRAY && sym->ident != iREFARRAY)
-    return AMX_ERR_PARAMS;
-  assert(sym->dim > 0); /* array must have at least one dimension */
-
-  /* find the end of the symbol name */
-  for (ptr = sym->name; *ptr != '\0'; ptr++)
-    /* nothing */;
-  *symdim = (AMX_DBG_SYMDIM *)(ptr + 1);/* skip '\0' too */
-
-  return AMX_ERR_NONE;
-}

amxmodx/amxdbg.h

@@ -1,172 +0,0 @@
-/*  Abstract Machine for the Pawn compiler, debugger support
- *
- *  This file contains extra definitions that are convenient for debugger
- *  support.
- *
- *  Copyright (c) ITB CompuPhase, 2005
- *
- *  This software is provided "as-is", without any express or implied warranty.
- *  In no event will the authors be held liable for any damages arising from
- *  the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1.  The origin of this software must not be misrepresented; you must not
- *      claim that you wrote the original software. If you use this software in
- *      a product, an acknowledgment in the product documentation would be
- *      appreciated but is not required.
- *  2.  Altered source versions must be plainly marked as such, and must not be
- *      misrepresented as being the original software.
- *  3.  This notice may not be removed or altered from any source distribution.
- *
- *  Version: $Id$
- */
-
-#ifndef AMXDBG_H_INCLUDED
-#define AMXDBG_H_INCLUDED
-
-#ifndef AMX_H_INCLUDED
-  #include "amx.h"
-#endif
-
-#ifdef  __cplusplus
-extern  "C" {
-#endif
-
-/* Some compilers do not support the #pragma align, which should be fine. Some
- * compilers give a warning on unknown #pragmas, which is not so fine...
- */
-#if defined SN_TARGET_PS2 || defined __GNUC__
-  #define AMX_NO_ALIGN
-#endif
-
-#if defined __GNUC__
-  #define PACKED        __attribute__((packed))
-#else
-  #define PACKED
-#endif
-
-#if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
-    #pragma pack(1)         /* structures must be packed (byte-aligned) */
-  #elif defined MACOS && defined __MWERKS__
-	#pragma options align=mac68k
-  #else
-    #pragma pack(push)
-    #pragma pack(1)         /* structures must be packed (byte-aligned) */
-    #if defined __TURBOC__
-      #pragma option -a-    /* "pack" pragma for older Borland compilers */
-    #endif
-  #endif
-#endif
-
-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    amx_version;          /* required version of the AMX */
-  int16_t flags         PACKED; /* currently unused */
-  int16_t files         PACKED; /* number of entries in the "file" table */
-  int16_t lines         PACKED; /* number of entries in the "line" table */
-  int16_t symbols       PACKED; /* number of entries in the "symbol" table */
-  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;
-#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 */
-} PACKED AMX_DBG_FILE;
-
-typedef struct tagAMX_DBG_LINE {
-  ucell   address       PACKED; /* address in the code segment where generated code (for this line) starts */
-  int32_t line          PACKED; /* line number */
-} PACKED AMX_DBG_LINE;
-
-typedef struct tagAMX_DBG_SYMBOL {
-  ucell   address       PACKED; /* address in the data segment or relative to the frame */
-  int16_t tag           PACKED; /* tag for the symbol */
-  ucell   codestart     PACKED; /* address in the code segment from which this symbol is valid (in scope) */
-  ucell   codeend       PACKED; /* address in the code segment until which this symbol is valid (in scope) */
-  char    ident;                /* kind of symbol (function/variable) */
-  char    vclass;               /* class of symbol (global/local) */
-  int16_t dim           PACKED; /* number of dimensions */
-  const char name[1];           /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_SYMBOL;
-
-typedef struct tagAMX_DBG_SYMDIM {
-  int16_t tag           PACKED; /* tag for the array dimension */
-  ucell   size          PACKED; /* size of the array dimension */
-} PACKED AMX_DBG_SYMDIM;
-
-typedef struct tagAMX_DBG_TAG {
-  int16_t tag           PACKED; /* tag id */
-  const char name[1];           /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_TAG;
-
-typedef struct tagAMX_DBG_MACHINE {
-  int16_t automaton     PACKED; /* automaton id */
-  ucell address         PACKED; /* address of state variable */
-  const char name[1];           /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_MACHINE;
-
-typedef struct tagAMX_DBG_STATE {
-  int16_t state         PACKED; /* state id */
-  int16_t automaton     PACKED; /* automaton id */
-  const char name[1];           /* ASCII string, zero-terminated */
-} PACKED AMX_DBG_STATE;
-
-typedef struct tagAMX_DBG {
-  AMX_DBG_HDR     _FAR *hdr         PACKED; /* points to the AMX_DBG header */
-  AMX_DBG_FILE    _FAR **filetbl    PACKED;
-  AMX_DBG_LINE    _FAR *linetbl     PACKED;
-  AMX_DBG_SYMBOL  _FAR **symboltbl  PACKED;
-  AMX_DBG_TAG     _FAR **tagtbl     PACKED;
-  AMX_DBG_MACHINE _FAR **automatontbl PACKED;
-  AMX_DBG_STATE   _FAR **statetbl   PACKED;
-} PACKED AMX_DBG;
-
-#if !defined iVARIABLE
-  #define iVARIABLE  1  /* cell that has an address and that can be fetched directly (lvalue) */
-  #define iREFERENCE 2  /* iVARIABLE, but must be dereferenced */
-  #define iARRAY     3
-  #define iREFARRAY  4  /* an array passed by reference (i.e. a pointer) */
-  #define iFUNCTN    9
-#endif
-
-
-int AMXAPI dbg_FreeInfo(AMX_DBG *amxdbg);
-int AMXAPI dbg_LoadInfo(AMX_DBG *amxdbg, void *dbg_addr);
-
-int AMXAPI dbg_LookupFile(AMX_DBG *amxdbg, ucell address, const char **filename);
-int AMXAPI dbg_LookupFunction(AMX_DBG *amxdbg, ucell address, const char **funcname);
-int AMXAPI dbg_LookupLine(AMX_DBG *amxdbg, ucell address, long *line);
-
-int AMXAPI dbg_GetFunctionAddress(AMX_DBG *amxdbg, const char *funcname, const char *filename, ucell *address);
-int AMXAPI dbg_GetLineAddress(AMX_DBG *amxdbg, long line, const char *filename, ucell *address);
-int AMXAPI dbg_GetAutomatonName(AMX_DBG *amxdbg, int automaton, const char **name);
-int AMXAPI dbg_GetStateName(AMX_DBG *amxdbg, int state, const char **name);
-int AMXAPI dbg_GetTagName(AMX_DBG *amxdbg, int tag, const char **name);
-int AMXAPI dbg_GetVariable(AMX_DBG *amxdbg, const char *symname, ucell scopeaddr, const AMX_DBG_SYMBOL **sym);
-int AMXAPI dbg_GetArrayDim(AMX_DBG *amxdbg, const AMX_DBG_SYMBOL *sym, const AMX_DBG_SYMDIM **symdim);
-
-
-#if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
-    #pragma pack()    /* reset default packing */
-  #elif defined MACOS && defined __MWERKS__
-    #pragma options align=reset
-  #else
-    #pragma pack(pop) /* reset previous packing */
-  #endif
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* AMXDBG_H_INCLUDED */

amxmodx/amxdefn.asm

@@ -1,86 +0,0 @@
-; Definition of the AMX structure for assembler syntax (NASM)
-
-	struc amx_s
-_base:       resd 1
-_dataseg:    resd 1
-_callback:   resd 1
-_debug:      resd 1
-_cip:        resd 1
-_frm:        resd 1
-_hea:        resd 1
-_hlw:        resd 1
-_stk:        resd 1
-_stp:        resd 1
-_flags:      resd 1
-_usertags:   resd 4	; 4 = AMX_USERNUM (#define'd in amx.h)
-_userdata:   resd 4	; 4 = AMX_USERNUM (#define'd in amx.h)
-_error:      resd 1
-_paramcount: resd 1
-_pri:        resd 1
-_alt:        resd 1
-_reset_stk:  resd 1
-_reset_hea:  resd 1
-_syscall_d:  resd 1
-%ifdef JIT
-        ; the two fields below are for the JIT; they do not exist in
-        ; the non-JIT version of the abstract machine
-_reloc_size: resd 1          ; memory block for relocations
-_code_size:  resd 1          ; memory size of the native code
-%endif
-	endstruc
-
-	struc amxhead_s
-_size:       resd 1  ; size of the "file"
-_magic:      resw 1  ; signature
-_file_version: resb 1; file format version
-_amx_version: resb 1 ; required version of the AMX
-_h_flags:    resw 1
-_defsize:    resw 1  ; size of one public/native function entry
-_cod:        resd 1  ; initial value of COD - code block
-_dat:        resd 1  ; initial value of DAT - data block
-_h_hea:      resd 1  ; initial value of HEA - start of the heap
-_h_stp:      resd 1  ; initial value of STP - stack top
-_h_cip:      resd 1  ; initial value of CIP - the instruction pointer
-_publics:    resd 1  ; offset to the "public functions" table
-_natives:    resd 1  ; offset to the "native functions" table
-_libraries:  resd 1  ; offset to the "library" table
-_pubvars:    resd 1  ; offset to the "public variables" table
-_tags:       resd 1  ; offset to the "public tagnames" table
-_nametable:  resd 1  ; offset to the name table, file version 7 only
-	endstruc
-
-
-AMX_ERR_NONE        EQU 0
-AMX_ERR_EXIT        EQU 1
-AMX_ERR_ASSERT      EQU 2
-AMX_ERR_STACKERR    EQU 3
-AMX_ERR_BOUNDS      EQU 4
-AMX_ERR_MEMACCESS   EQU 5
-AMX_ERR_INVINSTR    EQU 6
-AMX_ERR_STACKLOW    EQU 7
-AMX_ERR_HEAPLOW     EQU 8
-AMX_ERR_CALLBACK    EQU 9
-AMX_ERR_NATIVE      EQU 10
-AMX_ERR_DIVIDE      EQU 11      ; for catching divide errors
-AMX_ERR_SLEEP       EQU 12
-
-AMX_ERR_MEMORY      EQU 16
-AMX_ERR_FORMAT      EQU 17
-AMX_ERR_VERSION     EQU 18
-AMX_ERR_NOTFOUND    EQU 19
-AMX_ERR_INDEX       EQU 20
-AMX_ERR_DEBUG       EQU 21
-AMX_ERR_INIT        EQU 22
-AMX_ERR_USERDATA    EQU 23
-AMX_ERR_INIT_JIT    EQU 24
-AMX_ERR_PARAMS      EQU 25
-AMX_ERR_DOMAIN      EQU 26
-AMX_ERR_GENERAL     EQU 27
-
-AMX_FLAG_DEBUG      EQU 0002h   ; symbolic info. available
-AMX_FLAG_COMPACT    EQU 0004h
-AMX_FLAG_BYTEOPC    EQU 0008h
-AMX_FLAG_NOCHECKS   EQU 0010h
-AMX_FLAG_BROWSE     EQU 4000h
-AMX_FLAG_RELOC      EQU 8000h   ; jump/call addresses relocated
-

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

@@ -32,23 +32,13 @@
 #ifndef AMXMODX_H
 #define AMXMODX_H
 
-#ifdef __linux__
-#include <unistd.h>
-#include <stdlib.h>
-#include "sclinux.h"
-#endif
-#include <ctype.h>				//tolower, etc
+
 #include "string.h"
 #include <extdll.h>
 #include <meta_api.h>
 
-#ifdef _MSC_VER
-	// MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated
-	#if _MSC_VER >= 1400
-		#define unlink _unlink	
-		#define mkdir _mkdir
-		#define strdup _strdup
-	#endif
+#ifdef MEMORY_TEST
+#include "mmgr/mmgr.h"
 #endif
 
 #include "md5.h"
@@ -72,20 +62,17 @@
 #include "amxxlog.h"
 
 #define AMXXLOG_Log g_log.Log
-#define AMXXLOG_Error g_log.LogError
-#define AMX_VERSION	"1.76b"
+#define AMX_VERSION     "0.2"
 
 extern AMX_NATIVE_INFO  core_Natives[];
 extern AMX_NATIVE_INFO  time_Natives[];
 extern AMX_NATIVE_INFO  power_Natives[];
-extern AMX_NATIVE_INFO amxmodx_Natives[];
+extern  AMX_NATIVE_INFO amxmod_Natives[];
 extern  AMX_NATIVE_INFO file_Natives[];
 extern  AMX_NATIVE_INFO float_Natives[];
 extern  AMX_NATIVE_INFO string_Natives[];
 extern  AMX_NATIVE_INFO vault_Natives[];
-extern AMX_NATIVE_INFO msg_Natives[];
-extern AMX_NATIVE_INFO vector_Natives[];
-extern AMX_NATIVE_INFO g_SortNatives[];
+
 
 #ifndef __linux__
 #define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
@@ -97,22 +84,10 @@ extern AMX_NATIVE_INFO g_SortNatives[];
 #define DLFREE(m) dlclose(m)
 #endif
 
-#if defined __GNUC__
-	#include <stdint.h>
-	typedef intptr_t _INT_PTR;
-#else
-	#if defined AMD64
-		typedef __int64 _INT_PTR;
-	#else
-		typedef __int32 _INT_PTR;
-	#endif
-#endif
-
 #ifndef __linux__
 typedef HINSTANCE DLHANDLE;
 #else
 typedef void* DLHANDLE;
-	#define INFINITE 0xFFFFFFFF
 #endif
 
 #ifndef GETPLAYERAUTHID
@@ -128,7 +103,6 @@ extern AMX_NATIVE_INFO g_SortNatives[];
 
 char* UTIL_SplitHudMessage(register const char *src);
 int UTIL_ReadFlags(const char* c);
-
 void UTIL_ClientPrint( edict_t *pEntity, int msg_dest,  char *msg );
 void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1 = NULL, const char *arg2 = NULL);
 void UTIL_GetFlags(char* flags,int flag);
@@ -137,24 +111,21 @@ void UTIL_IntToString(int value, char *output);
 void UTIL_ShowMOTD( edict_t *client , char *motd, int mlen, const char *name);
 void UTIL_ShowMenu( edict_t* pEntity, int slots, int time, char *menu, int mlen );
 
-char *UTIL_VarArgs(const char *fmt, ...);
-
 
 #define GET_PLAYER_POINTER(e)   (&g_players[ENTINDEX(e)])
 //#define GET_PLAYER_POINTER(e)   (&g_players[(((int)e-g_edict_point)/sizeof(edict_t ))])
 #define GET_PLAYER_POINTER_I(i) (&g_players[i])
 
-struct WeaponsVault
-{
+struct WeaponsVault {
   String fullName;
   short int iId;
   short int ammoSlot;
 };
 
-struct fakecmd_t
-{
+struct fakecmd_t {
   char args[256];
   const char *argv[3];
+  //char argv[3][128];
   int argc;
   bool fake;
 };
@@ -169,8 +140,7 @@ extern CList<CCVar> g_cvars;
 extern CList<ForceObject> g_forcemodels;
 extern CList<ForceObject> g_forcesounds;
 extern CList<ForceObject> g_forcegeneric;
-extern CList<CModule, const char *> g_modules;
-extern CList<CScript, AMX*> g_loadedscripts;
+extern CList<CModule> g_modules;
 extern CList<CPlayer*> g_auth;
 extern EventsMngr g_events;
 extern Grenades g_grenades;
@@ -187,6 +157,7 @@ extern XVars g_xvars;
 extern bool g_bmod_cstrike;
 extern bool g_bmod_dod;
 extern bool g_dontprecache;
+extern bool g_initialized;
 extern int g_srvindex;
 extern cvar_t* amxmodx_version;
 extern cvar_t* hostname;
@@ -196,7 +167,6 @@ extern float g_game_restarting;
 extern float g_game_timeleft;
 extern float g_task_time;
 extern float g_auth_time;
-extern bool g_NewDLL_Available;
 extern hudtextparms_t g_hudset;
 //extern int g_edict_point;
 extern int g_players_num;
@@ -248,13 +218,11 @@ void plugin_srvcmd();
 const char* stristr(const char* a,const char* b);
 char *strptime(const char *buf, const char *fmt, struct tm *tm, short addthem);
 
-int loadModules(const char* filename, PLUG_LOADTIME now);
+int loadModules(const char* filename);
 void detachModules();
 void detachReloadModules();
-
-#ifdef FAKEMETA
 void attachModules();
-#endif
+void attachMetaModModules(PLUG_LOADTIME now, const char* filename);
 
 // Count modules
 enum CountModulesMode
@@ -266,24 +234,19 @@ enum CountModulesMode
 
 int countModules(CountModulesMode mode);
 void modules_callPluginsLoaded();
-void modules_callPluginsUnloaded();
-void modules_callPluginsUnloading();
 
+int add_amxnatives(module_info_s* info,AMX_NATIVE_INFO*natives);
 cell* get_amxaddr(AMX *amx,cell amx_addr);
 char* build_pathname(char *fmt, ... );
-char* build_pathname_r(char *buffer, size_t maxlen, char *fmt, ...);
 char* format_amxstring(AMX *amx, cell *params, int parm,int& len);
 AMX* get_amxscript(int, void**,const char**);
 const char* get_amxscriptname(AMX* amx);
 char* get_amxstring(AMX *amx,cell amx_addr,int id,int& len);
-extern "C" size_t get_amxstring_r(AMX *amx, cell amx_addr, char *destination, int maxlen);
-
 int amxstring_len(cell* cstr);
-int load_amxscript(AMX* amx, void** program, const char* path, char error[64], int debug);
+int load_amxscript(AMX* amx, void** program, const char* path, char error[64]);
 int set_amxnatives(AMX* amx,char error[64]);
 int set_amxstring(AMX *amx,cell amx_addr,const char *source,int max);
 int unload_amxscript(AMX* amx,void** program);
-
 void copy_amxmemory(cell* dest,cell* src,int len);
 void get_modname(char*);
 void print_srvconsole( char *fmt, ... );
@@ -292,8 +255,6 @@ void* alloc_amxmemory(void**, int size);
 void free_amxmemory(void **ptr);
 // get_localinfo
 const char* get_localinfo( const char* name , const char* def );
-cell AMX_NATIVE_CALL require_module(AMX *amx, cell *params);
-extern "C" void LogError(AMX *amx, int err, const char *fmt, ...);
 
 enum ModuleCallReason
 {
@@ -307,9 +268,6 @@ extern ModuleCallReason g_ModuleCallReason;		// modules.cpp
 extern CModule *g_CurrentlyCalledModule;		// modules.cpp
 extern const char *g_LastRequestedFunc;			// modules.cpp
 
-void Module_CacheFunctions();
-void Module_UncacheFunctions();
-
 void *Module_ReqFnptr(const char *funcName);	// modules.cpp
 
 // standard forwards
@@ -326,19 +284,7 @@ extern int FF_PluginLog;
 extern int FF_PluginEnd;
 extern int FF_InconsistentFile;
 extern int FF_ClientAuthorized;
-extern int FF_ChangeLevel;
-extern bool g_coloredmenus;
-
-typedef void (*AUTHORIZEFUNC)(int player, const char *authstring);
-
-#define MM_CVAR2_VERS	13
-
-struct func_s
-{
-	void *pfn;
-	const char *desc;
-};
-
-extern enginefuncs_t *g_pEngTable;
 
+extern CFakeMeta g_FakeMeta;
 #endif // AMXMODX_H
+

amxmodx/amxtime.cpp

@@ -18,8 +18,6 @@
 #	endif
 #endif
 
-#include <stdlib.h>
-
 // this file does not include amxmodx.h, so we have to include the memory manager here
 #ifdef MEMORY_TEST
 #include "mmgr/mmgr.h"
@@ -54,7 +52,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

@@ -3,6 +3,7 @@
 * 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
@@ -35,7 +36,6 @@
 /**********************
  ****** AMXXFILE ******
  **********************/
-
 #if defined __GNUC__
   #define PACKED        __attribute__((packed))
 #else
@@ -51,9 +51,13 @@
   #endif
 #endif
 
+typedef char	mint8_t;
+typedef int16_t		mint16_t;
+typedef int32_t		mint32_t;
+
 struct TableEntry
 {
-	mint8_t cellSize;
+	mint8_t cellSize PACKED;
 	mint32_t origSize PACKED;			// contains AMX_HEADER->stp
 	mint32_t offset PACKED;
 };
@@ -72,9 +76,6 @@ struct TableEntry
 
 CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 {
-	m_Bh.plugins = NULL;
-	m_AmxxFile = false;
-	
 	if (!filename)
 	{
 		m_Status = Err_InvalidParam;
@@ -83,8 +84,8 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 
 	m_Status = Err_None;
 	m_CellSize = cellsize;
-	m_pFile = fopen(filename, "rb");
 
+	m_pFile = fopen(filename, "rb");
 	if (!m_pFile)
 	{
 		m_Status = Err_FileOpen;
@@ -95,71 +96,42 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 	DATAREAD(&magic, sizeof(magic), 1);
 
 	m_OldFile = false;
-	
-	if (magic == 0x524C4542)
+	if (magic != 0x414D5842)
 	{
-		//we have an invalid, old, RLEB file
-		m_Status = Err_OldFile;
-		fclose(m_pFile);
-		m_pFile = NULL;
-		
-		return;
-	}
-	else if (magic == MAGIC_HEADER2)
+		// check for old file
+		AMX_HEADER hdr;
+		rewind(m_pFile);
+		fread(&hdr, sizeof(hdr), 1, m_pFile);
+		amx_Align16(&hdr.magic);
+		if (hdr.magic == AMX_MAGIC)
 		{
-		DATAREAD(&m_Bh.version, sizeof(int16_t), 1);
-		
-		if (m_Bh.version > MAGIC_VERSION)
-		{
-			m_Status = Err_OldFile;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			
-			return;
-		}
-		
-		m_AmxxFile = true;
-		DATAREAD(&m_Bh.numPlugins, sizeof(mint8_t), 1);
-		m_Bh.plugins = new PluginEntry[m_Bh.numPlugins];
-		PluginEntry *pe;
-		m_SectionHdrOffset = 0;
-		m_Entry = -1;
-		
-		for (mint8_t i = 0; i < m_Bh.numPlugins; i++)
-		{
-			pe = &(m_Bh.plugins[i]);
-			DATAREAD(&pe->cellsize, sizeof(mint8_t), 1);
-			DATAREAD(&pe->disksize, sizeof(int32_t), 1);
-			DATAREAD(&pe->imagesize, sizeof(int32_t), 1);
-			DATAREAD(&pe->memsize, sizeof(int32_t), 1);
-			DATAREAD(&pe->offs, sizeof(int32_t), 1);
-		}
-		
-		for (mint8_t i = 0; i < m_Bh.numPlugins; i++)
-		{
-			pe = &(m_Bh.plugins[i]);
-			
-			if (pe->cellsize == m_CellSize)
-			{
-				m_Entry = i;
-				break;
-			}
-		}
-		
-		if (m_Entry == -1)
+			if (cellsize != 4)
 			{
 				m_Status = Err_SectionNotFound;
 				fclose(m_pFile);
 				m_pFile = NULL;
-			
 				return;
 			}
 
-		pe = &(m_Bh.plugins[m_Entry]);
-		m_SectionLength = pe->disksize;
+			m_OldFile = true;
+			return;
 		}
-	else if (magic == MAGIC_HEADER)
+		else
 		{
+			// no known file format
+			m_Status = Err_FileInvalid;
+			fclose(m_pFile);
+			m_pFile = NULL;
+			return;
+		}
+	} else if ( magic == 0x524C4542 ) {
+		//we have an invalid, old, RLEB file
+		m_Status = Err_OldFile;
+		fclose(m_pFile);
+		m_pFile = NULL;
+		return;
+	} else {
+
 		// try to find the section
 		mint8_t numOfPlugins;
 		DATAREAD(&numOfPlugins, sizeof(numOfPlugins), 1);
@@ -168,7 +140,6 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 	
 		m_SectionHdrOffset = 0;
 		int i = 0;
-		
 		for (i = 0; i < static_cast<int>(numOfPlugins); ++i)
 		{
 			DATAREAD(&entry, sizeof(entry), 1);
@@ -178,7 +149,6 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 				break;
 			}
 		}
-		
 		if (!m_SectionHdrOffset)
 		{
 			m_Status = Err_SectionNotFound;
@@ -194,39 +164,12 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 			TableEntry nextEntry;
 			DATAREAD(&nextEntry, sizeof(nextEntry), 1);
 			m_SectionLength = nextEntry.offset - entry.offset;
-		} else {
+		}
+		else
+		{
 			fseek(m_pFile, 0, SEEK_END);
 			m_SectionLength = ftell(m_pFile) - (long)entry.offset;
 		}
-	} else {
-		// check for old file
-		AMX_HEADER hdr;
-		rewind(m_pFile);
-		fread(&hdr, sizeof(hdr), 1, m_pFile);
-		amx_Align16(&hdr.magic);
-		
-		if (hdr.magic == AMX_MAGIC)
-		{
-			if (cellsize != 4)
-			{
-				m_Status = Err_SectionNotFound;
-				fclose(m_pFile);
-				m_pFile = NULL;
-				
-				return;
-			}
-
-			m_OldFile = true;
-			
-			return;
-		} else {
-			// no known file format
-			m_Status = Err_FileInvalid;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			
-			return;
-		}
 	}
 }
 
@@ -237,12 +180,6 @@ CAmxxReader::~CAmxxReader()
 		fclose(m_pFile);
 		m_pFile = NULL;
 	}
-	
-	if (m_Bh.plugins)
-	{
-		delete [] m_Bh.plugins;
-		m_Bh.plugins = NULL;
-	}
 }
 
 CAmxxReader::Error CAmxxReader::GetStatus()
@@ -268,6 +205,7 @@ size_t CAmxxReader::GetBufferSize()
 	if (!m_pFile)
 		return 0;
 
+
 	long save = ftell(m_pFile);
 
 	if (m_OldFile)
@@ -276,31 +214,20 @@ size_t CAmxxReader::GetBufferSize()
 		AMX_HEADER hdr;
 		DATAREAD(&hdr, sizeof(hdr), 1);
 		fseek(m_pFile, save, SEEK_SET);
-		
 		return hdr.stp;
 	}
-	else if (m_AmxxFile)
-	{
-		PluginEntry *pe = &(m_Bh.plugins[m_Entry]);
-		
-		if (pe->imagesize > pe->memsize)
-			return pe->imagesize + 1;
-		
-		return pe->memsize + 1;
-	}
 
 	fseek(m_pFile, m_SectionHdrOffset, SEEK_SET);
 
 	TableEntry entry;
 	DATAREAD(&entry, sizeof(entry), 1);
 	fseek(m_pFile, save, SEEK_SET);
-	
 	return entry.origSize + 1;			// +1 : safe
 }
 
 #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; \
@@ -324,51 +251,30 @@ CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 		rewind(m_pFile);
 		DATAREAD(buffer, 1, filesize);
 		m_Status = Err_None;
-		
 		return m_Status;
 	}
-	else if (m_AmxxFile)
-	{
-		PluginEntry *pe = &(m_Bh.plugins[m_Entry]);
-		char *tempBuffer = new char[m_SectionLength + 1];
-		fseek(m_pFile, pe->offs, SEEK_SET);
-		DATAREAD((void *)tempBuffer, 1, m_SectionLength);
-		uLongf destLen = GetBufferSize();
-		int result = uncompress((Bytef *)buffer, &destLen, (Bytef *)tempBuffer, m_SectionLength);
-		delete [] tempBuffer;
 
-		if (result != Z_OK)
-		{
-			AMXXLOG_Log("[AMXX] Zlib error encountered: %d(%d)", result, m_SectionLength);
-			m_Status = Err_Decompress;
-			return Err_Decompress;
-		}
-		
-		return Err_None;
-	} else {
 	// new file type: go to the section table entry
 	fseek(m_pFile, m_SectionHdrOffset, SEEK_SET);
 	// go to the offset
 	TableEntry entry;
 	DATAREAD(&entry, sizeof(entry), 1);
 	fseek(m_pFile, entry.offset, SEEK_SET);
+//	AMXXLOG_Log("|||| Offset needed: %d At: %d", entry.offset, ftell(m_pFile));
 	uLongf destLen = GetBufferSize();
 	// read the data to a temporary buffer
 	char *tempBuffer = new char[m_SectionLength + 1];
 	//fread(tempBuffer, sizeof(char), m_SectionLength, m_pFile);
 	DATAREAD((void*)tempBuffer, 1, m_SectionLength);
 	// decompress
-		int result = uncompress((Bytef *)buffer, &destLen, (Bytef *)tempBuffer, m_SectionLength);
-		delete [] tempBuffer;
-		
+//	AMXXLOG_Log("|||| First Bytes: %d %d %d %d", tempBuffer[0], tempBuffer[1], tempBuffer[2], tempBuffer[3]);
+	int result = uncompress((Bytef *)buffer, &destLen,
+			(Bytef *)tempBuffer, m_SectionLength);
+//	AMXXLOG_Log("|||| Result: %d, m_SectionLength=%d, destLen=%d", result, m_SectionLength, destLen);
 	if (result != Z_OK)
 	{
-			AMXXLOG_Log("[AMXX] Zlib error encountered: %d(%d)", result, m_SectionLength);
 		m_Status = Err_Decompress;
-			
 		return Err_Decompress;
 	}
-		
 	return Err_None;
 }
-}

amxmodx/amxxfile.h

@@ -32,31 +32,6 @@
 #ifndef __AMXXFILE_H__
 #define __AMXXFILE_H__
 
-#define MAGIC_HEADER		0x414D5842
-#define MAGIC_HEADER2		0x414D5858
-#define	MAGIC_VERSION		0x0300
-
-typedef char		mint8_t;
-typedef int16_t		mint16_t;
-typedef int32_t		mint32_t;
-
-struct PluginEntry
-{
-	mint8_t cellsize;	//cell size
-	int32_t imagesize;	//uncompressed image size
-	int32_t disksize;	//compressed image size
-	int32_t memsize;	//memory image size
-	int32_t offs;		//file offset
-};
-
-struct BinHeader
-{
-	int32_t		magic;
-	mint16_t	version;
-	mint8_t		numPlugins;
-	PluginEntry *plugins;
-};
-
 class CAmxxReader
 {
 public:
@@ -78,9 +53,6 @@ private:
 	FILE *m_pFile;
 
 	bool m_OldFile;					// old .amx file
-	bool m_AmxxFile;				// new 'AMXX' header format
-	BinHeader m_Bh;					// binary header
-	int m_Entry;					// entry #
 
 	int m_CellSize;
 	int m_SectionHdrOffset;			// offset to the table in the header that describes the required section
@@ -92,7 +64,8 @@ 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

@@ -40,16 +40,10 @@
 #endif
 #include "amxmodx.h"
 
-#ifndef __linux__
-	#define	vsnprintf	_vsnprintf
-#endif
-
 CLog::CLog()
 {
 	m_LogType = 0;
 	m_LogFile.clear();
-	m_FoundError = false;
-	m_LoggedErrMap = false;
 }
 
 CLog::~CLog()
@@ -63,11 +57,10 @@ void CLog::CloseFile()
 	if (!m_LogFile.empty())
 	{
 		FILE *fp = fopen(m_LogFile.c_str(), "r");
-		
 		if (fp)
 		{
 			fclose(fp);
-			fp = fopen(m_LogFile.c_str(), "a+");
+			fopen(m_LogFile.c_str(), "a+");
 
 			// get time
 			time_t td;
@@ -80,7 +73,6 @@ void CLog::CloseFile()
 			fprintf(fp, "L %s: %s\n", date, "Log file closed.");
 			fclose(fp);
 		}
-		
 		m_LogFile.clear();
 	}
 }
@@ -88,59 +80,47 @@ void CLog::CloseFile()
 void CLog::CreateNewFile()
 {
 	CloseFile();
-	
 	// build filename
 	time_t td;
 	time(&td);
 	tm *curTime = localtime(&td);
 
-	char file[256];
 	int i = 0;
-	
 	while (true)
 	{
-		build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d%03d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i);
-		FILE *pTmpFile = fopen(file, "r");			// open for reading to check whether the file exists
-		
+		m_LogFile.assign(build_pathname("%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
 		if (!pTmpFile)
 			break;
-		
 		fclose(pTmpFile);
 		++i;
 	}
-	m_LogFile.assign(file);
-	
 	// Log logfile start
 	FILE *fp = fopen(m_LogFile.c_str(), "w");
-	
 	if (!fp)
 	{
 		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
 		SET_LOCALINFO("amxx_logging", "0");
-	} else {
+	}
 	fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
 	fclose(fp);
 }
-}
 
 void CLog::UseFile(const String &fileName)
 {
-	static char file[256];
-	m_LogFile.assign(build_pathname_r(file, sizeof(file)-1, "%s/%s", g_log_dir.c_str(), fileName.c_str()));
+	m_LogFile.assign(build_pathname("%s/%s", g_log_dir.c_str(), fileName.c_str()));
 }
 
 void CLog::MapChange()
 {
 	// create dir if not existing
-	char file[256];
 #ifdef __linux
-	mkdir(build_pathname_r(file, sizeof(file)-1, "%s", g_log_dir.c_str()), 0700);
+	mkdir(build_pathname("%s", g_log_dir.c_str()), 0700);
 #else
-	mkdir(build_pathname_r(file, sizeof(file)-1, "%s", g_log_dir.c_str()));
+	mkdir(build_pathname("%s", g_log_dir.c_str()));
 #endif
 
 	m_LogType = atoi(get_localinfo("amxx_logging", "1"));
-	
 	if (m_LogType < 0 || m_LogType > 3)
 	{
 		SET_LOCALINFO("amxx_logging", "1");
@@ -148,23 +128,21 @@ 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 --------");
+	}
+	else
+		return;
 }
 
 void CLog::Log(const char *fmt, ...)
 {
-	static char file[256];
-	
 	if (m_LogType == 1 || m_LogType == 2)
 	{
 		// get time
@@ -176,14 +154,14 @@ void CLog::Log(const char *fmt, ...)
 		strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
 
 		// msg
-		static char msg[3072];
+		char msg[3072];
 
 		va_list arglst;
 		va_start(arglst, fmt);
-		vsnprintf(msg, 3071, fmt, arglst);
+		vsprintf(msg, fmt, arglst);
 		va_end(arglst);
 
-		FILE *pF = NULL;
+		FILE *pF;
 		if (m_LogType == 2)
 		{
 			pF = fopen(m_LogFile.c_str(), "a+");
@@ -191,7 +169,6 @@ void CLog::Log(const char *fmt, ...)
 			{
 				CreateNewFile();
 				pF = fopen(m_LogFile.c_str(), "a+");
-				
 				if (!pF)
 				{
 					ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Logging disabled for this map.\n", m_LogFile.c_str());
@@ -199,80 +176,26 @@ void CLog::Log(const char *fmt, ...)
 					return;
 				}
 			}
-		} else {
-			build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday);
-			pF = fopen(file, "a+");
 		}
-		
-		if (pF)
+		else
 		{
-			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 Logging disabled for this map.\n", file);
-			m_LogType = 0;
-			return;
+			pF = fopen(build_pathname("%s/L%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday), "a+");
 		}
+		fprintf(pF, "L %s: %s\n", date, msg);
 
+		fclose(pF);
 		// 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];
+		// :TODO: Overflow possible here
+		char msg[3072];
 		va_list arglst;
 		va_start(arglst, fmt);
-		vsnprintf(msg_, 3071, fmt, arglst);
+		vsprintf(msg, fmt, arglst);
 		va_end(arglst);
-		ALERT(at_logged, "%s\n", msg_);
+		ALERT(at_logged, "%s\n", msg);
 	}
 }
-
-void CLog::LogError(const char *fmt, ...)
-{
-	static char file[256];
-
-	if (m_FoundError)
-	{
-		return;
-	}
-
-	// get time
-	time_t td;
-	time(&td);
-	tm *curTime = localtime(&td);
-
-	char date[32];
-	strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
-
-	// msg
-	static char msg[3072];
-
-	va_list arglst;
-	va_start(arglst, fmt);
-	vsnprintf(msg, sizeof(msg)-1, fmt, arglst);
-	va_end(arglst);
-
-	FILE *pF = NULL;
-	build_pathname_r(file, sizeof(file)-1, "%s/error_%02d%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, curTime->tm_year - 100);
-	pF = fopen(file, "a+");
-
-	if (pF)
-	{
-		if (!m_LoggedErrMap)
-		{
-			fprintf(pF, "L %s: Start of error session.\n", date);
-			fprintf(pF, "L %s: Info (map \"%s\") (logfile \"error_%02d%02d%02d.log\")\n", date, STRING(gpGlobals->mapname), curTime->tm_mon + 1, curTime->tm_mday, curTime->tm_year - 100);
-			m_LoggedErrMap = true;
-		}
-		fprintf(pF, "L %s: %s\n", date, msg);
-		fclose(pF);
-	} else {
-		ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Error Logging disabled for this map.\n", file);
-		m_FoundError = true;
-		return;
-	}
-
-	// print on server console
-	print_srvconsole("L %s: %s\n", date, msg);
-}
-

amxmodx/amxxlog.h

@@ -36,20 +36,17 @@ 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);
 public:
 	CLog();
 	~CLog();
-	
 	void CreateNewFile();
 	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/debugger.h

@@ -1,201 +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_DEBUGGER_H_
-#define _INCLUDE_DEBUGGER_H_
-
-#include "CVector.h"
-#include "amxdbg.h"
-
-/**
- * Third revision of the AMX Mod X Plugin Debugger.
- * This final, object oriented version is safe for multiple calls and lets you 
- *  fine-tune error handling.
- *  -BAILOPAN
- */
-class Debugger
-{
-public:
-	class Tracer
-	{
-	public:
-		
-		struct trace_info
-		{
-			trace_info() : cip(0), frm(0), next(NULL), prev(NULL), used(false) {};
-			
-			cell cip;
-			cell frm;
-			
-			trace_info *next;
-			trace_info *prev;
-			
-			bool used;
-		};
-	
-	public:
-		Tracer() : m_Error(0), m_pStart(NULL), m_pEnd(NULL), m_Reset(true) {};
-		~Tracer();
-	public:
-		void StepI(cell frm, cell cip);
-		void Reset();
-		void Clear();
-		
-		Debugger::Tracer::trace_info *GetStart() const;
-		Debugger::Tracer::trace_info *GetEnd() const;
-	public:
-		int m_Error;
-	private:
-		trace_info *m_pStart;
-		trace_info *m_pEnd;
-		
-		bool m_Reset;
-	};
-
-public:
-	Debugger(AMX *pAmx, AMX_DBG *pAmxDbg) : m_pAmx(pAmx), m_pAmxDbg(pAmxDbg), m_Top(-1)
-	{
-		_CacheAmxOpcodeList();
-	};
-	~Debugger();
-public:
-	//Begin a trace for a function
-	void BeginExec();
-
-	//Step through one instruction
-	void StepI();
-
-	//Get/set the last traced error
-	int GetTracedError();
-	void SetTracedError(int error);
-
-	//Get the first trace info of the call stack
-	Debugger::Tracer::trace_info *GetTraceStart() const;
-
-	//Get extra info about the call stack
-	bool GetTraceInfo(Debugger::Tracer::trace_info *pTraceInfo, long &line, const char *&function, const char *&file);
-
-	//Get the next trace in the call stack, NULL if none
-	Debugger::Tracer::trace_info *GetNextTrace(Debugger::Tracer::trace_info *pTraceInfo);
-
-	//Returns true if an error exists
-	bool ErrorExists();
-
-	//Formats the error message into a buffer.
-	//returns length of data copied, or -1 if there is no error.
-	int FormatError(char *buffer, size_t maxLength);
-
-	//End a trace
-	void EndExec();
-
-	//Reset the internal states as if the debugger was inactive
-	void Reset();
-
-	//Destroy internal states for shutdown
-	void Clear();
-
-	void DisplayTrace(const char *message);
-
-	AMX *GetAMX() const { return m_pAmx; }
-public:
-	//generic static opcode breaker
-	static int AMXAPI DebugHook(AMX *amx);
-	
-	static void FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLength);
-	static void GenericMessage(AMX *amx, int error);
-private:
-	void _CacheAmxOpcodeList();
-	
-	int _GetOpcodeFromCip(cell cip, cell *&addr);
-	cell _CipAsVa(cell cip);
-	
-	const char *_GetFilename();
-public:
-	AMX *m_pAmx;
-	AMX_DBG *m_pAmxDbg;
-	
-	int m_Top;
-	cell *m_pOpcodeList;
-	String m_FileName;
-	
-	CVector<Tracer *> m_pCalls;
-};
-
-typedef Debugger::Tracer::trace_info trace_info_t;
-
-/**
- * Error handler for plugins
- */
-
-class Handler
-{
-public:
-	Handler(AMX *pAmx) : m_pAmx(pAmx), m_iErrFunc(-1), m_iModFunc(-1), m_iNatFunc(-1), m_Handling(false), m_InNativeFilter(false) {};
-	~Handler() {};
-public:
-	int SetErrorHandler(const char *function);
-	int SetNativeFilter(const char *function);
-	int SetModuleFilter(const char *function);
-public:
-	int HandleError(const char *msg);
-	int HandleNative(const char *native, int index, int trap);
-	int HandleModule(const char *module, bool isClass=false);
-public:
-	bool IsHandling() const { return m_Handling; }
-	void SetErrorMsg(const char *msg);
-	
-	const char *GetLastMsg();
-	trace_info_t *GetTrace() const { return m_pTrace; }
-	const char *GetFmtCache() { return m_FmtCache.c_str(); }
-	
-	bool IsNativeFiltering() { return (m_iNatFunc > 0); }
-	bool InNativeFilter() { return m_InNativeFilter; }
-private:
-	AMX *m_pAmx;
-	
-	int m_iErrFunc;
-	int m_iModFunc;
-	int m_iNatFunc;
-	
-	bool m_Handling;
-	
-	//in the future, make this a stack!
-	bool m_InNativeFilter;
-	
-	String m_MsgCache;
-	String m_FmtCache;
-	
-	trace_info_t *m_pTrace;
-};
-
-extern AMX_NATIVE_INFO g_DebugNatives[];
-
-#endif //_INCLUDE_DEBUGGER_H_

amxmodx/emsg.cpp

@@ -58,14 +58,9 @@ WeaponsVault g_weaponsData[MAX_WEAPONS];
 void Client_VGUIMenu(void* mValue)
 {
   if (!mPlayer) return;
-
-	mPlayer->vgui = true;
-
-	switch (mState++)
-	{
+  switch (mState++){
   case 0:
     mPlayer->menu = -(*(int*)mValue);
-			mPlayer->newmenu = -1;
     break;
   case 1:
     mPlayer->keys = *(int*)mValue;
@@ -75,31 +70,20 @@ void Client_VGUIMenu(void* mValue)
 void Client_ShowMenu(void* mValue)
 {
   if (!mPlayer) return;
-
-	mPlayer->vgui = true;
-
-	switch (mState++)
-	{
+  switch (mState++){
   case 0:
     mPlayer->keys = *(int*)mValue;
     break;
   case 3:
-			{
     mPlayer->menu = g_menucmds.findMenuId( (char*)mValue );
-			mPlayer->newmenu = -1;
-			break;
-			}
   }
 }
 
-extern bool g_bmod_tfc;
 void Client_TeamInfo(void* mValue)
 {
-	if (mPlayer && !g_bmod_tfc) return;
+  if (mPlayer) return;
   static int index;
-
-	switch (mState++)
-	{
+  switch (mState++) {
   case 0:
     index = *(int*)mValue;
     break;
@@ -108,64 +92,50 @@ void Client_TeamInfo(void* mValue)
 	char* msg = (char*)mValue;
     g_players[ index ].team.assign( msg );
 	g_teamsIds.registerTeam( msg , -1 );
-			break;
   }
 }
 
 void Client_TextMsg(void* mValue)
 {
 	if ( mPlayer ) return;
-	
-	switch (mState++)
-	{
-		case 1:
-		{
+	switch (mState++) {
+	case 1:{
 		char * msg = (char*)mValue;
 		if (!msg) break;
-			
-			if (!strncmp("#Game_C", msg, 7))
-			{
+		if ( !strncmp("#Game_C", msg , 7) ) {
 			g_game_timeleft = g_game_restarting = gpGlobals->time + 3;
 			//      g_endround_time = gpGlobals->time;
 			//      g_newround_time = gpGlobals->time + CVAR_GET_FLOAT("mp_freezetime") + 3;
 		}
-			else if (!strncmp("#Game_w", msg, 7))
-			{
+		else if (!strncmp("#Game_w", msg , 7) ) {
 			g_game_timeleft = -2;
 		}
-			else if (!strncmp("#game_clan_s", msg, 12))
-			{
+		else if ( !strncmp("#game_clan_s", msg , 12)  ){
 			g_game_timeleft = -3;
 		}
-			
 		break;
 		   }
-		case 2:
-		{
+	case 2:{
 		char * msg = (char*)mValue;
 		if (!msg) break;
-			
-			if (g_game_timeleft == -2)
-			{
+		if (g_game_timeleft == -2 ){
 			g_game_timeleft = g_game_restarting = gpGlobals->time + atoi( msg );
 			//    g_newround_time = g_game_timeleft + CVAR_GET_FLOAT("mp_freezetime");
 		}
 		else if ( g_game_timeleft == -3 )
-				g_game_restarting = atoi(msg) * 60.0f;
-			
+			g_game_restarting = atoi( msg ) * 60;
 		break;
 		   }
-		case 3:
-		{
+	case 3:{
 		char * msg = (char*)mValue;
 		if (!msg) break;
 		if ( g_game_timeleft != -3 ) break;
 		g_game_restarting += atoi( msg );
 		g_game_timeleft = g_game_restarting	= gpGlobals->time + g_game_restarting;
-			
 		break;
 		   }
 	}
+	
 }
 
 void Client_WeaponList(void* mValue)
@@ -174,9 +144,7 @@ void Client_WeaponList(void* mValue)
   //static int wpnList2;
   static int iSlot;
   static const char* wpnName;
-	
-	switch (mState++)
-	{
+  switch (mState++) {
   case 0:
     wpnName = (char*)mValue;
     break;
@@ -185,12 +153,24 @@ void Client_WeaponList(void* mValue)
     break;
   case 7:
     int iId = *(int*)mValue;
+	/*int* blocker;
+
+	int iwpn = iId;
+	
+	if (iId > 31) {
+		iwpn -= 31;
+		blocker = &wpnList2;
+	}
+	else
+		blocker = &wpnList;*/
+
     if ( (iId < 0 || iId >= MAX_WEAPONS ) || (wpnList & (1<<iId)) )
       break;
     wpnList |= (1<<iId);
     g_weaponsData[iId].iId = iId;
     g_weaponsData[iId].ammoSlot = iSlot;
     g_weaponsData[iId].fullName.assign(wpnName);
+
   }
 }
 
@@ -198,9 +178,7 @@ void Client_CurWeapon(void* mValue)
 {
   static int iState;
   static int iId;
-	
-	switch (mState++)
-	{
+  switch (mState++){
   case 0:
     iState = *(int*)mValue;
     break;
@@ -219,10 +197,9 @@ void Client_CurWeapon(void* mValue)
 
 void Client_AmmoX(void* mValue)
 {
-	static int iAmmo;
 
-	switch (mState++)
-	{
+  static int iAmmo;
+  switch (mState++){
   case 0:
     iAmmo = *(int*)mValue;
     break;
@@ -237,9 +214,7 @@ void Client_AmmoX(void* mValue)
 void Client_AmmoPickup(void* mValue)
 {
   static int iSlot;
-	
-	switch (mState++)
-	{
+  switch (mState++){
   case 0:
     iSlot = *(int*)mValue;
     break;
@@ -255,9 +230,7 @@ void Client_ScoreInfo(void* mValue)
 {
   static int index;
   static int deaths;
-
-	switch (mState++)
-	{
+  switch (mState++){
   case 0:
     index = *(int*)mValue;
     break;
@@ -299,21 +272,24 @@ void Client_DeathMsg(void* mValue)
 	static int victim_id;
 	static int hs;
 	
-	switch (mState++)
-	{
+	switch (mState++){
 	case 0:
 		killer_id = *(int*)mValue;
-			killer = (killer_id > 0 && killer_id < 33) ? GET_PLAYER_POINTER_I(killer_id) : 0;
+		killer = (killer_id > 0 && killer_id < 33) ? 
+			GET_PLAYER_POINTER_I(killer_id) : 0;
 		break;
 	case 1:
 		victim_id = *(int*)mValue;
-			victim = (victim_id > 0 && victim_id < 33) ? GET_PLAYER_POINTER_I(victim_id) : 0;
+		victim = (victim_id > 0 && victim_id < 33) ? 
+			GET_PLAYER_POINTER_I(victim_id) : 0;
 		break;
 	case 2:	
 		hs = *(int*)mValue;
 		break;
 	case 3:
+		
 		if (  !killer || !victim ) break;
+
 		victim->death_killer = killer_id;
 		victim->death_weapon.assign((char*)mValue);
 		victim->death_headshot = hs;

amxmodx/fakemeta.h

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

amxmodx/float.cpp

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

amxmodx/format.h

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

amxmodx/helpers-x86.asm

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

amxmodx/messages.h

@@ -1,85 +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"
-
-#define MAX_MESSAGES 255
-
-#define MSGBLOCK_SET	0
-#define MSGBLOCK_GET	1
-#define BLOCK_NOT 0
-#define BLOCK_ONCE 1
-#define BLOCK_SET 2
-
-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 CVector<int> msgHooks[256];
-extern int msgBlocks[256];
-
-void ClearMessages();
-
-#endif //_MSGS_INCLUDE_H
-

amxmodx/mmgr/mmgr.cpp

@@ -930,11 +930,7 @@ void	*m_allocator(const char *sourceFile, const unsigned int sourceLine, const c
 
 			// Danger Will Robinson!
 
-			if (reservoir == NULL) 
-			{
-				log("%s: Unable to allocate RAM for internal memory tracking data", ownerString(sourceFile, sourceLine, sourceFunc));
-				throw "Unable to allocate RAM for internal memory tracking data";
-			}
+			if (reservoir == NULL) throw "Unable to allocate RAM for internal memory tracking data";
 
 			// Build a linked-list of the elements in our reservoir
 
@@ -1002,7 +998,6 @@ void	*m_allocator(const char *sourceFile, const unsigned int sourceLine, const c
 
 		if (au->actualAddress == NULL)
 		{
-			log("%s: Request for allocation failed. Out of memory.", ownerString(sourceFile, sourceLine, sourceFunc));
 			throw "Request for allocation failed. Out of memory.";
 		}
 
@@ -1113,11 +1108,7 @@ void	*m_reallocator(const char *sourceFile, const unsigned int sourceLine, const
 
 		// If you hit this assert, you tried to reallocate RAM that wasn't allocated by this memory manager.
 		m_assert(au != NULL);
-		if (au == NULL)
-		{
-			log("%s: Request to reallocate RAM that was never allocated", ownerString(sourceFile, sourceLine, sourceFunc));
-			throw "Request to reallocate RAM that was never allocated";
-		}
+		if (au == NULL) throw "Request to reallocate RAM that was never allocated";
 
 		// If you hit this assert, then the allocation unit that is about to be reallocated is damaged. But you probably
 		// already know that from a previous assert you should have seen in validateAllocUnit() :)
@@ -1171,11 +1162,7 @@ void	*m_reallocator(const char *sourceFile, const unsigned int sourceLine, const
 		m_assert(newActualAddress);
 		#endif
 
-		if (!newActualAddress)
-		{
-			log("%s: Request for reallocation failed. Out of memory", ownerString(sourceFile, sourceLine, sourceFunc));
-			throw "Request for reallocation failed. Out of memory.";
-		}
+		if (!newActualAddress) throw "Request for reallocation failed. Out of memory.";
 
 		// Remove this allocation from our stats (we'll add the new reallocation again later)
 
@@ -1304,11 +1291,7 @@ void	m_deallocator(const char *sourceFile, const unsigned int sourceLine, const
 
 		// If you hit this assert, you tried to deallocate RAM that wasn't allocated by this memory manager.
 		m_assert(au != NULL);
-		if (au == NULL)
-		{
-			log("%s: Request to deallocate RAM that was never allocated", ownerString(sourceFile, sourceLine, sourceFunc));
-			throw "Request to deallocate RAM that was never allocated";
-		}
+		if (au == NULL) throw "Request to deallocate RAM that was never allocated";
 
 		// If you hit this assert, then the allocation unit that is about to be deallocated is damaged. But you probably
 		// already know that from a previous assert you should have seen in validateAllocUnit() :)

amxmodx/modules.h

@@ -38,54 +38,142 @@
 #ifndef __linux__
   #define DLLEXPORT   __declspec(dllexport)
 #else
-	#define DLLEXPORT __attribute__((visibility("default")))
+  #define DLLEXPORT
   #define WINAPI
 #endif
 
 #undef C_DLLEXPORT
 #define C_DLLEXPORT extern "C" DLLEXPORT
 
+#define AMX_INTERFACE_VERSION 6
+
 #define RELOAD_MODULE 0
 #define STATIC_MODULE 1
 
-typedef enum
-{
-	Player_Name,		//String
-	Player_Ip,			//String
-	Player_Team,		//String
-	Player_Ingame,		//bool
-	Player_Authorized,	//bool
-	Player_Vgui,		//bool
-	Player_Time,		//float
-	Player_Playtime,	//float
-	Player_MenuExpire,	//float
-	Player_Weapons,		//struct{int,int}[32]
-	Player_CurrentWeapon,	//int
-	Player_TeamID,			//int
-	Player_Deaths,			//int
-	Player_Aiming,			//int
-	Player_Menu,			//int
-	Player_Keys,			//int
-	Player_Flags,			//int[32]
-	Player_Newmenu,			//int
-	Player_NewmenuPage,		//int
-}  PlayerProp;
+struct module_info_s {
+  const char* name;
+  const char* author;
+  const char* version;
+  int ivers;
+  int type;
+  long int serial;
+};
 
-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);
+// Small scripting language
+struct pfnamx_engine_g {
+  uint16_t*   (*pfnamx_Align16)(uint16_t *);                    // value
+  uint32_t*   (*pfnamx_Align32)(uint32_t *);                    // value
+  int     (*pfnamx_Allot)(AMX*, int, cell*, cell**);              // amx, length, amx_addr, phys_addr
+  int     (*pfnamx_Callback)(AMX*, cell , cell*, cell*);            // amx, index,result,params
+  int     (*pfnamx_Clone)(AMX*, AMX*, void*);                 // amxClone, amxSrc, data
+  int     (*pfnamx_Debug)(AMX*); // default debug procedure, does nothing   // amx
+  int     (*pfnamx_Exec)(AMX*, cell*, int , int , ...);           // amx, return val, index, num_params, ...
+  int     (*pfnamx_Execv)(AMX*, cell*, int , int, cell[]);          // amx, return val, index, num_params, param[]
+  int     (*pfnamx_FindPublic)(AMX*, char*, int*);              // amx, func name, index
+  int     (*pfnamx_FindPubVar)(AMX*, char*, cell*);             // anx, var name, amx_addr
+  int     (*pfnamx_FindTagId)(AMX*, cell , char*);              // amx. tag_id, tagname
+  int     (*pfnamx_Flags)(AMX*,uint16_t *);                 // amx, flags
+  int     (*pfnamx_GetAddr)(AMX*,cell ,cell**);               // amx, amx_addr, phys_addr
+  int     (*pfnamx_GetPublic)(AMX*, int , char*);               // amx, index, funcname
+  int     (*pfnamx_GetPubVar)(AMX*, int , char*, cell*);            // amx, index, varname, amx_addr
+  int     (*pfnamx_GetString)(char*dest,cell*);               // dest, source
+  int     (*pfnamx_GetTag)(AMX*, int , char*, cell*);             // amx, index, tagname, tag_id
+  int     (*pfnamx_GetUserData)(AMX*, long , void **);            // amx, tag, ptr
+  int     (*pfnamx_Init)(AMX*, void *);                   // amx, program
+  int     (*pfnamx_InitJIT)(AMX*, void *, void *);              // amx, reloc_table, native_code
+  int     (*pfnamx_MemInfo)(AMX*, long*, long*, long*);           // amx, codesize, datasize, stackheap
+  int     (*pfnamx_NameLength)(AMX*, int*);                 // amx, length
+  AMX_NATIVE_INFO * (*pfnamx_NativeInfo)(char*,AMX_NATIVE );            // name, func
+  int     (*pfnamx_NumPublics)(AMX*, int*);                 // amx, number
+  int     (*pfnamx_NumPubVars)(AMX*, int*);                 // amx, number
+  int     (*pfnamx_NumTags)(AMX*, int*);                    // amx, number
+  int     (*pfnamx_RaiseError)(AMX*, int );                 // amx, error
+  int     (*pfnamx_Register)(AMX*, AMX_NATIVE_INFO*, int );         // amx, nativelist, number
+  int     (*pfnamx_Release)(AMX*, cell );                   // amx, amx_addr
+  int     (*pfnamx_SetCallback)(AMX*, AMX_CALLBACK );             // amx, callback
+  int     (*pfnamx_SetDebugHook)(AMX*, AMX_DEBUG );             // amx, debug
+  int     (*pfnamx_SetString)(cell*, char*, int );              // dest, source, pack
+  int     (*pfnamx_SetUserData)(AMX*, long , void*);              // amx, tag, prt
+  int     (*pfnamx_StrLen)(cell*, int*);                    // amx, cstring, length
+};
+extern pfnamx_engine_g* g_engAmxFunc;
 
-class Debugger;
-Debugger *DisableDebugHandler(AMX *amx);
-void EnableDebugHandler(AMX *amx, Debugger *pd);
+#define AMX_ALIGN16       (*g_engAmxFunc->pfnamx_Align16)
+#define AMX_ALIGN32       (*g_engAmxFunc->pfnamx_Align32)
+#define AMX_ALLOT         (*g_engAmxFunc->pfnamx_Allot)
+#define AMX_CALLBACK      (*g_engAmxFunc->pfnamx_Callback)
+#define AMX_CLONE         (*g_engAmxFunc->pfnamx_Clone)
+#define AMX_DEBUG         (*g_engAmxFunc->pfnamx_Debug)
+#define AMX_EXEC          (*g_engAmxFunc->pfnamx_Exec)
+#define AMX_EXECV         (*g_engAmxFunc->pfnamx_Execv)
+#define AMX_FINDPUBLIC    (*g_engAmxFunc->pfnamx_FindPublic)
+#define AMX_FINDPUBVAR    (*g_engAmxFunc->pfnamx_FindPubVar)
+#define AMX_FINDTAGID     (*g_engAmxFunc->pfnamx_FindTagId)
+#define AMX_FLAGS         (*g_engAmxFunc->pfnamx_Flags)
+#define AMX_GETADDR       (*g_engAmxFunc->pfnamx_GetAddr)
+#define AMX_GETPUBLIC     (*g_engAmxFunc->pfnamx_GetPublic)
+#define AMX_GETPUBVAR     (*g_engAmxFunc->pfnamx_GetPubVar)
+#define AMX_GETSTRING     (*g_engAmxFunc->pfnamx_GetString)
+#define AMX_GETTAG        (*g_engAmxFunc->pfnamx_GetTag)
+#define AMX_GETUSERDATA   (*g_engAmxFunc->pfnamx_GetUserData)
+#define AMX_INIT          (*g_engAmxFunc->pfnamx_Init)
+#define AMX_INITJIT       (*g_engAmxFunc->pfnamx_InitJIT)
+#define AMX_MEMINFO       (*g_engAmxFunc->pfnamx_MemInfo)
+#define AMX_NAMELENGTH    (*g_engAmxFunc->pfnamx_NameLength)
+#define AMX_NATIVEINFO    (*g_engAmxFunc->pfnamx_NativeInfo)
+#define AMX_NUMPUBLICS    (*g_engAmxFunc->pfnamx_NumPublics)
+#define AMX_NUMPUBVARS    (*g_engAmxFunc->pfnamx_NumPubVars)
+#define AMX_NUMTAGS       (*g_engAmxFunc->pfnamx_NumTags)
+#define AMX_RAISEERROR    (*g_engAmxFunc->pfnamx_RaiseError)
+#define AMX_REGISTER      (*g_engAmxFunc->pfnamx_Register)
+#define AMX_RELEASE       (*g_engAmxFunc->pfnamx_Release)
+#define AMX_SETCALLBACK   (*g_engAmxFunc->pfnamx_SetCallback)
+#define AMX_SETDEBUGHOOK  (*g_engAmxFunc->pfnamx_SetDebugHook)
+#define AMX_SETSTRING     (*g_engAmxFunc->pfnamx_SetString)
+#define AMX_SETUSERDATA   (*g_engAmxFunc->pfnamx_SetUserData)
+#define AMX_STRLEN        (*g_engAmxFunc->pfnamx_StrLen)
 
-bool DirExists(const char *dir);
-const char* GetFileName(AMX *amx);
+// Modules API
+struct pfnmodule_engine_g {
+  int         (*pfnadd_amxnatives)(module_info_s*,AMX_NATIVE_INFO*);      // list
+  char*       (*pfnbuild_pathname)(char*, ...);                           // format, ....
+  void        (*pfncopy_amxmemory)(cell*,cell*,int);                      // dest, src, len
+  char*       (*pfnformat_amxstring)(AMX*, cell*, int ,int& );            // amx, format, start pos, len
+  cell*       (*pfnget_amxaddr)(AMX*,cell );                              // amx, cell
+  AMX*        (*pfnget_amxscript)(int, void**,const char**);              // id, code, name
+  const char* (*pfnget_amxscriptname)(AMX* amx);                          // amx
+  char*       (*pfnget_amxstring)(AMX*,cell,int, int&);                   // amx, src, buffer (0-3), len
+  void        (*pfnget_modname)(char*);                                   // modname
+  int         (*pfnload_amxscript)(AMX*, void**, const char*, char[64]);  // amx, code, path, error info
+  void        (*pfnprint_console)(char*, ...);                            // format, ....
+  void      (*pfnreport_error)(int code, char*, ... );
+  int         (*pfnset_amxnatives)(AMX*,char[64]);                        // amx, error info
+  int         (*pfnset_amxstring)(AMX*,cell ,const char*,int);            // amx, dest, string, maxlen
+  int         (*pfnamxstring_length)(cell*);                              // src
+  int         (*pfnunload_amxscript)(AMX* amx,void**);                    // amx, code
+  void*     (*pfnalloc_amxmemory)(void**,int size);
+  void      (*pfnfree_amxmemory)(void**);
+};
+extern pfnmodule_engine_g* g_engModuleFunc;
+
+#define ADD_AMXNATIVES          (*g_engModuleFunc->pfnadd_amxnatives)
+#define AMXSTRING_LENGTH        (*g_engModuleFunc->pfnamxstring_length)
+#define BUILD_PATHNAME          (*g_engModuleFunc->pfnbuild_pathname)
+#define COPY_AMXMEMORY          (*g_engModuleFunc->pfncopy_amxmemory)
+#define FORMAT_AMXSTRING        (*g_engModuleFunc->pfnformat_amxstring)
+#define GET_AMXADDR             (*g_engModuleFunc->pfnget_amxaddr)
+#define GET_AMXSCRIPT           (*g_engModuleFunc->pfnget_amxscript)
+#define GET_AMXSCRIPTNAME       (*g_engModuleFunc->pfnget_amxscriptname)
+#define GET_AMXSTRING           (*g_engModuleFunc->pfnget_amxstring)
+#define GET_MODNAME             (*g_engModuleFunc->pfnget_modname)
+#define LOAD_AMXSCRIPT          (*g_engModuleFunc->pfnload_amxscript)
+#define PRINT_CONSOLE           (*g_engModuleFunc->pfnprint_console)
+#define REPORT_ERROR      (*g_engModuleFunc->pfnreport_error)
+#define SET_AMXNATIVES          (*g_engModuleFunc->pfnset_amxnatives)
+#define SET_AMXSTRING           (*g_engModuleFunc->pfnset_amxstring)
+#define UNLOAD_AMXSCRIPT        (*g_engModuleFunc->pfnunload_amxscript)
+#define ALLOC_AMXMEMORY         (*g_engModuleFunc->pfnalloc_amxmemory)
+#define FREE_AMXMEMORY        (*g_engModuleFunc->pfnfree_amxmemory)
 
-inline cell FloatToCell(float input)
-{
-	REAL output = input;
-	return *(cell *)&output;
-}
 
 #endif // __MODULES_H__

amxmodx/msvc/amxmodx.vcproj

@@ -0,0 +1,804 @@
+<?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="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
+				OutputFile="debug/amxx_mm.dll"
+				Version="0.1"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				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"
+				OutputFile="release/amxx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile=".\release/amxx_mm.pdb"
+				ImportLibrary=".\release/amxx_mm.lib"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\release/amxmodx.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="MemtestDebug|Win32"
+			OutputDirectory="MemtestDebug"
+			IntermediateDirectory="MemtestDebug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="5"
+				StructMemberAlignment="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="amxmodx.h"
+				PrecompiledHeaderFile=".\memtestdebug/amxmodx.pch"
+				AssemblerListingLocation=".\memtestdebug/"
+				ObjectFile=".\memtestdebug/"
+				ProgramDataBaseFileName=".\memtestdebug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
+				OutputFile="memtestdebug/amxx_mm.dll"
+				Version="0.1"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				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"
+				OutputFile="memtestrelease/amxx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile=".\memtestrelease/amxx_mm.pdb"
+				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="&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;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="odbc32.lib odbccp32.lib ..\jit\jits.lib"
+				OutputFile="jitdebug/amxx_mm.dll"
+				Version="0.1"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				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"
+				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;JIT"
+				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"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				OutputFile="jitrelease/amxx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				ModuleDefinitionFile=""
+				ProgramDatabaseFile=".\jitrelease/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>
+		<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"
+				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="odbc32.lib odbccp32.lib ..\jit\jits.lib"
+				OutputFile="jitmemtestrelease/amxx_mm.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories="..\extra\lib_win32"
+				ModuleDefinitionFile=""
+				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"
+				OutputFile="MaximalSpeed/amxx_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="..\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">
+			</File>
+			<File
+				RelativePath="..\CVault.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="..\md5.cpp">
+			</File>
+			<File
+				RelativePath="..\meta_api.cpp">
+			</File>
+			<File
+				RelativePath="..\modules.cpp">
+			</File>
+			<File
+				RelativePath="..\power.cpp">
+			</File>
+			<File
+				RelativePath="..\srvcmd.cpp">
+			</File>
+			<File
+				RelativePath="..\string.cpp">
+			</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="..\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="..\CRList.h">
+			</File>
+			<File
+				RelativePath="..\CString.h">
+			</File>
+			<File
+				RelativePath="..\CTask.h">
+			</File>
+			<File
+				RelativePath="..\CVault.h">
+			</File>
+			<File
+				RelativePath="..\CVector.h">
+			</File>
+			<File
+				RelativePath="..\fakemeta.h">
+			</File>
+			<File
+				RelativePath="..\md5.h">
+			</File>
+			<File
+				RelativePath="..\modules.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>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

amxmodx/msvc/amxmodx_mm.def

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

amxmodx/msvc/amxmodx_mm.sln

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

amxmodx/msvc/amxmodx_mm.vcproj

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

amxmodx/msvc8/amxmodx_mm.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/msvc8/amxmodx_mm.vcproj

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

amxmodx/natives-amd64.asm

@@ -1,91 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; (C)2005 by David "BAILOPAN" Anderson		 ;
-; register_native functions for amd64		 ;;;;;;
-; Based on the concept by Julien "dJeyL" Laurent      ;
-; Thanks to T(+)rget for pushing me to implement this ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;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.
-
-;;Initializes the global variable
-
-BITS 64
-
-section .text
-
-global amxx_DynaInit, _amxx_DynaInit
-;void amxx_DynaInit(void *ptr);
-amxx_DynaInit:
-_amxx_DynaInit:
-	mov	[GLOBAL_GATE wrt rip], rdi
-	ret
-	
-;;Assembles the gateway function
-global amxx_DynaMake, _amxx_DynaMake
-;int amxx_DynaMake(char *buffer, int id);
-amxx_DynaMake:
-_amxx_DynaMake:
-	;we're not damaging the stack I think so we should be safe with no prologue
-	
-	;save these two we're about to destroy them
-	push		rsi		;push id
-	push		rdi		;push buffer
-	
-	mov		rsi, _amxx_DynaFuncStart
-	mov		rcx, _amxx_DynaFuncEnd - _amxx_DynaFuncStart
-	cld		;clear direction flag (just in case)
-	rep		movsb
-	
-	pop		rdi		;get buffer as destination
-	pop		rax		;get id
-	;align us to mov rsi, 1234... - on x86-64 this is 2 bytes after the differential
-	add		rdi, (_amxx_DynaFuncStart.move-_amxx_DynaFuncStart) + 2
-	mov		[rdi], qword rax
-	;align rdi to the call
-	add		rdi, (_amxx_DynaFuncStart.call-_amxx_DynaFuncStart.move) 
-	mov		rax, qword [GLOBAL_GATE wrt rip]
-	;copy the real address
-	mov		[rdi], rax
-	
-	ret
-
-;;The gateway function we will re-assemble
-;; This is similar to dJeyL's but a tad more elegant, as it's written in pure assembly
-;; and NASM > GAS :')
-global amxx_DynaFunc, _amxx_DynaFunc
-;int amxx_DynaFunc(AMX *amx, cell *params);
-amxx_DynaFunc:
-_amxx_DynaFunc:
-_amxx_DynaFuncStart:
-	push		rbp
-	mov		rbp, rsp
-	
-	;we're given an amx and params... we're also hardcoded for this though:
-	mov		rdx, rsi	;move 2nd param to 3rd 
-	mov		rsi, rdi	;move 1st param to 2nd
-	;this old trick, we'll move in the real pointer in a bit.
-.move:
-	mov		rdi, qword 1234567812345678h
-.call:
-	mov		rcx, qword 1234567812345678h
-	call		rcx
-	
-	pop		rbp
-	ret
-_amxx_DynaFuncEnd:
-
-;;Just returns the buffer size required
-global _amxx_DynaCodesize, amxx_DynaCodesize
-;int amxx_DynaCodesize()
-amxx_DynaCodesize:
-_amxx_DynaCodesize:
-	; on x86-64 this is 34 bytes
-	mov		rax, _amxx_DynaFuncEnd - _amxx_DynaFuncStart
-	ret
-
-section .data
-	
-GLOBAL_GATE		DQ		0
-

amxmodx/natives-x86.asm

@@ -1,100 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; (C)2005 by David "BAILOPAN" Anderson			 ;
-; register_native functions for x86				 ;;;;;;
-; Based on the concept by Julien "dJeyL" Laurent	  ;
-; Thanks to T(+)rget for pushing me to implement this ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;;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.
-
-;;Initializes the global variable
-
-section .text
-
-global amxx_DynaInit, _amxx_DynaInit
-;void amxx_DynaInit(void *ptr);
-amxx_DynaInit:
-_amxx_DynaInit:
-	push	ebp
-	mov		ebp, esp
-	
-	mov		eax, [ebp+8]		;get pointer
-	mov		[GLOBAL_GATE], eax	;store
-	
-	mov		eax, 1
-	pop		ebp
-	ret
-	
-;;Assembles the gateway function
-global amxx_DynaMake, _amxx_DynaMake
-;int amxx_DynaMake(char *buffer, int id);
-amxx_DynaMake:
-_amxx_DynaMake:
-	push	ebp
-	mov		ebp, esp
-	
-	push	edi
-	push	esi
-	
-	mov		edi, [ebp+8]	;buffer
-	mov		esi, _amxx_DynaFuncStart
-	mov		ecx, _amxx_DynaFuncEnd - _amxx_DynaFuncStart
-	cld		;clear direction flag (just in case)
-	rep		movsb
-	
-	mov		edi, [ebp+8]	;get buffer again
-	;align us to mov eax, 1234 - on x86 this is 4 bytes
-	add		edi, (_amxx_DynaMoveOffset-_amxx_DynaFuncStart) + 1
-	mov		eax, [ebp+12]
-	mov		[edi], eax
-	
-	pop		esi
-	pop		edi
-	
-	mov		eax, 1
-	pop		ebp
-	ret
-
-;;The gateway function we will re-assemble
-;; This is similar to dJeyL's but a tad more elegant, as it's written in pure assembly
-;; and NASM > GAS :')
-global amxx_DynaFunc, _amxx_DynaFunc
-;int amxx_DynaFunc(AMX *amx, cell *params);
-amxx_DynaFunc:
-_amxx_DynaFunc:
-_amxx_DynaFuncStart:
-	push	ebp
-	mov		ebp, esp
-	
-	;we're given an amx and params... we're also hardcoded for this though:
-_amxx_DynaMoveOffset:
-	mov		eax, 12345678h		;this old trick, we'll move in the real pointer in a bit.
-	push	dword [ebp+12]		;push params
-	push	dword [ebp+8]		;push amx
-	push	eax					;push the id
-	call	[GLOBAL_GATE]		;pass through teh global gateway.
-	add		esp, 12				;reset stack oops
-	
-	pop		ebp
-	ret
-_amxx_DynaFuncEnd:
-
-;;Just returns the buffer size required
-global _amxx_DynaCodesize, amxx_DynaCodesize
-;int amxx_DynaCodesize()
-amxx_DynaCodesize:
-_amxx_DynaCodesize:
-	push	ebp
-	mov		ebp, esp
-	
-	; on x86 is this 17 bytes
-	mov		eax, _amxx_DynaFuncEnd - _amxx_DynaFuncStart
-	
-	pop		ebp
-	ret
-	
-section .data
-	
-GLOBAL_GATE		DD		0

amxmodx/natives.cpp

@@ -1,516 +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 "sh_stack.h"
-#include "natives.h"
-#include "debugger.h"
-#include "libraries.h"
-#include "format.h"
-
-#ifdef __linux__
-#include <malloc.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-#include "sclinux.h"
-#endif
-
-//Written by David "BAILOPAN" Anderson
-//With the exception for param_convert, which was written by
-// Julien "dJeyL" Laurent
-
-CStack<int> g_ErrorStk;
-CVector<regnative *> g_RegNatives;
-CStack<regnative *> g_NativeStack;
-static char g_errorStr[512] = {0};
-bool g_Initialized = false;
-
-int amxx_DynaCallback(int idx, AMX *amx, cell *params)
-{
-	if (idx < 0 || idx >= (int)g_RegNatives.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid dynamic native called");
-		return 0;
-	}
-
-	regnative *pNative = g_RegNatives[idx];
-	int numParams = params[0] / sizeof(cell);
-
-	if (numParams > CALLFUNC_MAXPARAMS)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Called dynanative with too many parameters (%d)", CALLFUNC_MAXPARAMS);
-		return 0;
-	}
-
-	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
-	CPluginMngr::CPlugin *pNativePlugin = g_plugins.findPluginFast(pNative->amx);
-
-	if (!pNativePlugin->isExecutable(pNative->func))
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Called dynanative into a paused plugin.");
-		pPlugin->setStatus(ps_paused);
-		return 0;
-	}
-
-	if (pNative->caller)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Bug caught! Please contact the AMX Mod X Dev Team.");
-		return 0;
-	}
-
-	//parameter stack
-	//NOTE: it is possible that recursive register native calling
-	// could potentially be somehow damaged here.
-	//so, a :TODO: - make the stack unique, rather than a known ptr
-	pNative->caller = amx;
-
-	int err = 0;
-	cell ret = 0;
-	g_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--)
-			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())
-		{
-			//don't care
-		} else if (err != -1) {
-			//nothing logged the error
-			LogError(pNative->amx, err, NULL);
-		}
-		pNative->amx->error = AMX_ERR_NONE;
-		//furthermore, log an error in the parent plugin.
-		LogError(amx, AMX_ERR_NATIVE, "Unhandled dynamic native error");
-	} else if (g_ErrorStk.front()) {
-		LogError(amx, g_ErrorStk.front(), g_errorStr);
-	}
-	if (pDebugger)
-		pDebugger->EndExec();
-	g_NativeStack.pop();
-	g_ErrorStk.pop();
-
-	pNative->caller = NULL;
-
-	return ret;
-}
-
-AMX_NATIVE_INFO *BuildNativeTable()
-{
-	if (g_RegNatives.size() < 1)
-		return NULL;
-
-	AMX_NATIVE_INFO *pNatives = new AMX_NATIVE_INFO[g_RegNatives.size() + 1];
-
-	AMX_NATIVE_INFO info;
-	regnative *pNative;
-	for (size_t i=0; i<g_RegNatives.size(); i++)
-	{
-		pNative = g_RegNatives[i];
-		info.name = pNative->name.c_str();
-		info.func = (AMX_NATIVE)((void *)(pNative->pfn));
-		pNatives[i] = info;
-	}
-	pNatives[g_RegNatives.size()].name = NULL;
-	pNatives[g_RegNatives.size()].func = NULL;
-
-	//this needs to be deleted
-	return pNatives;
-}
-
-static cell AMX_NATIVE_CALL log_error(AMX *amx, cell *params)
-{
-	int len;
-	char *err = format_amxstring(amx, params, 2, len);
-
-	_snprintf(g_errorStr, sizeof(g_errorStr), "%s", err);
-	g_ErrorStk.pop();
-	g_ErrorStk.push(params[1]);
-
-	return 1;
-}
-
-//get_string(param, dest[], len)
-static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	int 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_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	int len;
-	char *str = get_amxstring(amx, params[2], 0, len);
-
-	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_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	return pNative->params[p];
-}
-
-//get_param_byref(num)
-static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
-
-	return addr[0];
-}
-
-//set_param_byref(num, val)
-static cell AMX_NATIVE_CALL set_param_byref(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
-
-	addr[0] = params[2];
-
-	return 1;
-}
-
-//get_array(param, dest[], size)
-static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *source = get_amxaddr(pNative->caller, pNative->params[p]);
-	cell *dest = get_amxaddr(amx, params[2]);
-
-	int size = params[3];
-
-	memcpy(dest, source, size * sizeof(cell));
-
-	return 1;
-}
-
-//set_array(param, source[], size)
-static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.front();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *dest = get_amxaddr(pNative->caller, pNative->params[p]);
-	cell *source = get_amxaddr(amx, params[2]);
-
-	int size = params[3];
-
-	memcpy(dest, source, size * sizeof(cell));
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL vdformat(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-
-	regnative *pNative = g_NativeStack.front();
-
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-
-	int vargPos = static_cast<int>(params[4]);
-	int fargPos = static_cast<int>(params[3]);
-
-	/** get the parent parameter array */
-	cell *local_params = pNative->params;
-
-	cell max = local_params[0] / sizeof(cell);
-	if (vargPos > (int)max + 1)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid vararg parameter passed: %d", vargPos);
-		return 0;
-	}
-	if (fargPos > (int)max + 1)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid fmtarg parameter passed: %d", fargPos);
-		return 0;
-	}
-
-	/* get destination info */
-	cell *fmt;
-	if (fargPos == 0)
-	{
-		if (params[0] / sizeof(cell) != 5)
-		{
-			LogError(amx, AMX_ERR_NATIVE, "Expected fmtarg as fifth parameter, found none");
-			return 0;
-		}
-		fmt = get_amxaddr(amx, params[5]);
-	} else {
-		fmt = get_amxaddr(pNative->caller, pNative->params[fargPos]);
-	}
-	cell *realdest = get_amxaddr(amx, params[1]);
-	size_t maxlen = static_cast<size_t>(params[2]);
-	cell *dest = realdest;
-
-	/* if this is necessary... */
-	static cell cpbuf[4096];
-	dest = cpbuf;
-
-	/* perform format */
-	size_t total = atcprintf(dest, maxlen, fmt, pNative->caller, local_params, &vargPos);
-
-	/* copy back */
-	memcpy(realdest, dest, (total+1) * sizeof(cell));
-
-	return total;
-}
-
-//This is basically right from dJeyL's lib_convert function
-//This awesome hack modifies the stack frame to have an address offset
-// that will align to the other plugin's memory.
-//I've no idea how he thought of this, but it's great.  No idea how well it works.
-static cell AMX_NATIVE_CALL param_convert(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	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 = pNative->caller;
-
-	unsigned char *data =amx->base+(int)((AMX_HEADER *)amx->base)->dat;
-	unsigned char *realdata = caller->base+(int)((AMX_HEADER *)caller->base)->dat;
-
-	* (cell *)(data+(int)amx->frm+(p+2)*sizeof(cell)) -= (cell)data-(cell)realdata;
-
-	return 1;
-}
-
-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));
-
-	return 1;
-}
-
-//register_native(const name[], const handler[])
-static cell AMX_NATIVE_CALL register_native(AMX *amx, cell *params)
-{
-	if (!g_Initialized)
-		amxx_DynaInit((void *)(amxx_DynaCallback));
-
-	g_Initialized = true;
-
-	int len;
-	char *name = get_amxstring(amx, params[1], 0, len);
-	char *func = get_amxstring(amx, params[2], 1, len);
-
-	int idx, err;
-	if ( (err=amx_FindPublic(amx, func, &idx)) != AMX_ERR_NONE)
-	{
-		LogError(amx, err, "Function \"%s\" was not found", func);
-		return 0;
-	}
-
-	regnative *pNative = new regnative;
-	pNative->amx = amx;
-	pNative->func = idx;
-	pNative->caller = NULL;
-	
-	//we'll apply a safety buffer too
-	//make our function
-	int size = amxx_DynaCodesize();
-#ifndef __linux__
-	DWORD temp;
-	pNative->pfn = new char[size + 10];
-	VirtualProtect(pNative->pfn, size+10, PAGE_EXECUTE_READWRITE, &temp);
-#else
-	pNative->pfn = (char *)memalign(sysconf(_SC_PAGESIZE), size+10);
-	mprotect((void *)pNative->pfn, size+10, PROT_READ|PROT_WRITE|PROT_EXEC);
-#endif
-
-	int id = (int)g_RegNatives.size();
-	
-	amxx_DynaMake(pNative->pfn, id);
-	pNative->func = idx;
-	pNative->style = params[3];
-
-	g_RegNatives.push_back(pNative);
-
-	pNative->name.assign(name);
-
-	return 1;
-}
-
-void ClearPluginLibraries()
-{
-	ClearLibraries(LibSource_Plugin);
-	for (size_t i=0; i<g_RegNatives.size(); i++)
-	{
-		delete [] g_RegNatives[i]->pfn;
-		delete g_RegNatives[i];
-	}
-	g_RegNatives.clear();
-}
-
-AMX_NATIVE_INFO g_NativeNatives[] = {
-	{"register_native",	register_native},
-	{"log_error",		log_error},
-	{"register_library",register_library},
-	{"get_string",		get_string},
-	{"set_string",		set_string},
-	{"get_param",		get_param},
-	{"get_param_byref",	get_param_byref},
-	{"set_param_byref",	set_param_byref},
-	{"get_array",		get_array},
-	{"set_array",		set_array},
-	//these are dummy functions for floats ;p
-	{"get_param_f",		get_param},
-	{"get_float_byref",	get_param_byref},
-	{"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

@@ -1,69 +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_NATIVES_H
-#define _INCLUDE_NATIVES_H
-
-//only 16 for now sorry
-#if !defined CALLFUNC_MAXPARAMS
-#define CALLFUNC_MAXPARAMS 16
-#endif
-
-#define CALLFUNC_FLAG_BYREF			1
-#define CALLFUNC_FLAG_BYREF_REUSED	2
-
-#define N_CELL		1
-#define	N_ARRAY		2
-#define N_BYREF		3
-#define	N_VARARG	4
-
-struct regnative
-{
-	AMX *amx;
-	String name;
-	char *pfn;
-	int func;
-	AMX *caller;
-	int style;
-	cell params[CALLFUNC_MAXPARAMS];
-};
-
-extern "C" void amxx_DynaInit(void *ptr);
-extern "C" void amxx_DynaMake(char *buffer, int id);
-extern "C" int amxx_DynaFunc(AMX *amx, cell *params);
-extern "C" int amxx_DynaCodesize();
-
-AMX_NATIVE_INFO *BuildNativeTable();
-void ClearPluginLibraries();
-
-//I couldn't resist :)
-extern AMX_NATIVE_INFO g_NativeNatives[];
-
-#endif //_INCLUDE_NATIVES_H

amxmodx/newmenus.cpp

@@ -1,954 +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 "newmenus.h"
-
-CVector<Menu *> g_NewMenus;
-CStack<int> g_MenuFreeStack;
-
-void ClearMenus()
-{
-	for (size_t i = 0; i < g_NewMenus.size(); i++)
-	{
-		delete g_NewMenus[i];
-	}
-	
-	g_NewMenus.clear();
-	while (!g_MenuFreeStack.empty())
-	{
-		g_MenuFreeStack.pop();
-	}
-}
-
-void validate_menu_text(char *str)
-{
-	if (!g_coloredmenus)
-	{
-		size_t offs = 0;
-		while (*str)
-		{
-			if (*str == '\\')
-			{
-				str++;
-				char c = tolower(*str);
-				if (c == 'r' || c == 'w'
-					|| c== 'w' || c == 'd')
-				{
-					str++;
-					offs += 2;
-					continue;
-				}
-			}
-			if (offs)
-			{
-				*(str-offs) = *str;
-			}
-			str++;
-		}
-		if (offs)
-		{
-			*(str-offs) = '\0';
-		}
-	}
-}
-
-Menu::Menu(const char *title, int mid, int tid)
-{
-	m_Title.assign(title);
-	menuId = mid;
-	thisId = tid;
-
-	m_OptNames[abs(MENU_BACK)].assign("Back");
-	m_OptNames[abs(MENU_MORE)].assign("More");
-	m_OptNames[abs(MENU_EXIT)].assign("Exit");
-
-	m_OptOrders[0] = MENU_BACK;
-	m_OptOrders[1] = MENU_MORE;
-	m_OptOrders[2] = MENU_EXIT;
-
-	m_AlwaysExit = false;
-	m_NeverExit = false;
-	m_AutoColors = g_coloredmenus;
-
-	items_per_page = 7;
-	func = 0;
-	padding = 0;
-	isDestroying = false;
-}
-
-Menu::~Menu()
-{
-	for (size_t i = 0; i < m_Items.size(); i++)
-	{
-		delete m_Items[i];
-	}
-
-	unregisterSPForward(this->func);
-	
-	m_Items.clear();
-}
-
-menuitem *Menu::AddItem(const char *name, const char *cmd, int access)
-{
-	menuitem *pItem = new menuitem;
-
-	pItem->name.assign(name);
-	pItem->cmd.assign(cmd);
-	pItem->access = access;
-	pItem->id = m_Items.size();
-	pItem->handler = -1;
-	pItem->pfn = NULL;
-
-	m_Items.push_back(pItem);
-
-	return pItem;
-}
-
-menuitem *Menu::GetMenuItem(item_t item)
-{
-	if (item >= m_Items.size())
-		return NULL;
-
-	return m_Items[item];
-}
-
-size_t Menu::GetItemCount()
-{
-	return m_Items.size();
-}
-
-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));
-}
-
-int Menu::PagekeyToItem(page_t page, item_t key)
-{
-	size_t start = page * items_per_page;
-	size_t num_pages = GetPageCount();
-
-	if (num_pages == 1 || !items_per_page)
-	{
-		if (key > m_Items.size())
-			return MENU_EXIT;
-		else
-			return key-1;
-	} else {
-		//first page
-		if (page == 0)
-		{
-			/* The algorithm for spaces here is same as a middle page. */
-			item_t new_key = key;
-			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
-			{
-				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
-				{
-					if (m_Items[i]->blanks[j] == 1)
-					{
-						if (!new_key)
-						{
-							break;
-						}
-						new_key--;
-					}
-					if (!new_key)
-					{
-						break;
-					}
-				}
-			}
-			key = new_key;
-			if (key == items_per_page + 1)
-			{
-				return MENU_MORE;
-			} else if (key == items_per_page + 2) {
-				return MENU_EXIT;
-			} else {
-				return (start + key - 1);
-			}
-		} else if (page == num_pages - 1) {
-			//last page
-			size_t remaining = m_Items.size() - start;
-			/* We have to add one remaining for each "bumping" space */
-			for (size_t i=m_Items.size() - remaining; i<m_Items.size(); i++)
-			{
-				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
-				{
-					if (m_Items[i]->blanks[j] == 1)
-					{
-						remaining++;
-					}
-				}
-			}
-			if (key == remaining + 1)
-			{
-				return MENU_BACK;
-			} else if (key == remaining + 2) {
-				return MENU_EXIT;
-			} else {
-				return (start + key - 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+key-1) && i<m_Items.size(); i++)
-			{
-				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
-				{
-					if (m_Items[i]->blanks[j] == 1)
-					{
-						if (!new_key)
-						{
-							break;
-						}
-						new_key--;
-					}
-					if (!new_key)
-					{
-						break;
-					}
-				}
-			}
-			key = new_key;
-			if (key > items_per_page && (key-items_per_page<=3))
-			{
-				return m_OptOrders[key-items_per_page-1];
-			} else {
-				return (start + key - 1);
-			}
-		}
-	}
-}
-
-bool Menu::Display(int player, page_t page)
-{
-	int keys = 0;
-	const char *str = GetTextString(player, page, keys);
-
-	if (!str)
-		return false;
-
-	static char buffer[2048];
-	int len = _snprintf(buffer, sizeof(buffer)-1, "%s", str);
-
-	CPlayer *pPlayer = GET_PLAYER_POINTER_I(player);
-
-	pPlayer->keys = keys;
-	pPlayer->menu = menuId;
-	pPlayer->newmenu = thisId;
-	pPlayer->page = (int)page;
-
-	UTIL_ShowMenu(pPlayer->pEdict, keys, -1, buffer, len);
-
-	return true;
-}
-
-const char *Menu::GetTextString(int player, page_t page, int &keys)
-{
-	page_t pages = GetPageCount();
-	item_t numItems = GetItemCount();
-
-	if (page >= pages)
-		return NULL;
-
-	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);
-		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);
-
-	enum
-	{
-		Display_Back = (1<<0),
-		Display_Next = (1<<1),
-		Display_Exit = (1<<2),
-	};
-
-	int flags = Display_Back|Display_Next;
-	item_t start = page * items_per_page;
-	item_t end = 0;
-	if (items_per_page)
-	{
-		if (start + items_per_page >= numItems)
-		{
-			end = numItems - 1;
-			flags &= ~Display_Next;
-		} else {
-			end = 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;
-	
-	int option = 0;
-	keys = 0;
-	bool enabled = true;
-	int ret = 0;
-	int slots = 0;
-	
-	for (item_t i = start; i <= end; i++)
-	{
-		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) {
-				enabled = false;
-			}
-		}
-		
-		if (pItem->pfn)
-		{
-			ret = (pItem->pfn)(player, thisId, i);
-			if (ret == ITEM_ENABLED)
-			{
-				enabled = true;
-			} else if (ret == ITEM_DISABLED) {
-				enabled = false;
-			}
-		}
-		
-		if (enabled)
-		{
-			keys |= (1<<option);
-			if (m_AutoColors) 
-			{
-				_snprintf(buffer, sizeof(buffer)-1, "\\r%d.\\w %s\n", ++option, pItem->name.c_str());
-			} else {
-				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
-			}
-		} else {
-			if (m_AutoColors)
-			{
-				_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++;
-
-		m_Text.append(buffer);
-
-		//attach blanks
-		if (pItem->blanks.size())
-		{
-			for (size_t j=0; j<pItem->blanks.size(); j++)
-			{
-				if (pItem->blanks[j] == 1)
-				{
-					option++;
-				}
-				m_Text.append("\n");
-				slots++;
-			}
-		}
-	}
-
-	if (padding == 1 && items_per_page)
-	{
-		int pad = items_per_page;
-		if (flags & Display_Back)
-		{
-			pad--;
-		}
-		if (flags & Display_Next)
-		{
-			pad--;
-		}
-		if (flags & Display_Exit)
-		{
-			pad--;
-		}
-		for (int i=slots+1; i<=pad; i++)
-		{
-			m_Text.append("\n");
-			option++;
-		}
-	}
-
-	for (int i=0; i<3; i++)
-	{
-		switch (m_OptOrders[i])
-		{
-		case MENU_BACK:
-			{
-				if (flags & Display_Back)
-				{
-					keys |= (1<<option++);
-					_snprintf(buffer, 
-						sizeof(buffer)-1, 
-						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						option, 
-						m_OptNames[abs(MENU_BACK)].c_str()
-						);
-					m_Text.append(buffer);
-				}
-				break;
-			}
-		case MENU_MORE:
-			{
-				if (flags & Display_Next)
-				{
-					keys |= (1<<option++);
-					_snprintf(buffer, 
-						sizeof(buffer)-1, 
-						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						option, 
-						m_OptNames[abs(MENU_MORE)].c_str()
-						);
-					m_Text.append(buffer);
-				}
-				break;
-			}
-		case MENU_EXIT:
-			{
-				if (flags & Display_Exit)
-				{
-					keys |= (1<<option++);
-					_snprintf(buffer, 
-						sizeof(buffer)-1, 
-						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
-						option, 
-						m_OptNames[abs(MENU_EXIT)].c_str()
-						);
-					m_Text.append(buffer);
-				}
-				break;
-			}
-		}
-	}
-	
-	return m_Text.c_str();
-}
-
-#define GETMENU(p) if (p >= (int)g_NewMenus.size() || p < 0 || !g_NewMenus[p] || g_NewMenus[p]->isDestroying) { \
-	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.size()); \
-	return 0; } \
-	Menu *pMenu = g_NewMenus[p];
-
-//Makes a new menu handle (-1 for failure)
-//native csdm_makemenu(title[]);
-static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
-{
-	int len;
-	char *title = get_amxstring(amx, params[1], 0, len);
-	validate_menu_text(title);
-	char *handler = get_amxstring(amx, params[2], 1, len);
-
-	int func = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
-	
-	if (func == -1)
-	{
-		LogError(amx, AMX_ERR_NOTFOUND, "Invalid function \"%s\"", handler);
-		return 0;
-	}
-
-	int id = g_menucmds.registerMenuId(title, amx);
-	g_menucmds.registerMenuCmd(g_plugins.findPluginFast(amx), id, 1023, func);
-
-	Menu *pMenu = new Menu(title, id, 0);
-
-	pMenu->func = func;
-
-	if (g_MenuFreeStack.empty())
-	{
-		g_NewMenus.push_back(pMenu);
-		pMenu->thisId = (int)g_NewMenus.size() - 1;
-		return (int)g_NewMenus.size() - 1;
-	} else {
-		int pos = g_MenuFreeStack.front();
-		g_MenuFreeStack.pop();
-		g_NewMenus[pos] = pMenu;
-		pMenu->thisId = pos;
-		return pos;
-	}
-}
-
-static cell AMX_NATIVE_CALL menu_addblank(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	if (params[2] && (!pMenu->items_per_page && pMenu->GetItemCount() >= 10))
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Non-paginated menus are limited to 10 items.");
-		return 0;
-	}
-
-	if (!pMenu->m_Items.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Blanks can only be added after items.");
-		return 0;
-	}
-
-	menuitem *item = pMenu->m_Items[pMenu->m_Items.size() - 1];
-	item->blanks.push_back(params[2]);
-
-	return 1;
-}
-
-//Adds an item to the menu (returns current item count - 1)
-//native menu_additem(menu, const name[], const command[]="", access=0);
-static cell AMX_NATIVE_CALL menu_additem(AMX *amx, cell *params)
-{
-	int len;
-	char *name, *cmd;
-	int access;
-
-	GETMENU(params[1]);
-
-	if (!pMenu->items_per_page && pMenu->GetItemCount() >= 10)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Non-paginated menus are limited to 10 items.");
-		return 0;
-	}
-
-	name = get_amxstring(amx, params[2], 0, len);
-	validate_menu_text(name);
-	cmd = get_amxstring(amx, params[3], 1, len);
-	access = params[4];
-
-	menuitem *pItem = pMenu->AddItem(name, cmd, access);
-
-	pItem->handler = params[5];
-
-	return 1;
-}
-
-//Returns the number of pages in a menu
-//native csdm_menu_pages(menu);
-static cell AMX_NATIVE_CALL menu_pages(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-	return pMenu->GetPageCount();
-}
-
-//Returns the number of items in a menu
-//native csdm_menu_items(menu);
-static cell AMX_NATIVE_CALL menu_items(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	return pMenu->GetItemCount();
-}
-
-//Builds the menu string for a specific page (set title to 0 to not include title)
-//page indices start at 0!
-static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
-{
-	GETMENU(params[2]);
-	
-	int player = params[1];
-	int page = params[3];
-	CPlayer* pPlayer = GET_PLAYER_POINTER_I(player);
-	
-	// This will set the expire time of the menu to infinite
-	pPlayer->menuexpire = INFINITE;
-
-	return pMenu->Display(player, page);
-}
-
-//Finds the id of a menu item for a specific page and key value.
-//Note that key should be from 0-6, as it only displays 7 per page.
-//page indices start at 0
-//native menu_keyid(menu, page, key);
-static cell AMX_NATIVE_CALL menu_find_id(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	page_t page = static_cast<page_t>(params[2]);
-	item_t key = static_cast<item_t>(params[3]);
-
-	return pMenu->PagekeyToItem(page, key);
-}
-
-//Gets info about a menu option
-//native menu_item_getinfo(menu, item, &access, command[], cmdlen, name[]="", namelen=0, &callback);
-static cell AMX_NATIVE_CALL menu_item_getinfo(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-	if (!pItem)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[3]);
-	addr[0] = pItem->access;
-
-	set_amxstring(amx, params[4], pItem->cmd.c_str(), params[5]);
-	set_amxstring(amx, params[6], pItem->name.c_str(), params[7]);
-
-	if (params[8])
-	{
-		addr = get_amxaddr(amx, params[8]);
-		if (addr)
-			addr[0] = pItem->handler;
-	}
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_makecallback(AMX *amx, cell *params)
-{
-	int len;
-	char *name = get_amxstring(amx, params[1], 0, len);
-
-	int id = registerSPForwardByName(amx, name, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
-
-	if (id == -1)
-	{
-		LogError(amx, AMX_ERR_NOTFOUND, "Invalid function %s", name);
-		return -1;
-	}
-
-	return id;
-}
-
-static cell AMX_NATIVE_CALL menu_item_setname(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-	if (!pItem)
-		return 0;
-
-	int len;
-	char *name;
-
-	name = get_amxstring(amx, params[3], 0, len);
-
-	pItem->name.assign(name);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_item_setcmd(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-	if (!pItem)
-		return 0;
-
-	int len;
-	char *cmd;
-
-	cmd = get_amxstring(amx, params[3], 0, len);
-
-	pItem->cmd.assign(cmd);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_item_setcall(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-	if (!pItem)
-		return 0;
-
-	pItem->handler = params[3];
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	int len = params[0] / sizeof(cell);
-	if (len < 3)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Expected 3 parameters");
-		return 0;
-	}
-
-	switch (params[2])
-	{
-	case MPROP_PERPAGE:
-		{
-			cell count = *get_amxaddr(amx, params[3]);
-			if (count < 0 || count > 7)
-			{
-				LogError(amx, AMX_ERR_NATIVE, "Cannot set %d items per page", count);
-				return 0;
-			}
-			pMenu->items_per_page = count;
-			break;
-		}
-	case MPROP_BACKNAME:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			validate_menu_text(str);
-			pMenu->m_OptNames[abs(MENU_BACK)].assign(str);
-			break;
-		}
-	case MPROP_NEXTNAME:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			validate_menu_text(str);
-			pMenu->m_OptNames[abs(MENU_MORE)].assign(str);
-			break;
-		}
-	case MPROP_EXITNAME:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			validate_menu_text(str);
-			pMenu->m_OptNames[abs(MENU_EXIT)].assign(str);
-			break;
-		}
-	case MPROP_TITLE:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			int old = pMenu->menuId;
-			g_menucmds.removeMenuId(old);
-			pMenu->m_Title.assign(str);
-			pMenu->menuId = g_menucmds.registerMenuId(str, amx);
-			g_menucmds.registerMenuCmd(
-				g_plugins.findPluginFast(amx),
-				pMenu->menuId,
-				1023,
-				pMenu->func);
-			CPlayer *pl;
-			/**
-			 * NOTE - this is actually bogus
-			 *  the client's screen won't actually match the cmd here 
-			 *  I think, this scenario needs to be tested. 
-			 */
-			for (int i=1; i<=gpGlobals->maxClients; i++)
-			{
-				pl = GET_PLAYER_POINTER_I(i);
-				if (pl->menu == old)
-					pl->menu = pMenu->menuId;
-			}
-			break;
-		}
-	case MPROP_EXITALL:
-		{
-			cell ans = *get_amxaddr(amx, params[3]);
-			if (ans == 1)
-			{
-				pMenu->m_AlwaysExit = true;
-				pMenu->m_NeverExit = false;
-			} else if (ans == 0) {
-				pMenu->m_AlwaysExit = false;
-				pMenu->m_NeverExit = false;
-			} else if (ans == -1) {
-				pMenu->m_NeverExit = true;
-				pMenu->m_AlwaysExit = false;
-			}
-			break;
-		}
-	case MPROP_ORDER:
-		{
-			cell *addr = get_amxaddr(amx, params[3]);
-			pMenu->m_OptOrders[0] = addr[0];
-			pMenu->m_OptOrders[1] = addr[1];
-			pMenu->m_OptOrders[2] = addr[2];
-			break;
-		}
-	case MPROP_NOCOLORS:
-		{
-			pMenu->m_AutoColors = *get_amxaddr(amx, params[3]) ? true : false;
-			break;
-		}
-	case MPROP_PADMENU:
-		{
-			pMenu->padding = *get_amxaddr(amx, params[3]);
-			break;
-		}
-	default:
-		{
-			LogError(amx, AMX_ERR_NATIVE, "Invalid menu setting: %d", params[1]);
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-#define GETMENU_R(p) if (p >= (int)g_NewMenus.size() || p < 0 || !g_NewMenus[p]) { \
-	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.size()); \
-	return 0; } \
-	Menu *pMenu = g_NewMenus[p];
-
-static cell AMX_NATIVE_CALL menu_cancel(AMX *amx, cell *params)
-{
-	int index = params[1];
-
-	if (index < 1 || index > gpGlobals->maxClients)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Player %d is not valid", index);
-		return 0;
-	}
-
-	CPlayer *player = GET_PLAYER_POINTER_I(index);
-	if (!player->ingame)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Played %d is not in game", index);
-		return 0;
-	}
-
-	int menu = player->newmenu;
-	if (menu < 0 || menu >= (int)g_NewMenus.size() || !g_NewMenus[menu])
-		return 0;
-
-	Menu *pMenu = g_NewMenus[menu];
-
-	player->newmenu = -1;
-	player->menu = 0;
-	executeForwards(pMenu->func, 
-		static_cast<cell>(index),
-		static_cast<cell>(pMenu->thisId),
-		static_cast<cell>(MENU_EXIT));
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_destroy(AMX *amx, cell *params)
-{
-	GETMENU_R(params[1]);
-
-	if (pMenu->isDestroying)
-		return 0;	//prevent infinite recursion
-
-	pMenu->isDestroying = true;
-	g_menucmds.removeMenuId(pMenu->menuId);
-	CPlayer *player;
-	for (int i=1; i<=gpGlobals->maxClients; i++)
-	{
-		player = GET_PLAYER_POINTER_I(i);
-		if (player->newmenu == pMenu->thisId)
-		{
-			player->newmenu = -1;
-			player->menu = 0;
-			executeForwards(pMenu->func, 
-				static_cast<cell>(i), 
-				static_cast<cell>(pMenu->thisId),
-				static_cast<cell>(MENU_EXIT));
-		}
-	}
-	g_NewMenus[params[1]] = NULL;
-	delete pMenu;
-	g_MenuFreeStack.push(params[1]);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL player_menu_info(AMX *amx, cell *params)
-{
-	if (params[1] < 1 || params[1] > gpGlobals->maxClients)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid player id %d", params[1]);
-		return 0;
-	}
-
-	CPlayer *player = GET_PLAYER_POINTER_I(params[1]);
-	if (!player->ingame)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Player %d is not ingame", params[1]);
-		return 0;
-	}
-
-	cell *m = get_amxaddr(amx, params[2]);
-	cell *n = get_amxaddr(amx, params[3]);
-
-	*m = player->menu;
-	*n = player->newmenu;
-
-	if ( (*m != 0 && *m != -1) || (*n != -1))
-		return 1;
-
-	return 0;
-}
-
-AMX_NATIVE_INFO g_NewMenuNatives[] = 
-{
-	{"menu_create",				menu_create},
-	{"menu_additem",			menu_additem},
-	{"menu_addblank",			menu_addblank},
-	{"menu_pages",				menu_pages},
-	{"menu_items",				menu_items},
-	{"menu_display",			menu_display},
-	{"menu_find_id",			menu_find_id},
-	{"menu_item_getinfo",		menu_item_getinfo},
-	{"menu_makecallback",		menu_makecallback},
-	{"menu_item_setcall",		menu_item_setcall},
-	{"menu_item_setcmd",		menu_item_setcmd},
-	{"menu_item_setname",		menu_item_setname},
-	{"menu_destroy",			menu_destroy},
-	{"menu_setprop",			menu_setprop},
-	{"menu_cancel",				menu_cancel},
-	{"player_menu_info",		player_menu_info},
-	{NULL,						NULL},
-};

amxmodx/newmenus.h

@@ -1,115 +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_NEWMENUS_H
-#define _INCLUDE_NEWMENUS_H
-
-#define	MENU_EXIT		-3
-#define	MENU_BACK		-2
-#define	MENU_MORE		-1
-#define	ITEM_IGNORE		0
-#define	ITEM_ENABLED	1
-#define ITEM_DISABLED	2
-
-
-#define MPROP_PERPAGE	1
-#define MPROP_BACKNAME	2
-#define MPROP_NEXTNAME	3
-#define MPROP_EXITNAME	4
-#define MPROP_TITLE		5
-#define MPROP_EXITALL	6
-#define MPROP_ORDER		7
-#define MPROP_NOCOLORS	8
-#define MPROP_PADMENU	9
-
-typedef int (*MENUITEM_CALLBACK)(int, int, int);
-
-struct menuitem
-{
-	String name;
-	String cmd;
-	
-	int access;
-	int handler;
-	
-	MENUITEM_CALLBACK pfn;
-	size_t id;
-
-	CVector<int> blanks;
-};
-
-typedef unsigned int menu_t;
-typedef unsigned int item_t;
-typedef unsigned int page_t;
-
-class Menu
-{
-public:
-	Menu(const char *title, int menuId, int thisId);
-	~Menu();
-	
-	menuitem *GetMenuItem(item_t item);
-	size_t GetPageCount();
-	size_t GetItemCount();
-	menuitem *AddItem(const char *name, const char *cmd, int access);
-	
-	const char *GetTextString(int player, page_t page, int &keys);
-	bool Display(int player, page_t page);
-	
-	int PagekeyToItem(page_t page, item_t key);
-	int GetMenuMenuid();
-public:
-	CVector<menuitem * > m_Items;
-	String m_Title;
-	String m_Text;
-
-	String m_OptNames[4];
-	int m_OptOrders[3];
-
-	bool m_AlwaysExit;
-	bool m_NeverExit;
-	bool m_AutoColors;
-	
-	int menuId;
-	int thisId;
-	int func;
-	int padding;
-	bool isDestroying;
-public:
-	unsigned int items_per_page;
-};
-
-void ClearMenus();
-
-extern CVector<Menu *> g_NewMenus;
-extern AMX_NATIVE_INFO g_NewMenuNatives[];
-
-#endif //_INCLUDE_NEWMENUS_H

amxmodx/optimizer.cpp

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

amxmodx/optimizer.h

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

amxmodx/power.cpp

@@ -6,7 +6,6 @@
  *  This file may be freely used. No warranties of any kind.
  */
 
-#include <stdlib.h>
 // this file does not include amxmodx.h, so we have to include the memory manager here
 #ifdef MEMORY_TEST
 #include "mmgr/mmgr.h"

amxmodx/sclinux.h

@@ -20,13 +20,6 @@
 #define	stricmp(a,b)    strcasecmp(a,b)
 #define	strnicmp(a,b,c) strncasecmp(a,b,c)
 
-#if defined __linux__  && !defined _snprintf 
-#define _snprintf snprintf
-#endif 
-#if defined __linux__  && !defined _vsnprintf
-//#define _vsnprintf vsnprintf
-#endif
-
 /*
  * WinWorld wants '\'. Unices do not.
  */

amxmodx/sdk/amxxmodule.cpp

@@ -45,13 +45,6 @@
 enginefuncs_t g_engfuncs;
 globalvars_t  *gpGlobals;
 
-DLL_FUNCTIONS *g_pFunctionTable;
-DLL_FUNCTIONS *g_pFunctionTable_Post;
-enginefuncs_t *g_pengfuncsTable;
-enginefuncs_t *g_pengfuncsTable_Post;
-NEW_DLL_FUNCTIONS *g_pNewFunctionsTable;
-NEW_DLL_FUNCTIONS *g_pNewFunctionsTable_Post;
-
 // GetEntityAPI2 functions
 static DLL_FUNCTIONS g_EntityAPI_Table = 
 {
@@ -2121,7 +2114,6 @@ C_DLLEXPORT int GetEntityAPI2(DLL_FUNCTIONS *pFunctionTable, int *interfaceVersi
 		return(FALSE);
 	}
 	memcpy(pFunctionTable, &g_EntityAPI_Table, sizeof(DLL_FUNCTIONS));
-	g_pFunctionTable=pFunctionTable;
 	return(TRUE);
 }
 
@@ -2139,7 +2131,7 @@ C_DLLEXPORT int GetEntityAPI2_Post(DLL_FUNCTIONS *pFunctionTable, int *interface
 		return(FALSE);
 	}
 	memcpy( pFunctionTable, &g_EntityAPI_Post_Table, sizeof( DLL_FUNCTIONS ) );
-	g_pFunctionTable_Post=pFunctionTable;
+
 	return(TRUE);
 }
 
@@ -2162,7 +2154,6 @@ C_DLLEXPORT int GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
 		return(FALSE);
 	}
 	memcpy(pengfuncsFromEngine, &g_EngineFuncs_Table, sizeof(enginefuncs_t));
-	g_pengfuncsTable=pengfuncsFromEngine;
 	return TRUE;
 }
 
@@ -2180,7 +2171,6 @@ C_DLLEXPORT int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine, int
 		return(FALSE);
 	}
 	memcpy(pengfuncsFromEngine, &g_EngineFuncs_Post_Table, sizeof(enginefuncs_t));
-	g_pengfuncsTable_Post=pengfuncsFromEngine;
 	return TRUE;
 
 }
@@ -2205,7 +2195,6 @@ C_DLLEXPORT int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable,
 		return(FALSE);
 	}
 	memcpy(pNewFunctionTable, &g_NewFuncs_Table, sizeof(NEW_DLL_FUNCTIONS));
-	g_pNewFunctionsTable=pNewFunctionTable;
 	return TRUE;
 }
 
@@ -2223,7 +2212,6 @@ C_DLLEXPORT int GetNewDLLFunctions_Post( NEW_DLL_FUNCTIONS *pNewFunctionTable, i
 		return(FALSE);
 	}
 	memcpy(pNewFunctionTable, &g_NewFuncs_Post_Table, sizeof(NEW_DLL_FUNCTIONS));
-	g_pNewFunctionsTable_Post=pNewFunctionTable;
 	return TRUE;
 }
 
@@ -2418,6 +2406,9 @@ C_DLLEXPORT void __stdcall GiveFnptrsToDll( enginefuncs_t* pengfuncsFromEngine,
 
 /************* AMXX Stuff *************/
 
+// *** Types ***
+typedef void* (*PFN_REQ_FNPTR)(const char * /*name*/);
+
 // *** Globals ***
 // Module info
 static amxx_module_info_s g_ModuleInfo = 
@@ -2426,20 +2417,15 @@ static amxx_module_info_s g_ModuleInfo =
 	MODULE_AUTHOR,
 	MODULE_VERSION,
 #ifdef MODULE_RELOAD_ON_MAPCHANGE
-	1,
+	1
 #else // MODULE_RELOAD_ON_MAPCHANGE
-	0,
+	0
 #endif // MODULE_RELOAD_ON_MAPCHANGE
-	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;
 PFN_PRINT_SRVCONSOLE		g_fn_PrintSrvConsole;
 PFN_GET_MODNAME				g_fn_GetModname;
@@ -2453,14 +2439,11 @@ PFN_GET_AMXSTRINGLEN		g_fn_GetAmxStringLen;
 PFN_FORMAT_AMXSTRING		g_fn_FormatAmxString;
 PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 PFN_LOG						g_fn_Log;
-PFN_LOG_ERROR				g_fn_LogErrorFunc;
 PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 PFN_REGISTER_FORWARD		g_fn_RegisterForward;
 PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
 PFN_PREPARE_CELLARRAY		g_fn_PrepareCellArray;
 PFN_PREPARE_CHARARRAY		g_fn_PrepareCharArray;
-PFN_PREPARE_CELLARRAY_A		g_fn_PrepareCellArrayA;
-PFN_PREPARE_CHARARRAY_A		g_fn_PrepareCharArrayA;
 PFN_IS_PLAYER_VALID			g_fn_IsPlayerValid;
 PFN_GET_PLAYER_NAME			g_fn_GetPlayerName;
 PFN_GET_PLAYER_IP			g_fn_GetPlayerIP;
@@ -2470,7 +2453,6 @@ PFN_IS_PLAYER_AUTHORIZED	g_fn_IsPlayerAuthorized;
 PFN_GET_PLAYER_TIME			g_fn_GetPlayerTime;
 PFN_GET_PLAYER_PLAYTIME		g_fn_GetPlayerPlayTime;
 PFN_GET_PLAYER_CURWEAPON	g_fn_GetPlayerCurweapon;
-PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 PFN_GET_PLAYER_TEAMID		g_fn_GetPlayerTeamID;
 PFN_GET_PLAYER_DEATHS		g_fn_GetPlayerDeaths;
 PFN_GET_PLAYER_MENU			g_fn_GetPlayerMenu;
@@ -2481,11 +2463,9 @@ PFN_IS_PLAYER_CONNECTING	g_fn_IsPlayerConnecting;
 PFN_IS_PLAYER_HLTV			g_fn_IsPlayerHLTV;
 PFN_GET_PLAYER_ARMOR		g_fn_GetPlayerArmor;
 PFN_GET_PLAYER_HEALTH		g_fn_GetPlayerHealth;
-#ifdef MEMORY_TEST
 PFN_ALLOCATOR				g_fn_Allocator;
 PFN_REALLOCATOR				g_fn_Reallocator;
 PFN_DEALLOCATOR				g_fn_Deallocator;
-#endif
 PFN_AMX_EXEC				g_fn_AmxExec;
 PFN_AMX_EXECV				g_fn_AmxExecv;
 PFN_AMX_ALLOT				g_fn_AmxAllot;
@@ -2499,24 +2479,6 @@ PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 PFN_UNREGISTER_SPFORWARD	g_fn_UnregisterSPForward;
 PFN_MERGEDEFINITION_FILE	g_fn_MergeDefinition_File;
 PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-PFN_GETPLAYERFLAGS			g_fn_GetPlayerFlags;
-PFN_GET_PLAYER_EDICT		g_fn_GetPlayerEdict;
-PFN_FORMAT					g_fn_Format;
-PFN_REGISTERFUNCTION		g_fn_RegisterFunction;
-PFN_REQ_FNPTR				g_fn_RequestFunction;
-PFN_AMX_PUSH				g_fn_AmxPush;
-PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
-PFN_PLAYER_PROP_ADDR		g_fn_PlayerPropAddr;
-PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
-PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
-PFN_FINDLIBRARY				g_fn_FindLibrary;
-PFN_ADDLIBRARIES			g_fn_AddLibraries;
-PFN_REMOVELIBRARIES			g_fn_RemoveLibraries;
-PFN_OVERRIDENATIVES			g_fn_OverrideNatives;
-PFN_GETLOCALINFO			g_fn_GetLocalInfo;
-PFN_AMX_REREGISTER			g_fn_AmxReRegister;
-PFN_REGISTERFUNCTIONEX		g_fn_RegisterFunctionEx;
-PFN_MESSAGE_BLOCK			g_fn_MessageBlock;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2554,20 +2516,13 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	if (!reqFnptrFunc)
 		return AMXX_PARAM;
 
-	g_fn_RequestFunction = reqFnptrFunc;
-
 	// Req all known functions
 	// Misc
 	REQFUNC("BuildPathname", g_fn_BuildPathname, PFN_BUILD_PATHNAME);
-	REQFUNC("BuildPathnameR", g_fn_BuildPathnameR, PFN_BUILD_PATHNAME_R);
 	REQFUNC("PrintSrvConsole", g_fn_PrintSrvConsole, PFN_PRINT_SRVCONSOLE);
 	REQFUNC("GetModname", g_fn_GetModname, PFN_GET_MODNAME);
 	REQFUNC("Log", g_fn_Log, PFN_LOG);
-	REQFUNC("LogError", g_fn_LogErrorFunc, PFN_LOG_ERROR);
 	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);
@@ -2575,7 +2530,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("FindAmxScriptByName", g_fn_FindAmxScriptByName, PFN_FIND_AMXSCRIPT_BYNAME);
 	REQFUNC("LoadAmxScript", g_fn_LoadAmxScript, PFN_LOAD_AMXSCRIPT);
 	REQFUNC("UnloadAmxScript", g_fn_UnloadAmxScript, PFN_UNLOAD_AMXSCRIPT);
-    REQFUNC("GetAmxScriptName", g_fn_GetAmxScriptName, PFN_GET_AMXSCRIPTNAME);
 
 	// String / mem in amx scripts support
 	REQFUNC("SetAmxString", g_fn_SetAmxString, PFN_SET_AMXSTRING);
@@ -2593,7 +2547,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);
@@ -2602,8 +2555,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("ExecuteForward", g_fn_ExecuteForward, PFN_EXECUTE_FORWARD);
 	REQFUNC("PrepareCellArray", g_fn_PrepareCellArray, PFN_PREPARE_CELLARRAY);
 	REQFUNC("PrepareCharArray", g_fn_PrepareCharArray, PFN_PREPARE_CHARARRAY);
-	REQFUNC("PrepareCellArrayA", g_fn_PrepareCellArrayA, PFN_PREPARE_CELLARRAY_A);
-	REQFUNC("PrepareCharArrayA", g_fn_PrepareCharArrayA, PFN_PREPARE_CHARARRAY_A);
+
 	// Player
 	REQFUNC("IsPlayerValid", g_fn_IsPlayerValid, PFN_IS_PLAYER_VALID);
 	REQFUNC("GetPlayerName", g_fn_GetPlayerName, PFN_GET_PLAYER_NAME);
@@ -2615,7 +2567,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("GetPlayerPlayTime", g_fn_GetPlayerPlayTime, PFN_GET_PLAYER_PLAYTIME);
 	REQFUNC("GetPlayerCurweapon", g_fn_GetPlayerCurweapon, PFN_GET_PLAYER_CURWEAPON);
 	REQFUNC("GetPlayerTeamID", g_fn_GetPlayerTeamID, PFN_GET_PLAYER_TEAMID);
-	REQFUNC("GetPlayerTeam",g_fn_GetPlayerTeam, PFN_GET_PLAYER_TEAM);
 	REQFUNC("GetPlayerDeaths", g_fn_GetPlayerDeaths, PFN_GET_PLAYER_DEATHS);
 	REQFUNC("GetPlayerMenu", g_fn_GetPlayerMenu, PFN_GET_PLAYER_MENU);
 	REQFUNC("GetPlayerKeys", g_fn_GetPlayerKeys, PFN_GET_PLAYER_KEYS);
@@ -2625,30 +2576,11 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("IsPlayerHLTV", g_fn_IsPlayerHLTV, PFN_IS_PLAYER_HLTV);
 	REQFUNC("GetPlayerArmor", g_fn_GetPlayerArmor, PFN_GET_PLAYER_ARMOR);
 	REQFUNC("GetPlayerHealth", g_fn_GetPlayerHealth, PFN_GET_PLAYER_HEALTH);
-	REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS);
-	REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT);
-	REQFUNC("amx_Push", g_fn_AmxPush, PFN_AMX_PUSH);
-	REQFUNC("SetPlayerTeamInfo", g_fn_SetTeamInfo, PFN_SET_TEAM_INFO);
-	REQFUNC("PlayerPropAddr", g_fn_PlayerPropAddr, PFN_PLAYER_PROP_ADDR);
-	REQFUNC("RegAuthFunc", g_fn_RegAuthFunc, PFN_REG_AUTH_FUNC);
-	REQFUNC("UnregAuthFunc", g_fn_UnregAuthFunc, PFN_UNREG_AUTH_FUNC);
 
-	//Added in 1.75 
-	REQFUNC("FindLibrary", g_fn_FindLibrary, PFN_FINDLIBRARY);
-	REQFUNC("AddLibraries", g_fn_AddLibraries, PFN_ADDLIBRARIES);
-	REQFUNC("RemoveLibraries", g_fn_RemoveLibraries, PFN_REMOVELIBRARIES);
-	REQFUNC("OverrideNatives", g_fn_OverrideNatives, PFN_OVERRIDENATIVES);
-	REQFUNC("GetLocalInfo", g_fn_GetLocalInfo, PFN_GETLOCALINFO);
-	REQFUNC("AmxReregister", g_fn_AmxReRegister, PFN_AMX_REREGISTER);
-
-	REQFUNC("MessageBlock", g_fn_MessageBlock, PFN_MESSAGE_BLOCK);
-
-#ifdef MEMORY_TEST
 	// Memory
 	REQFUNC_OPT("Allocator", g_fn_Allocator, PFN_ALLOCATOR);
 	REQFUNC_OPT("Reallocator", g_fn_Reallocator, PFN_REALLOCATOR);
 	REQFUNC_OPT("Deallocator", g_fn_Deallocator, PFN_DEALLOCATOR);
-#endif
 
 	REQFUNC("CellToReal", g_fn_CellToReal, PFN_CELL_TO_REAL);
 	REQFUNC("RealToCell", g_fn_RealToCell, PFN_REAL_TO_CELL);
@@ -2677,41 +2609,17 @@ 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);
-}
-
-void MF_LogError(AMX *amx, int err, const char *fmt, ...)
-{
-	char msg[3072];
-	va_list arglst;
-	va_start(arglst, fmt);
-	vsnprintf(msg, sizeof(msg) - 1, fmt, arglst);
-	va_end(arglst);
-
-	g_fn_LogErrorFunc(amx, err, "[%s] %s", MODULE_LOGTAG, msg);
+	g_fn_Log("[%s] %s", MODULE_NAME, msg);
 }
 
 
@@ -2721,7 +2629,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...)
 void ValidateMacros_DontCallThis_Smiley()
 {
 	MF_BuildPathname("str", "str", 0);
-	MF_BuildPathnameR(NULL, 0, "%d", 0);
 	MF_FormatAmxString(NULL, 0, 0, NULL);
 	MF_GetAmxAddr(NULL, 0);
 	MF_PrintSrvConsole("str", "str", 0);
@@ -2735,14 +2642,11 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetAmxStringLen(NULL);
 	MF_CopyAmxMemory(NULL, NULL, 0);
 	MF_Log("str", "str", 0);
-	MF_LogError(NULL, 0, NULL);
 	MF_RaiseAmxError(NULL, 0);
 	MF_RegisterForward("str", (ForwardExecType)0, 0, 0, 0);
 	MF_ExecuteForward(0, 0, 0);
 	MF_PrepareCellArray(NULL, 0);
 	MF_PrepareCharArray(NULL, 0);
-	MF_PrepareCellArrayA(NULL, 0, true);
-	MF_PrepareCharArrayA(NULL, 0, true);
 	MF_IsPlayerValid(0);
 	MF_GetPlayerName(0);
 	MF_GetPlayerIP(0);
@@ -2753,7 +2657,6 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetPlayerPlayTime(0);
 	MF_GetPlayerCurweapon(0);
 	MF_GetPlayerTeamID(0);
-	MF_GetPlayerTeam(0);
 	MF_GetPlayerDeaths(0);
 	MF_GetPlayerMenu(0);
 	MF_GetPlayerKeys(0);
@@ -2763,34 +2666,18 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_IsPlayerHLTV(0);
 	MF_GetPlayerArmor(0);
 	MF_GetPlayerHealth(0);
-	MF_AmxExec(0, 0, 0);
+	MF_AmxExec(0, 0, 0, 0);
 	MF_AmxExecv(0, 0, 0, 0, 0);
 	MF_AmxFindPublic(0, 0, 0);
 	MF_AmxAllot(0, 0, 0, 0);
-	MF_LoadAmxScript(0, 0, 0, 0, 0);
+	MF_LoadAmxScript(0, 0, 0, 0);
 	MF_UnloadAmxScript(0, 0);
 	MF_RegisterSPForward(0, 0, 0, 0, 0, 0);
 	MF_RegisterSPForwardByName(0, 0, 0, 0, 0, 0);
 	MF_UnregisterSPForward(0);
-	MF_GetPlayerFrags(0);
-	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
 
-#ifdef MEMORY_TEST
-
 /************* MEMORY *************/
 // undef all defined macros
 #undef new
@@ -2904,7 +2791,7 @@ void	*operator new(size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	*operator new[](size_t reportedSize)
@@ -2917,7 +2804,7 @@ void	*operator new[](size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 // Microsoft memory tracking operators
@@ -2931,7 +2818,7 @@ void	*operator new(size_t reportedSize, const char *sourceFile, int sourceLine)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine)
 {
@@ -2943,7 +2830,7 @@ void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	operator delete(void *reportedAddress)
@@ -2962,30 +2849,6 @@ void	operator delete[](void *reportedAddress)
 	Mem_Deallocator(g_Mem_CurrentFilename, g_Mem_CurrentLine, g_Mem_CurrentFunc, m_alloc_delete_array, reportedAddress);
 }
 
-#else
-
-#if !defined NO_ALLOC_OVERRIDES && !defined MEMORY_TEST && !defined WIN32
-void * operator new(size_t size) {
-	return(calloc(1, size)); 
-}
-
-void * operator new[](size_t size) {
-	return(calloc(1, size)); 
-}
-
-void operator delete(void * ptr) {
-	if(ptr)
-		free(ptr);
-}
-
-void operator delete[](void * ptr) {
-	if(ptr)
-		free(ptr);
-}
-#endif
-
-#endif //MEMORY_TEST
-
 /************* stuff from dlls/util.cpp *************/
 //				must come here because cbase.h declares it's own operator new
 

amxmodx/sdk/amxxmodule.h

@@ -22,7 +22,7 @@
 #ifndef __linux__
 #define DLLEXPORT __declspec(dllexport)
 #else
-#define DLLEXPORT __attribute__((visibility("default")))
+#define DLLEXPORT
 #define LINUX
 #endif
 
@@ -31,11 +31,8 @@
 
 // ***** AMXX stuff *****
 
-// 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 4
+// module interface version is 1
+#define AMXX_INTERFACE_VERSION 1
 
 // amxx module info
 struct amxx_module_info_s
@@ -44,11 +41,10 @@ struct amxx_module_info_s
 	const char *author;
 	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
 #define AMXX_OK					0			/* no error */
 #define AMXX_IFVERS				1			/* interface version */
@@ -57,26 +53,15 @@ struct amxx_module_info_s
 
 // *** Small stuff ***
 // The next section is copied from the amx.h file
-// Copyright (c) ITB CompuPhase, 1997-2005
+// Copyright (c) ITB CompuPhase, 1997-2004
 
-#if defined HAVE_STDINT_H
+#if defined __LCC__ || defined __DMC__ || defined __linux__
   #include <stdint.h>
-#else
-  #if defined __LCC__ || defined __DMC__ || defined LINUX
-    #if defined HAVE_INTTYPES_H
-      #include <inttypes.h>
-    #else
-      #include <stdint.h>
-    #endif
 #elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
   /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
    * here, these types are probably undefined.
    */
-    #if defined __MACH__
-      #include <ppc/types.h>
-      typedef unsigned short int  uint16_t;
-      typedef unsigned long int   uint32_t;
-    #elif defined __FreeBSD__
+  #if defined __FreeBSD__
     #include <inttypes.h>
   #else
     typedef short int           int16_t;
@@ -99,13 +84,7 @@ struct amxx_module_info_s
     #endif
   #endif
 #endif
-  #define HAVE_STDINT_H
-#endif
-#if defined _LP64 || defined WIN64 || defined _WIN64
-  #if !defined __64BIT__
-    #define __64BIT__
-  #endif
-#endif
+
 
 /* calling convention for native functions */
 #if !defined AMX_NATIVE_CALL
@@ -125,26 +104,24 @@ struct amxx_module_info_s
   #define AMXEXPORT
 #endif
 
-#if !defined PAWN_CELL_SIZE
-  #define PAWN_CELL_SIZE 32     /* by default, use 32-bit cells */
+
+
+#if !defined SMALL_CELL_SIZE
+  #define SMALL_CELL_SIZE 32    /* by default, use 32-bit cells */
 #endif
-#if PAWN_CELL_SIZE==16
-  typedef uint16_t  ucell;
-  typedef int16_t   cell;
-#elif PAWN_CELL_SIZE==32
+#if SMALL_CELL_SIZE==32
   typedef uint32_t  ucell;
   typedef int32_t   cell;
-#define REAL	float
-#elif PAWN_CELL_SIZE==64
+  typedef float		REAL;
+#elif SMALL_CELL_SIZE==64
   typedef uint64_t  ucell;
   typedef int64_t   cell;
-#define REAL	double
+  typedef double	REAL;
 #else
-  #error Unsupported cell size (PAWN_CELL_SIZE)
+  #error Unsupported cell size (SMALL_CELL_SIZE)
 #endif
 
 #define UNPACKEDMAX   ((1 << (sizeof(cell)-1)*8) - 1)
-#define UNLIMITED     (~1u >> 1)
 
 struct tagAMX;
 typedef cell (AMX_NATIVE_CALL *AMX_NATIVE)(struct tagAMX *amx, cell *params);
@@ -159,155 +136,24 @@ typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
   #pragma warning(disable:4103)  /* disable warning message 4103 that complains
                                   * about pragma pack in a header file */
   #pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
-
-	#if _MSC_VER >= 1400
-		#if !defined NO_MSVC8_AUTO_COMPAT
-
-			/* Disable deprecation warnings concerning unsafe CRT functions */
-			#if !defined _CRT_SECURE_NO_DEPRECATE
-				#define _CRT_SECURE_NO_DEPRECATE
-			#endif
-
-			/* Replace the POSIX function with ISO C++ conformant ones as they are now deprecated */
-			#define access _access
-			#define cabs _cabs
-			#define cgets _cgets
-			#define chdir _chdir
-			#define chmod _chmod
-			#define chsize _chsize
-			#define close _close
-			#define cprintf _cprintf
-			#define cputs _cputts
-			#define creat _creat
-			#define cscanf _cscanf
-			#define cwait _cwait
-			#define dup _dup
-			#define dup2 _dup2
-			#define ecvt _ecvt
-			#define eof _eof
-			#define execl _execl
-			#define execle _execle
-			#define execlp _execlp
-			#define execlpe _execlpe
-			#define execv _execv
-			#define execve _execv
-			#define execvp _execvp
-			#define execvpe _execvpe
-			#define fcloseall _fcloseall
-			#define fcvt _fcvt
-			#define fdopen _fdopen
-			#define fgetchar _fgetchar
-			#define filelength _filelength
-			#define fileno _fileno
-			#define flushall _flushall
-			#define fputchar _fputchar
-			#define gcvt _gcvt
-			#define getch _getch
-			#define getche _getche
-			#define getcwd _getcwd
-			#define getpid _getpid
-			#define getw _getw
-			#define hypot _hypot
-			#define inp _inp
-			#define inpw _inpw
-			#define isascii __isascii
-			#define isatty _isatty
-			#define iscsym __iscsym
-			#define iscsymf __iscsymf
-			#define itoa _itoa
-			#define j0 _j0
-			#define j1 _j1
-			#define jn _jn
-			#define kbhit _kbhit
-			#define lfind _lfind
-			#define locking _locking
-			#define lsearch _lsearch
-			#define lseek _lseek
-			#define ltoa _ltoa
-			#define memccpy _memccpy
-			#define memicmp _memicmp
-			#define mkdir _mkdir
-			#define mktemp _mktemp
-			#define open _open
-			#define outp _outp
-			#define outpw _outpw
-			#define putch _putch
-			#define putenv _putenv
-			#define putw _putw
-			#define read _read
-			#define rmdir _rmdir
-			#define rmtmp _rmtmp
-			#define setmode _setmode
-			#define sopen _sopen
-			#define spawnl _spawnl
-			#define spawnle _spawnle
-			#define spawnlp _spawnlp
-			#define spawnlpe _spawnlpe
-			#define spawnv _spawnv
-			#define spawnve _spawnve
-			#define spawnvp _spawnvp
-			#define spawnvpe _spawnvpe
-			#define strcmpi _strcmpi
-			#define strdup _strdup
-			#define stricmp _stricmp
-			#define strlwr _strlwr
-			#define strnicmp _strnicmp
-			#define strnset _strnset
-			#define strrev _strrev
-			#define strset _strset
-			#define strupr _strupr
-			#define swab _swab
-			#define tell _tell
-			#define tempnam _tempnam
-			#define toascii __toascii
-			#define tzset _tzset
-			#define ultoa _ultoa
-			#define umask _umask
-			#define ungetch _ungetch
-			#define unlink _unlink
-			#define wcsdup _wcsdup
-			#define wcsicmp _wcsicmp
-			#define wcsicoll _wcsicoll
-			#define wcslwr _wcslwr
-			#define wcsnicmp _wcsnicmp
-			#define wcsnset _wcsnset
-			#define wcsrev _wcsrev
-			#define wcsset _wcsset
-			#define wcsupr _wcsupr
-			#define write _write
-			#define y0 _y0
-			#define y1 _y1
-			#define yn _yn
-
-			/* Disable deprecation warnings because MSVC8 seemingly thinks the ISO C++ conformant 
-			 * functions above are deprecated. */
-			#pragma warning (disable:4996)
-				
-		#endif
-	#else
-		#define vsnprintf _vsnprintf
-	#endif
 #endif
 
 
-/* Some compilers do not support the #pragma align, which should be fine. Some
- * compilers give a warning on unknown #pragmas, which is not so fine...
- */
-#if (defined SN_TARGET_PS2 || defined __GNUC__) && !defined AMX_NO_ALIGN
+#if defined SN_TARGET_PS2 || defined __GNUC__
   #define AMX_NO_ALIGN
 #endif
 
+
 #if defined __GNUC__
   #define PACKED        __attribute__((packed))
 #else
   #define PACKED
 #endif
 
+
 #if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
+  #if defined __linux__
     #pragma pack(1)         /* structures must be packed (byte-aligned) */
-  #elif defined MACOS && defined __MWERKS__
-	#pragma options align=mac68k
   #else
     #pragma pack(push)
     #pragma pack(1)         /* structures must be packed (byte-aligned) */
@@ -328,7 +174,7 @@ typedef struct {
  * fields are valid at all times; many fields are cached in local variables.
  */
 typedef struct tagAMX {
-  unsigned char _FAR *base PACKED; /* points to the AMX header plus the code, optionally also the data */
+  unsigned char _FAR *base PACKED; /* points to the AMX header ("amxhdr") plus the code, optionally also the data */
   unsigned char _FAR *data PACKED; /* points to separate data+stack+heap, may be NULL */
   AMX_CALLBACK callback PACKED;
   AMX_DEBUG debug       PACKED; /* debug callback */
@@ -340,25 +186,30 @@ typedef struct tagAMX {
   cell stk              PACKED; /* stack pointer: relative to base + amxhdr->dat */
   cell stp              PACKED; /* top of the stack: relative to base + amxhdr->dat */
   int flags             PACKED; /* current status, see amx_Flags() */
+  /* for assertions and debug hook */
+  cell curline          PACKED;
+  cell curfile          PACKED;
+  int dbgcode           PACKED;
+  cell dbgaddr          PACKED;
+  cell dbgparam         PACKED;
+  char _FAR *dbgname    PACKED;
   /* user data */
   long usertags[AMX_USERNUM] PACKED;
-  //okay userdata[3] in AMX Mod X is for the CPlugin * pointer
-  //we're also gonna set userdata[2] to a special debug structure
   void _FAR *userdata[AMX_USERNUM] PACKED;
   /* native functions can raise an error */
   int error             PACKED;
-  /* passing parameters requires a "count" field */
-  int paramcount;
   /* the sleep opcode needs to store the full AMX status */
   cell pri              PACKED;
   cell alt              PACKED;
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
   cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
     int reloc_size      PACKED; /* required temporary buffer for relocations */
     long code_size      PACKED; /* estimated memory footprint of the native code */
-} PACKED AMX;
+  #endif
+} AMX;
 
 enum {
   AMX_ERR_NONE,
@@ -375,7 +226,6 @@ enum {
   AMX_ERR_NATIVE,       /* native function failed */
   AMX_ERR_DIVIDE,       /* divide by zero */
   AMX_ERR_SLEEP,        /* go into sleepmode - code can be restarted */
-  AMX_ERR_INVSTATE,     /* invalid state for this access */
 
   AMX_ERR_MEMORY = 16,  /* out of memory */
   AMX_ERR_FORMAT,       /* invalid file format */
@@ -390,14 +240,6 @@ enum {
   AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
 };
 
-#if !defined AMX_NO_ALIGN
-  #if defined __linux__
-    #pragma pack()    /* reset default packing */
-  #else
-    #pragma pack(pop) /* reset previous packing */
-  #endif
-#endif
-
 
 // ***** declare functions *****
 
@@ -1081,7 +923,7 @@ void FN_EngineFprintf(FILE *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf
 
 #ifdef FN_PvAllocEntPrivateData
-void *FN_PvAllocEntPrivateData(edict_t *pEdict, int32 cb);
+void *FN_PvAllocEntPrivateData(edict_t *pEdict, long cb);
 #endif // FN_PvAllocEntPrivateData
 
 #ifdef FN_PvEntPrivateData
@@ -2035,17 +1877,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*/);
-
 // ***** Module funcs stuff *****
 enum ForwardExecType
 {
@@ -2066,47 +1897,9 @@ enum ForwardParam
 	FP_ARRAY,						// array; use the return value of prepareArray.
 };
 
-enum PlayerProp
-{
-	Player_Name,		//String
-	Player_Ip,			//String
-	Player_Team,		//String
-	Player_Ingame,		//bool
-	Player_Authorized,	//bool
-	Player_Vgui,		//bool
-	Player_Time,		//float
-	Player_Playtime,	//float
-	Player_MenuExpire,	//float
-	Player_Weapons,		//struct{int,int}[32]
-	Player_CurrentWeapon,	//int
-	Player_TeamID,			//int
-	Player_Deaths,			//int
-	Player_Aiming,			//int
-	Player_Menu,			//int
-	Player_Keys,			//int
-	Player_Flags,			//int[32]
-	Player_Newmenu,			//int
-	Player_NewmenuPage,		//int
-};
-
-enum LibType
-{
-	LibType_Library,
-	LibType_Class
-};
-
-#define MSGBLOCK_SET	0
-#define MSGBLOCK_GET	1
-#define BLOCK_NOT 0
-#define BLOCK_ONCE 1
-#define BLOCK_SET 2
-
-typedef void (*AUTHORIZEFUNC)(int player, const char *authstring);
 
 typedef int				(*PFN_ADD_NATIVES)				(const AMX_NATIVE_INFO * /*list*/);
-typedef int				(*PFN_ADD_NEW_NATIVES)			(const AMX_NATIVE_INFO * /*list*/);
 typedef char *			(*PFN_BUILD_PATHNAME)			(const char * /*format*/, ...);
-typedef char *			(*PFN_BUILD_PATHNAME_R)			(char * /*buffer*/, size_t /* maxlen */, const char * /* format */, ...);
 typedef cell *			(*PFN_GET_AMXADDR)				(AMX * /*amx*/, cell /*offset*/);
 typedef void			(*PFN_PRINT_SRVCONSOLE)			(char * /*format*/, ...);
 typedef const char *	(*PFN_GET_MODNAME)				(void);
@@ -2120,14 +1913,11 @@ typedef int				(*PFN_GET_AMXSTRINGLEN)			(const cell *ptr);
 typedef char *			(*PFN_FORMAT_AMXSTRING)			(AMX * /*amx*/, cell * /*params*/, int /*startParam*/, int * /*pLen*/);
 typedef void			(*PFN_COPY_AMXMEMORY)			(cell * /*dest*/, const cell * /*src*/, int /*len*/);
 typedef void			(*PFN_LOG)						(const char * /*fmt*/, ...);
-typedef void			(*PFN_LOG_ERROR)				(AMX * /*amx*/, int /*err*/, const char * /*fmt*/, ...);
 typedef int				(*PFN_RAISE_AMXERROR)			(AMX * /*amx*/, int /*error*/);
 typedef int				(*PFN_REGISTER_FORWARD)			(const char * /*funcname*/, ForwardExecType /*exectype*/, ... /*paramtypes terminated by PF_DONE*/);
 typedef int				(*PFN_EXECUTE_FORWARD)			(int /*id*/, ... /*params*/);
 typedef cell			(*PFN_PREPARE_CELLARRAY)		(cell * /*ptr*/, unsigned int /*size*/);
 typedef cell			(*PFN_PREPARE_CHARARRAY)		(char * /*ptr*/, unsigned int /*size*/);
-typedef cell			(*PFN_PREPARE_CELLARRAY_A)		(cell * /*ptr*/, unsigned int /*size*/, bool /*copyBack*/);
-typedef cell			(*PFN_PREPARE_CHARARRAY_A)		(char * /*ptr*/, unsigned int /*size*/, bool /*copyBack*/);
 typedef int				(*PFN_IS_PLAYER_VALID)			(int /*id*/);
 typedef const char *	(*PFN_GET_PLAYER_NAME)			(int /*id*/);
 typedef const char *	(*PFN_GET_PLAYER_IP)			(int /*id*/);
@@ -2136,9 +1926,7 @@ typedef int				(*PFN_IS_PLAYER_BOT)			(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_AUTHORIZED)		(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_TIME)			(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_PLAYTIME)		(int /*id*/);
-typedef int				(*PFN_GETPLAYERFLAGS) 			(int /* id*/);
 typedef int				(*PFN_GET_PLAYER_CURWEAPON)		(int /*id*/);
-typedef const char *    (*PFN_GET_PLAYER_TEAM)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_TEAMID)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_DEATHS)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_MENU)			(int /*id*/);
@@ -2149,27 +1937,18 @@ typedef int				(*PFN_IS_PLAYER_CONNECTING)		(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_HLTV)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_ARMOR)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_HEALTH)		(int /*id*/);
-#ifdef USE_METAMOD
-typedef edict_t *		(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#else
-typedef void *			(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#endif
-typedef void *			(*PFN_PLAYER_PROP_ADDR)			(int /*id*/, int /*prop*/);
-
-#ifdef MEMORY_TEST
 typedef void *			(*PFN_ALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
 														 const unsigned int /*type*/, const size_t /*size*/);
 typedef void *			(*PFN_REALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
 														 const unsigned int /*type*/, const size_t /*size*/, void* /*addr*/ );
 typedef void			(*PFN_DEALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
 														 const unsigned int /*type*/, const void* /*addr*/ );
-#endif
-typedef int				(*PFN_AMX_EXEC)					(AMX* /*amx*/, cell* /*return val*/, int /*index*/);
+typedef int				(*PFN_AMX_EXEC)					(AMX* /*amx*/, cell* /*return val*/, int /*index*/, int /*numparams*/, ... /*params*/);
 typedef int				(*PFN_AMX_EXECV)				(AMX* /*amx*/, cell* /*return val*/, int /*index*/, int /*numparams*/, cell[] /*params*/);
 typedef int				(*PFN_AMX_ALLOT)				(AMX* /*amx*/, int /*length*/, cell* /*amx_addr*/, cell** /*phys_addr*/);
 typedef int				(*PFN_AMX_FINDPUBLIC)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
 typedef int				(*PFN_AMX_FINDNATIVE)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
-typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/, int /* debug */);
+typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/);
 typedef int				(*PFN_UNLOAD_AMXSCRIPT)			(AMX* /*amx*/,void** /*code*/);
 typedef cell			(*PFN_REAL_TO_CELL)				(REAL /*x*/);
 typedef REAL			(*PFN_CELL_TO_REAL)				(cell /*x*/);
@@ -2177,25 +1956,9 @@ typedef int				(*PFN_REGISTER_SPFORWARD)		(AMX * /*amx*/, int /*func*/, ... /*pa
 typedef int				(*PFN_REGISTER_SPFORWARD_BYNAME)	(AMX * /*amx*/, const char * /*funcName*/, ... /*params*/);
 typedef void			(*PFN_UNREGISTER_SPFORWARD)		(int /*id*/);
 typedef	void			(*PFN_MERGEDEFINITION_FILE)		(const char * /*filename*/);
-typedef const char *	(*PFN_FORMAT)					(const char * /*fmt*/, ... /*params*/);
-typedef void			(*PFN_REGISTERFUNCTION)			(void * /*pfn*/, const char * /*desc*/);
-typedef	int				(*PFN_AMX_PUSH)					(AMX * /*amx*/, cell /*value*/);
-typedef	int				(*PFN_SET_TEAM_INFO)			(int /*player */, int /*teamid */, const char * /*name */);
-typedef void			(*PFN_REG_AUTH_FUNC)			(AUTHORIZEFUNC);
-typedef void			(*PFN_UNREG_AUTH_FUNC)			(AUTHORIZEFUNC);
-typedef int				(*PFN_FINDLIBRARY)				(const char * /*name*/, LibType /*type*/);
-typedef size_t			(*PFN_ADDLIBRARIES)				(const char * /*name*/, LibType /*type*/, void * /*parent*/);
-typedef size_t			(*PFN_REMOVELIBRARIES)			(void * /*parent*/);
-typedef void			(*PFN_OVERRIDENATIVES)			(AMX_NATIVE_INFO * /*natives*/, const char * /*myname*/);
-typedef const char *	(*PFN_GETLOCALINFO)				(const char * /*name*/, const char * /*def*/);
-typedef int				(*PFN_AMX_REREGISTER)			(AMX * /*amx*/, AMX_NATIVE_INFO * /*list*/, int /*list*/);
-typedef void *			(*PFN_REGISTERFUNCTIONEX)		(void * /*pfn*/, const char * /*desc*/);
-typedef void			(*PFN_MESSAGE_BLOCK)			(int /* mode */, int /* message */, int * /* opt */);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
-extern PFN_ADD_NEW_NATIVES			g_fn_AddNewNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
-extern PFN_BUILD_PATHNAME_R			g_fn_BuildPathnameR;
 extern PFN_GET_AMXADDR				g_fn_GetAmxAddr;
 extern PFN_PRINT_SRVCONSOLE			g_fn_PrintSrvConsole;
 extern PFN_GET_MODNAME				g_fn_GetModname;
@@ -2209,14 +1972,11 @@ extern PFN_GET_AMXSTRINGLEN			g_fn_GetAmxStringLen;
 extern PFN_FORMAT_AMXSTRING			g_fn_FormatAmxString;
 extern PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 extern PFN_LOG						g_fn_Log;
-extern PFN_LOG_ERROR				g_fn_LogErrorFunc;
 extern PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 extern PFN_REGISTER_FORWARD			g_fn_RegisterForward;
 extern PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
 extern PFN_PREPARE_CELLARRAY		g_fn_PrepareCellArray;
 extern PFN_PREPARE_CHARARRAY		g_fn_PrepareCharArray;
-extern PFN_PREPARE_CELLARRAY_A		g_fn_PrepareCellArrayA;
-extern PFN_PREPARE_CHARARRAY_A		g_fn_PrepareCharArrayA;
 extern PFN_IS_PLAYER_VALID			g_fn_IsPlayerValid;
 extern PFN_GET_PLAYER_NAME			g_fn_GetPlayerName;
 extern PFN_GET_PLAYER_IP			g_fn_GetPlayerIP;
@@ -2237,6 +1997,7 @@ extern PFN_IS_PLAYER_HLTV			g_fn_IsPlayerHLTV;
 extern PFN_GET_PLAYER_ARMOR			g_fn_GetPlayerArmor;
 extern PFN_GET_PLAYER_HEALTH		g_fn_GetPlayerHealth;
 extern PFN_AMX_EXEC					g_fn_AmxExec;
+extern PFN_AMX_EXECV				g_fn_AmxExecv;
 extern PFN_AMX_ALLOT				g_fn_AmxAllot;
 extern PFN_AMX_FINDPUBLIC			g_fn_AmxFindPublic;
 extern PFN_LOAD_AMXSCRIPT			g_fn_LoadAmxScript;
@@ -2248,33 +2009,12 @@ extern PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 extern PFN_UNREGISTER_SPFORWARD		g_fn_UnregisterSPForward;
 extern PFN_MERGEDEFINITION_FILE		g_fn_MergeDefinition_File;
 extern PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-extern PFN_GETPLAYERFLAGS		g_fn_GetPlayerFlags;
-extern PFN_GET_PLAYER_EDICT			g_fn_GetPlayerEdict;
-extern PFN_FORMAT					g_fn_Format;
-extern PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
-extern PFN_REGISTERFUNCTION			g_fn_RegisterFunction;
-extern PFN_REQ_FNPTR				g_fn_RequestFunction;
-extern PFN_AMX_PUSH					g_fn_AmxPush;
-extern PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
-extern PFN_PLAYER_PROP_ADDR			g_fn_PlayerPropAddr;
-extern PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
-extern PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
-extern PFN_FINDLIBRARY				g_fn_FindLibrary;
-extern PFN_ADDLIBRARIES				g_fn_AddLibraries;
-extern PFN_REMOVELIBRARIES			g_fn_RemoveLibraries;
-extern PFN_OVERRIDENATIVES			g_fn_OverrideNatives;
-extern PFN_GETLOCALINFO				g_fn_GetLocalInfo;
-extern PFN_AMX_REREGISTER			g_fn_AmxReRegister;
-extern PFN_REGISTERFUNCTIONEX		g_fn_RegisterFunctionEx;
-extern PFN_MESSAGE_BLOCK			g_fn_MessageBlock;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
 // They understand #if 0 so we use #ifdef MAY_NEVER_BE_DEFINED
 int				MF_AddNatives				(const AMX_NATIVE_INFO *list) { }
-int				MF_AddNewNatives			(const AMX_NATIVE_INFO *list) { }
 char *			MF_BuildPathname			(const char * format, ...) { }
-char *			MF_BuildPathnameR			(char *buffer, size_t maxlen, const char *fmt, ...) { }
 cell *			MF_GetAmxAddr				(AMX * amx, cell offset) { }
 void			MF_PrintSrvConsole			(char * format, ...) { }
 const char *	MF_GetModname				(void) { }
@@ -2288,14 +2028,11 @@ int				MF_GetAmxStringLen			(const cell *ptr) { }
 char *			MF_FormatAmxString			(AMX * amx, cell * params, int startParam, int * pLen) { }
 void			MF_CopyAmxMemory			(cell * dest, const cell * src, int len) { }
 void			MF_Log						(const char * fmt, ...) { }
-void			MF_LogError					(AMX * amx, int err, const char *fmt, ...) { }
 int				MF_RaiseAmxError			(AMX * amx, int error) { }
 int				MF_RegisterForward			(const char * funcname, ForwardExecType exectype, ...) { }
 int				MF_ExecuteForward			(int id, ...) { }
 cell			MF_PrepareCellArray			(cell * ptr, unsigned int size) { }
 cell			MF_PrepareCharArray			(char * ptr, unsigned int size) { }
-cell			MF_PrepareCellArrayA			(cell * ptr, unsigned int size, bool copyBack) { }
-cell			MF_PrepareCharArrayA			(char * ptr, unsigned int size, bool copyBack) { }
 int				MF_IsPlayerValid			(int id) { }
 const char *	MF_GetPlayerName			(int id) { }
 const char *	MF_GetPlayerIP				(int id) { }
@@ -2305,7 +2042,6 @@ int				MF_IsPlayerAuthorized		(int id) { }
 float			MF_GetPlayerTime			(int id) { }
 float			MF_GetPlayerPlayTime		(int id) { }
 int				MF_GetPlayerCurweapon		(int id) { }
-const char *	MF_GetPlayerTeam			(int id) { }
 int				MF_GetPlayerTeamID			(int id) { }
 int				MF_GetPlayerDeaths			(int id) { }
 int				MF_GetPlayerMenu			(int id) { }
@@ -2321,31 +2057,10 @@ cell			amx_ftoc					(float x) { }
 int				MF_RegisterSPForwardByName	(AMX * amx, const char *str, ...) { }
 int				MF_RegisterSPForward		(AMX * amx, int func, ...) { }
 void			MF_UnregisterSPForward		(int id) { }
-int				MF_GetPlayerFlags			(int id) { }
-edict_t*		MF_GetPlayerEdict			(int id) { }
-const char *	MF_Format					(const char *fmt, ...) { }
-void			MF_RegisterFunction			(void *pfn, const char *description) { }
-void *			MF_RequestFunction			(const char *description) { }
-int				MF_AmxPush					(AMX *amx, cell *params) { }
-int				MF_AmxExec					(AMX *amx, cell *retval, int idx) { }
-int				MF_SetPlayerTeamInfo		(int id, int teamid, const char *teamname) { }
-void *			MF_PlayerPropAddr			(int id, int prop) { }
-void			MF_RegAuthFunc				(AUTHORIZEFUNC fn) { }
-void			MF_UnregAuthFunc			(AUTHORIZEFUNC fn) { }
-int				MF_FindLibrary				(const char *name, LibType type) { }
-size_t			MF_AddLibraries				(const char *name, LibType type, void *parent) { }
-size_t			MF_RemoveLibraries			(void *parent) { }
-void			MF_OverrideNatives			(AMX_NATIVE_INFO *natives, const char *myname) { }
-const char *	MF_GetLocalInfo				(const char *name, const char *def) { }
-int				MF_AmxReRegister			(AMX *amx, AMX_NATIVE_INFO *list, int number) { return 0; }
-void *			MF_RegisterFunctionEx		(void *pfn, const char *description) { }
-void *			MF_MessageBlock				(int mode, int msg, int *opt) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
-#define MF_AddNewNatives g_fn_AddNewNatives
 #define MF_BuildPathname g_fn_BuildPathname
-#define MF_BuildPathnameR g_fn_BuildPathnameR
 #define MF_FormatAmxString g_fn_FormatAmxString
 #define MF_GetAmxAddr g_fn_GetAmxAddr
 #define MF_PrintSrvConsole g_fn_PrintSrvConsole
@@ -2359,14 +2074,11 @@ void *			MF_MessageBlock				(int mode, int msg, int *opt) { }
 #define MF_GetAmxStringLen g_fn_GetAmxStringLen
 #define MF_CopyAmxMemory g_fn_CopyAmxMemory
 void MF_Log(const char *fmt, ...);
-void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_RaiseAmxError g_fn_RaiseAmxError
 #define MF_RegisterForward g_fn_RegisterForward
 #define MF_ExecuteForward g_fn_ExecuteForward
 #define MF_PrepareCellArray g_fn_PrepareCellArray
 #define MF_PrepareCharArray g_fn_PrepareCharArray
-#define MF_PrepareCellArrayA g_fn_PrepareCellArrayA
-#define MF_PrepareCharArrayA g_fn_PrepareCharArrayA
 #define MF_IsPlayerValid g_fn_IsPlayerValid
 #define MF_GetPlayerName g_fn_GetPlayerName
 #define MF_GetPlayerIP g_fn_GetPlayerIP
@@ -2376,7 +2088,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_GetPlayerTime g_fn_GetPlayerTime
 #define MF_GetPlayerPlayTime g_fn_GetPlayerPlayTime
 #define MF_GetPlayerCurweapon g_fn_GetPlayerCurweapon
-#define MF_GetPlayerTeam g_fn_GetPlayerTeam
 #define MF_GetPlayerTeamID g_fn_GetPlayerTeamID
 #define MF_GetPlayerDeaths g_fn_GetPlayerDeaths
 #define MF_GetPlayerMenu g_fn_GetPlayerMenu
@@ -2400,26 +2111,7 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_RegisterSPForwardByName g_fn_RegisterSPForwardByName
 #define MF_RegisterSPForward g_fn_RegisterSPForward
 #define MF_UnregisterSPForward g_fn_UnregisterSPForward
-#define MF_GetPlayerFlags g_fn_GetPlayerFlags
-#define MF_GetPlayerEdict g_fn_GetPlayerEdict
-#define MF_Format g_fn_Format
-#define MF_RegisterFunction g_fn_RegisterFunction
-#define MF_RequestFunction g_fn_RequestFunction
-#define MF_AmxPush g_fn_AmxPush
-#define	MF_SetPlayerTeamInfo g_fn_SetTeamInfo
-#define MF_PlayerPropAddr g_fn_PlayerPropAddr
-#define MF_RegAuthFunc g_fn_RegAuthFunc
-#define MF_UnregAuthFunc g_fn_UnregAuthFunc
-#define MF_FindLibrary g_fn_FindLibrary
-#define MF_AddLibraries g_fn_AddLibraries
-#define MF_RemoveLibraries g_fn_RemoveLibraries
-#define MF_OverrideNatives g_fn_OverrideNatives
-#define MF_GetLocalInfo g_fn_GetLocalInfo
-#define MF_AmxReRegister g_fn_AmxReRegister
-#define MF_RegisterFunctionEx g_fn_RegisterFunctionEx
-#define MF_MessageBlock g_fn_MessageBlock
 
-#ifdef MEMORY_TEST
 /*** Memory ***/
 void	*operator new(size_t reportedSize);
 void	*operator new[](size_t reportedSize);
@@ -2463,6 +2155,4 @@ void	Mem_Deallocator(const char *sourceFile, const unsigned int sourceLine, cons
 #define	realloc(ptr,sz)	Mem_Reallocator(__FILE__,__LINE__,__FUNCTION__,m_alloc_realloc,sz,ptr)
 #define	free(ptr)	Mem_Deallocator(__FILE__,__LINE__,__FUNCTION__,m_alloc_free,ptr)
 
-#endif //MEMORY_TEST
-
 #endif // #ifndef __AMXXMODULE_H__