Tagged 1.55

amxmodx/CCmd.cpp

@@ -35,10 +35,8 @@
 // *****************************************************
 // class CmdMngr
 // *****************************************************
-
+CmdMngr::CmdMngr() { 
-CmdMngr::CmdMngr()
+	memset(sortedlists,0,sizeof(sortedlists));
-{ 
-	memset(sortedlists, 0, sizeof(sortedlists));
 	srvcmdlist = 0;
 	clcmdlist = 0;
 	prefixHead = 0;
@@ -51,12 +49,13 @@ 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);
 	argument.assign(szArg);
 	plugin = pplugin;
@@ -74,68 +73,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 +149,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 +169,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.c_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 +264,7 @@ void CmdMngr::clear()
 	clearBufforedInfo();
 }
 
-void CmdMngr::clearBufforedInfo()
+void CmdMngr::clearBufforedInfo() { 
-{
 	buf_type = -1; 
 	buf_access = 0; 
 	buf_id = -1; 
@@ -286,3 +274,4 @@ void CmdMngr::clearBufforedInfo()
 }
 
 int CmdMngr::Command::uniqueid = 0;
+

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* getCmdInfo() { return info.c_str(); }
 		inline const char* getCmdLine() { return commandline.c_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 bool matchCommandLine(const char* cmd, const char* arg) 	{ return (!stricmp(command.c_str()+prefix, cmd+prefix ) && (argument.empty() || !stricmp(argument.c_str() , arg ))); }
-		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.c_str(), cmd)); }
+		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.c_str(), cmd ));	}
 		inline int getFunction() const { return function; }
-		inline bool gotAccess(int f) const { return (!flags || ((flags & f) == flags)); }
+		inline bool gotAccess(int f) const { return (!flags||((flags & f)==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;
 		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

@@ -48,7 +48,6 @@ EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin, int func, int flags)
 	m_FlagWorld = (flags & 1) ? true : false;						// flag a
 	m_FlagPlayer = (flags & 2) ? true : false;						// flag b
 	m_FlagOnce = (flags & 4) ? true : false;						// flag c
-	
 	if (flags & 24)
 	{
 		m_FlagAlive = (flags & 16) ? true : false;				// flag e
@@ -65,14 +64,12 @@ EventsMngr::ClEvent::~ClEvent()
 {
 	cond_t *tmp1 = m_Conditions;
 	cond_t *tmp2 = NULL;
-	
 	while (tmp1)
 	{
 		tmp2 = tmp1->next;
 		delete tmp1;
 		tmp1 = tmp2;
 	}
-	
 	m_Conditions = NULL;
 }
 
@@ -85,17 +82,14 @@ void EventsMngr::NextParam()
 
 	MsgDataEntry *tmp = NULL;
 	int tmpSize = 0;
-	
 	if (m_ParseVault)
 	{
 		// copy to tmp
 		tmp = new MsgDataEntry[m_ParseVaultSize];
-		
 		if (!tmp)
 		{
 			return;		// :TODO: Error report !!
 		}
-		
 		memcpy(tmp, m_ParseVault, m_ParseVaultSize * sizeof(MsgDataEntry));
 		tmpSize = m_ParseVaultSize;
 		delete [] m_ParseVault;
@@ -108,7 +102,6 @@ void EventsMngr::NextParam()
 		m_ParseVaultSize = INITIAL_PARSEVAULT_SIZE;
 
 	m_ParseVault = new MsgDataEntry[m_ParseVaultSize];
-	
 	if (tmp)
 	{
 		memcpy(m_ParseVault, tmp, tmpSize * sizeof(MsgDataEntry));
@@ -135,6 +128,7 @@ EventsMngr::~EventsMngr()
 	clearEvents();
 }
 
+
 CPluginMngr::CPlugin * EventsMngr::ClEvent::getPlugin()
 {
 	return m_Plugin;
@@ -176,7 +170,7 @@ void EventsMngr::ClEvent::registerFilter(char *filter)
 
 	// rest of line
 	tmpCond->sValue.assign(value);
-	tmpCond->fValue = static_cast<float>(atof(value));
+	tmpCond->fValue = atof(value);
 	tmpCond->iValue = atoi(value);
 	
 	tmpCond->next = NULL;
@@ -184,11 +178,10 @@ void EventsMngr::ClEvent::registerFilter(char *filter)
 	if (m_Conditions)
 	{
 		cond_t *tmp = m_Conditions;
-		
 		while (tmp->next)
 			tmp = tmp->next;
-		
 		tmp->next = tmpCond;
+
 	}
 	else
 		m_Conditions = tmpCond;
@@ -201,7 +194,6 @@ EventsMngr::ClEvent* EventsMngr::registerEvent(CPluginMngr::CPlugin* plugin, int
 		return NULL;
 
 	ClEvent *event = new ClEvent(plugin, func, flags);
-	
 	if (!event)
 		return NULL;
 
@@ -224,11 +216,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 +230,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 +247,6 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 			(*iter).m_Done = true;
 			continue;
 		}
-		
 		m_ParseNotDone = true;
 	}
 
@@ -265,7 +257,6 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 		m_ParseVault[0].type = MSG_INTEGER;
 		m_ParseVault[0].iValue = index;
 	}
-	
 	m_ParseFun = &m_Events[msg_type];
 }
 
@@ -275,6 +266,7 @@ void EventsMngr::parseValue(int iValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
+
 	// grow if needed
 	++m_ParsePos;
 	NextParam();
@@ -292,25 +284,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 +312,7 @@ void EventsMngr::parseValue(float fValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
+
 	// grow if needed
 	++m_ParsePos;
 	NextParam();
@@ -339,25 +330,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 +374,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.c_str())) execute=true; break;
-					case '!': if (strcmp(sz, condIter->sValue.c_str())) execute = true; break;
+				case '!': if (strcmp(sz, condIter->sValue.c_str())) execute=true; break;
-					case '&': if (strstr(sz, condIter->sValue.c_str())) execute = true; break;
+				case '&': if (strstr(sz, condIter->sValue.c_str())) execute=true; break;
 				}
-				
 				if (execute)
 					break;
 			}
 		}
-		
 		if (anyConditions && !execute)
 			(*iter).m_Done = true;		// don't execute
 	}
@@ -418,14 +403,13 @@ void EventsMngr::executeEvents()
 
 	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));
+		executeForwards((*iter).m_Func, m_ParseVault ? m_ParseVault[0].iValue : 0);
 	}
 
 	m_CurrentMsgType = -1;
@@ -439,30 +423,30 @@ int EventsMngr::getArgNum() const
 
 const char* EventsMngr::getArgString(int a) const
 {
-	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
 {
-	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;
@@ -475,15 +459,15 @@ int EventsMngr::getArgInteger(int a) const
 
 float EventsMngr::getArgFloat(int a) const
 {
-	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 +479,6 @@ void EventsMngr::clearEvents(void)
 	{
 		m_Events[i].clear();
 	}
-	
 	// delete parsevault
 	if (m_ParseVault)
 	{
@@ -514,26 +497,25 @@ 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()

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,7 +130,7 @@ private:
 	int m_ParsePos;				// is args. num. - 1
 	float* m_Timer;
 	
-	ClEvent* getValidEvent(ClEvent* a);
+	ClEvent* getValidEvent(ClEvent* a );
 
 	int m_CurrentMsgType;
 public:
@@ -142,20 +140,20 @@ public:
 	// Interface
 
 	ClEvent* registerEvent(CPluginMngr::CPlugin* plugin, int func, int flags, int msgid);
-	
 	void parserInit(int msg_type, float* timer, CPlayer* pPlayer, int index);
 	void parseValue(int iValue);
 	void parseValue(float fValue);
 	void parseValue(const char *sz);
 	void executeEvents();
-	
+	int getArgNum() const; //{ return (parsePos+1); }
-	int getArgNum() const;		//{ return (parsePos + 1); }
 	const char* getArgString(int a) const;
 	int getArgInteger(int a) const;
 	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

@@ -36,71 +36,70 @@
 // *****************************************************
 // 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.c_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);
   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 +115,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

@@ -30,22 +30,19 @@
 */
 
 #include "amxmodx.h"
-#include "debugger.h"
+
-#include "binlog.h"
+void AMXAPI amxx_InvalidateTrace(AMX *amx);
 
 CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes)
 {
 	m_FuncName = name;
 	m_ExecType = et;
 	m_NumParams = numParams;
-	
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
-	
 	// find funcs
 	int func;
 	AMXForward *tmp = NULL;
 	m_Funcs.clear();
-	
 	for (CPluginMngr::iterator iter = g_plugins.begin(); iter; ++iter)
 	{
 		if ((*iter).isValid() && amx_FindPublic((*iter).getAMX(), name, &func) == AMX_ERR_NONE)
@@ -77,79 +74,67 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 		{
 			// Get debug info
 			AMX *amx = (*iter).pPlugin->getAMX();
-			Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
+			AMX_DBGINFO *pInfo = (AMX_DBGINFO *)(amx->userdata[2]);
-			
+			if (pInfo)
-			if (pDebugger)
+				pInfo->error = AMX_ERR_NONE;
-				pDebugger->BeginExec();
-			
 			// handle strings & arrays
-			int i, ax = 0;
+			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)
+					amx_Allot(iter->pPlugin->getAMX(),
-						str = "";
+						(m_ParamTypes[i] == FP_STRING) ? strlen(reinterpret_cast<const char*>(params[i]))+1 : STRINGEX_MAXLENGTH,
-					amx_Allot(iter->pPlugin->getAMX(), (m_ParamTypes[i] == FP_STRING) ? strlen(str) + 1 : STRINGEX_MAXLENGTH, &realParams[i], &tmp);
+						&realParams[i], &tmp);
-					amx_SetStringOld(tmp, str, 0, 0);
+					amx_SetStringOld(tmp, (const char *)(params[i]), 0, 0);
 					physAddrs[i] = tmp;
 				}
 				else if (m_ParamTypes[i] == FP_ARRAY)
 				{
 					cell *tmp;
-					amx_Allot(amx, preparedArrays[params[i]].size, &realParams[i], &tmp);
+					amx_Allot(amx, preparedArrays[params[i]].size,
+						&realParams[i], &tmp);
 					physAddrs[i] = tmp;
-					
 					if (preparedArrays[params[i]].type == Type_Cell)
 					{
 						memcpy(tmp, preparedArrays[params[i]].ptr, preparedArrays[params[i]].size * sizeof(cell));
-					} else {
+					}
+					else
+					{
 						char *data = (char*)preparedArrays[params[i]].ptr;
-						
 						for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 							*tmp++ = (static_cast<cell>(*data++)) & 0xFF;
 					}
-				} else {
+				}
+				else
+				{
 					realParams[i] = params[i];
 				}
 			}
-			
 			//Push the parameters in reverse order.  Weird, unfriendly part of Small 3.0!
-			for (i = m_NumParams-1; i >= 0; i--)
+			for (i=m_NumParams-1; i>=0; i--)
 			{
 				amx_Push(amx, realParams[i]);
 			}
-			
 			// exec
 			cell retVal;
-#if defined BINLOG_ENABLED
-			g_BinLog.WriteOp(BinLog_CallPubFunc, (*iter).pPlugin->getId(), iter->func);
-#endif
 			int err = amx_Exec(amx, &retVal, iter->func);
-			
 			// log runtime error, if any
 			if (err != AMX_ERR_NONE)
 			{
 				//Did something else set an error?
-				if (pDebugger && pDebugger->ErrorExists())
+				if (pInfo && pInfo->error != AMX_ERR_NONE)
 				{
 					//we don't care, something else logged the error.
-				}
+				} else {
-				else if (err != -1)
-				{
 					//nothing logged the error so spit it out anyway
-					LogError(amx, err, NULL);
+					LogError(amx, err, "");
 				}
 			}
-			
+			amxx_InvalidateTrace(amx);
 			amx->error = AMX_ERR_NONE;
 
-			if (pDebugger)
-				pDebugger->EndExec();
-
 			// cleanup strings & arrays
 			for (i = 0; i < m_NumParams; ++i)
 			{
@@ -172,9 +157,10 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 						if (preparedArrays[params[i]].type == Type_Cell)
 						{
 							memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-						} else {
+						}
+						else
+						{
 							char *data = (char*)preparedArrays[params[i]].ptr;
-							
 							for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 								*data++ = static_cast<char>(*tmp++ & 0xFF);
 						}
@@ -204,7 +190,6 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 			}
 		}
 	}
-	
 	return globRetVal;
 }
 
@@ -244,72 +229,62 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	if (!pPlugin->isExecutable(m_Func))
 		return 0;
 
-	Debugger *pDebugger = (Debugger *)m_Amx->userdata[UD_DEBUGGER];
+	AMX_DBGINFO *pInfo = (AMX_DBGINFO *)(m_Amx->userdata[2]);
-	if (pDebugger)
+	if (pInfo)
-		pDebugger->BeginExec();
+		pInfo->error = AMX_ERR_NONE;
 
 	// 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_Allot(m_Amx,
-			amx_SetStringOld(tmp, str, 0, 0);
+				(m_ParamTypes[i] == FP_STRING) ? strlen(reinterpret_cast<const char*>(params[i]))+1 : STRINGEX_MAXLENGTH,
+				&realParams[i], &tmp);
+			amx_SetStringOld(tmp, (const char *)(params[i]), 0, 0);
 			physAddrs[i] = tmp;
 		}
 		else if (m_ParamTypes[i] == FP_ARRAY)
 		{
 			cell *tmp;
-			amx_Allot(m_Amx, preparedArrays[params[i]].size, &realParams[i], &tmp);
+			amx_Allot(m_Amx, preparedArrays[params[i]].size,
+				&realParams[i], &tmp);
 			physAddrs[i] = tmp;
-			
 			if (preparedArrays[params[i]].type == Type_Cell)
 			{
 				memcpy(tmp, preparedArrays[params[i]].ptr, preparedArrays[params[i]].size * sizeof(cell));
-			} else {
+			}
+			else
+			{
 				char *data = (char*)preparedArrays[params[i]].ptr;
-				
 				for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 					*tmp++ = (static_cast<cell>(*data++)) & 0xFF;
 			}
-		} else {
+		}
+		else
+		{
 			realParams[i] = params[i];
 		}
 	}
-	
+	for (i=m_NumParams-1; i>=0; i--)
-	for (i = m_NumParams - 1; i >= 0; i--)
 		amx_Push(m_Amx, realParams[i]);
-	
 	// exec
 	cell retVal;
-#if defined BINLOG_ENABLED
-	g_BinLog.WriteOp(BinLog_CallPubFunc, pPlugin->getId(), m_Func);
-#endif
 	int err = amx_Exec(m_Amx, &retVal, m_Func);
-	
 	if (err != AMX_ERR_NONE)
 	{
 		//Did something else set an error?
-		if (pDebugger && pDebugger->ErrorExists())
+		if (pInfo && pInfo->error != AMX_ERR_NONE)
 		{
 			//we don't care, something else logged the error.
-		}
+		} else {
-		else if (err != -1)
-		{
 			//nothing logged the error so spit it out anyway
-			LogError(m_Amx, err, NULL);
+			LogError(m_Amx, err, "");
 		}
 	}
-	
+	amxx_InvalidateTrace(m_Amx);
-	if (pDebugger)
-		pDebugger->EndExec();
-	
 	m_Amx->error = AMX_ERR_NONE;
 
 	// cleanup strings & arrays
@@ -334,9 +309,10 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 				if (preparedArrays[params[i]].type == Type_Cell)
 				{
 					memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-				} else {
+				}
+				else
+				{
 					char *data = (char*)preparedArrays[params[i]].ptr;
-					
 					for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
 						*data++ = static_cast<char>(*tmp++ & 0xFF);
 				}
@@ -352,12 +328,9 @@ int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int
 {
 	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;
 }
 
@@ -365,26 +338,22 @@ int CForwardMngr::registerSPForward(int func, AMX *amx, int numParams, const For
 {
 	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 {
+	}
+	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;
@@ -393,7 +362,6 @@ int CForwardMngr::registerSPForward(int func, AMX *amx, int numParams, const For
 					 
 		m_SPForwards.push_back(pForward);
 	}
-	
 	return retVal;
 }
 
@@ -401,58 +369,56 @@ int CForwardMngr::registerSPForward(const char *funcName, AMX *amx, int numParam
 {
 	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 {
+	}
+	else
+	{
 		pForward = new CSPForward();
-		
 		if (!pForward)
 			return -1;
-		
 		pForward->Set(funcName, amx, numParams, paramTypes);
-		
 		if (pForward->getFuncsNum() == 0)
 		{
 			delete pForward;
 			return -1;
 		}
-		
 		m_SPForwards.push_back(pForward);
 	}
-	
 	return retVal;
 }
 
 bool CForwardMngr::isIdValid(int id) const
 {
-	return (id >= 0) && ((id & 1) ? (static_cast<size_t>(id >> 1) < m_SPForwards.size()) : (static_cast<size_t>(id >> 1) < m_Forwards.size()));
+	return (id >= 0) && ((id & 1) ?
+		(static_cast<size_t>(id >> 1) < m_SPForwards.size()) :
+		(static_cast<size_t>(id >> 1) < m_Forwards.size()));
 }
 
 cell CForwardMngr::executeForwards(int id, cell *params)
 {
-	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : m_Forwards[id >> 1]->execute(params, m_TmpArrays);
+	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : 
+		m_Forwards[id >> 1]->execute(params, m_TmpArrays);
 	m_TmpArraysNum = 0;
-	
 	return retVal;
 }
 
 int CForwardMngr::getParamsNum(int id) const
 {
-	return (id & 1) ? m_SPForwards[id >> 1]->getParamsNum() : m_Forwards[id >> 1]->getParamsNum();
+	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);
+	return (id & 1) ? m_SPForwards[id >> 1]->getParamType(paramNum) :
+		m_Forwards[id >> 1]->getParamType(paramNum);
 }
 
 void CForwardMngr::clear()
@@ -461,9 +427,7 @@ void CForwardMngr::clear()
 	{
 		delete *iter;
 	}
-	
 	SPForwardVec::iterator spIter;
-	
 	for (spIter = m_SPForwards.begin(); spIter != m_SPForwards.end(); ++spIter)
 	{
 		delete (*spIter);
@@ -471,10 +435,8 @@ void CForwardMngr::clear()
 
 	m_Forwards.clear();
 	m_SPForwards.clear();
-	
 	while (!m_FreeSPForwards.empty())
 		m_FreeSPForwards.pop();
-	
 	m_TmpArraysNum = 0;
 }
 
@@ -486,117 +448,74 @@ bool CForwardMngr::isSPForward(int id) const
 void CForwardMngr::unregisterSPForward(int id)
 {
 	//make sure the id is valid
-	if (!isIdValid(id) || m_SPForwards.at(id >> 1)->isFree)
+	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);
-	
 	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);
 }
 
@@ -606,12 +525,9 @@ cell executeForwards(int id, ...)
 		return -1;
 
 	cell params[FORWARD_MAX_PARAMS];
-	
 	int paramsNum = g_forwards.getParamsNum(id);
-	
 	va_list argptr;
 	va_start(argptr, id);
-	
 	for (int i = 0; i < paramsNum && i < FORWARD_MAX_PARAMS; ++i)
 	{
 		if (g_forwards.getParamType(id, i) == FP_FLOAT)
@@ -622,9 +538,7 @@ cell executeForwards(int id, ...)
 		else
 			params[i] = (cell)va_arg(argptr, cell);
 	}
-	
 	va_end(argptr);
-	
 	return g_forwards.executeForwards(id, params);
 }
 
@@ -632,16 +546,13 @@ cell CForwardMngr::prepareArray(void *ptr, unsigned int size, ForwardArrayElemTy
 {
 	if (m_TmpArraysNum >= FORWARD_MAX_PARAMS)
 	{
-#ifdef MEMORY_TEST
+		#ifdef MEMORY_TEST
 		m_validateAllAllocUnits();
-#endif // MEMORY_TEST
+		#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;

amxmodx/CForward.h

@@ -46,9 +46,6 @@
 #ifndef FORWARD_H
 #define FORWARD_H
 
-#include <stdarg.h>
-#include "sh_stack.h"
-
 const int FORWARD_MAX_PARAMS = 32;
 
 enum ForwardExecType
@@ -80,9 +77,7 @@ enum ForwardArrayElemType
 struct ForwardPreparedArray
 {
 	void *ptr;
-	
 	ForwardArrayElemType type;
-	
 	unsigned int size;
 	bool copyBack;
 };
@@ -93,39 +88,31 @@ 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'
+	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];
 	}
 };
@@ -135,13 +122,10 @@ 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:
@@ -150,22 +134,18 @@ public:
 	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];
 	}
 };
@@ -174,7 +154,7 @@ class CForwardMngr
 {
 	typedef CVector<CForward*> ForwardVec;
 	typedef CVector<CSPForward*> SPForwardVec;
-	typedef CStack<int> FreeSPVec;							// Free SP Forwards
+	typedef CQueue<int> FreeSPVec;					// Free SP Forwards
 
 	ForwardVec m_Forwards;
 
@@ -187,7 +167,8 @@ public:
 
 	CForwardMngr()
 	{ m_TmpArraysNum = 0; }
-	~CForwardMngr() {}
+	~CForwardMngr()
+	{ }
 
 	// Interface
 	// Register normal forward
@@ -195,28 +176,23 @@ public:
 	// Register single plugin forward
 	int registerSPForward(const char *funcName, AMX *amx, int numParams, const ForwardParam * paramTypes);
 	int registerSPForward(int func, AMX *amx, int numParams, const ForwardParam * paramTypes);
-	
 	// Unregister single plugin forward
 	void unregisterSPForward(int id);
-	
 	// execute forward
 	cell executeForwards(int id, cell *params);
 	void clear();		// delete all forwards
-	
 	bool isIdValid(int id) const;			// check whether forward id is valid
 	bool isSPForward(int id) const;			// check whether forward is single plugin
 	int getParamsNum(int id) const;			// get num of params of a forward
 	int getFuncsNum(int id) const;			// get num of found functions of a forward
-	
 	ForwardParam getParamType(int id, int paramId) const;
-	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack);		// prepare array
+	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type,
+		bool copyBack);		// prepare array
 };
 
 // (un)register forward
 int registerForward(const char *funcName, ForwardExecType et, ...);
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num);
 int 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);
 
@@ -226,4 +202,5 @@ cell executeForwards(int id, ...);
 cell prepareCellArray(cell *ptr, unsigned int size, bool copyBack = false);
 cell prepareCharArray(char *ptr, unsigned int size, bool copyBack = false);
 
-#endif //FORWARD_H
+#endif
+

amxmodx/CLang.h

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

amxmodx/CList.h

@@ -35,7 +35,6 @@
 // *****************************************************
 // class CList
 // *****************************************************
-
 // Linked list
 template <typename T, typename F = char* >
 class CList
@@ -66,10 +65,8 @@ private:
 		~CElement()
 		{
 			delete m_pObject;
-			
 			if (m_pNext)
 				m_pNext->m_pPrev = m_pPrev;
-			
 			if (m_pPrev)
 				m_pPrev->m_pNext = m_pNext;
 		}
@@ -105,16 +102,15 @@ private:
 		}
 	};
 
-	// CList<T, F> class
+	// 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
 	{
-		friend class CList<T, F>;
+		friend class CList<T,F>;
-		
+		CList<T,F> *m_pList;			// The list that created this iterator
-		CList<T, F> *m_pList;			// The list that created this iterator
 		CElement *m_CurPos;				// Current position in the list
 	public:
 		iterator()
@@ -124,7 +120,7 @@ public:
 		}
 
 		// constructor based on list, element
