Tagged 0.16

amxmodx/CCmd.cpp

@@ -29,16 +29,16 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 #include "CCmd.h"
 
 // *****************************************************
 // class CmdMngr
 // *****************************************************
-
+CmdMngr::CmdMngr() { 
-CmdMngr::CmdMngr()
+	memset(sortedlists,0,sizeof(sortedlists));
-{ 
-	memset(sortedlists, 0, sizeof(sortedlists));
 	srvcmdlist = 0;
 	clcmdlist = 0;
 	prefixHead = 0;
@@ -51,14 +51,15 @@ CmdMngr::CmdMngr()
 
 }
 
-CmdMngr::Command::Command(CPluginMngr::CPlugin* pplugin, const char* pcmd, const char* pinfo, int pflags, 
+CmdMngr::Command::Command( CPluginMngr::CPlugin* pplugin,const char* pcmd, 
-							int pfunc, bool pviewable, CmdMngr* pparent) : commandline(pcmd), info(pinfo)
+			const char* pinfo , int pflags , int pfunc, 
-{
+			bool pviewable, CmdMngr* pparent ) : commandline(pcmd) , info(pinfo) {
+
 	char szCmd[64], szArg[64];
-	*szCmd = 0; *szArg = 0;
+	*szCmd = 0; *szArg=0;
-	sscanf(pcmd, "%s %s", szCmd, szArg);
+	sscanf(pcmd,"%s %s",szCmd,szArg);
-	command.assign(szCmd);
+	command.set(szCmd);
-	argument.assign(szArg);
+	argument.set(szArg);
 	plugin = pplugin;
 	flags = pflags;
 	cmdtype = 0;
@@ -74,68 +75,75 @@ CmdMngr::Command::~Command()
 	++uniqueid;
 }
 
-CmdMngr::Command* CmdMngr::registerCommand(CPluginMngr::CPlugin* plugin, int func, char* cmd, char* info, int level, bool listable)
+CmdMngr::Command* CmdMngr::registerCommand( CPluginMngr::CPlugin* plugin ,   int func , char* cmd ,  char* info , int level , bool listable )
 {
-	Command* b = new Command(plugin, cmd, info, level, func, listable, this);
+  Command* b = new Command( plugin ,  cmd , info ,  level , func , listable,  this );
-	if (b == 0) return 0;
+  if ( b == 0 ) return 0;
-	setCmdLink(&sortedlists[0], b);
+  setCmdLink( &sortedlists[0] , b );
-	
   return b;
 }
 
-CmdMngr::Command* CmdMngr::getCmd(long int id, int type, int access)
+CmdMngr::Command* CmdMngr::getCmd( long int id ,int type,  int access )
 {
-	//if (id >= 1024 || id < 0) return (Command*)id;
+	//if ( id >= 1024 || id < 0 ) return (Command*)id;
-	if (id < 0)
+	if ( id < 0 ){
-	{
+		for (CmdMngr::iterator a = begin( type ); a ; ++a){
-		for (CmdMngr::iterator a = begin(type); a ; ++a)
+			if ( (*a).id == id )
-		{
-			if ((*a).id == id)
 				return &(*a);
 		}
-		
 		return 0;
 	}
 
-	if ((id < buf_cmdid) || (access != buf_cmdaccess) || (type != buf_cmdtype))
+	if ( (id < buf_cmdid) || (access != buf_cmdaccess) || (type != buf_cmdtype) )
 	{
-		buf_cmdptr = begin(type);
+		buf_cmdptr = begin( type );
 		buf_cmdaccess = access;
 		buf_cmdtype = type;
 		buf_cmdid = id;
-	} else {
+	}
+	else
+	{
 		int a = id;
 		id -= buf_cmdid;
 		buf_cmdid = a;
 	}
 
-	while (buf_cmdptr)
+	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) 
+			
+			if ( id-- == 0 ) 
 				return &(*buf_cmdptr);
+			
 		}
+		
 		++buf_cmdptr;
 	}
 
 	return 0;		
 }
 
-int CmdMngr::getCmdNum(int type, int access)
+int CmdMngr::getCmdNum( int type, int access )
 {
-	if ((access == buf_access) && (type == buf_type))
+	if ( (access == buf_access) && (type == buf_type) )
 		return buf_num; // once calculated don't have to be done again
 
 	buf_access = access;
 	buf_type = type;
 	buf_num = 0;
 
-	CmdMngr::iterator a = begin(type);
+	CmdMngr::iterator a = begin( type );
 
-	while (a)
+	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;
 	}
@@ -143,19 +151,19 @@ int CmdMngr::getCmdNum(int type, int access)
 	return buf_num;
 }
 
-void CmdMngr::setCmdLink(CmdLink** a, Command* c, bool sorted)
+void CmdMngr::setCmdLink( CmdLink** a , Command* c, bool sorted  )
 {
-	CmdLink* np = new CmdLink(c);
+	CmdLink* np = new CmdLink( c );
 
-	if (np == 0) return;
+	if ( np == 0 ) return;
 
-	if (sorted)
+	if ( sorted )
 	{
-		while (*a)
+		while( *a ) 
 		{
-			int i = strcmp(c->getCommand(), (*a)->cmd->getCommand());
+			int i = strcmp(c->getCommand(),(*a)->cmd->getCommand() );
 
-			if ((i < 0) || (i == 0) && (strcmp(c->getArgument(), (*a)->cmd->getArgument()) < 0))
+			if ( (i<0) || (i==0) && ( strcmp( c->getArgument() , (*a)->cmd->getArgument() ) < 0 ) )
 				break;
 
 			a = &(*a)->next;
@@ -163,101 +171,84 @@ void CmdMngr::setCmdLink(CmdLink** a, Command* c, bool sorted)
 
 		np->next = *a;
 		*a = np;
-	} else {
+	}
-		while (*a) a = &(*a)->next;
+	else 
+	{
+		while ( *a ) a = &(*a)->next;
 		*a = np;
 	}
+
+	
 }
 
-void CmdMngr::clearCmdLink(CmdLink** phead, bool pclear)
+void CmdMngr::clearCmdLink( CmdLink** phead, bool pclear )
 {
-	while (*phead)
+	while( *phead ){
-	{
 		CmdLink* pp = (*phead)->next;
-		
+		if ( pclear ) delete (*phead)->cmd;
-		if (pclear) delete (*phead)->cmd;
 		delete *phead;
 		*phead = pp;
 	}
 }
 
-void CmdMngr::Command::setCmdType(int a)
+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->sortedlists[1], this);
+			parent->setCmdLink( &parent->clcmdlist , this , false );
-		
-		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 );
-		parent->setCmdLink(&parent->sortedlists[2], this);
-		parent->setCmdLink(&parent->srvcmdlist, this, false);
 	}
 }
 
-const char* CmdMngr::Command::getCmdType() const
+const char* CmdMngr::Command::getCmdType() const {
-{
+	switch( cmdtype ){
-	switch (cmdtype)
+	case 1:	return"client";
-	{
-		case 1:	return "client";
 	case 2:	return "server";
 	case 3:	return "console";
 	}
-	
 	return "unknown";
 }
 
-bool CmdMngr::registerCmdPrefix(Command* cc)
+bool CmdMngr::registerCmdPrefix( Command* cc )
 {
-	CmdPrefix** b = findPrefix(cc->getCommand());
+	CmdPrefix** b = findPrefix( cc->getCommand() );
-
+	if (*b){
-	if (*b)
+		setCmdLink( &(*b)->list , cc , false );
-	{
-		setCmdLink(&(*b)->list, cc, false);
 		cc->prefix = (*b)->name.size();
 		return true;
 	}
-	
 	return false;
 }
 
-void CmdMngr::registerPrefix(const char* nn)
+void CmdMngr::registerPrefix( const char* nn )
 {
-	if (*nn == 0) return;
+	if ( *nn == 0 ) return;
-	CmdPrefix** b = findPrefix(nn);
+	CmdPrefix** b = findPrefix( nn );
-	
 	if (*b) return;
-	*b = new CmdPrefix(nn, this);
+	*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.str(), nn, (*aa)->name.size() ) ) 
-	{
-		if (!strncmp((*aa)->name.c_str(), nn, (*aa)->name.size()))
 			break;
-		aa = &(*aa)->next;
+		aa=&(*aa)->next;
 	}
-	
 	return aa;
 }
 
-void CmdMngr::clearPrefix()
+void CmdMngr::clearPrefix(){
-{
+	while(prefixHead){
-	while (prefixHead)
-	{
 		CmdPrefix* a = prefixHead->next;
 		delete prefixHead;
 		prefixHead = a;
@@ -275,8 +266,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,33 +63,33 @@ 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(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* getCommand() const{ return command.str(); }
-		inline const char* getCmdInfo() { return info.c_str(); }
+		inline const char* getArgument() const{ return argument.str(); }
-		inline const char* getCmdLine() { return commandline.c_str(); }
+		inline const char* getCmdInfo() const{ return info.str(); }
-		inline bool matchCommandLine(const char* cmd, const char* arg) 	{ return (!stricmp(command.c_str() + prefix, cmd + prefix) && (argument.empty() || !stricmp(argument.c_str(), arg))); }
+		inline const char* getCmdLine() const{ return commandline.str(); }
-		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.c_str(), cmd)); }
+		inline bool matchCommandLine(const char* cmd, const char* arg) 	{ return (!stricmp(command.str()+prefix, cmd+prefix ) && (argument.empty() || !stricmp(argument.str() , arg ))); }
+		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.str(), cmd ));	}
 		inline int getFunction() const { return function; }
-		inline bool gotAccess(int f) const { return (!flags || ((flags & f) == flags)); }
+		inline bool gotAccess(int f) const { return (!flags||((flags & f)==flags)); }
 		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
 		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);
+		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,40 +99,36 @@ private:
 	CmdLink* srvcmdlist;
 	CmdLink* clcmdlist;
 
-	struct CmdPrefix
+	struct CmdPrefix {
-	{
-		String name;
 		CmdMngr* parent;
+		String name;
 		CmdLink* list;
 		CmdPrefix* next;
-		CmdPrefix(const char* nn, CmdMngr* pp): name(nn), parent(pp), list(0), next(0) {}
+		CmdPrefix( const char* nn , CmdMngr* pp) : 	name(nn),parent(pp),list(0),next(0){}
-		~CmdPrefix() { parent->clearCmdLink(&list); }
+		~CmdPrefix(){  parent->clearCmdLink(&list);  }
 	} *prefixHead;
 
-	bool registerCmdPrefix(Command* cc);
+	bool registerCmdPrefix( Command* cc );
-	CmdPrefix** findPrefix(const char* nn);
+	CmdPrefix** findPrefix(  const char* nn );
 	void clearPrefix();
 
-	void setCmdLink(CmdLink** a, Command* c, bool sorted = true);
+	void setCmdLink( CmdLink** a , Command* c, bool sorted = true );
-	void clearCmdLink(CmdLink** phead, bool pclear = false);
+	void clearCmdLink( CmdLink** phead, bool pclear = false  );
 
 public:
 	CmdMngr();
-	~CmdMngr() { clear(); }
+	~CmdMngr() {clear();}
 
 	// Interface
 
-	void registerPrefix(const char* nn);
+	void registerPrefix( const char* nn );
-	
+	Command* registerCommand( CPluginMngr::CPlugin* plugin , int func , char* cmd ,  char* info , int level , bool listable );
-	Command* registerCommand(CPluginMngr::CPlugin* plugin, int func, char* cmd, char* info, int level, bool listable);
+	Command* getCmd( long int id ,int type,  int access);
-	Command* getCmd(long int id, int type, int access);
+	int getCmdNum( 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);
+		return iterator( a ? a->list : 0 );
 	}
-
+	inline iterator clcmdbegin() const {return iterator(clcmdlist);}
-	inline iterator clcmdbegin() const { return iterator(clcmdlist); }
+	inline iterator srvcmdbegin() const {return iterator(srvcmdlist);}
-	inline iterator srvcmdbegin() const { return iterator(srvcmdlist); }
+	inline iterator begin( int type ) const { return iterator(sortedlists[type]); }
-	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

@@ -29,6 +29,8 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 #include "CEvent.h"
 
@@ -48,7 +50,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 +66,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 +84,10 @@ 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 +100,6 @@ void EventsMngr::NextParam()
 		m_ParseVaultSize = INITIAL_PARSEVAULT_SIZE;
 
 	m_ParseVault = new MsgDataEntry[m_ParseVaultSize];
-	
 	if (tmp)
 	{
 		memcpy(m_ParseVault, tmp, tmpSize * sizeof(MsgDataEntry));
@@ -126,7 +117,6 @@ EventsMngr::EventsMngr()
 {
 	m_ParseVault = NULL;
 	m_ParseVaultSize = 0;
-	m_CurrentMsgType = -1;
 	clearEvents();
 }
 
@@ -135,6 +125,7 @@ EventsMngr::~EventsMngr()
 	clearEvents();
 }
 
+
 CPluginMngr::CPlugin * EventsMngr::ClEvent::getPlugin()
 {
 	return m_Plugin;
@@ -175,8 +166,8 @@ void EventsMngr::ClEvent::registerFilter(char *filter)
 	tmpCond->paramId = atoi(filter);
 
 	// rest of line
-	tmpCond->sValue.assign(value);
+	tmpCond->sValue.set(value);
-	tmpCond->fValue = static_cast<float>(atof(value));
+	tmpCond->fValue = atof(value);
 	tmpCond->iValue = atoi(value);
 	
 	tmpCond->next = NULL;
@@ -184,11 +175,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 +191,6 @@ EventsMngr::ClEvent* EventsMngr::registerEvent(CPluginMngr::CPlugin* plugin, int
 		return NULL;
 
 	ClEvent *event = new ClEvent(plugin, func, flags);
-	
 	if (!event)
 		return NULL;
 
@@ -215,8 +204,6 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 	if (msg_type < 0 || msg_type > MAX_AMX_REG_MSG)
 		return;
 
-	m_CurrentMsgType = msg_type;
-
 	m_ParseNotDone = false;
 	m_Timer = timer;
 
@@ -224,11 +211,12 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 	if (!m_Events[msg_type].size())
 		return;
 
-	for (ClEventVecIter iter = m_Events[msg_type].begin(); iter; ++iter)
+	for(ClEventVecIter iter = m_Events[msg_type].begin(); iter; ++iter)
 	{
 		if ((*iter).m_Done)
 			continue;
 
+
 		if (!(*iter).m_Plugin->isExecutable((*iter).m_Func))
 		{
 			(*iter).m_Done = true;
@@ -237,7 +225,7 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 
 		if (pPlayer)
 		{
-			if (!(*iter).m_FlagPlayer || (pPlayer->IsAlive() ? !(*iter).m_FlagAlive : !(*iter).m_FlagDead))
+			if (!(*iter).m_FlagPlayer || (pPlayer->IsAlive() ? !(*iter).m_FlagAlive : !(*iter).m_FlagDead ) )
 			{
 				(*iter).m_Done = true;
 				continue;
@@ -254,7 +242,6 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 			(*iter).m_Done = true;
 			continue;
 		}
-		
 		m_ParseNotDone = true;
 	}
 
@@ -265,7 +252,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 +261,7 @@ void EventsMngr::parseValue(int iValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
+
 	// grow if needed
 	++m_ParsePos;
 	NextParam();
@@ -292,25 +279,23 @@ 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)
 			{
 				anyConditions = true;
-				switch (condIter->type)
+				switch(condIter->type)
 				{
-					case '=': if (condIter->iValue == iValue) execute = true; break;
+				case '=': if (condIter->iValue == iValue) execute=true; break;
-					case '!': if (condIter->iValue != iValue) execute = true; break;
+				case '!': if (condIter->iValue != iValue) execute=true; break;
-					case '&': if (iValue & condIter->iValue) execute = true; break;
+				case '&': if (iValue & condIter->iValue) execute=true; break;
-					case '<': if (iValue < condIter->iValue) execute = true; break;
+				case '<': if (iValue < condIter->iValue) execute=true; break;
-					case '>': if (iValue > condIter->iValue) execute = true; break;
+				case '>': if (iValue > condIter->iValue) execute=true; break;
 				}
 				if (execute)
 					break;
 			}
 		}
-		
 		if (anyConditions && !execute)
 			(*iter).m_Done = true;		// don't execute
 	}
@@ -322,6 +307,7 @@ void EventsMngr::parseValue(float fValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
+
 	// grow if needed
 	++m_ParsePos;
 	NextParam();
@@ -339,25 +325,22 @@ 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)
 			{
 				anyConditions = true;
-				switch (condIter->type)
+				switch(condIter->type)
 				{
-					case '=': if (condIter->fValue == fValue) execute = true; break;
+				case '=': if (condIter->fValue == fValue) execute=true; break;
-					case '!': if (condIter->fValue != fValue) execute = true; break;
+				case '!': if (condIter->fValue != fValue) execute=true; break;
-					case '<': if (fValue < condIter->fValue) execute = true; break;
+				case '<': if (fValue < condIter->fValue) execute=true; break;
-					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,24 +369,21 @@ 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)
 			{
 				anyConditions = true;
-				switch (condIter->type)
+				switch(condIter->type)
 				{
-					case '=': if (!strcmp(sz, condIter->sValue.c_str())) execute = true; break;
+				case '=': if (!strcmp(sz, condIter->sValue.str())) execute=true; break;
-					case '!': if (strcmp(sz, condIter->sValue.c_str())) execute = true; break;
+				case '!': if (strcmp(sz, condIter->sValue.str())) execute=true; break;
-					case '&': if (strstr(sz, condIter->sValue.c_str())) execute = true; break;
+				case '&': if (strstr(sz, condIter->sValue.str())) execute=true; break;
 				}
-				
 				if (execute)
 					break;
 			}
 		}
-		
 		if (anyConditions && !execute)
 			(*iter).m_Done = true;		// don't execute
 	}
@@ -411,58 +391,76 @@ 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) 
+			if ( (*iter).m_Done ) 
 			{
 				(*iter).m_Done = false;
 				continue;
 			}
 
 			(*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)
+			{
+				UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, 
+					(*iter).m_Plugin->getAMX()->curline, (*iter).m_Plugin->getName());
+			}
 		}
 
-	m_CurrentMsgType = -1;
+#ifdef ENABLEEXEPTIONS
+	}
+	catch( ... )
+	{
+		UTIL_Log( "[AMXX] fatal error at event execution");
+	}
+#endif		// #ifdef ENABLEEXEPTIONS
+
 	m_ParseFun = NULL;
 }
 
-int EventsMngr::getArgNum() const
+int EventsMngr::getArgNum()
 {
 	return m_ParsePos + 1;
 }
 
-const char* EventsMngr::getArgString(int a) const
+const char* EventsMngr::getArgString(int a)
 {
-	if (a < 0 || a > m_ParsePos)
+	if ( a < 0 || a > m_ParsePos )
 		return "";
 
 	static char var[32];
 
-	switch (m_ParseVault[a].type)
+	switch(m_ParseVault[a].type)
 	{
 	case MSG_INTEGER: 
-			sprintf(var, "%d", m_ParseVault[a].iValue);
+		sprintf( var, "%d", m_ParseVault[a].iValue );
 		return var;
 	case MSG_STRING: 
 		return m_ParseVault[a].sValue;
 	default:
-			sprintf(var, "%g", m_ParseVault[a].fValue);
+		sprintf( var, "%g", m_ParseVault[a].fValue );
 		return var;
 	}
 }
 
-int EventsMngr::getArgInteger(int a) const
+int EventsMngr::getArgInteger(int a)
 {
-	if (a < 0 || a > m_ParsePos)
+	if ( a < 0 || a > m_ParsePos )
 		return 0;
 
-	switch (m_ParseVault[a].type)
+	switch(m_ParseVault[a].type)
 	{
 	case MSG_INTEGER:
 		return m_ParseVault[a].iValue;
@@ -473,17 +471,17 @@ int EventsMngr::getArgInteger(int a) const
 	}
 }
 
-float EventsMngr::getArgFloat(int a) const
+float EventsMngr::getArgFloat(int a)
 {
-	if (a < 0 || a > m_ParsePos)
+	if ( a < 0 || a > m_ParsePos )
 		return 0.0f;
 
-	switch (m_ParseVault[a].type)
+	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 +493,6 @@ void EventsMngr::clearEvents(void)
 	{
 		m_Events[i].clear();
 	}
-	
 	// delete parsevault
 	if (m_ParseVault)
 	{
@@ -514,29 +511,23 @@ int EventsMngr::getEventId(const char* msg)
 		CS_EventsIds id;
 	} table[] =
 	{
-		{"CS_DeathMsg",		CS_DeathMsg},
+		{ "CS_DeathMsg" ,	CS_DeathMsg  },
-//		{"CS_RoundEnd",		CS_RoundEnd},
+			//		{ "CS_RoundEnd" ,	CS_RoundEnd  },
-//		{"CS_RoundStart",	CS_RoundStart},
+			//		{ "CS_RoundStart" , CS_RoundStart  },
-//		{"CS_Restart",		CS_Restart},
+			//		{ "CS_Restart" ,	CS_Restart  },
-		{"",				CS_Null}
+		{ "" ,				CS_Null  }
 	};
 
 	// if msg is a number, return it
 	int pos = atoi(msg);
-	
 	if (pos != 0)
 		return pos;
 
 	// try to find in table first
-	for (pos = 0; table[pos].id != CS_Null; ++pos)
+	for (pos = 0; table[ pos ].id != CS_Null; ++pos )
-		if (!strcmp(table[pos].name, msg))
+		if ( !strcmp( table[ pos ].name , msg ) )
-			return table[pos].id;
+			return table[ pos ].id;
 
 	// find the id of the message
-	return pos = GET_USER_MSG_ID(PLID, msg, 0);
+	return pos = GET_USER_MSG_ID(PLID, msg , 0 );
-}
-
-int EventsMngr::getCurrentMsgType()
-{
-	return m_CurrentMsgType;
 }

amxmodx/CEvent.h

@@ -32,10 +32,9 @@
 #ifndef __CEVENTS_H__
 #define __CEVENTS_H__
 
-#define MAX_AMX_REG_MSG MAX_REG_MSGS + 16
+#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
@@ -132,9 +130,8 @@ private:
 	int m_ParsePos;				// is args. num. - 1
 	float* m_Timer;
 	
-	ClEvent* getValidEvent(ClEvent* a);
+	ClEvent* getValidEvent(ClEvent* a );
 
-	int m_CurrentMsgType;
 public:
 	EventsMngr();
 	~EventsMngr();
@@ -142,20 +139,17 @@ 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(); //{ return (parsePos+1); }
-	int getArgNum() const;		//{ return (parsePos + 1); }
+	const char* getArgString(int a);
-	const char* getArgString(int a) const;
+	int getArgInteger(int a);
-	int getArgInteger(int a) const;
+	float getArgFloat(int a);
-	float getArgFloat(int a) const;
 	void clearEvents(void);
-	static int getEventId(const char* msg);
+	static int getEventId( const char* msg );
-	int getCurrentMsgType();
 };
 
-#endif //__CEVENTS_H__
+#endif // #ifdef __CEVENTS_H__

amxmodx/CFile.cpp

@@ -29,78 +29,76 @@
 *  version.
 */
 
-#include <ctype.h>
-#include "amxmodx.h"
 #include "CFile.h"
+#include <ctype.h>
 
 // *****************************************************
 // class File
 // *****************************************************
-
+File::File( const char* n, const char* m )
-File::File(const char* n, const char* m)
 {
-	fp = fopen(n, m);
+  fp = fopen( n , m );
 }
 
-File::~File()
+File::~File( )
 {
-	if (fp)
+  if ( fp )
-		fclose(fp);
+    fclose( fp );
 }
 
-File::operator bool () const
+File::operator bool ( ) const
 {
   return fp && !feof(fp);
 }
 
-File& operator<<(File& f, const String& n)
+File& operator<<( File& f, const String& n )
 {
-	if (f) fputs(n.c_str(), f.fp);
+  if ( f ) fputs( n.str() , f.fp ) ;
   return f;
 }
 
-File& operator<<(File& f, const char* n)
+File& operator<<( File& f, const char* n )
 {
-	if (f) fputs(n, f.fp);
+  if ( f ) fputs( n , f.fp ) ;
   return f;
 }
 
-File& operator<<(File& f, int n)
+File& operator<<( File& f, int n )
 {
-	if (f) fprintf(f.fp, "%d", n);
+  if ( f ) fprintf( f.fp , "%d" , n ) ;
   return f;
 }
 
-File& operator<<(File& f, const char& c)
+
+File& operator<<( File& f, const char& c )
 {
-	if (f) fputc(c, f.fp);
+  if ( f ) fputc( c , f.fp ) ;
   return f;
 }
 
-File& operator>>(File& f, String& n)
+File& operator>>( File& f, String& n )
 {
-	if (!f) return f;
+  if ( !f ) return f;
   char temp[1024];
-	fscanf(f.fp, "%s", temp);
+  fscanf( f.fp , "%s", temp );
-	n.assign(temp);
+  n.set(temp);
   return f;
 }
 
-File& operator>>(File& f, char* n)
+File& operator>>( File& f, char* n )
 {
-	if (f) fscanf(f.fp, "%s", n);
+  if ( f ) fscanf( f.fp , "%s", n );
   return f;
 }
 
-int File::getline(char* buf, int sz)
+int File::getline( char* buf, int sz )
 {
   int a = sz;
   char *origBuf = buf;
-	
+  if ( *this )
-	if (*this)
   {
     int c;
-		while (sz-- && (c = getc((*this).fp)) && c != EOF && c != '\n')
+    while ( sz-- && (c = getc( (*this).fp)) && c != EOF && c != '\n'  )
       *buf++ = c;
     *buf = 0;
   }
@@ -116,11 +114,12 @@ int File::getline(char* buf, int sz)
   return a - sz;
 }
 
-File& File::skipWs()
+File& File::skipWs( )
 {
-	if (!*this) return *this;
+  if ( !*this ) return *this;
   int c;
-	while (isspace(c = getc(fp))) {};
+  while( isspace( c = getc( fp ) ) ){};
-	ungetc(c, fp);
+  ungetc( c , fp );
   return *this;
 }
+

amxmodx/CFile.h

@@ -41,19 +41,18 @@ class File
 	FILE* fp;
 
 public:
-	File(const char* n, const char* m);
+	File( const char* n, const char* m );
-	~File();
+	~File( );
-	
+	operator bool ( ) const;
-	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 String& n);
+	friend File& operator<<( File& f, const char& c );
-	friend File& operator<<(File& f, const char* n);
+	friend File& operator<<( File& f, int n );
-	friend File& operator<<(File& f, const char& c);
+	friend File& operator>>( File& f, String& n );
-	friend File& operator<<(File& f, int n);
+	friend File& operator>>( File& f, char* n );
-	friend File& operator>>(File& f, String& n);
+	int getline( char* buf, int sz );
-	friend File& operator>>(File& f, char* n);
+	File& skipWs( );
-	
-	int getline(char* buf, int sz);
-	
-	File& skipWs();
 };
+
+
+

amxmodx/CForward.cpp

@@ -29,631 +29,52 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
-#include "debugger.h"
+#include "CForward.h"
 
-CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes)
+void CForwardMngr::registerForward(  CPluginMngr::CPlugin* p, int func , int type  ){
-{
-	m_FuncName = name;
-	m_ExecType = et;
-	m_NumParams = numParams;
 	
-	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
+	CForward** a = &head[ type ];
+	while(*a) a = &(*a)->next;
+	*a = new CForward( p , func );
 	
-	// find funcs
-	int func;
-	AMXForward *tmp = NULL;
-	m_Funcs.clear();
-	
-	for (CPluginMngr::iterator iter = g_plugins.begin(); iter; ++iter)
-	{
-		if ((*iter).isValid() && amx_FindPublic((*iter).getAMX(), name, &func) == AMX_ERR_NONE)
-		{
-			AMXForward tmp;
-			tmp.pPlugin = &(*iter);
-			tmp.func = func;
-			m_Funcs.push_back(tmp);
-		}
-	}
 }
 
-cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
+void CForwardMngr::clearForwards( CForward** a ){
-{
+	while( *a )	{
-	cell realParams[FORWARD_MAX_PARAMS];
+		CForward* b = (*a)->next;
-	cell *physAddrs[FORWARD_MAX_PARAMS];
+		delete *a;
-
+		*a = b;
-	const int STRINGEX_MAXLENGTH = 128;
-
-	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, ax = 0;
-			
-			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);
-					physAddrs[i] = tmp;
 	}
-				else if (m_ParamTypes[i] == FP_ARRAY)
-				{
-					cell *tmp;
-					amx_Allot(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 {
-						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 {
-					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;
-			int err = amx_Exec(amx, &retVal, iter->func);
-			
-			// 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();
-
-			// cleanup strings & arrays
-			for (i = 0; i < m_NumParams; ++i)
-			{
-				if (m_ParamTypes[i] == FP_STRING)
-				{
-					amx_Release(iter->pPlugin->getAMX(), realParams[i]);
-				}
-				else if (m_ParamTypes[i] == FP_STRINGEX)
-				{
-					// copy back
-					amx_GetStringOld(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 {
-							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]);
-				}
-			}
-
-			// decide what to do (based on exectype and retval)
-			switch (m_ExecType)
-			{
-				case ET_IGNORE:
-					break;
-				case ET_STOP:
-					if (retVal > 0)
-						return retVal;
-				case ET_STOP2:
-					if (retVal == 1)
-						return 1;
-					else if (retVal > globRetVal)
-						globRetVal = retVal;
-					break;
-				case ET_CONTINUE:
-					if (retVal > globRetVal)
-						globRetVal = retVal;
-					break;
-			}
-		}
-	}
-	
-	return globRetVal;
-}
-
-void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	m_Func = func;
-	m_Amx = amx;
-	m_NumParams = numParams;
-	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
-	m_HasFunc = true;
-	isFree = false;
-}
-
-void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	m_Amx = amx;
-	m_NumParams = numParams;
-	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
-	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
-	isFree = false;
-}
-
-cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
-{
-	if (isFree)
-		return 0;
-	
-	const int STRINGEX_MAXLENGTH = 128;
-
-	cell realParams[FORWARD_MAX_PARAMS];
-	cell *physAddrs[FORWARD_MAX_PARAMS];
-
-	if (!m_HasFunc)
-		return 0;
-	
-	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(m_Amx);
-	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);
-			physAddrs[i] = tmp;
-		}
-		else if (m_ParamTypes[i] == FP_ARRAY)
-		{
-			cell *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 {
-				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 {
-			realParams[i] = params[i];
-		}
-	}
-	
-	for (i = m_NumParams - 1; i >= 0; i--)
-		amx_Push(m_Amx, realParams[i]);
-	
-	// exec
-	cell retVal;
-	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;
-
-	// cleanup strings & arrays
-	for (i = 0; i < m_NumParams; ++i)
-	{
-		if (m_ParamTypes[i] == FP_STRING)
-		{
-			amx_Release(m_Amx, realParams[i]);
-		}
-		else if (m_ParamTypes[i] == FP_STRINGEX)
-		{
-			// copy back
-			amx_GetStringOld(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 {
-					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]);
-		}
-	}
-
-	return retVal;
-}
-
-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);
-	
-	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;
-	CSPForward *pForward;
-	
-	if (!m_FreeSPForwards.empty())
-	{
-		retVal = m_FreeSPForwards.front();
-		pForward = m_SPForwards[retVal >> 1];
-		pForward->Set(func, amx, numParams, paramTypes);
-		
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		
-		m_FreeSPForwards.pop();
-	} else {
-		retVal = (m_SPForwards.size() << 1) | 1;
-		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;
-}
-
-int CForwardMngr::registerSPForward(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	int retVal = (m_SPForwards.size() << 1) | 1;
-	CSPForward *pForward;
-	
-	if (!m_FreeSPForwards.empty())
-	{
-		retVal = m_FreeSPForwards.front();
-		pForward = m_SPForwards[retVal>>1];			// >>1 because unregisterSPForward pushes the id which contains the sp flag
-		pForward->Set(funcName, amx, numParams, paramTypes);
-		
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		
-		m_FreeSPForwards.pop();
-	} 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()));
-}
-
-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);
-	m_TmpArraysNum = 0;
-	
-	return retVal;
-}
-
-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
-{
-	return (id & 1) ? m_SPForwards[id >> 1]->getParamType(paramNum) : m_Forwards[id >> 1]->getParamType(paramNum);
 }
 
 void CForwardMngr::clear()
 {
-	for (ForwardVec::iterator iter = m_Forwards.begin(); iter != m_Forwards.end(); ++iter)
+	for ( int a = 0; a < FORWARD_NUM; ++a )
+		clearForwards( &head[ a ] );
+}
+
+void CForwardMngr::executeForwards( int type , int num , int player  ) {
+	
+	cell ret = 0;
+	int err;
+	CForward* a = head[ type ];
+	
+	while ( a )
 	{
-		delete *iter;
+		if ( a->getPlugin()->isExecutable( a->getFunction() ) )
-	}
-	
-	SPForwardVec::iterator spIter;
-	
-	for (spIter = m_SPForwards.begin(); spIter != m_SPForwards.end(); ++spIter)
 		{
-		delete (*spIter);
-	}
 			
-	m_Forwards.clear();
+			if ((err = amx_Exec(a->getPlugin()->getAMX(), &ret, a->getFunction() , num, player)) != AMX_ERR_NONE)
-	m_SPForwards.clear();
+				UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",	err,a->getPlugin()->getAMX()->curline,a->getPlugin()->getName());
 			
-	while (!m_FreeSPForwards.empty())
+			if ( ret )
-		m_FreeSPForwards.pop();
-	
-	m_TmpArraysNum = 0;
-}
-
-bool CForwardMngr::isSPForward(int id) const
-{
-	return ((id & 1) == 0) ? false : true;
-}
-
-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)
-{
-	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);
-}
-
-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);
+		a = a->next;
-	
-	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);
-}
-
-cell executeForwards(int id, ...)
-{
-	if (!g_forwards.isIdValid(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)
-		{
-			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)
-{
-	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)
-{
-	return g_forwards.prepareArray((void*)ptr, size, Type_Cell, copyBack);
-}
-
-cell prepareCharArray(char *ptr, unsigned int size, bool copyBack)
-{
-	return g_forwards.prepareArray((void*)ptr, size, Type_Char, copyBack);
-}
-
-void unregisterSPForward(int id)
-{
-	g_forwards.unregisterSPForward(id);
 }

amxmodx/CForward.h

@@ -29,201 +29,87 @@
 *  version.
 */
 
-/*
-	CForward.h
-	forwards
-	1) normal forwards: called in all plugins
-	2) single plugin (sp) forwards: called in one plugin
-
-	The SP Forwards are handled differently because they are expected to be created / deleted
-	often, but the "normal" forwards are expected to be initialized at start up.
-
-	Note about forward ids:
-		for normal forwards:	<index to vector> << 1
-		for sp forwards:		(<index to vector> << 1) | 1
-*/
-
 #ifndef FORWARD_H
 #define FORWARD_H
 
-#include <stdarg.h>
+// *****************************************************
-#include "sh_stack.h"
+// class CmdMngr
+// *****************************************************
 
-const int FORWARD_MAX_PARAMS = 32;
+#define FORWARD_NUM 12
 
-enum ForwardExecType
+enum {
-{
+	FF_ClientCommand,
-	ET_IGNORE = 0,					// Ignore return vaue
+	FF_ClientConnect,
-	ET_STOP,						// Stop on PLUGIN_HANDLED
+	FF_ClientDisconnect,
-	ET_STOP2,						// Stop on PLUGIN_HANDLED, continue on other values, return biggest return value
+	FF_ClientInfoChanged,
-	ET_CONTINUE,					// Continue; return biggest return value
+	FF_ClientPutInServer,
-};
+	FF_PluginInit,
-
+	FF_PluginCfg,
-enum ForwardParam
+	FF_PluginPrecache,
-{
+	FF_PluginLog,
-	FP_DONE = -1,					// specify this as the last argument
+	FF_PluginEnd,
-									// only tells the function that there are no more arguments
+	FF_InconsistentFile,
-	FP_CELL,						// normal cell
+	FF_ClientAuthorized,	
-	FP_FLOAT,						// float; used as normal cell though
-	FP_STRING,						// string
-	FP_STRINGEX,					// string; will be updated to the last function's value
-	FP_ARRAY,						// array; use the return value of prepareArray.
-};
-
-// for prepareArray
-enum ForwardArrayElemType
-{
-	Type_Cell = 0,
-	Type_Char
-};
-
-struct ForwardPreparedArray
-{
-	void *ptr;
-	
-	ForwardArrayElemType type;
-	
-	unsigned int size;
-	bool copyBack;
-};
-
-// Normal forward
-class CForward
-{
-	const char *m_FuncName;
-	ForwardExecType m_ExecType;
-	int m_NumParams;
-	
-	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);
-	CForward() {}		// leaves everything unitialized'
-	
-	cell execute(cell *params, ForwardPreparedArray *preparedArrays);
-	
-	int getParamsNum() const
-	{
-		return m_NumParams;
-	}
-	
-	int getFuncsNum() const
-	{
-		return m_Funcs.size();
-	}
-	
-	ForwardParam getParamType(int paramId) const
-	{
-		if (paramId < 0 || paramId >= m_NumParams)
-			return FP_DONE;
-		
-		return m_ParamTypes[paramId];
-	}
-};
-
-// Single plugin forward
-class CSPForward
-{
-	const char *m_FuncName;
-	int m_NumParams;
-	
-	ForwardParam m_ParamTypes[FORWARD_MAX_PARAMS];
-	AMX *m_Amx;
-	
-	int m_Func;
-	bool m_HasFunc;
-
-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;
-	}
-	
-	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
-
-	ForwardVec m_Forwards;
-
-	SPForwardVec m_SPForwards;
-	FreeSPVec m_FreeSPForwards;								// so we don't have to free memory
-
-	ForwardPreparedArray m_TmpArrays[FORWARD_MAX_PARAMS];	// used by prepareArray
-	int m_TmpArraysNum;
 public:
 	
-	CForwardMngr()
+	class iterator;
-	{ m_TmpArraysNum = 0; }
+
-	~CForwardMngr() {}
+	class CForward
+	{
+
+		friend class iterator;
+		friend class CForwardMngr;
+
+		CPluginMngr::CPlugin* plugin;
+		int function;
+		CForward* next;
+		CForward( CPluginMngr::CPlugin* p, int func  ) : plugin(p) , function(func) {next=0;}
+
+	public:
+		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
+		inline int getFunction() { return function; }
+
+
+
+	};
+	
+
+
+private:
+	CForward *head[ FORWARD_NUM ];
+	void clearForwards( CForward** a );
+
+public:
+	CForwardMngr() {memset( head, 0, sizeof(head));}
+	~CForwardMngr() { clear(); }
 
 	// Interface
-	// Register normal forward
-	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 registerForward(  CPluginMngr::CPlugin* p, int func , int type  );
-	void unregisterSPForward(int id);
+	void executeForwards( int type , int num = 0, int player = 0 );
+	void clear();	
 
-	// execute forward
-	cell executeForwards(int id, cell *params);
-	void clear();							// delete all forwards
 
-	bool isIdValid(int id) const;			// check whether forward id is valid
+	class iterator {
-	bool isSPForward(int id) const;			// check whether forward is single plugin
+		CForward *a;
-	int getParamsNum(int id) const;			// get num of params of a forward
+	public:
-	int getFuncsNum(int id) const;			// get num of found functions of a forward
+		iterator(CForward*aa) : a(aa) {}
-	
+		iterator& operator++() { a = a->next; return *this; }
-	ForwardParam getParamType(int id, int paramId) const;
+		bool operator==(const iterator& b) const { return a == b.a; }
-	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack);		// prepare array
+		bool operator!=(const iterator& b) const { return !operator==(b); }
+		operator bool () const { return a ? true : false; }
+		CForward& operator*() { return *a; }
+	};
+	inline iterator begin( int type ) const { return iterator(head[(int)type]); }
+	inline iterator end() const { return iterator(0); }
+	inline bool forwardsExist( int type ) {return head[(int)type]?true:false;}
 };
 
-// (un)register forward
-int registerForward(const char *funcName, ForwardExecType et, ...);
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num);
-int registerSPForwardByName(AMX *amx, const char *funcName, ...);
-int registerSPForwardByNameC(AMX *amx, const char *funcName, cell *list, size_t num);
-int registerSPForward(AMX *amx, int func, ...);
-void unregisterSPForward(int id);
 
-// execute forwards
+#endif
-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);
 
-#endif //FORWARD_H

amxmodx/CLang.h

@@ -1,203 +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_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 sKeyDef
-{
-	String *definition;
-	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;
-};
-
-class CLangMngr
-{
-	class CLang
-	{
-	public:
-		// Construct an empty CLang object
-		CLang();
-		// Construct a CLang object initialized with a language name
-		CLang(const char *lang);
-		// Destructor
-		~CLang();
-
-		// Get the definition
-		const char *GetDef(int key, int &status);
-		// Add definitions to this language
-		void MergeDefinitions(CQueue <sKeyDef> & vec);
-		// Reset this language
-		void Clear();
-
-		// compare this language to a language name
-		friend bool operator == (const CLang &left, const char *right)
-		{
-			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();
-	protected:
-		typedef THash<int, defentry> 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);
-	};
-
-	// 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);
-
-	typedef CVector<CLang*> LangVec;
-	typedef CVector<CLang*>::iterator LangVecIter;
-	
-	LangVec m_Languages;
-
-	CVector<md5Pair *> FileList;
-	CVector<String *> KeyList;
-	THash<String, keytbl_val> KeyTable;
-
-	// Get a lang object (construct if needed)
-	CLang * GetLang(const char *name);
-
-	CLang * GetLangR(const char *name);
-
-	// Current global client-id for functions like client_print with first parameter 0
-	int m_CurGlobId;
-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);
-	// Format a string
-	const char *Format(const char *src, ...);
-	// Format a string for an AMX plugin
-	char *FormatAmxString(AMX *amx, cell *params, int parm, int &len);
-	char *FormatString(const char *fmt, va_list &ap);
-	// Save
-	bool Save(const char *filename);
-	// Load
-	bool Load(const char *filename);
-	// Cache
-	bool LoadCache(const char *filename);
-	bool SaveCache(const char *filename);
-	void InvalidateCache();
-	// Get index
-	int GetKeyEntry(String &key);
-	int GetKeyEntry(const char *key);
-	int GetKeyIndex(const char *key);
-	// Get key from index
-	const char *GetKey(int key);
-	// Add key
-	int AddKeyEntry(String &key);
-
-	// Get the number of languages
-	int GetLangsNum();
-	// Get the name of a language
-	const char *GetLangName(int langId);
-	// Check if a language exists
-	bool LangExists(const char *langName);
-
-	// 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();
-
-	CLangMngr();
-	~CLangMngr();
-};
-
-#endif //_INCLUDE_CLANG_H

amxmodx/CList.h

@@ -36,294 +36,82 @@
 // class CList
 // *****************************************************
 
-// Linked list
 template <typename T, typename F = char* >
-class CList
+class CList {
-{
-private:
-	// One list element
-	class CElement
-	{
-		T *m_pObject;						// pointer to the object
-		CElement *m_pNext;					// pointer to the next element
-		CElement *m_pPrev;					// pointer to the previous element
-	public:
-		// dereference operator
-		T& operator* ()
-		{
-			return *m_pObject;
-		}
-
-		// constructor
-		CElement(T *pObj)
-		{
-			m_pObject = pObj;
-			m_pNext = NULL;
-			m_pPrev = NULL;
-		}
-
-		// destructor
-		~CElement()
-		{
-			delete m_pObject;
-			
-			if (m_pNext)
-				m_pNext->m_pPrev = m_pPrev;
-			
-			if (m_pPrev)
-				m_pPrev->m_pNext = m_pNext;
-		}
-
-		// returns object pointer
-		T *GetObj()
-		{
-			return m_pObject;
-		}
-
-		// returns next element pointer
-		CElement *GetNext()
-		{
-			return m_pNext;
-		}
-
-		// sets next element
-		void SetNext(CElement *newNext)
-		{
-			m_pNext = newNext;
-		}
-
-		// returns previous element pointer
-		CElement *GetPrev()
-		{
-			return m_pPrev;
-		}
-
-		// sets previous element
-		void SetPrev(CElement *newPrev)
-		{
-			m_pPrev = newPrev;
-		}
-	};
-
-	// CList<T, F> class
-	CElement *m_pHead;					// head of the linked list
-	CElement *m_pTail;					// tail of the linked list
 public:
-	// iterator class
+	class iterator;
-	class iterator
+	class CListEle {
-	{
+		friend class CList<T,F>;
-		friend class CList<T, F>;
+		friend class iterator;
-		
+		T* obj;
-		CList<T, F> *m_pList;			// The list that created this iterator
+		CListEle* next;
-		CElement *m_CurPos;				// Current position in the list
+		CListEle( T* a , CListEle* nn ) : obj(a) , next(nn) {}
 	public:
-		iterator()
+		T& operator* () { return *obj; }
-		{
+	};
-			m_pList = NULL;
+private:
-			m_CurPos = NULL;
+	CListEle *head;
+public:
+	CList<T,F>() { head = 0; }
+	~CList<T,F>() {	clear(); }
+	void clear() {
+		iterator a = begin();
+		while( a ) a.remove();
 	}
-
+	bool empty() {
-		// constructor based on list, element
+		return (head ? false : true);
-		iterator(CList<T, F> *pList, CElement *startPos)
-		{
-			m_pList = pList;
-			m_CurPos = startPos;
 	}
-
+	void put( T* a ) {	
-		// constructor based on other iterator
+		head = new CListEle( a , head ); 
-		iterator(const iterator &other)
-		{
-			m_pList = other.m_pList;
-			m_CurPos = other.m_CurPos;
 	}
-
+	int size() {
-		// dereference operator
+		CListEle *p = head;
-		T & operator* () const
+		int i = 0;
+		while (p)
 		{
-			return *m_CurPos->GetObj();
+			p = p->next;
+			++i;
 		}
-
+		return i;
-		T * operator-> () const
-		{
-			return m_CurPos->GetObj();
 	}
-
+	class iterator {
-		// validity check operator
+		CListEle** a;
-		inline operator bool () const
+	public:
-		{
+		iterator(CListEle** i=0) : a(i){}
-			return m_pList != NULL && m_CurPos != NULL && m_CurPos->GetObj() != NULL;
+		T& operator*() const {	return *(*a)->obj;}
-		}
+		inline operator bool () const { return (a && *a); }
-
+		inline iterator& operator++() {
-		// pre increment operator
+			a = &(*a)->next;
-		inline iterator& operator ++ ()
-		{
-			m_CurPos = m_CurPos->GetNext();
 			return *this;
 		}
-
+		inline iterator operator++(int) {
-		// post increment operator
+			iterator tmp(a);
-		inline iterator operator++(int)
+			a = &(*a)->next;
-		{
-			iterator tmp(*this);
-			m_CurPos = m_CurPos->next;
-			
 			return tmp;
 		}
-
+		iterator& remove(){
-		// returns iterator that points to next element
+			CListEle* aa = (*a)->next;
-		iterator GetNext()
+			delete (*a)->obj;
-		{
+			delete *a;
-			iterator tmp(*this);
+			*a = aa;
-			return ++tmp;
+			return *this;	
 		}
-
+		iterator& put( T* aa ){
-		iterator remove()
+			*a = new CListEle( aa , *a );
-		{
+			return *this;
-			return m_pList->remove(*this);
-		}
-		
-		iterator put(T *obj)
-		{
-			return m_pList->put(obj, *this);
 		}
 	};
-
+	inline iterator begin() { return iterator(&head); }
-	CList<T, F>()
+	iterator find( F a ){
-	{
+		iterator cc = begin();
-		m_pHead = NULL;
+		while(cc){
-		m_pTail = NULL;
+			if ( *cc == a )
-	}
-	
-	~CList<T, F>()
-	{
-		clear();
-	}
-
-	// removes the object referenced by where
-	// sets where to the next object
-	// returns an iterator pointing to the next object
-	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;
-	}
-
-	// puts an element to the end of the list
-	// returns an iterator pointing to it
-	iterator put_back(T *pObj)
-	{
-		CElement *pTmp = new CElement(pObj);
-		
-		if (!m_pHead)
-		{
-			m_pHead = pTmp;
-			m_pTail = pTmp;
-		} 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 {
-			pTmp->SetNext(m_pHead);
-			pTmp->SetPrev(NULL);
-			m_pHead->SetPrev(pTmp);
-			m_pHead = pTmp;
-		}
-		
-		return iterator(this, pTmp);
-	}
-
-	// alias for put_back
-	iterator put(T *pObj)
-	{
-		return put_back(pObj);
-	}
-
-	// puts an element after where
-	// alters where to point to the new element
-	// returns an iterator pointing to the new element
-	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
-			m_pTail = pTmp;
-
-		pTmp->SetPrev(where.m_CurPos);
-		pTmp->SetNext(where.m_CurPos->GetNext());
-
-		where.m_CurPos->SetNext(pTmp);
-		
-		return ++where;
-	}
-
-	iterator begin()
-	{
-		return iterator(this, m_pHead);
-	}
-
-	void clear()
-	{
-		iterator iter = begin();
-		while (iter) iter.remove();
-	}
-
-	iterator find(iterator startOn, const F &desc)
-	{
-		iterator iter = startOn;
-		while (iter)
-		{
-			if (*iter == desc)
 				break;
-			++iter;
+			++cc;
 		}
-		
+		return cc;
-		return iter;
-	}
-
-	iterator find(const F &desc)
-	{
-		return find(begin(), desc);
-	}
-
-	int size()
-	{
-		iterator iter = begin();
-		int i = 0;
-		
-		while (iter)
-		{
-			++i;
-			++iter;
-		}
-		
-		return i;
 	}
 };
 
-#endif //CLIST_H
+#endif
+

amxmodx/CLogEvent.cpp

@@ -29,290 +29,225 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 #include "CLogEvent.h"
 
 // *****************************************************
 // class LogEventsMngr
 // *****************************************************
-
+LogEventsMngr::LogEventsMngr() {
-LogEventsMngr::LogEventsMngr()
-{
   logCurrent = logCounter = 0;
   logcmplist = 0;
   arelogevents = false;
-	memset(logevents, 0, sizeof(logevents));
+  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 )
-	if (logid == parent->logCounter)
     return result;
-	
   logid = parent->logCounter;
-	
+  if ( in ) return result = strstr( string , text.str() ) ? 0 : 1;
-	if (in)
+  return result = strcmp(string,text.str());
-		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) )
-	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.str(), filter))
-	{
-		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 );
-	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 );
-	CLogCmp *cmp = parent->registerCondition(filter);
+	if ( cmp == 0 ) return;
-	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)
+			c->list = new LogCondEle( cmp , c->list );
-	{
-		if (c->argnum == cmp->pos)
-		{
-			c->list = new LogCondEle(cmp, c->list);
 			return;
 		}
 	}
-	
+	LogCondEle* aa = new LogCondEle( cmp , 0 );
-	LogCondEle* aa = new LogCondEle(cmp, 0);
+	if ( aa == 0 ) return;
-	
+	filters = new LogCond( cmp->pos , aa  , filters );
-	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);
+	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);
+	va_start ( logArgPtr , frmt );
-	int len = vsnprintf(logString, 255, frmt, logArgPtr);
+	int len = vsnprintf(logString, 255 , frmt, logArgPtr );
-	
+	if ( len == - 1) {
-	if (len == - 1)
-	{
 		len = 255;
 		logString[len] = 0;
 	}
-	
+	va_end ( logArgPtr );
-	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 ) 
-			while (*b && *b != '"' && a < 127) 
 		  logArgs[logArgc][a++] = *b++;
-			
       logArgs[logArgc++][a] = 0;
-			if (*b) b+=2; // thanks to double terminator
+      if ( *b) b+=2; // thanks to double terminator
     }
-		else if (*b == '(')
+    else if ( *b == '('  ) {
-		{
       ++b;
-			
+      while ( *b && *b != ')' && a < 127 ) 
-			while (*b && *b != ')' && a < 127) 
 		  logArgs[logArgc][a++] = *b++;
-			
       logArgs[logArgc++][a] = 0;
-			if (*b) b+=2;
+      if ( *b) b+=2;
-		} else {
+    }
-			while (*b && *b != '(' && *b != '"' && a < 127) 
+    else {
+      while ( *b && *b != '(' && *b != '"' && a < 127 ) 
 		  logArgs[logArgc][a++] = *b++;
-			if (*b) --a;
+      if ( *b ) --a;
       logArgs[logArgc++][a] = 0;
     }
   }
 }
 
-LogEventsMngr::CLogEvent* LogEventsMngr::registerLogEvent(CPluginMngr::CPlugin* plugin, int func, int pos)
+LogEventsMngr::CLogEvent* LogEventsMngr::registerLogEvent( CPluginMngr::CPlugin* plugin,  int func, int pos )
 {
-	if (pos < 1 || pos > MAX_LOGARGS)
+  if ( pos < 1 || pos > MAX_LOGARGS)
     return 0;
-
   arelogevents = true;
   CLogEvent** d = &logevents[pos];
-	
+  while(*d) d = &(*d)->next;
-	while (*d)
+  return *d = new CLogEvent( plugin , func, this );
-		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) {
-			for (CLogEvent::LogCondEle* c = b->list; c; c = c->next)
+				if ( c->cmp->compareCondition( logArgs[b->argnum] ) == 0 ){
-			{
-				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)
+					UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+						err,a->plugin->getAMX()->curline,a->plugin->getName());
 			}
+			
+#ifdef ENABLEEXEPTIONS
+		}
+		catch( ... )
+		{
+			UTIL_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()
+void LogEventsMngr::clearConditions() {
-{
+  while (logcmplist){
-	while (logcmplist)
-	{
     CLogCmp* a = logcmplist->next;
     delete logcmplist;
     logcmplist = a;
   }
 }
 
-LogEventsMngr::CLogEvent::LogCond::~LogCond()
+LogEventsMngr::CLogEvent::LogCond::~LogCond() {  
-{
+	while( list ) {
-	while (list)
-	{
 		LogCondEle* cc = list->next;
 		delete list;
 		list = cc;
 	}
 }
 
-LogEventsMngr::CLogEvent::~CLogEvent()
+LogEventsMngr::CLogEvent::~CLogEvent() {
-{
+	while( filters ) {
-	while (filters)
-	{
 		LogCond* cc = filters->next;
 		delete filters;
 		filters = cc;
 	}
 }
 
-LogEventsMngr::CLogEvent *LogEventsMngr::getValidLogEvent(CLogEvent * a)
+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) {
-			for (CLogEvent::LogCondEle* c = b->list; c; c = c->next)
+				if ( c->cmp->compareCondition( logArgs[b->argnum] ) == 0 ){
-			{
-				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,118 +62,105 @@ 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) {}
+		LogCondEle(CLogCmp *c, LogCondEle *n): cmp(c) , next(n) { }
 	};
-	
+	struct LogCond {
-		struct LogCond
-		{
-			int argnum;
-			
 		LogCondEle *list;
+		int argnum;
 		LogCond *next;
-			LogCond(int a, LogCondEle* ee, LogCond* n) : argnum(a), list(ee), next(n) {}
+		LogCond( int a , LogCondEle* ee , LogCond* n ) : argnum(a) , list(ee), next(n)  {}
 		~LogCond();
 	};
-		
     CPluginMngr::CPlugin *plugin;
-		
     int func;
-		
-		LogCond *filters;
 	LogEventsMngr* parent;
-		
+    LogCond *filters;
     CLogEvent *next;
-		CLogEvent(CPluginMngr::CPlugin *p, int f, LogEventsMngr* ppp) : plugin(p), func(f), filters(0), parent(ppp), next(0) {}
+    CLogEvent(CPluginMngr::CPlugin *p,int f, LogEventsMngr* ppp) : plugin(p),func(f), filters(0),parent(ppp) ,next(0) { }
     ~CLogEvent();
   public:
+
+	void registerFilter( char* filter );
 	inline CPluginMngr::CPlugin *getPlugin() { return plugin; }
-		void registerFilter(char* filter);
 	inline int getFunction() { return func; }
   };
 
 private:
-	CLogEvent *logevents[MAX_LOGARGS + 1];
-	CLogEvent *getValidLogEvent(CLogEvent * a);
-	CLogCmp* registerCondition(char* filter);
 
+  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);
+
+
+  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, va_list& vaptr);
+  void setLogString( char* frmt , ... );
-	void setLogString(char* frmt, ...);
+  void parseLogString(  );
-	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]; }
+  inline const char* getLogArg( int i ) { return ( i < 0 || i >=  logArgc ) ? "" : logArgs[ i ]; }
   void clearLogEvents();
 
-	class iterator
+
-	{
+  class iterator {
-		CLogEvent* a;
 	  LogEventsMngr* b;
-	
+	  CLogEvent* a;
   public:
-		inline iterator(CLogEvent*aa, LogEventsMngr* bb) : a(aa), b(bb) {}
+	  inline iterator(CLogEvent*aa,LogEventsMngr* bb) : a(aa), b(bb) {}
-			
+	  inline iterator& operator++() {
-		inline iterator& operator++()
+		  a = b->getValidLogEvent( a->next );
-		{
-			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); }
+	  inline bool operator!=(const iterator& c) const  { return !operator==(c); }
 	  CLogEvent& operator*() { return *a; }
-		operator bool () const { return a ? true : false; }
+	  operator bool ( ) const { return a ? true : false; }
   };
-	
+  inline iterator begin() { return iterator(getValidLogEvent(logevents[ logArgc ]),this); }
-	inline iterator begin() { return iterator(getValidLogEvent(logevents[logArgc]), this); }
+  inline iterator end() { return iterator(0,this); }
-	inline iterator end() { return iterator(0, this); }
 };
 
-#endif //LOGEVENTS_H
+#endif
+
+

amxmodx/CMenu.cpp

@@ -29,14 +29,15 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 #include "CMenu.h"
 
 // *****************************************************
 // 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,80 +48,30 @@ 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)
+  for( MenuIdEle* b = headid; b ; b = b->next) {
-	{
+    if ( (!b->amx || amx == b->amx) && strstr(name,b->name.str()) )
-		if ((!amx || !b->amx || amx == b->amx) && strstr(name,b->name.c_str()))
       return b->id;
   }
-	
   return 0;
 }
 
-void MenuMngr::removeMenuId(int id)
+int MenuMngr::registerMenuId(const char* n, AMX* a )
 {
-	MenuIdEle *n = headid;
+  int id = findMenuId( n, a );
-	MenuIdEle *l = NULL;
+  if (id) return id;
-	while (n)
+  headid = new MenuIdEle( n, a , headid  );
-	{
-		if (n->id == id)
-		{
-			if (l)
-				l->next = n->next;
-			else
-				headid = n->next;
-			delete n;
-			break;
-		}
-		l = n;
-		n = n->next;
-	}
-
-	MenuCommand *c = headcmd;
-	MenuCommand *lc = NULL;
-	MenuCommand *tmp;
-	while (c)
-	{
-		if (c->menuid == id)
-		{
-			if (lc)
-				lc->next = c->next;
-			else
-				headcmd = c->next;
-			tmp = c->next;
-			delete c;
-			c = tmp;
-		} else {
-			lc = c;
-			c = c->next;
-		}
-	}
-}
-
-int MenuMngr::registerMenuId(const char* n, AMX* a)
-{
-	int id = findMenuId(n, a);
-	
-	if (id)
-		return id;
-	
-	headid = new MenuIdEle(n, a, headid);
-	
-	if (!headid)
-		return 0;			// :TODO: Better error report
-	
   return headid->id;
 }
 
-void MenuMngr::registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f) 
+void MenuMngr::registerMenuCmd( CPluginMngr::CPlugin *a,int mi, int k , int f  ) 
 {
 	MenuCommand** temp = &headcmd;
-	while (*temp) temp = &(*temp)->next;
+	while(*temp) temp = &(*temp)->next;
-	*temp = new MenuCommand(a, mi, k, f);
+	*temp = new MenuCommand(a,mi, k,f);
 }
 
 void MenuMngr::clear() 

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,29 +65,28 @@ private:
 	  int menuid;
 	  int keys;
 	  int function;
-		
 	  MenuCommand* next;
-		MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f);
+	  MenuCommand( CPluginMngr::CPlugin *a, int mi, int k, int f );
   public:
 	  inline int getFunction() { return function; }
 	  inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
-		inline bool matchCommand(int m, int k) { return ((m == menuid) && (keys & k)); }
+	  inline bool matchCommand( int m, int k  ) { return ((m == menuid) && (keys & k)); }
   } *headcmd;
 	
 public:
+	
 	MenuMngr() { headid = 0;  headcmd = 0; }
 	~MenuMngr();
 
 	// Interface
 
+
 	int findMenuId(const char* name, AMX* a = 0);
-	int registerMenuId(const char* n, AMX* a);
+	int registerMenuId(const char* n, AMX* a );
-	void removeMenuId(int id);
+	void registerMenuCmd( CPluginMngr::CPlugin *a,int mi, int k , int f  );
-	void registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f);
 	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

@@ -28,13 +28,15 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
+
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
-#include "newmenus.h"
+
 // *****************************************************
 // class CPlayer
 // *****************************************************
-
+void CPlayer::Init( edict_t* e , int i )
-void CPlayer::Init(edict_t* e, int i)
 {
 	index = i;
 	pEdict = e;
@@ -49,8 +51,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();
@@ -58,107 +58,44 @@ 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));
-		}
-	}
-
-	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 = 0;
-	menu = 0;
-	newmenu = -1;
 }
-
+void CPlayer::PutInServer() {
-void CPlayer::PutInServer()
-{
   playtime = gpGlobals->time;
   ingame = true;
 }
-
+bool CPlayer::Connect(const char* connectname,const char* ipaddress) {
-int CPlayer::NextHUDChannel()
+  name.set(connectname);
-{
+  ip.set(ipaddress);
-	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)
-{
-	name.assign(connectname);
-	ip.assign(ipaddress);
   time = gpGlobals->time;
   bot = IsBot();
   death_killer = 0;
-	menu = 0;
+  memset(flags,0,sizeof(flags));
-	newmenu = -1;
+  memset(weapons,0,sizeof(weapons));
-	
-	memset(flags, 0, sizeof(flags));
-	memset(weapons, 0, sizeof(weapons));
-	
   initialized = true;
   authorized = false;
 
-	for (int i=0; i<=4; i++)
+  const char* authid = GETPLAYERAUTHID( pEdict );
-	{
-		channels[i] = 0.0f;
-		hudmap[i] = 0;
-	}
 
-	List<ClientCvarQuery_Info *>::iterator iter, end=queries.end();
+  if ( (authid == 0) || (*authid == 0) 
-	for (iter=queries.begin(); iter!=end; iter++)
+	  || (strcmp( authid , "STEAM_ID_PENDING") == 0) )
-	{
-		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))
 	return true;
 
   return false;
 }
 
+
+
 // *****************************************************
 // class Grenades
 // *****************************************************
-
+void Grenades::put( edict_t* grenade, float time, int type, CPlayer* player  )
-void Grenades::put(edict_t* grenade, float time, int type, CPlayer* player)
 {
   Obj* a = new Obj;
-	if (a == 0) return;
+  if ( a == 0 ) return;
   a->player = player;
   a->grenade = grenade;
   a->time = gpGlobals->time + time;
@@ -167,37 +104,33 @@ void Grenades::put(edict_t* grenade, float time, int type, CPlayer* player)
   head = a;
 }
 
-bool Grenades::find(edict_t* enemy, CPlayer** p, int& type)
+bool Grenades::find( edict_t* enemy, CPlayer** p, int& type )
 {
   bool found = false;
   Obj** a = &head;
-	
+  while ( *a ){
-	while (*a)
+    if ( (*a)->time > gpGlobals->time ) {
-	{
+      if ( (*a)->grenade == enemy ) {
-		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;
@@ -207,119 +140,93 @@ void Grenades::clear()
 // *****************************************************
 // class XVars
 // *****************************************************
-
+void XVars::clear()  {
-void XVars::clear()
-{
 	delete[] head;
 	head = 0;
 	num = 0;
 	size = 0;
 }
 
-int XVars::put(AMX* p, cell* v)
+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) )
-		if ((head[a].amx == p) && (head[a].value == v))
 		return a;
   }
 
-	if ((num >= size) && realloc_array(size ? (size * 2) : 8))
+  if ( (num >= size) && realloc_array( size ? (size * 2) : 8 ) )
 	return -1;
 
   head[num].value = v;
   head[num].amx = p;
-	
   return num++;
 }
 
-int XVars::realloc_array(int nsize)
+int XVars::realloc_array( int nsize )
 {
 	XVarEle* me = new XVarEle[nsize];
-	
+	if ( me ){
-	if (me)
+		for(int a = 0 ; a < num; ++a)
-	{
-		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() {
-TeamIds::~TeamIds()
+    while( head ) {
-{
-	while (head)
-	{
 		TeamEle* a = head->next;
 		delete head;
 		head = a;
     }
 }
 
-void TeamIds::registerTeam(const char* n, int s)
+void TeamIds::registerTeam( const char* n ,int s )
 {
     TeamEle** a = &head;
-	
+    while( *a ){
-	while (*a)
+		if ( strcmp((*a)->name.str(),n) == 0 ){
-	{
+			if (s != -1){
-		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 );
-	*a = new TeamEle(n, s);
+	if ( *a == 0 ) return;
-	
-	if (*a == 0)
-		return;
-	
     newTeam |= (1<<(*a)->tid);
 }
 
-int TeamIds::findTeamId(const char* n)
+int TeamIds::findTeamId( const char* n )
 {
 	TeamEle* a = head;
-	
+    while( a ){
-	while (a)
+		if ( !strcmpi(a->name.str(),n) )
-	{
-		if (!stricmp(a->name.c_str(), n))
 			return a->id;
 		a = a->next;
     }
-	
 	return -1;
 }
 
-int TeamIds::findTeamIdCase(const char* n)
+int TeamIds::findTeamIdCase( const char* n)
 {
 	TeamEle* a = head;
-	
+    while( a ){
-	while (a)
+		if ( !strcmp(a->name.str(), n) )
-	{
-		if (!strcmp(a->name.c_str(), n))
 			return a->id;
 		a = a->next;
     }
-	
 	return -1;
 }
 
 char TeamIds::TeamEle::uid = 0;
+

amxmodx/CMisc.h

@@ -33,47 +33,39 @@
 #define CMISC_H
 
 #include "CList.h"
-#include "sh_list.h"
+#include "string.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.name = (char*)name.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* getPluginName() { return plugin.str(); }
-	inline const char* getName() { return name.c_str(); }
+	inline const char* getName() { return name.str(); }
-	inline bool operator == (const char* string) { return (strcmp(name.c_str(), string) == 0); }
+	inline bool operator == ( const char* string ) const { return (strcmp(name.str(),string)==0); }
 };
 
+
+
 // *****************************************************
 // class CPlayer
 // *****************************************************
 
-struct ClientCvarQuery_Info
-{
-	int resultFwd;
-	int requestId;
-	int paramLen;
-	cell *params;
-};
-
 class CPlayer 
 {
+	
 public:
 	edict_t* pEdict;
 	
@@ -85,14 +77,11 @@ public:
 	bool ingame;
 	bool bot;
 	bool authorized;
-	bool vgui;	
 	
 	float time;
 	float playtime;
-	float menuexpire;
 	
-	struct
+	struct {
-	{
 		int ammo;
 		int clip;
 	} weapons[MAX_WEAPONS];
@@ -111,38 +100,27 @@ 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 Init(edict_t* e, int i);
 	void Disconnect();
 	void PutInServer();
+	bool Connect(const char* connectname,const char* ipaddress);
 
-	bool Connect(const char* connectname, const char* ipaddress);
+	inline bool IsBot(){
-
+		const char* auth= (*g_engfuncs.pfnGetPlayerAuthId)(pEdict);
-	inline bool IsBot()
+		return ( auth && !strcmp( auth , "BOT" ) );
-	{
-		return ((pEdict->v.flags & FL_FAKECLIENT) ? true : false);
 	}
 
-	inline bool IsAlive()
+	inline bool IsAlive(){
-	{
+		return ((pEdict->v.deadflag==DEAD_NO)&&(pEdict->v.health>0));
-		return ((pEdict->v.deadflag == DEAD_NO) && (pEdict->v.health > 0));
 	}
 
 	inline void Authorize() { authorized = true; }
 
-	int NextHUDChannel();
-
 };
 
 // *****************************************************
@@ -160,35 +138,31 @@ class Grenades
     Obj* next;
   } *head;
 
+
 public:
   Grenades() { head = 0; }
   ~Grenades() { clear(); }
-	
+  void put( edict_t* grenade, float time, int type, CPlayer* player  );
-	void put(edict_t* grenade, float time, int type, CPlayer* player);
+  bool find( edict_t* enemy, CPlayer** p, int& type );
-	bool find(edict_t* enemy, CPlayer** p, int& type);
   void clear();
 };
 
 // *****************************************************
 // class ForceObject
 // *****************************************************
-
+class ForceObject {
-class ForceObject
+    AMX* amx;
-{
     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 const char* getFilename() { return filename.str(); }
 	inline AMX* getAMX() { return amx; }
-	
 	Vector& getMin() { return mins; }
 	Vector& getMax() { return maxs; }
-	
 	inline FORCE_TYPE getForceType() { return type; }
 };
 
@@ -198,38 +172,30 @@ public:
 
 class XVars
 {
-	struct XVarEle
+  struct XVarEle  {
-	{
     AMX* amx;
     cell* value;
   };
   
   XVarEle* head;
-	
   int size;
   int num;
-	int realloc_array(int nsize);
+
+  int realloc_array( int nsize );
 
 public:
   XVars() {  num = 0;  size = 0;  head = 0; }
   ~XVars() { clear(); }
-	
   void clear();
-	int put(AMX* a, cell* v);
+  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;
-	{
-		return (a >= 0 && a < num) ? *(head[a].value) : 0;
   }
-
+  inline int setValue( int a, cell v ) { 
-	inline int setValue(int a, cell v)
+	  if ( a >= 0 && a < num ){
-	{ 
-		if (a >= 0 && a < num)
-		{
 		*(head[a].value) = v;
 		return 0;
 	  }
-
 	  return 1;
   }
 };
@@ -237,41 +203,34 @@ public:
 // *****************************************************
 // class CScript
 // *****************************************************
-
 class CScript
 {
 	String filename;
 	AMX* amx;
 	void* code;
 public:
-	CScript(AMX* aa, void* cc, const char* ff) : filename(ff), amx(aa), code(cc) {}
+	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 const char* getName() { return filename.str(); }
-	inline bool operator==(void* a) { return (amx == (AMX*)a); }
+	inline bool operator==( void* a ) { return (amx == (AMX*)a); }
 	inline void* getCode() { return code; }
 };
 
 // *****************************************************
 // 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; }
-		~TeamEle() { --uid; }
   } *head;
 
   int newTeam;
@@ -279,11 +238,15 @@ class TeamIds
 public:
   TeamIds();
   ~TeamIds();
-	
+  void registerTeam( const char* n ,int s );
-	void registerTeam(const char* n, int s);
+  int findTeamId( const char* n);
-	int findTeamId(const char* n);
+  int findTeamIdCase( const char* n);
-	int findTeamIdCase(const char* n);
   inline bool isNewTeam() { return newTeam ? true : false; }
 };
 
-#endif //CMISC_H
+
+
+#endif
+
+
+

amxmodx/CModule.cpp

@@ -29,255 +29,164 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 
-#ifndef FAR
+#ifndef FAR			// PM: Test: FAR
-	#define FAR
+#define FAR
 #endif
 
-// New
+typedef int (FAR *QUERYMOD)(module_info_s**);
-typedef void* (*PFN_REQ_FNPTR)(const char * /*name*/);
+typedef int (FAR *ATTACHMOD)(pfnamx_engine_g*,pfnmodule_engine_g*);
-typedef int (FAR *QUERYMOD_NEW)(int * /*ifvers*/, amxx_module_info_s * /*modInfo*/);
+typedef int (FAR *DETACHMOD)(void);
-typedef int (FAR *ATTACHMOD_NEW)(PFN_REQ_FNPTR /*reqFnptrFunc*/);
+
-typedef int (FAR *DETACHMOD_NEW)(void);
+QUERYMOD QueryModule;
-typedef void (FAR *PLUGINSLOADED_NEW)(void);
+ATTACHMOD AttachModule;
+DETACHMOD DetachModule;
+
+
+
+pfnamx_engine_g engAmxFunc = {
+  amx_Align16,
+  amx_Align32,
+  amx_Allot,
+  amx_Callback,
+  amx_Clone,
+  amx_Debug,
+  amx_Exec,
+  amx_Execv,
+  amx_FindPublic,
+  amx_FindPubVar,
+  amx_FindTagId,
+  amx_Flags,
+  amx_GetAddr,
+  amx_GetPublic,
+  amx_GetPubVar,
+  amx_GetString,
+  amx_GetTag,
+  amx_GetUserData,
+  amx_Init,
+  amx_InitJIT,
+  amx_MemInfo,
+  amx_NameLength,
+  amx_NativeInfo,
+  amx_NumPublics,
+  amx_NumPubVars,
+  amx_NumTags,
+  amx_RaiseError,
+  amx_Register,
+  amx_Release,
+  amx_SetCallback,
+  amx_SetDebugHook,
+  amx_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) : filename(fname)
 {
-	m_Filename.assign(fname);
+	metamod = false;
-	clear(false);
+	info = 0;
+	module = 0;
+	status = MODULE_NONE;
 }
-
 CModule::~CModule()
 {
-	// old & new
+	if ( module ) DLFREE(module);
-	if (m_Handle)
+	natives.clear();
-		DLFREE(m_Handle);
-
-	clear();
 }
-
-void CModule::clear(bool clearFilename)
-{
-	// old & new
-	m_Metamod = false;
-	m_Handle = NULL;
-	m_Status = MODULE_NONE;
-	
-	if (clearFilename)
-		m_Filename.assign("unknown");
-
-	// new
-	m_Amxx = false;
-	m_InfoNew.author = "unknown";
-	m_InfoNew.name = "unknown";
-	m_InfoNew.version = "unknown";
-	m_InfoNew.reload = 0;
-	m_MissingFunc = NULL;
-
-	m_Natives.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;
-}
-
 bool CModule::attachModule()
 {
-	// old & new
+	if ( status != MODULE_QUERY )
-	if (m_Status != MODULE_QUERY || !m_Handle)
 		return false;
-
+	AttachModule = (ATTACHMOD)DLPROC(module,"AMX_Attach");
-	if (m_Amxx)
+	if ( AttachModule )	(*AttachModule)(&engAmxFunc,&engModuleFunc);
-	{
+	status = MODULE_LOADED;
-		// new
-		ATTACHMOD_NEW AttachFunc_New = (ATTACHMOD_NEW)DLPROC(m_Handle, "AMXX_Attach");
-
-		if (!AttachFunc_New)
-			return false;
-		
-		g_ModuleCallReason = ModuleCall_Attach;
-		g_CurrentlyCalledModule = this;
-		int retVal = (*AttachFunc_New)(Module_ReqFnptr);
-		g_CurrentlyCalledModule = NULL;
-		g_ModuleCallReason = ModuleCall_NotCalled;
-
-		switch (retVal)
-		{
-			case AMXX_OK:
-				m_Status = MODULE_LOADED;
 	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;
-				return false;
-			case AMXX_FUNC_NOT_PRESENT:
-				m_Status = MODULE_FUNCNOTPRESENT;
-				m_MissingFunc = g_LastRequestedFunc;
-				return false;
-			default:
-				AMXXLOG_Log("[AMXX] Module \"%s\" (version \"%s\") returned an invalid code.", m_Filename.c_str(), getVersion());
-				m_Status = MODULE_BADLOAD;
-				return false;
-		}
-	} else {
-		m_Status = MODULE_BADLOAD;
-	}
-
-	return false;
 }
-
 bool CModule::queryModule()
 {
-	if (m_Status != MODULE_NONE)				// don't check if already queried
+	if ( status != MODULE_NONE ) // don't check if already quried
 		return false;
-
+	module = DLLOAD( filename.str() ); // link dll
-	m_Handle = DLLOAD(m_Filename.c_str());		// load file
+	if ( !module ){
-	if (!m_Handle)
+		status = MODULE_BADLOAD;
-	{
-		m_Status = MODULE_BADLOAD;
 		return false;
 	}
+	int meta = (int)DLPROC(module,"Meta_Attach"); // check if also MM
+	if ( meta ) metamod = true;
 
-	// Check whether the module uses metamod (for auto attach)
+	QueryModule = (QUERYMOD)DLPROC(module,"AMX_Query"); // check what version
-	if (DLPROC(m_Handle, "Meta_Attach"))
+	if (QueryModule == 0) {
-		m_Metamod = true;
+		status = MODULE_NOQUERY;
-
-	// Try new interface first
-	QUERYMOD_NEW queryFunc_New = (QUERYMOD_NEW)DLPROC(m_Handle, "AMXX_Query");
-	
-	if (queryFunc_New)
-	{
-		m_Amxx = true;
-		int ifVers = AMXX_INTERFACE_VERSION;
-		g_ModuleCallReason = ModuleCall_Query;
-		g_CurrentlyCalledModule = this;
-		int retVal = (*queryFunc_New)(&ifVers, &m_InfoNew);
-		g_CurrentlyCalledModule = NULL;
-		g_ModuleCallReason = ModuleCall_NotCalled;
-		
-		switch (retVal)
-		{
-			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;
-				return false;
-			case AMXX_IFVERS:
-				if (ifVers < AMXX_INTERFACE_VERSION)
-					m_Status = MODULE_OLD;
-				else
-					m_Status = MODULE_NEWER;
-				return false;
-			case AMXX_OK:
-				break;
-			default:
-				AMXXLOG_Log("[AMXX] Module \"%s\" (version \"%s\") returned an invalid code.", m_Filename.c_str(), getVersion());
-				m_Status = MODULE_BADLOAD;
 		return false;
 	}
-
+	(*QueryModule)( &info );
-		// Check for attach
+	if ( info == 0 ){
-		if (!DLPROC(m_Handle, "AMXX_Attach"))
+		status = MODULE_NOINFO;
-		{
-			m_Status = MODULE_NOATTACH;
 		return false;
 	}
-
+	if ( info->ivers != AMX_INTERFACE_VERSION )	{
-		m_Status = MODULE_QUERY;
+		status = MODULE_OLD;
+		return false;
+	}
+	AttachModule = (ATTACHMOD)DLPROC(module,"AMX_Attach"); // check for attach
+	if ( AttachModule == 0)	{
+		status = MODULE_NOATTACH;
+		return false;
+	}
+	info->serial = (long int)this;
+	status = MODULE_QUERY;
 	return true;
-	} else {
-		m_Status = MODULE_NOQUERY;
-		m_Amxx = false;
-		return false;
-	}
 }
-
 bool CModule::detachModule()
 {
-	if (m_Status != MODULE_LOADED)
+	if ( status != MODULE_LOADED )
 		return false;
-
+	DetachModule = (DETACHMOD)DLPROC(module,"AMX_Detach");
-	if (m_Amxx)
+	if (DetachModule) (*DetachModule)();
-	{
+	DLFREE(module);
-		DETACHMOD_NEW detachFunc_New = (DETACHMOD_NEW)DLPROC(m_Handle, "AMXX_Detach");
+	module = 0;
-		
+	natives.clear();
-		if (detachFunc_New)
+	status = MODULE_NONE;
-		{
-			g_ModuleCallReason = ModuleCall_Detach;
-			g_CurrentlyCalledModule = this;
-			(*detachFunc_New)();
-			g_CurrentlyCalledModule = NULL;
-			g_ModuleCallReason = ModuleCall_NotCalled;
-		}
-	}
-
-#ifndef FAKEMETA
-	if (IsMetamod())
-	{
-		UnloadMetamodPlugin(m_Handle);
-	}
-#endif
-	
-	DLFREE(m_Handle);
-	clear();
-	
 	return true;
 }
-
+const char* CModule::getStatus() const {
-void CModule::CallPluginsLoaded()
+	switch(status){
-{
-	if (m_Status != MODULE_LOADED)
-		return;
-
-	if (!m_Handle)
-		return;
-
-	PLUGINSLOADED_NEW func = (PLUGINSLOADED_NEW)DLPROC(m_Handle, "AMXX_PluginsLoaded");
-	
-	if (!func)
-		return;
-	
-	func();
-}
-
-const char* CModule::getStatus() const
-{
-	switch (m_Status)
-	{
 	case MODULE_NONE: return "error";
 	case MODULE_QUERY: return "pending";
-		case MODULE_BADLOAD:	return "bad load";
+	case MODULE_BADLOAD:return "bad load";
-		case MODULE_LOADED:		return "running";
+	case MODULE_LOADED:return "running";
-		case MODULE_NOINFO:		return "no info";
+	case MODULE_NOINFO:return "no info";
-		case MODULE_NOQUERY:	return "no query";
+	case MODULE_NOQUERY:return "no query";
-		case MODULE_NOATTACH:	return "no attach";
+	case MODULE_NOATTACH:return "no attach";
-		case MODULE_OLD:		return "old";
+	case MODULE_OLD:return "old";
-		case MODULE_FUNCNOTPRESENT:
-		case MODULE_NEWER:		return "newer";
-		case MODULE_INTERROR:	return "internal err";
-		case MODULE_NOT64BIT:	return "not 64bit";
-		default:				break;
 	}
-	
 	return "unknown";
 }

amxmodx/CModule.h

@@ -36,82 +36,49 @@
 #ifndef CMODULE_H
 #define CMODULE_H
 
-enum MODULE_STATUS
+enum MODULE_STATUS {
-{
+  MODULE_NONE,
-	MODULE_NONE,			// No module loaded
+  MODULE_QUERY,
-	MODULE_QUERY,			// Query failed
+  MODULE_BADLOAD,
-	MODULE_BADLOAD,			// Bad file or the module writer messed something up ;]
+  MODULE_LOADED,
-	MODULE_LOADED,			// Loaded
+  MODULE_NOINFO,
-	MODULE_NOINFO,			// No info
+  MODULE_NOQUERY,
-	MODULE_NOQUERY,			// No query function present
+  MODULE_NOATTACH,
-	MODULE_NOATTACH,		// No attach function present
+  MODULE_OLD
-	MODULE_OLD,				// Old interface
-	MODULE_NEWER,			// newer interface
-	MODULE_INTERROR,		// Internal error
-	MODULE_FUNCNOTPRESENT,	// Function not present
-	MODULE_NOT64BIT			// Not 64 bit compatible
 };
 
-struct amxx_module_info_s
-{
-	const char *name;
-	const char *author;
-	const char *version;
-	int reload;				// reload on mapchange when nonzero
-	const char *logtag;		//added in version 2
-};
-
-#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	3
-
 class CModule 
 {
-	String m_Filename;				// Filename
+	String filename;
+	bool metamod;
+	module_info_s* info;
+	DLHANDLE module;
+	MODULE_STATUS status;
 
-	bool m_Metamod;					// Using metamod?
-	bool m_Amxx;					// Using new module interface?
-	
-	amxx_module_info_s m_InfoNew;	// module info (new module interface)
-	DLHANDLE m_Handle;				// handle
-	MODULE_STATUS m_Status;			// status
-	const char *m_MissingFunc;		// missing function; only set on MODULE_FUNCNOTPRESENT status
-
-	void clear(bool clearFilename = true);
 public:
+
 	CModule(const char* fname);
 	~CModule();
 
 	// Interface
-	
 	bool attachModule();
 	bool queryModule();
 	bool detachModule();
-
-#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* getType() const { return metamod ? "amx&mm" : "amx"; }
-	inline const char* getAuthor() const { return m_InfoNew.author; }
+	inline const char* getAuthor() const { return info ? info->author : "unknown"; }
-	inline const char* getVersion() const { return m_InfoNew.version; }
+	inline const char* getVersion() const { return info ? info->version : "unknown"; }
-	inline const char* getName() const { return m_InfoNew.name; }
+	inline const char* getName() const { return info ? info->name : "unknown"; }	
-	inline const amxx_module_info_s* getInfoNew() const { return &m_InfoNew; }	// new
+	inline module_info_s* getInfo() const { return info; }
-	inline int getStatusValue() { return m_Status; }
+	inline int getStatusValue() { return status; }
-	inline bool operator==(const char* fname) { return !strcmp(m_Filename.c_str(), fname); }
+	inline bool operator==( void* fname ) { return !strcmp( filename.str() , (char*)fname );  }
-	inline bool isReloadable() { return ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)); }
+	inline bool isReloadable() { return ( (status==MODULE_LOADED) && (info->type==RELOAD_MODULE)); }
-	inline bool isAmxx() const { return m_Amxx; }
+	CList<AMX_NATIVE_INFO*> natives;
-	inline const char *getMissingFunc() const { return m_MissingFunc; }
-	inline const char *getFilename() { return m_Filename.c_str(); }
-	inline bool IsMetamod() { return m_Metamod; }
-	
-	void CallPluginsLoaded();
-
-	CList<AMX_NATIVE_INFO*> m_Natives;
 };
 
-#endif //CMODULE_H
+
+
+#endif
+
+
+

amxmodx/CPlugin.cpp

@@ -29,357 +29,174 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 #include "CPlugin.h"
 #include "CForward.h"
 #include "CFile.h"
-#include "amx.h"
-#include "natives.h"
-#include "debugger.h"
 
-extern const char *no_function;
+CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error) {	
-
-CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error, int debug)
-{	
 	CPlugin** a = &head;
-	
+	while( *a ) a = &(*a)->next;
-	while (*a)
+	*a = new CPlugin( pCounter++ ,path,name,error);
-		a = &(*a)->next;
+	return *error ? 0 : *a;
-	
-	*a = new CPlugin(pCounter++, path, name, error, debug);
-	
-	return (*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)
+	File fp( build_pathname("%s",filename) , "r" );
-		return;
 
-	pNatives = BuildNativeTable();
+	if ( !fp ) 
-	CPlugin *a = head;
-	
-	while (a)
 	{
-		if (a->getStatusCode() == ps_running)
+		UTIL_Log( "[AMXX] Plugins list not found (file \"%s\")",filename);
-		{
-			amx_Register(a->getAMX(), pNatives, -1);
-			a->Finalize();
-		}
-		a = a->next;
-	}
-	
-	m_Finalized = true;
-}
-
-int CPluginMngr::loadPluginsFromFile(const char* filename)
-{
-	char file[256];
-	FILE *fp = fopen(build_pathname_r(file, sizeof(file) - 1, "%s", filename), "rt");
-
-	if (!fp) 
-	{
-		AMXXLOG_Log("[AMXX] Plugins list not found (file \"%s\")", filename);
 		return 1;
 	}
 	
 	// Find now folder
-	char pluginName[256], error[256], debug[256];
+	char pluginName[256], line[256], error[256];
-	int debugFlag = 0;
+	const char *pluginsDir = get_localinfo("amxx_pluginsdir", "addons/amxx/plugins");
-	const char *pluginsDir = get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins");
 	
-	String line;
 	
-	while (!feof(fp)) 
+	while ( fp.getline(line , 255 ) ) 
 	{
-		pluginName[0] = '\0';
+		*pluginName = 0;
+		sscanf(line,"%s",pluginName);
+		if (!isalnum(*pluginName))  continue;
 				
-		debug[0] = '\0';
+		CPlugin* plugin = loadPlugin( pluginsDir , pluginName  , error  );
-		debugFlag = 0;
 		
-		line.clear();
+		if ( plugin != 0 ) // load_amxscript fills it with info in case of error
-		line._fread(fp);
-		sscanf(line.c_str(), "%s %s", pluginName, debug);
-		
-		if (!isalnum(*pluginName))
-			continue;
-
-		if (isalnum(*debug) && strcmp(debug, "debug") == 0)
 		{
-			debugFlag = 1;
+			AMX* amx = plugin->getAMX();
+			int iFunc;
+
+			if(amx_FindPublic(amx, "client_command" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_ClientCommand);
+			if(amx_FindPublic(amx, "client_connect" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_ClientConnect);
+			if(amx_FindPublic(amx, "client_disconnect" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_ClientDisconnect);
+			if(amx_FindPublic(amx, "client_infochanged" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_ClientInfoChanged);
+			if(amx_FindPublic(amx, "client_putinserver" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_ClientPutInServer);
+			if(amx_FindPublic(amx, "plugin_init" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_PluginInit);
+			if(amx_FindPublic(amx, "plugin_cfg" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_PluginCfg);
+			if(amx_FindPublic(amx, "plugin_precache" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_PluginPrecache);
+			if(amx_FindPublic(amx, "plugin_log" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_PluginLog);
+			if(amx_FindPublic(amx, "plugin_end" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_PluginEnd);
+			if(amx_FindPublic(amx, "inconsistent_file" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_InconsistentFile);
+			if(amx_FindPublic(amx, "client_authorized" , &iFunc) == AMX_ERR_NONE)
+				g_forwards.registerForward(  plugin , iFunc , FF_ClientAuthorized);
 		}
-
+		else
-		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, debugFlag);
-		
-		if (plugin->getStatusCode() == ps_bad_load)
 		{
-			char errorMsg[255];
+			UTIL_Log("[AMXX] %s (plugin \"%s\")", error, pluginName );
-			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 )
-	while (*a)
 		unloadPlugin(a);
-	
-	m_Finalized = false;
-	
-	if (pNatives)
-	{
-		delete [] pNatives;
-		pNatives = NULL;
-	}
 }
 
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(AMX *amx)
+CPluginMngr::CPlugin* CPluginMngr::findPluginFast(AMX *amx) 
 { 
+	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 )
-	while (a && &a->amx != amx)
+		a=a->next;
-		a = a->next;
-	
 	return a;
 }
 	
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(int index)
+CPluginMngr::CPlugin* CPluginMngr::findPlugin(int index){
-{
 	CPlugin*a = head;
-	
+	while ( a && index--)
-	while (a && index--)
+		a=a->next;
-		a = a->next;
-	
 	return a;
 }
 	
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(const char* name)
+CPluginMngr::CPlugin* CPluginMngr::findPlugin(const char* name) {
-{
+	if (!name) return 0;
-	if (!name)
-		return 0;
-	
 	int len = strlen(name);
-	
+	if (!len) return 0;
-	if (!len)
-		return 0;
-	
 	CPlugin*a = head;
-	
+	while( a && strncmp(a->name.str(), name,len) )
-	while (a && strncmp(a->name.c_str(), name, len))
+		a=a->next;
-		a = a->next;
-	
 	return a;
 }
 
-const char* CPluginMngr::CPlugin::getStatus() const
+const char* CPluginMngr::CPlugin::getStatus() const {
-{
+	switch(status){
-	switch (status)
+	case ps_running: return "running";
-	{
-		case ps_running: 
-		{
-			if (m_Debug)
-			{
-				return "debug";
-			} else {
-				return "running";
-			}
-			break;
-		}
 	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.set(unk);
-	title.assign(unk);
+	author.set(unk);
-	author.assign(unk);
+	version.set(unk);
-	version.assign(unk);
+	char* path = build_pathname("%s/%s",p,n);
-	
-	char file[256];
-	char* path = build_pathname_r(file, sizeof(file) - 1, "%s/%s", p, n);
 	code = 0;
-	memset(&amx, 0, sizeof(AMX));
+	int err = load_amxscript(&amx,&code,path,e );
-	int err = load_amxscript(&amx, &code, path, e, d);
+	if ( err == AMX_ERR_NONE ) status = ps_running;
-	
+	else status = ps_bad_load;
-	if (err == AMX_ERR_NONE)
+	amx.userdata[3] = this;
-	{
-		status = ps_running;
-	} else {
-		status = ps_bad_load;
-	}
-	
-	amx.userdata[UD_FINDPLUGIN] = this;
 	paused_fun = 0;
 	next = 0;
 	id = i;
+}
+CPluginMngr::CPlugin::~CPlugin( ){
+	unload_amxscript( &amx, &code );
+}
 
-	if (status == ps_running)
+void CPluginMngr::CPlugin::pauseFunction( int id ) { 
-	{
+	if (isValid()){
-		m_PauseFwd = registerSPForwardByName(&amx, "plugin_pause");
+		paused_fun |= (1<<id);
-		m_UnpauseFwd = registerSPForwardByName(&amx, "plugin_unpause");
+		g_commands.clearBufforedInfo();
-		
-		if (amx.flags & AMX_FLAG_DEBUG)
-		{
-			m_Debug = true;
-		} else {
-			m_Debug = false;
-		}
 	}
 }
 
-CPluginMngr::CPlugin::~CPlugin()
+void CPluginMngr::CPlugin::unpauseFunction( int id ) {
-{
+	if (isValid()) {
-	unload_amxscript(&amx, &code);
+		paused_fun &= ~(1<<id); 
-}
+		g_commands.clearBufforedInfo();
-
-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::setStatus( int a   ) { 
-void CPluginMngr::CPlugin::pauseFunction(int id)
-{ 
-}
-
-void CPluginMngr::CPlugin::unpauseFunction(int id)
-{
-}
-
-void CPluginMngr::CPlugin::setStatus(int a)
-{ 
 	status = a; 
 	g_commands.clearBufforedInfo(); // ugly way
 }
 
-// Pause a plugin
-void CPluginMngr::CPlugin::pausePlugin()
-{
-	if (isValid())
-	{
-		// call plugin_pause if provided
-		if (m_PauseFwd != -1)
-			executeForwards(m_PauseFwd);
 
-		setStatus(ps_paused);
-	}
-}
-
-// Unpause a plugin
-void CPluginMngr::CPlugin::unpausePlugin()
-{
-	if (isValid())
-	{
-		// set status first so the function will be marked executable
-		setStatus(ps_running);
-		
-		// call plugin_unpause if provided
-		if (m_UnpauseFwd != -1)
-			executeForwards(m_UnpauseFwd);
-	}
-}

amxmodx/CPlugin.h

@@ -36,18 +36,18 @@
 // class CPluginMngr
 // *****************************************************
 
-enum
+enum {
-{
+	ps_bad_load,
-	ps_bad_load,	//Load failed
+	ps_error,
-	ps_error,	//Erroneous state
+	ps_paused,
-	ps_locked,	//UNUSED
+	ps_running,
-	ps_paused,	//Plugin is temporarily paused
+	ps_stopped,
-	ps_stopped,	//Plugin is ... more temporarily paused
+	ps_locked
-	ps_running,	//Plugin is running
 };
 
 class CPluginMngr
 {
+
 public:
 
 	class iterator;
@@ -59,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);
+		~CPlugin( );
 
-		CPlugin(int i, const char* p, const char* n, char* e, int d);
-		~CPlugin();
-		
-		bool m_Debug;
 	public:
-		inline const char* getName() { return name.c_str();}
+
-		inline const char* getVersion() { return version.c_str();}
+		inline const char* getName() const { return name.str();}
-		inline const char* getTitle() { return title.c_str();}
+		inline const char* getVersion() const { return version.str();}
-		inline const char* getAuthor() { return author.c_str();}
+		inline const char* getTitle() const { return title.str();}
-		inline const char* getError() { return errorMsg.c_str();}
+		inline const char* getAuthor()const { return author.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.set(n); }
-		inline void setTitle(const char* n) { title.assign(n); }
+		inline void setAuthor( const char* n ) { author.set(n); }
-		inline void setAuthor(const char* n) { author.assign(n); }
+		inline void setVersion( const char* n ) { version.set(n); }
-		inline void setVersion(const char* n) { version.assign(n); }
+		inline bool isValid() const { return ((status != ps_bad_load) && (status != ps_locked)); }
-		inline void setError(const char* n) { errorMsg.assign(n); }
+		inline bool isPaused() const { return ( (status == ps_paused) || (status == ps_stopped)); }
-		inline bool isValid() const { return (status >= ps_paused); }
+		inline bool isFunctionPaused( int id ) const { return (paused_fun & (1<<id)) ? true : false; 	}
-		inline bool isPaused() const { return ((status == ps_paused) || (status == ps_stopped)); }
+		inline bool isExecutable(int id) const { 	return (isValid() && !isPaused() && !isFunctionPaused(id));	}
-		inline bool isExecutable(int id) const { return (isValid() && !isPaused());	}
+		inline void pausePlugin( ) { if ( isValid() ) setStatus(ps_paused); }
-		
+		inline void unpausePlugin( ) { if ( isValid() ) setStatus(ps_running); }
-		void Finalize();
+		void pauseFunction( int id );
-		void pausePlugin();
+		void unpauseFunction( int id );
-		void unpausePlugin();
+		void setStatus( int a   );
-		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(); }
 
-	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);
+	void unloadPlugin( CPlugin** a );
-	int loadPluginsFromFile(const char* filename);
+	int loadPluginsFromFile( const char* filename );
-	
+	CPlugin* findPluginFast(AMX *amx);
-	inline CPlugin* findPluginFast(AMX *amx) { return (CPlugin*)(amx->userdata[UD_FINDPLUGIN]); }
 	CPlugin* findPlugin(AMX *amx);
 	CPlugin* findPlugin(int index);
 	CPlugin* findPlugin(const char* name);
-	
 	inline int getPluginsNum() const { return pCounter; }
-	void Finalize();
 	void clear();
 
-	class iterator
+	class iterator {
-	{
 		CPlugin *a;
 	public:
 		iterator(CPlugin*aa) : a(aa) {}
@@ -142,9 +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); }
 };
 
-#endif //PLUGIN_H
+#endif
+
+

amxmodx/CQueue.h

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

amxmodx/CString.cpp

@@ -1,6 +1,7 @@
 /* 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
@@ -28,27 +29,41 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include "CString.h"
-#include "fakemeta.h"
+#include "string.h"
+#include "CFile.h"
 
-int LoadMetamodPlugin(const char *path, void **handle, PLUG_LOADTIME now)
+String::String()
 {
-	int err = 0;
+	len = 0;
-	if ( (err = LOAD_PLUGIN(PLID, path, now, handle)) || !*handle)
+	napis = 0;
-	{
-		LOG_MESSAGE(PLID, "Can't Attach Module \"%s\".", path);
-		return 0;
-	}
-
-	return 1;
 }
 
-int UnloadMetamodPlugin(void *handle)
+String::String( const char* n )
 {
-	if (UNLOAD_PLUGIN_BY_HANDLE(PLID, (void *)handle, PT_ANYTIME, PNL_PLUGIN))
+	napis = 0;
-	{
+	set(n);
-		return 0;
-	}
-
-	return 1;
 }
+
+String::~String()
+{
+	clear();
+}
+
+void String::set( const char* n )
+{
+	clear();
+	if ( n != 0 ){
+		len = strlen( n );
+		napis = new char[ len + 1 ];
+		if ( napis ) strcpy( napis , n );
+		else len = 0;
+	}
+}
+
+void String::clear() {
+	delete[] napis;
+	napis = 0;
+	len = 0;
+}
+

amxmodx/CString.h

@@ -29,385 +29,30 @@
 *  version.
 */
 
-#ifndef _INCLUDE_CSTRING_H
+#ifndef STRING_CUSTOM_H
-#define _INCLUDE_CSTRING_H
+#define STRING_CUSTOM_H
 
-#include <string.h>
+// *****************************************************
-#include <stdio.h>
+// class String
+// *****************************************************
 
-//by David "BAILOPAN" Anderson
 class String
 {
+  char* napis;
+  short int len;
+
 public:
-	String() 
+  String();
-	{
+  String( const char* n );
-		v = NULL;
+  ~String();
-		a_size = 0;
+  void set( const char* n );
-		//assign("");
+  inline bool empty() const {  return (len == 0); }
-	}
+  inline const char* str() const {  return napis ? napis : "(null)"; }
-
+  inline short int size() const {  return len; }
-	~String()
+  void clear();
-	{ 
-		if (v) 
-			delete [] v; 
-	}
-
-	String(const char *src) 
-	{
-		v = NULL; 
-		a_size = 0;
-		assign(src); 
-	}
-
-	const char * _fread(FILE *fp) 	 
-	{ 	 
-		Grow(512, false); 	 
-		char *ret = fgets(v, 511, fp); 	 
-		return ret; 	 
-	}
-
-	String(const String &src) 
-	{
-		v = NULL;
-		a_size = 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);
-		strcat(v, t);
-	}
-
-	void append(const char c)
-	{
-		size_t len = size();
-		Grow(len + 2);
-		v[len] = c;
-		v[len + 1] = '\0';
-	}
-
-	void append(String &d)
-	{
-		append(d.c_str());
-	}
-
-	void assign(const String &src)
-	{
-		assign(src.c_str());
-	}
-
-	void assign(const char *d)
-	{
-		if (!d)
-		{
-			clear();
-		} else {
-			size_t len = strlen(d);
-			Grow(len + 1, false);
-			memcpy(v, d, len);
-			v[len] = '\0';
-		}
-	}
-
-	void clear()
-	{
-		if (v)
-			v[0] = '\0';
-	}
-
-	int compare (const char *d) const
-	{
-		if (!v)
-			return strcmp("", d);
-		else
-			return strcmp(v, d);
-	}
-
-	//Added this for amxx inclusion
-	bool empty()
-	{
-		if (!v)
-			return true;
-
-		if (v[0] == '\0')
-			return true;
-
-		return false;
-	}
-
-	size_t size()
-	{
-		if (v)
-			return strlen(v);
-		else
-			return 0;
-	}
-
-	int find(const char c, int index = 0)
-	{
-		int len = static_cast<int>(size());
-		if (len < 1)
-			return npos;
-		if (index >= len || index < 0)
-			return npos;
-		int i = 0;
-		for (i=index; i<len; i++)
-		{
-			if (v[i] == c)
-			{
-				return i;
-			}
-		}
-
-		return npos;
-	}
-
-	bool is_space(int c)
-	{
-		if (c == '\f' || c == '\n' ||
-			c == '\t' || c == '\r' ||
-			c == '\v' || c == ' ')
-		{
-			return true;
-		}
-
-		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 (is_space(v[i]))
-			{
-				clear();
-				return;
-			} 
-		}
-
-		unsigned char c0 = v[0];
-
-		if (is_space(c0))
-		{
-			for (i=0; i<len; i++)
-			{
-				if (!is_space(v[i]) || (is_space(v[i]) && ((unsigned char)i==len-1)))
-				{
-					erase(0, i);
-					break;
-				}
-			}
-		}
-
-		len = strlen(v);
-
-		if (len < 1)
-		{
-			return;
-		}
-
-		if (is_space(v[len-1]))
-		{
-			for (i=len-1; i>=0; i--)
-			{
-				if (!is_space(v[i])
-					|| (is_space(v[i]) && i==0))
-				{
-					erase(i+1, j);
-					break;
-				}
-				j++;
-			}
-		}
-
-		if (len == 1)
-		{
-			if (is_space(v[0]))
-			{
-				clear();
-				return;
-			}
-		}
-	}
-
-	void erase(unsigned int start, int num = npos)
-	{
-		if (!v)
-			return;
-		unsigned int i = 0;
-		size_t len = size();
-		//check for bounds
-		if (num == npos || start+num > len-start)
-			num = len - start;
-		//do the erasing
-		bool copyflag = false;
-		for (i=0; i<len; i++)
-		{
-			if (i>=start && i<start+num)
-			{
-				if (i+num < len)
-				{	
-					v[i] = v[i+num];
-				} else {
-					v[i] = 0;
-				}
-				copyflag = true;
-			} else if (copyflag) {
-				if (i+num < len)
-				{
-					v[i] = v[i+num];
-				} else {
-					v[i] = 0;
-				}
-			}
-		}
-		len -= num;
-		v[len] = 0;
-	}
-
-	String substr(unsigned int index, int num = npos)
-	{
-		if (!v)
-		{
-			String b("");
-			return b;
-		}
-
-		String ns;
-
-		size_t len = size();
-
-		if (index >= len || !v)
-			return ns;
-		
-		if (num == npos)
-		{
-			num = len - index;
-		} else if (index+num >= len) {
-			num = len - index;
-		}
-
-		unsigned int i = 0;
-		unsigned int nslen = num + 2;
-
-		ns.Grow(nslen);
-
-		for (i=index; i<index+num; i++)
-			ns.append(v[i]);
-
-		return ns;
-	}
-
-	void toLower()
-	{
-		if (!v)
-			return;
-		unsigned int i = 0;
-		size_t len = strlen(v);
-		for (i=0; i<len; i++)
-		{
-			if (v[i] >= 65 && v[i] <= 90)
-				v[i] &= ~(1<<5);
-		}
-	}
-
-	String & operator = (const String &src)
-	{
-		assign(src);
-		return *this;
-	}
-
-	String & operator = (const char *src)
-	{
-		assign(src);
-		return *this;
-
-	}
-
-	char operator [] (unsigned int index)
-	{
-		if (index > size() || !v)
-		{
-			return -1;
-		} else {
-			return v[index];
-		}
-	}
-
-	int at(int a)
-	{
-		if (a < 0 || a >= (int)size() || !v)
-			return -1;
-
-		return v[a];
-	}
-
-	bool at(int at, char c)
-	{
-		if (at < 0 || at >= (int)size() || !v)
-			return false;
-
-		v[at] = c;
-
-		return true;
-	}
-
-private:
-	void Grow(unsigned int d, bool copy=true)
-	{
-		if (d <= a_size)
-			return;
-		char *n = new char[d + 1];
-		if (copy && v)
-			strcpy(n, v);
-		if (v)
-			delete [] v;
-		else
-			strcpy(n, "");			
-		v = n;
-		a_size = d + 1;
-	}
-
-	char *v;
-	unsigned int a_size;
-public:
-	static const int npos = -1;
 };
 
-#endif //_INCLUDE_CSTRING_H
+#endif
+
+
+

amxmodx/CTask.cpp

@@ -29,273 +29,164 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 #include "CTask.h"
 
-/*********************** CTask ***********************/
 
-int CTaskMngr::CTask::getTaskId() const
+CTaskMngr::CTask::CTask( CPluginMngr::CPlugin* p, int f, int flags, 
-{
+						int i, float base,  float exec,	int parlen , 
-	return m_iId;
+						const cell* par, int r){
-}
+	plugin = p;
+	func = f;
+	id = i;
+	next = 0;
+	prev = 0;
+	param_len = 0;
+	param = 0;
+	base_time = base;
+	exec_time = exec;
+	repeat = (flags & 1) ? r : 0;
+	loop = (flags & 2) ?  true : false;
+	afterstart = (flags & 4) ?  true : false;
+	beforeend = (flags & 8) ?  true : false;
 
-CPluginMngr::CPlugin *CTaskMngr::CTask::getPlugin() const
+	if ( parlen )
-{
-	return m_pPlugin;
-}
-
-void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
-{
-	clear();
-	m_bFree = false;
-
-	m_pPlugin = pPlugin;
-	m_iFunc = iFunc;
-	m_iId = iId;
-	m_fBase = fBase;
-
-	if (iFlags & 2)
 	{
-		m_bLoop = true;
+		param = new cell[ parlen + 1 ];
-		m_iRepeat = -1;
-	}
-	else if (iFlags & 1)
-	{
-		m_bLoop = true;
-		m_iRepeat = iRepeat;
-	}
 
-	m_bAfterStart =	(iFlags & 4) ? true : false;
+		if ( param ){
-	m_bBeforeEnd = (iFlags & 8) ? true : false;
+			param_len = parlen + 1;
-
+			memcpy( param , par , sizeof( cell ) * parlen );
-	m_fNextExecTime = fCurrentTime + m_fBase;
+			param[ parlen ] = 0; 
-
-	if (iParamsLen)
-	{
-		m_iParamLen = iParamsLen + 1;
-		m_pParams = new cell[m_iParamLen];
-		memcpy(m_pParams, pParams, sizeof(cell)*iParamsLen);
-		m_pParams[iParamsLen] = 0;
-	} else {
-		m_iParamLen = 0;
-		m_pParams = NULL;
-	}
-}
-
-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
-{
-	return m_bFree;
-}
-
-void CTaskMngr::CTask::changeBase(float fNewBase)
-{
-	m_fBase = fNewBase;
-}
-
-void CTaskMngr::CTask::resetNextExecTime(float fCurrentTime)
-{
-	m_fNextExecTime = fCurrentTime + m_fBase;
-}
-
-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)
-			execute = true;
-	}
-	else if (m_bBeforeEnd)
-	{
-		if (fTimeLimit != 0.0f && (fTimeLeft + fTimeLimit * 60.0f) - fCurrentTime - 1.0f <= m_fBase)
-			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_iParamLen)	// call with parameters
-			{
-				cell arr = prepareCellArray(m_pParams, m_iParamLen);
-				executeForwards(m_iFunc, arr, m_iId);
-			} else {
-				executeForwards(m_iFunc, m_iId);
-			}
-		}
-	
-		if (isFree())
-			return;
-
-		// set new exec time OR remove the task if needed
-		if (m_bLoop)
-		{
-			if (m_iRepeat != -1 && --m_iRepeat <= 0)
-				done = true;
-		} else {
-			done = true;
-		}
-
-		if (done)
-		{
-			clear();
-		} else {
-			m_fNextExecTime += m_fBase;
 		}
 	}
 }
 
-CTaskMngr::CTask::CTask()
+CTaskMngr::CTask* CTaskMngr::getFirstValidTask(CTask* h){
-{
+	CTask* a = h;
-	m_bFree = true;
+	while( a ) {
-
+		if ( a->isRemoved() )  {
-	m_pPlugin = NULL;
+			CTask* b = a->next;
-	m_iFunc = -1;
+			unlink( a );
-	m_iId = 0;
+			delete a;
-	m_fBase = 0.0f;
+			a = b;
-
-	m_iRepeat =	0;
-	m_bLoop = false;
-	m_bAfterStart =	false;
-	m_bBeforeEnd = false;
-
-	m_fNextExecTime = 0.0f;
-
-	m_iParamLen = 0;
-	m_pParams = NULL;
-}
-
-CTaskMngr::CTask::~CTask()
-{
-	clear();
-}
-
-/*********************** CTaskMngr ***********************/
-
-CTaskMngr::CTaskMngr()
-{
-	m_pTmr_CurrentTime = NULL;
-	m_pTmr_TimeLimit = NULL;
-	m_pTmr_TimeLeft = NULL;
-}
-
-CTaskMngr::~CTaskMngr()
-{
-	clear();
-}
-
-void CTaskMngr::registerTimers(float *pCurrentTime, float *pTimeLimit, float *pTimeLeft)
-{
-	m_pTmr_CurrentTime = pCurrentTime;
-	m_pTmr_TimeLimit = pTimeLimit;
-	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)
-{
-	// 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 {
-		// 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);
-	}
-}
-
-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;
-}
-
-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);
-		iter->resetNextExecTime(*m_pTmr_CurrentTime);
-		++i;
-		iter = m_Tasks.find(++iter, descriptor);
-	}
-	
-	return i;
-}
-
-bool CTaskMngr::taskExists(int iId, AMX *pAmx)
-{
-	return m_Tasks.find(CTaskDescriptor(iId, pAmx));
-}
-
-void CTaskMngr::startFrame()
-{
-	for (TaskListIter iter = m_Tasks.begin(); iter; ++iter)
-	{
-		if (iter->isFree())
 			continue;
-		iter->executeIfRequired(*m_pTmr_CurrentTime, *m_pTmr_TimeLimit, *m_pTmr_TimeLeft);
+		}
+		else if (  a->afterstart  ){
+			if ( *m_timer - *m_timeleft + 1 < a->base_time ) {
+				a = a->next;
+				continue;
+			}
+		}
+		else if ( a->beforeend ){
+			if ( *m_timelimit == 0 ){
+				a = a->next;
+				continue;
+			}
+			if (  (*m_timeleft + *m_timelimit * 60.0) - *m_timer - 1 >
+				a->base_time ){
+				a = a->next;
+				continue;
+			}
+		}
+		else if ( a->exec_time > *m_timer ) {
+			a = a->next;
+			continue;
+		}
+		return a;
+	}
+	return 0;
+}
+
+CTaskMngr::CTask* CTaskMngr::getNextTask(CTask* a) {
+	if ( a->isRemoved() )
+		return a->next;
+	if ( a->loop || a->isToReply() ){
+		a->exec_time = *m_timer + a->base_time;
+		return a->next;
+	}
+	a->setToRemove();
+	return a->next;
+}
+
+
+CTaskMngr::CTaskMngr() {
+	head = 0;
+	tail = 0;
+	m_timer = 0;
+	m_timelimit = 0;
+	m_timeleft = 0;
+}
+
+CTaskMngr::~CTaskMngr() {
+	clear();
+}
+
+void CTaskMngr::clear() {
+	while ( head )  {
+		tail = head->next;
+		delete head;
+		head = tail;
 	}
 }
 
-void CTaskMngr::clear()
+void CTaskMngr::registerTimers( float* timer , float* timelimit, float* timeleft ) {
-{
+	m_timer = timer;
-	m_Tasks.clear();
+	m_timelimit = timelimit;
+	m_timeleft = timeleft;
 }
+
+void CTaskMngr::registerTask( CPluginMngr::CPlugin* plugin, int func,
+							 int flags, int i, float base,  float exec, 
+							 int parlen , const cell* par, int repeat ){
+
+	CTask* a = new CTask(plugin,func,flags,i,base,exec,parlen,par,repeat );
+
+	if ( a == 0 ) return;
+
+	if ( tail ) 
+	{
+		tail->next = a;
+		a->prev = tail;
+		tail = a;
+	}
+	else {
+		head = a;
+		tail = a;
+	}
+}
+
+CTaskMngr::CTask* CTaskMngr::findTask( int id , AMX* amx )
+{
+	for (CTask* a = head; a ; a = a->next) 
+	{
+		if ( !a->isRemoved() && (a->getTaskId() == id) && (!amx || 
+			(a->getPlugin()->getAMX() == amx)) )
+			return a;
+	}
+	
+	return 0;
+}
+
+void CTaskMngr::unlink(CTask* a){
+	if ( a->prev ) a->prev->next = a->next;
+	else head = a->next;
+	if ( a->next ) a->next->prev  = a->prev;
+	else tail = a->prev;
+}
+
+int CTaskMngr::removeTasks( int id , AMX* amx )
+{
+	CTask* a;
+	int i = 0;
+	
+	while ( (a = findTask(id, amx )) != 0 )	{
+		a->setToRemove();
+		++i;
+	}
+	
+	return i;
+}
+

amxmodx/CTask.h

@@ -32,94 +32,97 @@
 #ifndef CTASK_H
 #define CTASK_H
 
+// *****************************************************
+// class CTaskMngr
+// *****************************************************
+
 class CTaskMngr
 {
-private:
+public:
-	/*** class CTask ***/
+	
+	class iterator;
+
 	class CTask
 	{
-		// task settings
 
-		CPluginMngr::CPlugin *m_pPlugin;
+		friend class iterator;
-		cell m_iId;
+		friend class CTaskMngr;
-		int m_iFunc;
-		int m_iRepeat;
 
-		bool m_bLoop;
+		CPluginMngr::CPlugin* plugin;
-		bool m_bAfterStart;
+		int id;
-		bool m_bBeforeEnd;
+		int func;
-		float m_fBase;		// for normal tasks, stores the interval, for the others, stores the amount of time before start / after end
+		int repeat;
-		int m_iParamLen;
+		bool loop;
+		bool afterstart;
+		bool beforeend;
+		float base_time;
+		float exec_time;
+		int param_len;
+		cell* param;
+		CTask* next;
+		CTask* prev;
+		inline void setToRemove() { exec_time = -1.0f; }
+		inline bool isToReply() { return  (repeat-- > 0); }
+		inline bool isRemoved() { return (exec_time == -1.0f);  }
+		CTask( CPluginMngr::CPlugin* p, int f, int flags, int i, 
+			float base,  float exec, int parlen , const cell* par, int r );
+		~CTask() { if ( param_len ) delete[] param; }	
 	
-		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;
 
-		CPluginMngr::CPlugin *getPlugin() const;
+		inline int getParamLen() { return param_len; }
-		int getTaskId() const;
+		inline int getTaskId() { return id; }
-
+		inline int getFunction() { return func; }
-		void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
+		cell* getParam() { return param; }
-
+		CPluginMngr::CPlugin* getPlugin() { return plugin; }
-		void changeBase(float fNewBase);
-		void resetNextExecTime(float fCurrentTime);
-
-		bool shouldRepeat();
-
-		CTask();
-		~CTask();
 	};
 
-	class CTaskDescriptor
-	{
-	public:
-		cell m_iId;
-		AMX *m_pAmx;
-		bool m_bFree;
 
-		CTaskDescriptor(int iId, AMX *pAmx, bool bFree = false)
-		{
-			m_iId = iId;
-			m_pAmx = pAmx;
-			m_bFree = bFree;
-		}
 
-		friend bool operator == (const CTask &left, const CTaskDescriptor &right)
+private:  
-		{
-			if (right.m_bFree)
-				return left.isFree();
 	
-			return !left.isFree() && (right.m_pAmx ? left.getPlugin()->getAMX() == right.m_pAmx : true) && left.getTaskId() == right.m_iId;
+	friend class iterator;
-		}
+	CTask *head;
-	};
+	CTask *tail;
+	float* m_timer;
+	float* m_timelimit;
+	float* m_timeleft;
+	CTask* getFirstValidTask(CTask* a);
+	CTask* getNextTask(CTask* a);	
+	CTask* findTask( int id , AMX* amx );
+	void unlink(CTask* a);
 
-	/*** 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
+	// Interface
-	void registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat);
 
-	int removeTasks(int iId, AMX *pAmx);											// remove all tasks that match the id and amx
-	int changeTasks(int iId, AMX *pAmx, float fNewBase);							// change all tasks that match the id and amx
-	bool taskExists(int iId, AMX *pAmx);
 
-	void startFrame();
+	void registerTimers( float* timer , float* timelimit, float* timeleft );
+	void registerTask( CPluginMngr::CPlugin* plugin, int func, int flags, int i, float base, float exec, int parlen , const cell* par, int repeat );
+	inline int taskExists(  int id ,AMX* amx) { return findTask(id,amx ) ? 1 : 0; }
+	int removeTasks( int id , AMX* amx );
 	void clear();
+
+	class iterator {
+		CTaskMngr* b;
+		CTask* a;
+	public:
+		iterator(CTask*aa,CTaskMngr* bb) : a(aa), b(bb) {}
+		iterator& operator++() {
+			a = b->getNextTask( a );
+			a = b->getFirstValidTask( a );
+			return *this;
+		}
+		CTask& operator*() { return *a; }
+		operator bool ( ) const { return a ? true : false; }
+	};
+	inline iterator begin() { return iterator(getFirstValidTask(head),this); }
+
 };
 
-#endif //CTASK_H
+#endif
+
+

amxmodx/CVault.cpp

@@ -29,57 +29,55 @@
 *  version.
 */
 
+#include "CVault.h"
+#include "CFile.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include "amxmodx.h"
-#include "CVault.h"
-#include "CFile.h"
 
 // *****************************************************
 // class Vault
 // *****************************************************
-
+bool Vault::exists( const char* k )
-bool Vault::exists(const char* k)
 {
-	if (*k == 0) return false;
+	if ( *k == 0 ) return false;
 
-	return *find(k) != 0;
+	return *find( k ) != 0;
 }
 
-void Vault::put(const char* k, const char* v)
+void Vault::put( const char* k, const char* v )
 {
-	if (*k == 0) return;
+	if ( *k == 0 ) return;
 
-	if (*v == 0)
+	if ( *v == 0 )
 	{
-		remove(k);
+		remove( k );
 		return;
 	}
 
-	Obj** a = find(k);
+	Obj** a = find( k );
 
-	if (*a)
+	if ( *a )
 	{
-		(*a)->value.assign(v);
+		(*a)->value.set(v);
-		(*a)->number = atoi(v);
+		(*a)->number = atoi( v );
 	}
 	else
-		*a = new Obj(k, v);
+		*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);
 }
 
-Vault::Obj** Vault::find(const char* n)
+Vault::Obj** Vault::find( const char* n )
 {
 	Obj** a = &head;
 
-	while (*a)
+	while( *a )
 	{
-		if (strcmp((*a)->key.c_str(), n) == 0)
+		if ( strcmp((*a)->key.str(), n) == 0 )
 			return a;
 
 		a = &(*a)->next;
@@ -89,31 +87,31 @@ Vault::Obj** Vault::find(const char* n)
 }
 
 
-int Vault::get_number(const char* n)
+int Vault::get_number( const char* n )
 {
-	if (*n == 0) return 0;
+	if ( *n == 0 ) return 0;
 
-	Obj* b = *find(n);
+	Obj* b = *find( n );
 
-	if (b == 0) return 0;
+	if ( b == 0 ) return 0;
 
 	return b->number;
 }
 
-const char* Vault::get(const char* n)
+const char* Vault::get( const char* n )
 {
-	if (*n == 0) return "";
+	if ( *n == 0 ) return "";
 
-	Obj* b = *find(n);
+	Obj* b = *find( n );
 
-	if (b == 0) return "";
+	if ( b == 0 ) return "";
 
-	return b->value.c_str();
+	return b->value.str();
 }
 
 void Vault::clear()
 {
-	while (head)
+	while ( head )
 	{
 		Obj* a = head->next;
 		delete head;
@@ -121,57 +119,58 @@ void Vault::clear()
 	}
 }
 
-void Vault::remove(const char* n)
+void Vault::remove( const char* n )
 {
-	Obj** b = find(n);
+	Obj** b = find( n );
 
-	if (*b == 0) return;
+	if ( *b == 0 ) return;
 
 	Obj* a = (*b)->next;
 	delete *b;
 	*b = a;
 }
 
-void Vault::setSource(const char* n)
+void Vault::setSource( const char* n )
 {
-	path.assign(n);
+	path.set(n);
 }
 
-bool Vault::loadVault()
+
+bool Vault::loadVault(  )
 {
-	if (path.empty()) return false;
+	if ( path.empty() ) return false;
 
 	clear();
 
-	File a(path.c_str(), "r");
+	File a( path.str() , "r" );
 
-	if (!a) return false;
+	if ( !a ) return false;
 
 	const int sz = 512;
-	char value[sz + 1];
+	char value[sz+1];
-	char key[sz + 1];
+	char key[sz+1];
 
-	while (a >> key && a.skipWs() && a.getline(value, sz))
+	while ( a >> key && a.skipWs() && a.getline( value , sz ) )
 	{
-		if (isalpha(*key))
+		if ( isalpha ( *key ) )
-			put(key, value);
+			put( key, value );
 	}
 
 	return true;
 
 }
 
-bool Vault::saveVault()
+bool Vault::saveVault( )
 {
-	if (path.empty()) return false;
+	if ( path.empty() ) return false;
 
-	File a(path.c_str(), "w");
+	File a( path.str() , "w" );
 
-	if (!a) return false;
+	if ( !a ) return false;
 
 	a << "; Don't modify!" << '\n';
 
-	for (Obj* b = head; b; b = b->next)
+	for (Obj* b = head; b ;b = b->next)
 		a << b->key << '\t' << b->value << '\n';
 
 	return true;

amxmodx/CVault.h

@@ -45,43 +45,38 @@ class Vault
   {
 	String key;
 	String value;
-		
 	int number;
     Obj *next;
-		Obj(const char* k, const char* v);
+	Obj( const char* k,  const char* v);
   } *head;
 
   String path;
 
-	Obj** find(const char* n);
+  Obj** find( const char* n );
 
 public:
 
-	Vault() { head = 0; }
+  Vault() {head=0;}
-	~Vault() { clear(); }
+  ~Vault() { clear();}
 
 	// Interface
 
-	bool exists(const char* k);
+  bool exists( const char* k );
-	
   void put(const char* k, const char* v);
-	void remove(const char* k);
+  void remove( const char* k );
-	
+  const char* get( const char* n );
-	const char* get(const char* n);
+  int get_number( const char* n );
-	int get_number(const char* n);
+  void setSource( const char* n );
-	void setSource(const char* n);
+  bool loadVault( );
-	
+  bool saveVault( );
-	bool loadVault();
-	bool saveVault();
-	
   void clear();
 
-	class iterator
+
-	{
+  class iterator {
 	Obj * a;
   public:
-		iterator(Obj* aa) : a(aa) {}
+	iterator(Obj*aa) : a(aa) {}
-		iterator& operator++() { if (a) a = a->next; return *this; }
+	iterator& operator++() { if ( a ) a = a->next; return *this; }
 	bool operator==(const iterator& b) const { return a == b.a; }
 	bool operator!=(const iterator& b) const { return !operator==(b); }
 	String& key() const { return a->key; }
@@ -92,4 +87,7 @@ public:
   inline iterator end() const { return iterator(0); }
 };
 
-#endif //VAULT_CUSTOM_H
+#endif
+
+
+

amxmodx/CVector.h

@@ -1,491 +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 __CVECTOR_H__
-#define __CVECTOR_H__
-
-#include <assert.h>
-
-// Vector
-template <class T> class CVector
-{
-	bool Grow()
-	{
-		// automatic grow
-		size_t newSize = m_Size * 2;
-		if (newSize == 0)
-			newSize = 8;					// a good init value
-		T *newData = new T[newSize];
-		if (!newData)
-			return false;
-		if (m_Data)
-		{
-			for (size_t i=0; i<m_CurrentUsedSize; i++)
-				newData[i] = m_Data[i];
-			delete [] m_Data;
-		}
-		m_Data = newData;
-		m_Size = newSize;
-		return true;
-	}
-
-	bool GrowIfNeeded()
-	{
-		if (m_CurrentUsedSize >= m_Size)
-			return Grow();
-		else
-			return true;
-	}
-
-	bool ChangeSize(size_t size)
-	{
-		// 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];
-			delete [] m_Data;
-		}
-		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;
-public:
-	class iterator
-	{
-	protected:
-		T *m_Ptr;
-	public:
-		// constructors / destructors
-		iterator()
-		{
-			m_Ptr = NULL;
-		}
-
-		iterator(T * ptr)
-		{
-			m_Ptr = ptr;
-		}
-
-		// member functions
-		T * base()
-		{
-			return m_Ptr;
-		}
-
-		const T * base() const
-		{
-			return m_Ptr;
-		}
-
-		// operators
-		T & operator*()
-		{
-			return *m_Ptr;
-		}
-
-		T * operator->()
-		{
-			return m_Ptr;
-		}
-
-		iterator & operator++()		// preincrement
-		{
-			++m_Ptr;
-			return (*this);
-		}
-
-		iterator operator++(int)	// postincrement
-		{
-			iterator tmp = *this;
-			++m_Ptr;
-			return tmp;
-		}
-
-		iterator & operator--()		// predecrement
-		{
-			--m_Ptr;
-			return (*this);
-		}
-
-		iterator operator--(int)	// postdecrememnt
-		{
-			iterator tmp = *this;
-			--m_Ptr;
-			return tmp;
-		}
-
-		bool operator==(T * right) const
-		{
-			return (m_Ptr == right);
-		}
-
-		bool operator==(const iterator & right) const
-		{
-			return (m_Ptr == right.m_Ptr);
-		}
-
-		bool operator!=(T * right) const
-		{
-			return (m_Ptr != right);
-		}
-
-		bool operator!=(const iterator & right) const
-		{
-			return (m_Ptr != right.m_Ptr);
-		}
-
-		iterator & operator+=(size_t offset)
-		{
-			m_Ptr += offset;
-			return (*this);
-		}
-
-		iterator & operator-=(size_t offset)
-		{
-			m_Ptr -= offset;
-			return (*this);
-		}
-
-		iterator operator+(size_t offset) const
-		{
-			iterator tmp(*this);
-			tmp.m_Ptr += offset;
-			return tmp;
-		}
-
-		iterator operator-(size_t offset) const
-		{
-			iterator tmp(*this);
-			tmp.m_Ptr -= offset;
-			return tmp;
-		}
-
-		T & operator[](size_t offset)
-		{
-			return (*(*this + offset));
-		}
-
-		const T & operator[](size_t offset) const
-		{
-			return (*(*this + offset));
-		}
-
-		bool operator<(const iterator & right) const
-		{
-			return m_Ptr < right.m_Ptr;
-		}
-
-		bool operator>(const iterator & right) const
-		{
-			return m_Ptr > right.m_Ptr;
-		}
-
-		bool operator<=(const iterator & right) const
-		{
-			return m_Ptr <= right.m_Ptr;
-		}
-
-		bool operator>=(const iterator & right) const
-		{
-			return m_Ptr >= right.m_Ptr;
-		}
-
-		size_t operator-(const iterator & right) const
-		{
-			return m_Ptr - right.m_Ptr;
-		}
-	};
-
-	// constructors / destructors
-	CVector<T>()
-	{
-		m_Size = 0;
-		m_CurrentUsedSize = 0;
-		m_Data = NULL;
-	}
-
-	CVector<T>(const CVector<T> & other)
-	{
-		// copy data
-		m_Data = new T [other.m_CurrentUsedSize];
-		m_Size = other.m_CurrentUsedSize;
-		m_CurrentUsedSize = other.m_CurrentUsedSize;
-		for (size_t i=0; i<other.m_CurrentUsedSize; i++)
-			m_Data[i] = other.m_Data[i];
-	}
-
-	~CVector<T>()
-	{
-		clear();
-	}
-
-	// interface
-	size_t size() const
-	{
-		return m_CurrentUsedSize;
-	}
-
-	size_t capacity() const
-	{
-		return m_Size;
-	}
-
-	iterator begin() const
-	{
-		return iterator(m_Data);
-	}
-
-	iterator end() const
-	{
-		return iterator(m_Data + m_CurrentUsedSize);
-	}
-
-	iterator iterAt(size_t pos)
-	{
-		if (pos > m_CurrentUsedSize)
-			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)
-	{
-		++m_CurrentUsedSize;
-		if (!GrowIfNeeded())
-		{
-			--m_CurrentUsedSize;
-			return false;
-		}
-
-		m_Data[m_CurrentUsedSize - 1] = elem;
-		return true;
-	}
-
-	void pop_back()
-	{
-		--m_CurrentUsedSize;
-		if (m_CurrentUsedSize < 0)
-			m_CurrentUsedSize = 0;
-
-		FreeMemIfPossible();
-	}
-
-	bool resize(size_t newSize)
-	{
-		if (!ChangeSize(newSize))
-			return false;
-		m_CurrentUsedSize = newSize;
-		return true;
-	}
-
-	bool empty() const
-	{
-		return (m_CurrentUsedSize == 0);
-	}
-
-	T & at(size_t pos)
-	{
-		if (pos > m_CurrentUsedSize)
-		{
-			assert(0);
-		}
-		return m_Data[pos];
-	}
-
-	const  T & at(size_t pos) const
-	{
-		if (pos > m_CurrentUsedSize)
-		{
-			assert(0);
-		}
-		return m_Data[pos];
-	}
-
-	T & operator[](size_t pos)
-	{
-		return at(pos);
-	}
-
-	const T & operator[](size_t pos) const
-	{
-		return at(pos);
-	}
-
-	T & front()
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[0];
-	}
-
-	const T & front() const
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[0];
-	}
-
-	T & back()
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[m_CurrentUsedSize - 1];
-	}
-
-	const T & back() const
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[m_CurrentUsedSize - 1];
-	}
-
-	iterator insert(iterator where, const T & value)
-	{
-		// validate iter
-		if (where < m_Data || where > (m_Data + m_CurrentUsedSize))
-			return iterator(0);
-
-		size_t ofs = where - begin();
-
-		++m_CurrentUsedSize;
-		if (!GrowIfNeeded())
-		{
-			--m_CurrentUsedSize;
-			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;
-	}
-
-	iterator erase(iterator where)
-	{
-		// validate iter
-		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
-			return iterator(0);
-
-		size_t ofs = where - begin();
-
-		if (m_CurrentUsedSize > 1)
-		{
-			// move
-			T *theend = m_Data + m_CurrentUsedSize;
-			for (T *ptr = where.base() + 1; ptr < theend; ++ptr)
-				*(ptr - 1) = *ptr;
-		}
-
-		--m_CurrentUsedSize;
-
-		FreeMemIfPossible();
-
-		return begin() + ofs;
-	}
-
-	void clear()
-	{
-		m_Size = 0;
-		m_CurrentUsedSize = 0;
-		if (m_Data)
-		{
-			delete [] m_Data;
-			m_Data = NULL;
-		}
-	}
-};
-
-#endif // __CVECTOR_H__
-

amxmodx/Makefile

@@ -1,96 +1,116 @@
-#(C)2004-2005 AMX Mod X Development Team
+MODNAME = amxx_mm
-# Makefile written by David "BAILOPAN" Anderson
+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
+CSRCFILES = amx.c amxcore.c amxtime.c power.c
 
-HLSDK = ../hlsdk/SourceCode
+EXTRA_LIBS_LINUX =
-MM_ROOT = ../metamod/metamod
+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 -funroll-loops -s -fomit-frame-pointer -pipe
+EXTRA_FLAGS = -Dstrcmpi=strcasecmp
-DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
-NAME = amxmodx_mm
 
-OBJECTS = meta_api.cpp CFile.cpp CVault.cpp vault.cpp float.cpp file.cpp modules.cpp \
+SDKTOP=../hlsdk
-	CMisc.cpp CTask.cpp string.cpp amxmodx.cpp CEvent.cpp CCmd.cpp CLogEvent.cpp \
+METADIR=../metamodx
-	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
 
-LINK = -lz /lib/libstdc++.a
 
-INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
+SDKSRC=$(SDKTOP)/SourceCode
-	-I$(MM_ROOT) -Lzlib -I$(HLSDK)/common
+OBJDIR_LINUX=obj.linux
+OBJDIR_WIN32=obj.win32
+SRCDIR=.
 
-ifeq "$(DEBUG)" "true"
+ifdef windir
-	BIN_DIR = Debug
+	OS=WIN32
-	CFLAGS = $(DEBUG_FLAGS)
 else
-	BIN_DIR = Release
+	OS=LINUX
-	CFLAGS = $(OPT_FLAGS)
 endif
 
-ifeq "$(MMGR)" "true"
+CC_LINUX=gcc-2.95
-	OBJECTS += mmgr/mmgr.cpp
+ifeq "$(OS)" "WIN32"
-	CFLAGS += -DMEMORY_TEST
+	CC_WIN32=gcc
-endif
+	LD_WINDLL=dllwrap
-
+	DEFAULT=win32
-CFLAGS += -DLINUX -DNDEBUG -fPIC -Wno-deprecated -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
+	CLEAN=clean_win32
-
-ifeq "$(AMD64)" "true"
-	BINARY = $(NAME)_amd64.so
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -DAMD64 -m64 
-	OBJECTS += JIT/natives-amd64.o
 else
-	BINARY = $(NAME)_i386.so
+	CC_WIN32=/usr/local/cross-tools/i386-mingw32msvc/bin/gcc
-	OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o
+	LD_WINDLL=/usr/local/cross-tools/bin/i386-mingw32msvc-dllwrap
-	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+	DEFAULT=linux win32
-	OPT_FLAGS += -march=i586
+	CLEAN=clean_both
 endif
 
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
 
-all:
+LIBFILE_LINUX = $(MODNAME)_i386.so
-	mkdir -p $(BIN_DIR)
+LIBFILE_WIN32 = $(MODNAME).dll
-	$(MAKE) amxmodx
+TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX)
+TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32)
 
-amd64:
+FILES_ALL = *.cpp *.h [A-Z]* *.rc
-	rm -f zlib/libz.a
+ifeq "$(OS)" "LINUX"
-	$(MAKE) all AMD64=true
+	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_mmgr:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true MMGR=true
 
-amd64_debug_mmgr:
+CCOPT = -O2 -march=i586 -ffast-math -funroll-loops \
-	rm -f zlib/libz.a
+	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
-	$(MAKE) all AMD64=true DEBUG=true MMGR=true
+	-malign-jumps=2 -malign-functions=2 -s	-DNDEBUG
 
-amd64_debug:
+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)
-	rm -f zlib/libz.a
+CFLAGS=-Wall -Wno-unknown-pragmas
-	$(MAKE) all AMD64=true DEBUG=true
+ODEF = -DOPT_TYPE=\"optimized\"
+CFLAGS:=$(CCOPT) $(CFLAGS) $(ODEF) $(EXTRA_FLAGS)
 
-mmgr:
+DO_CC_LINUX=$(CC_LINUX) $(CFLAGS) -fPIC $(INCLUDEDIRS) -o $@ -c $<
-	$(MAKE) all MMGR=true
+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 $@
 
-debug_mmgr:
+$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.c
-	$(MAKE) all MMGR=true DEBUG=true
+	$(DO_CC_LINUX)
 
-amxmodx: $(OBJ_LINUX)
+$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(DO_CC_LINUX)
 
-debug:	
+$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.c
-	$(MAKE) all DEBUG=true
+	$(DO_CC_WIN32)
 
-default: all
+$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.cpp
+	$(DO_CC_WIN32)
 
-clean:
+default: $(DEFAULT)
-	rm -rf Release/*.o
+
-	rm -rf Release/$(BINARY)
+$(TARGET_LINUX): $(OBJDIR_LINUX) $(OBJ_LINUX) $(OBJC_LINUX)
-	rm -rf Debug/*.o
+	$(LINK_LINUX)
-	rm -rf Debug/$(BINARY)
+
+$(TARGET_WIN32): $(OBJDIR_WIN32) $(OBJ_WIN32) $(OBJC_WIN32)
+	$(LINK_WIN32)
+
+$(OBJDIR_LINUX):
+	mkdir $@
+
+$(OBJDIR_WIN32):
+	mkdir $@
+
+win32: $(TARGET_WIN32)
+
+linux: $(TARGET_LINUX)
+
+clean: $(CLEAN)
+
+clean_both:
+	-rm -f $(OBJDIR_LINUX)/*
+	-rm -f $(OBJDIR_WIN32)/*
+
+clean_win32:
+	del /q $(OBJDIR_WIN32)
 

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-2003
  *
  *  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
@@ -10,46 +10,18 @@
  *  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$
  */
-
+#if defined __linux__
-#if defined FREEBSD && !defined __FreeBSD__
-  #define __FreeBSD__
-#endif
-#if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
   #include <sclinux.h>
 #endif
-
+#ifndef __AMX_H
-#ifndef AMX_H_INCLUDED
+#define __AMX_H
-#define AMX_H_INCLUDED
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-
-#if defined HAVE_STDINT_H
-  #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__
+  #if defined __LCC__ || defined __linux__
-      #include <ppc/types.h>
+    #include <stdint.h>
-      typedef unsigned short int  uint16_t;
-      typedef unsigned long int   uint32_t;
-    #elif defined __FreeBSD__
-      #include <inttypes.h>
   #else
     typedef short int           int16_t;
     typedef unsigned short int  uint16_t;
@@ -60,42 +32,16 @@
       typedef long int          int32_t;
       typedef unsigned long int uint32_t;
     #endif
-      #if defined __WIN32__ || defined _WIN32 || defined WIN32
-        typedef __int64	          int64_t;
-        typedef unsigned __int64  uint64_t;
-        #define HAVE_I64
-      #elif defined __GNUC__
-        typedef long long         int64_t;
-        typedef unsigned long long uint64_t;
-        #define HAVE_I64
-      #endif
-    #endif
-  #endif
-  #define HAVE_STDINT_H
-#endif
-#if defined _LP64 || defined WIN64 || defined _WIN64
-  #if !defined __64BIT__
-    #define __64BIT__
   #endif
 #endif
-
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined __MSDOS__
-#if !defined arraysize
+  #if !defined alloca
-  #define arraysize(array)  (sizeof(array) / sizeof((array)[0]))
+    #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 +52,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
@@ -115,7 +59,6 @@ extern  "C" {
 #if !defined AMXEXPORT
   #define AMXEXPORT
 #endif
-
 /* File format version                          Required AMX version
  *   0 (original version)                       0
  *   1 (opcodes JUMP.pri, SWITCH and CASETBL)   1
@@ -125,67 +68,47 @@ 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 CELL_TYPE
-#if !defined PAWN_CELL_SIZE
+  #define CELL_TYPE
-  #define PAWN_CELL_SIZE 32     /* by default, use 32-bit cells */
+  #if defined(BIT16)
-#endif
+    typedef uint16_t  ucell;    /* only for type casting */
-#if PAWN_CELL_SIZE==16
-  typedef uint16_t  ucell;
     typedef int16_t   cell;
-#elif PAWN_CELL_SIZE==32
+  #else
     typedef uint32_t  ucell;
     typedef int32_t   cell;
-#define REAL	float
+  #endif
-#elif PAWN_CELL_SIZE==64
-  typedef uint64_t  ucell;
-  typedef int64_t   cell;
-#define REAL	double
-#else
-  #error Unsupported cell size (PAWN_CELL_SIZE)
 #endif
-
-#define UNPACKEDMAX   ((1L << (sizeof(cell)-1)*8) - 1)
-#define UNLIMITED     (~1u >> 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
-
 #if defined _MSC_VER
   #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" */
 #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) */
@@ -194,31 +117,22 @@ typedef int (AMXAPI *AMX_NATIVE_FILTER)(struct tagAMX *amx, int index);
     #endif
   #endif
 #endif
-
+typedef struct {
-typedef struct tagAMX_NATIVE_INFO {
+  char _FAR *name       PACKED;
-  const char _FAR *name PACKED;
   AMX_NATIVE func       PACKED;
-} PACKED AMX_NATIVE_INFO;
+} AMX_NATIVE_INFO       PACKED;
-
 #define AMX_USERNUM     4
 #define sEXPMAX         19      /* maximum name length for file version <= 6 */
 #define sNAMEMAX        31      /* maximum name length of symbol name */
-
 typedef struct tagAMX_FUNCSTUB {
-  ucell address         PACKED;
+  uint32_t address      PACKED;
   char name[sEXPMAX+1]  PACKED;
-} PACKED AMX_FUNCSTUB;
+} AMX_FUNCSTUB          PACKED;
-
-typedef struct tagFUNCSTUBNT {
-  ucell address         PACKED;
-  ucell nameofs      PACKED;	//we need this for amxx to be backwards comaptible
-} PACKED AMX_FUNCSTUBNT;
-
 /* 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 */
@@ -230,27 +144,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;
+  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
-  //lastly, userdata[1] is for opcode_list from amx_BrowseRelocate
   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 */
+  cell _FAR *syscall_d  PACKED; /* relocated value/address for the SYSCALL.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                   PACKED;
 /* The AMX_HEADER structure is both the memory format as the file format. The
  * structure is used internaly.
  */
@@ -271,12 +188,9 @@ 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 */
+  int32_t nametable     PACKED; /* name table, file version 7 only */
-} PACKED AMX_HEADER;
+} AMX_HEADER            PACKED;
-
-//This is always the same for us
 #define AMX_MAGIC       0xf1e0
-
 enum {
   AMX_ERR_NONE,
   /* reserve the first 15 error codes for exit codes of the abstract machine */
@@ -292,9 +206,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 */
   AMX_ERR_VERSION,      /* file is for a newer version of the AMX */
@@ -306,142 +217,92 @@ 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 {
-/*      AMX_FLAG_CHAR16   0x01     no longer used */
+  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 */
+};
+#define AMX_FLAG_CHAR16   0x01  /* characters are 16-bit */
 #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_BIGENDIAN 0x08 /* big endian encoding */
-#define AMX_FLAG_NOCHECKS 0x10  /* no array bounds checking; no STMT opcode */
+#define AMX_FLAG_NOCHECKS  0x10 /* no array bounds checking */
-#define AMX_FLAG_PRENIT	 0x100	/* pre-initialized, do not check natives */
+#define AMX_FLAG_BROWSE 0x4000  /* browsing/relocating or executing */
-#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_RELOC  0x8000  /* jump/call addresses relocated */
-
 #define AMX_EXEC_MAIN   -1      /* start at program entry point */
 #define AMX_EXEC_CONT   -2      /* continue from last address */
-
 #define AMX_USERTAG(a,b,c,d)    ((a) | ((b)<<8) | ((long)(c)<<16) | ((long)(d)<<24))
-
+#define AMX_EXPANDMARGIN  64
-#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
-
-typedef void (*BROWSEHOOK)(AMX *amx, cell *oplist, cell *cip);
-
 /* for native functions that use floating point parameters, the following
  * two macros are convenient for casting a "cell" into a "float" type _without_
  * changing the bit pattern
  */
-#if PAWN_CELL_SIZE==32
+#define amx_ftoc(f)     ( * ((cell*)&f) )   /* float to cell */
-  #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
+#define amx_ctof(c)     ( * ((float*)&c) )  /* cell to float */
-  #define amx_ctof(c)   ( * ((float*)&c) )  /* cell to float */
+#define amx_StrParam(amx,param,result) {                             \
-#elif PAWN_CELL_SIZE==64
-  #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
-  #define amx_ctof(c)   ( * ((double*)&c) ) /* cell to float */
-#else
-  #error Unsupported cell size
-#endif
-
-#define amx_StrParam(amx,param,result)                                      \
-    do {                                                                    \
             cell *amx_cstr_; int amx_length_;                        \
             amx_GetAddr((amx), (param), &amx_cstr_);                 \
             amx_StrLen(amx_cstr_, &amx_length_);                     \
             if (amx_length_ > 0 &&                                   \
-          ((result) = (void*)alloca((amx_length_ + 1) * sizeof(*(result)))) != NULL) \
+                ((result) = (char*)alloca(amx_length_ + 1)) != NULL) \
-        amx_GetString((char*)(result), amx_cstr_, sizeof(*(result))>1, amx_length_); \
+              amx_GetString((result), amx_cstr_);                    \
             else (result) = NULL;                                    \
-    } while (0)
+}
-
 uint16_t * AMXAPI amx_Align16(uint16_t *v);
 uint32_t * AMXAPI amx_Align32(uint32_t *v);
-#if defined _I64_MAX || defined HAVE_I64
-  uint64_t * AMXAPI amx_Align64(uint64_t *v);
-#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_FindNative(AMX *amx, const char *name, int *index);
+int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...);
-int AMXAPI amx_FindPublic(AMX *amx, const char *funcname, int *index);
+int AMXAPI amx_Execv(AMX *amx, cell *retval, int index, int numparams, cell params[]);
-int AMXAPI amx_FindPubVar(AMX *amx, const char *varname, cell *amx_addr);
+int AMXAPI amx_FindNative(AMX *amx, char *name, int *index);
+int AMXAPI amx_FindPublic(AMX *amx, char *funcname, int *index);
+int AMXAPI amx_FindPubVar(AMX *amx, char *varname, cell *amx_addr);
 int AMXAPI amx_FindTagId(AMX *amx, cell tag_id, char *tagname);
 int AMXAPI amx_Flags(AMX *amx,uint16_t *flags);
 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,cell *source);
 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);
 int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code);
 int AMXAPI amx_MemInfo(AMX *amx, long *codesize, long *datasize, long *stackheap);
 int AMXAPI amx_NameLength(AMX *amx, int *length);
-AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(const char *name, AMX_NATIVE func);
+AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(char *name,AMX_NATIVE func);
 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_Register(AMX *amx, AMX_NATIVE_INFO *nativelist, int number);
-int AMXAPI amx_RegisterToAny(AMX *amx, AMX_NATIVE f);
 int AMXAPI amx_Release(AMX *amx, cell amx_addr);
 int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
 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, char *source, int pack);
 int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr);
-int AMXAPI amx_StrLen(const cell *cstring, int *length);
+char * AMXAPI amx_StrError(int errnum);
-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);
-
-#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
-
 #ifdef  __cplusplus
 }
 #endif
-
+#endif /* __AMX_H */
-#endif /* AMX_H_INCLUDED */

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

@@ -1,74 +1,36 @@
-/*  Core module for the Pawn AMX
+/*  Core module for the Small AMX
  *
- *  Copyright (c) ITB CompuPhase, 1997-2005
+ *  Copyright (c) ITB CompuPhase, 1997-2002
- *
+ *  This file may be freely used. No warranties of any kind.
- *  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$
  */
-#if defined _UNICODE || defined __UNICODE__ || defined UNICODE
-# if !defined UNICODE   /* for Windows */
-#   define UNICODE
-# endif
-# if !defined _UNICODE  /* for C library */
-#   define _UNICODE
-# endif
-#endif
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <assert.h>
 #include "amx.h"
-#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined _Windows
+
-  #include <windows.h>
+#define NOPROPLIST
-#endif
 
 /* A few compilers do not provide the ANSI C standard "time" functions */
 #if !defined SN_TARGET_PS2 && !defined _WIN32_WCE
   #include <time.h>
 #endif
 
-#if defined _UNICODE
-# include <tchar.h>
-#elif !defined __T
-  typedef char          TCHAR;
-# define __T(string)    string
-# define _tcschr        strchr
-# define _tcscpy        strcpy
-# define _tcsdup        strdup
-# define _tcslen        strlen
-#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;
   char *name;
   cell value;
-  //??? 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,15 +96,17 @@ 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;
+  data=amx->base+(int)hdr->dat;
   /* the number of bytes is on the stack, at "frm + 2*cell" */
   bytes= * (cell *)(data+(int)amx->frm+2*sizeof(cell));
   /* the number of arguments is the number of bytes divided
@@ -157,7 +121,7 @@ static cell AMX_NATIVE_CALL getarg(AMX *amx, cell *params)
   cell value;
 
   hdr=(AMX_HEADER *)amx->base;
-  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  data=amx->base+(int)hdr->dat;
   /* get the base value */
   value= * (cell *)(data+(int)amx->frm+((int)params[1]+3)*sizeof(cell));
   /* adjust the address in "value" in case of an array access */
@@ -174,7 +138,7 @@ static cell AMX_NATIVE_CALL setarg(AMX *amx, cell *params)
   cell value;
 
   hdr=(AMX_HEADER *)amx->base;
-  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  data=amx->base+(int)hdr->dat;
   /* get the base value */
   value= * (cell *)(data+(int)amx->frm+((int)params[1]+3)*sizeof(cell));
   /* adjust the address in "value" in case of an array access */
@@ -187,9 +151,11 @@ static cell AMX_NATIVE_CALL setarg(AMX *amx, cell *params)
   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,95 +174,191 @@ static cell AMX_NATIVE_CALL funcidx(AMX *amx,cell *params)
     return 0;
   } /* if */
 
-  amx_GetString(name,cstr,0,UNLIMITED);
+  amx_GetString(name,cstr);
   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>UCHAR_MAX) {
+    /* 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>UCHAR_MAX) {
+    /* 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,lastaddr,err;
+
+  /* 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=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,lastaddr;
+
+  /* calculate number of cells needed for (packed) destination */
+  amx_GetAddr(amx,params[2],&csrc);
+  amx_StrLen(csrc,&len);
+  assert(len>=0);
+  lastaddr=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 defined BIT16
       uchar b[2];
-    #elif PAWN_CELL_SIZE==32
-      uchar b[4];
-    #elif PAWN_CELL_SIZE==64
-      uchar b[8];
     #else
-	  #error Unsupported cell size
+      uchar b[4];
     #endif
   } value;
   uchar t;
 
-  (void)amx;
   assert((size_t)params[0]==sizeof(cell));
   value.c = params[1];
-  #if PAWN_CELL_SIZE==16
+  #if defined BIT16
     t = value.b[0];
     value.b[0] = value.b[1];
     value.b[1] = t;
-  #elif PAWN_CELL_SIZE==32
+  #else
     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
-    t = value.b[0];
-    value.b[0] = value.b[7];
-    value.b[7] = t;
-	t = value.b[1];
-	value.b[1] = value.b[6];
-	value.b[6] = t;
-	t = value.b[2];
-	value.b[2] = value.b[5];
-	value.b[5] = t;
-	t = value.b[3];
-    value.b[3] = value.b[4];
-    value.b[4] = t;
-  #else
-    #error Unsupported cell size
   #endif
   return value.c;
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_tolower(AMX *amx,cell *params)
 {
-  (void)amx;
+  assert((size_t)params[0]==sizeof(cell));
-  #if defined __WIN32__ || defined _WIN32 || defined WIN32
-    return (cell)CharLower((LPTSTR)params[1]);
-  #elif defined _Windows
-    return (cell)AnsiLower((LPSTR)params[1]);
-  #else
   return tolower((int)params[1]);
-  #endif
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_toupper(AMX *amx,cell *params)
 {
-  (void)amx;
+  assert((size_t)params[0]==sizeof(cell));
-  #if defined __WIN32__ || defined _WIN32 || defined WIN32
-    return (cell)CharUpper((LPTSTR)params[1]);
-  #elif defined _Windows
-    return (cell)AnsiUpper((LPSTR)params[1]);
-  #else
   return toupper((int)params[1]);
-  #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 +374,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 +382,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);
   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 +403,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);
   } /* if */
   free(name);
   return (item!=NULL) ? item->value : 0;
@@ -417,14 +468,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 = 0L;
-static unsigned long IL_StandardRandom_seed = INITIAL_SEED; /* always use a non-zero seed */
 #define IL_RMULT 1103515245L
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
@@ -436,7 +485,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,8 +502,23 @@ static cell AMX_NATIVE_CALL core_random(AMX *amx,cell *params)
         result %= params[1];
     return (cell)result;
 }
-#endif
 
+#if 0
+
+void core_Init(void)
+{
+  /* reduced to a do-nothing routine */
+}
+
+void core_Exit(void)
+{
+  #if !defined NOPROPLIST
+    while (proproot.next!=NULL)
+      list_delete(&proproot,proproot.next);
+  #endif
+}
+
+#endif
 
 AMX_NATIVE_INFO core_Natives[] = {
   { "numargs",       numargs },
@@ -462,28 +526,23 @@ 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 */
 };
 
-int AMXEXPORT amx_CoreInit(AMX *amx)
-{
-  return amx_Register(amx, core_Natives, -1);
-}
 
-int AMXEXPORT amx_CoreCleanup(AMX *amx)
-{
-  (void)amx;
-  #if !defined AMX_NOPROPLIST
-    //??? delete only the properties owned by the AMX
-    while (proproot.next!=NULL)
-      list_delete(&proproot,proproot.next);
-  #endif
-  return AMX_ERR_NONE;
-}

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  PACKED; /* file format version */
-  char    amx_version   PACKED; /* required version of the AMX */
-  int16_t flags         PACKED; /* currently unused */
-  int16_t files         PACKED; /* number of entries in the "file" table */
-  int16_t lines         PACKED; /* number of entries in the "line" table */
-  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 */
-} AMX_DBG_HDR           PACKED;
-#define AMX_DBG_MAGIC   0xf1ef
-
-typedef struct tagAMX_DBG_FILE {
-  ucell   address       PACKED; /* address in the code segment where generated code (for this file) starts */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_FILE          PACKED;
-
-typedef struct tagAMX_DBG_LINE {
-  ucell   address       PACKED; /* address in the code segment where generated code (for this line) starts */
-  int32_t line          PACKED; /* line number */
-} AMX_DBG_LINE          PACKED;
-
-typedef struct tagAMX_DBG_SYMBOL {
-  ucell   address       PACKED; /* address in the data segment or relative to the frame */
-  int16_t tag           PACKED; /* tag for the symbol */
-  ucell   codestart     PACKED; /* address in the code segment from which this symbol is valid (in scope) */
-  ucell   codeend       PACKED; /* address in the code segment until which this symbol is valid (in scope) */
-  char    ident         PACKED; /* kind of symbol (function/variable) */
-  char    vclass        PACKED; /* class of symbol (global/local) */
-  int16_t dim           PACKED; /* number of dimensions */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_SYMBOL        PACKED;
-
-typedef struct tagAMX_DBG_SYMDIM {
-  int16_t tag           PACKED; /* tag for the array dimension */
-  ucell   size          PACKED; /* size of the array dimension */
-} AMX_DBG_SYMDIM        PACKED;
-
-typedef struct tagAMX_DBG_TAG {
-  int16_t tag           PACKED; /* tag id */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_TAG           PACKED;
-
-typedef struct tagAMX_DBG_MACHINE {
-  int16_t automaton     PACKED; /* automaton id */
-  ucell address         PACKED; /* address of state variable */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_MACHINE       PACKED;
-
-typedef struct tagAMX_DBG_STATE {
-  int16_t state         PACKED; /* state id */
-  int16_t automaton     PACKED; /* automaton id */
-  const char name[1]    PACKED; /* ASCII string, zero-terminated */
-} AMX_DBG_STATE         PACKED;
-
-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;
-} AMX_DBG                           PACKED;
-
-#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.h

@@ -0,0 +1,240 @@
+/* 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 AMXMOD_H
+#define AMXMOD_H
+
+#include "modules.h"
+#include "CString.h"
+#include "CList.h"
+#include "CPlugin.h"
+#include "CMisc.h"
+#include "CVault.h"
+#include "CModule.h"
+#include "CTask.h"
+#include "CLogEvent.h"
+#include "CForward.h"
+#include "CCmd.h"
+#include "CMenu.h"
+#include "CEvent.h"
+
+#define AMX_VERSION     "0.15"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+  extern AMX_NATIVE_INFO  core_Natives[];
+  extern AMX_NATIVE_INFO  time_Natives[];
+  extern AMX_NATIVE_INFO  power_Natives[];
+#ifdef  __cplusplus
+}
+#endif
+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[];
+
+
+#ifndef __linux__
+#define DLLOAD(path) (DLHANDLE)LoadLibrary(path);
+#define DLPROC(m,func) GetProcAddress(m,func);
+#define DLFREE(m) FreeLibrary(m);
+#else
+#define DLLOAD(path) (DLHANDLE)dlopen(path, RTLD_NOW);
+#define DLPROC(m,func) dlsym(m,func);
+#define DLFREE(m) dlclose(m);
+#endif
+
+#ifndef __linux__
+typedef HINSTANCE DLHANDLE;
+#else
+typedef void* DLHANDLE;
+#endif
+
+#ifndef GETPLAYERAUTHID
+#define GETPLAYERAUTHID     (*g_engfuncs.pfnGetPlayerAuthId)
+#endif
+#define ANGLEVECTORS        (*g_engfuncs.pfnAngleVectors)
+#define CLIENT_PRINT        (*g_engfuncs.pfnClientPrintf)
+#define CVAR_DIRECTSET      (*g_engfuncs.pfnCvar_DirectSet)
+#define GETCLIENTLISTENING  (*g_engfuncs.pfnVoice_GetClientListening)
+#define RUNPLAYERMOVE       (*g_engfuncs.pfnRunPlayerMove)
+#define SETCLIENTLISTENING  (*g_engfuncs.pfnVoice_SetClientListening)
+#define SETCLIENTMAXSPEED   (*g_engfuncs.pfnSetClientMaxspeed)
+
+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);
+void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pMessage);
+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 );
+void UTIL_MakeNewLogFile();
+void UTIL_Log(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 {
+  String fullName;
+  short int iId;
+  short int ammoSlot;
+};
+
+struct fakecmd_t {
+  char args[256];
+  const char *argv[3];
+  //char argv[3][128];
+  int argc;
+  bool fake;
+};
+
+
+extern CPluginMngr g_plugins;
+extern CTaskMngr g_tasksMngr;
+extern CPlayer g_players[33];
+extern CPlayer* mPlayer;
+extern CmdMngr g_commands;
+extern CList<CCVar> g_cvars;
+extern CList<ForceObject> g_forcemodels;
+extern CList<ForceObject> g_forcesounds;
+extern CList<ForceObject> g_forcegeneric;
+extern CList<CModule> g_modules;
+extern CList<CPlayer*> g_auth;
+extern EventsMngr g_events;
+extern Grenades g_grenades;
+extern LogEventsMngr g_logevents;
+extern MenuMngr g_menucmds;
+extern String g_log_dir;
+extern String g_mod_name;
+extern TeamIds g_teamsIds;
+extern Vault g_vault;
+extern CForwardMngr  g_forwards;
+extern WeaponsVault g_weaponsData[MAX_WEAPONS];
+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* amx_version;
+extern cvar_t* amxmodx_version;
+extern cvar_t* hostname;
+extern cvar_t* mp_timelimit;
+extern fakecmd_t g_fakecmd;
+extern float g_game_restarting;
+extern float g_game_timeleft;
+extern float g_task_time;
+extern float g_auth_time;
+extern hudtextparms_t g_hudset;
+//extern int g_edict_point;
+extern int g_players_num;
+extern int mPlayerIndex;
+extern int mState;
+extern void (*endfunction)(void*);
+extern void (*function)(void*);
+
+typedef void (*funEventCall)(void*);
+extern funEventCall modMsgsEnd[MAX_REG_MSGS];
+extern funEventCall modMsgs[MAX_REG_MSGS];
+
+extern int gmsgAmmoPickup;
+extern int gmsgAmmoX;
+extern int gmsgBattery;
+extern int gmsgCurWeapon;
+extern int gmsgDamage;
+extern int gmsgDeathMsg;
+extern int gmsgHealth;
+extern int gmsgMOTD;
+extern int gmsgScoreInfo;
+extern int gmsgSendAudio;
+extern int gmsgServerName;
+extern int gmsgShowMenu;
+extern int gmsgTeamInfo;
+extern int gmsgTextMsg;
+extern int gmsgVGUIMenu;
+extern int gmsgWeapPickup;
+extern int gmsgWeaponList;
+extern int gmsgintermission;
+extern int gmsgResetHUD;
+extern int gmsgRoundTime;
+
+void Client_AmmoPickup(void*);
+void Client_AmmoX(void*);
+void Client_CurWeapon(void*);
+void Client_ScoreInfo(void*);
+void Client_ShowMenu(void*);
+void Client_TeamInfo(void*);
+void Client_TextMsg(void*);
+void Client_VGUIMenu(void*);
+void Client_WeaponList(void*);
+void Client_DamageEnd(void*);
+void Client_DeathMsg(void*);
+
+void amx_command();
+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);
+void dettachModules();
+void dettachReloadModules();
+void attachModules();
+void attachMetaModModules( const char* filename );
+void dettachMetaModModules( const char* filename );
+
+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* 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);
+int amxstring_len(cell* cstr);
+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, ... );
+void report_error( int code, char* fmt, ... );
+void* alloc_amxmemory(void**, int size);
+void free_amxmemory(void **ptr);
+
+
+#endif // AMXMOD_H
+

amxmodx/amxmodx.h

@@ -32,26 +32,9 @@
 #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 MEMORY_TEST
-	#include "mmgr/mmgr.h"
-#endif
-
-#include "md5.h"
-#include "CVector.h"
-#include "CList.h"
-#include "CQueue.h"
 #include "modules.h"
 #include "CString.h"
+#include "CList.h"
 #include "CPlugin.h"
 #include "CMisc.h"
 #include "CVault.h"
@@ -62,48 +45,39 @@
 #include "CCmd.h"
 #include "CMenu.h"
 #include "CEvent.h"
-#include "CLang.h"
-#include "fakemeta.h"
-#include "amxxlog.h"
 
-#define AMXXLOG_Log g_log.Log
+#define AMX_VERSION     "0.16"
-#define AMX_VERSION	"1.70"
 
-extern AMX_NATIVE_INFO core_Natives[];
+#ifdef  __cplusplus
-extern AMX_NATIVE_INFO time_Natives[];
+extern "C" {
-extern AMX_NATIVE_INFO power_Natives[];
+#endif
-extern AMX_NATIVE_INFO amxmodx_Natives[];
+  extern AMX_NATIVE_INFO  core_Natives[];
+  extern AMX_NATIVE_INFO  time_Natives[];
+  extern AMX_NATIVE_INFO  power_Natives[];
+#ifdef  __cplusplus
+}
+#endif
+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[];
 
-#ifndef __linux__
-#define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
-#define DLPROC(m, func) GetProcAddress(m, func)
-#define DLFREE(m) FreeLibrary(m)
-#else
-#define DLLOAD(path) (DLHANDLE)dlopen(path, RTLD_NOW)
-#define DLPROC(m, func) dlsym(m, func)
-#define DLFREE(m) dlclose(m)
-#endif
 
-#if defined __GNUC__
+#ifndef __linux__
-	#include <stdint.h>
+#define DLLOAD(path) (DLHANDLE)LoadLibrary(path);
-	typedef intptr_t _INT_PTR;
+#define DLPROC(m,func) GetProcAddress(m,func);
+#define DLFREE(m) FreeLibrary(m);
 #else
-	#if defined AMD64
+#define DLLOAD(path) (DLHANDLE)dlopen(path, RTLD_NOW);
-		typedef __int64 _INT_PTR;
+#define DLPROC(m,func) dlsym(m,func);
-	#else
+#define DLFREE(m) dlclose(m);
-		typedef __int32 _INT_PTR;
-	#endif
 #endif
 
 #ifndef __linux__
-	typedef HINSTANCE DLHANDLE;
+typedef HINSTANCE DLHANDLE;
 #else
-	typedef void* DLHANDLE;
+typedef void* DLHANDLE;
-	#define INFINITE 0xFFFFFFFF
 #endif
 
 #ifndef GETPLAYERAUTHID
@@ -119,38 +93,41 @@ extern AMX_NATIVE_INFO vault_Natives[];
 
 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_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);
+void UTIL_GetFlags(char* flags,int flag);
 void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pMessage);
 void UTIL_IntToString(int value, char *output);
-void UTIL_ShowMOTD(edict_t *client, char *motd, int mlen, const char *name);
+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);
+void UTIL_ShowMenu( edict_t* pEntity, int slots, int time, char *menu, int mlen );
+void UTIL_MakeNewLogFile();
+void UTIL_Log(const char *fmt, ...);
 
-char *UTIL_VarArgs(const char *fmt, ...);
+#define UTIL_MODULES_RUNNING	0
+#define UTIL_MODULES_ALL		1
+#define UTIL_MODULES_STOPPED	2
 
+int UTIL_GetModulesNum(int mode);
 
 #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(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;
 };
 
-extern CLog g_log;
+
 extern CPluginMngr g_plugins;
 extern CTaskMngr g_tasksMngr;
 extern CPlayer g_players[33];
@@ -160,14 +137,12 @@ 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<CModule> g_modules;
-extern CList<CScript, AMX*> g_loadedscripts;
 extern CList<CPlayer*> g_auth;
 extern EventsMngr g_events;
 extern Grenades g_grenades;
 extern LogEventsMngr g_logevents;
 extern MenuMngr g_menucmds;
-extern CLangMngr g_langMngr;
 extern String g_log_dir;
 extern String g_mod_name;
 extern TeamIds g_teamsIds;
@@ -178,7 +153,9 @@ 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* amx_version;
 extern cvar_t* amxmodx_version;
 extern cvar_t* hostname;
 extern cvar_t* mp_timelimit;
@@ -187,7 +164,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;
@@ -236,96 +212,36 @@ void Client_DeathMsg(void*);
 void amx_command();
 void plugin_srvcmd();
 
-const char* stristr(const char* a, const char* b);
+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 dettachModules();
-void detachReloadModules();
+void dettachReloadModules();
+void attachModules();
+void attachMetaModModules( const char* filename );
+void dettachMetaModModules( const char* filename );
 
-#ifdef FAKEMETA
+int add_amxnatives(module_info_s* info,AMX_NATIVE_INFO*natives);
-	void attachModules();
+cell* get_amxaddr(AMX *amx,cell amx_addr);
-#endif
+char* build_pathname(char *fmt, ... );
-
+char* format_amxstring(AMX *amx, cell *params, int parm,int& len);
-// Count modules
+AMX* get_amxscript(int, void**,const char**);
-enum CountModulesMode
-{
-	CountModules_Running = 0,
-	CountModules_All,
-	CountModules_Stopped
-};
-
-int countModules(CountModulesMode mode);
-void modules_callPluginsLoaded();
-
-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);
+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_amxnatives(AMX* amx,char error[64]);
-int set_amxstring(AMX *amx, cell amx_addr, const char *source, int max);
+int set_amxstring(AMX *amx,cell amx_addr,const char *source,int max);
-int unload_amxscript(AMX* amx, void** program);
+int unload_amxscript(AMX* amx,void** program);
-
+void copy_amxmemory(cell* dest,cell* src,int len);
-void copy_amxmemory(cell* dest, cell* src, int len);
 void get_modname(char*);
-void print_srvconsole(char *fmt, ...);
+void print_srvconsole( char *fmt, ... );
-void report_error(int code, char* fmt, ...);
+void report_error( int code, char* fmt, ... );
 void* alloc_amxmemory(void**, int size);
 void free_amxmemory(void **ptr);
 // get_localinfo
-const char* get_localinfo(const char* name, const char* def);
+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
-{
-	ModuleCall_NotCalled = 0,					// nothing
-	ModuleCall_Query,							// in Query func
-	ModuleCall_Attach,							// in Attach func
-	ModuleCall_Detach,							// in Detach func
-};
-
-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
-// defined in meta_api.cpp
-extern int FF_ClientCommand;
-extern int FF_ClientConnect;
-extern int FF_ClientDisconnect;
-extern int FF_ClientInfoChanged;
-extern int FF_ClientPutInServer;
-extern int FF_PluginInit;
-extern int FF_PluginCfg;
-extern int FF_PluginPrecache;
-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;
-};
 
 #endif // AMXMODX_H
+

amxmodx/amxtime.c

@@ -11,20 +11,6 @@
   #include <windows.h>
   #include <mmsystem.h>
 #endif
-
-#ifdef __GNUC__
-#	ifndef CLK_TCK
-#		define CLK_TCK	CLOCKS_PER_SEC
-#	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"
-#endif // MEMORY_TEST
-
 #include "amx.h"
 
 #if defined __BORLANDC__ || defined __WATCOMC__

amxmodx/amxxfile.cpp

@@ -1,374 +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 "amxxfile.h"
-#include "zlib/zlib.h"
-
-/**********************
- ****** AMXXFILE ******
- **********************/
-
-#if defined __GNUC__
-	#define PACKED		__attribute__((packed))
-#else
-	#define PACKED
-#endif
-
-#if defined __linux__
-	#pragma pack(1)				/* structures must be packed (byte-aligned) */
-#else
-	#pragma pack(1)				/* structures must be packed (byte-aligned) */
-	#if defined __TURBOC__
-		#pragma option -a-		/* "pack" pragma for older Borland compilers */
-	#endif
-#endif
-
-struct TableEntry
-{
-	mint8_t cellSize PACKED;
-	mint32_t origSize PACKED;			// contains AMX_HEADER->stp
-	mint32_t offset PACKED;
-};
-
-#define DATAREAD(addr, itemsize, itemcount) \
-	if (fread((addr), (itemsize), (itemcount), (m_pFile)) != (itemcount)) \
-	{ \
-		if (feof(m_pFile)) \
-			m_Status = Err_FileInvalid; \
-		else \
-			m_Status = Err_FileRead; \
-		fclose(m_pFile); \
-		m_pFile = NULL; \
-		return; \
-	}
-
-CAmxxReader::CAmxxReader(const char *filename, int cellsize)
-{
-	m_Bh.plugins = NULL;
-	m_AmxxFile = false;
-	
-	if (!filename)
-	{
-		m_Status = Err_InvalidParam;
-		return;
-	}
-
-	m_Status = Err_None;
-	m_CellSize = cellsize;
-	m_pFile = fopen(filename, "rb");
-	
-	if (!m_pFile)
-	{
-		m_Status = Err_FileOpen;
-		return;
-	}
-
-	mint32_t magic;
-	DATAREAD(&magic, sizeof(magic), 1);
-
-	m_OldFile = false;
-	
-	if (magic == 0x524C4542)
-	{
-		//we have an invalid, old, RLEB file
-		m_Status = Err_OldFile;
-		fclose(m_pFile);
-		m_pFile = NULL;
-		
-		return;
-	}
-	else if (magic == MAGIC_HEADER2)
-	{
-		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)
-		{
-			m_Status = Err_SectionNotFound;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			
-			return;
-		}
-		
-		pe = &(m_Bh.plugins[m_Entry]);
-		m_SectionLength = pe->disksize;
-	}
-	else if (magic == MAGIC_HEADER)
-	{
-		// try to find the section
-		mint8_t numOfPlugins;
-		DATAREAD(&numOfPlugins, sizeof(numOfPlugins), 1);
-	
-		TableEntry entry;
-	
-		m_SectionHdrOffset = 0;
-		int i = 0;
-		
-		for (i = 0; i < static_cast<int>(numOfPlugins); ++i)
-		{
-			DATAREAD(&entry, sizeof(entry), 1);
-			if (entry.cellSize == m_CellSize)
-			{
-				m_SectionHdrOffset = ftell(m_pFile) - sizeof(entry);
-				break;
-			}
-		}
-		
-		if (!m_SectionHdrOffset)
-		{
-			m_Status = Err_SectionNotFound;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			return;
-		}
-
-		// compute section length
-		if ((i + 1) < static_cast<int>(numOfPlugins))
-		{
-			// there is a next section
-			TableEntry nextEntry;
-			DATAREAD(&nextEntry, sizeof(nextEntry), 1);
-			m_SectionLength = nextEntry.offset - entry.offset;
-		} 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;
-		}
-	} 
-}
-
-CAmxxReader::~CAmxxReader()
-{
-	if (m_pFile)
-	{
-		fclose(m_pFile);
-		m_pFile = NULL;
-	}
-	
-	if (m_Bh.plugins)
-	{
-		delete [] m_Bh.plugins;
-		m_Bh.plugins = NULL;
-	}
-}
-
-CAmxxReader::Error CAmxxReader::GetStatus()
-{
-	return m_Status;
-}
-
-#undef DATAREAD
-#define DATAREAD(addr, itemsize, itemcount) \
-	if (fread(addr, itemsize, itemcount, m_pFile) != itemcount) \
-	{ \
-		if (feof(m_pFile)) \
-			m_Status = Err_FileInvalid; \
-		else \
-			m_Status = Err_FileRead; \
-		fclose(m_pFile); \
-		m_pFile = NULL; \
-		return 0; \
-	}
-
-size_t CAmxxReader::GetBufferSize()
-{
-	if (!m_pFile)
-		return 0;
-
-	long save = ftell(m_pFile);
-
-	if (m_OldFile)
-	{
-		rewind(m_pFile);
-		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) != itemcount) \
-	{ \
-		if (feof(m_pFile)) \
-			m_Status = Err_FileInvalid; \
-		else \
-			m_Status = Err_FileRead; \
-		fclose(m_pFile); \
-		m_pFile = NULL; \
-		return m_Status; \
-	}
-
-CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
-{
-	if (!m_pFile)
-		return m_Status;
-
-	if (m_OldFile)
-	{
-		// get file size
-		fseek(m_pFile, 0, SEEK_END);
-		long filesize = ftell(m_pFile);
-		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);
-		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;
-		
-		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

@@ -1,97 +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 __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:
-	enum Error
-	{
-		Err_None=0,
-		Err_InvalidParam,
-		Err_FileOpen,
-		Err_FileRead,
-		Err_FileInvalid,
-		Err_SectionNotFound,
-		Err_DecompressorInit,
-		Err_Decompress,
-		Err_OldFile,
-	};
-
-private:
-	Error m_Status;
-	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
-	int m_SectionLength;
-public:
-	CAmxxReader(const char *filename, int cellsize);
-	~CAmxxReader();
-
-	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
-};
-
-#endif // __AMXXFILE_H__

amxmodx/amxxlog.cpp

@@ -1,225 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*
-*
-*  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.
-*/
-
-// amxx_logging localinfo:
-//  0 = no logging
-//  1 = one logfile / day
-//  2 = one logfile / map
-//  3 = HL Logs
-
-#include <time.h>
-#ifndef __linux__
-	#include <io.h>
-#endif
-#include "amxmodx.h"
-
-#ifndef __linux__
-	#define	vsnprintf	_vsnprintf
-#endif
-
-CLog::CLog()
-{
-	m_LogType = 0;
-	m_LogFile.clear();
-}
-
-CLog::~CLog()
-{
-	CloseFile();
-}
-
-void CLog::CloseFile()
-{
-	// log "log file closed" to old file, if any
-	if (!m_LogFile.empty())
-	{
-		FILE *fp = fopen(m_LogFile.c_str(), "r");
-		
-		if (fp)
-		{
-			fclose(fp);
-			fp = fopen(m_LogFile.c_str(), "a+");
-
-			// get time
-			time_t td;
-			time(&td);
-			tm *curTime = localtime(&td);
-
-			char date[32];
-			strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
-
-			fprintf(fp, "L %s: %s\n", date, "Log file closed.");
-			fclose(fp);
-		}
-		
-		m_LogFile.clear();
-	}
-}
-
-void CLog::CreateNewFile()
-{
-	CloseFile();
-	
-	// build filename
-	time_t td;
-	time(&td);
-	tm *curTime = localtime(&td);
-
-	int i = 0;
-	
-	while (true)
-	{
-		FILE *pTmpFile = fopen(m_LogFile.c_str(), "r");			// open for reading to check whether the file exists
-		
-		if (!pTmpFile)
-			break;
-		
-		fclose(pTmpFile);
-		++i;
-	}
-	
-	// 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()));
-}
-
-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);
-#else
-	mkdir(build_pathname_r(file, sizeof(file)-1, "%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");
-		m_LogType = 1;
-		print_srvconsole("[AMXX] Invalid amxx_logging value; setting back to 1...");
-	}
-
-	if (m_LogType == 2)
-	{
-		// create new logfile
-		CreateNewFile();
-	}
-	else if (m_LogType == 1)
-	{
-		Log("-------- Mapchange to %s --------", STRING(gpGlobals->mapname));
-	}
-	else
-		return;
-}
-
-void CLog::Log(const char *fmt, ...)
-{
-	static char file[256];
-	
-	if (m_LogType == 1 || m_LogType == 2)
-	{
-		// 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, 3071, fmt, arglst);
-		va_end(arglst);
-
-		FILE *pF = NULL;
-		if (m_LogType == 2)
-		{
-			pF = fopen(m_LogFile.c_str(), "a+");
-			if (!pF)
-			{
-				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());
-					m_LogType = 0;
-					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)
-		{
-			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;
-		}
-
-		// print on server console
-		print_srvconsole("L %s: %s\n", date, msg);
-	}
-	else if (m_LogType == 3)
-	{
-		// build message
-		static char msg_[3072];
-		va_list arglst;
-		va_start(arglst, fmt);
-		vsnprintf(msg_, 3071, fmt, arglst);
-		va_end(arglst);
-		ALERT(at_logged, "%s\n", msg_);
-	}
-}

amxmodx/amxxlog.h

@@ -1,52 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*
-*
-*  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 __AMXXLOG_H__
-#define __AMXXLOG_H__
-
-class CLog
-{
-private:
-	String m_LogFile;
-	int m_LogType;
-
-	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, ...);
-};
-
-#endif // __AMXXLOG_H__

amxmodx/debugger.cpp

@@ -1,993 +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 "debugger.h"
-
-#if !defined WIN32 && !defined _WIN32
-#define _snprintf snprintf
-#endif
-
-/**
- * AMX Mod X Debugging Engine
- *  Written by David "BAILOPAN" Anderson
- */
-
-enum AmxOpcodes
-{
-  OP_NONE,              /* invalid opcode */
-  OP_LOAD_PRI,
-  OP_LOAD_ALT,
-  OP_LOAD_S_PRI,
-  OP_LOAD_S_ALT,
-  OP_LREF_PRI,
-  OP_LREF_ALT,
-  OP_LREF_S_PRI,
-  OP_LREF_S_ALT,
-  OP_LOAD_I,
-  OP_LODB_I,
-  OP_CONST_PRI,
-  OP_CONST_ALT,
-  OP_ADDR_PRI,
-  OP_ADDR_ALT,
-  OP_STOR_PRI,
-  OP_STOR_ALT,
-  OP_STOR_S_PRI,
-  OP_STOR_S_ALT,
-  OP_SREF_PRI,
-  OP_SREF_ALT,
-  OP_SREF_S_PRI,
-  OP_SREF_S_ALT,
-  OP_STOR_I,
-  OP_STRB_I,
-  OP_LIDX,
-  OP_LIDX_B,
-  OP_IDXADDR,
-  OP_IDXADDR_B,
-  OP_ALIGN_PRI,
-  OP_ALIGN_ALT,
-  OP_LCTRL,
-  OP_SCTRL,
-  OP_MOVE_PRI,
-  OP_MOVE_ALT,
-  OP_XCHG,
-  OP_PUSH_PRI,
-  OP_PUSH_ALT,
-  OP_PUSH_R,
-  OP_PUSH_C,
-  OP_PUSH,
-  OP_PUSH_S,
-  OP_POP_PRI,
-  OP_POP_ALT,
-  OP_STACK,
-  OP_HEAP,
-  OP_PROC,
-  OP_RET,
-  OP_RETN,
-  OP_CALL,
-  OP_CALL_PRI,
-  OP_JUMP,
-  OP_JREL,
-  OP_JZER,
-  OP_JNZ,
-  OP_JEQ,
-  OP_JNEQ,
-  OP_JLESS,
-  OP_JLEQ,
-  OP_JGRTR,
-  OP_JGEQ,
-  OP_JSLESS,
-  OP_JSLEQ,
-  OP_JSGRTR,
-  OP_JSGEQ,
-  OP_SHL,
-  OP_SHR,
-  OP_SSHR,
-  OP_SHL_C_PRI,
-  OP_SHL_C_ALT,
-  OP_SHR_C_PRI,
-  OP_SHR_C_ALT,
-  OP_SMUL,
-  OP_SDIV,
-  OP_SDIV_ALT,
-  OP_UMUL,
-  OP_UDIV,
-  OP_UDIV_ALT,
-  OP_ADD,
-  OP_SUB,
-  OP_SUB_ALT,
-  OP_AND,
-  OP_OR,
-  OP_XOR,
-  OP_NOT,
-  OP_NEG,
-  OP_INVERT,
-  OP_ADD_C,
-  OP_SMUL_C,
-  OP_ZERO_PRI,
-  OP_ZERO_ALT,
-  OP_ZERO,
-  OP_ZERO_S,
-  OP_SIGN_PRI,
-  OP_SIGN_ALT,
-  OP_EQ,
-  OP_NEQ,
-  OP_LESS,
-  OP_LEQ,
-  OP_GRTR,
-  OP_GEQ,
-  OP_SLESS,
-  OP_SLEQ,
-  OP_SGRTR,
-  OP_SGEQ,
-  OP_EQ_C_PRI,
-  OP_EQ_C_ALT,
-  OP_INC_PRI,
-  OP_INC_ALT,
-  OP_INC,
-  OP_INC_S,
-  OP_INC_I,
-  OP_DEC_PRI,
-  OP_DEC_ALT,
-  OP_DEC,
-  OP_DEC_S,
-  OP_DEC_I,
-  OP_MOVS,
-  OP_CMPS,
-  OP_FILL,
-  OP_HALT,
-  OP_BOUNDS,
-  OP_SYSREQ_PRI,
-  OP_SYSREQ_C,
-  OP_FILE,    /* obsolete */
-  OP_LINE,    /* obsolete */
-  OP_SYMBOL,  /* obsolete */
-  OP_SRANGE,  /* obsolete */
-  OP_JUMP_PRI,
-  OP_SWITCH,
-  OP_CASETBL,
-  OP_SWAP_PRI,
-  OP_SWAP_ALT,
-  OP_PUSHADDR,
-  OP_NOP,
-  OP_SYSREQ_D,
-  OP_SYMTAG,  /* obsolete */
-  OP_BREAK,
-  /* ----- */
-  OP_NUM_OPCODES
-} OPCODE;
-
-
-const char *GenericError(int err);
-
-Debugger::Tracer::~Tracer()
-{
-	Clear();
-}
-
-void Debugger::Tracer::StepI(cell frm, cell cip)
-{
-	if (m_pEnd == NULL)
-	{
-		assert(m_Reset);
-
-		if (m_pStart == NULL)
-			m_pStart = new trace_info();
-
-		m_pEnd = m_pStart;
-		m_Reset = true;
-		m_pEnd->cip = cip;
-		m_pEnd->frm = frm;
-		m_pEnd->used = true;
-	} else {
-		if (m_pEnd->frm > frm)
-		{
-			//the last frame has moved down the stack.
-			//push a new call onto our list
-			if (m_pEnd->next)
-			{
-				m_pEnd = m_pEnd->next;
-				m_pEnd->used = true;
-			} else {
-				trace_info *pInfo = new trace_info();
-				m_pEnd->next = pInfo;
-				pInfo->prev = m_pEnd;
-				pInfo->used = true;
-				m_pEnd = pInfo;
-			}
-			//if we're pushing a new call, save the initial frame
-			m_pEnd->frm = frm;
-		} else if (m_pEnd->frm < frm) {
-			//the last frame has moved up the stack.
-			//pop a call from our list
-			m_pEnd->used = false;
-			m_pEnd = m_pEnd->prev;
-		}
-		//no matter where we are, save the current cip
-		m_pEnd->cip = cip;
-	}
-}
-
-void Debugger::Tracer::Clear()
-{
-	trace_info *pInfo, *pNext;
-
-	pInfo = m_pStart;
-	while (pInfo)
-	{
-		pNext = pInfo->next;
-		delete pInfo;
-		pInfo = pNext;
-	}
-
-	m_pStart = NULL;
-	m_pEnd = NULL;
-	m_Error = AMX_ERR_NONE;
-	m_Reset = true;
-}
-
-void Debugger::Tracer::Reset()
-{
-	trace_info *pInfo = m_pStart;
-
-	while (pInfo && pInfo->used)
-	{
-		pInfo->used = false;
-		pInfo = pInfo->next;
-	}
-
-	m_pEnd = NULL;
-	m_Error = AMX_ERR_NONE;
-	m_Reset = true;
-}
-
-trace_info_t *Debugger::Tracer::GetStart() const
-{
-	return m_pStart;
-}
-
-trace_info_t *Debugger::Tracer::GetEnd() const
-{
-	return m_pEnd;
-}
-
-void Debugger::BeginExec()
-{
-	m_Top++;
-	assert(m_Top >= 0);
-
-	if (m_Top >= (int)m_pCalls.size())
-	{
-		Tracer *pTracer = new Tracer();
-		m_pCalls.push_back(pTracer);
-		assert(m_Top == (m_pCalls.size() - 1));
-	}
-
-	m_pCalls[m_Top]->Reset();
-}
-
-void Debugger::EndExec()
-{
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	m_pCalls[m_Top]->Reset();
-
-	m_Top--;
-}
-
-void Debugger::StepI()
-{
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	m_pCalls[m_Top]->StepI(m_pAmx->frm, m_pAmx->cip);
-}
-
-void Debugger::Reset()
-{
-	//no call state
-	m_Top = -1;
-}
-
-int Debugger::GetTracedError()
-{
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	return m_pCalls[m_Top]->m_Error;
-}
-
-void Debugger::SetTracedError(int error)
-{
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	m_pCalls[m_Top]->m_Error = error;
-}
-
-trace_info_t *Debugger::GetTraceStart() const
-{
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	return m_pCalls[m_Top]->GetEnd();
-}
-
-bool Debugger::GetTraceInfo(trace_info_t *pTraceInfo, long &line, const char *&function, const char *&file)
-{
-	cell addr = pTraceInfo->cip;
-
-	dbg_LookupFunction(m_pAmxDbg, addr, &function);
-	dbg_LookupLine(m_pAmxDbg, addr, &line);
-	dbg_LookupFile(m_pAmxDbg, addr, &file);
-
-	return true;
-}
-
-trace_info_t *Debugger::GetNextTrace(trace_info_t *pTraceInfo)
-{
-	if (!pTraceInfo->prev || !pTraceInfo->prev->used)
-		return NULL;
-
-	return pTraceInfo->prev;
-}
-
-bool Debugger::ErrorExists()
-{
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	return (m_pCalls[m_Top]->m_Error != AMX_ERR_NONE);
-}
-
-int Debugger::FormatError(char *buffer, size_t maxLength)
-{
-	if (!ErrorExists())
-		return -1;
-
-	assert(m_Top >= 0 && m_Top < (int)m_pCalls.size());
-
-	Tracer *pTracer = m_pCalls[m_Top];
-	int error = pTracer->m_Error;
-	const char *gen_err = GenericError(error);
-	int size = 0;
-	trace_info_t *pTrace = pTracer->GetEnd();
-	cell cip = _CipAsVa(m_pAmx->cip);
-	cell *p_cip = NULL;
-	int amx_err = AMX_ERR_NONE;
-
-	size += _snprintf(buffer, maxLength, "Run time error %d: %s ", error, gen_err);
-	buffer += size;
-	maxLength -= size;
-
-	if (error == AMX_ERR_NATIVE || error == AMX_ERR_INVNATIVE)
-	{
-		char native_name[sNAMEMAX+1];
-		int num = 0;
-		/*//go two instructions back
-		cip -= (sizeof(cell) * 2);
-		int instr = _GetOpcodeFromCip(cip, p_cip);
-		if (instr == OP_SYSREQ_C)
-		{
-			num = (int)*p_cip;
-		}*/
-		//New code only requires this...
-		num = (int)(_INT_PTR)m_pAmx->usertags[UT_NATIVE];
-		amx_err = amx_GetNative(m_pAmx, num, native_name);
-		/*if (num)
-			amx_err = amx_GetNative(m_pAmx, (int)*p_cip, native_name);
-		else 
-			amx_err = AMX_ERR_NOTFOUND;*/
-		//if (!amx_err)
-			size += _snprintf(buffer, maxLength, "(native \"%s\")", native_name);
-	}
-
-	return size;
-}
-
-cell Debugger::_CipAsVa(cell cip)
-{
-	AMX_HEADER *hdr = (AMX_HEADER*)(m_pAmx->base);
-	unsigned char *code = m_pAmx->base + (int)hdr->cod;
-
-	if (cip >= (cell)code && cip < (cell)(m_pAmx->base + (int)hdr->dat))
-	{
-		return (cell)(cip-(cell)code);
-	} else {
-		return (cell)(code + cip);
-	}
-}
-
-int Debugger::_GetOpcodeFromCip(cell cip, cell *&addr)
-{
-	AMX_HEADER *hdr = (AMX_HEADER*)(m_pAmx->base);
-	unsigned char *code = m_pAmx->base + (int)hdr->cod;
-
-	cell *p_cip = NULL;
-	//test if cip is between these 
-	if (cip >= (cell)code && cip < (cell)(m_pAmx->base + (int)hdr->dat))
-	{
-		p_cip = (cell *)(cip);
-	} else {
-		p_cip = (cell *)(code + cip);
-	}
-
-	//move forward one entry
-	addr = p_cip + 1;
-
-	//p_cip should be aligned to an instruction!
-	cell instr = *p_cip;
-
-	if (instr < 1 || instr >= OP_NUM_OPCODES)
-	{
-		if (!m_pOpcodeList)
-			return 0;
-
-		//we have an invalid opcode, so try searching for it
-		for (cell i=1; i<OP_NUM_OPCODES; i++)
-		{
-			if ((cell)m_pOpcodeList[i] == instr)
-			{
-				instr = i;
-				break;
-			}
-		}
-
-		if (instr < 1 || instr >= OP_NUM_OPCODES)
-			instr = 0;		//nothing found
-	}
-
-	return (int)instr;
-}
-
-void Debugger::_CacheAmxOpcodeList()
-{
-    m_pOpcodeList = (cell *)m_pAmx->userdata[UD_OPCODELIST];
-}
-
-//by BAILOPAN
-//  generic error printing routine
-//  for pawn 3.0 this is just a wrapper
-const char *GenericError(int err)
-{
-	static const char *amx_errs[] =
-	{
-		NULL,
-		"forced exit",
-		"assertion failed",
-		"stack error",
-		"index out of bounds",
-		"memory access",
-		"invalid instruction",
-		"stack low",
-		"heap low",
-		"callback",
-		"native error",
-		"divide",
-		"sleep",
-		"invalid access state",
-		"native not found",
-		NULL,
-		"out of memory", //16
-		"bad file format",
-		"bad file version",
-		"function not found",
-		"invalid entry point",
-		"debugger cannot run",
-		"plugin un or re-initialized",
-		"userdata table full",
-		"JIT failed to initialize",
-		"parameter error",
-		"domain error",
-	};
-	//does this plugin have line ops?
-	const char *geterr = NULL;
-	if (err <= 26 && err > 0)
-		geterr = amx_errs[err];
-
-	return geterr ? geterr : "unknown error";
-}
-
-int AMXAPI Debugger::DebugHook(AMX *amx)
-{
-	Debugger *pDebugger = NULL;
-
-	if (!amx || !(amx->flags & AMX_FLAG_DEBUG))
-		return AMX_ERR_NONE;
-
-	if (amx->flags & AMX_FLAG_PRENIT)
-		return AMX_ERR_NONE;
-
-	pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
-
-	if (!pDebugger)
-		return AMX_ERR_NONE;
-
-	pDebugger->StepI();
-
-	return AMX_ERR_NONE;
-}
-
-void Debugger::Clear()
-{
-	for (size_t i=0; i<m_pCalls.size(); i++)
-			delete m_pCalls[i];
-
-	m_pCalls.clear();
-}
-
-void Debugger::DisplayTrace(const char *message)
-{
-	if (message != NULL)
-		AMXXLOG_Log("%s", message);
-
-	char buffer[512];
-	FormatError(buffer, sizeof(buffer)-1);
-
-	const char *filename = _GetFilename();
-
-	AMXXLOG_Log("[AMXX] Displaying debug trace (plugin \"%s\")", filename);
-	AMXXLOG_Log("[AMXX] %s", buffer);
-	
-	int count = 0;
-	long lLine;
-	const char *file, *function;
-	trace_info_t *pTrace = GetTraceStart();
-	while (pTrace)
-	{
-		GetTraceInfo(pTrace, lLine, function, file);
-		AMXXLOG_Log(
-			"[AMXX]    [%d] %s::%s (line %d)",
-			count,
-			file,
-			function,
-			(int)(lLine + 1)
-			);
-		count++;
-		pTrace = GetNextTrace(pTrace);
-	}
-}
-
-const char *Debugger::_GetFilename()
-{
-	if (m_FileName.size() < 1)
-	{
-		const char *filename = "";
-		CPluginMngr::CPlugin *pl = g_plugins.findPluginFast(m_pAmx);
-		if (pl)
-		{
-			filename = pl->getName();
-		} else {
-			CList<CScript,AMX*>::iterator a = g_loadedscripts.find(m_pAmx);
-			if (a)
-				filename = (*a).getName();
-		}
-		m_FileName.assign(filename);
-	}
-
-	return m_FileName.c_str();
-}
-
-void Debugger::FmtGenericMsg(AMX *amx, int error, char buffer[], size_t maxLength)
-{
-	const char *filename = "";
-
-	CList<CScript,AMX*>::iterator a = g_loadedscripts.find(amx);
-	if (a)
-		filename = (*a).getName();
-	size_t len = strlen(filename);
-	for (size_t i=len-1; i>=0; i--)
-	{
-		if (filename[i] == '/' || filename[i] == '\\' && i != len - 1)
-		{
-			filename = &(filename[i+1]);
-			break;
-		}
-	}
-
-	_snprintf(buffer, maxLength, "Run time error %d (plugin \"%s\") - debug not enabled!", error, filename);
-}
-
-void Debugger::GenericMessage(AMX *amx, int err)
-{
-	static char buffer[512];
-
-	buffer[0] = '\0';
-	Debugger::FmtGenericMsg(amx, err, buffer, sizeof(buffer)-1);
-
-	if (buffer[0] != '\0')
-		AMXXLOG_Log("[AMXX] %s", buffer);
-}
-
-Debugger::~Debugger()
-{
-	Clear();
-}
-
-int Handler::SetErrorHandler(const char *function)
-{
-	int error;
-	
-	error = amx_FindPublic(m_pAmx, function, &m_iErrFunc);
-
-	if (error != AMX_ERR_NONE && m_iErrFunc < 1)
-		m_iErrFunc = -1;
-
-	return error;
-}
-
-int Handler::SetModuleFilter(const char *function)
-{
-	int error;
-	
-	error = amx_FindPublic(m_pAmx, function, &m_iModFunc);
-
-	if (error != AMX_ERR_NONE && m_iModFunc < 1)
-		m_iModFunc = -1;
-
-	return error;
-}
-
-int Handler::SetNativeFilter(const char *function)
-{
-	int error;
-	
-	error = amx_FindPublic(m_pAmx, function, &m_iNatFunc);
-
-	if (error != AMX_ERR_NONE && !IsNativeFiltering())
-		m_iNatFunc = -1;
-
-	return error;
-}
-
-void Handler::SetErrorMsg(const char *msg)
-{
-	if (!msg)
-		m_MsgCache.clear();
-	else
-		m_MsgCache.assign(msg);
-}
-
-const char *Handler::GetLastMsg()
-{
-	if (m_MsgCache.size() < 1)
-		return NULL;
-
-	return m_MsgCache.c_str();
-}
-
-int Handler::HandleModule(const char *module)
-{
-	if (m_iModFunc < 1)
-		return 0;
-
-	/**
-	 * This is the most minimalistic handler of them all
-	 */
-
-	cell hea_addr, *phys_addr, retval;
-	Debugger *pd;
-
-	pd = DisableDebugHandler(m_pAmx);
-
-	//temporarily set prenit
-	m_pAmx->flags |= AMX_FLAG_PRENIT;
-	amx_PushString(m_pAmx, &hea_addr, &phys_addr, module, 0, 0);
-	int err = amx_Exec(m_pAmx, &retval, m_iModFunc);
-	amx_Release(m_pAmx, hea_addr);
-	m_pAmx->flags &= ~AMX_FLAG_PRENIT;
-
-	EnableDebugHandler(m_pAmx, pd);
-
-	if (err != AMX_ERR_NONE)
-		return 0;
-
-	return (int)retval;
-}
-
-int Handler::HandleNative(const char *native, int index, int trap)
-{
-	if (!IsNativeFiltering())
-		return 0;
-
-	/**
-	 * Our handler here is a bit different from HandleError().
-	 * For one, there is no current error in pDebugger, so we 
-	 *  don't have to save some states.
-	 */
-
-	m_InNativeFilter = true;
-
-	Debugger *pDebugger = (Debugger *)m_pAmx->userdata[UD_DEBUGGER];
-
-	if (pDebugger && trap)
-		pDebugger->BeginExec();
-	else if (pDebugger && !trap)
-		DisableDebugHandler(m_pAmx);
-
-	cell hea_addr, *phys_addr, retval;
-
-	if (!trap)
-		m_pAmx->flags |= AMX_FLAG_PRENIT;
-
-	amx_Push(m_pAmx, trap);
-	amx_Push(m_pAmx, index);
-	amx_PushString(m_pAmx, &hea_addr, &phys_addr, native, 0, 0);
-	int err = amx_Exec(m_pAmx, &retval, m_iNatFunc);
-	if (err != AMX_ERR_NONE)
-	{
-		//LogError() took care of something for us.
-		if (err == -1)
-		{
-			m_InNativeFilter = false;
-			amx_Release(m_pAmx, hea_addr);
-			return 1;
-		}
-		if (!trap)
-		{
-			AMXXLOG_Log("[AMXX] Runtime failure %d occurred in native filter.  Aborting plugin load.", err);
-			return 0;
-		}
-		//handle this manually.
-		//we need to push this through an error filter, same as executeForwards!
-		if (pDebugger && pDebugger->ErrorExists())
-		{
-			//don't display, it was already handled.
-		} else if (err != -1) {
-			LogError(m_pAmx, err, NULL);
-		}
-		AMXXLOG_Log("[AMXX] NOTE: Runtime failures in native filters are not good!");
-		retval = 0;
-	}
-	if (!trap)
-		m_pAmx->flags &= ~AMX_FLAG_PRENIT;
-	if (pDebugger && trap)
-		pDebugger->EndExec();
-	else if (pDebugger && !trap)
-		EnableDebugHandler(m_pAmx, pDebugger);
-
-	amx_Release(m_pAmx, hea_addr);
-
-	m_InNativeFilter = false;
-
-	return (int)retval;
-}
-
-int Handler::HandleError(const char *msg)
-{
-	if (m_iErrFunc <= 0)
-		return 0;
-
-	m_Handling = true;
-	m_pTrace = NULL;
-	m_FmtCache.clear();
-
-	Debugger *pDebugger = (Debugger *)m_pAmx->userdata[UD_DEBUGGER];
-
-	int error = m_pAmx->error;
-
-	static char _buffer[512];
-	if (pDebugger)
-	{
-		pDebugger->SetTracedError(error);
-		m_pTrace = pDebugger->GetTraceStart();
-		pDebugger->FormatError(_buffer, sizeof(_buffer)-1);
-		m_FmtCache.assign(_buffer);
-		pDebugger->BeginExec();
-	} else {
-		Debugger::FmtGenericMsg(m_pAmx, error, _buffer, sizeof(_buffer)-1);
-		m_FmtCache.assign(_buffer);
-	}
-	
-	SetErrorMsg(msg);
-
-	cell hea_addr, *phys_addr, result;
-
-	amx_PushString(m_pAmx, &hea_addr, &phys_addr, msg, 0, 0);
-	amx_Push(m_pAmx, pDebugger ? 1 : 0);
-	amx_Push(m_pAmx, error);
-	int err = amx_Exec(m_pAmx, &result, m_iErrFunc);
-	if (err != AMX_ERR_NONE)
-	{
-		//handle this manually.
-		if (pDebugger)
-		{
-			pDebugger->SetTracedError(err);
-			pDebugger->DisplayTrace(msg);
-		} else {
-			if (GetLastMsg())
-				AMXXLOG_Log("%s", GetLastMsg());
-			Debugger::GenericMessage(m_pAmx, err);
-		}
-		AMXXLOG_Log("[AMXX] NOTE: Runtime failures in an error filter are not good!");
-	}
-
-	if (pDebugger)
-		pDebugger->EndExec();
-
-	amx_Release(m_pAmx, hea_addr);
-
-	m_Handling = false;
-	m_pTrace = NULL;
-	m_FmtCache.clear();
-
-	if (err != AMX_ERR_NONE || !result)
-		return 0;
-
-	return result;
-}
-
-static cell AMX_NATIVE_CALL set_error_filter(AMX *amx, cell *params)
-{
-	int len;
-	char *function = get_amxstring(amx, params[1], 0, len);
-
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	if (!pHandler)
-	{
-		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Plugin not initialized correctly.");
-		return 0;
-	}
-
-	int err = pHandler->SetErrorHandler(function);
-	if (err != AMX_ERR_NONE)
-	{
-		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Function not found: %s", function);
-		return 0;
-	}
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL dbg_trace_begin(AMX *amx, cell *params)
-{
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	if (!pHandler)
-		return 0;		//should never happen
-
-	trace_info_t *pTrace = pHandler->GetTrace();
-
-	return (cell)(pTrace);
-}
-
-static cell AMX_NATIVE_CALL dbg_trace_next(AMX *amx, cell *params)
-{
-	Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
-
-	if (!pDebugger)
-		return 0;
-
-	trace_info_t *pTrace = (trace_info_t *)(params[1]);
-
-	if (pTrace)
-		return (cell)(pDebugger->GetNextTrace(pTrace));
-
-	return 0;
-}
-
-static cell AMX_NATIVE_CALL dbg_trace_info(AMX *amx, cell *params)
-{
-	Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
-
-	if (!pDebugger)
-		return 0;
-
-	trace_info_t *pTrace = (trace_info_t *)(params[1]);
-
-	if (!pTrace)
-		return 0;
-
-	cell *line_addr = get_amxaddr(amx, params[2]);
-	long lLine=-1;
-	const char *function=NULL, *file=NULL;
-
-	pDebugger->GetTraceInfo(pTrace, lLine, function, file);
-
-	set_amxstring(amx, params[3], function ? function : "", params[4]);
-	set_amxstring(amx, params[5], file ? file : "", params[5]);
-	*line_addr = (cell)lLine + 1;
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL dbg_fmt_error(AMX *amx, cell *params)
-{
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	if (!pHandler)
-		return 0;
-
-	const char *str = pHandler->GetFmtCache();
-
-	set_amxstring(amx, params[1], str, params[2]);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL set_native_filter(AMX *amx, cell *params)
-{
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	if (!pHandler)
-	{
-		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Plugin not initialized correctly.");
-		return 0;
-	}
-
-	if (!pHandler->IsNativeFiltering())
-	{
-		//we can only initialize this during PRENIT
-		if (! (amx->flags & AMX_FLAG_PRENIT) )
-			return 0;
-	}
-
-	int len;
-	char *func = get_amxstring(amx, params[1], 0, len);
-
-	int err = pHandler->SetNativeFilter(func);
-
-	if (err != AMX_ERR_NONE)
-	{
-		Debugger::GenericMessage(amx, AMX_ERR_NOTFOUND);
-		AMXXLOG_Log("[AMXX] Function not found: %s", function);
-		return 0;
-	}
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL set_module_filter(AMX *amx, cell *params)
-{
-	if ( !(amx->flags & AMX_FLAG_PRENIT) )
-		return -1;
-
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	if (!pHandler)
-		return -2;
-
-	int len;
-	char *function = get_amxstring(amx, params[1], 0, len);
-
-	return pHandler->SetModuleFilter(function);
-}
-
-
-AMX_NATIVE_INFO g_DebugNatives[] = {
-	{"set_error_filter",	set_error_filter},
-	{"dbg_trace_begin",		dbg_trace_begin},
-	{"dbg_trace_next",		dbg_trace_next},
-	{"dbg_trace_info",		dbg_trace_info},
-	{"dbg_fmt_error",		dbg_fmt_error},
-	{"set_native_filter",	set_native_filter},
-	{"set_module_filter",	set_module_filter},
-	{NULL,					NULL},
-};

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), used(false), next(NULL), prev(NULL) {};
-			
-			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);
-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

@@ -29,6 +29,8 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 
 int gmsgAmmoPickup;
@@ -58,14 +60,9 @@ WeaponsVault g_weaponsData[MAX_WEAPONS];
 void Client_VGUIMenu(void* mValue)
 {
   if (!mPlayer) return;
-
+  switch (mState++){
-	mPlayer->vgui = true;
-
-	switch (mState++)
-	{
   case 0:
     mPlayer->menu = -(*(int*)mValue);
-			mPlayer->newmenu = -1;
     break;
   case 1:
     mPlayer->keys = *(int*)mValue;
@@ -75,20 +72,12 @@ void Client_VGUIMenu(void* mValue)
 void Client_ShowMenu(void* mValue)
 {
   if (!mPlayer) return;
-
+  switch (mState++){
-	mPlayer->vgui = true;
-
-	switch (mState++)
-	{
   case 0:
     mPlayer->keys = *(int*)mValue;
     break;
   case 3:
-			{
+    mPlayer->menu = g_menucmds.findMenuId( (char*)mValue );
-			mPlayer->menu = g_menucmds.findMenuId((char*)mValue);
-			mPlayer->newmenu = -1;
-			break;
-			}
   }
 }
 
@@ -96,74 +85,59 @@ void Client_TeamInfo(void* mValue)
 {
   if (mPlayer) return;
   static int index;
-
+  switch (mState++) {
-	switch (mState++)
-	{
   case 0:
     index = *(int*)mValue;
     break;
   case 1:
-			if (index < 1 || index > gpGlobals->maxClients) break;
+	if ( index < 1 || index > gpGlobals->maxClients ) break;
 	char* msg = (char*)mValue;
-			g_players[index].team.assign(msg);
+    g_players[ index ].team.set( msg );
-			g_teamsIds.registerTeam(msg, -1);
+	g_teamsIds.registerTeam( msg , -1 );
   }
 }
 
 void Client_TextMsg(void* mValue)
 {
-	if (mPlayer) return;
+	if ( mPlayer ) return;
-	
+	switch (mState++) {
-	switch (mState++)
+	case 1:{
-	{
-		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_endround_time = gpGlobals->time;
-				//g_newround_time = gpGlobals->time + CVAR_GET_FLOAT("mp_freezetime") + 3;
+			//      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");
-				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)
+		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;
+		if ( g_game_timeleft != -3 ) break;
-			g_game_restarting += atoi(msg);
+		g_game_restarting += atoi( msg );
 		g_game_timeleft = g_game_restarting	= gpGlobals->time + g_game_restarting;
-			
 		break;
 		   }
 	}
+	
 }
 
 void Client_WeaponList(void* mValue)
@@ -172,9 +146,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;
@@ -183,12 +155,24 @@ void Client_WeaponList(void* mValue)
     break;
   case 7:
     int iId = *(int*)mValue;
-			if ((iId < 0 || iId >= MAX_WEAPONS) || (wpnList & (1<<iId)))
+	/*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);
+    g_weaponsData[iId].fullName.set(wpnName);
+
   }
 }
 
@@ -196,9 +180,7 @@ void Client_CurWeapon(void* mValue)
 {
   static int iState;
   static int iId;
-	
+  switch (mState++){
-	switch (mState++)
-	{
   case 0:
     iState = *(int*)mValue;
     break;
@@ -208,7 +190,7 @@ void Client_CurWeapon(void* mValue)
     break;
   case 2:
   if (!mPlayer) return;
-			if (!iState || (iId < 1 || iId >= MAX_WEAPONS)) break;
+    if (!iState || (iId < 1 || iId >= MAX_WEAPONS ) ) break;
     mPlayer->weapons[iId].clip = *(int*)mValue;
     mPlayer->current = iId;
     mPlayer->lastHit = mPlayer->lastTrace;
@@ -217,16 +199,15 @@ 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;
   case 1:
   if (!mPlayer) return;
-			for (int i = 1; i < MAX_WEAPONS; ++i)
+    for(int i=1;i<MAX_WEAPONS;++i)
     if (iAmmo == g_weaponsData[i].ammoSlot)
         mPlayer->weapons[i].ammo = *(int*)mValue;
   }
@@ -235,15 +216,13 @@ void Client_AmmoX(void* mValue)
 void Client_AmmoPickup(void* mValue)
 {
   static int iSlot;
-	
+  switch (mState++){
-	switch (mState++)
-	{
   case 0:
     iSlot = *(int*)mValue;
     break;
   case 1:
   if (!mPlayer) return;
-			for (int i = 1; i < MAX_WEAPONS; ++i)
+    for(int i=1;i<MAX_WEAPONS;++i)
     if (g_weaponsData[i].ammoSlot==iSlot)
         mPlayer->weapons[i].ammo += *(int*)mValue;
   }
@@ -253,9 +232,7 @@ void Client_ScoreInfo(void* mValue)
 {
   static int index;
   static int deaths;
-
+  switch (mState++){
-	switch (mState++)
-	{
   case 0:
     index = *(int*)mValue;
     break;
@@ -263,12 +240,12 @@ void Client_ScoreInfo(void* mValue)
     deaths = *(int*)mValue;
     break;
   case 4:
-			if (index < 1 || index > gpGlobals->maxClients) break;
+	if ( index < 1 || index > gpGlobals->maxClients ) break;
-			CPlayer*pPlayer = GET_PLAYER_POINTER_I(index);
+    CPlayer*pPlayer = GET_PLAYER_POINTER_I( index );
     pPlayer->deaths = deaths;
     pPlayer->teamId = *(int*)mValue;
-			if (g_teamsIds.isNewTeam())
+    if ( g_teamsIds.isNewTeam() )
-				g_teamsIds.registerTeam(pPlayer->team.c_str(), pPlayer->teamId);
+      g_teamsIds.registerTeam( pPlayer->team.str() , pPlayer->teamId );
   }
 }
 
@@ -276,14 +253,14 @@ void Client_DamageEnd(void* mValue)
 {
 	CPlayer* dead = mPlayer;
 
-	if (dead && dead->death_killer)
+	if ( dead && dead->death_killer )
 	{
-		g_events.parserInit(CS_DEATHMSG, &gpGlobals->time, mPlayer = 0, mPlayerIndex = 0);
+		g_events.parserInit( CS_DEATHMSG , &gpGlobals->time , mPlayer = 0, mPlayerIndex = 0 );
-		g_events.parseValue(dead->death_killer);
+		g_events.parseValue( dead->death_killer  );
-		g_events.parseValue(dead->index);
+		g_events.parseValue( dead->index  );
-		g_events.parseValue(dead->death_headshot);
+		g_events.parseValue( dead->death_headshot  );
-		g_events.parseValue(dead->death_weapon.c_str());
+		g_events.parseValue( dead->death_weapon.str()  );
-		g_events.parseValue(dead->death_tk ? 1 : 0);
+		g_events.parseValue( dead->death_tk ? 1 : 0  );
 		g_events.executeEvents();
 		dead->death_killer = 0;
 	}
@@ -297,23 +274,26 @@ 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;
+		
+		if (  !killer || !victim ) break;
+
 		victim->death_killer = killer_id;
-			victim->death_weapon.assign((char*)mValue);
+		victim->death_weapon.set((char*)mValue);
 		victim->death_headshot = hs;
 		victim->death_tk = (killer->teamId == victim->teamId);
 	}

amxmodx/fakemeta.h

@@ -1,37 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*
-*
-*  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 __FAKEMETA_H__
-#define __FAKEMETA_H__
-
-int UnloadMetamodPlugin(void *handle);
-int LoadMetamodPlugin(const char *path, void **handle, PLUG_LOADTIME now);
-
-#endif // #ifndef __FAKEMETA_H__

amxmodx/file.cpp

@@ -35,46 +35,25 @@
 	#define _INTPTR_T_DEFINED
 #endif
 
-#ifdef __GNUC__
+#include <extdll.h>
-#include <stdio.h>
+#include <meta_api.h>
-#include <sys/types.h>
+#include "amxmodx.h"
-#include <sys/stat.h>
-#include <dirent.h>
-#endif
 
 // header file for unlink()
 #ifdef __linux__
 #include <unistd.h>
 #else
-#define WINDOWS_LEAN_AND_MEAN
-#include <windows.h>
 #include <io.h>
 #endif
 
-#include <extdll.h>
+#ifdef __GNUC__
-#include <meta_api.h>
-#include "amxmodx.h"
 
-CVector<FILE *> FileList;
+//#include <stddef.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <dirent.h>
 
-class AutoFilePtr
+#endif
-{
-	FILE *m_FP;
-public:
-	AutoFilePtr(FILE *fp) : m_FP(fp)
-	{}
-	
-	~AutoFilePtr()
-	{
-		if (m_FP)
-			fclose(m_FP);
-	}
-	
-	operator FILE* ()
-	{
-		return m_FP;
-	}
-};
 
 static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
 {
@@ -82,26 +61,20 @@ static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
 	int a;
 	struct dirent *ep;
 	DIR *dp;
-	char* dirname = build_pathname("%s", get_amxstring(amx, params[1], 0, a));
+	char* dirname = build_pathname("%s",get_amxstring(amx,params[1],0,a) );
 	a = params[2];
-	
+	if ( (dp = opendir (dirname)) == NULL )
-	if ((dp = opendir (dirname)) == NULL)
 		return 0;
-	
+	seekdir( dp , a );
-	seekdir(dp, a);
+	if ( (ep  = readdir (dp)) != NULL )  {
-	
+		cell *length = get_amxaddr(amx,params[5]);
-	if ((ep = readdir (dp)) != NULL)
+		*length = set_amxstring(amx,params[3], ep->d_name ,params[4]);
-	{
+		a = telldir( dp );
-		cell *length = get_amxaddr(amx, params[5]);
+	}
-		*length = set_amxstring(amx, params[3], ep->d_name, params[4]);
+	else
-		a = telldir(dp);
-	} else
 		a = 0;
-	
 	closedir (dp);
-	
 	return a;
-
 #else
 	int tmp;
 	char *dirname = build_pathname("%s/*", get_amxstring(amx, params[1], 0, tmp));
@@ -109,12 +82,10 @@ static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
 
 	_finddata_t fd;
 	intptr_t handle = _findfirst(dirname, &fd);
-	
 	if (handle < 0)
 		return 0;
 
 	++tmp;
-	
 	for (int i = 0; i < tmp; ++i)
 	{
 		if (_findnext(handle, &fd) < 0)
@@ -123,9 +94,8 @@ static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
 			break;
 		}
 	}
-	
 	// current data in fd
-	cell *length = get_amxaddr(amx, params[5]);						// pointer to the outLen parameter
+	cell *length = get_amxaddr(amx,params[5]);		// pointer to the outLen parameter
 	*length = set_amxstring(amx, params[3], fd.name, params[4]);	// set output and outLen parameters
 	_findclose(handle);
 
@@ -136,223 +106,142 @@ static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL read_file(AMX *amx, cell *params) /* 5 param */
 {
   int iLen;
-	char* szFile = get_amxstring(amx, params[1], 0, iLen);
+  char* szFile = get_amxstring(amx,params[1],0,iLen);
-	FILE *fp;
+  FILE*fp;
-	
+  if ( (fp =fopen(build_pathname("%s",szFile),"r")) == NULL) {
-	if ((fp =fopen(build_pathname("%s", szFile), "r")) == NULL)
+    amx_RaiseError(amx,AMX_ERR_NATIVE);
-	{
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
     return 0;
   }
-
   char buffor[1024];
   int i = 0, iLine = params[2];
-	
+  while((i <= iLine) && fgets(buffor,1023,fp) )
-	while ((i <= iLine) && fgets(buffor, 1023, fp))
     i++;
-	
   fclose(fp);
-
+  if (i > iLine){
-	if (i > iLine)
-	{
     int len = strlen(buffor);
-		
+    if (buffor[len-1]=='\n')
-		if (buffor[len - 1] == '\n')
+      buffor[--len]=0;
-			buffor[--len] = 0;
+    if (buffor[len-1]=='\r')
-		
+      buffor[--len]=0;
-		if (buffor[len - 1] == '\r')
+    cell *length = get_amxaddr(amx,params[5]);
-			buffor[--len] = 0;
+    *length = set_amxstring(amx,params[3],buffor,params[4]);
-		
-		cell *length = get_amxaddr(amx, params[5]);
-		*length = set_amxstring(amx, params[3], buffor, params[4]);
-		
     return i;
   }
-	
   return 0;
 }
 
 static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 {
   int i;
-	char* sFile = build_pathname("%s", get_amxstring(amx, params[1], 0, i));
+  char* sFile = build_pathname("%s", get_amxstring(amx,params[1],0,i) );
-	char* sText = get_amxstring(amx, params[2], 0, i);
+  char* sText = get_amxstring(amx,params[2],0,i);
   FILE* pFile;
   int iLine = params[3];
 
   // apending to the end
-	if (iLine < 0)
+  if (iLine < 0) {
-	{
+    if ( (pFile  = fopen( sFile ,"a")) == NULL ){
-		if ((pFile = fopen(sFile, "a")) == NULL)
+      amx_RaiseError(amx,AMX_ERR_NATIVE);
-		{
-			amx_RaiseError(amx, AMX_ERR_NATIVE);
       return 0;
     }
-		
+    fputs( sText , pFile );
-		fputs(sText, pFile);
+    fputc( '\n', pFile );
-		fputc('\n', pFile);
+    fclose( pFile );
-		fclose(pFile);
-		
     return 1;
   }
 
   // creating a new file with a line in a middle
-	if ((pFile = fopen(sFile, "r")) == NULL)
+  if ( (pFile = fopen(sFile,"r")) == NULL ) {
-	{
+    if ( (pFile = fopen(sFile,"w")) == NULL ){
-		if ((pFile = fopen(sFile, "w")) == NULL)
+      amx_RaiseError(amx,AMX_ERR_NATIVE);
-		{
-			amx_RaiseError(amx, AMX_ERR_NATIVE);
       return 0;
     }
-		
+    for(i=0;i < iLine;++i)
-		for (i = 0; i < iLine; ++i)
+      fputc('\n',pFile);
-			fputc('\n', pFile);
+    fputs( sText , pFile );
-
+    fputc( '\n', pFile );
-		fputs(sText, pFile);
-		fputc('\n', pFile);
     fclose(pFile);
-		
     return 1;
   }
 
   // adding a new line in a middle of already existing file
   FILE* pTemp;
-	char buffor[2048];
+  char buffor[1024];
 
-	if ((pTemp = tmpfile()) == NULL)
+  if ( (pTemp = tmpfile()) == NULL ){
-	{
+    amx_RaiseError(amx,AMX_ERR_NATIVE);
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
     return 0;
   }
 
-	for (i = 0; ; ++i)
+  for(i=0;;++i){
-	{
+    if (  i == iLine ){
-		if (i == iLine)
+      fgets(buffor,1023,pFile);
-		{
+      fputs( sText , pTemp );
-			fgets(buffor, 2047, pFile);
+      fputc( '\n', pTemp );
-			fputs(sText, pTemp);
-			fputc('\n', pTemp);
     }
-		else if (fgets(buffor, 2047, pFile))
+    else if ( fgets(buffor,1023,pFile) ){
-		{
+      fputs(buffor , pTemp );
-			fputs(buffor, pTemp);
     }
-		else if (i < iLine)
+    else if ( i < iLine ) {
-		{
+      fputc( '\n', pTemp );
-			fputc('\n', pTemp);
     }
-		else
+    else break;
-			break;
   }
 
   fclose(pFile);
   rewind(pTemp);
 
   // now rewrite because file can be now smaller...
-	if ((pFile = fopen(sFile, "w")) == NULL)
+  if ( (pFile = fopen(sFile,"w")) == NULL ){
-	{
+    amx_RaiseError(amx,AMX_ERR_NATIVE);
-		amx_RaiseError(amx, AMX_ERR_NATIVE);
     return 0;
   }
 
-	while (fgets(buffor, 2047, pTemp))
+  while(fgets(buffor,1023,pTemp))
-		fputs(buffor, pFile);
+    fputs(buffor,pFile );
 
   fclose(pTemp);
   fclose(pFile);
-	
   return 1;
 }
 
 static cell AMX_NATIVE_CALL delete_file(AMX *amx, cell *params) /* 1 param */
 {
   int iLen;
-	char* sFile = get_amxstring(amx, params[1], 0, iLen);
+  char* sFile = get_amxstring(amx,params[1],0,iLen);
-	
+  return (unlink( build_pathname("%s",sFile) )?0:1);
-	return (unlink(build_pathname("%s", sFile)) ? 0 : 1);
 }
 
 static cell AMX_NATIVE_CALL file_exists(AMX *amx, cell *params) /* 1 param */
 {
   int iLen;
-	char *sFile = get_amxstring(amx, params[1], 0, iLen);
+  char* sFile = get_amxstring(amx,params[1],0,iLen);
-	char *file = build_pathname("%s", sFile);
+  FILE* fp = fopen(build_pathname("%s",sFile),"r");
-
+  if ( fp != NULL) {
-#if defined WIN32 || defined _WIN32
+    fclose(fp);
-	DWORD attr = GetFileAttributes(file);
-	
-	if (attr == INVALID_FILE_ATTRIBUTES)
-		return 0;
-	
-	if (attr == FILE_ATTRIBUTE_DIRECTORY)
-		return 0;
-	
     return 1;
-#else
+  }
-	struct stat s;
-	
-	if (stat(file, &s) != 0)
   return 0;
-	
-	if (S_ISDIR(s.st_mode))
-		return 0;
-	
-	return 1;
-#endif
-}
-
-static cell AMX_NATIVE_CALL dir_exists(AMX *amx, cell *params) /* 1 param */
-{
-	int iLen;
-	char *sFile = get_amxstring(amx, params[1], 0, iLen);
-	char *file = build_pathname("%s", sFile);
-
-#if defined WIN32 || defined _WIN32
-	DWORD attr = GetFileAttributes(file);
-	
-	if (attr == INVALID_FILE_ATTRIBUTES)
-		return 0;
-	
-	if (attr == FILE_ATTRIBUTE_DIRECTORY)
-		return 1;
-	
-	return 0;
-#else
-	struct stat s;
-	
-	if (stat(file, &s) != 0)
-		return 0;
-	
-	if (S_ISDIR(s.st_mode))
-		return 1;
-	
-	return 0;
-#endif
 }
 
 static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
 {
   int iLen;
-	char* sFile = get_amxstring(amx, params[1], 0, iLen);
+  char* sFile = get_amxstring(amx,params[1],0,iLen);
-	AutoFilePtr fp(fopen(build_pathname("%s", sFile), "r"));
+  FILE* fp = fopen(build_pathname("%s",sFile),"r");
-	
+  if ( fp != NULL) {
-	if (fp != NULL)
+  if ( params[0] < 2 || params[2] == 0 ){
-	{
+    fseek(fp,0,SEEK_END);
-		if (params[0] < 2 || params[2] == 0)
-		{
-			fseek(fp, 0, SEEK_END);
     int size = ftell(fp);
-			
+    fclose(fp);
     return size;
   }
-		else if (params[2] == 1)
+  else if ( params[2] == 1 ){
-		{
     int a = 0,lines = 0;
-			
+    while( a != EOF ){
-			while (a != EOF)
-			{
       ++lines;
-				while ((a = fgetc(fp)) != '\n' && a != EOF);
+      while ( (a = fgetc(fp)) != '\n'  && a != EOF )
+        ;
     }
     //int a, b = '\n';
     //while( (a = fgetc(fp)) != EOF ){
@@ -364,431 +253,23 @@ static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
     //  ++lines;
     return lines;
   }
-		else if (params[2] == 2)
+  else if ( params[2] == 2 ){
-		{
+    fseek(fp,-1,SEEK_END);
-			fseek(fp, -1, SEEK_END);
+    if ( fgetc(fp) == '\n' )
-			
-			if (fgetc(fp) == '\n')
       return 1;
-			
     return 0;
   }
   }
-	
   return -1;
 }
 
-static cell AMX_NATIVE_CALL amx_fopen(AMX *amx, cell *params)
+AMX_NATIVE_INFO file_Natives[] = {
-{
+  { "delete_file",    delete_file },
-	int len, j = -1;
+  { "file_exists",    file_exists },
-	char *file = build_pathname("%s", get_amxstring(amx, params[1], 1, len));
+  { "file_size",    file_size },
-	char *flags = get_amxstring(amx, params[2], 0, len);
+  { "read_dir",     read_dir },
-
+  { "read_file",      read_file },
-	FILE *fp = fopen(file, flags);
+  { "write_file",     write_file },
-
+  { NULL, NULL }
-	return (cell)fp;
-}
-
-static cell AMX_NATIVE_CALL amx_fwrite_blocks(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[2]);
-	size_t blocks = params[3];
-	size_t btmp = blocks;
-	cell mode = params[4];
-	switch (mode)
-	{
-	case 1:
-		{
-			char *a = new char[blocks];
-			char *ptr = a;
-			while (btmp--)
-				*a++ = static_cast<char>(*addr++);
-			size_t res = fwrite(a, sizeof(char), blocks, fp);
-			delete [] a;
-			return res;
-		}
-	case 2:
-		{
-			short *a = new short[blocks];
-			short *ptr = a;
-			while (btmp--)
-				*a++ = static_cast<short>(*addr++);
-			size_t res = fwrite(a, sizeof(short), blocks, fp);
-			delete [] a;
-			return res;
-		}
-	case 4:
-		{
-			int *a = new int[blocks];
-			int *ptr = a;
-			while (btmp--)
-				*a++ = static_cast<int>(*addr++);
-			size_t res = fwrite(a, sizeof(int), blocks, fp);
-			delete [] a;
-			return res;
-		}
-	}
-
-	return 0;
-}
-
-static cell AMX_NATIVE_CALL amx_fwrite(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	size_t mode = params[3];
-	switch (mode)
-	{
-	case 1:
-		{
-			char a = static_cast<char>(params[2]);
-			return fwrite(&a, sizeof(char), 1, fp);
-		}
-	case 2:
-		{
-			short b = static_cast<short>(params[2]);
-			return fwrite(&b, sizeof(short), 1, fp);
-		}
-	case 4:
-		{
-			int c = static_cast<int>(params[2]);
-			return fwrite(&c, sizeof(short), 1, fp);
-		}
-	}
-
-	return 0;
-}
-
-static cell AMX_NATIVE_CALL amx_fwrite_raw(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[2]);
-	return fwrite(addr, params[3], params[4], fp);
-}
-
-static cell AMX_NATIVE_CALL amx_fread_raw(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[2]);
-	size_t size = static_cast<cell>(params[3]);
-	size_t blocks = static_cast<cell>(params[4]);
-    
-	return fread(addr, size, blocks, fp);
-}
-
-static cell AMX_NATIVE_CALL amx_fread(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[2]);
-	switch (params[3])
-	{
-	case 1:	//char
-		{
-			char a;
-			size_t res = fread(&a, sizeof(char), 1, fp);
-			*addr = static_cast<cell>(a);
-			return res;
-		}
-	case 2:	//short
-		{
-			short a;
-			size_t res = fread(&a, sizeof(short), 1, fp);
-			*addr = static_cast<cell>(a);
-			return res;
-		}
-	case 4:	//int
-	default:
-		{
-			int a;
-			size_t res = fread(&a, sizeof(int), 1, fp);
-			*addr = static_cast<cell>(a);
-			return res;
-		}
-	}
-
-	return 0;
-}
-
-static cell AMX_NATIVE_CALL amx_fread_blocks(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[2]);
-	size_t blocks = params[3];
-	switch (params[3])
-	{
-	case 1:	//char
-		{
-			char *a = new char[blocks];
-			char *ptr = a;
-			size_t res = fread(a, sizeof(char), blocks, fp);
-			while (blocks--)
-				*addr++ = static_cast<cell>(*ptr++);
-			delete [] a;
-			return res;
-		}
-	case 2:	//short
-		{
-			short *a = new short[blocks];
-			short *ptr = a;
-			size_t res = fread(a, sizeof(short), blocks, fp);
-			while (blocks--)
-				*addr++ = static_cast<cell>(*ptr++);
-			delete [] a;
-			return res;
-		}
-	case 4:	//int
-	default:
-		{
-			int *a = new int[blocks];
-			int *ptr = a;
-			size_t res = fread(a, sizeof(int), blocks, fp);
-			while (blocks--)
-				*addr++ = static_cast<cell>(*ptr++);
-			delete [] a;
-			return res;
-		}
-	}
-
-	return 0;
-}
-
-static cell AMX_NATIVE_CALL amx_fgets(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	static char buffer[4096];
-	buffer[0] = '\0';
-	fgets(buffer, sizeof(buffer)-1, fp);
-	return set_amxstring(amx, params[2], buffer, params[3]);
-}
-
-static cell AMX_NATIVE_CALL amx_fseek(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	return fseek(fp, params[2], params[3]);
-}
-
-static cell AMX_NATIVE_CALL amx_ftell(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	return ftell(fp);
-}
-
-static cell AMX_NATIVE_CALL amx_fprintf(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 0;
-
-	int len;
-	char *str = format_amxstring(amx, params, 2, len);
-	return fprintf(fp, "%s", str);
-}
-
-static cell AMX_NATIVE_CALL amx_feof(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 1;
-
-	return feof(fp);
-}
-
-static cell AMX_NATIVE_CALL amx_fclose(AMX *amx, cell *params)
-{
-	FILE *fp = (FILE *)params[1];
-
-	if (!fp)
-		return 1;
-
-	fclose(fp);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL amx_filesize(AMX *amx, cell *params)
-{
-	int len;
-	char *file = build_pathname("%s", format_amxstring(amx, params, 1, len));
-	long size;
-	
-	AutoFilePtr fp(fopen(file, "rb"));
-	
-	if (fp)
-	{
-		fseek(fp, 0, SEEK_END);
-		size = ftell(fp);
-		
-		return size;
-	}
-	
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_build_pathname(AMX *amx, cell *params)
-{
-	int len;
-	char *szPath = get_amxstring(amx, params[1], 0, len);
-	
-	return set_amxstring(amx, params[2], build_pathname("%s", szPath), params[3]);
-}
-
-static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
-{
-	int len;
-	char *path = get_amxstring(amx, params[1], 0, len);
-
-#if defined WIN32 || defined _WIN32
-	char *dirname = build_pathname("%s\\*", path);
-	
-	WIN32_FIND_DATA fd;
-	HANDLE hFile = FindFirstFile(dirname, &fd);
-	
-	if (hFile == INVALID_HANDLE_VALUE)
-		return 0;
-	
-	set_amxstring(amx, params[2], fd.cFileName, params[3]);
-	
-	return (DWORD)hFile;
-#else
-	char *dirname = build_pathname("%s", path);
-	DIR *dp = opendir(dirname);
-	
-	if (!dp)
-		return NULL;
-	struct dirent *ep = readdir(dp);
-	
-	if (!ep)
-	{
-		closedir(dp);
-		return NULL;
-	}
-	
-	set_amxstring(amx, params[2], ep->d_name, params[3]);
-	
-	return (cell)dp;
-#endif
-}
-
-static cell AMX_NATIVE_CALL amx_close_dir(AMX *amx, cell *params)
-{
-#if defined WIN32 || defined _WIN32
-	HANDLE hFile = (HANDLE)((DWORD)params[1]);
-	
-	if (hFile == INVALID_HANDLE_VALUE || hFile == NULL)
-		return 0;
-	
-	FindClose(hFile);
-	
-	return 1;
-#else
-	DIR *dp = (DIR *)params[1];
-	
-	if (!dp)
-		return 0;
-	
-	closedir(dp);
-	return 1;
-#endif
-}
-
-static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
-{
-#if defined WIN32 || defined _WIN32
-	HANDLE hFile = (HANDLE)((DWORD)params[1]);
-	
-	if (hFile == INVALID_HANDLE_VALUE || hFile == NULL)
-		return 0;
-	
-	WIN32_FIND_DATA fd;
-	
-	if (!FindNextFile(hFile, &fd))
-		return 0;
-	
-	set_amxstring(amx, params[2], fd.cFileName, params[3]);
-	
-	return 1;
-#else
-	DIR *dp = (DIR *)params[1];
-	
-	if (!dp)
-		return 0;
-	struct dirent *ep = readdir(dp);
-	
-	if (!ep)
-		return 0;
-	
-	set_amxstring(amx, params[2], ep->d_name, params[3]);
-	
-	return 1;
-#endif
-}
-
-AMX_NATIVE_INFO file_Natives[] =
-{
-	{"delete_file",		delete_file},
-	{"file_exists",		file_exists},
-	{"file_size",		file_size},
-	{"read_dir",		read_dir},
-	{"read_file",		read_file},
-	{"write_file",		write_file},
-	//new, sane file natives
-	{"fopen",			amx_fopen},
-	{"fclose",			amx_fclose},
-	{"fread",			amx_fread},
-	{"fread_blocks",	amx_fread_blocks},
-	{"fread_raw",		amx_fread_raw},
-	{"fwrite",			amx_fwrite},
-	{"fwrite_blocks",	amx_fwrite_blocks},
-	{"fwrite_raw",		amx_fwrite_raw},
-	{"feof",			amx_feof},
-	{"fprintf",			amx_fprintf},
-	{"fgets",			amx_fgets},
-	{"fseek",			amx_fseek},
-	{"ftell",			amx_ftell},
-	{"filesize",		amx_filesize},
-	{"unlink",			delete_file},
-	{"build_pathname", amx_build_pathname},
-	{"dir_exists",		dir_exists},
-	{"open_dir",		amx_open_dir},
-	{"close_dir",		amx_close_dir},
-	{"next_file",		amx_get_dir},
-	{NULL,				NULL}
 };
+

amxmodx/float.cpp

@@ -14,19 +14,11 @@
  * 2003-11-24: A few more native functions (geometry), plus minor modifications,
  *             mostly to be compatible with dynamically loadable extension
  *             modules, by Thiadmer Riemersma
- * 2004-01-09: Adaptions for 64-bit cells (using "double precision"), by
- *             Thiadmer Riemersma
  */
 #include <stdlib.h>     /* for atof() */
 #include <stdio.h>      /* for NULL */
 #include <assert.h>
 #include <math.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"
 
 /*
@@ -37,19 +29,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
@@ -60,10 +39,10 @@ static cell AMX_NATIVE_CALL n_float(AMX *amx,cell *params)
     *   params[0] = number of bytes
     *   params[1] = long value to convert to a float
     */
-    REAL fValue;
+    float fValue;
 
     /* Convert to a float. Calls the compilers long to float conversion. */
-    fValue = (REAL) params[1];
+    fValue = (float) params[1];
 
     /* Return the cell. */
     return amx_ftoc(fValue);
@@ -81,7 +60,7 @@ static cell AMX_NATIVE_CALL n_floatstr(AMX *amx,cell *params)
     */
     char szSource[60];
     cell *pString;
-    REAL fNum;
+    float fNum;
     int nLen;
 
     /* They should have sent us 1 cell. */
@@ -92,14 +71,14 @@ static cell AMX_NATIVE_CALL n_floatstr(AMX *amx,cell *params)
 
     /* Find out how long the string is in characters. */
     amx_StrLen(pString, &nLen);
-    if (nLen == 0 || (unsigned int)nLen >= sizeof szSource)
+    if (nLen == 0 || nLen >= sizeof szSource)
         return 0;
 
     /* Now convert the Small String into a C type null terminated string */
-    amx_GetStringOld(szSource, pString, 0);
+    amx_GetString(szSource, pString);
 
     /* Now convert this to a float. */
-    fNum = (REAL)atof(szSource);
+    fNum = (float)atof(szSource);
 
     return amx_ftoc(fNum);
 }
@@ -115,7 +94,7 @@ static cell AMX_NATIVE_CALL n_floatmul(AMX *amx,cell *params)
     *   params[1] = float operand 1
     *   params[2] = float operand 2
     */
-    REAL fRes = amx_ctof(params[1]) * amx_ctof(params[2]);
+    float fRes = amx_ctof(params[1]) * amx_ctof(params[2]);
     return amx_ftoc(fRes);
 }
 
@@ -130,7 +109,7 @@ static cell AMX_NATIVE_CALL n_floatdiv(AMX *amx,cell *params)
     *   params[1] = float dividend (top)
     *   params[2] = float divisor (bottom)
     */
-    REAL fRes = amx_ctof(params[1]) / amx_ctof(params[2]);
+    float fRes = amx_ctof(params[1]) / amx_ctof(params[2]);
     return amx_ftoc(fRes);
 }
 
@@ -145,7 +124,7 @@ static cell AMX_NATIVE_CALL n_floatadd(AMX *amx,cell *params)
     *   params[1] = float operand 1
     *   params[2] = float operand 2
     */
-    REAL fRes = amx_ctof(params[1]) + amx_ctof(params[2]);
+    float fRes = amx_ctof(params[1]) + amx_ctof(params[2]);
     return amx_ftoc(fRes);
 }
 
@@ -160,7 +139,7 @@ static cell AMX_NATIVE_CALL n_floatsub(AMX *amx,cell *params)
     *   params[1] = float operand 1
     *   params[2] = float operand 2
     */
-    REAL fRes = amx_ctof(params[1]) - amx_ctof(params[2]);
+    float fRes = amx_ctof(params[1]) - amx_ctof(params[2]);
     return amx_ftoc(fRes);
 }
 
@@ -175,8 +154,8 @@ static cell AMX_NATIVE_CALL n_floatfract(AMX *amx,cell *params)
     *   params[0] = number of bytes
     *   params[1] = float operand
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
-    fA = fA - (REAL)(floor((double)fA));
+    fA = fA - (float)(floor((double)fA));
     return amx_ftoc(fA);
 }
 
@@ -192,24 +171,24 @@ static cell AMX_NATIVE_CALL n_floatround(AMX *amx,cell *params)
     *   params[1] = float operand
     *   params[2] = Type of rounding (long)
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
 
     switch (params[2])
     {
         case 1:       /* round downwards (truncate) */
-            fA = (REAL)(floor((double)fA));
+            fA = (float)(floor((double)fA));
             break;
         case 2:       /* round upwards */
-            fA = (REAL)(ceil((double)fA));
+            fA = (float)(ceil((double)fA));
             break;
         case 3:       /* round towards zero */
             if ( fA>=0.0 )
-                fA = (REAL)(floor((double)fA));
+                fA = (float)(floor((double)fA));
             else
-                fA = (REAL)(ceil((double)fA));
+                fA = (float)(ceil((double)fA));
             break;
         default:      /* standard, round to nearest */
-            fA = (REAL)(floor((double)fA+.5));
+            fA = (float)(floor((double)fA+.5));
             break;
     }
 
@@ -227,7 +206,7 @@ static cell AMX_NATIVE_CALL n_floatcmp(AMX *amx,cell *params)
     *   params[1] = float operand 1
     *   params[2] = float operand 2
     */
-    REAL fA, fB;
+    float fA, fB;
 
     fA = amx_ctof(params[1]);
     fB = amx_ctof(params[2]);
@@ -247,8 +226,8 @@ static cell AMX_NATIVE_CALL n_floatsqroot(AMX *amx,cell *params)
     *   params[0] = number of bytes
     *   params[1] = float operand
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
-    fA = (REAL)sqrt(fA);
+    fA = (float)sqrt(fA);
     if (fA < 0)
         return amx_RaiseError(amx, AMX_ERR_DOMAIN);
     return amx_ftoc(fA);
@@ -265,9 +244,9 @@ static cell AMX_NATIVE_CALL n_floatpower(AMX *amx,cell *params)
     *   params[1] = float operand 1 (base)
     *   params[2] = float operand 2 (exponent)
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
-    REAL fB = amx_ctof(params[2]);
+    float fB = amx_ctof(params[2]);
-    fA = (REAL)pow(fA, fB);
+    fA = (float)pow(fA, fB);
     return amx_ftoc(fA);
 }
 
@@ -282,25 +261,25 @@ static cell AMX_NATIVE_CALL n_floatlog(AMX *amx,cell *params)
     *   params[1] = float operand 1 (value)
     *   params[2] = float operand 2 (base)
     */
-    REAL fValue = amx_ctof(params[1]);
+    float fValue = amx_ctof(params[1]);
-    REAL fBase = amx_ctof(params[2]);
+    float fBase = amx_ctof(params[2]);
     if (fValue <= 0.0 || fBase <= 0)
         return amx_RaiseError(amx, AMX_ERR_DOMAIN);
     if (fBase == 10.0) // ??? epsilon
-        fValue = (REAL)log10(fValue);
+        fValue = (float)log10(fValue);
     else
-        fValue = (REAL)(log(fValue) / log(fBase));
+        fValue = (float)(log(fValue) / log(fBase));
     return amx_ftoc(fValue);
 }
 
-static REAL ToRadians(REAL angle, int radix)
+static float ToRadians(float angle, int radix)
 {
     switch (radix)
     {
         case 1:         /* degrees, sexagesimal system (technically: degrees/minutes/seconds) */
-            return (REAL)(angle * PI / 180.0);
+            return (float)(angle * PI / 180.0);
         case 2:         /* grades, centesimal system */
-            return (REAL)(angle * PI / 200.0);
+            return (float)(angle * PI / 200.0);
         default:        /* assume already radian */
             return angle;
     } /* switch */
@@ -317,9 +296,9 @@ static cell AMX_NATIVE_CALL n_floatsin(AMX *amx,cell *params)
     *   params[1] = float operand 1 (angle)
     *   params[2] = float operand 2 (radix)
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
     fA = ToRadians(fA, params[2]);
-    fA = sin(fA);
+    fA = sinf(fA);							// PM: using the float version of sin
     return amx_ftoc(fA);
 }
 
@@ -334,9 +313,9 @@ static cell AMX_NATIVE_CALL n_floatcos(AMX *amx,cell *params)
     *   params[1] = float operand 1 (angle)
     *   params[2] = float operand 2 (radix)
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
     fA = ToRadians(fA, params[2]);
-    fA = cos(fA);
+    fA = cosf(fA);							// PM: using the float version of cos
     return amx_ftoc(fA);
 }
 
@@ -351,87 +330,19 @@ static cell AMX_NATIVE_CALL n_floattan(AMX *amx,cell *params)
     *   params[1] = float operand 1 (angle)
     *   params[2] = float operand 2 (radix)
     */
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
     fA = ToRadians(fA, params[2]);
-    fA = tan(fA);
+    fA = tanf(fA);							// PM: using the float version of tan
     return amx_ftoc(fA);
 }
 
-#if defined __BORLANDC__ || defined __WATCOMC__
-  #pragma argsused
-#endif
-/* Added by BAILOPAN */
-static cell AMX_NATIVE_CALL n_floatatan(AMX *amx, cell *params)
-{
-	/*
-	 * params[1] = angle
-	 * 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);
-}
-
-#if defined __BORLANDC__ || defined __WATCOMC__
-  #pragma argsused
-#endif
-/* Added by BAILOPAN */
-static cell AMX_NATIVE_CALL n_floatacos(AMX *amx, cell *params)
-{
-	/*
-	 * params[1] = angle
-	 * params[2] = radix
-	 */
-	REAL fA = amx_ctof(params[1]);
-	fA = acos(fA);
-	fA = FromRadians(fA, params[2]);
-	return amx_ftoc(fA);
-}
-
-#if defined __BORLANDC__ || defined __WATCOMC__
-  #pragma argsused
-#endif
-/* Added by BAILOPAN */
-static cell AMX_NATIVE_CALL n_floatasin(AMX *amx, cell *params)
-{
-	/*
-	 * params[1] = angle
-	 * params[2] = radix
-	 */
-	REAL fA = amx_ctof(params[1]);
-	fA = asin(fA);
-	fA = FromRadians(fA, params[2]);
-	return amx_ftoc(fA);
-}
-
-#if defined __BORLANDC__ || defined __WATCOMC__
-  #pragma argsused
-#endif
-/* Added by BAILOPAN */
-static cell AMX_NATIVE_CALL n_floatatan2(AMX *amx, cell *params)
-{
-	/*
-	 * params[1] = x
-	 * params[2] = y
-	 * params[3] = radix
-	 */
-	REAL fA = amx_ctof(params[1]);
-	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
 /******************************************************************/
 static cell AMX_NATIVE_CALL n_floatabs(AMX *amx,cell *params)
 {
-    REAL fA = amx_ctof(params[1]);
+    float fA = amx_ctof(params[1]);
     fA = (fA >= 0) ? fA : -fA;
     return amx_ftoc(fA);
 }
@@ -453,10 +364,6 @@ AMX_NATIVE_INFO float_Natives[] = {
   { "floatcos",    n_floatcos   },
   { "floattan",    n_floattan   },
   { "floatabs",    n_floatabs   },
-  { "floatasin",   n_floatasin  },
-  { "floatacos",   n_floatacos  },
-  { "floatatan",   n_floatatan  },
-  { "floatatan2",  n_floatatan2 },
   { NULL, NULL }        /* terminator */
 };
 

amxmodx/format.cpp

@@ -1,434 +0,0 @@
-#include "amxmodx.h"
-#include "format.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_Log("[AMXX] \"%s\" is an invalid debug language", testlang);
-			validlang = false;
-		}
-				
-		g_langMngr.GetDef(testlang, key, debug_status);
-				
-		if (validlang && debug_status == ERR_BADKEY)
-			AMXXLOG_Log("[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_Log("[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 AddInt(U **buf_p, size_t &maxlen, int val, int width, int flags)
-{
-	U		text[32];
-	int		digits;
-	int		signedVal;
-	U		*buf;
-
-	digits = 0;
-	signedVal = val;
-	if (val < 0)
-		val = -val;
-	do {
-		text[digits++] = '0' + val % 10;
-		val /= 10;
-	} while (val);
-
-	if (signedVal < 0)
-		text[digits++] = '-';
-
-	buf = *buf_p;
-
-	if( !(flags & LADJUST) )
-	{
-		while (digits < width && maxlen)
-		{
-			*buf++ = (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 'f':
-			CHECK_ARGS(0);
-			AddFloat(&buf_p, llen, amx_ctof(*get_amxaddr(amx, params[arg])), width, prec);
-			arg++;
-			break;
-		case 's':
-			CHECK_ARGS(0);
-			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,8 +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);
-
-#endif //_INCLUDE_FORMATTING_H

amxmodx/md5.cpp

@@ -1,474 +0,0 @@
-// MD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
-
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
-
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
-
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
- */
-
-#include "md5.h"
-
-#include <assert.h>
-#include <string.h>
-
-// MD5 simple initialization method
-
-MD5::MD5(){
-
-  init();
-
-}
-
-
-// MD5 block update operation. Continues an MD5 message-digest
-// operation, processing another message block, and updating the
-// context.
-
-void MD5::update (uint1 *input, uint4 input_length) {
-
-  uint4 input_index, buffer_index;
-  uint4 buffer_space;                // how much space is left in buffer
-
-  if (finalized){  // so we can't update!
-    /*cerr << "MD5::update:  Can't update a finalized digest!" << endl;*/
-    return;
-  }
-
-  // Compute number of bytes mod 64
-  buffer_index = (unsigned int)((count[0] >> 3) & 0x3F);
-
-  // Update number of bits
-  if (  (count[0] += ((uint4) input_length << 3))<((uint4) input_length << 3) )
-    count[1]++;
-
-  count[1] += ((uint4)input_length >> 29);
-
-
-  buffer_space = 64 - buffer_index;  // how much space is left in buffer
-
-  // Transform as many times as possible.
-  if (input_length >= buffer_space) { // ie. we have enough to fill the buffer
-    // fill the rest of the buffer and transform
-    memcpy (buffer + buffer_index, input, buffer_space);
-    transform (buffer);
-
-    // now, transform each 64-byte piece of the input, bypassing the buffer
-    for (input_index = buffer_space; input_index + 63 < input_length; 
-	 input_index += 64)
-      transform (input+input_index);
-
-    buffer_index = 0;  // so we can buffer remaining
-  }
-  else
-    input_index=0;     // so we can buffer the whole input
-
-
-  // and here we do the buffering:
-  memcpy(buffer+buffer_index, input+input_index, input_length-input_index);
-}
-
-
-
-// MD5 update for files.
-// Like above, except that it works on files (and uses above as a primitive.)
-
-void MD5::update(FILE *file){
-
-  unsigned char buffer[1024];
-  int len;
-
-  while (len=fread(buffer, 1, 1024, file))
-    update(buffer, len);
-
-  fclose (file);
-
-}
-
-
-// MD5 finalization. Ends an MD5 message-digest operation, writing the
-// the message digest and zeroizing the context.
-
-
-void MD5::finalize (){
-
-  unsigned char bits[8];
-  unsigned int index, padLen;
-  static uint1 PADDING[64]={
-    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-
-  if (finalized){
-   /* cerr << "MD5::finalize:  Already finalized this digest!" << endl;*/
-    return;
-  }
-
-  // Save number of bits
-  encode (bits, count, 8);
-
-  // Pad out to 56 mod 64.
-  index = (uint4) ((count[0] >> 3) & 0x3f);
-  padLen = (index < 56) ? (56 - index) : (120 - index);
-  update (PADDING, padLen);
-
-  // Append length (before padding)
-  update (bits, 8);
-
-  // Store state in digest
-  encode (digest, state, 16);
-
-  // Zeroize sensitive information
-  memset (buffer, 0, sizeof(*buffer));
-
-  finalized=1;
-
-}
-
-
-
-
-MD5::MD5(FILE *file){
-
-  init();  // must be called be all constructors
-  update(file);
-  finalize ();
-}
-
-unsigned char *MD5::raw_digest(){
-
-  uint1 *s = new uint1[16];
-
-  if (!finalized){
-/*    cerr << "MD5::raw_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;*/
-    return ( (unsigned char*) "");
-  }
-
-  memcpy(s, digest, 16);
-  return s;
-}
-
-
-
-char *MD5::hex_digest(){
-
-  int i;
-  char *s= new char[33];
-
-  if (!finalized){
-/*    cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;*/
-    return "";
-  }
-
-  for (i=0; i<16; i++)
-    sprintf(s+i*2, "%02x", digest[i]);
-
-  s[32]='\0';
-
-  return s;
-}
-
-
-char *MD5::hex_digest(char buffer[33]){
-
-  int i;
-
-  if (!finalized)
-  {
-	 /* cerr << "MD5::hex_digest:  Can't get digest if you haven't "<<
-      "finalized the digest!" <<endl;*/
-    return "";
-  }
-
-  for (i=0; i<16; i++)
-    sprintf(buffer+i*2, "%02x", digest[i]);
-
-  buffer[32]='\0';
-
-  return buffer;
-}
-
-
-// PRIVATE METHODS:
-
-
-
-void MD5::init(){
-  finalized=0;  // we just started!
-
-  // Nothing counted, so count=0
-  count[0] = 0;
-  count[1] = 0;
-
-  // Load magic initialization constants.
-  state[0] = 0x67452301;
-  state[1] = 0xefcdab89;
-  state[2] = 0x98badcfe;
-  state[3] = 0x10325476;
-}
-
-
-
-// Constants for MD5Transform routine.
-// Although we could use C++ style constants, defines are actually better,
-// since they let us easily evade scope clashes.
-
-#define S11 7
-#define S12 12
-#define S13 17
-#define S14 22
-#define S21 5
-#define S22 9
-#define S23 14
-#define S24 20
-#define S31 4
-#define S32 11
-#define S33 16
-#define S34 23
-#define S41 6
-#define S42 10
-#define S43 15
-#define S44 21
-
-
-
-
-// MD5 basic transformation. Transforms state based on block.
-void MD5::transform (uint1 block[64]){
-
-  uint4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
-
-  decode (x, block, 64);
-
-  assert(!finalized);  // not just a user error, since the method is private
-
-  /* Round 1 */
-  FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
-  FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
-  FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
-  FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
-  FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
-  FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
-  FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
-  FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
-  FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
-  FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
-  FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
-  FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
-  FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
-  FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
-  FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
-  FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
-
- /* Round 2 */
-  GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
-  GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
-  GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
-  GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
-  GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
-  GG (d, a, b, c, x[10], S22,  0x2441453); /* 22 */
-  GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
-  GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
-  GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
-  GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
-  GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
-  GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
-  GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
-  GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
-  GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
-  GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
-
-  /* Round 3 */
-  HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
-  HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
-  HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
-  HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
-  HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
-  HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
-  HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
-  HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
-  HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
-  HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
-  HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
-  HH (b, c, d, a, x[ 6], S34,  0x4881d05); /* 44 */
-  HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
-  HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
-  HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
-  HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
-
-  /* Round 4 */
-  II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
-  II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
-  II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
-  II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
-  II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
-  II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
-  II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
-  II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
-  II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
-  II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
-  II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
-  II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
-  II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
-  II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
-  II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
-  II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
-
-  state[0] += a;
-  state[1] += b;
-  state[2] += c;
-  state[3] += d;
-
-  // Zeroize sensitive information.
-  memset ( (uint1 *) x, 0, sizeof(x));
-
-}
-
-
-
-// Encodes input (UINT4) into output (unsigned char). Assumes len is
-// a multiple of 4.
-void MD5::encode (uint1 *output, uint4 *input, uint4 len) {
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4) {
-    output[j]   = (uint1)  (input[i] & 0xff);
-    output[j+1] = (uint1) ((input[i] >> 8) & 0xff);
-    output[j+2] = (uint1) ((input[i] >> 16) & 0xff);
-    output[j+3] = (uint1) ((input[i] >> 24) & 0xff);
-  }
-}
-
-
-
-
-// Decodes input (unsigned char) into output (UINT4). Assumes len is
-// a multiple of 4.
-void MD5::decode (uint4 *output, uint1 *input, uint4 len){
-
-  unsigned int i, j;
-
-  for (i = 0, j = 0; j < len; i++, j += 4)
-    output[i] = ((uint4)input[j]) | (((uint4)input[j+1]) << 8) |
-      (((uint4)input[j+2]) << 16) | (((uint4)input[j+3]) << 24);
-}
-
-
-
-
-
-// Note: Replace "for loop" with standard memcpy if possible.
-void MD5::memcpy (uint1 *output, uint1 *input, uint4 len){
-
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-    output[i] = input[i];
-}
-
-
-
-// Note: Replace "for loop" with standard memset if possible.
-void MD5::memset (uint1 *output, uint1 value, uint4 len){
-
-  unsigned int i;
-
-  for (i = 0; i < len; i++)
-    output[i] = value;
-}
-
-
-
-// ROTATE_LEFT rotates x left n bits.
-
-inline unsigned int MD5::rotate_left  (uint4 x, uint4 n){
-  return (x << n) | (x >> (32-n))  ;
-}
-
-
-
-
-// F, G, H and I are basic MD5 functions.
-
-inline unsigned int MD5::F            (uint4 x, uint4 y, uint4 z){
-  return (x & y) | (~x & z);
-}
-
-inline unsigned int MD5::G            (uint4 x, uint4 y, uint4 z){
-  return (x & z) | (y & ~z);
-}
-
-inline unsigned int MD5::H            (uint4 x, uint4 y, uint4 z){
-  return x ^ y ^ z;
-}
-
-inline unsigned int MD5::I            (uint4 x, uint4 y, uint4 z){
-  return y ^ (x | ~z);
-}
-
-
-
-// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
-// Rotation is separate from addition to prevent recomputation.
-
-
-inline void MD5::FF(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4  s, uint4 ac){
- a += F(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void MD5::GG(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4 s, uint4 ac){
- a += G(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void MD5::HH(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-		    uint4 s, uint4 ac){
- a += H(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}
-
-inline void MD5::II(uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			     uint4 s, uint4 ac){
- a += I(b, c, d) + x + ac;
- a = rotate_left (a, s) +b;
-}

amxmodx/md5.h

@@ -1,105 +0,0 @@
-// MD5.CC - source code for the C++/object oriented translation and 
-//          modification of MD5.
-
-// Translation and modification (c) 1995 by Mordechai T. Abzug 
-
-// This translation/ modification is provided "as is," without express or 
-// implied warranty of any kind.
-
-// The translator/ modifier does not claim (1) that MD5 will do what you think 
-// it does; (2) that this translation/ modification is accurate; or (3) that 
-// this software is "merchantible."  (Language for this disclaimer partially 
-// copied from the disclaimer below).
-
-/* based on:
-
-   MD5.H - header file for MD5C.C
-   MDDRIVER.C - test driver for MD2, MD4 and MD5
-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
-
-*/
-
-#include <stdio.h>
-//#include <fstream.h>
-//#include <iostream.h>
-
-class MD5 {
-
-public:
-// methods for controlled operation:
-  MD5              ();  // simple initializer
-  void  update     (unsigned char *input, unsigned int input_length);
-  void  update     (FILE *file);
-  void  finalize   ();
-
-// constructors for special circumstances.  All these constructors finalize
-// the MD5 context.
-  MD5              (unsigned char *string); // digest string, finalize
-  MD5              (FILE *file);            // digest file, close, finalize
-
-// methods to acquire finalized result
-  unsigned char    *raw_digest ();  // digest as a 16-byte binary array
-  char *            hex_digest ();  // digest as a 33-byte ascii-hex string
-  char *			hex_digest (char buffer[33]); //same as above, passing buffer
-
-
-
-private:
-
-// first, some types:
-  typedef unsigned       int uint4; // assumes integer is 4 words long
-  typedef unsigned short int uint2; // assumes short integer is 2 words long
-  typedef unsigned      char uint1; // assumes char is 1 word long
-
-// next, the private data:
-  uint4 state[4];
-  uint4 count[2];     // number of *bits*, mod 2^64
-  uint1 buffer[64];   // input buffer
-  uint1 digest[16];
-  uint1 finalized;
-
-// last, the private methods, mostly static:
-  void init             ();               // called by all constructors
-  void transform        (uint1 *buffer);  // does the real update work.  Note 
-                                          // that length is implied to be 64.
-
-  static void encode    (uint1 *dest, uint4 *src, uint4 length);
-  static void decode    (uint4 *dest, uint1 *src, uint4 length);
-  static void memcpy    (uint1 *dest, uint1 *src, uint4 length);
-  static void memset    (uint1 *start, uint1 val, uint4 length);
-
-  static inline uint4  rotate_left (uint4 x, uint4 n);
-  static inline uint4  F           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  G           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  H           (uint4 x, uint4 y, uint4 z);
-  static inline uint4  I           (uint4 x, uint4 y, uint4 z);
-  static inline void   FF  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   GG  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   HH  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-  static inline void   II  (uint4& a, uint4 b, uint4 c, uint4 d, uint4 x, 
-			    uint4 s, uint4 ac);
-
-};

amxmodx/mmgr/mmgr.h

@@ -1,146 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Copyright 2000, Paul Nettle. All rights reserved.
-//
-// You are free to use this source code in any commercial or non-commercial product.
-//
-// mmgr.h - Memory manager & tracking software
-//
-// The most recent version of this software can be found at: ftp://ftp.GraphicsPapers.com/pub/ProgrammingTools/MemoryManagers/
-//
-// [NOTE: Best when viewed with 8-character tabs]
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-#ifndef	_H_MMGR
-#define	_H_MMGR
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// For systems that don't have the __FUNCTION__ variable, we can just define it here
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-#ifndef __FUNCTION__
-#define	__FUNCTION__ "??"
-#endif // #ifndef __FUNCTION__
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Types
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-typedef	struct tag_au
-{
-	size_t		actualSize;
-	size_t		reportedSize;
-	void		*actualAddress;
-	void		*reportedAddress;
-	char		sourceFile[40];
-	char		sourceFunc[40];
-	unsigned int	sourceLine;
-	unsigned int	allocationType;
-	bool		breakOnDealloc;
-	bool		breakOnRealloc;
-	unsigned int	allocationNumber;
-	struct tag_au	*next;
-	struct tag_au	*prev;
-} sAllocUnit;
-
-typedef	struct
-{
-	unsigned int	totalReportedMemory;
-	unsigned int	totalActualMemory;
-	unsigned int	peakReportedMemory;
-	unsigned int	peakActualMemory;
-	unsigned int	accumulatedReportedMemory;
-	unsigned int	accumulatedActualMemory;
-	unsigned int	accumulatedAllocUnitCount;
-	unsigned int	totalAllocUnitCount;
-	unsigned int	peakAllocUnitCount;
-} sMStats;
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// External constants
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-extern	const	unsigned int	m_alloc_unknown;
-extern	const	unsigned int	m_alloc_new;
-extern	const	unsigned int	m_alloc_new_array;
-extern	const	unsigned int	m_alloc_malloc;
-extern	const	unsigned int	m_alloc_calloc;
-extern	const	unsigned int	m_alloc_realloc;
-extern	const	unsigned int	m_alloc_delete;
-extern	const	unsigned int	m_alloc_delete_array;
-extern	const	unsigned int	m_alloc_free;
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Used by the macros
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-void		m_setOwner(const char *file, const unsigned int line, const char *func);
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Allocation breakpoints
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-bool		&m_breakOnRealloc(void *reportedAddress);
-bool		&m_breakOnDealloc(void *reportedAddress);
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// The meat of the memory tracking software
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-void		*m_allocator(const char *sourceFile, const unsigned int sourceLine, const char *sourceFunc,
-			     const unsigned int allocationType, const size_t reportedSize);
-void		*m_reallocator(const char *sourceFile, const unsigned int sourceLine, const char *sourceFunc,
-			       const unsigned int reallocationType, const size_t reportedSize, void *reportedAddress);
-void		m_deallocator(const char *sourceFile, const unsigned int sourceLine, const char *sourceFunc,
-			      const unsigned int deallocationType, const void *reportedAddress);
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Utilitarian functions
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-bool		m_validateAddress(const void *reportedAddress);
-bool		m_validateAllocUnit(const sAllocUnit *allocUnit);
-bool		m_validateAllAllocUnits();
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Unused RAM calculations
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-unsigned int	m_calcUnused(const sAllocUnit *allocUnit);
-unsigned int	m_calcAllUnused();
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Logging and reporting
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-void		m_dumpAllocUnit(const sAllocUnit *allocUnit, const char *prefix = "");
-void		m_dumpMemoryReport(const char *filename = "memreport.log", const bool overwrite = true);
-sMStats		m_getMemoryStatistics();
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Variations of global operators new & delete
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-void	*operator new(size_t reportedSize);
-void	*operator new[](size_t reportedSize);
-void	*operator new(size_t reportedSize, const char *sourceFile, int sourceLine);
-void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine);
-void	operator delete(void *reportedAddress);
-void	operator delete[](void *reportedAddress);
-
-#endif // _H_MMGR
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Macros -- "Kids, please don't try this at home. We're trained professionals here." :)
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-#include "nommgr.h"
-#define	new		(m_setOwner  (__FILE__,__LINE__,__FUNCTION__),false) ? NULL : new
-#define	delete		(m_setOwner  (__FILE__,__LINE__,__FUNCTION__),false) ? m_setOwner("",0,"") : delete
-#define	malloc(sz)	m_allocator  (__FILE__,__LINE__,__FUNCTION__,m_alloc_malloc,sz)
-#define	calloc(sz)	m_allocator  (__FILE__,__LINE__,__FUNCTION__,m_alloc_calloc,sz)
-#define	realloc(ptr,sz)	m_reallocator(__FILE__,__LINE__,__FUNCTION__,m_alloc_realloc,sz,ptr)
-#define	free(ptr)	m_deallocator(__FILE__,__LINE__,__FUNCTION__,m_alloc_free,ptr)
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// mmgr.h - End of file
-// ---------------------------------------------------------------------------------------------------------------------------------

amxmodx/mmgr/nommgr.h

@@ -1,39 +0,0 @@
-// ---------------------------------------------------------------------------------------------------------------------------------
-// Copyright 2000, Paul Nettle. All rights reserved.
-//
-// You are free to use this source code in any commercial or non-commercial product.
-//
-// nommgr.h - Memory manager & tracking software
-//
-// The most recent version of this software can be found at: ftp://ftp.GraphicsPapers.com/pub/ProgrammingTools/MemoryManagers/
-//
-// [NOTE: Best when viewed with 8-character tabs]
-// ---------------------------------------------------------------------------------------------------------------------------------
-
-#ifdef	new
-#undef	new
-#endif
-
-#ifdef	delete
-#undef	delete
-#endif
-
-#ifdef	malloc
-#undef	malloc
-#endif
-
-#ifdef	calloc
-#undef	calloc
-#endif
-
-#ifdef	realloc
-#undef	realloc
-#endif
-
-#ifdef	free
-#undef	free
-#endif
-
-// ---------------------------------------------------------------------------------------------------------------------------------
-// nommgr.h - End of file
-// ---------------------------------------------------------------------------------------------------------------------------------

amxmodx/modules.h

@@ -45,39 +45,135 @@
 #undef C_DLLEXPORT
 #define C_DLLEXPORT extern "C" DLLEXPORT
 
+#define AMX_INTERFACE_VERSION 6
+
 #define RELOAD_MODULE 0
 #define STATIC_MODULE 1
 
-typedef enum
+struct module_info_s {
-{
+  const char* name;
-	Player_Name,		//String
+  const char* author;
-	Player_Ip,			//String
+  const char* version;
-	Player_Team,		//String
+  int ivers;
-	Player_Ingame,		//bool
+  int type;
-	Player_Authorized,	//bool
+  long int serial;
-	Player_Vgui,		//bool
+};
-	Player_Time,		//float
-	Player_Playtime,	//float
-	Player_MenuExpire,	//float
-	Player_Weapons,		//struct{int,int}[32]
-	Player_CurrentWeapon,	//int
-	Player_TeamID,			//int
-	Player_Deaths,			//int
-	Player_Aiming,			//int
-	Player_Menu,			//int
-	Player_Keys,			//int
-	Player_Flags,			//int[32]
-	Player_Newmenu,			//int
-	Player_NewmenuPage,		//int
-}  PlayerProp;
 
-int CheckModules(AMX *amx, char error[128]);
+// Small scripting language
-const char *StrCaseStr(const char *as, const char *bs);
+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;
+#define AMX_ALIGN16       (*g_engAmxFunc->pfnamx_Align16)
-Debugger *DisableDebugHandler(AMX *amx);
+#define AMX_ALIGN32       (*g_engAmxFunc->pfnamx_Align32)
-void EnableDebugHandler(AMX *amx, Debugger *pd);
+#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)
+
+// 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)
 
-const char* GetFileName(AMX *amx);
 
 #endif // __MODULES_H__

amxmodx/msvc/.cvsignore

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

amxmodx/msvc/amxmod_mm.def

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

amxmodx/msvc/amxmod_mm.dsp

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

amxmodx/msvc/amxmod_mm.dsw

@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "dodfun"=.\dodfun.dsp - Package Owner=<4>
+Project: "amxmod_mm"=.\amxmod_mm.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -27,4 +27,3 @@ Package=<3>
 
 ###############################################################################
 
-

amxmodx/msvc/amxmodx_mm.def

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

amxmodx/msvc/amxmodx_mm.dsp

@@ -53,11 +53,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\amxmodx_mm.def" /out:"release/amxx_mm.dll" /libpath:"..\extra\lib_win32"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\amxmodx_mm.def" /out:"release/amxxmm.dll" /libpath:"..\extra\lib_win32"
 # Begin Custom Build
-TargetPath=.\release\amxx_mm.dll
+TargetPath=.\release\amxxmm.dll
-TargetName=amxx_mm
+TargetName=amxxmm
-InputPath=.\release\amxx_mm.dll
+InputPath=.\release\amxxmm.dll
 SOURCE="$(InputPath)"
 
 "$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -89,12 +89,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\amxmodx_mm.def" /out:"debug/amxx_mm.dll" /pdbtype:sept /libpath:"..\extra\lib_win32"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\amxmodx_mm.def" /out:"debug/amxxmm.dll" /pdbtype:sept /libpath:"..\extra\lib_win32"
 # SUBTRACT LINK32 /incremental:no /nodefaultlib
 # Begin Custom Build
-TargetPath=.\debug\amxx_mm.dll
+TargetPath=.\debug\amxxmm.dll
-TargetName=amxx_mm
+TargetName=amxxmm
-InputPath=.\debug\amxx_mm.dll
+InputPath=.\debug\amxxmm.dll
 SOURCE="$(InputPath)"
 
 "$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -129,10 +129,6 @@ SOURCE=..\amxtime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\amxxlog.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\CCmd.cpp
 # End Source File
 # Begin Source File

amxmodx/msvc/amxmodx_mm.sln

@@ -1,36 +1,18 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx", "amxmodx_mm.vcproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcproj", "{2FDEE868-4051-4918-81E9-5CBA63F3E785}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
-		JITDebug = JITDebug
-		JITMemtestRelease = JITMemtestRelease
-		JITRelease = JITRelease
-		MaximalSpeed = MaximalSpeed
-		MemtestDebug = MemtestDebug
-		MemtestRelease = MemtestRelease
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.ActiveCfg = Debug|Win32
+		{2FDEE868-4051-4918-81E9-5CBA63F3E785}.Debug.ActiveCfg = Debug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.Build.0 = Debug|Win32
+		{2FDEE868-4051-4918-81E9-5CBA63F3E785}.Debug.Build.0 = Debug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.ActiveCfg = JITDebug|Win32
+		{2FDEE868-4051-4918-81E9-5CBA63F3E785}.Release.ActiveCfg = Release|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.Build.0 = JITDebug|Win32
+		{2FDEE868-4051-4918-81E9-5CBA63F3E785}.Release.Build.0 = Release|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITMemtestRelease.ActiveCfg = JITMemtestRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITMemtestRelease.Build.0 = JITMemtestRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.ActiveCfg = JITRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.Build.0 = JITRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MaximalSpeed.ActiveCfg = MaximalSpeed|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MaximalSpeed.Build.0 = MaximalSpeed|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestDebug.ActiveCfg = MemtestDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestDebug.Build.0 = MemtestDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestRelease.ActiveCfg = MemtestRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.MemtestRelease.Build.0 = MemtestRelease|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release.ActiveCfg = Release|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

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,448 +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"
-
-#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;
-CVector<String> g_Libraries;
-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;
-	}
-
-	//parameter stack
-	pNative->caller = amx;
-
-	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(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>=1; i--)
-			pNative->params[i] = params[i];
-	} else if (pNative->style == 1) {
-		//use dJeyL's system .. very clever!
-		for (int i=numParams; i>=1; i--)
-			amx_Push(pNative->amx, params[i]);
-	}
-	Debugger *pDebugger = (Debugger *)pNative->amx->userdata[UD_DEBUGGER];
-	if (pDebugger)
-		pDebugger->BeginExec();
-	err=amx_Exec(pNative->amx, &ret, pNative->func);
-	if (err != AMX_ERR_NONE)
-	{
-		if (pDebugger && pDebugger->ErrorExists())
-		{
-			//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();
-
-	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;
-}
-
-//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);
-
-	AddPluginLibrary(lib);
-
-	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;
-	
-	//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;
-}
-
-bool LibraryExists(const char *name)
-{
-	for (size_t i=0; i<g_Libraries.size(); i++)
-	{
-		if (stricmp(g_Libraries[i].c_str(), name)==0)
-			return true;
-	}
-
-	return false;
-}
-
-void AddPluginLibrary(const char *name)
-{
-	String f(name);
-	g_Libraries.push_back(f);
-}
-
-void ClearPluginLibraries()
-{
-	g_Libraries.clear();
-
-	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},
-	{"param_convert",	param_convert},
-	//////////////////////////
-	{NULL,				NULL},
-};

amxmodx/natives.h

@@ -1,71 +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 AddPluginLibrary(const char *name);
-void ClearPluginLibraries();
-bool LibraryExists(const char *name);
-
-//I couldn't resist :)
-extern AMX_NATIVE_INFO g_NativeNatives[];
-
-#endif //_INCLUDE_NATIVES_H

amxmodx/newmenus.cpp

@@ -1,829 +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 (m_AlwaysExit && key > m_Items.size())
-			return MENU_EXIT;
-		else
-			return key-1;
-	} else {
-		//first page
-		if (page == 0)
-		{
-			if (key == items_per_page + 1)
-				return MENU_MORE;
-			else if (key == items_per_page + 2)
-				return MENU_EXIT;
-			else
-				return (start + key - 1);
-		} else if (page == num_pages - 1) {
-			//last page
-			size_t remaining = m_Items.size() - start;
-			if (key == remaining + 1)
-			{
-				return MENU_BACK;
-			} else if (key == remaining + 2) {
-				return MENU_EXIT;
-			} else {
-				return (start + key - 1);
-			}
-		} else {
-			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 (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);
-	
-	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_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)
-		{
-			executeForwards(pMenu->func, 
-				static_cast<cell>(i), 
-				static_cast<cell>(pMenu->thisId),
-				static_cast<cell>(MENU_EXIT));
-			player->newmenu = -1;
-			player->menu = 0;
-		}
-	}
-	g_NewMenus[params[1]] = NULL;
-	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},
-	{"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,103 +0,0 @@
-#include <string.h>
-#include "optimizer.h"
-
-#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;
-	
-	FIND_NATIVE("floatmul", N_Float_Mul);
-	FIND_NATIVE("floatdiv", N_Float_Div);
-	FIND_NATIVE("floatadd", N_Float_Add);
-	FIND_NATIVE("floatsub", N_Float_Sub);
-	FIND_NATIVE("float", N_Float_To);
-	FIND_NATIVE("floatround", N_Float_Round);
-	FIND_NATIVE("floatcmp", N_Float_Cmp);
-	//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,26 +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);
-
-#endif //_INCLUDE_AMXMODX_OPTIMIZER_H

amxmodx/power.c

@@ -5,13 +5,6 @@
  *  Copyright (c) ITB CompuPhase, 1998, 1999
  *  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"
-#endif // MEMORY_TEST
-
 #include "amx.h"
 
 static cell power(AMX *amx, cell *params)

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/howto.txt

@@ -1,34 +0,0 @@
-**** HOWTO MAKE A MODULE ****
-* STEP 1
-  Download the AMXX Sdk, and place all files into your module source dir.
-  Don't edit amxxmodule.h or amxxmodule.cpp
-
-  Go through the moduleconfig.h file and do what it says
-  If you want to have natives in your module, uncomment line 30
-   ( // #define FN_AMXX_ATTACH OnAmxxAttach )
-  If you want to have forwards in your module, uncomment line 35
-   ( // #define FN_AMXX_PLUGINSLOADED OnPluginsLoaded )
-  If you want your module to use metamod, uncomment line 22
-   ( // #define USE_METAMOD ) and set up metamod hooks (starting an line 54)
-   You only have to uncomment the line (you may change the function name if you want to).
-* STEP 2
-  Add an another source file.
-  At the beginning, add the short GPL and
-  #include "amxxmodule.h"
-  If you have uncommented any hooks in moduleconfig.h (metamod hooks or Metamod init functions or amxx init functions),
-  define the functions here (or you will get unresolved externals).
-  If you want native functions, add a call to MF_AddNatives into the OnAmxxAttach function.
-  If you want forward functions add (a) call(s) to MF_RegisterForward into the OnPluginsLoaded function.
-* NOTES
-  Include files order in your cpp file(s):
-    standard files
-    amxxmodule.h
-    your files
-   Example:
-    #include <stdlib.h>
-    #include <string>
-    #include <stdio.h>
-    
-    #include "amxxmodule.h"
-
-    #include "mymoduleutils.h"

amxmodx/sdk/moduleconfig.h

@@ -1,472 +0,0 @@
-// Configuration
-
-#ifndef __MODULECONFIG_H__
-#define __MODULECONFIG_H__
-
-// Module info
-#define MODULE_NAME "--ENTER NAME HERE--"
-#define MODULE_VERSION "--ENTER VERSION HERE--"
-#define MODULE_AUTHOR "--ENTER AUTHOR HERE--"
-#define MODULE_URL "--ENTER URL HERE--"
-#define MODULE_LOGTAG "--ENTER LOGTAG HERE--"
-// If you want the module not to be reloaded on mapchange, remove / comment out the next line
-#define MODULE_RELOAD_ON_MAPCHANGE
-
-#ifdef __DATE__
-#define MODULE_DATE __DATE__
-#else // __DATE__
-#define MODULE_DATE "Unknown"
-#endif // __DATE__
-
-// metamod plugin?
-// #define USE_METAMOD
-
-// use memory manager/tester?
-// note that if you use this, you cannot construct/allocate 
-// anything before the module attached (OnAmxxAttach).
-// be careful of default constructors using new/malloc!
-// #define MEMORY_TEST
-
-// Unless you use STL or exceptions, keep this commented.
-// It allows you to compile without libstdc++.so as a dependency
-// #define NO_ALLOC_OVERRIDES
-
-// - AMXX Init functions
-// Also consider using FN_META_*
-// AMXX query
-//#define FN_AMXX_QUERY OnAmxxQuery
-// AMXX attach
-//   Do native functions init here (MF_AddNatives)
-//#define FN_AMXX_ATTACH OnAmxxAttach
-// AMXX detach
-//#define FN_AMXX_DETACH OnAmxxDetach
-// All plugins loaded
-//   Do forward functions init here (MF_RegisterForward)
-// #define FN_AMXX_PLUGINSLOADED OnPluginsLoaded
-
-/**** METAMOD ****/
-// If your module doesn't use metamod, you may close the file now :)
-#ifdef USE_METAMOD
-// ----
-// Hook Functions
-// Uncomment these to be called
-// You can also change the function name
-
-// - Metamod init functions
-// Also consider using FN_AMXX_*
-// Meta query
-//#define FN_META_QUERY OnMetaQuery
-// Meta attach
-//#define FN_META_ATTACH OnMetaAttach
-// Meta detach
-//#define FN_META_DETACH OnMetaDetach
-
-// (wd) are Will Day's notes
-// - GetEntityAPI2 functions
-// #define FN_GameDLLInit				GameDLLInit					/* pfnGameInit() */
-// #define FN_DispatchSpawn				DispatchSpawn				/* pfnSpawn() */
-// #define FN_DispatchThink				DispatchThink				/* pfnThink() */
-// #define FN_DispatchUse				DispatchUse					/* pfnUse() */
-// #define FN_DispatchTouch				DispatchTouch				/* pfnTouch() */
-// #define FN_DispatchBlocked			DispatchBlocked				/* pfnBlocked() */
-// #define FN_DispatchKeyValue			DispatchKeyValue			/* pfnKeyValue() */
-// #define FN_DispatchSave				DispatchSave				/* pfnSave() */
-// #define FN_DispatchRestore			DispatchRestore				/* pfnRestore() */
-// #define FN_DispatchObjectCollsionBox	DispatchObjectCollsionBox	/* pfnSetAbsBox() */
-// #define FN_SaveWriteFields			SaveWriteFields				/* pfnSaveWriteFields() */
-// #define FN_SaveReadFields			SaveReadFields				/* pfnSaveReadFields() */
-// #define FN_SaveGlobalState			SaveGlobalState				/* pfnSaveGlobalState() */
-// #define FN_RestoreGlobalState		RestoreGlobalState			/* pfnRestoreGlobalState() */
-// #define FN_ResetGlobalState			ResetGlobalState			/* pfnResetGlobalState() */
-// #define FN_ClientConnect				ClientConnect				/* pfnClientConnect()			(wd) Client has connected */
-// #define FN_ClientDisconnect			ClientDisconnect			/* pfnClientDisconnect()		(wd) Player has left the game */
-// #define FN_ClientKill				ClientKill					/* pfnClientKill()				(wd) Player has typed "kill" */
-// #define FN_ClientPutInServer			ClientPutInServer			/* pfnClientPutInServer()		(wd) Client is entering the game */
-// #define FN_ClientCommand				ClientCommand				/* pfnClientCommand()			(wd) Player has sent a command (typed or from a bind) */
-// #define FN_ClientUserInfoChanged		ClientUserInfoChanged		/* pfnClientUserInfoChanged()	(wd) Client has updated their setinfo structure */
-// #define FN_ServerActivate			ServerActivate				/* pfnServerActivate()			(wd) Server is starting a new map */
-// #define FN_ServerDeactivate			ServerDeactivate			/* pfnServerDeactivate()		(wd) Server is leaving the map (shutdown or changelevel); SDK2 */
-// #define FN_PlayerPreThink			PlayerPreThink				/* pfnPlayerPreThink() */
-// #define FN_PlayerPostThink			PlayerPostThink				/* pfnPlayerPostThink() */
-// #define FN_StartFrame				StartFrame					/* pfnStartFrame() */
-// #define FN_ParmsNewLevel				ParmsNewLevel				/* pfnParmsNewLevel() */
-// #define FN_ParmsChangeLevel			ParmsChangeLevel			/* pfnParmsChangeLevel() */
-// #define FN_GetGameDescription		GetGameDescription			/* pfnGetGameDescription()		Returns string describing current .dll.  E.g. "TeamFotrress 2" "Half-Life" */
-// #define FN_PlayerCustomization		PlayerCustomization			/* pfnPlayerCustomization()	Notifies .dll of new customization for player. */
-// #define FN_SpectatorConnect			SpectatorConnect			/* pfnSpectatorConnect()		Called when spectator joins server */
-// #define FN_SpectatorDisconnect		SpectatorDisconnect			/* pfnSpectatorDisconnect()	Called when spectator leaves the server */
-// #define FN_SpectatorThink			SpectatorThink				/* pfnSpectatorThink()			Called when spectator sends a command packet (usercmd_t) */
-// #define FN_Sys_Error					Sys_Error					/* pfnSys_Error()				Notify game .dll that engine is going to shut down.  Allows mod authors to set a breakpoint.  SDK2 */
-// #define FN_PM_Move					PM_Move						/* pfnPM_Move()				(wd) SDK2 */
-// #define FN_PM_Init					PM_Init						/* pfnPM_Init()				Server version of player movement initialization; (wd) SDK2 */
-// #define FN_PM_FindTextureType		PM_FindTextureType			/* pfnPM_FindTextureType()		(wd) SDK2 */
-// #define FN_SetupVisibility			SetupVisibility				/* pfnSetupVisibility()		Set up PVS and PAS for networking for this client; (wd) SDK2 */
-// #define FN_UpdateClientData			UpdateClientData			/* pfnUpdateClientData()		Set up data sent only to specific client; (wd) SDK2 */
-// #define FN_AddToFullPack				AddToFullPack				/* pfnAddToFullPack()			(wd) SDK2 */
-// #define FN_CreateBaseline			CreateBaseline				/* pfnCreateBaseline()			Tweak entity baseline for network encoding allows setup of player baselines too.; (wd) SDK2 */
-// #define FN_RegisterEncoders			RegisterEncoders			/* pfnRegisterEncoders()		Callbacks for network encoding; (wd) SDK2 */
-// #define FN_GetWeaponData				GetWeaponData				/* pfnGetWeaponData()			(wd) SDK2 */
-// #define FN_CmdStart					CmdStart					/* pfnCmdStart()				(wd) SDK2 */
-// #define FN_CmdEnd					CmdEnd						/* pfnCmdEnd()					(wd) SDK2 */
-// #define FN_ConnectionlessPacket		ConnectionlessPacket		/* pfnConnectionlessPacket()	(wd) SDK2 */
-// #define FN_GetHullBounds				GetHullBounds				/* pfnGetHullBounds()			(wd) SDK2 */
-// #define FN_CreateInstancedBaselines	CreateInstancedBaselines	/* pfnCreateInstancedBaselines()	(wd) SDK2 */
-// #define FN_InconsistentFile			InconsistentFile			/* pfnInconsistentFile()		(wd) SDK2 */
-// #define FN_AllowLagCompensation		AllowLagCompensation		/* pfnAllowLagCompensation()	(wd) SDK2 */
-
-// - GetEntityAPI2_Post functions
-// #define FN_GameDLLInit_Post					GameDLLInit_Post
-// #define FN_DispatchSpawn_Post				DispatchSpawn_Post
-// #define FN_DispatchThink_Post				DispatchThink_Post
-// #define FN_DispatchUse_Post					DispatchUse_Post
-// #define FN_DispatchTouch_Post				DispatchTouch_Post
-// #define FN_DispatchBlocked_Post				DispatchBlocked_Post
-// #define FN_DispatchKeyValue_Post				DispatchKeyValue_Post
-// #define FN_DispatchSave_Post					DispatchSave_Post
-// #define FN_DispatchRestore_Post				DispatchRestore_Post
-// #define FN_DispatchObjectCollsionBox_Post	DispatchObjectCollsionBox_Post
-// #define FN_SaveWriteFields_Post				SaveWriteFields_Post
-// #define FN_SaveReadFields_Post				SaveReadFields_Post
-// #define FN_SaveGlobalState_Post				SaveGlobalState_Post
-// #define FN_RestoreGlobalState_Post			RestoreGlobalState_Post
-// #define FN_ResetGlobalState_Post				ResetGlobalState_Post
-// #define FN_ClientConnect_Post				ClientConnect_Post
-// #define FN_ClientDisconnect_Post				ClientDisconnect_Post
-// #define FN_ClientKill_Post					ClientKill_Post
-// #define FN_ClientPutInServer_Post			ClientPutInServer_Post
-// #define FN_ClientCommand_Post				ClientCommand_Post
-// #define FN_ClientUserInfoChanged_Post		ClientUserInfoChanged_Post
-// #define FN_ServerActivate_Post				ServerActivate_Post
-// #define FN_ServerDeactivate_Post				ServerDeactivate_Post
-// #define FN_PlayerPreThink_Post				PlayerPreThink_Post
-// #define FN_PlayerPostThink_Post				PlayerPostThink_Post
-// #define FN_StartFrame_Post					StartFrame_Post
-// #define FN_ParmsNewLevel_Post				ParmsNewLevel_Post
-// #define FN_ParmsChangeLevel_Post				ParmsChangeLevel_Post
-// #define FN_GetGameDescription_Post			GetGameDescription_Post
-// #define FN_PlayerCustomization_Post			PlayerCustomization_Post
-// #define FN_SpectatorConnect_Post				SpectatorConnect_Post
-// #define FN_SpectatorDisconnect_Post			SpectatorDisconnect_Post
-// #define FN_SpectatorThink_Post				SpectatorThink_Post
-// #define FN_Sys_Error_Post					Sys_Error_Post
-// #define FN_PM_Move_Post						PM_Move_Post
-// #define FN_PM_Init_Post						PM_Init_Post
-// #define FN_PM_FindTextureType_Post			PM_FindTextureType_Post
-// #define FN_SetupVisibility_Post				SetupVisibility_Post
-// #define FN_UpdateClientData_Post				UpdateClientData_Post
-// #define FN_AddToFullPack_Post				AddToFullPack_Post
-// #define FN_CreateBaseline_Post				CreateBaseline_Post
-// #define FN_RegisterEncoders_Post				RegisterEncoders_Post
-// #define FN_GetWeaponData_Post				GetWeaponData_Post
-// #define FN_CmdStart_Post						CmdStart_Post
-// #define FN_CmdEnd_Post						CmdEnd_Post
-// #define FN_ConnectionlessPacket_Post			ConnectionlessPacket_Post
-// #define FN_GetHullBounds_Post				GetHullBounds_Post
-// #define FN_CreateInstancedBaselines_Post		CreateInstancedBaselines_Post
-// #define FN_InconsistentFile_Post				InconsistentFile_Post
-// #define FN_AllowLagCompensation_Post			AllowLagCompensation_Post
-
-// - GetEngineAPI functions
-// #define FN_PrecacheModel						PrecacheModel
-// #define FN_PrecacheSound						PrecacheSound
-// #define FN_SetModel							SetModel
-// #define FN_ModelIndex						ModelIndex
-// #define FN_ModelFrames						ModelFrames
-// #define FN_SetSize							SetSize
-// #define FN_ChangeLevel						ChangeLevel
-// #define FN_GetSpawnParms						GetSpawnParms
-// #define FN_SaveSpawnParms					SaveSpawnParms
-// #define FN_VecToYaw							VecToYaw
-// #define FN_VecToAngles						VecToAngles
-// #define FN_MoveToOrigin						MoveToOrigin
-// #define FN_ChangeYaw							ChangeYaw
-// #define FN_ChangePitch						ChangePitch
-// #define FN_FindEntityByString				FindEntityByString
-// #define FN_GetEntityIllum					GetEntityIllum
-// #define FN_FindEntityInSphere				FindEntityInSphere
-// #define FN_FindClientInPVS					FindClientInPVS
-// #define FN_EntitiesInPVS						EntitiesInPVS
-// #define FN_MakeVectors						MakeVectors
-// #define FN_AngleVectors						AngleVectors
-// #define FN_CreateEntity						CreateEntity
-// #define FN_RemoveEntity						RemoveEntity
-// #define FN_CreateNamedEntity					CreateNamedEntity
-// #define FN_MakeStatic						MakeStatic
-// #define FN_EntIsOnFloor						EntIsOnFloor
-// #define FN_DropToFloor						DropToFloor
-// #define FN_WalkMove							WalkMove
-// #define FN_SetOrigin							SetOrigin
-// #define FN_EmitSound							EmitSound
-// #define FN_EmitAmbientSound					EmitAmbientSound
-// #define FN_TraceLine							TraceLine
-// #define FN_TraceToss							TraceToss
-// #define FN_TraceMonsterHull					TraceMonsterHull
-// #define FN_TraceHull							TraceHull
-// #define FN_TraceModel						TraceModel
-// #define FN_TraceTexture						TraceTexture
-// #define FN_TraceSphere						TraceSphere
-// #define FN_GetAimVector						GetAimVector
-// #define FN_ServerCommand						ServerCommand
-// #define FN_ServerExecute						ServerExecute
-// #define FN_engClientCommand					engClientCommand
-// #define FN_ParticleEffect					ParticleEffect
-// #define FN_LightStyle						LightStyle
-// #define FN_DecalIndex						DecalIndex
-// #define FN_PointContents						PointContents
-// #define FN_MessageBegin						MessageBegin
-// #define FN_MessageEnd						MessageEnd
-// #define FN_WriteByte							WriteByte
-// #define FN_WriteChar							WriteChar
-// #define FN_WriteShort						WriteShort
-// #define FN_WriteLong							WriteLong
-// #define FN_WriteAngle						WriteAngle
-// #define FN_WriteCoord						WriteCoord
-// #define FN_WriteString						WriteString
-// #define FN_WriteEntity						WriteEntity
-// #define FN_CVarRegister						CVarRegister
-// #define FN_CVarGetFloat						CVarGetFloat
-// #define FN_CVarGetString						CVarGetString
-// #define FN_CVarSetFloat						CVarSetFloat
-// #define FN_CVarSetString						CVarSetString
-// #define FN_AlertMessage						AlertMessage
-// #define FN_EngineFprintf						EngineFprintf
-// #define FN_PvAllocEntPrivateData				PvAllocEntPrivateData
-// #define FN_PvEntPrivateData					PvEntPrivateData
-// #define FN_FreeEntPrivateData				FreeEntPrivateData
-// #define FN_SzFromIndex						SzFromIndex
-// #define FN_AllocString						AllocString
-// #define FN_GetVarsOfEnt						GetVarsOfEnt
-// #define FN_PEntityOfEntOffset				PEntityOfEntOffset
-// #define FN_EntOffsetOfPEntity				EntOffsetOfPEntity
-// #define FN_IndexOfEdict						IndexOfEdict
-// #define FN_PEntityOfEntIndex					PEntityOfEntIndex
-// #define FN_FindEntityByVars					FindEntityByVars
-// #define FN_GetModelPtr						GetModelPtr
-// #define FN_RegUserMsg						RegUserMsg
-// #define FN_AnimationAutomove					AnimationAutomove
-// #define FN_GetBonePosition					GetBonePosition
-// #define FN_FunctionFromName					FunctionFromName
-// #define FN_NameForFunction					NameForFunction
-// #define FN_ClientPrintf						ClientPrintf
-// #define FN_ServerPrint						ServerPrint
-// #define FN_Cmd_Args							Cmd_Args
-// #define FN_Cmd_Argv							Cmd_Argv
-// #define FN_Cmd_Argc							Cmd_Argc
-// #define FN_GetAttachment						GetAttachment
-// #define FN_CRC32_Init						CRC32_Init
-// #define FN_CRC32_ProcessBuffer				CRC32_ProcessBuffer
-// #define FN_CRC32_ProcessByte					CRC32_ProcessByte
-// #define FN_CRC32_Final						CRC32_Final
-// #define FN_RandomLong						RandomLong
-// #define FN_RandomFloat						RandomFloat
-// #define FN_SetView							SetView
-// #define FN_Time								Time
-// #define FN_CrosshairAngle					CrosshairAngle
-// #define FN_LoadFileForMe						LoadFileForMe
-// #define FN_FreeFile							FreeFile
-// #define FN_EndSection						EndSection
-// #define FN_CompareFileTime					CompareFileTime
-// #define FN_GetGameDir						GetGameDir
-// #define FN_Cvar_RegisterVariable				Cvar_RegisterVariable
-// #define FN_FadeClientVolume					FadeClientVolume
-// #define FN_SetClientMaxspeed					SetClientMaxspeed
-// #define FN_CreateFakeClient					CreateFakeClient
-// #define FN_RunPlayerMove						RunPlayerMove
-// #define FN_NumberOfEntities					NumberOfEntities
-// #define FN_GetInfoKeyBuffer					GetInfoKeyBuffer
-// #define FN_InfoKeyValue						InfoKeyValue
-// #define FN_SetKeyValue						SetKeyValue
-// #define FN_SetClientKeyValue					SetClientKeyValue
-// #define FN_IsMapValid						IsMapValid
-// #define FN_StaticDecal						StaticDecal
-// #define FN_PrecacheGeneric					PrecacheGeneric
-// #define FN_GetPlayerUserId					GetPlayerUserId
-// #define FN_BuildSoundMsg						BuildSoundMsg
-// #define FN_IsDedicatedServer					IsDedicatedServer
-// #define FN_CVarGetPointer					CVarGetPointer
-// #define FN_GetPlayerWONId					GetPlayerWONId
-// #define FN_Info_RemoveKey					Info_RemoveKey
-// #define FN_GetPhysicsKeyValue				GetPhysicsKeyValue
-// #define FN_SetPhysicsKeyValue				SetPhysicsKeyValue
-// #define FN_GetPhysicsInfoString				GetPhysicsInfoString
-// #define FN_PrecacheEvent						PrecacheEvent
-// #define FN_PlaybackEvent						PlaybackEvent
-// #define FN_SetFatPVS							SetFatPVS
-// #define FN_SetFatPAS							SetFatPAS
-// #define FN_CheckVisibility					CheckVisibility
-// #define FN_DeltaSetField						DeltaSetField
-// #define FN_DeltaUnsetField					DeltaUnsetField
-// #define FN_DeltaAddEncoder					DeltaAddEncoder
-// #define FN_GetCurrentPlayer					GetCurrentPlayer
-// #define FN_CanSkipPlayer						CanSkipPlayer
-// #define FN_DeltaFindField					DeltaFindField
-// #define FN_DeltaSetFieldByIndex				DeltaSetFieldByIndex
-// #define FN_DeltaUnsetFieldByIndex			DeltaUnsetFieldByIndex
-// #define FN_SetGroupMask						SetGroupMask
-// #define FN_engCreateInstancedBaseline		engCreateInstancedBaseline
-// #define FN_Cvar_DirectSet					Cvar_DirectSet
-// #define FN_ForceUnmodified					ForceUnmodified
-// #define FN_GetPlayerStats					GetPlayerStats
-// #define FN_AddServerCommand					AddServerCommand
-// #define FN_Voice_GetClientListening			Voice_GetClientListening
-// #define FN_Voice_SetClientListening			Voice_SetClientListening
-// #define FN_GetPlayerAuthId					GetPlayerAuthId
-
-// - GetEngineAPI_Post functions
-// #define FN_PrecacheModel_Post				PrecacheModel_Post
-// #define FN_PrecacheSound_Post				PrecacheSound_Post
-// #define FN_SetModel_Post						SetModel_Post
-// #define FN_ModelIndex_Post					ModelIndex_Post
-// #define FN_ModelFrames_Post					ModelFrames_Post
-// #define FN_SetSize_Post						SetSize_Post
-// #define FN_ChangeLevel_Post					ChangeLevel_Post
-// #define FN_GetSpawnParms_Post				GetSpawnParms_Post
-// #define FN_SaveSpawnParms_Post				SaveSpawnParms_Post
-// #define FN_VecToYaw_Post						VecToYaw_Post
-// #define FN_VecToAngles_Post					VecToAngles_Post
-// #define FN_MoveToOrigin_Post					MoveToOrigin_Post
-// #define FN_ChangeYaw_Post					ChangeYaw_Post
-// #define FN_ChangePitch_Post					ChangePitch_Post
-// #define FN_FindEntityByString_Post			FindEntityByString_Post
-// #define FN_GetEntityIllum_Post				GetEntityIllum_Post
-// #define FN_FindEntityInSphere_Post			FindEntityInSphere_Post
-// #define FN_FindClientInPVS_Post				FindClientInPVS_Post
-// #define FN_EntitiesInPVS_Post				EntitiesInPVS_Post
-// #define FN_MakeVectors_Post					MakeVectors_Post
-// #define FN_AngleVectors_Post					AngleVectors_Post
-// #define FN_CreateEntity_Post					CreateEntity_Post
-// #define FN_RemoveEntity_Post					RemoveEntity_Post
-// #define FN_CreateNamedEntity_Post			CreateNamedEntity_Post
-// #define FN_MakeStatic_Post					MakeStatic_Post
-// #define FN_EntIsOnFloor_Post					EntIsOnFloor_Post
-// #define FN_DropToFloor_Post					DropToFloor_Post
-// #define FN_WalkMove_Post						WalkMove_Post
-// #define FN_SetOrigin_Post					SetOrigin_Post
-// #define FN_EmitSound_Post					EmitSound_Post
-// #define FN_EmitAmbientSound_Post				EmitAmbientSound_Post
-// #define FN_TraceLine_Post					TraceLine_Post
-// #define FN_TraceToss_Post					TraceToss_Post
-// #define FN_TraceMonsterHull_Post				TraceMonsterHull_Post
-// #define FN_TraceHull_Post					TraceHull_Post
-// #define FN_TraceModel_Post					TraceModel_Post
-// #define FN_TraceTexture_Post					TraceTexture_Post
-// #define FN_TraceSphere_Post					TraceSphere_Post
-// #define FN_GetAimVector_Post					GetAimVector_Post
-// #define FN_ServerCommand_Post				ServerCommand_Post
-// #define FN_ServerExecute_Post				ServerExecute_Post
-// #define FN_engClientCommand_Post				engClientCommand_Post
-// #define FN_ParticleEffect_Post				ParticleEffect_Post
-// #define FN_LightStyle_Post					LightStyle_Post
-// #define FN_DecalIndex_Post					DecalIndex_Post
-// #define FN_PointContents_Post				PointContents_Post
-// #define FN_MessageBegin_Post					MessageBegin_Post
-// #define FN_MessageEnd_Post					MessageEnd_Post
-// #define FN_WriteByte_Post					WriteByte_Post
-// #define FN_WriteChar_Post					WriteChar_Post
-// #define FN_WriteShort_Post					WriteShort_Post
-// #define FN_WriteLong_Post					WriteLong_Post
-// #define FN_WriteAngle_Post					WriteAngle_Post
-// #define FN_WriteCoord_Post					WriteCoord_Post
-// #define FN_WriteString_Post					WriteString_Post
-// #define FN_WriteEntity_Post					WriteEntity_Post
-// #define FN_CVarRegister_Post					CVarRegister_Post
-// #define FN_CVarGetFloat_Post					CVarGetFloat_Post
-// #define FN_CVarGetString_Post				CVarGetString_Post
-// #define FN_CVarSetFloat_Post					CVarSetFloat_Post
-// #define FN_CVarSetString_Post				CVarSetString_Post
-// #define FN_AlertMessage_Post					AlertMessage_Post
-// #define FN_EngineFprintf_Post				EngineFprintf_Post
-// #define FN_PvAllocEntPrivateData_Post		PvAllocEntPrivateData_Post
-// #define FN_PvEntPrivateData_Post				PvEntPrivateData_Post
-// #define FN_FreeEntPrivateData_Post			FreeEntPrivateData_Post
-// #define FN_SzFromIndex_Post					SzFromIndex_Post
-// #define FN_AllocString_Post					AllocString_Post
-// #define FN_GetVarsOfEnt_Post					GetVarsOfEnt_Post
-// #define FN_PEntityOfEntOffset_Post			PEntityOfEntOffset_Post
-// #define FN_EntOffsetOfPEntity_Post			EntOffsetOfPEntity_Post
-// #define FN_IndexOfEdict_Post					IndexOfEdict_Post
-// #define FN_PEntityOfEntIndex_Post			PEntityOfEntIndex_Post
-// #define FN_FindEntityByVars_Post				FindEntityByVars_Post
-// #define FN_GetModelPtr_Post					GetModelPtr_Post
-// #define FN_RegUserMsg_Post					RegUserMsg_Post
-// #define FN_AnimationAutomove_Post			AnimationAutomove_Post
-// #define FN_GetBonePosition_Post				GetBonePosition_Post
-// #define FN_FunctionFromName_Post				FunctionFromName_Post
-// #define FN_NameForFunction_Post				NameForFunction_Post
-// #define FN_ClientPrintf_Post					ClientPrintf_Post
-// #define FN_ServerPrint_Post					ServerPrint_Post
-// #define FN_Cmd_Args_Post						Cmd_Args_Post
-// #define FN_Cmd_Argv_Post						Cmd_Argv_Post
-// #define FN_Cmd_Argc_Post						Cmd_Argc_Post
-// #define FN_GetAttachment_Post				GetAttachment_Post
-// #define FN_CRC32_Init_Post					CRC32_Init_Post
-// #define FN_CRC32_ProcessBuffer_Post			CRC32_ProcessBuffer_Post
-// #define FN_CRC32_ProcessByte_Post			CRC32_ProcessByte_Post
-// #define FN_CRC32_Final_Post					CRC32_Final_Post
-// #define FN_RandomLong_Post					RandomLong_Post
-// #define FN_RandomFloat_Post					RandomFloat_Post
-// #define FN_SetView_Post						SetView_Post
-// #define FN_Time_Post							Time_Post
-// #define FN_CrosshairAngle_Post				CrosshairAngle_Post
-// #define FN_LoadFileForMe_Post				LoadFileForMe_Post
-// #define FN_FreeFile_Post						FreeFile_Post
-// #define FN_EndSection_Post					EndSection_Post
-// #define FN_CompareFileTime_Post				CompareFileTime_Post
-// #define FN_GetGameDir_Post					GetGameDir_Post
-// #define FN_Cvar_RegisterVariable_Post		Cvar_RegisterVariable_Post
-// #define FN_FadeClientVolume_Post				FadeClientVolume_Post
-// #define FN_SetClientMaxspeed_Post			SetClientMaxspeed_Post
-// #define FN_CreateFakeClient_Post				CreateFakeClient_Post
-// #define FN_RunPlayerMove_Post				RunPlayerMove_Post
-// #define FN_NumberOfEntities_Post				NumberOfEntities_Post
-// #define FN_GetInfoKeyBuffer_Post				GetInfoKeyBuffer_Post
-// #define FN_InfoKeyValue_Post					InfoKeyValue_Post
-// #define FN_SetKeyValue_Post					SetKeyValue_Post
-// #define FN_SetClientKeyValue_Post			SetClientKeyValue_Post
-// #define FN_IsMapValid_Post					IsMapValid_Post
-// #define FN_StaticDecal_Post					StaticDecal_Post
-// #define FN_PrecacheGeneric_Post				PrecacheGeneric_Post
-// #define FN_GetPlayerUserId_Post				GetPlayerUserId_Post
-// #define FN_BuildSoundMsg_Post				BuildSoundMsg_Post
-// #define FN_IsDedicatedServer_Post			IsDedicatedServer_Post
-// #define FN_CVarGetPointer_Post				CVarGetPointer_Post
-// #define FN_GetPlayerWONId_Post				GetPlayerWONId_Post
-// #define FN_Info_RemoveKey_Post				Info_RemoveKey_Post
-// #define FN_GetPhysicsKeyValue_Post			GetPhysicsKeyValue_Post
-// #define FN_SetPhysicsKeyValue_Post			SetPhysicsKeyValue_Post
-// #define FN_GetPhysicsInfoString_Post			GetPhysicsInfoString_Post
-// #define FN_PrecacheEvent_Post				PrecacheEvent_Post
-// #define FN_PlaybackEvent_Post				PlaybackEvent_Post
-// #define FN_SetFatPVS_Post					SetFatPVS_Post
-// #define FN_SetFatPAS_Post					SetFatPAS_Post
-// #define FN_CheckVisibility_Post				CheckVisibility_Post
-// #define FN_DeltaSetField_Post				DeltaSetField_Post
-// #define FN_DeltaUnsetField_Post				DeltaUnsetField_Post
-// #define FN_DeltaAddEncoder_Post				DeltaAddEncoder_Post
-// #define FN_GetCurrentPlayer_Post				GetCurrentPlayer_Post
-// #define FN_CanSkipPlayer_Post				CanSkipPlayer_Post
-// #define FN_DeltaFindField_Post				DeltaFindField_Post
-// #define FN_DeltaSetFieldByIndex_Post			DeltaSetFieldByIndex_Post
-// #define FN_DeltaUnsetFieldByIndex_Post		DeltaUnsetFieldByIndex_Post
-// #define FN_SetGroupMask_Post					SetGroupMask_Post
-// #define FN_engCreateInstancedBaseline_Post	engCreateInstancedBaseline_Post
-// #define FN_Cvar_DirectSet_Post				Cvar_DirectSet_Post
-// #define FN_ForceUnmodified_Post				ForceUnmodified_Post
-// #define FN_GetPlayerStats_Post				GetPlayerStats_Post
-// #define FN_AddServerCommand_Post				AddServerCommand_Post
-// #define FN_Voice_GetClientListening_Post		Voice_GetClientListening_Post
-// #define FN_Voice_SetClientListening_Post		Voice_SetClientListening_Post
-// #define FN_GetPlayerAuthId_Post				GetPlayerAuthId_Post
-
-// #define FN_OnFreeEntPrivateData				OnFreeEntPrivateData				
-// #define FN_GameShutdown						GameShutdown
-// #define FN_ShouldCollide						ShouldCollide
-
-// #define FN_OnFreeEntPrivateData_Post			OnFreeEntPrivateData_Post
-// #define FN_GameShutdown_Post					GameShutdown_Post
-// #define FN_ShouldCollide_Post				ShouldCollide_Post
-
-
-#endif // USE_METAMOD
-
-#endif // __MODULECONFIG_H__

amxmodx/sh_list.h

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

amxmodx/sh_stack.h

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

amxmodx/sh_tinyhash.h

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

amxmodx/srvcmd.cpp

@@ -29,243 +29,200 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include "amxmodx.h"
 
-void amx_command()
+void amx_command(){
-{
+	
 	const char* cmd = CMD_ARGV(1);
 	
-	if (!strcmp(cmd, "plugins") || !strcmp(cmd, "list"))
+	if (!strcmp(cmd,"plugins") || !strcmp(cmd,"list"))
 	{
 
-		print_srvconsole("Currently loaded plugins:\n");
+		print_srvconsole( "Currently loaded plugins:\n");
-		print_srvconsole("       %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", "name", "version", "author", "file", "status");
+		print_srvconsole( "       %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n",
+			"name","version","author","file","status");
 
 		int plugins = 0;
 		int	running = 0;
 
+
 		CPluginMngr::iterator a = g_plugins.begin();
 		
 		while (a) 
 		{
 			++plugins;
-			if ((*a).isValid() && !(*a).isPaused()) 
+
+			if ( (*a).isValid() && !(*a).isPaused() ) 
 				++running;
 
-			print_srvconsole(" [%3d] %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
+			print_srvconsole( " [%3d] %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n",
+				plugins,(*a).getTitle(),(*a).getVersion(),
+				(*a).getAuthor(), (*a).getName(), (*a).getStatus() );
+
 			++a;
 		}
 
-		a = g_plugins.begin();
+		print_srvconsole( "%d plugins, %d running\n",plugins,running );
 
-		int num = 0;
-		while (a)
-		{
-			num++;
-			if ((*a).getStatusCode() == ps_bad_load)
-			{
-				//error
-				print_srvconsole("(%3d) Load fails: %s\n", num, (*a).getError());
-			} else if ( (*a).getStatusCode() == ps_error) {
-				//error
-				print_srvconsole("(%3d) Error: %s\n", num, (*a).getError());
 	}
-			++a;
+	else if (!strcmp(cmd,"pause") && CMD_ARGC() > 2) 
-		}
-
-		print_srvconsole("%d plugins, %d running\n", plugins, running);
-	}
-	else if (!strcmp(cmd, "pause") && CMD_ARGC() > 2) 
 	{
 		const char* sPlugin = CMD_ARGV(2);
 
 		CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin);
 
-		if (plugin && plugin->isValid()) 
+		if ( plugin && plugin->isValid() ) 
 		{
 			plugin->pausePlugin();
-			print_srvconsole("Paused plugin \"%s\"\n", plugin->getName());
+			print_srvconsole("Paused plugin \"%s\"\n",plugin->getName() );
 		}
-		else 
+		else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin);
-			print_srvconsole("Couldn't find plugin matching \"%s\"\n", sPlugin);
+
 	}
-	else if (!strcmp(cmd, "unpause") && CMD_ARGC() > 2) 
+	else if (!strcmp(cmd,"unpause") && CMD_ARGC() > 2) 
 	{
 		const char* sPlugin = CMD_ARGV(2);
 
 		CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin);
 
-		if (plugin && plugin->isValid() && plugin->isPaused()) 
+		if ( plugin && plugin->isValid() ) 
 		{
 			plugin->unpausePlugin();
-			print_srvconsole("Unpaused plugin \"%s\"\n", plugin->getName());
+			print_srvconsole("Unpaused plugin \"%s\"\n",plugin->getName() );
 		}
-		else if (!plugin)
+		else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin);
+
+	}
+	else if (!strcmp(cmd,"cvars")) 
 	{
-			print_srvconsole("Couldn't find plugin matching \"%s\"\n", sPlugin);
+		print_srvconsole( "Registered cvars:\n");
-		} else {
+		print_srvconsole( "       %-24.23s %-24.23s %-16.15s\n",
-			print_srvconsole("Plugin %s can't be unpaused right now.", sPlugin);
+			"name","value","plugin");
-		}
-	}
-	else if (!strcmp(cmd, "cvars")) 
-	{
-		print_srvconsole("Registered cvars:\n");
-		print_srvconsole("       %-24.23s %-24.23s %-16.15s\n", "name", "value", "plugin");
 
 		int ammount = 0;
 
-		for (CList<CCVar>::iterator a = g_cvars.begin(); a; ++a)
+		for( CList<CCVar>::iterator a = g_cvars.begin(); a ; ++a )
 		{
-			print_srvconsole(" [%3d] %-24.23s %-24.23s %-16.15s\n", ++ammount, (*a).getName(), CVAR_GET_STRING((*a).getName()), (*a).getPluginName());
+			print_srvconsole( " [%3d] %-24.23s %-24.23s %-16.15s\n",++ammount,
+			(*a).getName() ,CVAR_GET_STRING( (*a).getName() ),(*a).getPluginName() );
 		}
 
-		print_srvconsole("%d cvars\n", ammount);
+		print_srvconsole( "%d cvars\n",ammount);
 	}
-	else if (!strcmp(cmd, "cmds")) 
+	else if ( !strcmp(cmd,"cmds") ) 
 	{
-		print_srvconsole("Registered commands:\n");
+		
-		print_srvconsole("       %-24.23s %-16.15s %-8.7s %-16.15s\n", "name", "access", "type", "plugin");
+		print_srvconsole( "Registered commands:\n");
+		print_srvconsole( "       %-24.23s %-16.15s %-8.7s %-16.15s\n", 
+			"name","access" ,"type" ,"plugin");
 		
 		int ammount = 0;
+		
 		char access[32];
 
-		CmdMngr::iterator a = g_commands.begin(CMD_ConsoleCommand);
+		CmdMngr::iterator a = g_commands.begin( CMD_ConsoleCommand );
 
-		while (a)
+		while( a )
 		{
-			UTIL_GetFlags(access, (*a).getFlags());
+			UTIL_GetFlags( access , (*a).getFlags() );
-			print_srvconsole(" [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n", ++ammount, (*a).getCmdLine(), access, (*a).getCmdType(), (*a).getPlugin()->getName());
+			print_srvconsole( " [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n",
+				++ammount,(*a).getCmdLine() , access , (*a).getCmdType() , (*a).getPlugin()->getName());
 			++a;
 		}
 
-		print_srvconsole("%d commands\n",ammount);
+		print_srvconsole( "%d commands\n",ammount);
 	}
-	else if (!strcmp(cmd, "version")) 
+	else if (!strcmp(cmd,"version")) 
 	{
-		print_srvconsole("%s %s (%s)\n", Plugin_info.name, Plugin_info.version, Plugin_info.url);
+
-		print_srvconsole("Authors: David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko\n");
+		print_srvconsole( "%s %s\n", Plugin_info.name, Plugin_info.version);
-		print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n");
+		print_srvconsole(   "author: %s (%s)\n", Plugin_info.author, Plugin_info.url);
-		print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n");
+		print_srvconsole(   "compiled: %s\n", __DATE__ ", " __TIME__);
-		print_srvconsole("\tBorja \"faluco\" Ferrer\n");
+	
-		print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__);
-#if defined JIT && !defined ASM32
-		print_srvconsole("Core mode: JIT Only\n");
-#elif !defined JIT && defined ASM32
-		print_srvconsole("Core mode: ASM32 Only\n");
-#elif defined JIT && defined ASM32
-		print_srvconsole("Core mode: JIT+ASM32\n");
-#else
-		print_srvconsole("Core mode: Normal\n");
-#endif
 	}
-	else if (!strcmp(cmd, "modules"))
+	else if (!strcmp(cmd,"modules"))
 	{
-		print_srvconsole("Currently loaded modules:\n");
+		print_srvconsole( "Currently loaded modules:\n");
-		print_srvconsole("      %-23.22s %-8.7s %-20.19s %-11.10s\n", "name", "version", "author", "status");
+		print_srvconsole( "      %-23.22s %-7.8s %-8.7s %-20.19s %-11.10s\n",
+			"name","type","version", "author", "status");
 
 		int running = 0;
 		int modules = 0;
 
-		CList<CModule,const char *>::iterator a = g_modules.begin();
+		CList<CModule>::iterator a = g_modules.begin();
 
-		while (a)
+		while ( a )
 		{
-			if ((*a).getStatusValue() == MODULE_LOADED)
+			if ( (*a).getStatusValue() == MODULE_LOADED )
 				++running;
+
 			++modules;
 
-			print_srvconsole(" [%2d] %-23.22s %-8.7s %-20.19s %-11.10s\n", modules, (*a).getName(), (*a).getVersion(), (*a).getAuthor(), (*a).getStatus());
+			print_srvconsole( " [%2d] %-23.22s %-7.6s %-8.7s %-20.19s %-11.10s\n",modules,
+				(*a).getName(), (*a).getType(), (*a).getVersion(), (*a).getAuthor() , (*a).getStatus() );
+		
 			++a;
 		}
 
-		print_srvconsole("%d modules, %d correct\n", modules, running);
+		print_srvconsole( "%d modules, %d correct\n",modules,running);
 	}
-	else if (!strcmp(cmd, "gpl"))
+	else 
 	{
-		print_srvconsole("AMX Mod X\n");
+
-		print_srvconsole("\n");
+
-		print_srvconsole(" by the AMX Mod X Development Team\n");
-		print_srvconsole("  originally developed by OLO\n");
-		print_srvconsole("\n");
-		print_srvconsole("\n");
-		print_srvconsole("  This program is free software; you can redistribute it and/or modify it\n");
-		print_srvconsole("  under the terms of the GNU General Public License as published by the\n");
-		print_srvconsole("  Free Software Foundation; either version 2 of the License, or (at\n");
-		print_srvconsole("  your option) any later version.\n");
-		print_srvconsole("\n");
-		print_srvconsole("  This program is distributed in the hope that it will be useful, but\n");
-		print_srvconsole("  WITHOUT ANY WARRANTY; without even the implied warranty of\n");
-		print_srvconsole("  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n");
-		print_srvconsole("  General Public License for more details.\n");
-		print_srvconsole("\n");
-		print_srvconsole("  You should have received a copy of the GNU General Public License\n");
-		print_srvconsole("  along with this program; if not, write to the Free Software Foundation,\n");
-		print_srvconsole("  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n");
-		print_srvconsole("\n");
-		print_srvconsole("  In addition, as a special exception, the author gives permission to\n");
-		print_srvconsole("  link the code of this program with the Half-Life Game Engine (\"HL\n");
-		print_srvconsole("  Engine\") and Modified Game Libraries (\"MODs\") developed by Valve,\n");
-		print_srvconsole("  L.L.C (\"Valve\"). You must obey the GNU General Public License in all\n");
-		print_srvconsole("  respects for all of the code used other than the HL Engine and MODs\n");
-		print_srvconsole("  from Valve. If you modify this file, you may extend this exception\n");
-		print_srvconsole("  to your version of the file, but you are not obligated to do so. If\n");
-		print_srvconsole("  you do not wish to do so, delete this exception statement from your\n");
-		print_srvconsole("  version.\n");
-		print_srvconsole("\n");
-	}
-	else if (!strcmp(cmd, "\x74\x75\x72\x74\x6C\x65"))		// !! Hidden Command :D !!
-	{
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2E\x2E\x3A\x3A\x3E\x3E\x3A\x3A\x3B\x3E\x5E\x27\x2E\x27\x27\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x27\x3A\x3A\x3F\x3D\x3E\x3E\x3E\x3E\x3E\x3D\x3F\x3E\x78\x2B\x3F\x3E\x3E\x3E\x3D\x3E\x3F\x2B\x3F\x3E\x3B\x2E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x2E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x27\x2C\x3A\x3E\x3B\x3F\x3D\x3E\x3B\x2E\x27\x5E\x5E\x3B\x3B\x2C\x3A\x3F\x3F\x3D\x78\x3F\x3B\x3E\x3A\x3B\x3A\x5E\x3B\x3D\x3E\x2B\x2B\x2B\x2B\x3D\x2C\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x2C\x3E\x37\x24\x24\x78\x3D\x3D\x3D\x3F\x3A\x27\x20\x20\x20\x20\x20\x20\x20\x2E\x3A\x3B\x3D\x3E\x3A\x3A\x3A\x3A\x3F\x3F\x3F\x3E\x5E\x2C\x2E\x2E\x2C\x2C\x2C\x2C\x3A\x3B\x3D\x3D\x3B\x5E\x2C\x2C\x2C\x3A\x5E\x3A\x3F\x3F\x3E\x3D\x3D\x3E\x3E\x2B\x3B\x27\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x2C\x3D\x2B\x3E\x2C\x5E\x3D\x79\x24\x33\x78\x33\x24\x5A\x24\x3B\x20\x20\x3A\x3E\x2B\x3E\x3D\x3F\x5E\x2C\x2C\x2C\x5E\x5E\x3E\x3D\x3E\x3B\x3B\x3A\x5E\x5E\x3E\x3F\x3D\x2B\x37\x3D\x3F\x3E\x3E\x3E\x3F\x3D\x3F\x3F\x3D\x3D\x3D\x3D\x3E\x3F\x3D\x3E\x3E\x3E\x3D\x5A\x78\x3E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x3D\x5A\x24\x37\x78\x66\x68\x78\x5A\x5A\x24\x79\x79\x71\x23\x23\x4D\x71\x3B\x3A\x3B\x3A\x3E\x3B\x3B\x2C\x5E\x3E\x3F\x3D\x3F\x3A\x2C\x2C\x3A\x3B\x3B\x3E\x3E\x3D\x2B\x3D\x3E\x3D\x3B\x3A\x3E\x3D\x2B\x3D\x2B\x37\x2B\x3D\x2B\x37\x37\x2B\x2B\x33\x33\x33\x37\x37\x24\x5A\x79\x3A\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x5E\x2B\x5A\x2B\x3E\x3D\x37\x5A\x66\x40\x40\x23\x40\x48\x23\x23\x23\x38\x5E\x3B\x3D\x3F\x2B\x3E\x3B\x3E\x5E\x5E\x2C\x27\x2E\x27\x2E\x2E\x5E\x3F\x3D\x3D\x3F\x3A\x3B\x3A\x3A\x3A\x5E\x5E\x3E\x3E\x3F\x3D\x37\x37\x3D\x3D\x37\x2B\x3D\x37\x2B\x37\x78\x24\x79\x38\x68\x45\x48\x79\x3E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x2C\x3E\x3E\x78\x33\x68\x48\x23\x23\x40\x40\x48\x45\x66\x33\x20\x2C\x3A\x3E\x3E\x3E\x3B\x3B\x3A\x3A\x2C\x2E\x2C\x5E\x3A\x2C\x5E\x3B\x3E\x37\x37\x3F\x3B\x3A\x2E\x3A\x3A\x3B\x3D\x3B\x3B\x3D\x2B\x3D\x78\x33\x37\x3E\x3D\x3D\x2B\x37\x2B\x78\x78\x78\x78\x5A\x66\x71\x68\x38\x45\x27\x20\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x3A\x37\x37\x24\x66\x71\x45\x45\x71\x45\x3A\x3A\x2C\x5E\x3A\x3E\x3A\x3A\x3B\x3B\x5E\x3A\x2C\x5E\x5E\x2C\x2C\x5E\x3A\x3E\x2B\x33\x3D\x3E\x3A\x3A\x3A\x3D\x2B\x2B\x3D\x3F\x3F\x37\x37\x2B\x37\x3D\x3D\x5A\x33\x78\x33\x37\x78\x24\x5A\x33\x37\x38\x40\x71\x38\x66\x40\x2C\x20\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x2B\x5A\x45\x40\x5E\x5E\x5E\x3A\x2C\x3A\x3B\x3E\x3A\x5E\x5E\x2C\x2E\x2E\x2C\x5E\x3B\x3B\x3A\x2B\x3E\x3F\x3B\x3F\x3F\x3F\x3F\x3E\x3F\x3D\x37\x3B\x3B\x3D\x33\x2B\x3D\x3D\x78\x78\x5A\x78\x33\x78\x5A\x5A\x5A\x24\x71\x48\x79\x5A\x24\x79\x45\x3E\x20\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x27\x3B\x2C\x2C\x27\x5E\x5E\x2C\x3A\x5E\x3A\x3A\x5E\x3A\x3B\x3F\x3E\x3F\x3E\x3B\x3E\x3E\x3F\x3D\x2B\x37\x37\x2B\x2B\x3D\x2B\x37\x2B\x37\x37\x2B\x3B\x3D\x33\x2B\x2B\x37\x37\x2B\x3D\x78\x78\x66\x78\x78\x37\x33\x66\x78\x38\x23\x23\x27\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3A\x3F\x3B\x5E\x2C\x3B\x3F\x3D\x3F\x3F\x3B\x3A\x3A\x3A\x3E\x3F\x3E\x3E\x3F\x3A\x3F\x33\x78\x78\x33\x24\x24\x33\x2B\x37\x78\x24\x78\x33\x3D\x2B\x2B\x5A\x24\x78\x24\x78\x33\x33\x24\x5A\x79\x24\x24\x24\x68\x45\x48\x38\x68\x45\x40\x3E\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2C\x3A\x3E\x3F\x37\x3D\x3E\x3F\x2B\x3F\x3F\x3E\x3F\x3F\x3F\x3D\x3F\x3E\x3F\x3D\x37\x2B\x3E\x3E\x2B\x37\x37\x33\x37\x33\x78\x33\x33\x33\x78\x37\x37\x37\x78\x5A\x78\x5A\x79\x79\x5A\x24\x79\x79\x79\x79\x79\x68\x71\x38\x38\x71\x23\x23\x45\x37\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x2B\x2B\x3F\x2B\x78\x40\x38\x3F\x3B\x3E\x3B\x3B\x3E\x3F\x37\x2B\x3F\x3F\x3D\x3D\x3E\x3F\x2B\x37\x37\x37\x37\x33\x33\x78\x78\x33\x37\x24\x5A\x78\x5A\x5A\x78\x24\x33\x3D\x37\x37\x37\x78\x24\x5A\x78\x37\x37\x78\x66\x79\x66\x71\x66\x40\x45\x40\x3A\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2B\x3A\x3F\x2B\x3D\x2B\x79\x23\x79\x3B\x2C\x3A\x3A\x3A\x37\x78\x3F\x3E\x3B\x3E\x3B\x3E\x3D\x37\x24\x33\x37\x33\x37\x78\x78\x33\x24\x68\x79\x33\x24\x78\x2B\x33\x33\x5A\x79\x24\x5A\x79\x24\x5A\x37\x24\x5A\x5A\x66\x38\x66\x79\x66\x40\x71\x45\x48\x5A\x3A\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x37\x3D\x37\x37\x33\x37\x37\x66\x45\x5A\x3F\x5E\x5E\x78\x37\x3D\x3F\x3E\x3B\x3B\x3E\x2B\x2B\x24\x78\x37\x2B\x37\x2B\x37\x78\x78\x71\x79\x33\x33\x24\x24\x78\x24\x5A\x3F\x37\x78\x24\x78\x79\x66\x5A\x78\x79\x66\x79\x68\x79\x66\x5A\x33\x3F\x3D\x3D\x20\x20\x20\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x2B\x3D\x3F\x37\x37\x78\x33\x5A\x4E\x4D\x23\x38\x33\x3F\x3E\x3B\x3E\x3B\x3D\x3D\x33\x66\x24\x78\x33\x2B\x78\x24\x5A\x24\x5A\x71\x79\x78\x33\x33\x78\x79\x5A\x5A\x33\x66\x24\x78\x78\x24\x79\x5A\x24\x79\x5A\x37\x66\x24\x3D\x3B\x66\x23\x4D\x4D\x4D\x79\x3B\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3A\x33\x37\x37\x24\x78\x66\x79\x48\x4D\x4D\x4D\x4D\x23\x71\x68\x5A\x24\x5A\x79\x68\x68\x5A\x5A\x24\x79\x66\x68\x78\x5A\x4E\x45\x66\x66\x45\x45\x45\x24\x5A\x40\x71\x68\x5A\x68\x5A\x37\x66\x79\x78\x37\x78\x37\x68\x38\x38\x71\x48\x40\x23\x45\x3A\x3D\x37\x45\x27\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x37\x37\x78\x37\x33\x38\x45\x45\x71\x20\x5E\x3D\x2B\x3F\x2B\x2B\x79\x71\x45\x48\x40\x45\x45\x45\x45\x45\x71\x40\x40\x71\x38\x38\x79\x66\x38\x68\x48\x48\x45\x66\x37\x2B\x3A\x37\x3F\x3B\x3A\x2C\x27\x2C\x27\x78\x4D\x23\x48\x48\x48\x79\x2B\x3A\x3F\x79\x27\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3A\x78\x78\x24\x40\x4E\x4E\x4D\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x3E\x3E\x3F\x3E\x3E\x3E\x3E\x3B\x3B\x3B\x3A\x3A\x3F\x3E\x3A\x2E\x2E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2E\x45\x4D\x40\x45\x78\x5E\x33\x68\x33\x2B\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x24\x48\x45\x48\x78\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2B\x4E\x40\x2B\x66\x33\x78\x20\x20\n");
-		print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2B\x2C\x20\x3A\x20\x20\n");
-	} else {
 		print_srvconsole("Usage: amxx < command > [ argument ]\n");
 		print_srvconsole("Commands:\n");
 		print_srvconsole("   version                - display amxx version info\n");
-		print_srvconsole("   gpl                    - print the license\n");
 		print_srvconsole("   plugins                - list plugins currently loaded\n");
 		print_srvconsole("   modules                - list modules currently loaded\n");
 		print_srvconsole("   cvars                  - list cvars registered by plugins\n");
 		print_srvconsole("   cmds                   - list commands registered by plugins\n");
 		print_srvconsole("   pause < plugin >       - pause a running plugin\n");
 		print_srvconsole("   unpause < plugin >     - unpause a previously paused plugin\n");
+
+	
 	}
 }
 
+
 void plugin_srvcmd()
 {
+
 	cell ret = 0;
+	int err;
 	const char* cmd = CMD_ARGV(0);
 	
+#ifdef ENABLEEXEPTIONS
+	try{
+#endif
+		
 		CmdMngr::iterator a = g_commands.srvcmdbegin();
 		
-	while (a)
+		while ( a )
 		{
-		if ((*a).matchCommand(cmd) && (*a).getPlugin()->isExecutable((*a).getFunction()))
+			if (  (*a).matchCommand( cmd )  && 
+				(*a).getPlugin()->isExecutable( (*a).getFunction() ) )
 			{
-			cell ret = executeForwards((*a).getFunction(), static_cast<cell>(g_srvindex),
+				
-				static_cast<cell>((*a).getFlags()), static_cast<cell>((*a).getId()));
+				if ((err = amx_Exec( (*a).getPlugin()->getAMX(), &ret , (*a).getFunction() 
-			if (ret) break;
+					, 3 , g_srvindex , (*a).getFlags() , (*a).getId() )) != AMX_ERR_NONE)
+					
+					UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+					err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName());
+				
+				if ( ret ) break;
 			}
+			
 			++a;
 		}
+		
+#ifdef ENABLEEXEPTIONS
+	}catch( ... )
+	{
+		UTIL_Log( "[AMXX] fatal error at forward function execution");
+	}
+#endif
+	
 }

amxmodx/strptime.cpp

@@ -14,11 +14,6 @@
 #define strnicmp strncasecmp
 #endif
 
-// 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
-
 const char *_lc_Wday_ [2][ 7],
                   *_lc_Month_[2][12],
                   *_lc_AmPm_ [2][ 2];