-		iterator(CList<T, F> *pList, CElement *startPos)
+		iterator(CList<T,F> *pList, CElement *startPos)
 		{
 			m_pList = pList;
 			m_CurPos = startPos;
@@ -151,7 +147,7 @@ public:
 		// validity check operator
 		inline operator bool () const
 		{
-			return m_pList != NULL && m_CurPos != NULL && m_CurPos->GetObj() != NULL;
+			return m_pList!=NULL && m_CurPos!=NULL && m_CurPos->GetObj()!=NULL;
 		}
 
 		// pre increment operator
@@ -166,7 +162,6 @@ public:
 		{
 			iterator tmp(*this);
 			m_CurPos = m_CurPos->next;
-			
 			return tmp;
 		}
 
@@ -181,20 +176,18 @@ public:
 		{
 			return m_pList->remove(*this);
 		}
-		
 		iterator put(T *obj)
 		{
 			return m_pList->put(obj, *this);
 		}
 	};
 
-	CList<T, F>()
+	CList<T,F>()
 	{
 		m_pHead = NULL;
 		m_pTail = NULL;
 	}
-	
+	~CList<T,F>()
-	~CList<T, F>()
 	{
 		clear();
 	}
@@ -205,16 +198,12 @@ public:
 	iterator remove(iterator &where)
 	{
 		iterator tmp(where.GetNext());
-		
 		if (where.m_CurPos == m_pHead)
 			m_pHead = where.m_CurPos->GetNext();
-		
 		if (where.m_CurPos == m_pTail)
 			m_pTail = where.m_CurPos->GetPrev();
-		
 		delete where.m_CurPos;
 		where = tmp;
-		
 		return tmp;
 	}
 
@@ -223,36 +212,36 @@ public:
 	iterator put_back(T *pObj)
 	{
 		CElement *pTmp = new CElement(pObj);
-		
 		if (!m_pHead)
 		{
 			m_pHead = pTmp;
 			m_pTail = pTmp;
-		} else {
+		}
+		else
+		{
 			pTmp->SetNext(NULL);
 			pTmp->SetPrev(m_pTail);
 			m_pTail->SetNext(pTmp);
 			m_pTail = pTmp;
 		}
-		
 		return iterator(this, pTmp);
 	}
 
 	iterator put_front(T *pObj)
 	{
 		CElement *pTmp = new CElement(pObj);
-		
 		if (!m_pHead)
 		{
 			m_pHead = pTmp;
 			m_pTail = pTmp;
-		} else {
+		}
+		else
+		{
 			pTmp->SetNext(m_pHead);
 			pTmp->SetPrev(NULL);
 			m_pHead->SetPrev(pTmp);
 			m_pHead = pTmp;
 		}
-		
 		return iterator(this, pTmp);
 	}
 
@@ -268,7 +257,6 @@ public:
 	iterator put(T *pObj, iterator &where)
 	{
 		CElement *pTmp = new CElement(pObj);
-		
 		if (where.m_CurPos->GetNext())
 			where.m_CurPos->GetNext()->SetPrev(pTmp);
 		else		// where = tail
@@ -278,7 +266,6 @@ public:
 		pTmp->SetNext(where.m_CurPos->GetNext());
 
 		where.m_CurPos->SetNext(pTmp);
-		
 		return ++where;
 	}
 
@@ -296,13 +283,12 @@ public:
 	iterator find(iterator startOn, const F &desc)
 	{
 		iterator iter = startOn;
-		while (iter)
+		while(iter)
 		{
 			if (*iter == desc)
 				break;
 			++iter;
 		}
-		
 		return iter;
 	}
 
@@ -314,16 +300,14 @@ public:
 	int size()
 	{
 		iterator iter = begin();
-		int i = 0;
+		int i=0;
-		
 		while (iter)
 		{
 			++i;
 			++iter;
 		}
-		
 		return i;
 	}
 };
+#endif
 
-#endif //CLIST_H

amxmodx/CLogEvent.cpp

@@ -35,192 +35,135 @@
 // *****************************************************
 // 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.c_str() ) ? 0 : 1;
-	if (in)
-		return result = strstr(string, text.c_str()) ? 0 : 1;
-	
   return result = strcmp(string,text.c_str());
 }
 
-LogEventsMngr::CLogCmp* LogEventsMngr::registerCondition(char* filter)
+LogEventsMngr::CLogCmp* LogEventsMngr::registerCondition(char* filter){
-{
 	char* temp = filter;
 	// expand "1=message"
-
+    while ( isdigit(*filter) )
-	while (isdigit(*filter))
 		++filter;
-
     bool in = (*filter=='&');
     *filter++ = 0;
     int pos = atoi(temp);
-	
+	if ( pos < 0 || pos >= MAX_LOGARGS) pos = 0;
-	if (pos < 0 || pos >= MAX_LOGARGS)
-		pos = 0;
-	
 	CLogCmp* c = logcmplist;
-	
+	while( c ) {
-	while (c)
+		if ( (c->pos==pos) && (c->in==in) && !strcmp(c->text.c_str(), filter))
-	{
-		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()
 {
     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;
 		}
@@ -232,87 +175,64 @@ void LogEventsMngr::executeLogEvents()
     }
 }
 
-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,104 @@ 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;
 		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;
-		
     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:
 	inline CPluginMngr::CPlugin *getPlugin() { return plugin; }
-		void registerFilter(char* filter);
+	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;
-	
   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

@@ -35,8 +35,7 @@
 // *****************************************************
 // class MenuMngr
 // *****************************************************
-MenuMngr::MenuCommand::MenuCommand(CPluginMngr::CPlugin *a, int mi, int k, int f)
+MenuMngr::MenuCommand::MenuCommand( CPluginMngr::CPlugin *a, int mi, int k, int f ) {
-{
 	plugin = a;
 	keys = k;
 	menuid = mi;
@@ -47,80 +46,32 @@ 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 ( (!amx || !b->amx || amx == b->amx) && strstr(name,b->name.c_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 clear();
 
-	class iterator
+	class iterator {
-	{
 		MenuCommand* a;
 	public:
 		iterator(MenuCommand*aa) : a(aa) {}
@@ -98,9 +96,8 @@ public:
 		operator bool () const { return a ? true : false; }
 		MenuCommand& operator*() { return *a; }
 	};
-	
 	inline iterator begin() const { return iterator(headcmd); }
 	inline iterator end() const { return iterator(0); }
 };
 
-#endif //MENUS_H
+#endif

amxmodx/CMisc.cpp

@@ -29,12 +29,11 @@
 *  version.
 */
 #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 +48,6 @@ void CPlayer::Init(edict_t* e, int i)
 	aiming = 0;
 	menu = 0;
 	keys = 0;
-	menuexpire = 0.0;
-	newmenu = -1;
 	
 	death_weapon.clear();
 	name.clear();
@@ -58,107 +55,46 @@ 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()
-{
-	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 +103,34 @@ 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.c_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 ( !stricmp(a->name.c_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.c_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,38 @@
 #define CMISC_H
 
 #include "CList.h"
-#include "sh_list.h"
 
 // *****************************************************
 // class CCVar
 // *****************************************************
-
 class CCVar
 {
     cvar_t cvar;
     String name;
     String plugin;
-
 public:	
-	CCVar(const char* pname, const char* pplugin, int pflags, float pvalue) : name(pname), plugin(pplugin)
+    CCVar( const char* pname, const char* pplugin, 
-	{
+		int pflags, float pvalue ) : name(pname) , plugin(pplugin ) {
 		cvar.name = (char*)name.c_str();
 		cvar.flags = pflags;
 		cvar.string = "";
 		cvar.value = pvalue;
     }
-	
 	inline cvar_t* getCvar() { return &cvar; }
 	inline const char* getPluginName() { return plugin.c_str(); }
 	inline const char* getName() { return name.c_str(); }
-	inline bool operator == (const char* string) { return (strcmp(name.c_str(), string) == 0); }
+	inline bool operator == ( const char* string ) { return (strcmp(name.c_str(),string)==0); }
 };
 
+
+
 // *****************************************************
 // class CPlayer
 // *****************************************************
 
-struct ClientCvarQuery_Info
-{
-	int resultFwd;
-	int requestId;
-	int paramLen;
-	cell *params;
-};
-
 class CPlayer 
 {
+	
 public:
 	edict_t* pEdict;
 	
@@ -85,14 +76,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];
@@ -114,35 +102,25 @@ public:
 	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(){
-
+		return ((pEdict->v.flags & FL_FAKECLIENT)?true:false);
-	inline bool IsBot()
-	{
-		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
-{
     String filename;
     FORCE_TYPE type;
     Vector mins;
     Vector maxs;
     AMX* amx;
 public:
-	ForceObject(const char* n, FORCE_TYPE c, Vector& mi, Vector& ma, AMX* a) : filename(n), type(c), mins(mi), maxs(ma), amx(a) {}
+    ForceObject(const char* n, FORCE_TYPE c,Vector& mi, Vector& ma, AMX* a) :
-
+    filename(n) , type(c), mins(mi), maxs(ma), amx(a) {}
 	inline const char* getFilename() { return filename.c_str(); }
 	inline AMX* getAMX() { return amx; }
-	
 	Vector& getMin() { return mins; }
 	Vector& getMax() { return maxs; }
-	
 	inline FORCE_TYPE getForceType() { return type; }
 };
 
@@ -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 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

@@ -32,7 +32,7 @@
 #include "amxmodx.h"
 
 #ifndef FAR
-	#define FAR
+#define FAR
 #endif
 
 // New
@@ -55,7 +55,7 @@ CModule::CModule(const char* fname)
 CModule::~CModule()
 {
 	// old & new
-	if (m_Handle)
+	if ( m_Handle )
 		DLFREE(m_Handle);
 
 	clear();
@@ -67,7 +67,6 @@ void CModule::clear(bool clearFilename)
 	m_Metamod = false;
 	m_Handle = NULL;
 	m_Status = MODULE_NONE;
-	
 	if (clearFilename)
 		m_Filename.assign("unknown");
 
@@ -115,7 +114,6 @@ bool CModule::attachModule()
 
 		if (!AttachFunc_New)
 			return false;
-		
 		g_ModuleCallReason = ModuleCall_Attach;
 		g_CurrentlyCalledModule = this;
 		int retVal = (*AttachFunc_New)(Module_ReqFnptr);
@@ -165,7 +163,6 @@ bool CModule::queryModule()
 
 	// Try new interface first
 	QUERYMOD_NEW queryFunc_New = (QUERYMOD_NEW)DLPROC(m_Handle, "AMXX_Query");
-	
 	if (queryFunc_New)
 	{
 		m_Amxx = true;
@@ -175,7 +172,6 @@ bool CModule::queryModule()
 		int retVal = (*queryFunc_New)(&ifVers, &m_InfoNew);
 		g_CurrentlyCalledModule = NULL;
 		g_ModuleCallReason = ModuleCall_NotCalled;
-		
 		switch (retVal)
 		{
 		case AMXX_PARAM:
@@ -205,7 +201,9 @@ bool CModule::queryModule()
 
 		m_Status = MODULE_QUERY;
 		return true;
-	} else {
+	}
+	else
+	{
 		m_Status = MODULE_NOQUERY;
 		m_Amxx = false;
 		return false;
@@ -220,7 +218,6 @@ bool CModule::detachModule()
 	if (m_Amxx)
 	{
 		DETACHMOD_NEW detachFunc_New = (DETACHMOD_NEW)DLPROC(m_Handle, "AMXX_Detach");
-		
 		if (detachFunc_New)
 		{
 			g_ModuleCallReason = ModuleCall_Detach;
@@ -230,17 +227,14 @@ bool CModule::detachModule()
 			g_ModuleCallReason = ModuleCall_NotCalled;
 		}
 	}
-
 #ifndef FAKEMETA
 	if (IsMetamod())
 	{
 		UnloadMetamodPlugin(m_Handle);
 	}
 #endif
-	
 	DLFREE(m_Handle);
 	clear();
-	
 	return true;
 }
 
@@ -253,16 +247,14 @@ void CModule::CallPluginsLoaded()
 		return;
 
 	PLUGINSLOADED_NEW func = (PLUGINSLOADED_NEW)DLPROC(m_Handle, "AMXX_PluginsLoaded");
-	
 	if (!func)
 		return;
-	
 	func();
 }
 
 const char* CModule::getStatus() const
 {
-	switch (m_Status)
+	switch(m_Status)
 	{
 	case MODULE_NONE:		return "error";
 	case MODULE_QUERY:		return "pending";
@@ -278,6 +270,5 @@ const char* CModule::getStatus() const
 	case MODULE_NOT64BIT:	return "not 64bit";
 	default:		break;
 	}
-	
 	return "unknown";
 }

amxmodx/CModule.h

@@ -36,8 +36,7 @@
 #ifndef CMODULE_H
 #define CMODULE_H
 
-enum MODULE_STATUS
+enum MODULE_STATUS {
-{
   MODULE_NONE,				// No module loaded
   MODULE_QUERY,				// Query failed
   MODULE_BADLOAD,			// Bad file or the module writer messed something up ;]
@@ -61,6 +60,7 @@ struct amxx_module_info_s
 	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 */
@@ -71,10 +71,8 @@ struct amxx_module_info_s
 class CModule 
 {
 	String m_Filename;				// Filename
-	
 	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
@@ -86,15 +84,12 @@ public:
 	~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* getAuthor() const { return m_InfoNew.author; }
@@ -102,16 +97,18 @@ public:
 	inline const char* getName() const { return m_InfoNew.name; }
 	inline const amxx_module_info_s* getInfoNew() const { return &m_InfoNew; }	// new
 	inline int getStatusValue() { return m_Status; }
-	inline bool operator==(const char* fname) { return !strcmp(m_Filename.c_str(), fname); }
+	inline bool operator==( const char* fname ) { return !strcmp( m_Filename.c_str() , fname );  }
 	inline bool isReloadable() { return ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)); }
 	inline bool isAmxx() const { return m_Amxx; }
 	inline const char *getMissingFunc() const { return m_MissingFunc; }
 	inline const char *getFilename() { return m_Filename.c_str(); }
 	inline bool IsMetamod() { return m_Metamod; }
-	
+	void CModule::CallPluginsLoaded();
-	void CallPluginsLoaded();
 
 	CList<AMX_NATIVE_INFO*> m_Natives;
 };
 
-#endif //CMODULE_H
+#endif
+
+
+

amxmodx/CPlugin.cpp

@@ -35,24 +35,17 @@
 #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, int debug)
+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, debug);
-		a = &(*a)->next;
-	
-	*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;
@@ -63,10 +56,9 @@ void CPluginMngr::Finalize()
 {
 	if (m_Finalized)
 		return;
-	
 	pNatives = BuildNativeTable();
-	CPlugin *a = head;
 
+	CPlugin *a = head;
 	while (a)
 	{
 		if (a->getStatusCode() == ps_running)
@@ -74,20 +66,19 @@ void CPluginMngr::Finalize()
 			amx_Register(a->getAMX(), pNatives, -1);
 			a->Finalize();
 		}
-		a = a->next;
+		a=a->next;
 	}
-	
 	m_Finalized = true;
 }
 
-int CPluginMngr::loadPluginsFromFile(const char* filename)
+int  CPluginMngr::loadPluginsFromFile( const char* filename )
 {
 	char file[256];
-	FILE *fp = fopen(build_pathname_r(file, sizeof(file) - 1, "%s", filename), "rt");
+	FILE *fp = fopen(build_pathname_r(file, sizeof(file)-1, "%s",filename) , "rt");
 
-	if (!fp) 
+	if ( !fp ) 
 	{
-		AMXXLOG_Log("[AMXX] Plugins list not found (file \"%s\")", filename);
+		AMXXLOG_Log( "[AMXX] Plugins list not found (file \"%s\")",filename);
 		return 1;
 	}
 	
@@ -98,26 +89,22 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 	
 	String line;
 
-	while (!feof(fp)) 
+	while ( !feof(fp) ) 
 	{
 		pluginName[0] = '\0';
-		
 		debug[0] = '\0';
 		debugFlag = 0;
-		
 		line.clear();
 		line._fread(fp);
-		sscanf(line.c_str(), "%s %s", pluginName, debug);
+		sscanf(line.c_str(),"%s %s",pluginName, debug);
-		
+		if (!isalnum(*pluginName))  continue;
-		if (!isalnum(*pluginName))
-			continue;
 
 		if (isalnum(*debug) && strcmp(debug, "debug") == 0)
 		{
 			debugFlag = 1;
 		}
 
-		CPlugin* plugin = loadPlugin(pluginsDir, pluginName, error, debugFlag);
+		CPlugin* plugin = loadPlugin( pluginsDir , pluginName  , error,  debugFlag);
 		
 		if (plugin->getStatusCode() == ps_bad_load)
 		{
@@ -133,15 +120,11 @@ int CPluginMngr::loadPluginsFromFile(const char* filename)
 	return pCounter;
 }
 
-void CPluginMngr::clear()
+void CPluginMngr::clear() {
-{
 	CPlugin**a = &head;	
-	
+	while ( *a )
-	while (*a)
 		unloadPlugin(a);
-	
 	m_Finalized = false;
-	
 	if (pNatives)
 	{
 		delete [] pNatives;
@@ -149,48 +132,37 @@ void CPluginMngr::clear()
 	}
 }
 
-CPluginMngr::CPlugin* CPluginMngr::findPlugin(AMX *amx)
+CPluginMngr::CPlugin* CPluginMngr::findPluginFast(AMX *amx) 
 { 
+	return (CPlugin*)(amx->userdata[3]); 
+}
+
+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.c_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: 
 			{
 					if (m_Debug)
@@ -206,41 +178,33 @@ const char* CPluginMngr::CPlugin::getStatus() const
 	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, int d) : name(n), title(n) {
-{
 	const char* unk = "unknown";
-	
 	title.assign(unk);
 	author.assign(unk);
 	version.assign(unk);
-	
 	char file[256];
-	char* path = build_pathname_r(file, sizeof(file) - 1, "%s/%s", p, n);
+	char* path = build_pathname_r(file, sizeof(file)-1, "%s/%s",p,n);
 	code = 0;
 	memset(&amx, 0, sizeof(AMX));
-	int err = load_amxscript(&amx, &code, path, e, d);
+	int err = load_amxscript(&amx,&code,path,e, d);
-	
+	if ( err == AMX_ERR_NONE )
-	if (err == AMX_ERR_NONE)
 	{
 		status = ps_running;
 	} else {
 		status = ps_bad_load;
 	}
-	
+	amx.userdata[3] = this;
-	amx.userdata[UD_FINDPLUGIN] = this;
 	paused_fun = 0;
 	next = 0;
 	id = i;
-	
 	if (status == ps_running)
 	{
 		m_PauseFwd = registerSPForwardByName(&amx, "plugin_pause");
 		m_UnpauseFwd = registerSPForwardByName(&amx, "plugin_unpause");
-		
 		if (amx.flags & AMX_FLAG_DEBUG)
 		{
 			m_Debug = true;
@@ -250,109 +214,45 @@ CPluginMngr::CPlugin::CPlugin(int i, const char* p, const char* n, char* e, int
 	}
 }
 
-CPluginMngr::CPlugin::~CPlugin()
+CPluginMngr::CPlugin::~CPlugin( )
 {
-	unload_amxscript(&amx, &code);
+	unload_amxscript( &amx, &code );
-}
-
-int AMXAPI native_handler(AMX *amx, int index)
-{
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	char name[sNAMEMAX + 1];
-	amx_GetNative(amx, index, name);
-
-	return pHandler->HandleNative(name, index, 0);
-}
-
-static cell AMX_NATIVE_CALL invalid_native(AMX *amx, cell *params)
-{
-	//A script has accidentally called an invalid native! give them a
-	// first chance to block the resulting error.
-
-	Handler *pHandler = (Handler *)amx->userdata[UD_HANDLER];
-
-	//this should never happen
-	if (!pHandler)
-	{
-		LogError(amx, AMX_ERR_INVNATIVE, "Invalid native attempt");
-		return 0;
-	}
-
-	//this should never happen because this native won't be called
-	// if the plugin isn't filtering.
-	if (!pHandler->IsNativeFiltering())
-	{
-		LogError(amx, AMX_ERR_INVNATIVE, "Invalid native attempt");
-		return 0;
-	}
-
-	char name[sNAMEMAX + 1];
-	int native = (int)(_INT_PTR)(amx->usertags[UT_NATIVE]);
-	int err = amx_GetNative(amx, native, name);
-
-	if (err != AMX_ERR_NONE)
-		name[0] = '\0';
-
-	//1 - because we're trapping usage
-	if (!pHandler->HandleNative(name, native, 1))
-	{
-		amx->usertags[UT_NATIVE] = (void *)native;
-		LogError(amx, AMX_ERR_INVNATIVE, NULL);
-		return 0;
-	}
-
-	//Someday maybe allow native filters to write their own return value?
-	return 0;
 }
 
 void CPluginMngr::CPlugin::Finalize()
 {
 	char buffer[128];
-	int old_status = status;
 
+	int old_status = status;
 	if (CheckModules(&amx, buffer))
 	{
-		if (amx_Register(&amx, core_Natives, -1) != AMX_ERR_NONE)
+		if ( amx_Register(&amx, core_Natives, -1) != AMX_ERR_NONE )
-		{
-			Handler *pHandler = (Handler *)amx.userdata[UD_HANDLER];
-			int res = 0;
-			
-			if (pHandler->IsNativeFiltering())
-				res = amx_CheckNatives(&amx, native_handler);
-			
-			if (!res)
 		{
 			status = ps_bad_load;
 			sprintf(buffer, "Plugin uses an unknown function (name \"%s\") - check your modules.ini.", no_function);
 			errorMsg.assign(buffer);
 			amx.error = AMX_ERR_NOTFOUND;
-			} else {
-				amx_RegisterToAny(&amx, invalid_native);
-			}
 		}
 	} else {
 		status = ps_bad_load;
 		errorMsg.assign(buffer);
 		amx.error = AMX_ERR_NOTFOUND;
 	}
-	
 	if (old_status != status)
 	{
 		AMXXLOG_Log("[AMXX] Plugin \"%s\" failed to load: %s", name.c_str(), errorMsg.c_str());
 	}
 }
 
-void CPluginMngr::CPlugin::pauseFunction(int id)
+void CPluginMngr::CPlugin::pauseFunction( int id )
 { 
 }
 
-void CPluginMngr::CPlugin::unpauseFunction(int id)
+void CPluginMngr::CPlugin::unpauseFunction( int id )
 {
 }
 
-void CPluginMngr::CPlugin::setStatus(int a)
+void CPluginMngr::CPlugin::setStatus( int a   ) { 
-{ 
 	status = a; 
 	g_commands.clearBufforedInfo(); // ugly way
 }
@@ -376,8 +276,8 @@ void CPluginMngr::CPlugin::unpausePlugin()
 	if (isValid())
 	{
 		// set status first so the function will be marked executable
-		setStatus(ps_running);
 
+		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,25 +59,23 @@ public:
 	
 		AMX amx;
 		void* code;
-		
 		String name;
 		String version;
 		String title;
 		String author;
 		String errorMsg;
-		
 		int m_PauseFwd;
 		int m_UnpauseFwd;
 		int paused_fun;
 		int status;
 		CPlugin* next;
 		int id;
-		
+		CPlugin(int i , const char* p,const char* n, char* e, int d);
-		CPlugin(int i, const char* p, const char* n, char* e, int d);
+		~CPlugin( );
-		~CPlugin();
-		
 		bool m_Debug;
+
 	public:
+
 		inline const char* getName() { return name.c_str();}
 		inline const char* getVersion() { return version.c_str();}
 		inline const char* getTitle() { return title.c_str();}
@@ -87,21 +85,20 @@ public:
 		inline int getId() const { return id; }
 		inline AMX* getAMX() { return &amx; }
 		inline const AMX* getAMX() const { return &amx; }
-		inline void setTitle(const char* n) { title.assign(n); }
+		inline void setTitle( const char* n ) { title.assign(n); }
-		inline void setAuthor(const char* n) { author.assign(n); }
+		inline void setAuthor( const char* n ) { author.assign(n); }
-		inline void setVersion(const char* n) { version.assign(n); }
+		inline void setVersion( const char* n ) { version.assign(n); }
-		inline void setError(const char* n) { errorMsg.assign(n); }
+		inline void setError( const char* n ) { errorMsg.assign(n); }
-		inline bool isValid() const { return (status >= ps_paused); }
+		inline bool isValid() const { return ((status == ps_running || status == ps_paused)); }
-		inline bool isPaused() const { return ((status == ps_paused) || (status == ps_stopped)); }
+		inline bool isPaused() const { return ( (status == ps_paused) ); }
+		//inline bool isFunctionPaused( int id ) const { return (paused_fun & (1<<id)) ? true : false; 	}
 		inline bool isExecutable(int id) const { return (isValid() && !isPaused());	}
-		
 		void Finalize();
 		void pausePlugin();
 		void unpausePlugin();
-		void pauseFunction(int id);
+		void pauseFunction( int id );
-		void unpauseFunction(int id);
+		void unpauseFunction( int id );
-		void setStatus(int a);
+		void setStatus( int a   );
-		
 		const char* getStatus() const;
 		inline bool isDebug() const { return m_Debug; }
 	}; 
@@ -109,6 +106,8 @@ public:
 private:	
 	CPlugin *head;
 	int pCounter;
+
+
 public:
 	CPluginMngr() { head = 0; pCounter = 0; pNatives = NULL; m_Finalized=false;}
 	~CPluginMngr() { clear(); }
@@ -119,20 +118,17 @@ public:
 	// Interface
 
 	CPlugin* loadPlugin(const char* path, const char* name, char* error, int debug);
-	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 +138,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

@@ -45,17 +45,14 @@ public:
 			item = i;
 			next = n;
 		}
-		
 		CQueueItem *GetNext()
 		{
 			return next;
 		}
-		
 		T & GetItem()
 		{
 			return item;
 		}
-		
 		void SetNext(CQueueItem *n)
 		{
 			next = n;
@@ -74,7 +71,7 @@ public:
 
 	bool empty()
 	{
-		return ((mSize == 0) ? true : false);
+		return ((mSize==0)?true:false);
 	}
 
 	void push(const T &v)
@@ -122,8 +119,8 @@ public:
 private:
 	CQueueItem *mFirst;
 	CQueueItem *mLast;
-	
 	unsigned int mSize;
 };
 
 #endif //_INCLUDE_CQUEUE_H
+

amxmodx/CStack.h

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

amxmodx/CString.h

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

amxmodx/CTask.cpp

@@ -33,7 +33,6 @@
 #include "CTask.h"
 
 /*********************** CTask ***********************/
-
 int CTaskMngr::CTask::getTaskId() const
 {
 	return m_iId;
@@ -44,7 +43,7 @@ CPluginMngr::CPlugin *CTaskMngr::CTask::getPlugin() const
 	return m_pPlugin;
 }
 
-void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
+void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime)
 {
 	clear();
 	m_bFree = false;
@@ -58,13 +57,10 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 	{
 		m_bLoop = true;
 		m_iRepeat = -1;
-	}
+	} else if (iFlags & 1) {
-	else if (iFlags & 1)
-	{
 		m_bLoop = true;
 		m_iRepeat = iRepeat;
 	}
-	
 	m_bAfterStart =	(iFlags & 4) ?  true : false;
 	m_bBeforeEnd =	(iFlags & 8) ?  true : false;
 
@@ -127,9 +123,8 @@ void CTaskMngr::CTask::resetNextExecTime(float fCurrentTime)
 
 void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft)
 {
-	bool execute = false;
+	bool execute=false;
-	bool done = false;
+	bool done=false;
-	
 	if (m_bAfterStart)
 	{
 		if (fCurrentTime - fTimeLeft + 1.0f >= m_fBase)
@@ -139,16 +134,14 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 	{
 		if (fTimeLimit != 0.0f && (fTimeLeft + fTimeLimit * 60.0f) - fCurrentTime - 1.0f <= m_fBase)
 			execute = true;
-	}
+	} else if (m_fNextExecTime <= fCurrentTime) {
-	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_bLoop && !m_iRepeat) )
 		{
 			if (m_iParamLen)	// call with parameters
 			{
@@ -206,7 +199,6 @@ CTaskMngr::CTask::~CTask()
 }
 
 /*********************** CTaskMngr ***********************/
-
 CTaskMngr::CTaskMngr()
 {
 	m_pTmr_CurrentTime = NULL;
@@ -226,22 +218,21 @@ void CTaskMngr::registerTimers(float *pCurrentTime, float *pTimeLimit, float *pT
 	m_pTmr_TimeLeft = pTimeLeft;
 }
 
-void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, cell iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
+void CTaskMngr::registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat)
 {
 	// first, search for free tasks
 	TaskListIter iter = m_Tasks.find(CTaskDescriptor(0, NULL, true));
-	
 	if (iter)
 	{
 		// found: reuse it
 		iter->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
-	} else {
+	}
+	else
+	{
 		// not found: make a new one
 		CTask *pTmp = new CTask;
-		
 		if (!pTmp)
 			return;
-		
 		pTmp->set(pPlugin, iFunc, iFlags, iId, fBase, iParamsLen, pParams, iRepeat, *m_pTmr_CurrentTime);
 		m_Tasks.put(pTmp);
 	}
@@ -251,15 +242,13 @@ int CTaskMngr::removeTasks(int iId, AMX *pAmx)
 {
 	CTaskDescriptor descriptor(iId, pAmx);
 	TaskListIter iter = m_Tasks.find(descriptor);
-	int i = 0;
+	int i=0;
-	
 	while (iter)
 	{
 			iter->clear();
 			++i;
 			iter = m_Tasks.find(++iter, descriptor);
 	}
-	
 	return i;
 }
 
@@ -267,8 +256,7 @@ int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase)
 {
 	CTaskDescriptor descriptor(iId, pAmx);
 	TaskListIter iter = m_Tasks.find(descriptor);
-	int i = 0;
+	int i=0;
-	
 	while (iter)
 	{
 			iter->changeBase(fNewBase);
@@ -276,7 +264,6 @@ int CTaskMngr::changeTasks(int iId, AMX *pAmx, float fNewBase)
 			++i;
 			iter = m_Tasks.find(++iter, descriptor);
 	}
-	
 	return i;
 }
 

amxmodx/CTask.h

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

amxmodx/CVault.cpp

@@ -39,47 +39,46 @@
 // *****************************************************
 // 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)->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.c_str(), n) == 0 )
 			return a;
 
 		a = &(*a)->next;
@@ -89,31 +88,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();
 }
 
 void Vault::clear()
 {
-	while (head)
+	while ( head )
 	{
 		Obj* a = head->next;
 		delete head;
@@ -121,57 +120,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);
 }
 
-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.c_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.c_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

@@ -70,58 +70,32 @@ template <class T> class CVector
 		// change size
 		if (size == m_Size)
 			return true;
-
-		if (!size)
-		{
-			if (m_Data)
-			{
-				delete [] m_Data;
-				m_Data = NULL;
-				m_Size = 0;
-			}
-			return true;
-		}
-
 		T *newData = new T[size];
 		if (!newData)
 			return false;
 		if (m_Data)
 		{
-			size_t end = (m_CurrentUsedSize < size) ? (m_CurrentUsedSize) : size;
+			size_t end = (m_Size < size) ? (m_Size) : size;
 			for (size_t i=0; i<end; i++)
 				newData[i] = m_Data[i];
 			delete [] m_Data;
 		}
+		if (m_Size < size)
+			m_CurrentSize = size;
 		m_Data = newData;
 		m_Size = size;
-		if (m_CurrentUsedSize > m_Size)
-			m_CurrentUsedSize = m_Size;
-
 		return true;
 	}
 
 	void FreeMemIfPossible()
 	{
-		if (!m_Data)
-			return;
 
-		if (!m_CurrentUsedSize)
-		{
-			ChangeSize(0);
-			return;
-		}
-
-		size_t newSize = m_Size;
-		while (m_CurrentUsedSize <= newSize / 2)
-			newSize /= 2;
-
-		if (newSize != m_Size)
-			ChangeSize(newSize);
 	}
 protected:
 	T *m_Data;
 	size_t m_Size;
 	size_t m_CurrentUsedSize;
+	size_t m_CurrentSize;
 public:
 	class iterator
 	{
@@ -215,7 +189,7 @@ public:
 
 		iterator & operator-=(size_t offset)
 		{
-			m_Ptr -= offset;
+			m_Ptr += offset;
 			return (*this);
 		}
 
@@ -229,7 +203,7 @@ public:
 		iterator operator-(size_t offset) const
 		{
 			iterator tmp(*this);
-			tmp.m_Ptr -= offset;
+			tmp.m_Ptr += offset;
 			return tmp;
 		}
 		
@@ -303,12 +277,12 @@ public:
 		return m_Size;
 	}
 
-	iterator begin() const
+	iterator begin()
 	{
 		return iterator(m_Data);
 	}
 
-	iterator end() const
+	iterator end()
 	{
 		return iterator(m_Data + m_CurrentUsedSize);
 	}
@@ -322,9 +296,7 @@ public:
 
 	bool reserve(size_t newSize)
 	{
-		if (newSize > m_Size)
 		return ChangeSize(newSize);
-		return true;
 	}
 
 	bool push_back(const T & elem)
@@ -345,15 +317,14 @@ public:
 		--m_CurrentUsedSize;
 		if (m_CurrentUsedSize < 0)
 			m_CurrentUsedSize = 0;
-
+		// :TODO: free memory sometimes
-		FreeMemIfPossible();
 	}
 
 	bool resize(size_t newSize)
 	{
 		if (!ChangeSize(newSize))
 			return false;
-		m_CurrentUsedSize = newSize;
+		FreeMemIfPossible();
 		return true;
 	}
 
@@ -426,13 +397,15 @@ public:
 		return m_Data[m_CurrentUsedSize - 1];
 	}
 
-	iterator insert(iterator where, const T & value)
+	bool insert(iterator where, const T & value)
 	{
+		// we have to insert before
+		// if it is begin, don't decrement
+		if (where != m_Data)
+			--where;
 		// validate iter
-		if (where < m_Data || where > (m_Data + m_CurrentUsedSize))
+		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
-			return iterator(0);
+			return false;
-
-		size_t ofs = where - begin();
 
 		++m_CurrentUsedSize;
 		if (!GrowIfNeeded())
@@ -441,50 +414,34 @@ public:
 			return false;
 		}
 
-		where = begin() + ofs;
+		memmove(where.base() + 1, where.base(), m_CurrentUsedSize - (where - m_Data));
-
+		memcpy(where.base(), &value, sizeof(T));
-		// Move subsequent entries
+		return true;
-		for (T *ptr = m_Data + m_CurrentUsedSize - 2; ptr >= where.base(); --ptr)
-			*(ptr + 1) = *ptr;
-
-		*where.base() = value;
-
-		return where;
 	}
 
-	iterator erase(iterator where)
+	void erase(iterator where)
 	{
 		// validate iter
 		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
-			return iterator(0);
+			return false;
-
-		size_t ofs = where - begin();
 
 		if (m_CurrentUsedSize > 1)
 		{
 			// move
-			T *theend = m_Data + m_CurrentUsedSize;
+			memmove(where.base(), where.base() + 1, m_CurrentUsedSize - 1);
-			for (T *ptr = where.base() + 1; ptr < theend; ++ptr)
-				*(ptr - 1) = *ptr;
 		}
 
 		--m_CurrentUsedSize;
-
+		// :TODO: free memory sometimes
-		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

@@ -6,7 +6,7 @@ MM_ROOT = ../metamod/metamod
 
 ### EDIT BELOW FOR OTHER PROJECTS ###
 
-OPT_FLAGS = -O2 -funroll-loops -s -fomit-frame-pointer -pipe
+OPT_FLAGS = -O3 -funroll-loops -s -pipe
 DEBUG_FLAGS = -g -ggdb3
 CPP = gcc
 NAME = amxmodx_mm
@@ -15,10 +15,9 @@ OBJECTS = meta_api.cpp CFile.cpp CVault.cpp vault.cpp float.cpp file.cpp modules
 	CMisc.cpp CTask.cpp string.cpp amxmodx.cpp CEvent.cpp CCmd.cpp CLogEvent.cpp \
 	srvcmd.cpp strptime.cpp amxcore.cpp amxtime.cpp power.cpp amxxlog.cpp fakemeta.cpp \
 	amxxfile.cpp CLang.cpp md5.cpp emsg.cpp CForward.cpp CPlugin.cpp CModule.cpp \
-	CMenu.cpp util.cpp amx.cpp amxdbg.cpp natives.cpp newmenus.cpp debugger.cpp \
+	CMenu.cpp util.cpp amx.cpp amxdbg.cpp natives.cpp newmenus.cpp 
-	optimizer.cpp format.cpp
 
-LINK = -lz /lib/libstdc++.a
+LINK = -lz 
 
 INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
 	-I$(MM_ROOT) -Lzlib -I$(HLSDK)/common
@@ -40,14 +39,13 @@ CFLAGS += -DLINUX -DNDEBUG -fPIC -Wno-deprecated -DHAVE_STDINT_H -static-libgcc
 
 ifeq "$(AMD64)" "true"
 	BINARY = $(NAME)_amd64.so
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -DAMD64 -m64 
+	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 
 	OBJECTS += JIT/natives-amd64.o
 else
 	BINARY = $(NAME)_i386.so
 	OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o
-	OBJECTS += JIT/helpers-x86.o
 	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
-	OPT_FLAGS += -march=i586
+	OPT_FLAGS += -march=i686
 endif
 
 OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)

amxmodx/amx.cpp

@@ -46,7 +46,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>
 #include "osdefs.h"
 #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
   #include <sclinux.h>
@@ -266,13 +265,6 @@ typedef enum {
   OP_SYSREQ_D,
   OP_SYMTAG,  /* obsolete */
   OP_BREAK,
-  OP_FLOAT_MUL,
-  OP_FLOAT_DIV,
-  OP_FLOAT_ADD,
-  OP_FLOAT_SUB,
-  OP_FLOAT_TO,
-  OP_FLOAT_ROUND,
-  OP_FLOAT_CMP,
   /* ----- */
   OP_NUM_OPCODES
 } OPCODE;
@@ -433,7 +425,10 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
   AMX_FUNCSTUB *func;
   AMX_NATIVE f;
 
+  assert(amx!=NULL);
   hdr=(AMX_HEADER *)amx->base;
+  assert(hdr!=NULL);
+  assert(hdr->magic==AMX_MAGIC);
   assert(hdr->natives<=hdr->libraries);
 #if defined AMX_NATIVETABLE
   if (index<NULL) {
@@ -449,10 +444,34 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
 #endif
   assert(f!=NULL);
 
-  /* As of AMX Mod X 1.56, we don't patch sysreq.c to sysreq.d anymore.
+  /* Now that we have found the function, patch the program so that any
-   * Otherwise, we'd have no way of knowing the last native to be used.
+   * subsequent call will call the function directly (bypassing this
+   * callback).
+   * This trick cannot work in the JIT, because the program would need to
+   * be re-JIT-compiled after patching a P-code instruction.
    */
-  amx->usertags[UT_NATIVE] = (void *)index;
+  #if defined JIT && !defined NDEBUG
+    if ((amx->flags & AMX_FLAG_JITC)!=0)
+      assert(amx->sysreq_d==0);
+  #endif
+  if (amx->sysreq_d!=0) {
+    /* at the point of the call, the CIP pseudo-register points directly
+     * behind the SYSREQ instruction and its parameter.
+     */
+    unsigned char *code=amx->base+(int)hdr->cod+(int)amx->cip-4;
+    assert(amx->cip >= 4 && amx->cip < (hdr->dat - hdr->cod));
+    assert(sizeof(f)<=sizeof(cell));    /* function pointer must fit in a cell */
+#if defined __GNUC__ || defined ASM32
+    if (*(cell*)code==index) {
+#else
+    if (*(cell*)code!=OP_SYSREQ_PRI) {
+      assert(*(cell*)(code-sizeof(cell))==OP_SYSREQ_C);
+      assert(*(cell*)code==index);
+#endif
+      *(cell*)(code-sizeof(cell))=amx->sysreq_d;
+      *(cell*)code=(cell)f;
+    } /* if */
+  } /* if */
 
   /* Note:
    *   params[0] == number of bytes for the additional parameters passed to the native function
@@ -461,25 +480,7 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
    */
 
   amx->error=AMX_ERR_NONE;
-
-#if defined BINLOG_ENABLED
-  binlogfuncs_t *logfuncs = (binlogfuncs_t *)amx->usertags[UT_BINLOGS];
-  if (logfuncs)
-  {
-	  logfuncs->pfnLogNative(amx, index, (int)(params[0] / sizeof(cell)));
-	  logfuncs->pfnLogParams(amx, params);
-  }
-#endif //BINLOG_ENABLED
-
   *result = f(amx,params);
-
-#if defined BINLOG_ENABLED
-  if (logfuncs)
-  {
-	  logfuncs->pfnLogReturn(amx, *result);
-  }
-#endif
-
   return amx->error;
 }
 #endif /* defined AMX_INIT */
@@ -511,7 +512,6 @@ static int amx_BrowseRelocate(AMX *amx)
   cell cip;
   long codesize;
   OPCODE op;
-  BROWSEHOOK hook = NULL;
   #if defined __GNUC__ || defined ASM32 || defined JIT
     cell *opcode_list;
   #endif
@@ -527,7 +527,6 @@ static int amx_BrowseRelocate(AMX *amx)
   code=amx->base+(int)hdr->cod;
   codesize=hdr->dat - hdr->cod;
   amx->flags|=AMX_FLAG_BROWSE;
-  hook = (BROWSEHOOK)amx->usertags[UT_BROWSEHOOK];
 
   /* sanity checks */
   assert(OP_PUSH_PRI==36);
@@ -548,7 +547,6 @@ static int amx_BrowseRelocate(AMX *amx)
      */
     if ((amx->flags & AMX_FLAG_JITC)==0 && sizeof(AMX_NATIVE)<=sizeof(cell))
       amx->sysreq_d=opcode_list[OP_SYSREQ_D];
-	amx->userdata[UD_OPCODELIST] = (void *)opcode_list;
   #else
     /* ANSI C
      * to use direct system requests, a function pointer must fit in a cell;
@@ -556,7 +554,6 @@ static int amx_BrowseRelocate(AMX *amx)
      */
     if (sizeof(AMX_NATIVE)<=sizeof(cell))
       amx->sysreq_d=OP_SYSREQ_D;
-	amx->userdata[UD_OPCODELIST] = (long)NULL;
   #endif
 
   /* start browsing code */
@@ -633,22 +630,11 @@ static int amx_BrowseRelocate(AMX *amx)
     case OP_FILL:
     case OP_HALT:
     case OP_BOUNDS:
+    case OP_SYSREQ_C:
     case OP_PUSHADDR:
     case OP_SYSREQ_D:
       cip+=sizeof(cell);
       break;
-    case OP_SYSREQ_C:
-		{
-			if (hook)
-#if defined __GNUC__ || defined ASM32 || defined JIT
-				hook(amx, opcode_list, &cip);
-#else
-				hook(amx, NULL, &cip);
-#endif
-			else
-				cip+=sizeof(cell);
-			break;
-		}
 
     case OP_LOAD_I:     /* instructions without parameters */
     case OP_STOR_I:
@@ -709,13 +695,6 @@ static int amx_BrowseRelocate(AMX *amx)
     case OP_SWAP_ALT:
     case OP_NOP:
     case OP_BREAK:
-    case OP_FLOAT_MUL:
-    case OP_FLOAT_DIV:
-    case OP_FLOAT_ADD:
-    case OP_FLOAT_SUB:
-    case OP_FLOAT_TO:
-    case OP_FLOAT_ROUND:
-	case OP_FLOAT_CMP:
       break;
 
     case OP_CALL:       /* opcodes that need relocation */
@@ -840,10 +819,9 @@ static void expand(unsigned char *code, long codesize, long memsize)
 }
 #endif /* defined AMX_INIT */
 
-int AMXAPI amx_Init(AMX *amx, void *program)
+int AMXAPI amx_Init(AMX *amx,void *program)
 {
   AMX_HEADER *hdr;
-  BROWSEHOOK hook = NULL;
   #if (defined _Windows || defined LINUX || defined __FreeBSD__ || defined __OpenBSD__) && !defined AMX_NODYNALOAD
     char libname[sNAMEMAX+8];  /* +1 for '\0', +3 for 'amx' prefix, +4 for extension */
     #if defined _Windows
@@ -991,9 +969,6 @@ int AMXAPI amx_Init(AMX *amx, void *program)
   #endif
 
   /* relocate call and jump instructions */
-  hook = (BROWSEHOOK)amx->usertags[UT_BROWSEHOOK];
-  if (hook)
-	  hook(amx, NULL, NULL);
   amx_BrowseRelocate(amx);
 
   /* load any extension modules that the AMX refers to */
@@ -1042,7 +1017,7 @@ int AMXAPI amx_Init(AMX *amx, void *program)
 
 #if defined JIT
 
-  #define CODESIZE_JIT    65536  /* approximate size of the code for the JIT */
+  #define CODESIZE_JIT    8192  /* approximate size of the code for the JIT */
 
   #if defined __WIN32__   /* this also applies to Win32 "console" applications */
 
@@ -1307,22 +1282,27 @@ int AMXAPI amx_GetNative(AMX *amx, int index, char *funcname)
 
 int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index)
 {
-  int first,last,mid;
+  int first,last,mid,result;
   char pname[sNAMEMAX+1];
 
   amx_NumNatives(amx, &last);
   last--;       /* last valid index is 1 less than the number of functions */
   first=0;
-  /* normal search */
+  /* binary search */
-  for (mid=0; mid<=last; mid++)
+  while (first<=last) {
-  {
+    mid=(first+last)/2;
     amx_GetNative(amx, mid, pname);
-    if (strcmp(pname, name)==0)
+    result=strcmp(pname,name);
-	{
+    if (result>0) {
-      *index = mid;
+      last=mid-1;
+    } else if (result<0) {
+      first=mid+1;
+    } else {
+      *index=mid;
       return AMX_ERR_NONE;
     } /* if */
-  } /* for */
+  } /* while */
+  /* not found, set to an invalid index, so amx_Exec() will fail */
   *index=INT_MAX;
   return AMX_ERR_NOTFOUND;
 }
@@ -1535,11 +1515,37 @@ int AMXAPI amx_FindTagId(AMX *amx, cell tag_id, char *tagname)
 #if defined AMX_XXXUSERDATA
 int AMXAPI amx_GetUserData(AMX *amx, long tag, void **ptr)
 {
+  int index;
+
+  assert(amx!=NULL);
+  assert(tag!=0);
+  for (index=0; index<AMX_USERNUM && amx->usertags[index]!=tag; index++)
+    /* nothing */;
+  if (index>=AMX_USERNUM)
+    return AMX_ERR_USERDATA;
+  *ptr=amx->userdata[index];
   return AMX_ERR_NONE;
 }
 
 int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr)
 {
+  int index;
+
+  assert(amx!=NULL);
+  assert(tag!=0);
+  /* try to find existing tag */
+  for (index=0; index<AMX_USERNUM && amx->usertags[index]!=tag; index++)
+    /* nothing */;
+  /* if not found, try to find empty tag */
+  if (index>=AMX_USERNUM)
+    for (index=0; index<AMX_USERNUM && amx->usertags[index]!=0; index++)
+      /* nothing */;
+  /* if still not found, quit with error */
+  if (index>=AMX_USERNUM)
+    return AMX_ERR_INDEX;
+  /* set the tag and the value */
+  amx->usertags[index]=tag;
+  amx->userdata[index]=ptr;
   return AMX_ERR_NONE;
 }
 #endif /* AMX_XXXUSERDATA */
@@ -1557,61 +1563,6 @@ static AMX_NATIVE findfunction(const char *name, const AMX_NATIVE_INFO *list, in
 }
 
 const char *no_function;
-
-int AMXAPI amx_CheckNatives(AMX *amx, AMX_NATIVE_FILTER nf)
-{
-  AMX_FUNCSTUB *func;
-  AMX_HEADER *hdr;
-  int i,numnatives,res=0;
-
-  hdr=(AMX_HEADER *)amx->base;
-  assert(hdr!=NULL);
-  assert(hdr->magic==AMX_MAGIC);
-  assert(hdr->natives<=hdr->libraries);
-  numnatives=NUMENTRIES(hdr,natives,libraries);
-
-  func=GETENTRY(hdr,natives,0);
-  for (i=0; i<numnatives; i++) {
-    if (func->address==0) {
-      /* this function is not yet located */
-      res=nf(amx,i);
-      if (!res)
-	  {
-        no_function = GETENTRYNAME(hdr,func);
-        return 0;
-	  }
-    } /* if */
-    func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
-  } /* for */
-  return 1;
-}
-
-int AMXAPI amx_RegisterToAny(AMX *amx, AMX_NATIVE f)
-{
-  AMX_FUNCSTUB *func;
-  AMX_HEADER *hdr;
-  int i,numnatives,err;
-
-  hdr=(AMX_HEADER *)amx->base;
-  assert(hdr!=NULL);
-  assert(hdr->magic==AMX_MAGIC);
-  assert(hdr->natives<=hdr->libraries);
-  numnatives=NUMENTRIES(hdr,natives,libraries);
-
-  err=AMX_ERR_NONE;
-  func=GETENTRY(hdr,natives,0);
-  for (i=0; i<numnatives; i++) {
-    if (func->address==0) {
-      /* this function is not yet located */
-      func->address=(ucell)f;
-    } /* if */
-    func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
-  } /* for */
-  if (err==AMX_ERR_NONE)
-    amx->flags|=AMX_FLAG_NTVREG;
-  return err;
-}
-
 int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *list, int number)
 {
   AMX_FUNCSTUB *func;
@@ -1725,13 +1676,7 @@ int AMXAPI amx_PushString(AMX *amx, cell *amx_addr, cell **phys_addr, const char
 #define SKIPPARAM(n)    ( cip=(cell *)cip+(n) )
 #define PUSH(v)         ( stk-=sizeof(cell), *(cell *)(data+(int)stk)=v )
 #define POP(v)          ( v=*(cell *)(data+(int)stk), stk+=sizeof(cell) )
-#define ABORT(amx,v)    { (amx)->stk=reset_stk; \
+#define ABORT(amx,v)    { (amx)->stk=reset_stk; (amx)->hea=reset_hea; return v; }
-						  (amx)->hea=reset_hea; \
-						  (amx)->cip=(cell)cip; \
-						  (amx)->pri=pri; \
-						  (amx)->alt=alt; \
-						  return v; \
-						}
 
 #define CHKMARGIN()     if (hea+STKMARGIN>stk) return AMX_ERR_STACKERR
 #define CHKSTACK()      if (stk>amx->stp) return AMX_ERR_STACKLOW
@@ -1781,16 +1726,13 @@ static const void * const amx_opcodelist[] = {
         &&op_file,      &&op_line,      &&op_symbol,    &&op_srange,
         &&op_jump_pri,  &&op_switch,    &&op_casetbl,   &&op_swap_pri,
         &&op_swap_alt,  &&op_pushaddr,  &&op_nop,       &&op_sysreq_d,
-        &&op_symtag,    &&op_break,     &&op_float_mul, &&op_float_div,
+        &&op_symtag,    &&op_break };
-        &&op_float_add, &&op_float_sub, &&op_float_to,  &&op_float_round,
-        &&op_float_cmp};
   AMX_HEADER *hdr;
   AMX_FUNCSTUB *func;
   unsigned char *code, *data;
   cell pri,alt,stk,frm,hea;
   cell reset_stk, reset_hea, *cip;
-  cell offs, offs2;
+  cell offs;
-  REAL fnum, fnum2;
   ucell codesize;
   int num,i;
 
@@ -2529,8 +2471,6 @@ static const void * const amx_opcodelist[] = {
     amx->hea=hea;
     amx->frm=frm;
     amx->stk=stk;
-    amx->pri=pri;
-    amx->alt=alt;
     num=amx->callback(amx,pri,&pri,(cell *)(data+(int)stk));
     if (num!=AMX_ERR_NONE) {
       if (num==AMX_ERR_SLEEP) {
@@ -2550,8 +2490,6 @@ static const void * const amx_opcodelist[] = {
     amx->hea=hea;
     amx->frm=frm;
     amx->stk=stk;
-    amx->pri=pri;
-    amx->alt=alt;
     num=amx->callback(amx,offs,&pri,(cell *)(data+(int)stk));
     if (num!=AMX_ERR_NONE) {
       if (num==AMX_ERR_SLEEP) {
@@ -2571,8 +2509,6 @@ static const void * const amx_opcodelist[] = {
     amx->hea=hea;
     amx->frm=frm;
     amx->stk=stk;
-    amx->pri=pri;
-    amx->alt=alt;
     pri=((AMX_NATIVE)offs)(amx,(cell *)(data+(int)stk));
     if (amx->error!=AMX_ERR_NONE) {
       if (amx->error==AMX_ERR_SLEEP) {
@@ -2636,67 +2572,12 @@ static const void * const amx_opcodelist[] = {
     NEXT(cip);
   op_nop:
     NEXT(cip);
-  op_float_mul:
+  op_break:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-    fnum = amx_ctof(offs) * amx_ctof(offs2);
-    pri = amx_ftoc(fnum);
-    NEXT(cip);
-  op_float_add:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-    fnum = amx_ctof(offs) + amx_ctof(offs2);
-    pri = amx_ftoc(fnum);
-    NEXT(cip);
-  op_float_sub:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-    fnum = amx_ctof(offs) - amx_ctof(offs2);
-    pri = amx_ftoc(fnum);
-    NEXT(cip);
-  op_float_div:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-    fnum = amx_ctof(offs) / amx_ctof(offs2);
-    pri = amx_ftoc(fnum);
-    NEXT(cip);
-  op_float_to:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    fnum = (REAL)offs;
-    pri = amx_ftoc(fnum);
-    NEXT(cip);
-  op_float_round:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-    fnum = amx_ctof(offs);
-    if (!offs2)
-       fnum = floor(fnum + 0.5);
-	else  if (offs2 == 1)
-       fnum = floor(fnum);
-	else
-       fnum = ceil(fnum);
-    pri = (cell)fnum;
-    NEXT(cip);
-  op_float_cmp:
-    offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-    offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-    fnum = amx_ctof(offs);
-    fnum2 = amx_ctof(offs2);
-    if (fnum == fnum2)
-      pri = 0;
-	else if (fnum > fnum2)
-      pri = 1;
-	else
-      pri = -1;
-    NEXT(cip);
-op_break:
     if (amx->debug!=NULL) {
       /* store status */
       amx->frm=frm;
       amx->stk=stk;
       amx->hea=hea;
-      amx->pri=pri;
-      amx->alt=alt;
       amx->cip=(cell)((unsigned char*)cip-code);
       num=amx->debug(amx);
       if (num!=AMX_ERR_NONE) {
@@ -2773,8 +2654,7 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
     cell  parms[9];     /* registers and parameters for assembler AMX */
   #else
     OPCODE op;
-    cell offs, offs2;
+    cell offs;
-	REAL fnum, fnum2;
     int num;
   #endif
   assert(amx!=NULL);
@@ -3565,8 +3445,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
       amx->hea=hea;
       amx->frm=frm;
       amx->stk=stk;
-      amx->pri=pri;
-      amx->alt=alt;
       num=amx->callback(amx,pri,&pri,(cell *)(data+(int)stk));
       if (num!=AMX_ERR_NONE) {
         if (num==AMX_ERR_SLEEP) {
@@ -3586,8 +3464,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
       amx->hea=hea;
       amx->frm=frm;
       amx->stk=stk;
-      amx->pri=pri;
-      amx->alt=alt;
       num=amx->callback(amx,offs,&pri,(cell *)(data+(int)stk));
       if (num!=AMX_ERR_NONE) {
         if (num==AMX_ERR_SLEEP) {
@@ -3607,8 +3483,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
       amx->hea=hea;
       amx->frm=frm;
       amx->stk=stk;
-      amx->pri=pri;
-      amx->alt=alt;
       pri=((AMX_NATIVE)offs)(amx,(cell *)(data+(int)stk));
       if (amx->error!=AMX_ERR_NONE) {
         if (amx->error==AMX_ERR_SLEEP) {
@@ -3665,59 +3539,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
       break;
     case OP_NOP:
       break;
-    case OP_FLOAT_MUL:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-      fnum = amx_ctof(offs) * amx_ctof(offs2);
-      pri = amx_ftoc(fnum);
-      break;
-    case OP_FLOAT_ADD:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-      fnum = amx_ctof(offs) + amx_ctof(offs2);
-      pri = amx_ftoc(fnum);
-      break;
-    case OP_FLOAT_SUB:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-      fnum = amx_ctof(offs) - amx_ctof(offs2);
-      pri = amx_ftoc(fnum);
-      break;
-    case OP_FLOAT_DIV:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-      fnum = amx_ctof(offs) / amx_ctof(offs2);
-      pri = amx_ftoc(fnum);
-      break;
-    case OP_FLOAT_TO:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      fnum = (float)offs;
-      pri = amx_ftoc(fnum);
-      break;
-    case OP_FLOAT_ROUND:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-      fnum = amx_ctof(offs);
-      if (!offs2)
-         fnum = (REAL)floor(fnum + 0.5);
-      else  if (offs2 == 1)
-         fnum = floor(fnum);
-	  else
-         fnum = ceil(fnum);
-      pri = (cell)fnum;
-      break;
-	case OP_FLOAT_CMP:
-      offs = *(cell *)(data + (int)stk + sizeof(cell)*1);
-      offs2 = *(cell *)(data + (int)stk + sizeof(cell)*2);
-      fnum = amx_ctof(offs);
-      fnum2 = amx_ctof(offs2);
-      if (fnum == fnum2)
-        pri = 0;
-	  else if (fnum > fnum2)
-        pri = 1;
-	  else
-        pri = -1;
-      break;
     case OP_BREAK:
       assert((amx->flags & AMX_FLAG_BROWSE)==0);
       if (amx->debug!=NULL) {
@@ -3725,8 +3546,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index)
         amx->frm=frm;
         amx->stk=stk;
         amx->hea=hea;
-        amx->pri=pri;
-        amx->alt=alt;
         amx->cip=(cell)((unsigned char*)cip-code);
         num=amx->debug(amx);
         if (num!=AMX_ERR_NONE) {

amxmodx/amx.h

@@ -79,6 +79,15 @@
   #endif
 #endif
 
+#if HAVE_ALLOCA_H
+  #include <alloca.h>
+#endif
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 /* || defined __MSDOS__ */
+  #if !defined alloca
+    #define alloca(n)   _alloca(n)
+  #endif
+#endif
+
 #if !defined arraysize
   #define arraysize(array)  (sizeof(array) / sizeof((array)[0]))
 #endif
@@ -157,7 +166,6 @@ 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
@@ -231,10 +239,9 @@ typedef struct tagAMX {
   cell stp              PACKED; /* top of the stack: relative to base + amxhdr->dat */
   int flags             PACKED; /* current status, see amx_Flags() */
   /* user data */
-  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;
@@ -293,7 +300,6 @@ enum {
   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 */
@@ -329,16 +335,23 @@ enum {
   #define AMX_COMPACTMARGIN 64
 #endif
 
-#define UD_FINDPLUGIN	3
+struct amx_trace
-#define UD_DEBUGGER		2
+{
-#define UD_OPCODELIST	1
+	cell frm;
-#define	UD_HANDLER		0
+	amx_trace *prev;
-#define	UT_NATIVE		3
+	amx_trace *next;
-#define UT_OPTIMIZER	2
+	bool used;
-#define UT_BROWSEHOOK	1
+};
-#define UT_BINLOGS		0
 
-typedef void (*BROWSEHOOK)(AMX *amx, cell *oplist, cell *cip);
+struct AMX_DBGINFO
+{
+	void *pDebug;			//Pointer to debug data
+	int error;				//non-amx_Exec() error setting
+	amx_trace *pTrace;		//Pointer to stack trace 
+	amx_trace *pTraceFrm;
+	amx_trace *pTraceEnd;
+	cell frm;
+};
 
 /* for native functions that use floating point parameters, the following
  * two macros are convenient for casting a "cell" into a "float" type _without_
@@ -372,7 +385,6 @@ uint32_t * AMXAPI amx_Align32(uint32_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);
@@ -402,7 +414,6 @@ int AMXAPI amx_PushArray(AMX *amx, cell *amx_addr, cell **phys_addr, const cell
 int AMXAPI amx_PushString(AMX *amx, cell *amx_addr, cell **phys_addr, const char *string, int pack, int use_wchar);
 int AMXAPI amx_RaiseError(AMX *amx, int error);
 int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
-int AMXAPI amx_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);
@@ -441,15 +452,6 @@ int AMXAPI amx_GetStringOld(char *dest,const cell *source,int use_wchar);
   #endif
 #endif
 
-#if defined BINLOG_ENABLED
-typedef struct tagBINLOG
-{
-	void	(*pfnLogNative)(AMX *amx, int native, int params);
-	void	(*pfnLogReturn)(AMX *amx, cell retval);
-	void	(*pfnLogParams)(AMX *amx, cell *params);
-} binlogfuncs_t;
-#endif
-
 #ifdef  __cplusplus
 }
 #endif

amxmodx/amxexecn.asm

@@ -56,8 +56,6 @@
 ;
 ;History (list of changes)
 ;-------------------------
-; 10 february 2006 by David Anderson
-;       Addition of float opcodes
 ; 17 february 2005  by Thiadmer Riemersms
 ;       Addition of the BREAK opcode, removal of the older debugging opcode table.
 ;  6 march 2004  by Thiadmer Riemersma
@@ -131,28 +129,6 @@
         jg      near err_stack
 %endmacro
 
-;Normal abort, saves pri/alt
-%macro	_ABORT 1
-		mov		ebp,amx
-        mov     [ebp+_pri], dword eax  ; store values in AMX structure (PRI, ALT)
-        mov     [ebp+_alt], dword edx  ; store values in AMX structure (PRI, ALT)
-		mov		[ebp+_error], dword %1
-		jmp		_return
-%endmacro
-
-;Checked abort, saves nothing and uses a conditional
-%macro	_CHKABORT 1
-		mov		ebp,amx
-		mov		[ebp+_error], %1
-		cmp		%1, AMX_ERR_NONE
-		jne		_return
-%endmacro
-
-;Fast abort, only aborts, nothing else
-%macro	_FASTABORT 0
-		jmp		_return
-%endmacro
-
 %macro  _CHKHEAP 0
         mov     ebp,amx
         mov     ebp,[ebp+_hlw]
@@ -1220,7 +1196,8 @@ OP_HALT:
         mov     eax,esi         ; EAX=CIP
         sub     eax,code
         mov     [ebp+_cip],eax
-        _ABORT	ebx
+        mov     eax,ebx         ; return the parameter of the HALT opcode
+        jmp     _return
 
 
 OP_BOUNDS:
@@ -1244,7 +1221,6 @@ OP_SYSREQ_PRI:
         mov     alt,edx         ; save ALT
 
         mov     [ebp+_stk],ecx  ; store values in AMX structure (STK, HEA, FRM)
-        ;we don't save regs since they're useless after this
         mov     ecx,hea
         mov     ebx,frm
         mov     [ebp+_hea],ecx
@@ -1275,7 +1251,8 @@ OP_SYSREQ_PRI:
         pop     edi             ; restore saved registers
         pop     esi
         pop     ebp
-        _CHKABORT eax			; if result was invalid, leave
+        cmp     eax,AMX_ERR_NONE
+        jne     near _return    ; return error code, if any
 
         mov     eax,pri         ; get retval into eax (PRI)
         mov     edx,alt         ; restore ALT
@@ -1316,8 +1293,8 @@ OP_SYSREQ_D:                    ; (TR)
         pop     edi             ; restore saved registers
         pop     esi
         pop     ebp
-        mov		eax,[ebp+_error]
+        cmp     DWORD [ebp+_error],AMX_ERR_NONE
-        _CHKABORT eax
+        jne     near _return    ; return error code, if any
 
         ; function result is in eax (PRI)
         mov     edx,alt         ; restore ALT
@@ -1408,96 +1385,6 @@ OP_NOP:
         add     esi,4
         GO_ON
 
-OP_FLOAT_MUL:
-		add   esi,4
-		fld   dword [edi+ecx+4]
-		fmul	dword [edi+ecx+8]
-		sub   esp,4
-		fstp	dword [esp]
-		pop   eax
-		GO_ON
-		
-OP_FLOAT_DIV:
-		add   esi,4
-		fld   dword [edi+ecx+4]
-		fdiv	dword [edi+ecx+8]
-		sub   esp,4
-		fstp	dword [esp]
-		pop   eax
-		GO_ON
-		
-OP_FLOAT_ADD:
-		add   esi,4
-		fld   dword [edi+ecx+4]
-		fadd	dword [edi+ecx+8]
-		sub   esp,4
-		fstp	dword [esp]
-		pop   eax
-		GO_ON
-		
-OP_FLOAT_SUB:
-		add   esi,4
-		fld   dword [edi+ecx+4]
-		fsub	dword [edi+ecx+8]
-		sub   esp, 4
-		fstp	dword [esp]
-		pop   eax
-		GO_ON
-		
-OP_FLOAT_TO:
-		add     esi,4
-		fild    dword [edi+ecx+4]
-		sub     esp,4
-		fstp    dword [esp]
-		pop     eax
-		GO_ON
-		
-OP_FLOAT_ROUND:
-		add	    esi,4
-		;get the float control word
-		push    0
-		mov     ebp,esp
-		fstcw   [ebp]
-		mov		eax,[ebp]
-		push    eax
-		;clear the top bits
-		xor     ah,ah
-		;get the control method
-		push    edx
-		mov     edx,[edi+ecx+8]
-		and     edx,3	;sanity check
-		shl     edx,2	;shift it to right position
-		;set the bits
-		or      ah,dl	;set bits 15,14 of FCW to rounding method
-		or      ah,3	;set precision to 64bit
-		mov     [ebp], eax
-		fldcw   [ebp]
-		;calculate
-		push    0
-		fld     dword [edi+ecx+4]
-		frndint
-		fistp   dword [esp]
-		pop     eax
-		pop     edx
-		;restore bits
-		pop     ebp
-		mov     [esp], ebp
-		fldcw   [esp]
-		pop      ebp
-		GO_ON
-		
-OP_FLOAT_CMP:
-		add     esi, 4
-		fld     dword [edi+ecx+8]
-		fld     dword [edi+ecx+4]
-		fucompp
-		fnstsw  ax
-		fwait
-		sahf
-		cmovz   eax, [g_flags+4]
-		cmova   eax, [g_flags+8]
-		cmovb   eax, [g_flags+0]
-		GO_ON
 
 OP_BREAK:
         mov     ebp,amx         ; get amx into ebp
@@ -1529,7 +1416,7 @@ OP_BREAK:
         mov     [ebp+_error],eax   ; save EAX (error code) before restoring all regs
         _RESTOREREGS               ; abort run, but restore stack first
         mov     eax,[ebp+_error]   ; get error code in EAX back again
-        _FASTABORT
+        jmp     _return         ; return error code
     break_noabort:
         _RESTOREREGS
         mov     eax,[ebp+_pri]  ; restore PRI and ALT
@@ -1538,34 +1425,43 @@ OP_BREAK:
 
 
 OP_INVALID:
-        _ABORT	AMX_ERR_INVINSTR
+        mov     eax,AMX_ERR_INVINSTR
+        jmp     _return
 
 err_call:
-        _ABORT	AMX_ERR_CALLBACK
+        mov     eax,AMX_ERR_CALLBACK
+        jmp     _return
 
 err_stack:
-        _ABORT	AMX_ERR_STACKERR
+        mov     eax,AMX_ERR_STACKERR
+        jmp     _return
 
 err_stacklow:
-        _ABORT	AMX_ERR_STACKLOW
+        mov     eax,AMX_ERR_STACKLOW
+        jmp     _return
 
 err_memaccess:
-        _ABORT	AMX_ERR_MEMACCESS
+        mov     eax,AMX_ERR_MEMACCESS
+        jmp     _return
 
 err_bounds:
-        _ABORT	AMX_ERR_BOUNDS
+        mov     eax,AMX_ERR_BOUNDS
+        jmp     _return
 
 err_heaplow:
-        _ABORT	AMX_ERR_HEAPLOW
+        mov     eax,AMX_ERR_HEAPLOW
+        jmp     _return
 
 err_divide:
-        _ABORT	AMX_ERR_DIVIDE
+        mov     eax,AMX_ERR_DIVIDE
+        jmp     _return
+
 
 _return:
         ; save a few parameters, mostly for the "sleep"function
         mov     ebp,amx         ; get amx into ebp
-        mov		[ebp+_cip],esi	; get corrected cip for amxmodx
+        mov     [ebp+_pri],eax  ; store values in AMX structure (PRI, ALT)
-        mov		eax,[ebp+_error]; get error code
+        mov     [ebp+_alt],edx  ; store values in AMX structure (PRI, ALT)
 
         pop     esi             ; remove FRM from stack
 
@@ -1593,12 +1489,6 @@ Start_DATA
 
 lodb_and DD     0ffh, 0ffffh, 0, 0ffffffffh
 
-		GLOBAL g_flags
-g_flags:
-		DD		-1
-		DD		0
-		DD		1
-
         GLOBAL  amx_opcodelist
         GLOBAL  _amx_opcodelist
 amx_opcodelist:
@@ -1740,10 +1630,4 @@ _amx_opcodelist DD OP_INVALID
         DD      OP_SYSREQ_D
         DD      OP_SYMTAG
         DD      OP_BREAK
-        DD		OP_FLOAT_MUL
+
-        DD		OP_FLOAT_DIV
-		DD		OP_FLOAT_ADD
-		DD		OP_FLOAT_SUB
-		DD		OP_FLOAT_TO
-		DD		OP_FLOAT_ROUND
-		DD		OP_FLOAT_CMP

amxmodx/amxjitsn.asm

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

amxmodx/amxmodx.h

@@ -32,6 +32,7 @@
 #ifndef AMXMODX_H
 #define AMXMODX_H
 
+
 #ifdef __linux__
 #include <unistd.h>
 #include <stdlib.h>
@@ -41,9 +42,10 @@
 #include "string.h"
 #include <extdll.h>
 #include <meta_api.h>
+#include "mm_pextensions.h"			// metamod-p extensions
 
 #ifdef MEMORY_TEST
-	#include "mmgr/mmgr.h"
+#include "mmgr/mmgr.h"
 #endif
 
 #include "md5.h"
@@ -67,43 +69,32 @@
 #include "amxxlog.h"
 
 #define AMXXLOG_Log g_log.Log
-#define AMX_VERSION	"1.71"
+#define AMX_VERSION     "1.55"
 
 extern AMX_NATIVE_INFO  core_Natives[];
 extern AMX_NATIVE_INFO  time_Natives[];
 extern AMX_NATIVE_INFO  power_Natives[];
-extern AMX_NATIVE_INFO amxmodx_Natives[];
+extern  AMX_NATIVE_INFO amxmod_Natives[];
 extern  AMX_NATIVE_INFO file_Natives[];
 extern  AMX_NATIVE_INFO float_Natives[];
 extern  AMX_NATIVE_INFO string_Natives[];
 extern  AMX_NATIVE_INFO vault_Natives[];
 
+
 #ifndef __linux__
 #define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
-#define DLPROC(m, func) GetProcAddress(m, func)
+#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 DLPROC(m,func) dlsym(m,func)
 #define DLFREE(m) dlclose(m)
 #endif
 
-#if defined __GNUC__
-	#include <stdint.h>
-	typedef intptr_t _INT_PTR;
-#else
-	#if defined AMD64
-		typedef __int64 _INT_PTR;
-	#else
-		typedef __int32 _INT_PTR;
-	#endif
-#endif
-
 #ifndef __linux__
-	typedef HINSTANCE DLHANDLE;
+typedef HINSTANCE DLHANDLE;
 #else
-	typedef void* DLHANDLE;
+typedef void* DLHANDLE;
-	#define INFINITE 0xFFFFFFFF
 #endif
 
 #ifndef GETPLAYERAUTHID
@@ -119,37 +110,36 @@ 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 );
-
 char *UTIL_VarArgs(const char *fmt, ...);
 
 
 #define GET_PLAYER_POINTER(e)   (&g_players[ENTINDEX(e)])
-//#define GET_PLAYER_POINTER(e)   (&g_players[(((int)e-g_edict_point)/sizeof(edict_t))])
+//#define GET_PLAYER_POINTER(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 bool g_IsNewMM;
+extern pextension_funcs_t *gpMetaPExtFuncs;
 extern CLog g_log;
 extern CPluginMngr g_plugins;
 extern CTaskMngr g_tasksMngr;
@@ -160,8 +150,7 @@ extern CList<CCVar> g_cvars;
 extern CList<ForceObject> g_forcemodels;
 extern CList<ForceObject> g_forcesounds;
 extern CList<ForceObject> g_forcegeneric;
-extern CList<CModule, const char *> g_modules;
+extern CList<CModule,const char *> g_modules;
-extern CList<CScript, AMX*> g_loadedscripts;
 extern CList<CPlayer*> g_auth;
 extern EventsMngr g_events;
 extern Grenades g_grenades;
@@ -187,7 +176,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,15 +224,14 @@ 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);
 void detachModules();
 void detachReloadModules();
-
 #ifdef FAKEMETA
-	void attachModules();
+void attachModules();
 #endif
 
 // Count modules
@@ -258,31 +245,28 @@ enum CountModulesMode
 int countModules(CountModulesMode mode);
 void modules_callPluginsLoaded();
 
-cell* get_amxaddr(AMX *amx, cell amx_addr);
+cell* get_amxaddr(AMX *amx,cell amx_addr);
-char* build_pathname(char *fmt, ...);
+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);
+char* format_amxstring(AMX *amx, cell *params, int parm,int& len);
-AMX* get_amxscript(int, void**, const char**);
+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 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, ...);
+void LogError(AMX *amx, int err, const char *fmt, ...);
 
 enum ModuleCallReason
 {
@@ -295,7 +279,6 @@ enum ModuleCallReason
 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();
 
@@ -315,12 +298,11 @@ 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);
+#ifdef FAKEMETA
-
+extern CFakeMeta g_FakeMeta;
-#define MM_CVAR2_VERS	13
+#endif
 
 struct func_s
 {
@@ -329,3 +311,4 @@ struct func_s
 };
 
 #endif // AMXMODX_H
+

amxmodx/amxxfile.cpp

@@ -35,7 +35,6 @@
 /**********************
  ****** AMXXFILE ******
  **********************/
-
 #if defined __GNUC__
   #define PACKED        __attribute__((packed))
 #else
@@ -74,7 +73,6 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 {
 	m_Bh.plugins = NULL;
 	m_AmxxFile = false;
-	
 	if (!filename)
 	{
 		m_Status = Err_InvalidParam;
@@ -83,8 +81,8 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 
 	m_Status = Err_None;
 	m_CellSize = cellsize;
-	m_pFile = fopen(filename, "rb");
 
+	m_pFile = fopen(filename, "rb");
 	if (!m_pFile)
 	{
 		m_Status = Err_FileOpen;
@@ -95,37 +93,28 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 	DATAREAD(&magic, sizeof(magic), 1);
 
 	m_OldFile = false;
-	
+	if ( magic == 0x524C4542 ) {
-	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 ) {
-	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++)
-		for (mint8_t i = 0; i < m_Bh.numPlugins; i++)
 		{
 			pe = &(m_Bh.plugins[i]);
 			DATAREAD(&pe->cellsize, sizeof(mint8_t), 1);
@@ -134,32 +123,26 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 			DATAREAD(&pe->memsize, sizeof(int32_t), 1);
 			DATAREAD(&pe->offs, sizeof(int32_t), 1);
 		}
-		
+		for (mint8_t i=0; i<m_Bh.numPlugins; i++)
-		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) {
-	else if (magic == MAGIC_HEADER)
+
-	{
 		// try to find the section
 		mint8_t numOfPlugins;
 		DATAREAD(&numOfPlugins, sizeof(numOfPlugins), 1);
@@ -168,7 +151,6 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 	
 		m_SectionHdrOffset = 0;
 		int i = 0;
-		
 		for (i = 0; i < static_cast<int>(numOfPlugins); ++i)
 		{
 			DATAREAD(&entry, sizeof(entry), 1);
@@ -178,7 +160,6 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 				break;
 			}
 		}
-		
 		if (!m_SectionHdrOffset)
 		{
 			m_Status = Err_SectionNotFound;
@@ -188,13 +169,15 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 		}
 
 		// compute section length
-		if ((i + 1) < static_cast<int>(numOfPlugins))
+		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 {
+		}
+		else
+		{
 			fseek(m_pFile, 0, SEEK_END);
 			m_SectionLength = ftell(m_pFile) - (long)entry.offset;
 		}
@@ -204,7 +187,6 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 		rewind(m_pFile);
 		fread(&hdr, sizeof(hdr), 1, m_pFile);
 		amx_Align16(&hdr.magic);
-		
 		if (hdr.magic == AMX_MAGIC)
 		{
 			if (cellsize != 4)
@@ -212,19 +194,18 @@ CAmxxReader::CAmxxReader(const char *filename, int cellsize)
 				m_Status = Err_SectionNotFound;
 				fclose(m_pFile);
 				m_pFile = NULL;
-				
 				return;
 			}
 
 			m_OldFile = true;
-			
 			return;
-		} else {
+		}
+		else
+		{
 			// no known file format
 			m_Status = Err_FileInvalid;
 			fclose(m_pFile);
 			m_pFile = NULL;
-			
 			return;
 		}
 	} 
@@ -237,7 +218,6 @@ CAmxxReader::~CAmxxReader()
 		fclose(m_pFile);
 		m_pFile = NULL;
 	}
-	
 	if (m_Bh.plugins)
 	{
 		delete [] m_Bh.plugins;
@@ -276,16 +256,11 @@ size_t CAmxxReader::GetBufferSize()
 		AMX_HEADER hdr;
 		DATAREAD(&hdr, sizeof(hdr), 1);
 		fseek(m_pFile, save, SEEK_SET);
-		
 		return hdr.stp;
-	}
+	} else if (m_AmxxFile) {
-	else if (m_AmxxFile)
-	{
 		PluginEntry *pe = &(m_Bh.plugins[m_Entry]);
-		
 		if (pe->imagesize > pe->memsize)
 			return pe->imagesize + 1;
-		
 		return pe->memsize + 1;
 	}
 
@@ -294,7 +269,6 @@ size_t CAmxxReader::GetBufferSize()
 	TableEntry entry;
 	DATAREAD(&entry, sizeof(entry), 1);
 	fseek(m_pFile, save, SEEK_SET);
-	
 	return entry.origSize + 1;			// +1 : safe
 }
 
@@ -324,26 +298,22 @@ CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 		rewind(m_pFile);
 		DATAREAD(buffer, 1, filesize);
 		m_Status = Err_None;
-		
 		return m_Status;
-	}
+	} else if (m_AmxxFile) {
-	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);
+		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
@@ -358,17 +328,15 @@ CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 		//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);
+		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

@@ -95,3 +95,4 @@ public:
 };
 
 #endif // __AMXXFILE_H__
+

amxmodx/amxxlog.cpp

@@ -36,12 +36,12 @@
 
 #include <time.h>
 #ifndef __linux__
-	#include <io.h>
+#include <io.h>
 #endif
 #include "amxmodx.h"
 
 #ifndef __linux__
-	#define	vsnprintf	_vsnprintf
+#define	vsnprintf	_vsnprintf
 #endif
 
 CLog::CLog()
@@ -61,7 +61,6 @@ void CLog::CloseFile()
 	if (!m_LogFile.empty())
 	{
 		FILE *fp = fopen(m_LogFile.c_str(), "r");
-		
 		if (fp)
 		{
 			fclose(fp);
@@ -78,7 +77,6 @@ void CLog::CloseFile()
 			fprintf(fp, "L %s: %s\n", date, "Log file closed.");
 			fclose(fp);
 		}
-		
 		m_LogFile.clear();
 	}
 }
@@ -86,36 +84,29 @@ void CLog::CloseFile()
 void CLog::CreateNewFile()
 {
 	CloseFile();
-	
 	// build filename
 	time_t td;
 	time(&td);
 	tm *curTime = localtime(&td);
 
-	char file[256];
 	int i = 0;
-	
 	while (true)
 	{
-		build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d%03d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i);
+		FILE *pTmpFile = fopen(m_LogFile.c_str(), "r");		// open for reading to check whether the file exists
-		FILE *pTmpFile = fopen(file, "r");			// open for reading to check whether the file exists
-		
 		if (!pTmpFile)
 			break;
-		
 		fclose(pTmpFile);
 		++i;
 	}
-	m_LogFile.assign(file);
-	
 	// Log logfile start
 	FILE *fp = fopen(m_LogFile.c_str(), "w");
-	
 	if (!fp)
 	{
 		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
 		SET_LOCALINFO("amxx_logging", "0");
-	} else {
+	}
+	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);
 	}
@@ -132,13 +123,12 @@ void CLog::MapChange()
 	// create dir if not existing
 	char file[256];
 #ifdef __linux
-	mkdir(build_pathname_r(file, sizeof(file)-1, "%s", g_log_dir.c_str()), 0700);
+	mkdir(build_pathname_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()));
+	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");
@@ -153,7 +143,7 @@ void CLog::MapChange()
 	}
 	else if (m_LogType == 1)
 	{
-		Log("-------- Mapchange to %s --------", STRING(gpGlobals->mapname));
+		Log("-------- Mapchange --------");
 	}
 	else
 		return;
@@ -162,7 +152,6 @@ void CLog::MapChange()
 void CLog::Log(const char *fmt, ...)
 {
 	static char file[256];
-	
 	if (m_LogType == 1 || m_LogType == 2)
 	{
 		// get time
@@ -189,7 +178,6 @@ void CLog::Log(const char *fmt, ...)
 			{
 				CreateNewFile();
 				pF = fopen(m_LogFile.c_str(), "a+");
-				
 				if (!pF)
 				{
 					ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Logging disabled for this map.\n", m_LogFile.c_str());
@@ -197,16 +185,19 @@ void CLog::Log(const char *fmt, ...)
 					return;
 				}
 			}
-		} else {
+		}
+		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 {
+		}
+		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;

amxmodx/amxxlog.h

@@ -42,7 +42,6 @@ private:
 public:
 	CLog();
 	~CLog();
-	
 	void CreateNewFile();
 	void CloseFile();
 	void MapChange();
@@ -50,3 +49,4 @@ public:
 };
 
 #endif // __AMXXLOG_H__
+

amxmodx/binlog.cpp

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

amxmodx/binlog.h

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

amxmodx/debugger.h

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

@@ -58,14 +58,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 +70,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 +83,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.assign( 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 +144,7 @@ void Client_WeaponList(void* mValue)
   //static int wpnList2;
   static int iSlot;
   static const char* wpnName;
-	
+  switch (mState++) {
-	switch (mState++)
-	{
   case 0:
     wpnName = (char*)mValue;
     break;
@@ -183,12 +153,13 @@ void Client_WeaponList(void* mValue)
     break;
   case 7:
     int iId = *(int*)mValue;
-			if ((iId < 0 || iId >= MAX_WEAPONS) || (wpnList & (1<<iId)))
+    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);
+
   }
 }
 
@@ -196,9 +167,7 @@ void Client_CurWeapon(void* mValue)
 {
   static int iState;
   static int iId;
-	
+  switch (mState++){
-	switch (mState++)
-	{
   case 0:
     iState = *(int*)mValue;
     break;
@@ -208,7 +177,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 +186,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 +203,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 +219,7 @@ void Client_ScoreInfo(void* mValue)
 {
   static int index;
   static int deaths;
-
+  switch (mState++){
-	switch (mState++)
-	{
   case 0:
     index = *(int*)mValue;
     break;
@@ -263,12 +227,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.c_str() , pPlayer->teamId );
   }
 }
 
@@ -276,14 +240,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.c_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,21 +261,24 @@ void Client_DeathMsg(void* mValue)
 	static int victim_id;
 	static int hs;
 	
-	switch (mState++)
+	switch (mState++){
-	{
 	case 0:
 		killer_id = *(int*)mValue;
-			killer = (killer_id > 0 && killer_id < 33) ? GET_PLAYER_POINTER_I(killer_id) : 0;
+		killer = (killer_id > 0 && killer_id < 33) ? 
+			GET_PLAYER_POINTER_I(killer_id) : 0;
 		break;
 	case 1:
 		victim_id = *(int*)mValue;
-			victim = (victim_id > 0 && victim_id < 33) ? GET_PLAYER_POINTER_I(victim_id) : 0;
+		victim = (victim_id > 0 && victim_id < 33) ? 
+			GET_PLAYER_POINTER_I(victim_id) : 0;
 		break;
 	case 2:	
 		hs = *(int*)mValue;
 		break;
 	case 3:
-			if (!killer || !victim) break;
+		
+		if (  !killer || !victim ) break;
+
 		victim->death_killer = killer_id;
 		victim->death_weapon.assign((char*)mValue);
 		victim->death_headshot = hs;
@@ -346,3 +313,4 @@ void Client_ResetHUD(void* mValue)
 
 }
 */
+

amxmodx/fakemeta.h

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

amxmodx/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/helpers-x86.asm

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

amxmodx/mm_pextensions.h

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

amxmodx/modules.h

@@ -48,38 +48,6 @@
 #define RELOAD_MODULE 0
 #define STATIC_MODULE 1
 
-typedef enum
-{
-	Player_Name,		//String
-	Player_Ip,			//String
-	Player_Team,		//String
-	Player_Ingame,		//bool
-	Player_Authorized,	//bool
-	Player_Vgui,		//bool
-	Player_Time,		//float
-	Player_Playtime,	//float
-	Player_MenuExpire,	//float
-	Player_Weapons,		//struct{int,int}[32]
-	Player_CurrentWeapon,	//int
-	Player_TeamID,			//int
-	Player_Deaths,			//int
-	Player_Aiming,			//int
-	Player_Menu,			//int
-	Player_Keys,			//int
-	Player_Flags,			//int[32]
-	Player_Newmenu,			//int
-	Player_NewmenuPage,		//int
-}  PlayerProp;
-
 int CheckModules(AMX *amx, char error[128]);
-const char *StrCaseStr(const char *as, const char *bs);
-
-class Debugger;
-Debugger *DisableDebugHandler(AMX *amx);
-void EnableDebugHandler(AMX *amx, Debugger *pd);
-
-bool DirExists(const char *dir);
-
-const char* GetFileName(AMX *amx);
 
 #endif // __MODULES_H__

amxmodx/msvc/amxmodx_mm.def

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

amxmodx/msvc/amxmodx_mm.sln

@@ -7,10 +7,8 @@ Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		JITDebug = JITDebug
-		JITDebugBinLog = JITDebugBinLog
 		JITMemtestRelease = JITMemtestRelease
 		JITRelease = JITRelease
-		JITReleaseBinLog = JITReleaseBinLog
 		MaximalSpeed = MaximalSpeed
 		MemtestDebug = MemtestDebug
 		MemtestRelease = MemtestRelease
@@ -21,14 +19,10 @@ Global
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.Debug.Build.0 = Debug|Win32
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.ActiveCfg = JITDebug|Win32
 		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.Build.0 = JITDebug|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.ActiveCfg = JITDebugBinLog|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.Build.0 = JITDebugBinLog|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}.JITReleaseBinLog.ActiveCfg = JITReleaseBinLog|Win32
-		{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog.Build.0 = JITReleaseBinLog|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

amxmodx/msvc/amxmodx_mm.vcproj

@@ -42,13 +42,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\JIT\natives-x86.obj ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
 				OutputFile="debug/amxmodx_mm.dll"
 				Version="0.1"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
@@ -164,7 +163,7 @@
 				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="5"
 				StructMemberAlignment="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="amxmodx.h"
@@ -183,7 +182,7 @@
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
 				OutputFile="memtestdebug/amxmodx_mm.dll"
-				Version="1.6.5.0"
+				Version="0.1"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
@@ -257,7 +256,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
+				IgnoreDefaultLibraryNames="LIBC"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\memtestrelease/amxx_mm.pdb"
@@ -303,7 +302,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -326,7 +325,7 @@
 				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
 				OutputFile="jitdebug/amxmodx_mm.dll"
 				Version="0.1"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
 				IgnoreDefaultLibraryNames="MSVCRT"
@@ -372,13 +371,10 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
 				GlobalOptimizations="TRUE"
 				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="TRUE"
-				OptimizeForProcessor="0"
 				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32"
 				IgnoreStandardIncludePath="FALSE"
@@ -393,7 +389,6 @@
 				ProgramDataBaseFileName=".\jitrelease/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -408,8 +403,8 @@
 				IgnoreDefaultLibraryNames="MSVCRT"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb"
+				ProgramDatabaseFile=".\jitrelease/amxx_mm.pdb"
-				GenerateMapFile="TRUE"
+				GenerateMapFile="FALSE"
 				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -580,153 +575,6 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
-		<Configuration
-			Name="JITDebugBinLog|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;PAWN_CELL_SIZE=32;ASM32;JIT;BINLOG_ENABLED"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitdebugbinlog/amxmodx.pch"
-				AssemblerListingLocation=".\jitdebugbinlog/"
-				ObjectFile=".\jitdebugbinlog/"
-				ProgramDataBaseFileName=".\jitdebugbinlog/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="jitdebugbinlog/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitdebugbinlog/amxx_mm.pdb"
-				ImportLibrary=".\jitdebugbinlog/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITReleaseBinLog|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="TRUE"
-				OptimizeForProcessor="0"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;BINLOG_ENABLED"
-				IgnoreStandardIncludePath="FALSE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitreleasebinlog/amxmodx.pch"
-				AssemblerListingLocation=".\jitreleasebinlog/"
-				ObjectFile=".\jitreleasebinlog/"
-				ProgramDataBaseFileName=".\jitreleasebinlog/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="3"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="jitreleasebinlog/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_mm.pdb"
-				GenerateMapFile="TRUE"
-				ImportLibrary=".\jitreleasebinlog/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -755,9 +603,6 @@
 			<File
 				RelativePath="..\amxxlog.cpp">
 			</File>
-			<File
-				RelativePath="..\binlog.cpp">
-			</File>
 			<File
 				RelativePath="..\CCmd.cpp">
 			</File>
@@ -790,25 +635,10 @@
 			</File>
 			<File
 				RelativePath="..\CTask.cpp">
-				<FileConfiguration
-					Name="JITRelease|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="0"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITReleaseBinLog|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="0"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\CVault.cpp">
 			</File>
-			<File
-				RelativePath="..\debugger.cpp">
-			</File>
 			<File
 				RelativePath="..\emsg.cpp">
 			</File>
@@ -827,21 +657,6 @@
 			<File
 				RelativePath="..\float.cpp">
 			</File>
-			<File
-				RelativePath="..\format.cpp">
-				<FileConfiguration
-					Name="JITRelease|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="4"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITReleaseBinLog|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="4"/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\md5.cpp">
 			</File>
@@ -857,9 +672,6 @@
 			<File
 				RelativePath="..\newmenus.cpp">
 			</File>
-			<File
-				RelativePath="..\optimizer.cpp">
-			</File>
 			<File
 				RelativePath="..\power.cpp">
 			</File>
@@ -868,18 +680,6 @@
 			</File>
 			<File
 				RelativePath="..\string.cpp">
-				<FileConfiguration
-					Name="JITRelease|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="2"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITReleaseBinLog|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="2"/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\strptime.cpp">
@@ -925,18 +725,6 @@
 						<Tool
 							Name="VCCLCompilerTool"/>
 					</FileConfiguration>
-					<FileConfiguration
-						Name="JITDebugBinLog|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITReleaseBinLog|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
 				</File>
 			</Filter>
 		</Filter>
@@ -958,9 +746,6 @@
 			<File
 				RelativePath="..\amxxlog.h">
 			</File>
-			<File
-				RelativePath="..\binlog.h">
-			</File>
 			<File
 				RelativePath="..\CCmd.h">
 			</File>
@@ -997,6 +782,9 @@
 			<File
 				RelativePath="..\CQueue.h">
 			</File>
+			<File
+				RelativePath="..\CStack.h">
+			</File>
 			<File
 				RelativePath="..\CString.h">
 			</File>
@@ -1009,15 +797,9 @@
 			<File
 				RelativePath="..\CVector.h">
 			</File>
-			<File
-				RelativePath="..\debugger.h">
-			</File>
 			<File
 				RelativePath="..\fakemeta.h">
 			</File>
-			<File
-				RelativePath="..\format.h">
-			</File>
 			<File
 				RelativePath="..\md5.h">
 			</File>
@@ -1033,21 +815,9 @@
 			<File
 				RelativePath="..\newmenus.h">
 			</File>
-			<File
-				RelativePath="..\optimizer.h">
-			</File>
 			<File
 				RelativePath="..\resource.h">
 			</File>
-			<File
-				RelativePath="..\sh_list.h">
-			</File>
-			<File
-				RelativePath="..\sh_stack.h">
-			</File>
-			<File
-				RelativePath="..\sh_tinyhash.h">
-			</File>
 			<File
 				RelativePath="..\zlib\zconf.h">
 			</File>
@@ -1084,95 +854,12 @@
 			<File
 				RelativePath="..\amxjitsn.asm">
 			</File>
-			<File
-				RelativePath="..\helpers-x86.asm">
-			</File>
 			<File
 				RelativePath="..\natives-amd64.asm">
 			</File>
 			<File
 				RelativePath="..\natives-x86.asm">
 			</File>
-			<Filter
-				Name="Builds"
-				Filter="">
-				<File
-					RelativePath="..\Jit\helpers-x86.obj">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="SDK"
-			Filter="">
-			<File
-				RelativePath="..\sdk\amxxmodule.cpp">
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MemtestDebug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MemtestRelease|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITDebug|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITRelease|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITMemtestRelease|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="MaximalSpeed|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITDebugBinLog|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="JITReleaseBinLog|Win32"
-					ExcludedFromBuild="TRUE">
-					<Tool
-						Name="VCCLCompilerTool"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\sdk\amxxmodule.h">
-			</File>
-			<File
-				RelativePath="..\sdk\moduleconfig.h">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

amxmodx/msvc8/amxmodx_mm.sln

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

amxmodx/natives.cpp

@@ -29,9 +29,8 @@
 */
 
 #include "amxmodx.h"
-#include "sh_stack.h"
+#include "CStack.h"
 #include "natives.h"
-#include "debugger.h"
 
 #ifdef __linux__
 #include <malloc.h>
@@ -44,11 +43,11 @@
 //With the exception for param_convert, which was written by
 // Julien "dJeyL" Laurent
 
-CStack<int> g_ErrorStk;
 CVector<regnative *> g_RegNatives;
 CStack<regnative *> g_NativeStack;
 CVector<String> g_Libraries;
 static char g_errorStr[512] = {0};
+static int g_errorNum = 0;
 bool g_Initialized = false;
 
 int amxx_DynaCallback(int idx, AMX *amx, cell *params)
@@ -75,7 +74,7 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 
 	int err = 0;
 	cell ret = 0;
-	g_ErrorStk.push(0);
+	g_errorNum = 0;
 	g_NativeStack.push(pNative);
 	if (pNative->style == 0)
 	{
@@ -88,29 +87,19 @@ int amxx_DynaCallback(int idx, AMX *amx, cell *params)
 		for (int i=numParams; i>=1; i--)
 			amx_Push(pNative->amx, params[i]);
 	}
-	Debugger *pDebugger = (Debugger *)pNative->amx->userdata[UD_DEBUGGER];
+	if ( (err=amx_Exec(pNative->amx, &ret, pNative->func)) != AMX_ERR_NONE)
-	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();
+		LogError(pNative->amx, err, "");
+		return 0;
+	}
+	if (g_errorNum)
+	{
+		g_NativeStack.pop();
+		LogError(amx, g_errorNum, g_errorStr);
+		return ret;
+	}
+	g_NativeStack.pop();
 
 	return ret;
 }
@@ -144,8 +133,7 @@ static cell AMX_NATIVE_CALL log_error(AMX *amx, cell *params)
 	char *err = format_amxstring(amx, params, 2, len);
 
 	_snprintf(g_errorStr, sizeof(g_errorStr), "%s", err);
-	g_ErrorStk.pop();
+	g_errorNum = params[1];
-	g_ErrorStk.push(params[1]);
 
 	return 1;
 }
@@ -158,7 +146,7 @@ static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -179,7 +167,7 @@ static cell AMX_NATIVE_CALL set_string(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -202,7 +190,7 @@ static cell AMX_NATIVE_CALL get_param(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -221,7 +209,7 @@ static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -242,7 +230,7 @@ static cell AMX_NATIVE_CALL set_param_byref(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -265,7 +253,7 @@ static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -278,7 +266,8 @@ static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
 
 	int size = params[3];
 
-	memcpy(dest, source, size * sizeof(cell));
+	while (size-->0)
+		*dest = *source;
 
 	return 1;
 }
@@ -291,7 +280,7 @@ static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -304,7 +293,8 @@ static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
 
 	int size = params[3];
 
-	memcpy(dest, source, size * sizeof(cell));
+	while (size-->0)
+		*dest = *source;
 
 	return 1;
 }
@@ -320,7 +310,7 @@ static cell AMX_NATIVE_CALL param_convert(AMX *amx, cell *params)
 		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
 		return 0;
 	}
-	regnative *pNative = g_NativeStack.front();
+	regnative *pNative = g_NativeStack.top();
 	if (pNative->style != 1)
 	{
 		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
@@ -434,7 +424,7 @@ AMX_NATIVE_INFO g_NativeNatives[] = {
 	{"get_param",		get_param},
 	{"get_param_byref",	get_param_byref},
 	{"set_param_byref",	set_param_byref},
-	{"get_array",		get_array},
+	{"get_array",		set_array},
 	{"set_array",		set_array},
 	//these are dummy functions for floats ;p
 	{"get_param_f",		get_param},

amxmodx/natives.h

@@ -32,9 +32,7 @@
 #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

amxmodx/newmenus.cpp

@@ -1,75 +1,13 @@
-/* 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++)
+	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)
@@ -77,32 +15,12 @@ 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++)
+	for (size_t i=0; i<m_Items.size(); i++)
 		delete m_Items[i];
-
-	unregisterSPForward(this->func);
-	
 	m_Items.clear();
 }
 
@@ -138,53 +56,60 @@ size_t Menu::GetItemCount()
 size_t Menu::GetPageCount()
 {
 	size_t items = GetItemCount();
-	if (items_per_page == 0)
+	page_t numPages = (items / MENUITEMS) + 1;
-		return 1;
 
-	return ((items/items_per_page) + ((items % items_per_page) ? 1 : 0));
+	if (!items)
+		return 0;
+
+	if (numPages % MENUITEMS == 0)
+		numPages--;
+
+	return numPages;
 }
 
 int Menu::PagekeyToItem(page_t page, item_t key)
 {
-	size_t start = page * items_per_page;
+	page_t pages = GetPageCount();
-	size_t num_pages = GetPageCount();
+	item_t numItems = GetItemCount();
 
-	if (num_pages == 1 || !items_per_page)
+	if (page >= pages)
-	{
-		if (m_AlwaysExit && key > m_Items.size())
 		return MENU_EXIT;
-		else
+
-			return key-1;
+	item_t start = page * 7;
-	} else {
+
-		//first page
 	if (page == 0)
 	{
-			if (key == items_per_page + 1)
+		item_t rem = numItems >= 7 ? 7 : numItems;
+		if (key == rem)
+		{
+			if (pages > 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 {
+		} else if (key == rem+1) {
-				return (start + key - 1);
+			return MENU_EXIT;
 		}
-		} else {
+	} else if (page == pages - 1) {
-			if (key > items_per_page && (key-items_per_page<=3))
+		//find number of remaining items
+		//for example, 11 items on page 1... means start=7, 11-7=4
+		item_t rem = numItems - start;
+		//however, the last item is actually this -1, so...
+		if (key == rem)
 		{
-				return m_OptOrders[key-items_per_page-1];
+			return MENU_EXIT;
+		} else if (key == rem+1) {
+			return MENU_BACK;
+		}
 	} else {
-				return (start + key - 1);
+		if (key == 7)
-			}
+		{
+			return MENU_MORE;
+		} else if (key == 8) {
+			return MENU_BACK;
 		}
 	}
+
+	return (start + key);
 }
 
 bool Menu::Display(int player, page_t page)
@@ -221,76 +146,39 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	m_Text.clear();
 
 	char buffer[255];
-	if (items_per_page && (pages != 1))
+	if (g_coloredmenus)
-	{
+		_snprintf(buffer, sizeof(buffer)-1, "\\y%s %d/%d\n\\w\n", m_Title.c_str(), page+1, pages);
-		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);
+		_snprintf(buffer, sizeof(buffer)-1, "%s %d/%d\n\n", m_Title.c_str(), page+1, pages);
-	} else {
-		if (m_AutoColors)
-			_snprintf(buffer, sizeof(buffer)-1, "\\y%s\n\\w\n", m_Title.c_str());
-		else
-			_snprintf(buffer, sizeof(buffer)-1, "%s\n\n", m_Title.c_str());
-	}
-	
 	m_Text.append(buffer);
 
-	enum
+	item_t start = page * 7;
-	{
-		Display_Back = (1<<0),
-		Display_Next = (1<<1),
-		Display_Exit = (1<<2),
-	};
-
-	int flags = Display_Back|Display_Next;
-	item_t start = page * items_per_page;
 	item_t end = 0;
-	if (items_per_page)
+	if (start + 7 <= numItems)
 	{
-		if (start + items_per_page >= numItems)
+		end = start + 7;
-		{
-			end = numItems - 1;
-			flags &= ~Display_Next;
 	} else {
-			end = start + items_per_page - 1;
+		end = numItems;
 	}
-		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++)
-	
-	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));
+			ret = executeForwards(pItem->handler, player, thisId, i);
 			if (ret == ITEM_ENABLED)
 				enabled = true;
 			else if (ret == ITEM_DISABLED)
 				enabled = false;
 		}
-		
 		if (pItem->pfn)
 		{
 			ret = (pItem->pfn)(player, thisId, i);
@@ -299,16 +187,12 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 			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)
+			if (g_coloredmenus)
 			{
 				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", ++option, pItem->name.c_str());
 			} else {
@@ -316,96 +200,35 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 				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++;
 	}
+	//now for a weird part >:o
+	//this will either be MORE or BACK..
+	keys |= (1<<option++);
+	if ((page < pages - 1) && (pages > 1))
+	{
+		_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "More");
+	} else {
+		_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Exit");
 	}
-	}
+	m_Text.append(buffer);
-
+	if (pages > 1)
-	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, 
+		if (pages == 0)
-						sizeof(buffer)-1, 
+		{
-						m_AutoColors ? "\\r%d. \\w%s\n" : "%d. %s\n", 
+			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Exit");
-						option, 
+		} else {
-						m_OptNames[abs(MENU_BACK)].c_str()
+			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Back");
-						);
+		}
 		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) { \
+#define GETMENU(p) if (p >= (int)g_NewMenus.size() || p < 0) { \
-	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.size()); \
+	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d", p); \
 	return 0; } \
 	Menu *pMenu = g_NewMenus[p];
 
@@ -415,11 +238,9 @@ 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);
@@ -427,46 +248,12 @@ static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
 	}
 
 	int id = g_menucmds.registerMenuId(title, amx);
-	g_menucmds.registerMenuCmd(g_plugins.findPluginFast(amx), id, 1023, func);
+	g_menucmds.registerMenuCmd( g_plugins.findPluginFast(amx), id, 1023, func );
 
-	Menu *pMenu = new Menu(title, id, 0);
+	Menu *pMenu = new Menu(title, id, (int)g_NewMenus.size());
-
-	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)
@@ -479,14 +266,7 @@ static cell AMX_NATIVE_CALL menu_additem(AMX *amx, cell *params)
 
 	GETMENU(params[1]);
 
-	if (!pMenu->items_per_page && pMenu->GetItemCount() >= 10)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Non-paginated menus are limited to 10 items.");
-		return 0;
-	}
-
 	name = get_amxstring(amx, params[2], 0, len);
-	validate_menu_text(name);
 	cmd = get_amxstring(amx, params[3], 1, len);
 	access = params[4];
     
@@ -522,10 +302,6 @@ static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
 
 	int player = params[1];
 	int page = params[3];
-	CPlayer* pPlayer = GET_PLAYER_POINTER_I(player);
-	
-	// This will set the expire time of the menu to infinite
-	pPlayer->menuexpire = INFINITE;
 
 	return pMenu->Display(player, page);
 }
@@ -639,221 +415,10 @@ static cell AMX_NATIVE_CALL menu_item_setcall(AMX *amx, cell *params)
     return 1;
 } 
 
-static cell AMX_NATIVE_CALL menu_setprop(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	int len = params[0] / sizeof(cell);
-	if (len < 3)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Expected 3 parameters");
-		return 0;
-	}
-
-	switch (params[2])
-	{
-	case MPROP_PERPAGE:
-		{
-			cell count = *get_amxaddr(amx, params[3]);
-			if (count < 0 || count > 7)
-			{
-				LogError(amx, AMX_ERR_NATIVE, "Cannot set %d items per page", count);
-				return 0;
-			}
-			pMenu->items_per_page = count;
-			break;
-		}
-	case MPROP_BACKNAME:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			validate_menu_text(str);
-			pMenu->m_OptNames[abs(MENU_BACK)].assign(str);
-			break;
-		}
-	case MPROP_NEXTNAME:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			validate_menu_text(str);
-			pMenu->m_OptNames[abs(MENU_MORE)].assign(str);
-			break;
-		}
-	case MPROP_EXITNAME:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			validate_menu_text(str);
-			pMenu->m_OptNames[abs(MENU_EXIT)].assign(str);
-			break;
-		}
-	case MPROP_TITLE:
-		{
-			char *str = get_amxstring(amx, params[3], 0, len);
-			int old = pMenu->menuId;
-			g_menucmds.removeMenuId(old);
-			pMenu->m_Title.assign(str);
-			pMenu->menuId = g_menucmds.registerMenuId(str, amx);
-			g_menucmds.registerMenuCmd(
-				g_plugins.findPluginFast(amx),
-				pMenu->menuId,
-				1023,
-				pMenu->func);
-			CPlayer *pl;
-			/**
-			 * NOTE - this is actually bogus
-			 *  the client's screen won't actually match the cmd here 
-			 *  I think, this scenario needs to be tested. 
-			 */
-			for (int i=1; i<=gpGlobals->maxClients; i++)
-			{
-				pl = GET_PLAYER_POINTER_I(i);
-				if (pl->menu == old)
-					pl->menu = pMenu->menuId;
-			}
-			break;
-		}
-	case MPROP_EXITALL:
-		{
-			cell ans = *get_amxaddr(amx, params[3]);
-			if (ans == 1)
-			{
-				pMenu->m_AlwaysExit = true;
-				pMenu->m_NeverExit = false;
-			} else if (ans == 0) {
-				pMenu->m_AlwaysExit = false;
-				pMenu->m_NeverExit = false;
-			} else if (ans == -1) {
-				pMenu->m_NeverExit = true;
-				pMenu->m_AlwaysExit = false;
-			}
-			break;
-		}
-	case MPROP_ORDER:
-		{
-			cell *addr = get_amxaddr(amx, params[3]);
-			pMenu->m_OptOrders[0] = addr[0];
-			pMenu->m_OptOrders[1] = addr[1];
-			pMenu->m_OptOrders[2] = addr[2];
-			break;
-		}
-	case MPROP_NOCOLORS:
-		{
-			pMenu->m_AutoColors = *get_amxaddr(amx, params[3]) ? true : false;
-			break;
-		}
-	case MPROP_PADMENU:
-		{
-			pMenu->padding = *get_amxaddr(amx, params[3]);
-			break;
-		}
-	default:
-		{
-			LogError(amx, AMX_ERR_NATIVE, "Invalid menu setting: %d", params[1]);
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-#define GETMENU_R(p) if (p >= (int)g_NewMenus.size() || p < 0 || !g_NewMenus[p]) { \
-	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d(%d)", p, g_NewMenus.size()); \
-	return 0; } \
-	Menu *pMenu = g_NewMenus[p];
-
-static cell AMX_NATIVE_CALL menu_cancel(AMX *amx, cell *params)
-{
-	int index = params[1];
-
-	if (index < 1 || index > gpGlobals->maxClients)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Player %d is not valid", index);
-		return 0;
-	}
-
-	CPlayer *player = GET_PLAYER_POINTER_I(index);
-	if (!player->ingame)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Played %d is not in game", index);
-		return 0;
-	}
-
-	int menu = player->newmenu;
-	if (menu < 0 || menu >= (int)g_NewMenus.size() || !g_NewMenus[menu])
-		return 0;
-
-	Menu *pMenu = g_NewMenus[menu];
-
-	player->newmenu = -1;
-	player->menu = 0;
-	executeForwards(pMenu->func, 
-		static_cast<cell>(index),
-		static_cast<cell>(pMenu->thisId),
-		static_cast<cell>(MENU_EXIT));
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_destroy(AMX *amx, cell *params)
-{
-	GETMENU_R(params[1]);
-
-	if (pMenu->isDestroying)
-		return 0;	//prevent infinite recursion
-
-	pMenu->isDestroying = true;
-	g_menucmds.removeMenuId(pMenu->menuId);
-	CPlayer *player;
-	for (int i=1; i<=gpGlobals->maxClients; i++)
-	{
-		player = GET_PLAYER_POINTER_I(i);
-		if (player->newmenu == pMenu->thisId)
-		{
-			player->newmenu = -1;
-			player->menu = 0;
-			executeForwards(pMenu->func, 
-				static_cast<cell>(i), 
-				static_cast<cell>(pMenu->thisId),
-				static_cast<cell>(MENU_EXIT));
-		}
-	}
-	g_NewMenus[params[1]] = NULL;
-	delete pMenu;
-	g_MenuFreeStack.push(params[1]);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL player_menu_info(AMX *amx, cell *params)
-{
-	if (params[1] < 1 || params[1] > gpGlobals->maxClients)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid player id %d", params[1]);
-		return 0;
-	}
-
-	CPlayer *player = GET_PLAYER_POINTER_I(params[1]);
-	if (!player->ingame)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Player %d is not ingame", params[1]);
-		return 0;
-	}
-
-	cell *m = get_amxaddr(amx, params[2]);
-	cell *n = get_amxaddr(amx, params[3]);
-
-	*m = player->menu;
-	*n = player->newmenu;
-
-	if ( (*m != 0 && *m != -1) || (*n != -1))
-		return 1;
-
-	return 0;
-}
-
 AMX_NATIVE_INFO g_NewMenuNatives[] = 
 {
 	{"menu_create",				menu_create},
 	{"menu_additem",			menu_additem},
-	{"menu_addblank",			menu_addblank},
 	{"menu_pages",				menu_pages},
 	{"menu_items",				menu_items},
 	{"menu_display",			menu_display},
@@ -863,9 +428,5 @@ AMX_NATIVE_INFO g_NewMenuNatives[] =
 	{"menu_item_setcall",		menu_item_setcall},
 	{"menu_item_setcmd",		menu_item_setcmd},
 	{"menu_item_setname",		menu_item_setname},
-	{"menu_destroy",			menu_destroy},
-	{"menu_setprop",			menu_setprop},
-	{"menu_cancel",				menu_cancel},
-	{"player_menu_info",		player_menu_info},
 	{NULL,						NULL},
 };

amxmodx/newmenus.h

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

amxmodx/optimizer.cpp

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

amxmodx/optimizer.h

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

amxmodx/sdk/amxxmodule.cpp

@@ -2502,10 +2502,6 @@ PFN_FORMAT					g_fn_Format;
 PFN_REGISTERFUNCTION		g_fn_RegisterFunction;
 PFN_REQ_FNPTR				g_fn_RequestFunction;
 PFN_AMX_PUSH				g_fn_AmxPush;
-PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
-PFN_PLAYER_PROP_ADDR		g_fn_PlayerPropAddr;
-PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
-PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2615,10 +2611,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS);
 	REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT);
 	REQFUNC("amx_Push", g_fn_AmxPush, PFN_AMX_PUSH);
-	REQFUNC("SetPlayerTeamInfo", g_fn_SetTeamInfo, PFN_SET_TEAM_INFO);
-	REQFUNC("PlayerPropAddr", g_fn_PlayerPropAddr, PFN_PLAYER_PROP_ADDR);
-	REQFUNC("RegAuthFunc", g_fn_RegAuthFunc, PFN_REG_AUTH_FUNC);
-	REQFUNC("UnregAuthFunc", g_fn_UnregAuthFunc, PFN_UNREG_AUTH_FUNC);
 
 #ifdef MEMORY_TEST
 	// Memory
@@ -2741,10 +2733,6 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetPlayerEdict(0);
 	MF_Format("", 4, "str");
 	MF_RegisterFunction(NULL, "");
-	MF_SetPlayerTeamInfo(0, 0, "");
-	MF_PlayerPropAddr(0, 0);
-	MF_RegAuthFunc(NULL);
-	MF_UnregAuthFunc(NULL);
 }
 #endif
 
@@ -2924,20 +2912,20 @@ void	operator delete[](void *reportedAddress)
 #else
 
 #if !defined NO_ALLOC_OVERRIDES && !defined MEMORY_TEST && !defined WIN32
-void * operator new(size_t size) {
+void * ::operator new(size_t size) {
 	return(calloc(1, size)); 
 }
 
-void * operator new[](size_t size) {
+void * ::operator new[](size_t size) {
 	return(calloc(1, size)); 
 }
 
-void operator delete(void * ptr) {
+void ::operator delete(void * ptr) {
 	if(ptr)
 		free(ptr);
 }
 
-void operator delete[](void * ptr) {
+void ::operator delete[](void * ptr) {
 	if(ptr)
 		free(ptr);
 }

amxmodx/sdk/amxxmodule.h

@@ -1927,30 +1927,6 @@ enum ForwardParam
 	FP_ARRAY,						// array; use the return value of prepareArray.
 };
 
-enum PlayerProp
-{
-	Player_Name,		//String
-	Player_Ip,			//String
-	Player_Team,		//String
-	Player_Ingame,		//bool
-	Player_Authorized,	//bool
-	Player_Vgui,		//bool
-	Player_Time,		//float
-	Player_Playtime,	//float
-	Player_MenuExpire,	//float
-	Player_Weapons,		//struct{int,int}[32]
-	Player_CurrentWeapon,	//int
-	Player_TeamID,			//int
-	Player_Deaths,			//int
-	Player_Aiming,			//int
-	Player_Menu,			//int
-	Player_Keys,			//int
-	Player_Flags,			//int[32]
-	Player_Newmenu,			//int
-	Player_NewmenuPage,		//int
-};
-
-typedef void (*AUTHORIZEFUNC)(int player, const char *authstring);
 
 typedef int				(*PFN_ADD_NATIVES)				(const AMX_NATIVE_INFO * /*list*/);
 typedef char *			(*PFN_BUILD_PATHNAME)			(const char * /*format*/, ...);
@@ -2002,7 +1978,6 @@ typedef edict_t *		(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
 #else
 typedef void *			(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
 #endif
-typedef void *			(*PFN_PLAYER_PROP_ADDR)			(int /*id*/, int /*prop*/);
 
 #ifdef MEMORY_TEST
 typedef void *			(*PFN_ALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
@@ -2028,9 +2003,6 @@ typedef	void			(*PFN_MERGEDEFINITION_FILE)		(const char * /*filename*/);
 typedef const char *	(*PFN_FORMAT)					(const char * /*fmt*/, ... /*params*/);
 typedef void			(*PFN_REGISTERFUNCTION)			(void * /*pfn*/, const char * /*desc*/);
 typedef	int				(*PFN_AMX_PUSH)					(AMX * /*amx*/, cell /*value*/);
-typedef	int				(*PFN_SET_TEAM_INFO)			(int /*player */, int /*teamid */, const char * /*name */);
-typedef void			(*PFN_REG_AUTH_FUNC)			(AUTHORIZEFUNC);
-typedef void			(*PFN_UNREG_AUTH_FUNC)			(AUTHORIZEFUNC);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
@@ -2094,10 +2066,6 @@ extern PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 extern PFN_REGISTERFUNCTION			g_fn_RegisterFunction;
 extern PFN_REQ_FNPTR				g_fn_RequestFunction;
 extern PFN_AMX_PUSH					g_fn_AmxPush;
-extern PFN_SET_TEAM_INFO			g_fn_SetTeamInfo;
-extern PFN_PLAYER_PROP_ADDR			g_fn_PlayerPropAddr;
-extern PFN_REG_AUTH_FUNC			g_fn_RegAuthFunc;
-extern PFN_UNREG_AUTH_FUNC			g_fn_UnregAuthFunc;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
@@ -2158,10 +2126,6 @@ void			MF_RegisterFunction			(void *pfn, const char *description) { }
 void *			MF_RequestFunction			(const char *description) { }
 int				MF_AmxPush					(AMX *amx, cell *params) { }
 int				MF_AmxExec					(AMX *amx, cell *retval, int idx) { }
-int				MF_SetPlayerTeamInfo		(int id, int teamid, const char *teamname) { }
-void *			MF_PlayerPropAddr			(int id, int prop) { }
-void			MF_RegAuthFunc				(AUTHORIZEFUNC fn) { }
-void			MF_UnregAuthFunc			(AUTHORIZEFUNC fn) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
@@ -2225,12 +2189,8 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_GetPlayerEdict g_fn_GetPlayerEdict
 #define MF_Format g_fn_Format
 #define MF_RegisterFunction g_fn_RegisterFunction
-#define MF_RequestFunction g_fn_RequestFunction
+#define MF_RequestFunction g_fn_RequestFunction;
 #define MF_AmxPush g_fn_AmxPush
-#define	MF_SetPlayerTeamInfo g_fn_SetTeamInfo
-#define MF_PlayerPropAddr g_fn_PlayerPropAddr
-#define MF_RegAuthFunc g_fn_RegAuthFunc
-#define MF_UnregAuthFunc g_fn_UnregAuthFunc
 
 #ifdef MEMORY_TEST
 /*** Memory ***/

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

@@ -31,156 +31,164 @@
 
 #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();
 
-		int num = 0;
 				while (a)
 				{
-			num++;
+					if ( (*a).getStatusCode() == ps_bad_load )
-			if ((*a).getStatusCode() == ps_bad_load)
 					{
 						//error
-				print_srvconsole("(%3d) Load fails: %s\n", num, (*a).getError());
+						print_srvconsole("Load fails: %s\n", (*a).getError());
-			} else if ( (*a).getStatusCode() == ps_error) {
-				//error
-				print_srvconsole("(%3d) Error: %s\n", num, (*a).getError());
 					}
 					++a;
 				}
 
-		print_srvconsole("%d plugins, %d running\n", plugins, running);
+				print_srvconsole( "%d plugins, %d running\n",plugins,running );
+
 		}
-	else if (!strcmp(cmd, "pause") && CMD_ARGC() > 2) 
+		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->isPaused() ) 
 				{
 						plugin->unpausePlugin();
-			print_srvconsole("Unpaused plugin \"%s\"\n", plugin->getName());
+						print_srvconsole("Unpaused plugin \"%s\"\n",plugin->getName() );
-		}
+				} else if (!plugin) {
-		else if (!plugin)
+					print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin);
-		{
-			print_srvconsole("Couldn't find plugin matching \"%s\"\n", sPlugin);
 				} else {
 					print_srvconsole("Plugin %s can't be unpaused right now.", sPlugin);
 				}
+
 		}
-	else if (!strcmp(cmd, "cvars")) 
+		else if (!strcmp(cmd,"cvars")) 
 		{
-		print_srvconsole("Registered cvars:\n");
+				print_srvconsole( "Registered cvars:\n");
-		print_srvconsole("       %-24.23s %-24.23s %-16.15s\n", "name", "value", "plugin");
+				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(   "Authors: %s  (%s)\n", "Felix \"SniperBeamer\" Geyer, David \"BAILOPAN\" Anderson, Pavol \"PM OnoTo\" Marko, Jonny \"Got His Gun\" Bergstrom, and Lukasz \"SidLuke\" Wlasinski.",  Plugin_info.url);
-		print_srvconsole("\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");
+				print_srvconsole(   "Core mode: JIT Only\n");
 #elif !defined JIT && defined ASM32
-		print_srvconsole("Core mode: ASM32 Only\n");
+				print_srvconsole(	"Core mode: ASM32 Only\n");
 #elif defined JIT && defined ASM32
-		print_srvconsole("Core mode: JIT+ASM32\n");
+				print_srvconsole(	"Core mode: JIT+ASM32\n");
 #else
-		print_srvconsole("Core mode: Normal\n");
+				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 %-8.7s %-20.19s %-11.10s\n",
+						"name", "version", "author", "status");
 
 				int running = 0;
 				int modules = 0;
 
 				CList<CModule,const char *>::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 %-8.7s %-20.19s %-11.10s\n", modules,
+								(*a).getName(), (*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 if (!strcmp(cmd, "gpl"))
 		{
 			print_srvconsole("AMX Mod X\n");
 			print_srvconsole("\n");
@@ -237,7 +245,11 @@ void amx_command()
 			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 {
+		}
+		else
+		{
+
+
 				print_srvconsole("Usage: amxx < command > [ argument ]\n");
 				print_srvconsole("Commands:\n");
 				print_srvconsole("   version                - display amxx version info\n");
@@ -248,9 +260,11 @@ void amx_command()
 				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;
@@ -258,13 +272,13 @@ void plugin_srvcmd()
 				
 	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),
+			cell ret = executeForwards((*a).getFunction(), g_srvindex, (*a).getFlags(), (*a).getId());
-				static_cast<cell>((*a).getFlags()), static_cast<cell>((*a).getId()));
+			if ( ret ) break;
-			if (ret) break;
 		}
 		++a;
 	}

amxmodx/util.cpp

@@ -30,10 +30,11 @@
 */
 
 #include <time.h>
+
 #include "amxmodx.h"
 
 #ifdef __linux__
-	#define _vsnprintf vsnprintf
+#define _vsnprintf vsnprintf
 #endif
 
 char *UTIL_VarArgs(const char *fmt, ...)
@@ -51,26 +52,21 @@ char *UTIL_VarArgs(const char *fmt, ...)
 int UTIL_ReadFlags(const char* c) 
 {
 	int flags = 0;
-	
+	while (*c) flags |= ( 1 << ( *c++ - 'a' ) );
-	while (*c)
-		flags |= (1<<(*c++ - 'a'));
-	
 	return flags;
 }
 
-void UTIL_GetFlags(char* f, int a)
+void UTIL_GetFlags(char* f,int a)
 {
-	for (int i = 'a'; i <= 'z'; ++i)
+	for(int i='a';i<='z';++i){
-	{
+		if ( a & 1 ) *f++ = i;
-		if (a & 1) *f++ = i;
 		a >>= 1;
 	}
-
 	*f = 0;
 }
 
 /* warning - don't pass here const string */
-void UTIL_ShowMenu(edict_t* pEdict, int slots, int time, char *menu, int mlen)
+void UTIL_ShowMenu( edict_t* pEdict, int slots, int time, char *menu, int mlen )
 {
 	char *n = menu;
 	char c = 0;
@@ -79,19 +75,17 @@ void UTIL_ShowMenu(edict_t* pEdict, int slots, int time, char *menu, int mlen)
 	if (!gmsgShowMenu)
 		return;							// some games don't support ShowMenu (Firearms)
 
-	while (*n)
+	while ( *n ) {
-	{
 		a = mlen;
-		if (a > 175) a = 175;
+		if ( a > 175 ) a = 175;
 		mlen -= a;
 		c = *(n+=a);
 		*n = 0;
-		
+		MESSAGE_BEGIN( MSG_ONE , gmsgShowMenu, NULL, pEdict );
-		MESSAGE_BEGIN(MSG_ONE, gmsgShowMenu, NULL, pEdict);
+		WRITE_SHORT( slots );
-		WRITE_SHORT(slots);
+		WRITE_CHAR( time );
-		WRITE_CHAR(time);
+		WRITE_BYTE( c ? TRUE : FALSE);
-		WRITE_BYTE(c ? TRUE : FALSE);
+		WRITE_STRING( menu );
-		WRITE_STRING(menu);
 		MESSAGE_END();
 		*n = c;
 		menu = n;
@@ -99,14 +93,14 @@ void UTIL_ShowMenu(edict_t* pEdict, int slots, int time, char *menu, int mlen)
 }
 
 /* warning - don't pass here const string */
-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)
 {
 	if (!gmsgMOTD)
 		return;				// :TODO: Maybe output a warning log?
 
 	if (gmsgServerName)
 	{
-		MESSAGE_BEGIN(MSG_ONE, gmsgServerName, NULL, client);
+		MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
 		WRITE_STRING(name);
 		MESSAGE_END();
 	}
@@ -115,17 +109,15 @@ void UTIL_ShowMOTD(edict_t *client, char *motd, int mlen, const char *name)
 	char c = 0;
 	int a;
 
-	while (*n)
+	while ( *n ) {
-	{
 		a = mlen;
-		if (a > 175) a = 175;
+		if ( a > 175 ) a = 175;
 		mlen -= a;
-		c = *(n += a);
+		c = *(n+=a);
 		*n = 0;
-		
+		MESSAGE_BEGIN( MSG_ONE , gmsgMOTD, NULL, client );
-		MESSAGE_BEGIN(MSG_ONE, gmsgMOTD, NULL, client);
+		WRITE_BYTE( c ? FALSE : TRUE );
-		WRITE_BYTE(c ? FALSE : TRUE);
+		WRITE_STRING( motd );
-		WRITE_STRING(motd);
 		MESSAGE_END();
 		*n = c;
 		motd = n;
@@ -133,52 +125,42 @@ void UTIL_ShowMOTD(edict_t *client, char *motd, int mlen, const char *name)
 
 	if (gmsgServerName)
 	{
-		MESSAGE_BEGIN(MSG_ONE, gmsgServerName, NULL, client);
+		MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
-		WRITE_STRING(hostname->string);
+		WRITE_STRING( hostname->string );
 		MESSAGE_END();
 	}
 }
 
 void UTIL_IntToString(int value, char *output)
 {
-	static const char *words[] = 
+	static const char *words[] = {"zero ","one ","two ","three ","four ",
-		{"zero ","one ","two ","three ","four ",
 		"five ", "six ","seven ","eight ","nine ","ten ",
 		"eleven ","twelve ","thirteen ","fourteen ","fifteen ",
 		"sixteen ","seventeen ","eighteen ","nineteen ",
 		"twenty ","thirty ","fourty ", "fifty ","sixty ",
 		"seventy ","eighty ","ninety ",
 		"hundred ","thousand "};
-	
 	*output = 0;
 	if (value < 0) value = -value;
 	int tho = value / 1000;
 	int aaa = 0;
-	
+	if (tho){
-	if (tho)
+		aaa += sprintf(&output[aaa], words[ tho ] );
-	{
+		aaa += sprintf(&output[aaa], words[29] );
-		aaa += sprintf(&output[aaa], words[tho]);
-		aaa += sprintf(&output[aaa], words[29]);
 		value =  value % 1000;
 	}
-
 	int hun = value / 100;
-	
+	if (hun) {
-	if (hun)
+		aaa += sprintf(&output[aaa], words[ hun ] );
-	{
+		aaa += sprintf(&output[aaa], words[28] );
-		aaa += sprintf(&output[aaa], words[hun]);
-		aaa += sprintf(&output[aaa], words[28]);
 		value =  value % 100;
 	}
-
 	int ten = value / 10;
 	int unit = value % 10;
-	
+	if ( ten )  
-	if (ten)
+		aaa += sprintf(&output[aaa], words[ ( ten > 1 ) ? ( ten + 18 ) : ( unit + 10 ) ] );
-		aaa += sprintf(&output[aaa], words[(ten > 1) ? (ten + 18) : (unit + 10)]);
+	if ( ten != 1 && ( unit || (!value && !hun && !tho) ) ) 
-	
+		sprintf(&output[aaa], words[ unit ] );
-	if (ten != 1 && (unit || (!value && !hun && !tho))) 
-		sprintf(&output[aaa], words[unit]);
 }
 
 char* UTIL_SplitHudMessage(const char *src)
@@ -186,57 +168,50 @@ char* UTIL_SplitHudMessage(const char *src)
 	static char message[512];
 	short b = 0, d = 0, e = 0, c = -1;
 
-	while (src[d] && e < 480)
+	while ( src[ d ] && e < 480 ) {
-	{
+		if ( src[ d ] == ' ' ) {
-		if (src[d] == ' ')
-		{
 			c = e;
 		}
-		else if (src[d] == '\n')
+		else if ( src[ d ] == '\n' ) {
-		{
 			c = -1;
 			b = 0;
 		}
-		
+		message[ e++ ] = src[ d++ ];
-		message[e++] = src[d++];
+		if ( ++b == 69 ) {
-		
+			if ( c == -1 )   {
-		if (++b == 69)
+				message[ e++ ] = '\n';
-		{
-			if (c == -1)
-			{
-				message[e++] = '\n';
 				b = 0;
-			} else {
+			}
-				message[c] = '\n';
+			else  {
+				message[ c ] = '\n';
 				b = e - c - 1;
 				c = -1;
 			}
 		}
 	}
-
+	message[ e ] = 0;
-	message[e] = 0;
 	return message;
 }
 
-unsigned short FixedUnsigned16(float value, float scale)
+unsigned short FixedUnsigned16( float value, float scale )
 {
 	int output = (int)(value * scale);
 
-	if (output < 0)
+	if ( output < 0 )
 		output = 0;
-	else if (output > 0xFFFF)
+	else if ( output > 0xFFFF )
 		output = 0xFFFF;
 
 	return (unsigned short)output;
 }
 
-short FixedSigned16(float value, float scale)
+short FixedSigned16( float value, float scale )
 {
 	int output = (int)(value * scale);
 
-	if (output > 32767)
+	if ( output > 32767 )
 		output = 32767;
-	else if (output < -32768)
+	else if ( output < -32768 )
 		output = -32768;
 
 	return (short)output;
@@ -244,15 +219,15 @@ short FixedSigned16(float value, float scale)
 
 void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pMessage)
 {
-	if (pEntity)
+	if ( pEntity )
-		MESSAGE_BEGIN(MSG_ONE_UNRELIABLE, SVC_TEMPENTITY, NULL, pEntity);
+		MESSAGE_BEGIN( MSG_ONE_UNRELIABLE, SVC_TEMPENTITY, NULL, pEntity );
 	else
-		MESSAGE_BEGIN(MSG_BROADCAST, SVC_TEMPENTITY);
+		MESSAGE_BEGIN( MSG_BROADCAST, SVC_TEMPENTITY );
 
 	WRITE_BYTE(29);
 	WRITE_BYTE(textparms.channel & 0xFF);
-	WRITE_SHORT(FixedSigned16(textparms.x, (1<<13)));
+	WRITE_SHORT(FixedSigned16(textparms.x, (1<<13) ));
-	WRITE_SHORT(FixedSigned16(textparms.y, (1<<13)));
+	WRITE_SHORT(FixedSigned16(textparms.y, (1<<13) ));
 	WRITE_BYTE(textparms.effect);
 	WRITE_BYTE(textparms.r1);
 	WRITE_BYTE(textparms.g1);
@@ -262,34 +237,30 @@ void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pM
 	WRITE_BYTE(255);
 	WRITE_BYTE(250);
 	WRITE_BYTE(0);
-	WRITE_SHORT(FixedUnsigned16(textparms.fadeinTime, (1<<8)));
+	WRITE_SHORT(FixedUnsigned16(textparms.fadeinTime, (1<<8) ));
-	WRITE_SHORT(FixedUnsigned16(textparms.fadeoutTime, (1<<8)));
+	WRITE_SHORT(FixedUnsigned16(textparms.fadeoutTime, (1<<8) ));
-	WRITE_SHORT(FixedUnsigned16(textparms.holdTime, (1<<8)));
+	WRITE_SHORT(FixedUnsigned16(textparms.holdTime, (1<<8) ));
-	
+	if (textparms.effect==2)
-	if (textparms.effect == 2)
+		WRITE_SHORT(FixedUnsigned16(textparms.fxTime, (1<<8) ) );
-		WRITE_SHORT(FixedUnsigned16(textparms.fxTime, (1<<8)));
-	
 	WRITE_STRING(pMessage);
 	MESSAGE_END();
 }
 
 /* warning - buffer of msg must be longer than 190 chars!
 (here in AMX it is always longer) */
-void UTIL_ClientPrint(edict_t *pEntity, int msg_dest, char *msg)
+void UTIL_ClientPrint( edict_t *pEntity, int msg_dest,  char *msg )
 {
 	if (!gmsgTextMsg)
 		return;				// :TODO: Maybe output a warning log?
 
 	char c = msg[190];
 	msg[190] = 0; // truncate without checking with strlen()
-	
+	if ( pEntity )
-	if (pEntity)
+		MESSAGE_BEGIN( MSG_ONE, gmsgTextMsg, NULL, pEntity );
-		MESSAGE_BEGIN(MSG_ONE, gmsgTextMsg, NULL, pEntity);
 	else
-		MESSAGE_BEGIN(MSG_BROADCAST, gmsgTextMsg);
+		MESSAGE_BEGIN( MSG_BROADCAST , gmsgTextMsg);
-	
+	WRITE_BYTE( msg_dest );
-	WRITE_BYTE(msg_dest);
+	WRITE_STRING( msg );
-	WRITE_STRING(msg);
 	MESSAGE_END();
 	msg[190] = c;
 }
@@ -333,7 +304,7 @@ void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1,
 		// store argument
 		g_fakecmd.argv[1] = arg1;
 		// build argument line
-		snprintf(g_fakecmd.args, 255, "%s", arg1);
+		snprintf( g_fakecmd.args, 255, "%s", arg1);
 		// if snprintf reached 255 chars limit, this will make sure there will be no access violation
 		g_fakecmd.args[255] = 0;
 	}

amxmodx/vault.cpp

@@ -34,49 +34,52 @@
 
 Vault g_vault;
 
-static cell AMX_NATIVE_CALL set_vaultdata(AMX *amx, cell *params)
+static cell AMX_NATIVE_CALL set_vaultdata(AMX *amx,cell *params)
 {
   int iLen;
 
-	g_vault.put(get_amxstring(amx, params[1], 0, iLen), get_amxstring(amx, params[2], 1, iLen));
+  g_vault.put( get_amxstring(amx,params[1],0,iLen) , get_amxstring(amx,params[2],1,iLen) );
   g_vault.saveVault();
 
   return 1;
 }
 
-static cell AMX_NATIVE_CALL get_vaultdata(AMX *amx, cell *params)
+static cell AMX_NATIVE_CALL get_vaultdata(AMX *amx,cell *params)
 {
   int iLen;
-	const char* key = get_amxstring(amx, params[1], 0, iLen);
 
-	if (params[3])
+  const char* key = get_amxstring(amx,params[1],0,iLen);
-		return set_amxstring(amx, params[2], g_vault.get(key), params[3]);
 
-	return g_vault.get_number(key);
+  if ( params[3] )
+    return set_amxstring( amx , params[2] , g_vault.get( key ) , params[3] );
+
+  return g_vault.get_number( key );
 }
 
-static cell AMX_NATIVE_CALL remove_vaultdata(AMX *amx, cell *params)
+static cell AMX_NATIVE_CALL remove_vaultdata(AMX *amx,cell *params)
 {
   int iLen;
 
-	g_vault.remove(get_amxstring(amx, params[1], 0, iLen));
+  g_vault.remove( get_amxstring(amx,params[1],0,iLen) );
   g_vault.saveVault();
 
   return 1;
 }
 
-static cell AMX_NATIVE_CALL vaultdata_exists(AMX *amx, cell *params)
+static cell AMX_NATIVE_CALL vaultdata_exists(AMX *amx,cell *params)
 {
   int iLen;
-	return g_vault.exists(get_amxstring(amx, params[1], 0, iLen)) ? 1 : 0;
+
+  return g_vault.exists( get_amxstring(amx,params[1],0,iLen) ) ? 1 : 0;
 }
 
-AMX_NATIVE_INFO vault_Natives[] =
+AMX_NATIVE_INFO vault_Natives[] = {
-{
+  { "set_vaultdata",  set_vaultdata },
-	{"set_vaultdata",		set_vaultdata},
+  { "get_vaultdata",  get_vaultdata },
-	{"get_vaultdata",		get_vaultdata},
+  { "remove_vaultdata", remove_vaultdata  },
-	{"remove_vaultdata",	remove_vaultdata},
+  { "delete_vaultdata", remove_vaultdata  },
-	{"delete_vaultdata",	remove_vaultdata},
+  { "vaultdata_exists", vaultdata_exists  },
-	{"vaultdata_exists",	vaultdata_exists},
+  { 0, 0 }
-	{0,						0}
 };
+
+

amxmodx/version.rc

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

compiler/amxxpc/amxxpc.cpp

@@ -30,11 +30,7 @@ int main(int argc, char **argv)
 #endif
 
 #ifdef __linux__
-	HINSTANCE lib = NULL;
+	HINSTANCE lib = dlmount("./amxxpc32.so");
-	if (FileExists("./amxxpc32.so"))
-		lib = dlmount("./amxxpc32.so");
-	else
-		lib = dlmount("amxxpc32.so");
 #else
 	HINSTANCE lib = dlmount("amxxpc32.dll");
 #endif
@@ -105,12 +101,9 @@ int main(int argc, char **argv)
 
 	unlink(file);
 
-	HINSTANCE lib64 = NULL;
+	HINSTANCE lib64 = 0;
 #ifdef __linux__
-	if (FileExists("./amxxpc64.so"))
 	lib64 = dlmount("./amxxpc64.so");
-	else
-		lib64 = dlmount("amxxpc64.so");
 #else
 	lib64 = dlmount("amxxpc64.dll");
 #endif
@@ -381,15 +374,3 @@ void show_help()
 	printf("\t-p<name> set name of \"prefix\" file\n");
 	printf("\t-r[name] write cross reference report to console or to specified file\n");
 }
-
-#ifdef __linux__
-bool FileExists(const char *file)
-{
-	FILE *fp = fopen(file, "rb");
-	if (!fp)
-		return false;
-	fclose(fp);
-	return true;
-}
-#endif
-

compiler/amxxpc/amxxpc.h

@@ -1,7 +1,7 @@
 #ifndef _AMXXSC_INCLUDE_H
 #define _AMXXSC_INCLUDE_H
 
-#define VERSION_STRING		"1.70-300"
+#define VERSION_STRING		"1.50-300"
 #define VERSION				03000
 #define MAGIC_HEADER		0x414D5842
 #define MAGIC_HEADER2		0x414D5858
@@ -67,8 +67,4 @@ struct BinPlugin
 	int32_t offs;		//file offset
 };
 
-#ifdef __linux__
-bool FileExists(const char *file);
-#endif
-
 #endif //_AMXXSC_INCLUDE_H

compiler/libpc300/Makefile

@@ -18,7 +18,7 @@ INCLUDE = -I.
 ifeq "$(PAWN64)" "true"
 	BINARY = $(NAME)64.so
 	BIN_DIR = Release64
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -Dpc_printf=pc_printf64
+	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64
 else
 	BINARY = $(NAME)32.so
 	BIN_DIR = Release32

compiler/libpc300/libpawnc.c

@@ -65,16 +65,12 @@
  * purpose messages; errors go through pc_error(). The function is modelled
  * after printf().
  */
-#if PAWN_CELL_SIZE==32
 #if defined __WIN32__ || defined _WIN32 || defined WIN32
  __declspec (dllexport)
 int pc_printf(const char *message,...)
 #else
 extern int pc_printf(const char *message,...)
 #endif
-#else
-int pc_printf(const char *message, ...)
-#endif
 {
 #if PAWN_CELL_SIZE==32
   int ret;

compiler/libpc300/libpc300.sln

@@ -6,8 +6,6 @@ EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
-		Debug32 = Debug32
-		Debug64 = Debug64
 		Release = Release
 		Release32 = Release32
 		Release64 = Release64
@@ -15,10 +13,6 @@ Global
 	GlobalSection(ProjectConfiguration) = postSolution
 		{19B72687-080B-437A-917A-12AEB0031635}.Debug.ActiveCfg = Release|Win32
 		{19B72687-080B-437A-917A-12AEB0031635}.Debug.Build.0 = Release|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug32.ActiveCfg = Debug32|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug32.Build.0 = Debug32|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug64.ActiveCfg = Debug64|Win32
-		{19B72687-080B-437A-917A-12AEB0031635}.Debug64.Build.0 = Debug64|Win32
 		{19B72687-080B-437A-917A-12AEB0031635}.Release.ActiveCfg = Release|Win32
 		{19B72687-080B-437A-917A-12AEB0031635}.Release.Build.0 = Release|Win32
 		{19B72687-080B-437A-917A-12AEB0031635}.Release32.ActiveCfg = Release32|Win32

compiler/libpc300/libpc300.vcproj

@@ -4,7 +4,6 @@
 	Version="7.10"
 	Name="libpc300"
 	ProjectGUID="{19B72687-080B-437A-917A-12AEB0031635}"
-	RootNamespace="libpc300"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -201,104 +200,6 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
-		<Configuration
-			Name="Debug32|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=32;NO_MAIN"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="1"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/amxxpc32.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/libpc300.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug64|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBPC300_EXPORTS;PAWNC_DLL;PAWN_CELL_SIZE=64;NO_MAIN"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="1"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/amxxpc64.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/libpc300.pdb"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/libpc300.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -346,6 +247,9 @@
 			<File
 				RelativePath=".\scstate.c">
 			</File>
+			<File
+				RelativePath=".\scstub.c">
+			</File>
 			<File
 				RelativePath=".\scvars.c">
 			</File>
@@ -368,12 +272,6 @@
 			<File
 				RelativePath=".\libpawnc.rc">
 			</File>
-			<File
-				RelativePath=".\sc5.scp">
-			</File>
-			<File
-				RelativePath=".\sc7.scp">
-			</File>
 		</Filter>
 	</Files>
 	<Globals>

compiler/libpc300/sc.h

@@ -63,12 +63,6 @@
 #define PREPROC_TERM  '\x7f'/* termination character for preprocessor expressions (the "DEL" code) */
 #define sDEF_PREFIX   "default.inc" /* default prefix filename */
 
-#if defined WIN32
-#define INVISIBLE
-#else
-#define INVISIBLE __attribute__((visibility("protected")))
-#endif
-
 typedef union {
   void *pv;                 /* e.g. a name */
   int i;
@@ -441,16 +435,12 @@ int pc_enablewarning(int number,int enable);
  */
 
 /* general console output */
-#if PAWN_CELL_SIZE==32
 #if defined __WIN32__ || defined _WIN32 || defined WIN32
  __declspec (dllexport)
 int pc_printf(const char *message,...);
 #else
 extern int pc_printf(const char *message,...);
 #endif
-#else
-int pc_printf(const char *message, ...) INVISIBLE;
-#endif
 
 /* error report function */
 int pc_error(int number,char *message,char *filename,int firstline,int lastline,va_list argptr);
@@ -639,7 +629,7 @@ SC_FUNC void jmp_eq0(int number);
 SC_FUNC void outval(cell val,int newline);
 
 /* function prototypes in SC5.C */
-SC_FUNC int error(int number,...) INVISIBLE;
+SC_FUNC int error(int number,...) __attribute__((visibility("protected")));
 SC_FUNC void errorset(int code);
 
 /* function prototypes in SC6.C */

compiler/libpc300/sc1.c

@@ -62,7 +62,7 @@
 #endif
 
 #include "sc.h"
-#define VERSION_STR "3.0.3367-amxx"
+#define VERSION_STR "3.0.3367"
 #define VERSION_INT 0x300
 
 static void resetglobals(void);
@@ -531,7 +531,6 @@ int pc_compile(int argc, char *argv[])
     delete_symbols(&glbtab,0,TRUE,FALSE);
     #if !defined NO_DEFINE
       delete_substtable();
-      insert_subst("__DATE__", "\"" __DATE__ "\"", 8);
     #endif
     resetglobals();
     sc_ctrlchar=sc_ctrlchar_org;
@@ -546,6 +545,7 @@ int pc_compile(int argc, char *argv[])
     fline=skipinput;            /* reset line number */
     sc_reparse=FALSE;           /* assume no extra passes */
     sc_status=statFIRST;        /* resetglobals() resets it to IDLE */
+
     if (strlen(incfname)>0) {
       if (strcmp(incfname,sDEF_PREFIX)==0) {
         plungefile(incfname,FALSE,TRUE);    /* parse "default.inc" */
@@ -595,7 +595,6 @@ int pc_compile(int argc, char *argv[])
   delete_symbols(&glbtab,0,TRUE,FALSE);
   #if !defined NO_DEFINE
     delete_substtable();
-    insert_subst("__DATE__", "\"" __DATE__ "\"", 8);
   #endif
   resetglobals();
   sc_ctrlchar=sc_ctrlchar_org;
@@ -1228,10 +1227,7 @@ static void setconfig(char *root)
       GetModuleFileName(NULL,path,_MAX_PATH);
     #elif defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
       /* see www.autopackage.org for the BinReloc module */
-      ptr = SELFPATH;
+      strncpy(path,SELFPATH,sizeof path);
-      if (!ptr)
-        ptr = root;
-      strncpy(path,ptr,sizeof path);
     #else
       if (root!=NULL)
         strncpy(path,root,sizeof path); /* path + filename (hopefully) */
@@ -1922,10 +1918,8 @@ static int declloc(int fstatic)
     /* Although valid, a local variable whose name is equal to that
      * of a global variable or to that of a local variable at a lower
      * level might indicate a bug.
-	 * NOTE - don't bother with the error if there's no valid function!
      */
     if ((sym=findloc(name))!=NULL && sym->compound!=nestlevel || findglb(name)!=NULL)
-	  if (curfunc!=NULL && (curfunc->usage & uNATIVE))
       error(219,name);                  /* variable shadows another symbol */
     while (matchtoken('[')){
       ident=iARRAY;
@@ -3184,7 +3178,7 @@ static int newfunc(char *firstname,int firsttag,int fpublic,int fstatic,int stoc
   if ((sym->usage & (uPROTOTYPED | uREAD))==uREAD && sym->tag!=0) {
     int curstatus=sc_status;
     sc_status=statWRITE;  /* temporarily set status to WRITE, so the warning isn't blocked */
-    //error(208);		  //this is silly, it should be caught the first pass
+    error(208);
     sc_status=curstatus;
     sc_reparse=TRUE;      /* must add another pass to "initial scan" phase */
   } /* if */
@@ -3304,8 +3298,9 @@ static int newfunc(char *firstname,int firsttag,int fpublic,int fstatic,int stoc
 
 static int argcompare(arginfo *a1,arginfo *a2)
 {
-  int result=1,level,i;
+  int result,level,i;
 
+  result= strcmp(a1->name,a2->name)==0;     /* name */
   if (result)
     result= a1->ident==a2->ident;           /* type/class */
   if (result)
@@ -3648,7 +3643,7 @@ static void doarg(char *name,int ident,int offset,int tags[],int numtags,
   if (argsym!=NULL) {
     error(21,name);             /* symbol already defined */
   } else {
-    if ((argsym=findglb(name))!=NULL && argsym->ident!=iFUNCTN && curfunc!=NULL)
+    if ((argsym=findglb(name))!=NULL && argsym->ident!=iFUNCTN)
       error(219,name);          /* variable shadows another symbol */
     /* add details of type and address */
     assert(numtags>0);

compiler/libpc300/sc2.c

@@ -715,6 +715,18 @@ static int ftoi(cell *val,const unsigned char *curptr)
       #endif
     #elif PAWN_CELL_SIZE==64
       *val=*((cell *)&fnum);
+      #if !defined NDEBUG
+        /* I assume that the C/C++ compiler stores "double" values in IEEE 754
+         * format (as mandated in the ANSI standard).
+         */
+        { float test1 = 0.0, test2 = 50.0, test3 = -50.0;
+          uint64_t bit = 1;
+          /* test 0.0 == all bits 0 */
+          assert(*(uint64_t*)&test1==0x00000000L);
+          /* test sign & magnitude format */
+          assert(((*(uint64_t*)&test2) ^ (*(uint64_t*)&test3)) == (bit << (PAWN_CELL_SIZE-1)));
+        }
+      #endif
     #else
       #error Unsupported cell size
     #endif
@@ -1189,7 +1201,6 @@ static int command(void)
 #endif
 #if !defined NO_DEFINE
   case tpDEFINE: {
-    int flag=0;
     ret=CMD_DEFINE;
     if (!SKIPPING) {
       char *pattern,*substitution;
@@ -1201,13 +1212,7 @@ static int command(void)
         lptr++;
       start=lptr;       /* save starting point of the match pattern */
       count=0;
-      while (*lptr!='\0') {
+      while (*lptr>' ' && *lptr!='\0') {
-        if (*lptr=='(')
-          flag=1;
-        if (flag && *lptr==')')
-          flag=0;
-        if (!flag && *lptr<=' ')
-          break;
         litchar(&lptr,0); /* litchar() advances "lptr" and handles escape characters */
         count++;
       } /* while */
@@ -1414,7 +1419,7 @@ static int substpattern(unsigned char *line,size_t buffersize,char *pattern,char
   int prefixlen;
   const unsigned char *p,*s,*e;
   unsigned char *args[10];
-  int match,arg,len,argsnum=0;
+  int match,arg,len;
 
   memset(args,0,sizeof args);
 
@@ -1454,8 +1459,6 @@ static int substpattern(unsigned char *line,size_t buffersize,char *pattern,char
         /* store the parameter (overrule any earlier) */
         if (args[arg]!=NULL)
           free(args[arg]);
-		else
-          argsnum++;
         len=(int)(e-s);
         args[arg]=(unsigned char*)malloc(len+1);
         if (args[arg]==NULL)
@@ -1512,17 +1515,14 @@ static int substpattern(unsigned char *line,size_t buffersize,char *pattern,char
   if (match) {
     /* calculate the length of the substituted string */
     for (e=(unsigned char*)substitution,len=0; *e!='\0'; e++) {
-      if (*e=='%' && isdigit(*(e+1)) && argsnum) {
+      if (*e=='%' && isdigit(*(e+1))) {
         arg=*(e+1)-'0';
         assert(arg>=0 && arg<=9);
-        if (args[arg]!=NULL) {
+        if (args[arg]!=NULL)
           len+=strlen((char*)args[arg]);
         e++;          /* skip %, digit is skipped later */
       } else {
         len++;
-        }
-      } else {
-        len++;
       } /* if */
     } /* for */
     /* check length of the string after substitution */
@@ -1538,21 +1538,8 @@ static int substpattern(unsigned char *line,size_t buffersize,char *pattern,char
           if (args[arg]!=NULL) {
             strins((char*)s,(char*)args[arg],strlen((char*)args[arg]));
             s+=strlen((char*)args[arg]);
-            e++;          /* skip %, digit is skipped later */
-          } else {
-            strins((char*)s,(char*)e,1);
-            s++;
           } /* if */
-        } else if (*e=='"') {
+          e++;          /* skip %, digit is skipped later */
-          p=e;
-          if (is_startstring(e)) {              /* skip strings */
-            e=skipstring(e);
-            strins((char*)s,(char*)p,(e-p+1));
-            s+=(e-p+1);
-          } else {
-            strins((char*)s,(char*)e,1);
-            s++;
-          }
         } else {
           strins((char*)s,(char*)e,1);
           s++;
@@ -1591,7 +1578,7 @@ static void substallpatterns(unsigned char *line,int buffersize)
     if (*start=='\0')
       break;            /* abort loop on error */
     /* if matching the operator "defined", skip it plus the symbol behind it */
-    if (strncmp((char*)start,"defined",7)==0 && !isalpha((char)*(start+7))) {
+    if (strncmp((char*)start,"defined",7)==0 && *(start+7)<=' ') {
       start+=7;         /* skip "defined" */
       /* skip white space & parantheses */
       while (*start<=' ' && *start!='\0' || *start=='(')
@@ -2464,7 +2451,7 @@ static symbol *find_symbol(const symbol *root,const char *name,int fnumber,int i
   while (ptr!=NULL) {
     if (hash==ptr->hash && strcmp(name,ptr->name)==0
         && (ptr->parent==NULL || includechildren)
-		&& (fnumber<0 || (ptr->fnumber<0 || ptr->fnumber==fnumber)))
+        && (ptr->fnumber<0 || ptr->fnumber==fnumber))
       return ptr;
     ptr=ptr->next;
   } /* while */

compiler/libpc300/sc3.c

@@ -375,13 +375,7 @@ static int skim(int *opstr,void (*testfunc)(int),int dropval,int endval,
         droplab=getlabel();
       } /* if */
       dropout(lvalue,testfunc,droplab,lval);
-      if (!lvalue && sc_intest && (lval->ident==iARRAY || lval->ident==iREFARRAY)) {
-        error(33, lval->sym ? (lval->sym->name ? lval->sym->name : "-unknown") : "-unknown-");  /* array was not indexed in an expression */
-      }
     } else if (hits) {                       /* no (more) identical operators */
-      if (!lvalue && sc_intest && (lval->ident==iARRAY || lval->ident==iREFARRAY)) {
-        error(33, lval->sym ? (lval->sym->name ? lval->sym->name : "-unknown") : "-unknown-");  /* array was not indexed in an expression */
-      }
       dropout(lvalue,testfunc,droplab,lval); /* found at least one operator! */
       ldconst(endval,sPRI);
       jumplabel(endlab=getlabel());
@@ -970,12 +964,8 @@ static int hier14(value *lval1)
     check_userop(NULL,lval2.tag,lval3.tag,2,&lval3,&lval2.tag);
     store(&lval3);      /* now, store the expression result */
   } /* if */
-  if (!oper) {  /* tagname mismatch (if "oper", warning already given in plunge2()) */
+  if (!oper && !matchtag(lval3.tag,lval2.tag,TRUE))
-    if (lval3.sym && !matchtag(lval3.sym->tag, lval2.tag, TRUE))
+    error(213);         /* tagname mismatch (if "oper", warning already given in plunge2()) */
-      error(213);
-    else if (!lval3.sym && !matchtag(lval3.tag, lval2.tag, TRUE))
-      error(213);
-  }
   if (lval3.sym)
     markusage(lval3.sym,uWRITTEN);
   sideeffect=TRUE;
@@ -1017,10 +1007,10 @@ static int hier13(value *lval)
     array1= (lval->ident==iARRAY || lval->ident==iREFARRAY);
     array2= (lval2.ident==iARRAY || lval2.ident==iREFARRAY);
     if (array1 && !array2) {
-      char *ptr=(lval->sym!=NULL && lval->sym->name!=NULL) ? lval->sym->name : "-unknown-";
+      char *ptr=(lval->sym->name!=NULL) ? lval->sym->name : "-unknown-";
       error(33,ptr);            /* array must be indexed */
     } else if (!array1 && array2) {
-      char *ptr=(lval2.sym!=NULL && lval2.sym->name!=NULL) ? lval2.sym->name : "-unknown-";
+      char *ptr=(lval2.sym->name!=NULL) ? lval2.sym->name : "-unknown-";
       error(33,ptr);            /* array must be indexed */
     } /* if */
     /* ??? if both are arrays, should check dimensions */
@@ -1599,7 +1589,7 @@ restart:
       error(76);                /* invalid function call, or syntax error */
     } /* if */
     return FALSE;
-  }
+  } /* if */
   return lvalue;
 }
 
@@ -1902,7 +1892,7 @@ static int nesting=0;
       if (matchtoken('_')) {
         arglist[argpos]=ARG_IGNORED;  /* flag argument as "present, but ignored" */
         if (arg[argidx].ident==0 || arg[argidx].ident==iVARARGS) {
-          error(88);             /* argument count mismatch */
+          error(202);             /* argument count mismatch */
         } else if (!arg[argidx].hasdefault) {
           error(34,nargs+1);      /* argument has no default value */
         } /* if */
@@ -1918,7 +1908,7 @@ static int nesting=0;
         lvalue=hier14(&lval);
         switch (arg[argidx].ident) {
         case 0:
-          error(88);             /* argument count mismatch */
+          error(202);             /* argument count mismatch */
           break;
         case iVARARGS:
           /* always pass by reference */
@@ -1926,7 +1916,7 @@ static int nesting=0;
             assert(lval.sym!=NULL);
             if ((lval.sym->usage & uCONST)!=0 && (arg[argidx].usage & uCONST)==0) {
               /* treat a "const" variable passed to a function with a non-const
-               * "variable argument flist" as a constant here */
+               * "variable argument list" as a constant here */
               assert(lvalue);
               rvalue(&lval);      /* get value in PRI */
               setheap_pri();      /* address of the value on the heap in PRI */
@@ -2138,7 +2128,7 @@ static int nesting=0;
       markexpr(sPARM,NULL,0);   /* mark the end of a sub-expression */
       nest_stkusage++;
     } else {
-      error(88,argidx);        /* argument count mismatch */
+      error(202,argidx);        /* argument count mismatch */
     } /* if */
     if (arglist[argidx]==ARG_UNHANDLED)
       nargs++;
@@ -2212,8 +2202,7 @@ static int nesting=0;
     if ((sym->usage & uNATIVE)==0)
       totalsize++;                    /* add "call" opcode */
     totalsize+=nest_stkusage;
-    if (!curfunc) /* if we got here, the function is invalid! */
+    assert(curfunc!=NULL);
-      return;
     if (curfunc->x.stacksize<totalsize)
       curfunc->x.stacksize=totalsize;
     nest_stkusage-=nargs+heapalloc+1; /* stack/heap space, +1 for argcount param */

compiler/libpc300/sc5.scp

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

compiler/libpc300/sc6.c

@@ -581,8 +581,6 @@ SC_FUNC int assemble(FILE *fout,FILE *fin)
   constvalue *constptr;
   cell mainaddr;
 
-  fcurrent = -1;
-
   /* if compression failed, restart the assembly with compaction switched off */
   if (setjmp(compact_err)!=0) {
     assert(sc_compress);  /* cannot arrive here if compact encoding was disabled */

compiler/libpc300/sclist.c

@@ -450,14 +450,9 @@ SC_FUNC stringlist *insert_dbgsymbol(symbol *sym)
 #endif
     if (sym->ident==iARRAY || sym->ident==iREFARRAY) {
       symbol *sub;
-#if !defined NDEBUG
-	  count = sym->dim.array.level;
-#endif
       strcat(string," [ ");
       for (sub=sym; sub!=NULL; sub=finddepend(sub)) {
-#if !defined NDEBUG
+        assert(sub->dim.array.level==count++);
-        assert(sub->dim.array.level==count--);
-#endif
         sprintf(string+strlen(string),"%x:%x ",sub->x.idxtag,sub->dim.array.length);
       } /* for */
       strcat(string,"]");

configs/amxx.cfg

@@ -33,12 +33,9 @@ amx_freq_imessage 180
 // Set in seconds how fast players can chat (chat-flood protection)
 amx_flood_time 0.75
 
-// Amount of reserved slots, amx_hideslots must be 1 to use this cvar (for more details see comments in plugin source)
+// Amount of reserved slots (for more details see comments in a plugin source)
 amx_reservation 0
 
-// If you set this to 1, you can hide slots on your server
-amx_hideslots 0
-
 // Displaying of time remaining
 // a - display white text on bottom
 // b - use voice
@@ -80,8 +77,3 @@ amx_client_languages 1
 // 2 - All plugins are put in debug mode
 // Note - debug mode will affect JIT performance
 amx_debug 1
-
-// Plugin MultiLingual Debug
-// To debug a language put its 2 letter code between quotes ("en", "de", etc)
-// "" means disabled
-amx_mldebug ""

configs/core.ini

@@ -14,26 +14,3 @@ amxx_vault	addons/amxmodx/data/vault.ini
 ; 2 - one logfile / map
 ; 3 - HL Logs
 amxx_logging	1
-
-; Binary logging level
-; add these up to get what you want
-; these only work with bin logging binaries
-; 1  - default
-; 2  - log internal string sets/gets
-; 4  - log internal formats
-; 8  - log all native params
-; 16 - log internal function calls (only in debug mode)
-; 32 - log line number accesses (only in debug mode)
-bin_logging	49
-
-; Maximum binary log size, in megs
-max_binlog_size	20
-
-; Plugin optimization flags - add these up to get what you want
-; lowering these may stop crashes on very old CPUs
-; set 65536 to disable optimizer, NOT 0!
-;-------------
-; 1 - float arithmetic
-; 2 - float comparisons
-; 4 - float rounding
-optimizer	7

configs/cstrike/amxx.cfg

@@ -33,12 +33,9 @@ amx_freq_imessage 180
 // Set in seconds how fast players can chat (chat-flood protection)
 amx_flood_time 0.75
 
-// Amount of reserved slots, amx_hideslots must be 1 to use this cvar (for more details see comments in plugin source)
+// Amount of reserved slots (for more details see comments in a plugin source)
 amx_reservation 0
 
-// If you set this to 1, you can hide slots on your server
-amx_hideslots 0
-
 // Displaying of time remaining
 // a - display white text on bottom
 // b - use voice
@@ -96,8 +93,3 @@ amx_client_languages 1
 // 2 - All plugins are put in debug mode
 // Note - debug mode will affect JIT performance
 amx_debug 1
-
-// Plugin MultiLingual Debug
-// To debug a language put its 2 letter code between quotes ("en", "de", etc)
-// "" means disabled
-amx_mldebug ""

configs/cstrike/core.ini

@@ -16,26 +16,3 @@ csstats		addons/amxmodx/data/csstats.dat
 ; 2 - one logfile / map
 ; 3 - HL Logs
 amxx_logging	1
-
-; Binary logging level
-; add these up to get what you want
-; these only work with bin logging binaries
-; 1  - default
-; 2  - log internal string sets/gets
-; 4  - log internal formats
-; 8  - log all native params
-; 16 - log internal function calls (only in debug mode)
-; 32 - log line number accesses (only in debug mode)
-bin_logging	49
-
-; Maximum binary log size, in megs
-max_binlog_size	20
-
-; Plugin optimization flags - add these up to get what you want
-; lowering these may stop crashes on very old CPUs
-; set 65536 to disable optimizer, NOT 0!
-;-------------
-; 1 - float arithmetic
-; 2 - float comparisons
-; 4 - float rounding
-optimizer	7