Tagged 0.10

amxmodx/CCmd.cpp

@@ -29,7 +29,9 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
 #include "CCmd.h"
 
 // *****************************************************
@@ -56,8 +58,8 @@ CmdMngr::Command::Command( CPluginMngr::CPlugin* pplugin,const char* pcmd,
 	char szCmd[64], szArg[64];
 	*szCmd = 0; *szArg=0;
 	sscanf(pcmd,"%s %s",szCmd,szArg);
-	command.assign(szCmd);
+	command.set(szCmd);
-	argument.assign(szArg);
+	argument.set(szArg);
 	plugin = pplugin;
 	flags = pflags;
 	cmdtype = 0;
@@ -238,7 +240,7 @@ void CmdMngr::registerPrefix( const char* nn )
 CmdMngr::CmdPrefix** CmdMngr::findPrefix(  const char* nn ){
 	CmdPrefix** aa = &prefixHead;
 	while(*aa){
-		if ( !strncmp( (*aa)->name.c_str(), nn, (*aa)->name.size() ) ) 
+		if ( !strncmp( (*aa)->name.str(), nn, (*aa)->name.size() ) ) 
 			break;
 		aa=&(*aa)->next;
 	}
@@ -274,4 +276,3 @@ void CmdMngr::clearBufforedInfo() {
 }
 
 int CmdMngr::Command::uniqueid = 0;
-

amxmodx/CCmd.h

@@ -67,12 +67,12 @@ public:
 		~Command();
 	public:
 
-		inline const char* getCommand() { return command.c_str(); }
+		inline const char* getCommand() const{ return command.str(); }
-		inline const char* getArgument() { return argument.c_str(); }
+		inline const char* getArgument() const{ return argument.str(); }
-		inline const char* getCmdInfo() { return info.c_str(); }
+		inline const char* getCmdInfo() const{ return info.str(); }
-		inline const char* getCmdLine() { return commandline.c_str(); }
+		inline const char* getCmdLine() const{ return commandline.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.str()+prefix, cmd+prefix ) && (argument.empty() || !stricmp(argument.str() , arg ))); }
-		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.c_str(), cmd ));	}
+		inline bool matchCommand(const char* cmd) {	return (!strcmp(command.str(), cmd ));	}
 		inline int getFunction() const { return function; }
 		inline bool gotAccess(int f) const { return (!flags||((flags & f)==flags)); }
 		inline CPluginMngr::CPlugin* getPlugin() { return plugin; }
@@ -100,8 +100,8 @@ private:
 	CmdLink* clcmdlist;
 
 	struct CmdPrefix {
-		String name;
 		CmdMngr* parent;
+		String name;
 		CmdLink* list;
 		CmdPrefix* next;
 		CmdPrefix( const char* nn , CmdMngr* pp) : 	name(nn),parent(pp),list(0),next(0){}

amxmodx/CEvent.cpp

@@ -29,7 +29,9 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
 #include "CEvent.h"
 
 // *****************************************************
@@ -42,9 +44,6 @@ EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin,  int func, int flags)
 	m_Func = func;
 
 	// flags
-	m_FlagAlive = true;
-	m_FlagDead = true;
-
 	m_FlagWorld = (flags & 1) ? true : false;						// flag a
 	m_FlagPlayer = (flags & 2) ? true : false;						// flag b
 	m_FlagOnce = (flags & 4) ? true : false;						// flag c
@@ -56,58 +55,11 @@ EventsMngr::ClEvent::ClEvent(CPluginMngr::CPlugin* plugin,  int func, int flags)
 
 	m_Stamp = 0.0f;
 	m_Done = false;
-
-	m_Conditions = NULL;
 }
 
 EventsMngr::ClEvent::~ClEvent()
 {
-	cond_t *tmp1 = m_Conditions;
-	cond_t *tmp2 = NULL;
-	while (tmp1)
-	{
-		tmp2 = tmp1->next;
-		delete tmp1;
-		tmp1 = tmp2;
-	}
-	m_Conditions = NULL;
-}
 
-void EventsMngr::NextParam()
-{
-	const int INITIAL_PARSEVAULT_SIZE = 32;
-
-	if (m_ParsePos < m_ParseVaultSize)
-		return;
-
-	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;
-		m_ParseVault = NULL;
-	}
-
-	if (m_ParseVaultSize > 0)
-		m_ParseVaultSize *= 2;
-	else
-		m_ParseVaultSize = INITIAL_PARSEVAULT_SIZE;
-
-	m_ParseVault = new MsgDataEntry[m_ParseVaultSize];
-	if (tmp)
-	{
-		memcpy(m_ParseVault, tmp, tmpSize * sizeof(MsgDataEntry));
-		delete [] tmp;
-		tmp = NULL;
-	}
 }
 
 int EventsMngr::ClEvent::getFunction()
@@ -117,9 +69,6 @@ int EventsMngr::ClEvent::getFunction()
 
 EventsMngr::EventsMngr()
 {
-	m_ParseVault = NULL;
-	m_ParseVaultSize = 0;
-	m_CurrentMsgType = -1;
 	clearEvents();
 }
 
@@ -157,34 +106,23 @@ void EventsMngr::ClEvent::registerFilter(char *filter)
 	if (!*value)
 		return;
 
-	cond_t *tmpCond = new cond_t;
+	CondMapPair pair;
-	if (!tmpCond)
-		return;
 
 	// type character
-	tmpCond->type = *value;
+	pair.second.type = *value;
 
-	// set a null here so param id can be recognized, and save it
+	// set a null here so param id can be recognized later
 	*value++ = 0;
-	tmpCond->paramId = atoi(filter);
 
 	// rest of line
-	tmpCond->sValue.assign(value);
+	pair.second.sValue = value;
-	tmpCond->fValue = atof(value);
+	pair.second.fValue = atof(value);
-	tmpCond->iValue = atoi(value);
+	pair.second.iValue = atoi(value);
 
-	tmpCond->next = NULL;
+	// param id
+	pair.first = atoi(filter);
 
-	if (m_Conditions)
+	m_Conditions.insert(pair);
-	{
-		cond_t *tmp = m_Conditions;
-		while (tmp->next)
-			tmp = tmp->next;
-		tmp->next = tmpCond;
-
-	}
-	else
-		m_Conditions = tmpCond;
 }
 
 EventsMngr::ClEvent* EventsMngr::registerEvent(CPluginMngr::CPlugin* plugin, int func, int flags, int msgid)
@@ -197,7 +135,7 @@ EventsMngr::ClEvent* EventsMngr::registerEvent(CPluginMngr::CPlugin* plugin, int
 	if (!event)
 		return NULL;
 
-	m_Events[msgid].put(event);
+	m_Events[msgid].push_back(event);
 
 	return event;
 }
@@ -207,44 +145,41 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 	if (msg_type < 0 || msg_type > MAX_AMX_REG_MSG)
 		return;
 
-	m_CurrentMsgType = msg_type;
-
 	m_ParseNotDone = false;
 	m_Timer = timer;
 
 	// don't parse if nothing to do
-	if (!m_Events[msg_type].size())
+	if (m_Events[msg_type].empty())
 		return;
 
-	for(ClEventVecIter iter = m_Events[msg_type].begin(); iter; ++iter)
+	for(ClEventVecIter iter = m_Events[msg_type].begin(); iter != m_Events[msg_type].end(); ++iter)
 	{
-		if ((*iter).m_Done)
+		if ((*iter)->m_Done)
 			continue;
 
-
+		if (!(*iter)->m_Plugin->isExecutable((*iter)->m_Func))
-		if (!(*iter).m_Plugin->isExecutable((*iter).m_Func))
 		{
-			(*iter).m_Done = true;
+			(*iter)->m_Done = true;
 			continue;
 		}
 
 		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;
+				(*iter)->m_Done = true;
 				continue;
 			}
 		}
-		else if (!(*iter).m_FlagWorld)
+		else if (!(*iter)->m_FlagWorld)
 		{
-			(*iter).m_Done = true;
+			(*iter)->m_Done = true;
 			continue;
 		}
 
-		if ((*iter).m_FlagOnce && (*iter).m_Stamp == (float)(*timer))
+		if ((*iter)->m_FlagOnce && (*iter)->m_Stamp == (float)(*timer))
 		{
-			(*iter).m_Done = true;
+			(*iter)->m_Done = true;
 			continue;
 		}
 		m_ParseNotDone = true;
@@ -252,10 +187,15 @@ void EventsMngr::parserInit(int msg_type, float* timer, CPlayer* pPlayer, int in
 
 	if (m_ParseNotDone)
 	{
+		// we don't clear it (performance)
+		if (m_ParseVault.size() < 1)
+		{
+			m_ParseVault.reserve(32);				// 32 as default
+			m_ParseVault.push_back(MsgDataVault());
+		}
 		m_ParsePos = 0;
-		NextParam();
+		m_ParseVault[m_ParsePos].type = MSG_INTEGER;
-		m_ParseVault[0].type = MSG_INTEGER;
+		m_ParseVault[m_ParsePos].iValue = index;
-		m_ParseVault[0].iValue = index;
 	}
 	m_ParseFun = &m_Events[msg_type];
 }
@@ -266,43 +206,45 @@ void EventsMngr::parseValue(int iValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
-
 	// grow if needed
-	++m_ParsePos;
+	if (m_ParseVault.size() <= static_cast<size_t>(++m_ParsePos))
-	NextParam();
+	{
+		MsgDataVault tmp;
+		m_ParseVault.push_back(tmp);
+	}
 
 	m_ParseVault[m_ParsePos].type = MSG_INTEGER;
 	m_ParseVault[m_ParsePos].iValue = iValue;
 
-	// loop through the registered funcs, and decide whether they have to be called or not
+	// loop through the registered funcs, and decide whether they have to be called
-	// if they shouldnt, their m_Done is set to true
+	bool skip;
-	for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter)
+	for (ClEventVecIter iter = m_ParseFun->begin(); iter != m_ParseFun->end(); ++iter)
 	{
-		if ((*iter).m_Done)
+		if ((*iter)->m_Done)
-			continue;		// already skipped; don't bother with parsing
+			continue;
 
-		// loop through conditions
+		skip = false;
-		bool execute = false;
+		ClEvent::CondMapIter condIter = (*iter)->m_Conditions.find(m_ParsePos);
-		bool anyConditions = false;
+		if (condIter == (*iter)->m_Conditions.end())
-		for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next)
+			continue;
+
+		do
 		{
-			if (condIter->paramId == m_ParsePos)
+			switch(condIter->second.type)
 			{
-				anyConditions = true;
+			case '=': if (condIter->second.iValue == iValue) skip=true; break;
-				switch(condIter->type)
+			case '!': if (condIter->second.iValue != iValue) skip=true; break;
-				{
+			case '&': if (iValue & condIter->second.iValue) skip=true; break;
-				case '=': if (condIter->iValue == iValue) execute=true; break;
+			case '<': if (iValue < condIter->second.iValue) skip=true; break;
-				case '!': if (condIter->iValue != iValue) execute=true; break;
+			case '>': if (iValue > condIter->second.iValue) skip=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)
+			if (skip)
 				break;
-			}
+		} while ( ++condIter != (*iter)->m_Conditions.end() );
-		}
+
-		if (anyConditions && !execute)
+		if (skip)
-			(*iter).m_Done = true;		// don't execute
+			continue;
+		(*iter)->m_Done = true;
 	}
 }
 
@@ -312,42 +254,44 @@ void EventsMngr::parseValue(float fValue)
 	if (!m_ParseNotDone || !m_ParseFun)
 		return;
 
-
 	// grow if needed
-	++m_ParsePos;
+	if (m_ParseVault.size() <= static_cast<size_t>(++m_ParsePos))
-	NextParam();
+	{
+		MsgDataVault tmp;
+		m_ParseVault.push_back(tmp);
+	}
 
 	m_ParseVault[m_ParsePos].type = MSG_FLOAT;
 	m_ParseVault[m_ParsePos].fValue = fValue;
 
-	// loop through the registered funcs, and decide whether they have to be called or not
+	// loop through the registered funcs, and decide whether they have to be called
-	// if they shouldnt, their m_Done is set to true
+	bool skip;
-	for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter)
+	for (ClEventVecIter iter = m_ParseFun->begin(); iter != m_ParseFun->end(); ++iter)
 	{
-		if ((*iter).m_Done)
+		if ((*iter)->m_Done)
-			continue;		// already skipped; don't bother with parsing
+			continue;
 
-		// loop through conditions
+		skip = false;
-		bool execute = false;
+		ClEvent::CondMapIter condIter = (*iter)->m_Conditions.find(m_ParsePos);
-		bool anyConditions = false;
+		if (condIter == (*iter)->m_Conditions.end())
-		for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next)
+			continue;
+
+		do
 		{
-			if (condIter->paramId == m_ParsePos)
+			switch(condIter->second.type)
 			{
-				anyConditions = true;
+			case '=': if (condIter->second.fValue == fValue) skip=true; break;
-				switch(condIter->type)
+			case '!': if (condIter->second.fValue != fValue) skip=true; break;
-				{
+			case '<': if (fValue < condIter->second.fValue) skip=true; break;
-				case '=': if (condIter->fValue == fValue) execute=true; break;
+			case '>': if (fValue > condIter->second.fValue) skip=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;
 			}
-				if (execute)
+			if (skip)
 				break;
-			}
+		} while ( ++condIter != (*iter)->m_Conditions.end() );
-		}
+
-		if (anyConditions && !execute)
+		if (skip)
-			(*iter).m_Done = true;		// don't execute
+			continue;
+		(*iter)->m_Done = true;
 	}
 }
 
@@ -358,70 +302,90 @@ void EventsMngr::parseValue(const char *sz)
 		return;
 
 	// grow if needed
-	++m_ParsePos;
+	if (m_ParseVault.size() <= static_cast<size_t>(++m_ParsePos))
-	NextParam();
+	{
+		MsgDataVault tmp;
+		m_ParseVault.push_back(tmp);
+	}
 
 	m_ParseVault[m_ParsePos].type = MSG_STRING;
 	m_ParseVault[m_ParsePos].sValue = sz;
 
-	// loop through the registered funcs, and decide whether they have to be called or not
+	// loop through the registered funcs, and decide whether they have to be called
-	// if they shouldnt, their m_Done is set to true
+	bool skip;
-	for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter)
+	for (ClEventVecIter iter = m_ParseFun->begin(); iter != m_ParseFun->end(); ++iter)
 	{
-		if ((*iter).m_Done)
+		if ((*iter)->m_Done)
-			continue;		// already skipped; don't bother with parsing
+			continue;
 
-		// loop through conditions
+		skip = false;
-		bool execute = false;
+		ClEvent::CondMapIter condIter = (*iter)->m_Conditions.find(m_ParsePos);
-		bool anyConditions = false;
+		if (condIter == (*iter)->m_Conditions.end())
-		for (ClEvent::cond_t *condIter = (*iter).m_Conditions; condIter; condIter = condIter->next)
+			continue;
+
+		do
 		{
-			if (condIter->paramId == m_ParsePos)
+			switch(condIter->second.type)
 			{
-				anyConditions = true;
+			case '=': if (!strcmp(sz, condIter->second.sValue.c_str())) skip=true; break;
-				switch(condIter->type)
+			case '!': if (!strstr(sz, condIter->second.sValue.c_str())) skip=true; break;
-				{
+			case '&': if (strstr(sz, condIter->second.sValue.c_str())) skip=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;
 			}
-				if (execute)
+			if (skip)
 				break;
-			}
+		} while ( ++condIter != (*iter)->m_Conditions.end() );
-		}
+
-		if (anyConditions && !execute)
+		if (skip)
-			(*iter).m_Done = true;		// don't execute
+			continue;
+		(*iter)->m_Done = true;
 	}
 }
 
 void EventsMngr::executeEvents()
 {
+	int err;
+
 	if (!m_ParseFun)
 	{
 		return;
 	}
 
-	for (ClEventVecIter iter = m_ParseFun->begin(); iter; ++iter)
+#ifdef ENABLEEXEPTIONS
+	try
 	{
-		if ( (*iter).m_Done ) 
+#endif		// #ifdef ENABLEEXEPTIONS
+		for (ClEventVecIter iter = m_ParseFun->begin(); iter != m_ParseFun->end(); ++iter)
 		{
-			(*iter).m_Done = false;
+			if ( (*iter)->m_Done ) 
+			{
+				(*iter)->m_Done = false;
 				continue;
 			}
-		(*iter).m_Stamp = (float)*m_Timer;
+
-		executeForwards((*iter).m_Func, m_ParseVault ? m_ParseVault[0].iValue : 0);
+			(*iter)->m_Stamp = *m_Timer;
+
+			if ((err = amx_Exec((*iter)->m_Plugin->getAMX(), NULL, (*iter)->m_Func, 1, m_ParseVault.size() ? m_ParseVault[0].iValue : 0)) != AMX_ERR_NONE)
+			{
+				UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, 
+					(*iter)->m_Plugin->getAMX()->curline, (*iter)->m_Plugin->getName());
+			}
 		}
 
-	m_CurrentMsgType = -1;
+#ifdef ENABLEEXEPTIONS
-	m_ParseFun = NULL;
+	}
+	catch( ... )
+	{
+		UTIL_Log( "[AMXX] fatal error at event execution");
+	}
+#endif		// #ifdef ENABLEEXEPTIONS
 }
 
-int EventsMngr::getArgNum() const
+int EventsMngr::getArgNum()
 {
 	return m_ParsePos + 1;
 }
 
-const char* EventsMngr::getArgString(int a) const
+const char* EventsMngr::getArgString(int a)
 {
 	if ( a < 0 || a > m_ParsePos )
 		return "";
@@ -441,7 +405,7 @@ const char* EventsMngr::getArgString(int a) const
 	}
 }
 
-int EventsMngr::getArgInteger(int a) const
+int EventsMngr::getArgInteger(int a)
 {
 	if ( a < 0 || a > m_ParsePos )
 		return 0;
@@ -457,7 +421,7 @@ int EventsMngr::getArgInteger(int a) const
 	}
 }
 
-float EventsMngr::getArgFloat(int a) const
+float EventsMngr::getArgFloat(int a)
 {
 	if ( a < 0 || a > m_ParsePos )
 		return 0.0f;
@@ -477,14 +441,12 @@ void EventsMngr::clearEvents(void)
 {
 	for (int i = 0; i < MAX_AMX_REG_MSG; ++i)
 	{
-		m_Events[i].clear();
+		for (ClEventVecIter iter = m_Events[i].begin(); iter != m_Events[i].end(); ++iter)
-	}
-	// delete parsevault
-	if (m_ParseVault)
 		{
-		delete [] m_ParseVault;
+			if (*iter)
-		m_ParseVault = NULL;
+				delete *iter;
-		m_ParseVaultSize = 0;
+		}
+		m_Events[i].clear();
 	}
 }
 
@@ -517,8 +479,3 @@ int EventsMngr::getEventId(const char* msg)
 	// find the id of the message
 	return pos = GET_USER_MSG_ID(PLID, msg , 0 );
 }
-
-int EventsMngr::getCurrentMsgType()
-{
-	return m_CurrentMsgType;
-}

amxmodx/CEvent.h

@@ -32,6 +32,10 @@
 #ifndef __CEVENTS_H__
 #define __CEVENTS_H__
 
+#include <vector>
+#include <map>
+#include <string>
+
 #define MAX_AMX_REG_MSG MAX_REG_MSGS+16
  
 enum {
@@ -86,53 +90,50 @@ public:
 		// conditions
 		struct cond_t
 		{
-			int paramId;				// the message parameter id
+			std::string sValue;			// value
-
+			float fValue;
-			String sValue;				// value (string)
+			int iValue;
-			float fValue;				// value (float)
+			int type;
-			int iValue;					// value (int)
-			int type;					// type (can be int, float, string)
-
-			cond_t *next;
 		};
 
-		cond_t *m_Conditions;
+		typedef std::pair<int, cond_t> CondMapPair;
+		typedef std::map<int, cond_t> CondMap;
+		typedef CondMap::iterator CondMapIter;
+		
+		CondMap m_Conditions;
 
-	public:
 		// constructors & destructors
 		ClEvent(CPluginMngr::CPlugin* plugin,  int func, int flags);
 		~ClEvent();
-
+	public:
 		inline CPluginMngr::CPlugin* getPlugin();
 		inline int getFunction();
 		void registerFilter(char* filter);			// add a condition
 	};
 
 private:
-	struct MsgDataEntry
+	struct MsgDataVault
 	{
 		float fValue;
 		int iValue;
 		const char* sValue;
 		MsgParamType type;
 	};
-	MsgDataEntry *m_ParseVault;
+	typedef std::vector<MsgDataVault> MsgDataVaultVec;
-	int m_ParseVaultSize;
+	typedef MsgDataVaultVec::iterator MsgDataVaultVecIter;
-	void NextParam();				// make sure a new parameter can be added
+	MsgDataVaultVec m_ParseVault;
 
-	typedef CList<ClEvent> ClEventVec;
+	typedef std::vector<ClEvent*> ClEventVec;
 	typedef ClEventVec::iterator ClEventVecIter;
-
 	ClEventVec m_Events[MAX_AMX_REG_MSG];
 	ClEventVec *m_ParseFun;	// current Event vector
 
 	bool m_ParseNotDone;
-	int m_ParsePos;				// is args. num. - 1
+	int m_ParsePos;				// is -1 less then args. num.
 	float* m_Timer;
 	
 	ClEvent* getValidEvent(ClEvent* a );
 
-	int m_CurrentMsgType;
 public:
 	EventsMngr();
 	~EventsMngr();
@@ -145,15 +146,12 @@ public:
 	void parseValue(float fValue);
 	void parseValue(const char *sz);
 	void executeEvents();
-	int getArgNum() const; //{ return (parsePos+1); }
+	int getArgNum(); //{ return (parsePos+1); }
-	const char* getArgString(int a) const;
+	const char* getArgString(int a);
-	int getArgInteger(int a) const;
+	int getArgInteger(int a);
-	float getArgFloat(int a) const;
+	float getArgFloat(int a);
 	void clearEvents(void);
 	static int getEventId( const char* msg );
-	int getCurrentMsgType();
 };
 
 #endif // #ifdef __CEVENTS_H__
-
-

amxmodx/CFile.cpp

@@ -29,9 +29,8 @@
 *  version.
 */
 
-#include <ctype.h>
-#include "amxmodx.h"
 #include "CFile.h"
+#include <ctype.h>
 
 // *****************************************************
 // class File
@@ -54,7 +53,7 @@ File::operator bool ( ) const
 
 File& operator<<( File& f, const String& n )
 {
-  if ( f ) fputs( n.c_str() , f.fp ) ;
+  if ( f ) fputs( n.str() , f.fp ) ;
   return f;
 }
 
@@ -82,7 +81,7 @@ File& operator>>( File& f, String& n )
   if ( !f ) return f;
   char temp[1024];
   fscanf( f.fp , "%s", temp );
-  n.assign(temp);
+  n.set(temp);
   return f;
 }
 
@@ -95,7 +94,6 @@ File& operator>>( File& f, char* n )
 int File::getline( char* buf, int sz )
 {
   int a = sz;
-  char *origBuf = buf;
   if ( *this )
   {
     int c;
@@ -103,15 +101,6 @@ int File::getline( char* buf, int sz )
       *buf++ = c;
     *buf = 0;
   }
-
-  // trim 0x0a and 0x0d characters at the end
-  while (buf != origBuf)
-  {
-    if (*buf == 0x0a || *buf == 0x0d)
-		*buf = 0;
-	--buf;
-  }
-
   return a - sz;
 }
 

amxmodx/CForward.cpp

@@ -29,549 +29,52 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
+#include "CForward.h"
 
-void AMXAPI amxx_InvalidateTrace(AMX *amx);
+void CForwardMngr::registerForward(  CPluginMngr::CPlugin* p, int func , int type  ){
+	
+	CForward** a = &head[ type ];
+	while(*a) a = &(*a)->next;
+	*a = new CForward( p , func );
 	
-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)
-		{
-			AMXForward tmp;
-			tmp.pPlugin = &(*iter);
-			tmp.func = func;
-			m_Funcs.push_back(tmp);
-		}
-	}
 }
 
-cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
+void CForwardMngr::clearForwards( CForward** a ){
-{
+	while( *a )	{
-	cell realParams[FORWARD_MAX_PARAMS];
+		CForward* b = (*a)->next;
-	cell *physAddrs[FORWARD_MAX_PARAMS];
+		delete *a;
-
+		*a = b;
-	const int STRINGEX_MAXLENGTH = 128;
-
-	cell globRetVal = 0;
-
-	unsigned int id = 0;
-
-	AMXForwardList::iterator iter;
-
-	for (iter = m_Funcs.begin(); iter != m_Funcs.end(); iter++)
-	{
-		if (iter->pPlugin->isExecutable(iter->func))
-		{
-			// Get debug info
-			AMX *amx = (*iter).pPlugin->getAMX();
-			AMX_DBGINFO *pInfo = (AMX_DBGINFO *)(amx->userdata[2]);
-			if (pInfo)
-				pInfo->error = AMX_ERR_NONE;
-			// handle strings & arrays
-			int i, ax=0;
-			for (i = 0; i < m_NumParams; ++i)
-			{
-				if (m_ParamTypes[i] == FP_STRING || m_ParamTypes[i] == FP_STRINGEX)
-				{
-					cell *tmp;
-					amx_Allot(iter->pPlugin->getAMX(),
-						(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(amx, preparedArrays[params[i]].size,
-						&realParams[i], &tmp);
-					physAddrs[i] = tmp;
-					if (preparedArrays[params[i]].type == Type_Cell)
-					{
-						memcpy(tmp, preparedArrays[params[i]].ptr, preparedArrays[params[i]].size * sizeof(cell));
-					}
-					else
-					{
-						char *data = (char*)preparedArrays[params[i]].ptr;
-						for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
-							*tmp++ = (static_cast<cell>(*data++)) & 0xFF;
-					}
-				}
-				else
-				{
-					realParams[i] = params[i];
-				}
-			}
-			//Push the parameters in reverse order.  Weird, unfriendly part of Small 3.0!
-			for (i=m_NumParams-1; i>=0; i--)
-			{
-				amx_Push(amx, realParams[i]);
-			}
-			// exec
-			cell retVal;
-			int err = amx_Exec(amx, &retVal, iter->func);
-			// log runtime error, if any
-			if (err != AMX_ERR_NONE)
-			{
-				//Did something else set an error?
-				if (pInfo && pInfo->error != AMX_ERR_NONE)
-				{
-					//we don't care, something else logged the error.
-				} else {
-					//nothing logged the error so spit it out anyway
-					LogError(amx, err, "");
-				}
-			}
-			amxx_InvalidateTrace(amx);
-			amx->error = AMX_ERR_NONE;
-
-			// cleanup strings & arrays
-			for (i = 0; i < m_NumParams; ++i)
-			{
-				if (m_ParamTypes[i] == FP_STRING)
-				{
-					amx_Release(iter->pPlugin->getAMX(), realParams[i]);
-				}
-				else if (m_ParamTypes[i] == FP_STRINGEX)
-				{
-					// copy back
-					amx_GetStringOld(reinterpret_cast<char*>(params[i]), physAddrs[i], 0);
-					amx_Release(iter->pPlugin->getAMX(), realParams[i]);
-				}
-				else if (m_ParamTypes[i] == FP_ARRAY)
-				{
-					// copy back
-					if (preparedArrays[params[i]].copyBack)
-					{
-						cell *tmp = physAddrs[i];
-						if (preparedArrays[params[i]].type == Type_Cell)
-						{
-							memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-						}
-						else
-						{
-							char *data = (char*)preparedArrays[params[i]].ptr;
-							for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
-								*data++ = static_cast<char>(*tmp++ & 0xFF);
-						}
-					}
-					amx_Release(iter->pPlugin->getAMX(), realParams[i]);
-				}
-			}
-
-			// decide what to do (based on exectype and retval)
-			switch (m_ExecType)
-			{
-			case ET_IGNORE:
-				break;
-			case ET_STOP:
-				if (retVal > 0)
-					return retVal;
-			case ET_STOP2:
-				if (retVal == 1)
-					return 1;
-				else if (retVal > globRetVal)
-					globRetVal = retVal;
-				break;
-			case ET_CONTINUE:
-				if (retVal > globRetVal)
-					globRetVal = retVal;
-				break;
-			}
-		}
-	}
-	return globRetVal;
-}
-
-void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	m_Func = func;
-	m_Amx = amx;
-	m_NumParams = numParams;
-	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
-	m_HasFunc = true;
-	isFree = false;
-}
-
-void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	m_Amx = amx;
-	m_NumParams = numParams;
-	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
-	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
-	isFree = false;
-}
-
-cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
-{
-	if (isFree)
-		return 0;
-	
-	const int STRINGEX_MAXLENGTH = 128;
-
-	cell realParams[FORWARD_MAX_PARAMS];
-	cell *physAddrs[FORWARD_MAX_PARAMS];
-
-	if (!m_HasFunc)
-		return 0;
-	
-	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(m_Amx);
-	if (!pPlugin->isExecutable(m_Func))
-		return 0;
-
-	AMX_DBGINFO *pInfo = (AMX_DBGINFO *)(m_Amx->userdata[2]);
-	if (pInfo)
-		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)
-		{
-			cell *tmp;
-			amx_Allot(m_Amx,
-				(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);
-			physAddrs[i] = tmp;
-			if (preparedArrays[params[i]].type == Type_Cell)
-			{
-				memcpy(tmp, preparedArrays[params[i]].ptr, preparedArrays[params[i]].size * sizeof(cell));
-			}
-			else
-			{
-				char *data = (char*)preparedArrays[params[i]].ptr;
-				for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
-					*tmp++ = (static_cast<cell>(*data++)) & 0xFF;
-			}
-		}
-		else
-		{
-			realParams[i] = params[i];
-		}
-	}
-	for (i=m_NumParams-1; i>=0; i--)
-		amx_Push(m_Amx, realParams[i]);
-	// exec
-	cell retVal;
-	int err = amx_Exec(m_Amx, &retVal, m_Func);
-	if (err != AMX_ERR_NONE)
-	{
-		//Did something else set an error?
-		if (pInfo && pInfo->error != AMX_ERR_NONE)
-		{
-			//we don't care, something else logged the error.
-		} else {
-			//nothing logged the error so spit it out anyway
-			LogError(m_Amx, err, "");
-		}
-	}
-	amxx_InvalidateTrace(m_Amx);
-	m_Amx->error = AMX_ERR_NONE;
-
-	// cleanup strings & arrays
-	for (i = 0; i < m_NumParams; ++i)
-	{
-		if (m_ParamTypes[i] == FP_STRING)
-		{
-			amx_Release(m_Amx, realParams[i]);
-		}
-		else if (m_ParamTypes[i] == FP_STRINGEX)
-		{
-			// copy back
-			amx_GetStringOld(reinterpret_cast<char*>(params[i]), physAddrs[i], 0);
-			amx_Release(m_Amx, realParams[i]);
-		}
-		else if (m_ParamTypes[i] == FP_ARRAY)
-		{
-			// copy back
-			if (preparedArrays[params[i]].copyBack)
-			{
-				cell *tmp = physAddrs[i];
-				if (preparedArrays[params[i]].type == Type_Cell)
-				{
-					memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-				}
-				else
-				{
-					char *data = (char*)preparedArrays[params[i]].ptr;
-					for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
-						*data++ = static_cast<char>(*tmp++ & 0xFF);
-				}
-			}
-			amx_Release(m_Amx, realParams[i]);
-		}
-	}
-
-	return retVal;
-}
-
-int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam * paramTypes)
-{
-	int retVal = m_Forwards.size() << 1;
-	CForward *tmp = new CForward(funcName, et, numParams, paramTypes);
-	if (!tmp)
-		return -1;				// should be invalid
-	m_Forwards.push_back(tmp);
-	return retVal;
-}
-
-int CForwardMngr::registerSPForward(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	int retVal = -1;
-	CSPForward *pForward;
-	if (!m_FreeSPForwards.empty())
-	{
-		retVal = m_FreeSPForwards.front();
-		pForward = m_SPForwards[retVal >> 1];
-		pForward->Set(func, amx, numParams, paramTypes);
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		m_FreeSPForwards.pop();
-	}
-	else
-	{
-		retVal = (m_SPForwards.size() << 1) | 1;
-		pForward = new CSPForward();
-		if (!pForward)
-			return -1;
-		pForward->Set(func, amx, numParams, paramTypes);
-		if (pForward->getFuncsNum() == 0)
-		{
-			return -1;
-			delete pForward;
-		}
-					 
-		m_SPForwards.push_back(pForward);
-	}
-	return retVal;
-}
-
-int CForwardMngr::registerSPForward(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
-{
-	int retVal = (m_SPForwards.size() << 1) | 1;
-	CSPForward *pForward;
-	if (!m_FreeSPForwards.empty())
-	{
-		retVal = m_FreeSPForwards.front();
-		pForward = m_SPForwards[retVal>>1];		// >>1 because unregisterSPForward pushes the id which contains the sp flag
-		pForward->Set(funcName, amx, numParams, paramTypes);
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		m_FreeSPForwards.pop();
-	}
-	else
-	{
-		pForward = new CSPForward();
-		if (!pForward)
-			return -1;
-		pForward->Set(funcName, amx, numParams, paramTypes);
-		if (pForward->getFuncsNum() == 0)
-		{
-			delete pForward;
-			return -1;
-		}
-		m_SPForwards.push_back(pForward);
-	}
-	return retVal;
-}
-
-bool CForwardMngr::isIdValid(int id) const
-{
-	return (id >= 0) && ((id & 1) ?
-		(static_cast<size_t>(id >> 1) < m_SPForwards.size()) :
-		(static_cast<size_t>(id >> 1) < m_Forwards.size()));
-}
-
-cell CForwardMngr::executeForwards(int id, cell *params)
-{
-	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : 
-		m_Forwards[id >> 1]->execute(params, m_TmpArrays);
-	m_TmpArraysNum = 0;
-	return retVal;
-}
-
-int CForwardMngr::getParamsNum(int id) const
-{
-	return (id & 1) ? m_SPForwards[id >> 1]->getParamsNum() :
-		m_Forwards[id >> 1]->getParamsNum();
-}
-
-ForwardParam CForwardMngr::getParamType(int id, int paramNum) const
-{
-	return (id & 1) ? m_SPForwards[id >> 1]->getParamType(paramNum) :
-		m_Forwards[id >> 1]->getParamType(paramNum);
 }
 
 void CForwardMngr::clear()
 {
-	for (ForwardVec::iterator iter = m_Forwards.begin(); iter != m_Forwards.end(); ++iter)
+	for ( int a = 0; a < FORWARD_NUM; ++a )
-	{
+		clearForwards( &head[ a ] );
-		delete *iter;
-	}
-	SPForwardVec::iterator spIter;
-	for (spIter = m_SPForwards.begin(); spIter != m_SPForwards.end(); ++spIter)
-	{
-		delete (*spIter);
-	}
-
-	m_Forwards.clear();
-	m_SPForwards.clear();
-	while (!m_FreeSPForwards.empty())
-		m_FreeSPForwards.pop();
-	m_TmpArraysNum = 0;
 }
 
-bool CForwardMngr::isSPForward(int id) const
+void CForwardMngr::executeForwards( int type , int num , int player  ) {
-{
-	return ((id & 1) == 0) ? false : true;
-}
 	
-void CForwardMngr::unregisterSPForward(int id)
+	cell ret = 0;
-{
+	int err;
-	//make sure the id is valid
+	CForward* a = head[ type ];
-	if ( !isIdValid(id) || m_SPForwards.at(id >> 1)->isFree )
-		return;
 	
-	m_SPForwards.at(id >> 1)->isFree = true;
+	while ( a )
-
-	m_FreeSPForwards.push(id);
-}
-
-int registerForward(const char *funcName, ForwardExecType et, ...)
-{
-	int curParam = 0;
-	va_list argptr;
-	va_start(argptr, et);
-	ForwardParam params[FORWARD_MAX_PARAMS];
-	ForwardParam tmp;
-	while (true)
 	{
-		if (curParam == FORWARD_MAX_PARAMS)
+		if ( a->getPlugin()->isExecutable( a->getFunction() ) )
+		{
+			
+			if ((err = amx_Exec(a->getPlugin()->getAMX(), &ret, a->getFunction() , num, player)) != AMX_ERR_NONE)
+				UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",	err,a->getPlugin()->getAMX()->curline,a->getPlugin()->getName());
+			
+			if ( ret )
 				break;
-		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 registerSPForwardByName(AMX *amx, const char *funcName, ...)
+		a = a->next;
-{
-	int curParam = 0;
-	va_list argptr;
-	va_start(argptr, funcName);
-	ForwardParam params[FORWARD_MAX_PARAMS];
-	ForwardParam tmp;
-	while (true)
-	{
-		if (curParam == FORWARD_MAX_PARAMS)
-			break;
-		tmp = (ForwardParam)va_arg(argptr, int);
-		if (tmp == FP_DONE)
-			break;
-		params[curParam] = tmp;
-		++curParam;
 	}
-	va_end(argptr);
-	return g_forwards.registerSPForward(funcName, amx, curParam, params);
-}
-
-int registerSPForward(AMX *amx, int func, ...)
-{
-	int curParam = 0;
-	va_list argptr;
-	va_start(argptr, func);
-	ForwardParam params[FORWARD_MAX_PARAMS];
-	ForwardParam tmp;
-	while (true)
-	{
-		if (curParam == FORWARD_MAX_PARAMS)
-			break;
-		tmp = (ForwardParam)va_arg(argptr, int);
-		if (tmp == FP_DONE)
-			break;
-		params[curParam] = tmp;
-		++curParam;
-	}
-	va_end(argptr);
-	return g_forwards.registerSPForward(func, amx, curParam, params);
-}
-
-cell executeForwards(int id, ...)
-{
-	if (!g_forwards.isIdValid(id))
-		return -1;
-
-	cell params[FORWARD_MAX_PARAMS];
-	int paramsNum = g_forwards.getParamsNum(id);
-	va_list argptr;
-	va_start(argptr, id);
-	for (int i = 0; i < paramsNum && i < FORWARD_MAX_PARAMS; ++i)
-	{
-		if (g_forwards.getParamType(id, i) == FP_FLOAT)
-		{
-			REAL tmp = (REAL)va_arg(argptr, double);			// floats get converted to doubles
-			params[i] = *(cell*)&tmp;
-		}
-		else
-			params[i] = (cell)va_arg(argptr, cell);
-	}
-	va_end(argptr);
-	return g_forwards.executeForwards(id, params);
-}
-
-cell CForwardMngr::prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack)
-{
-	if (m_TmpArraysNum >= FORWARD_MAX_PARAMS)
-	{
-		#ifdef MEMORY_TEST
-		m_validateAllAllocUnits();
-		#endif // MEMORY_TEST
-		AMXXLOG_Log("[AMXX] Forwards with more than 32 parameters are not supported (tried to prepare array # %d).", m_TmpArraysNum + 1);
-		m_TmpArraysNum = 0;
-		return -1;
-	}
-	m_TmpArrays[m_TmpArraysNum].ptr = ptr;
-	m_TmpArrays[m_TmpArraysNum].size = size;
-	m_TmpArrays[m_TmpArraysNum].type = type;
-	m_TmpArrays[m_TmpArraysNum].copyBack = copyBack;
-
-	return m_TmpArraysNum++;
-}
-
-cell prepareCellArray(cell *ptr, unsigned int size, bool copyBack)
-{
-	return g_forwards.prepareArray((void*)ptr, size, Type_Cell, copyBack);
-}
-
-cell prepareCharArray(char *ptr, unsigned int size, bool copyBack)
-{
-	return g_forwards.prepareArray((void*)ptr, size, Type_Char, copyBack);
-}
-
-void unregisterSPForward(int id)
-{
-	g_forwards.unregisterSPForward(id);
 }

amxmodx/CForward.h

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

amxmodx/CLang.h

@@ -1,210 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#ifndef _INCLUDE_CLANG_H
-#define _INCLUDE_CLANG_H
-
-#define LANG_SERVER 0
-#define LANG_PLAYER -1
-
-struct md5Pair
-{
-	String file;
-	String val;
-};
-
-struct keyEntry
-{
-	String key;
-	uint32_t hash;
-};
-
-struct sKeyDef
-{
-	sKeyDef() { key = -1; def = 0; }
-	~sKeyDef() { if (def) delete def; }
-	int key;
-	String *def;
-};
-
-class CLangMngr
-{
-	class CLang
-	{
-	public:
-		// Construct an empty CLang object
-		CLang();
-		// Construct a CLang object initialized with a language name
-		CLang(const char *lang);
-		// Destructor
-		~CLang();
-
-		// Get the definition
-		const char *GetDef(const char *key);
-		// Add definitions to this language
-		void MergeDefinitions(CQueue <sKeyDef*> & vec);
-		// Reset this language
-		void Clear();
-
-		// compare this language to a language name
-		friend bool operator == (const CLang &left, const char *right)
-		{
-			return strcmp(left.m_LanguageName, right)==0 ? true : false;
-		}
-		// Get language name
-		const char *GetName() { return m_LanguageName; }
-		// Save to file
-		bool Save(FILE *fp, int &defOffset, uint32_t &curOffset);
-		bool SaveDefinitions(FILE *fp, uint32_t &curOffset);
-		// Load
-		bool Load(FILE *fp);
-		void SetMngr(CLangMngr *l) { m_LMan = l; }
-		// Get number of entries
-		int Entries() { 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:
-
-		// 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;
-		CLangMngr *m_LMan;
-	public:
-		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);
-	// strip lowercase; make lower if needed
-	static size_t strip(char *str, char *newstr, bool makelower=false);
-
-	typedef CVector<CLang*> LangVec;
-	typedef CVector<CLang*>::iterator LangVecIter;
-	
-	LangVec m_Languages;
-
-	CVector<md5Pair *> FileList;
-	CVector<keyEntry*> KeyList;
-
-	// Get a lang object (construct if needed)
-	CLang * GetLang(const char *name);
-
-	CLang * GetLangR(const char *name);
-
-	// Current global client-id for functions like client_print with first parameter 0
-	int m_CurGlobId;
-public:
-	// Merge a definitions file
-	int MergeDefinitionFile(const char *file);
-	// Get a definition from a lang name and a kyer
-	const char *GetDef(const char *langName, const char *key);
-	// Format a string
-	const char *Format(const char *src, ...);
-	// Format a string for an AMX plugin
-	char *FormatAmxString(AMX *amx, cell *params, int parm, int &len);
-	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 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();
-	// Get the name of a language
-	const char *GetLangName(int langId);
-	// Check if a language exists
-	bool LangExists(const char *langName);
-
-	// When a language id in a format string in FormatAmxString is LANG_PLAYER, the glob id decides which language to take.
-	void SetDefLang(int id);
-
-	// Reset
-	void Clear();
-
-	CLangMngr();
-	~CLangMngr();
-};
-
-#endif //_INCLUDE_CLANG_H

amxmodx/CList.h

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

amxmodx/CLogEvent.cpp

@@ -29,7 +29,9 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
 #include "CLogEvent.h"
 
 // *****************************************************
@@ -50,8 +52,8 @@ int LogEventsMngr::CLogCmp::compareCondition(const char* string){
   if ( logid == parent->logCounter )
     return result;
   logid = parent->logCounter;
-  if ( in ) return result = strstr( string , text.c_str() ) ? 0 : 1;
+  if ( in ) return result = strstr( string , text.str() ) ? 0 : 1;
-  return result = strcmp(string,text.c_str());
+  return result = strcmp(string,text.str());
 }
 
 LogEventsMngr::CLogCmp* LogEventsMngr::registerCondition(char* filter){
@@ -65,7 +67,7 @@ LogEventsMngr::CLogCmp* LogEventsMngr::registerCondition(char* filter){
 	if ( pos < 0 || pos >= MAX_LOGARGS) pos = 0;
 	CLogCmp* c = logcmplist;
 	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.str(), filter))
 			return c;
 		c = c->next;
 	}
@@ -151,12 +153,11 @@ LogEventsMngr::CLogEvent* LogEventsMngr::registerLogEvent( CPluginMngr::CPlugin*
 
 void LogEventsMngr::executeLogEvents()
 {
+    int err;
     bool valid;
-    for(CLogEvent* a = logevents[ logArgc ]; a ; a = a->next)
+    for(CLogEvent* a = logevents[ logArgc ]; a ; a = a->next){
-	{
 		valid = true;
-		for( CLogEvent::LogCond* b = a->filters; b ; b = b->next)
+		for( CLogEvent::LogCond* b = a->filters; b ; b = b->next){
-		{
 			valid = false;
 			for( CLogEvent::LogCondEle* c = b->list; c ; c = c->next) {
 				if ( c->cmp->compareCondition( logArgs[b->argnum] ) == 0 ){
@@ -164,14 +165,28 @@ void LogEventsMngr::executeLogEvents()
 					break;
 				}
 			}
-			if (!valid) 
+			if (!valid) break;
-				break;
 		}
 		
-		if (valid)
+#ifdef ENABLEEXEPTIONS
+		try
 		{
-			executeForwards(a->func);
+#endif
+			
+			if (valid){
+				if ((err = amx_Exec(a->plugin->getAMX(), NULL , a->func , 0)) != AMX_ERR_NONE)
+					UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+						err,a->plugin->getAMX()->curline,a->plugin->getName());
 			}
+			
+#ifdef ENABLEEXEPTIONS
+		}
+		catch( ... )
+		{
+			UTIL_Log( "[AMXX] fatal error at log forward function execution");
+		}
+#endif
+		
     }
 }
 

amxmodx/CLogEvent.h

@@ -96,22 +96,23 @@ public:
 		LogCondEle(CLogCmp *c, LogCondEle *n): cmp(c) , next(n) { }
 	};
 	struct LogCond {
-		int argnum;
 		LogCondEle *list;
+		int argnum;
 		LogCond *next;
 		LogCond( int a , LogCondEle* ee , LogCond* n ) : argnum(a) , list(ee), next(n)  {}
 		~LogCond();
 	};
     CPluginMngr::CPlugin *plugin;
     int func;
-    LogCond *filters;
 	LogEventsMngr* parent;
+    LogCond *filters;
     CLogEvent *next;
     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 );
+	inline CPluginMngr::CPlugin *getPlugin() { return plugin; }
 	inline int getFunction() { return func; }
   };
 
@@ -143,8 +144,8 @@ public:
 
 
   class iterator {
-	  CLogEvent* a;
 	  LogEventsMngr* b;
+	  CLogEvent* a;
   public:
 	  inline iterator(CLogEvent*aa,LogEventsMngr* bb) : a(aa), b(bb) {}
 	  inline iterator& operator++() {

amxmodx/CMenu.cpp

@@ -29,7 +29,9 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
 #include "CMenu.h"
 
 // *****************************************************
@@ -51,7 +53,7 @@ MenuMngr::~MenuMngr()
 int MenuMngr::findMenuId(const char* name, AMX* amx)
 {
   for( MenuIdEle* b = headid; b ; b = b->next) {
-    if ( (!amx || !b->amx || amx == b->amx) && strstr(name,b->name.c_str()) )
+    if ( (!b->amx || amx == b->amx) && strstr(name,b->name.str()) )
       return b->id;
   }
   return 0;
@@ -62,8 +64,6 @@ 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;
 }
 

amxmodx/CMenu.h

@@ -83,7 +83,7 @@ public:
 
 	int findMenuId(const char* name, AMX* a = 0);
 	int registerMenuId(const char* n, AMX* a );
-	void registerMenuCmd(CPluginMngr::CPlugin *a, int mi, int k, int f);
+	void registerMenuCmd( CPluginMngr::CPlugin *a,int mi, int k , int f  );
 	void clear();
 
 	class iterator {
@@ -98,6 +98,10 @@ public:
 	};
 	inline iterator begin() const { return iterator(headcmd); }
 	inline iterator end() const { return iterator(0); }
+	
+
 };
 
 #endif
+
+

amxmodx/CMisc.cpp

@@ -28,11 +28,14 @@
 *  you do not wish to do so, delete this exception statement from your
 *  version.
 */
-#include "amxmodx.h"
+
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
+
 // *****************************************************
 // class CPlayer
 // *****************************************************
-
 void CPlayer::Init( edict_t* e , int i )
 {
 	index = i;
@@ -59,16 +62,14 @@ void CPlayer::Disconnect() {
   ingame = false;
   initialized = false;
   authorized = false;
-  bot = 0;
 }
-
 void CPlayer::PutInServer() {
   playtime = gpGlobals->time;
   ingame = true;
 }
 bool CPlayer::Connect(const char* connectname,const char* ipaddress) {
-  name.assign(connectname);
+  name.set(connectname);
-  ip.assign(ipaddress);
+  ip.set(ipaddress);
   time = gpGlobals->time;
   bot = IsBot();
   death_killer = 0;
@@ -119,7 +120,6 @@ bool Grenades::find( edict_t* enemy, CPlayer** p, int& type )
       Obj* b = (*a)->next;
       delete *a;
       *a = b;
-
       continue;
 
     }
@@ -192,7 +192,7 @@ void TeamIds::registerTeam( const char* n ,int s )
 {
     TeamEle** a = &head;
     while( *a ){
-		if ( strcmp((*a)->name.c_str(),n) == 0 ){
+		if ( strcmp((*a)->name.str(),n) == 0 ){
 			if (s != -1){
 				(*a)->id = s;
 				newTeam &= ~(1<<(*a)->tid);				
@@ -210,7 +210,7 @@ int TeamIds::findTeamId( const char* n )
 {
 	TeamEle* a = head;
     while( a ){
-		if ( !stricmp(a->name.c_str(),n) )
+		if ( !strcmpi(a->name.str(),n) )
 			return a->id;
 		a = a->next;
     }
@@ -221,7 +221,7 @@ int TeamIds::findTeamIdCase( const char* n)
 {
 	TeamEle* a = head;
     while( a ){
-		if ( !strcmp(a->name.c_str(), n) )
+		if ( !strcmp(a->name.str(), n) )
 			return a->id;
 		a = a->next;
     }

amxmodx/CMisc.h

@@ -33,6 +33,7 @@
 #define CMISC_H
 
 #include "CList.h"
+#include "string.h"
 
 // *****************************************************
 // class CCVar
@@ -45,15 +46,15 @@ class CCVar
 public:	
     CCVar( const char* pname, const char* pplugin, 
 		int pflags, float pvalue ) : name(pname) , plugin(pplugin ) {
-		cvar.name = (char*)name.c_str();
+		cvar.name = (char*)name.str();
 		cvar.flags = pflags;
 		cvar.string = "";
 		cvar.value = pvalue;
     }
 	inline cvar_t* getCvar() { return &cvar; }
-	inline const char* getPluginName() { return plugin.c_str(); }
+	inline const char* getPluginName() { return plugin.str(); }
-	inline const char* getName() { return name.c_str(); }
+	inline const char* getName() { return name.str(); }
-	inline bool operator == ( const char* string ) { return (strcmp(name.c_str(),string)==0); }
+	inline bool operator == ( const char* string ) const { return (strcmp(name.str(),string)==0); }
 };
 
 
@@ -99,8 +100,6 @@ public:
 	int death_victim;
 	bool death_tk;
 	String death_weapon;
-	int newmenu;
-	int page;
 	
 	Vector lastTrace;
 	Vector thisTrace;
@@ -112,7 +111,8 @@ public:
 	bool Connect(const char* connectname,const char* ipaddress);
 
 	inline bool IsBot(){
-		return ((pEdict->v.flags & FL_FAKECLIENT)?true:false);
+		const char* auth= (*g_engfuncs.pfnGetPlayerAuthId)(pEdict);
+		return ( auth && !strcmp( auth , "BOT" ) );
 	}
 
 	inline bool IsAlive(){
@@ -151,15 +151,15 @@ public:
 // class ForceObject
 // *****************************************************
 class ForceObject {
+    AMX* amx;
     String filename;
     FORCE_TYPE type;
     Vector mins;
     Vector maxs;
-    AMX* amx;
 public:
     ForceObject(const char* n, FORCE_TYPE c,Vector& mi, Vector& ma, AMX* a) :
     filename(n) , type(c), mins(mi), maxs(ma), amx(a) {}
-	inline const char* getFilename() { return filename.c_str(); }
+	inline const char* getFilename() { return filename.str(); }
 	inline AMX* getAMX() { return amx; }
 	Vector& getMin() { return mins; }
 	Vector& getMax() { return maxs; }
@@ -211,7 +211,7 @@ class CScript
 public:
 	CScript(AMX* aa, void* cc,const char* ff):filename(ff),amx(aa),code(cc){}
 	inline AMX* getAMX() { return amx; }
-	inline const char* getName() { return filename.c_str(); }
+	inline const char* getName() { return filename.str(); }
 	inline bool operator==( void* a ) { return (amx == (AMX*)a); }
 	inline void* getCode() { return code; }
 };

amxmodx/CModule.cpp

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

amxmodx/CModule.h

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

amxmodx/CPlugin.cpp

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

amxmodx/CPlugin.h

@@ -42,7 +42,7 @@ enum {
 	ps_paused,
 	ps_running,
 	ps_stopped,
-	ps_locked,
+	ps_locked
 };
 
 class CPluginMngr
@@ -63,44 +63,34 @@ public:
 		String version;
 		String title;
 		String author;
-		String errorMsg;
-		int m_PauseFwd;
-		int m_UnpauseFwd;
 		int paused_fun;
 		int status;
 		CPlugin* next;
 		int id;
-		CPlugin(int i , const char* p,const char* n, char* e, int d);
+		CPlugin(int i , const char* p,const char* n, char* e);
 		~CPlugin( );
-		bool m_Debug;
 
 	public:
 
-		inline const char* getName() { return name.c_str();}
+		inline const char* getName() const { return name.str();}
-		inline const char* getVersion() { return version.c_str();}
+		inline const char* getVersion() const { return version.str();}
-		inline const char* getTitle() { return title.c_str();}
+		inline const char* getTitle() const { return title.str();}
-		inline const char* getAuthor() { return author.c_str();}
+		inline const char* getAuthor()const { return author.str();}
-		inline const char* getError() { return errorMsg.c_str();}
-		inline int getStatusCode() { return status; }
 		inline int getId() const { return id; }
 		inline AMX* getAMX() { return &amx; }
-		inline const AMX* getAMX() const { return &amx; }
+		inline void setTitle( const char* n ) { title.set(n); }
-		inline void setTitle( const char* n ) { title.assign(n); }
+		inline void setAuthor( const char* n ) { author.set(n); }
-		inline void setAuthor( const char* n ) { author.assign(n); }
+		inline void setVersion( const char* n ) { version.set(n); }
-		inline void setVersion( const char* n ) { version.assign(n); }
+		inline bool isValid() const { return ((status != ps_bad_load) && (status != ps_locked)); }
-		inline void setError( const char* n ) { errorMsg.assign(n); }
+		inline bool isPaused() const { return ( (status == ps_paused) || (status == ps_stopped)); }
-		inline bool isValid() const { return ((status == ps_running || status == ps_paused)); }
+		inline bool isFunctionPaused( int id ) const { return (paused_fun & (1<<id)) ? true : false; 	}
-		inline bool isPaused() const { return ( (status == ps_paused) ); }
+		inline bool isExecutable(int id) const { 	return (isValid() && !isPaused() && !isFunctionPaused(id));	}
-		//inline bool isFunctionPaused( int id ) const { return (paused_fun & (1<<id)) ? true : false; 	}
+		inline void pausePlugin( ) { if ( isValid() ) setStatus(ps_paused); }
-		inline bool isExecutable(int id) const { return (isValid() && !isPaused());	}
+		inline void unpausePlugin( ) { if ( isValid() ) setStatus(ps_running); }
-		void Finalize();
-		void pausePlugin();
-		void unpausePlugin();
 		void pauseFunction( int id );
 		void unpauseFunction( int id );
 		void setStatus( int a   );
 		const char* getStatus() const;
-		inline bool isDebug() const { return m_Debug; }
 	}; 
 	
 private:	
@@ -109,15 +99,12 @@ private:
 
 
 public:
-	CPluginMngr() { head = 0; pCounter = 0; pNatives = NULL; m_Finalized=false;}
+	CPluginMngr() { head = 0; pCounter = 0; }
 	~CPluginMngr() { clear(); }
 
-	bool m_Finalized;
-	AMX_NATIVE_INFO *pNatives;
-
 	// Interface
 
-	CPlugin* loadPlugin(const char* path, const char* name, char* error, int debug);
+	CPlugin* loadPlugin(const char* path, const char* name, char* error);
 	void unloadPlugin( CPlugin** a );
 	int loadPluginsFromFile( const char* filename );
 	CPlugin* findPluginFast(AMX *amx);
@@ -125,7 +112,6 @@ public:
 	CPlugin* findPlugin(int index);
 	CPlugin* findPlugin(const char* name);
 	inline int getPluginsNum() const { return pCounter; }
-	void Finalize();
 	void clear();
 
 	class iterator {

amxmodx/CQueue.h

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

amxmodx/CStack.h

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

@@ -1,6 +1,7 @@
 /* AMX Mod X
 *
 * by the AMX Mod X Development Team
+*  originally developed by OLO
 *
 *
 *  This program is free software; you can redistribute it and/or modify it
@@ -28,25 +29,41 @@
 *  version.
 */
 
-#ifndef __AMXXLOG_H__
+#include "CString.h"
-#define __AMXXLOG_H__
+#include "string.h"
+#include "CFile.h"
 
-class CLog
+String::String()
 {
-private:
+	len = 0;
-	String m_LogFile;
+	napis = 0;
-	int m_LogType;
+}
 
-	void GetLastFile(int &outMonth, int &outDay, String &outFilename);
+String::String( const char* n )
-	void UseFile(const String &fileName);
+{
-public:
+	napis = 0;
-	CLog();
+	set(n);
-	~CLog();
+}
-	void CreateNewFile();
-	void CloseFile();
-	void MapChange();
-	void Log(const char *fmt, ...);
-};
 
-#endif // __AMXXLOG_H__
+String::~String()
+{
+	clear();
+}
+
+void String::set( const char* n )
+{
+	clear();
+	if ( n != 0 ){
+		len = strlen( n );
+		napis = new char[ len + 1 ];
+		if ( napis ) strcpy( napis , n );
+		else len = 0;
+	}
+}
+
+void String::clear() {
+	delete[] napis;
+	napis = 0;
+	len = 0;
+}
 

amxmodx/CString.h

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

amxmodx/CTask.cpp

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

amxmodx/CTask.h

@@ -32,89 +32,95 @@
 #ifndef CTASK_H
 #define CTASK_H
 
+// *****************************************************
+// class CTaskMngr
+// *****************************************************
+
 class CTaskMngr
 {
-private:
+public:
-	/*** class CTask ***/
+	
+	class iterator;
+
 	class CTask
 	{
-		// task settings
-		CPluginMngr::CPlugin *m_pPlugin;
-		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
+		friend class iterator;
-		float m_fNextExecTime;
+		friend class CTaskMngr;
+
+		CPluginMngr::CPlugin* plugin;
+		int id;
+		int func;
+		int repeat;
+		bool loop;
+		bool afterstart;
+		bool beforeend;
+		float base_time;
+		float exec_time;
+		int param_len;
+		cell* param;
+		CTask* next;
+		CTask* prev;
+		inline void setToRemove() { exec_time = -1.0f; }
+		inline bool isToReply() { return  (repeat-- > 0); }
+		inline bool isRemoved() { return (exec_time == -1.0f);  }
+		CTask( CPluginMngr::CPlugin* p, int f, int flags, int i, 
+			float base,  float exec, int parlen , const cell* par, int r );
+		~CTask() { if ( param_len ) delete[] param; }	
+	
 	public:
-		 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;
 
-		 CPluginMngr::CPlugin *getPlugin() const;
+		inline int getParamLen() { return param_len; }
-		 int getTaskId() const;
+		inline int getTaskId() { return id; }
-
+		inline int getFunction() { return func; }
-		 void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
+		cell* getParam() { return param; }
-
+		CPluginMngr::CPlugin* getPlugin() { return plugin; }
-		 void changeBase(float fNewBase);
-		 void resetNextExecTime(float fCurrentTime);
-
-		 bool shouldRepeat();
-
-		CTask();
-		~CTask();
 	};
 
-	class CTaskDescriptor
-	{
-	public:
-		int m_iId;
-		AMX *m_pAmx;
-		bool m_bFree;
 
-		CTaskDescriptor(int iId, AMX *pAmx, bool bFree = false)
-		{
-			m_iId = iId;
-			m_pAmx = pAmx;
-			m_bFree = bFree;
-		}
 
-		friend bool operator == (const CTask &left, const CTaskDescriptor &right)
+private:  
-		{
-			if (right.m_bFree)
-				return left.isFree();
 	
-			return !left.isFree() &&
+	friend class iterator;
-				(right.m_pAmx ? left.getPlugin()->getAMX() == right.m_pAmx : true) &&
+	CTask *head;
-				left.getTaskId() == right.m_iId;
+	CTask *tail;
-		}
+	float* m_timer;
-	};
+	float* m_timelimit;
+	float* m_timeleft;
+	CTask* getFirstValidTask(CTask* a);
+	CTask* getNextTask(CTask* a);	
+	CTask* findTask( int id , AMX* amx );
+	void unlink(CTask* a);
 
-	/*** CTaskMngr priv members ***/
-	typedef CList<CTask, CTaskDescriptor> TaskList;
-	typedef TaskList::iterator TaskListIter;
-	TaskList m_Tasks;
-	float *m_pTmr_CurrentTime;
-	float *m_pTmr_TimeLimit;
-	float *m_pTmr_TimeLeft;
 public:
+	
 	CTaskMngr();
 	~CTaskMngr();
 
-	void registerTimers(float *pCurrentTime, float *pTimeLimit, float *pTimeLeft);	// The timers will always point to the right value
+	// Interface
-	void registerTask(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, 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
+	void registerTimers( float* timer , float* timelimit, float* timeleft );
-	bool taskExists(int iId, AMX *pAmx);
+	void registerTask( CPluginMngr::CPlugin* plugin, int func, int flags, int i, float base, float exec, int parlen , const cell* par, int repeat );
-	void startFrame();
+	inline int taskExists(  int id ,AMX* amx) { return findTask(id,amx ) ? 1 : 0; }
+	int removeTasks( int id , AMX* amx );
 	void clear();
+
+	class iterator {
+		CTaskMngr* b;
+		CTask* a;
+	public:
+		iterator(CTask*aa,CTaskMngr* bb) : a(aa), b(bb) {}
+		iterator& operator++() {
+			a = b->getNextTask( a );
+			a = b->getFirstValidTask( a );
+			return *this;
+		}
+		CTask& operator*() { return *a; }
+		operator bool ( ) const { return a ? true : false; }
+	};
+	inline iterator begin() { return iterator(getFirstValidTask(head),this); }
+
 };
 
 #endif

amxmodx/CVault.cpp

@@ -29,12 +29,11 @@
 *  version.
 */
 
+#include "CVault.h"
+#include "CFile.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#include "amxmodx.h"
-#include "CVault.h"
-#include "CFile.h"
 
 // *****************************************************
 // class Vault
@@ -60,7 +59,7 @@ void Vault::put( const char* k, const char* v )
 
 	if ( *a )
 	{
-		(*a)->value.assign(v);
+		(*a)->value.set(v);
 		(*a)->number = atoi( v );
 	}
 	else
@@ -78,7 +77,7 @@ Vault::Obj** Vault::find( const char* n )
 
 	while( *a )
 	{
-		if ( strcmp((*a)->key.c_str(), n) == 0 )
+		if ( strcmp((*a)->key.str(), n) == 0 )
 			return a;
 
 		a = &(*a)->next;
@@ -107,7 +106,7 @@ const char* Vault::get( const char* n )
 
 	if ( b == 0 ) return "";
 
-	return b->value.c_str();
+	return b->value.str();
 }
 
 void Vault::clear()
@@ -133,7 +132,7 @@ void Vault::remove( const char* n )
 
 void Vault::setSource( const char* n )
 {
-	path.assign(n);
+	path.set(n);
 }
 
 
@@ -143,7 +142,7 @@ bool Vault::loadVault(  )
 
 	clear();
 
-	File a( path.c_str() , "r" );
+	File a( path.str() , "r" );
 
 	if ( !a ) return false;
 
@@ -165,7 +164,7 @@ bool Vault::saveVault( )
 {
 	if ( path.empty() ) return false;
 
-	File a( path.c_str() , "w" );
+	File a( path.str() , "w" );
 
 	if ( !a ) return false;
 

amxmodx/CVector.h

@@ -1,448 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#ifndef __CVECTOR_H__
-#define __CVECTOR_H__
-
-#include <assert.h>
-
-// Vector
-template <class T> class CVector
-{
-	bool Grow()
-	{
-		// automatic grow
-		size_t newSize = m_Size * 2;
-		if (newSize == 0)
-			newSize = 8;					// a good init value
-		T *newData = new T[newSize];
-		if (!newData)
-			return false;
-		if (m_Data)
-		{
-			for (size_t i=0; i<m_CurrentUsedSize; i++)
-				newData[i] = m_Data[i];
-			delete [] m_Data;
-		}
-		m_Data = newData;
-		m_Size = newSize;
-		return true;
-	}
-
-	bool GrowIfNeeded()
-	{
-		if (m_CurrentUsedSize >= m_Size)
-			return Grow();
-		else
-			return true;
-	}
-
-	bool ChangeSize(size_t size)
-	{
-		// change size
-		if (size == m_Size)
-			return true;
-		T *newData = new T[size];
-		if (!newData)
-			return false;
-		if (m_Data)
-		{
-			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;
-		return true;
-	}
-
-	void FreeMemIfPossible()
-	{
-
-	}
-protected:
-	T *m_Data;
-	size_t m_Size;
-	size_t m_CurrentUsedSize;
-	size_t m_CurrentSize;
-public:
-	class iterator
-	{
-	protected:
-		T *m_Ptr;
-	public:
-		// constructors / destructors
-		iterator()
-		{
-			m_Ptr = NULL;
-		}
-
-		iterator(T * ptr)
-		{
-			m_Ptr = ptr;
-		}
-
-		// member functions
-		T * base()
-		{
-			return m_Ptr;
-		}
-
-		const T * base() const
-		{
-			return m_Ptr;
-		}
-
-		// operators
-		T & operator*()
-		{
-			return *m_Ptr;
-		}
-
-		T * operator->()
-		{
-			return m_Ptr;
-		}
-
-		iterator & operator++()		// preincrement
-		{
-			++m_Ptr;
-			return (*this);
-		}
-
-		iterator operator++(int)	// postincrement
-		{
-			iterator tmp = *this;
-			++m_Ptr;
-			return tmp;
-		}
-
-		iterator & operator--()		// predecrement
-		{
-			--m_Ptr;
-			return (*this);
-		}
-
-		iterator operator--(int)	// postdecrememnt
-		{
-			iterator tmp = *this;
-			--m_Ptr;
-			return tmp;
-		}
-
-		bool operator==(T * right) const
-		{
-			return (m_Ptr == right);
-		}
-
-		bool operator==(const iterator & right) const
-		{
-			return (m_Ptr == right.m_Ptr);
-		}
-
-		bool operator!=(T * right) const
-		{
-			return (m_Ptr != right);
-		}
-
-		bool operator!=(const iterator & right) const
-		{
-			return (m_Ptr != right.m_Ptr);
-		}
-
-		iterator & operator+=(size_t offset)
-		{
-			m_Ptr += offset;
-			return (*this);
-		}
-
-		iterator & operator-=(size_t offset)
-		{
-			m_Ptr += offset;
-			return (*this);
-		}
-
-		iterator operator+(size_t offset) const
-		{
-			iterator tmp(*this);
-			tmp.m_Ptr += offset;
-			return tmp;
-		}
-
-		iterator operator-(size_t offset) const
-		{
-			iterator tmp(*this);
-			tmp.m_Ptr += offset;
-			return tmp;
-		}
-		
-		T & operator[](size_t offset)
-		{
-			return (*(*this + offset));
-		}
-
-		const T & operator[](size_t offset) const
-		{
-			return (*(*this + offset));
-		}
-
-		bool operator<(const iterator & right) const
-		{
-			return m_Ptr < right.m_Ptr;
-		}
-
-		bool operator>(const iterator & right) const
-		{
-			return m_Ptr > right.m_Ptr;
-		}
-
-		bool operator<=(const iterator & right) const
-		{
-			return m_Ptr <= right.m_Ptr;
-		}
-
-		bool operator>=(const iterator & right) const
-		{
-			return m_Ptr >= right.m_Ptr;
-		}
-
-		size_t operator-(const iterator & right) const
-		{
-			return m_Ptr - right.m_Ptr;
-		}
-	};
-
-	// constructors / destructors
-	CVector<T>()
-	{
-		m_Size = 0;
-		m_CurrentUsedSize = 0;
-		m_Data = NULL;
-	}
-
-	CVector<T>(const CVector<T> & other)
-	{
-		// copy data
-		m_Data = new T [other.m_CurrentUsedSize];
-		m_Size = other.m_CurrentUsedSize;
-		m_CurrentUsedSize = other.m_CurrentUsedSize;
-		for (size_t i=0; i<other.m_CurrentUsedSize; i++)
-			m_Data[i] = other.m_Data[i];
-	}
-
-	~CVector<T>()
-	{
-		clear();
-	}
-
-	// interface
-	size_t size() const
-	{
-		return m_CurrentUsedSize;
-	}
-
-	size_t capacity() const
-	{
-		return m_Size;
-	}
-
-	iterator begin()
-	{
-		return iterator(m_Data);
-	}
-
-	iterator end()
-	{
-		return iterator(m_Data + m_CurrentUsedSize);
-	}
-
-	iterator iterAt(size_t pos)
-	{
-		if (pos > m_CurrentUsedSize)
-			assert(0);
-		return iterator(m_Data + pos);
-	}
-
-	bool reserve(size_t newSize)
-	{
-		return ChangeSize(newSize);
-	}
-
-	bool push_back(const T & elem)
-	{
-		++m_CurrentUsedSize;
-		if (!GrowIfNeeded())
-		{
-			--m_CurrentUsedSize;
-			return false;
-		}
-
-		m_Data[m_CurrentUsedSize - 1] = elem;
-		return true;
-	}
-
-	void pop_back()
-	{
-		--m_CurrentUsedSize;
-		if (m_CurrentUsedSize < 0)
-			m_CurrentUsedSize = 0;
-		// :TODO: free memory sometimes
-	}
-
-	bool resize(size_t newSize)
-	{
-		if (!ChangeSize(newSize))
-			return false;
-		FreeMemIfPossible();
-		return true;
-	}
-
-	bool empty() const
-	{
-		return (m_CurrentUsedSize == 0);
-	}
-
-	T & at(size_t pos)
-	{
-		if (pos > m_CurrentUsedSize)
-		{
-			assert(0);
-		}
-		return m_Data[pos];
-	}
-
-	const  T & at(size_t pos) const
-	{
-		if (pos > m_CurrentUsedSize)
-		{
-			assert(0);
-		}
-		return m_Data[pos];
-	}
-
-	T & operator[](size_t pos)
-	{
-		return at(pos);
-	}
-
-	const T & operator[](size_t pos) const
-	{
-		return at(pos);
-	}
-
-	T & front()
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[0];
-	}
-
-	const T & front() const
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[0];
-	}
-
-	T & back()
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[m_CurrentUsedSize - 1];
-	}
-
-	const T & back() const
-	{
-		if (m_CurrentUsedSize < 1)
-		{
-			assert(0);
-		}
-		return m_Data[m_CurrentUsedSize - 1];
-	}
-
-	bool insert(iterator where, const T & value)
-	{
-		// we have to insert before
-		// if it is begin, don't decrement
-		if (where != m_Data)
-			--where;
-		// validate iter
-		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
-			return false;
-
-		++m_CurrentUsedSize;
-		if (!GrowIfNeeded())
-		{
-			--m_CurrentUsedSize;
-			return false;
-		}
-
-		memmove(where.base() + 1, where.base(), m_CurrentUsedSize - (where - m_Data));
-		memcpy(where.base(), &value, sizeof(T));
-		return true;
-	}
-
-	void erase(iterator where)
-	{
-		// validate iter
-		if (where < m_Data || where >= (m_Data + m_CurrentUsedSize))
-			return false;
-
-		if (m_CurrentUsedSize > 1)
-		{
-			// move
-			memmove(where.base(), where.base() + 1, m_CurrentUsedSize - 1);
-		}
-
-		--m_CurrentUsedSize;
-		// :TODO: free memory sometimes
-	}
-
-	void clear()
-	{
-		m_Size = 0;
-		m_CurrentUsedSize = 0;
-		delete [] m_Data;
-		m_Data = NULL;
-	}
-};
-
-#endif // __CVECTOR_H__
-

amxmodx/Makefile

@@ -1,95 +1,116 @@
-#(C)2004-2005 AMX Mod X Development Team
+MODNAME = amx_mm
-# Makefile written by David "BAILOPAN" Anderson
+SRCFILES = meta_api.cpp CFile.cpp CString.cpp CVault.cpp vault.cpp\
+float.cpp file.cpp modules.cpp CMisc.cpp CTask.cpp string.cpp\
+amxmod.cpp CEvent.cpp CCmd.cpp CLogEvent.cpp srvcmd.cpp strptime.cpp\
+CForward.cpp CPlugin.cpp CModule.cpp CMenu.cpp emsg.cpp util.cpp
+CSRCFILES = amx.c amxcore.c amxtime.c power.c
 
-HLSDK = ../hlsdk/SourceCode
+EXTRA_LIBS_LINUX =
-MM_ROOT = ../metamod/metamod
+EXTRA_LIBS_WIN32 =
+EXTRA_LIBDIRS_LINUX = -Lextra/lib_linux
+EXTRA_LIBDIRS_WIN32 = -Lextra/lib_win32
 
-### EDIT BELOW FOR OTHER PROJECTS ###
+EXTRA_INCLUDEDIRS = -Iextra/include
 
-OPT_FLAGS = -O3 -funroll-loops -s -pipe
+EXTRA_FLAGS = -Dstrcmpi=strcasecmp
-DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
-NAME = amxmodx_mm
 
-OBJECTS = meta_api.cpp CFile.cpp CVault.cpp vault.cpp float.cpp file.cpp modules.cpp \
+SDKTOP=../hlsdk
-	CMisc.cpp CTask.cpp string.cpp amxmodx.cpp CEvent.cpp CCmd.cpp CLogEvent.cpp \
+METADIR=../metamodx
-	srvcmd.cpp strptime.cpp amxcore.cpp amxtime.cpp power.cpp amxxlog.cpp fakemeta.cpp \
-	amxxfile.cpp CLang.cpp md5.cpp emsg.cpp CForward.cpp CPlugin.cpp CModule.cpp \
-	CMenu.cpp util.cpp amx.cpp amxdbg.cpp natives.cpp newmenus.cpp 
 
-LINK = -lz 
 
-INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
+SDKSRC=$(SDKTOP)/SourceCode
-	-I$(MM_ROOT) -Lzlib -I$(HLSDK)/common
+OBJDIR_LINUX=obj.linux
+OBJDIR_WIN32=obj.win32
+SRCDIR=.
 
-ifeq "$(DEBUG)" "true"
+ifdef windir
-	BIN_DIR = Debug
+	OS=WIN32
-	CFLAGS = $(DEBUG_FLAGS)
 else
-	BIN_DIR = Release
+	OS=LINUX
-	CFLAGS = $(OPT_FLAGS)
 endif
 
-ifeq "$(MMGR)" "true"
+CC_LINUX=gcc
-	OBJECTS += mmgr/mmgr.cpp
+ifeq "$(OS)" "WIN32"
-	CFLAGS += -DMEMORY_TEST
+	CC_WIN32=gcc
-endif
+	LD_WINDLL=dllwrap
-
+	DEFAULT=win32
-CFLAGS += -DLINUX -DNDEBUG -fPIC -Wno-deprecated -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions
+	CLEAN=clean_win32
-
-ifeq "$(AMD64)" "true"
-	BINARY = $(NAME)_amd64.so
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 
-	OBJECTS += JIT/natives-amd64.o
 else
-	BINARY = $(NAME)_i386.so
+	CC_WIN32=/usr/local/cross-tools/i386-mingw32msvc/bin/gcc
-	OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o
+	LD_WINDLL=/usr/local/cross-tools/bin/i386-mingw32msvc-dllwrap
-	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
+	DEFAULT=linux win32
-	OPT_FLAGS += -march=i686
+	CLEAN=clean_both
 endif
 
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
 
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
 
-all:
+LIBFILE_LINUX = $(MODNAME)_i386.so
-	mkdir -p $(BIN_DIR)
+LIBFILE_WIN32 = $(MODNAME).dll
-	$(MAKE) amxmodx
+TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX)
+TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32)
 
-amd64:
+FILES_ALL = *.cpp *.h [A-Z]* *.rc
-	rm -f zlib/libz.a
+ifeq "$(OS)" "LINUX"
-	$(MAKE) all AMD64=true
+	ASRCFILES := $(shell ls -t $(SRCFILES))
+else
+	ASRCFILES := $(shell dir /b)
+endif
+OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o)
+OBJC_LINUX := $(CSRCFILES:%.c=$(OBJDIR_LINUX)/%.o)
+OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o)
+OBJC_WIN32 := $(CSRCFILES:%.c=$(OBJDIR_WIN32)/%.o)
 
-amd64_mmgr:
-	rm -f zlib/libz.a
-	$(MAKE) all AMD64=true MMGR=true
 
-amd64_debug_mmgr:
+CCOPT = -march=i586 -O6 -ffast-math -funroll-loops \
-	rm -f zlib/libz.a
+	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
-	$(MAKE) all AMD64=true DEBUG=true MMGR=true
+	-malign-jumps=2 -malign-functions=2 -s	-DNDEBUG
 
-amd64_debug:
+INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/pm_shared -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS)
-	rm -f zlib/libz.a
+CFLAGS=-Wall -Wno-unknown-pragmas
-	$(MAKE) all AMD64=true DEBUG=true
+ODEF = -DOPT_TYPE=\"optimized\"
+CFLAGS:=$(CCOPT) $(CFLAGS) $(ODEF) $(EXTRA_FLAGS)
 
-mmgr:
+DO_CC_LINUX=$(CC_LINUX) $(CFLAGS) -fPIC $(INCLUDEDIRS) -o $@ -c $<
-	$(MAKE) all MMGR=true
+DO_CC_WIN32=$(CC_WIN32) $(CFLAGS) $(INCLUDEDIRS) -o $@ -c $<
+LINK_LINUX=$(CC_LINUX) $(CFLAGS) -lstdc++ -shared -ldl -lm $(OBJ_LINUX) $(OBJC_LINUX) $(EXTRA_LIBDIRS_LINUX) $(EXTRA_LIBS_LINUX) -o $@
+LINK_WIN32=$(LD_WINDLL) -mwindows --def $(MODNAME).def --add-stdcall-alias $(OBJ_WIN32) $(OBJC_WIN32) $(EXTRA_LIBDIRS_WIN32) $(EXTRA_LIBS_WIN32) -o $@
 
-debug_mmgr:
+$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.c
-	$(MAKE) all MMGR=true DEBUG=true
+	$(DO_CC_LINUX)
 
-amxmodx: $(OBJ_LINUX)
+$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
+	$(DO_CC_LINUX)
 
-debug:	
+$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.c
-	$(MAKE) all DEBUG=true
+	$(DO_CC_WIN32)
 
-default: all
+$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.cpp
+	$(DO_CC_WIN32)
 
-clean:
+default: $(DEFAULT)
-	rm -rf Release/*.o
+
-	rm -rf Release/$(BINARY)
+$(TARGET_LINUX): $(OBJDIR_LINUX) $(OBJ_LINUX) $(OBJC_LINUX)
-	rm -rf Debug/*.o
+	$(LINK_LINUX)
-	rm -rf Debug/$(BINARY)
+
+$(TARGET_WIN32): $(OBJDIR_WIN32) $(OBJ_WIN32) $(OBJC_WIN32)
+	$(LINK_WIN32)
+
+$(OBJDIR_LINUX):
+	mkdir $@
+
+$(OBJDIR_WIN32):
+	mkdir $@
+
+win32: $(TARGET_WIN32)
+
+linux: $(TARGET_LINUX)
+
+clean: $(CLEAN)
+
+clean_both:
+	-rm -f $(OBJDIR_LINUX)/*
+	-rm -f $(OBJDIR_WIN32)/*
+
+clean_win32:
+	del /q $(OBJDIR_WIN32)
 

amxmodx/amx.h

@@ -1,6 +1,6 @@
-/*  Pawn Abstract Machine (for the Pawn language)
+/*  Abstract Machine for the Small compiler
  *
- *  Copyright (c) ITB CompuPhase, 1997-2005
+ *  Copyright (c) ITB CompuPhase, 1997-2003
  *
  *  This software is provided "as-is", without any express or implied warranty.
  *  In no event will the authors be held liable for any damages arising from
@@ -10,46 +10,20 @@
  *  including commercial applications, and to alter it and redistribute it
  *  freely, subject to the following restrictions:
  *
- *  1.  The origin of this software must not be misrepresented; you must not
+ *  PM: Whole file changed
- *      claim that you wrote the original software. If you use this software in
- *      a product, an acknowledgment in the product documentation would be
- *      appreciated but is not required.
- *  2.  Altered source versions must be plainly marked as such, and must not be
- *      misrepresented as being the original software.
- *  3.  This notice may not be removed or altered from any source distribution.
- *
- *  Version: $Id$
  */
-
+#define LINUX
-#if defined FREEBSD && !defined __FreeBSD__
+#if defined LINUX
-  #define __FreeBSD__
-#endif
-#if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
   #include <sclinux.h>
 #endif
-
+#ifndef __AMX_H
-#ifndef AMX_H_INCLUDED
+#define __AMX_H
-#define AMX_H_INCLUDED
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-
-#if defined HAVE_STDINT_H
-  #include <stdint.h>
-#else
-  #if defined __LCC__ || defined __DMC__ || defined LINUX
-    #if defined HAVE_INTTYPES_H
-      #include <inttypes.h>
-    #else
-      #include <stdint.h>
-    #endif
-  #elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
   /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
    * here, these types are probably undefined.
    */
-    #if defined __MACH__
+  #if defined __LCC__ || defined LINUX
-      #include <ppc/types.h>
+    #include <stdint.h>
-      typedef unsigned short int  uint16_t;
-      typedef unsigned long int   uint32_t;
-    #elif defined __FreeBSD__
-      #include <inttypes.h>
   #else
     typedef short int           int16_t;
     typedef unsigned short int  uint16_t;
@@ -60,51 +34,16 @@
       typedef long int          int32_t;
       typedef unsigned long int uint32_t;
     #endif
-      #if defined __WIN32__ || defined _WIN32 || defined WIN32
-        typedef __int64	          int64_t;
-        typedef unsigned __int64  uint64_t;
-        #define HAVE_I64
-      #elif defined __GNUC__
-        typedef long long         int64_t;
-        typedef unsigned long long uint64_t;
-        #define HAVE_I64
-      #endif
-    #endif
-  #endif
-  #define HAVE_STDINT_H
-#endif
-#if defined _LP64 || defined WIN64 || defined _WIN64
-  #if !defined __64BIT__
-    #define __64BIT__
   #endif
 #endif
-
+#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined __MSDOS__
-#if 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
-
 #ifdef  __cplusplus
 extern  "C" {
 #endif
-
-#if defined PAWN_DLL
-  #if !defined AMX_NATIVE_CALL
-    #define AMX_NATIVE_CALL __stdcall
-  #endif
-  #if !defined AMXAPI
-    #define AMXAPI          __stdcall
-  #endif
-#endif
-
 /* calling convention for native functions */
 #if !defined AMX_NATIVE_CALL
   #define AMX_NATIVE_CALL
@@ -115,8 +54,6 @@ extern  "C" {
     #define AMXAPI      __stdcall
   #elif defined CDECL
     #define AMXAPI      __cdecl
-  #elif defined GCC_HASCLASSVISIBILITY
-    #define AMXAPI __attribute__ ((visibility("default")))
   #else
     #define AMXAPI
   #endif
@@ -124,7 +61,6 @@ extern  "C" {
 #if !defined AMXEXPORT
   #define AMXEXPORT
 #endif
-
 /* File format version                          Required AMX version
  *   0 (original version)                       0
  *   1 (opcodes JUMP.pri, SWITCH and CASETBL)   1
@@ -134,33 +70,20 @@ extern  "C" {
  *   5 (tagnames table)                         4
  *   6 (reformatted header)                     6
  *   7 (name table, opcodes SYMTAG & SYSREQ.D)  7
- *   8 (opcode STMT, renewed debug interface)   8
  */
-#define CUR_FILE_VERSION  8     /* current file version; also the current AMX version */
+#define CUR_FILE_VERSION  7     /* current file version; also the current AMX version */
 #define MIN_FILE_VERSION  6     /* lowest supported file format version for the current AMX version */
-#define MIN_AMX_VERSION   8     /* minimum AMX version needed to support the current file format */
+#define MIN_AMX_VERSION   7     /* minimum AMX version needed to support the current file format */
-
+#if !defined CELL_TYPE
-#if !defined PAWN_CELL_SIZE
+  #define CELL_TYPE
-  #define PAWN_CELL_SIZE 32     /* by default, use 32-bit cells */
+  #if defined(BIT16)
-#endif
+    typedef uint16_t  ucell;    /* only for type casting */
-#if PAWN_CELL_SIZE==16
-  typedef uint16_t  ucell;
     typedef int16_t   cell;
-#elif PAWN_CELL_SIZE==32
+  #else
     typedef uint32_t  ucell;
     typedef int32_t   cell;
-#define REAL	float
+  #endif
-#elif PAWN_CELL_SIZE==64
-  typedef uint64_t  ucell;
-  typedef int64_t   cell;
-#define REAL	double
-#else
-  #error Unsupported cell size (PAWN_CELL_SIZE)
 #endif
-
-#define UNPACKEDMAX   ((1L << (sizeof(cell)-1)*8) - 1)
-#define UNLIMITED     (~1u >> 1)
-
 struct tagAMX;
 typedef cell (AMX_NATIVE_CALL *AMX_NATIVE)(struct tagAMX *amx, cell *params);
 typedef int (AMXAPI *AMX_CALLBACK)(struct tagAMX *amx, cell index,
@@ -169,31 +92,25 @@ typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
 #if !defined _FAR
   #define _FAR
 #endif
-
 #if defined _MSC_VER
   #pragma warning(disable:4103)  /* disable warning message 4103 that complains
                                   * about pragma pack in a header file */
   #pragma warning(disable:4100)  /* "'%$S' : unreferenced formal parameter" */
 #endif
-
 /* Some compilers do not support the #pragma align, which should be fine. Some
  * compilers give a warning on unknown #pragmas, which is not so fine...
  */
-#if (defined SN_TARGET_PS2 || defined __GNUC__) && !defined AMX_NO_ALIGN
+#if defined SN_TARGET_PS2 || defined __GNUC__
   #define AMX_NO_ALIGN
 #endif
-
 #if defined __GNUC__
   #define PACKED        __attribute__((packed))
 #else
   #define PACKED
 #endif
-
 #if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
+  #if defined LINUX
     #pragma pack(1)         /* structures must be packed (byte-aligned) */
-  #elif defined MACOS && defined __MWERKS__
-	#pragma options align=mac68k
   #else
     #pragma pack(push)
     #pragma pack(1)         /* structures must be packed (byte-aligned) */
@@ -202,31 +119,22 @@ typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
     #endif
   #endif
 #endif
-
+typedef struct {
-typedef struct tagAMX_NATIVE_INFO {
+  char _FAR *name       PACKED;
-  const char _FAR *name PACKED;
   AMX_NATIVE func       PACKED;
-} PACKED AMX_NATIVE_INFO;
+} AMX_NATIVE_INFO       PACKED;
-
 #define AMX_USERNUM     4
 #define sEXPMAX         19      /* maximum name length for file version <= 6 */
 #define sNAMEMAX        31      /* maximum name length of symbol name */
-
 typedef struct tagAMX_FUNCSTUB {
-  ucell address         PACKED;
+  uint32_t address      PACKED;
   char name[sEXPMAX+1]  PACKED;
-} PACKED AMX_FUNCSTUB;
+} AMX_FUNCSTUB          PACKED;
-
-typedef struct tagFUNCSTUBNT {
-  ucell address         PACKED;
-  ucell nameofs      PACKED;	//we need this for amxx to be backwards comaptible
-} PACKED AMX_FUNCSTUBNT;
-
 /* The AMX structure is the internal structure for many functions. Not all
  * fields are valid at all times; many fields are cached in local variables.
  */
 typedef struct tagAMX {
-  unsigned char _FAR *base PACKED; /* points to the AMX header plus the code, optionally also the data */
+  unsigned char _FAR *base PACKED; /* points to the AMX header ("amxhdr") plus the code, optionally also the data */
   unsigned char _FAR *data PACKED; /* points to separate data+stack+heap, may be NULL */
   AMX_CALLBACK callback PACKED;
   AMX_DEBUG debug       PACKED; /* debug callback */
@@ -238,26 +146,30 @@ typedef struct tagAMX {
   cell stk              PACKED; /* stack pointer: relative to base + amxhdr->dat */
   cell stp              PACKED; /* top of the stack: relative to base + amxhdr->dat */
   int flags             PACKED; /* current status, see amx_Flags() */
+  /* for assertions and debug hook */
+  cell curline          PACKED;
+  cell curfile          PACKED;
+  int dbgcode           PACKED;
+  cell dbgaddr          PACKED;
+  cell dbgparam         PACKED;
+  char _FAR *dbgname    PACKED;
   /* user data */
   long usertags[AMX_USERNUM] PACKED;
-  //okay userdata[3] in AMX Mod X is for the CPlugin * pointer
-  //we're also gonna set userdata[2] to a special debug structure
   void _FAR *userdata[AMX_USERNUM] PACKED;
   /* native functions can raise an error */
   int error             PACKED;
-  /* passing parameters requires a "count" field */
-  int paramcount;
   /* the sleep opcode needs to store the full AMX status */
   cell pri              PACKED;
   cell alt              PACKED;
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
-  cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  cell _FAR *syscall_d  PACKED; /* relocated value/address for the SYSCALL.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
     int reloc_size      PACKED; /* required temporary buffer for relocations */
     long code_size      PACKED; /* estimated memory footprint of the native code */
-} PACKED AMX;
+  #endif
-
+} AMX                   PACKED;
 /* The AMX_HEADER structure is both the memory format as the file format. The
  * structure is used internaly.
  */
@@ -278,12 +190,9 @@ typedef struct tagAMX_HEADER {
   int32_t libraries     PACKED; /* offset to the table of libraries */
   int32_t pubvars       PACKED; /* the "public variables" table */
   int32_t tags          PACKED; /* the "public tagnames" table */
-  int32_t nametable     PACKED; /* name table */
+  int32_t nametable     PACKED; /* name table, file version 7 only */
-} PACKED AMX_HEADER;
+} AMX_HEADER            PACKED;
-
-//This is always the same for us
 #define AMX_MAGIC       0xf1e0
-
 enum {
   AMX_ERR_NONE,
   /* reserve the first 15 error codes for exit codes of the abstract machine */
@@ -299,8 +208,6 @@ enum {
   AMX_ERR_NATIVE,       /* native function failed */
   AMX_ERR_DIVIDE,       /* divide by zero */
   AMX_ERR_SLEEP,        /* go into sleepmode - code can be restarted */
-  AMX_ERR_INVSTATE,     /* invalid state for this access */
-
   AMX_ERR_MEMORY = 16,  /* out of memory */
   AMX_ERR_FORMAT,       /* invalid file format */
   AMX_ERR_VERSION,      /* file is for a newer version of the AMX */
@@ -312,148 +219,92 @@ enum {
   AMX_ERR_INIT_JIT,     /* cannot initialize the JIT */
   AMX_ERR_PARAMS,       /* parameter error */
   AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
-  AMX_ERR_GENERAL,      /* general error (unknown or unspecific error) */
 };
-
+enum {
-/*      AMX_FLAG_CHAR16   0x01     no longer used */
+  DBG_INIT,             /* query/initialize */
+  DBG_FILE,             /* file number in curfile, filename in name */
+  DBG_LINE,             /* line number in curline, file number in curfile */
+  DBG_SYMBOL,           /* address in dbgaddr, class/type in dbgparam */
+  DBG_CLRSYM,           /* stack address below which locals should be removed. stack address in stk */
+  DBG_CALL,             /* function call, address jumped to in dbgaddr */
+  DBG_RETURN,           /* function returns */
+  DBG_TERMINATE,        /* program ends, code address in dbgaddr, reason in dbgparam */
+  DBG_SRANGE,           /* symbol size and dimensions (arrays); level in dbgaddr (!); length in dbgparam */
+  DBG_SYMTAG,           /* tag of the most recent symbol (if non-zero), tag in dbgparam */
+};
+#define AMX_FLAG_CHAR16   0x01  /* characters are 16-bit */
 #define AMX_FLAG_DEBUG    0x02  /* symbolic info. available */
 #define AMX_FLAG_COMPACT  0x04  /* compact encoding */
-#define AMX_FLAG_BYTEOPC  0x08  /* opcode is a byte (not a cell) */
+#define AMX_FLAG_BIGENDIAN 0x08 /* big endian encoding */
-#define AMX_FLAG_NOCHECKS 0x10  /* no array bounds checking; no STMT opcode */
+#define AMX_FLAG_NOCHECKS  0x10 /* no array bounds checking */
-#define AMX_FLAG_PRENIT	 0x100	/* pre-initialized, do not check natives */
+#define AMX_FLAG_BROWSE 0x4000  /* browsing/relocating or executing */
-#define AMX_FLAG_NTVREG 0x1000  /* all native functions are registered */
-#define AMX_FLAG_JITC   0x2000  /* abstract machine is JIT compiled */
-#define AMX_FLAG_BROWSE 0x4000  /* busy browsing */
 #define AMX_FLAG_RELOC  0x8000  /* jump/call addresses relocated */
-
 #define AMX_EXEC_MAIN   -1      /* start at program entry point */
 #define AMX_EXEC_CONT   -2      /* continue from last address */
-
 #define AMX_USERTAG(a,b,c,d)    ((a) | ((b)<<8) | ((long)(c)<<16) | ((long)(d)<<24))
-
+#define AMX_EXPANDMARGIN  64
-#if !defined AMX_COMPACTMARGIN
-  #define AMX_COMPACTMARGIN 64
-#endif
-
-struct amx_trace
-{
-	cell frm;
-	amx_trace *prev;
-	amx_trace *next;
-	bool used;
-};
-
-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_
  * changing the bit pattern
  */
-#if PAWN_CELL_SIZE==32
+#define amx_ftoc(f)     ( * ((cell*)&f) )   /* float to cell */
-  #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
+#define amx_ctof(c)     ( * ((float*)&c) )  /* cell to float */
-  #define amx_ctof(c)   ( * ((float*)&c) )  /* cell to float */
+#define amx_StrParam(amx,param,result) {                             \
-#elif PAWN_CELL_SIZE==64
-  #define amx_ftoc(f)   ( * ((cell*)&f) )   /* float to cell */
-  #define amx_ctof(c)   ( * ((double*)&c) ) /* cell to float */
-#else
-  #error Unsupported cell size
-#endif
-
-#define amx_StrParam(amx,param,result)                                      \
-    do {                                                                    \
             cell *amx_cstr_; int amx_length_;                        \
             amx_GetAddr((amx), (param), &amx_cstr_);                 \
             amx_StrLen(amx_cstr_, &amx_length_);                     \
             if (amx_length_ > 0 &&                                   \
-          ((result) = (void*)alloca((amx_length_ + 1) * sizeof(*(result)))) != NULL) \
+                ((result) = (char*)alloca(amx_length_ + 1)) != NULL) \
-        amx_GetString((char*)(result), amx_cstr_, sizeof(*(result))>1, amx_length_); \
+              amx_GetString((result), amx_cstr_);                    \
             else (result) = NULL;                                    \
-    } while (0)
+}
-
 uint16_t * AMXAPI amx_Align16(uint16_t *v);
 uint32_t * AMXAPI amx_Align32(uint32_t *v);
-#if defined _I64_MAX || defined HAVE_I64
-  uint64_t * AMXAPI amx_Align64(uint64_t *v);
-#endif
 int AMXAPI amx_Allot(AMX *amx, int cells, cell *amx_addr, cell **phys_addr);
 int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params);
 int AMXAPI amx_Cleanup(AMX *amx);
 int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data);
-int AMXAPI amx_Exec(AMX *amx, cell *retval, int index);
+int AMXAPI amx_Debug(AMX *amx); /* default debug procedure, does nothing */
-int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index);
+int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...);
-int AMXAPI amx_FindPublic(AMX *amx, const char *funcname, int *index);
+int AMXAPI amx_Execv(AMX *amx, cell *retval, int index, int numparams, cell params[]);
-int AMXAPI amx_FindPubVar(AMX *amx, const char *varname, cell *amx_addr);
+int AMXAPI amx_FindNative(AMX *amx, char *name, int *index);
+int AMXAPI amx_FindPublic(AMX *amx, char *funcname, int *index);
+int AMXAPI amx_FindPubVar(AMX *amx, char *varname, cell *amx_addr);
 int AMXAPI amx_FindTagId(AMX *amx, cell tag_id, char *tagname);
 int AMXAPI amx_Flags(AMX *amx,uint16_t *flags);
 int AMXAPI amx_GetAddr(AMX *amx,cell amx_addr,cell **phys_addr);
 int AMXAPI amx_GetNative(AMX *amx, int index, char *funcname);
 int AMXAPI amx_GetPublic(AMX *amx, int index, char *funcname);
 int AMXAPI amx_GetPubVar(AMX *amx, int index, char *varname, cell *amx_addr);
-int AMXAPI amx_GetString(char *dest,const cell *source, int use_wchar, size_t size);
+int AMXAPI amx_GetString(char *dest,cell *source);
 int AMXAPI amx_GetTag(AMX *amx, int index, char *tagname, cell *tag_id);
 int AMXAPI amx_GetUserData(AMX *amx, long tag, void **ptr);
 int AMXAPI amx_Init(AMX *amx, void *program);
 int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code);
 int AMXAPI amx_MemInfo(AMX *amx, long *codesize, long *datasize, long *stackheap);
 int AMXAPI amx_NameLength(AMX *amx, int *length);
-AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(const char *name, AMX_NATIVE func);
+AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(char *name,AMX_NATIVE func);
 int AMXAPI amx_NumNatives(AMX *amx, int *number);
 int AMXAPI amx_NumPublics(AMX *amx, int *number);
 int AMXAPI amx_NumPubVars(AMX *amx, int *number);
 int AMXAPI amx_NumTags(AMX *amx, int *number);
-int AMXAPI amx_Push(AMX *amx, cell value);
-int AMXAPI amx_PushArray(AMX *amx, cell *amx_addr, cell **phys_addr, const cell array[], int numcells);
-int AMXAPI amx_PushString(AMX *amx, cell *amx_addr, cell **phys_addr, const char *string, int pack, int use_wchar);
 int AMXAPI amx_RaiseError(AMX *amx, int error);
-int AMXAPI amx_Register(AMX *amx, const AMX_NATIVE_INFO *nativelist, int number);
+int AMXAPI amx_Register(AMX *amx, AMX_NATIVE_INFO *nativelist, int number);
 int AMXAPI amx_Release(AMX *amx, cell amx_addr);
 int AMXAPI amx_SetCallback(AMX *amx, AMX_CALLBACK callback);
 int AMXAPI amx_SetDebugHook(AMX *amx, AMX_DEBUG debug);
-int AMXAPI amx_SetString(cell *dest, const char *source, int pack, int use_wchar, size_t size);
+int AMXAPI amx_SetString(cell *dest, char *source, int pack);
 int AMXAPI amx_SetUserData(AMX *amx, long tag, void *ptr);
-int AMXAPI amx_StrLen(const cell *cstring, int *length);
+char * AMXAPI amx_StrError(int errnum);
-int AMXAPI amx_UTF8Check(const char *string, int *length);
+int AMXAPI amx_StrLen(cell *cstring, int *length);
-int AMXAPI amx_UTF8Get(const char *string, const char **endptr, cell *value);
-int AMXAPI amx_UTF8Len(const cell *cstr, int *length);
-int AMXAPI amx_UTF8Put(char *string, char **endptr, int maxchars, cell value);
-int AMXAPI amx_GetLibraries(AMX *amx);
-const char *AMXAPI amx_GetLibrary(AMX *amx, int index, char *buffer, int len);
-int AMXAPI amx_SetStringOld(cell *dest,const char *source,int pack,int use_wchar);
-int AMXAPI amx_GetStringOld(char *dest,const cell *source,int use_wchar);
-
-#if PAWN_CELL_SIZE==16
-  #define amx_AlignCell(v) amx_Align16(v)
-#elif PAWN_CELL_SIZE==32
-  #define amx_AlignCell(v) amx_Align32(v)
-#elif PAWN_CELL_SIZE==64 && (defined _I64_MAX || defined HAVE_I64)
-  #define amx_AlignCell(v) amx_Align64(v)
-#else
-  #error Unsupported cell size
-#endif
-
-#define amx_RegisterFunc(amx, name, func) \
-  amx_Register((amx), amx_NativeInfo((name),(func)), 1);
-
 #if !defined AMX_NO_ALIGN
-  #if defined LINUX || defined __FreeBSD__
+  #if defined LINUX
     #pragma pack()    /* reset default packing */
-  #elif defined MACOS && defined __MWERKS__
-    #pragma options align=reset
   #else
     #pragma pack(pop) /* reset previous packing */
   #endif
 #endif
-
 #ifdef  __cplusplus
 }
 #endif
-
+#endif /* __AMX_H */
-#endif /* AMX_H_INCLUDED */

amxmodx/amxcore.c

@@ -1,74 +1,36 @@
-/*  Core module for the Pawn AMX
+/*  Core module for the Small AMX
  *
- *  Copyright (c) ITB CompuPhase, 1997-2005
+ *  Copyright (c) ITB CompuPhase, 1997-2002
- *
+ *  This file may be freely used. No warranties of any kind.
- *  This software is provided "as-is", without any express or implied warranty.
- *  In no event will the authors be held liable for any damages arising from
- *  the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1.  The origin of this software must not be misrepresented; you must not
- *      claim that you wrote the original software. If you use this software in
- *      a product, an acknowledgment in the product documentation would be
- *      appreciated but is not required.
- *  2.  Altered source versions must be plainly marked as such, and must not be
- *      misrepresented as being the original software.
- *  3.  This notice may not be removed or altered from any source distribution.
  *
  *  Version: $Id$
  */
-#if defined _UNICODE || defined __UNICODE__ || defined UNICODE
-# if !defined UNICODE   /* for Windows */
-#   define UNICODE
-# endif
-# if !defined _UNICODE  /* for C library */
-#   define _UNICODE
-# endif
-#endif
-
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <assert.h>
 #include "amx.h"
-#if defined __WIN32__ || defined _WIN32 || defined WIN32 || defined _Windows
+
-  #include <windows.h>
+#define NOPROPLIST
-#endif
 
 /* A few compilers do not provide the ANSI C standard "time" functions */
 #if !defined SN_TARGET_PS2 && !defined _WIN32_WCE
   #include <time.h>
 #endif
 
-#if defined _UNICODE
-# include <tchar.h>
-#elif !defined __T
-  typedef char          TCHAR;
-# define __T(string)    string
-# define _tcschr        strchr
-# define _tcscpy        strcpy
-# define _tcsdup        strdup
-# define _tcslen        strlen
-#endif
-
-
 #define CHARBITS        (8*sizeof(char))
 typedef unsigned char   uchar;
 
-#if !defined AMX_NOPROPLIST
+#if !defined NOPROPLIST
 typedef struct _property_list {
   struct _property_list *next;
   cell id;
   char *name;
   cell value;
-  //??? safe AMX (owner of the property)
 } proplist;
 
-static proplist proproot = { NULL, 0, NULL, 0 };
+static proplist proproot = { NULL };
 
 static proplist *list_additem(proplist *root)
 {
@@ -134,15 +96,17 @@ static proplist *list_finditem(proplist *root,cell id,char *name,cell value,
 }
 #endif
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL numargs(AMX *amx, cell *params)
 {
   AMX_HEADER *hdr;
   uchar *data;
   cell bytes;
 
-  (void)params;
   hdr=(AMX_HEADER *)amx->base;
-  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  data=amx->base+(int)hdr->dat;
   /* the number of bytes is on the stack, at "frm + 2*cell" */
   bytes= * (cell *)(data+(int)amx->frm+2*sizeof(cell));
   /* the number of arguments is the number of bytes divided
@@ -157,7 +121,7 @@ static cell AMX_NATIVE_CALL getarg(AMX *amx, cell *params)
   cell value;
 
   hdr=(AMX_HEADER *)amx->base;
-  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  data=amx->base+(int)hdr->dat;
   /* get the base value */
   value= * (cell *)(data+(int)amx->frm+((int)params[1]+3)*sizeof(cell));
   /* adjust the address in "value" in case of an array access */
@@ -174,7 +138,7 @@ static cell AMX_NATIVE_CALL setarg(AMX *amx, cell *params)
   cell value;
 
   hdr=(AMX_HEADER *)amx->base;
-  data=amx->data ? amx->data : amx->base+(int)hdr->dat;
+  data=amx->base+(int)hdr->dat;
   /* get the base value */
   value= * (cell *)(data+(int)amx->frm+((int)params[1]+3)*sizeof(cell));
   /* adjust the address in "value" in case of an array access */
@@ -187,9 +151,11 @@ static cell AMX_NATIVE_CALL setarg(AMX *amx, cell *params)
   return 1;
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL heapspace(AMX *amx,cell *params)
 {
-  (void)params;
   return amx->stk - amx->hea;
 }
 
@@ -208,95 +174,191 @@ static cell AMX_NATIVE_CALL funcidx(AMX *amx,cell *params)
     return 0;
   } /* if */
 
-  amx_GetString(name,cstr,0,UNLIMITED);
+  amx_GetString(name,cstr);
   err=amx_FindPublic(amx,name,&index);
   if (err!=AMX_ERR_NONE)
     index=-1;   /* this is not considered a fatal error */
   return index;
 }
 
+int amx_StrPack(cell *dest,cell *source)
+{
+  int len;
+
+  amx_StrLen(source,&len);
+  if ((ucell)*source>UCHAR_MAX) {
+    /* source string is already packed */
+    while (len >= 0) {
+      *dest++ = *source++;
+      len-=sizeof(cell);
+    } /* while */
+  } else {
+    /* pack string, from bottom up */
+    cell c;
+    int i;
+    for (c=0,i=0; i<len; i++) {
+      assert((*source & ~0xffL)==0);
+      c=(c<<CHARBITS) | *source++;
+      if (i%sizeof(cell) == sizeof(cell)-1) {
+        *dest++=c;
+        c=0;
+      } /* if */
+    } /* for */
+    if (i%sizeof(cell) != 0)    /* store remaining packed characters */
+      *dest=c << (sizeof(cell)-i%sizeof(cell))*CHARBITS;
+    else
+      *dest=0;                  /* store full cell of zeros */
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+int amx_StrUnpack(cell *dest,cell *source)
+{
+  if ((ucell)*source>UCHAR_MAX) {
+    /* unpack string, from top down (so string can be unpacked in place) */
+    cell c;
+    int i,len;
+    amx_StrLen(source,&len);
+    dest[len]=0;
+    for (i=len-1; i>=0; i--) {
+      c=source[i/sizeof(cell)] >> (sizeof(cell)-i%sizeof(cell)-1)*CHARBITS;
+      dest[i]=c & UCHAR_MAX;
+    } /* for */
+  } else {
+    /* source string is already unpacked */
+    while ((*dest++ = *source++) != 0)
+      /* nothing */;
+  } /* if */
+  return AMX_ERR_NONE;
+}
+
+static int verify_addr(AMX *amx,cell addr)
+{
+  int err;
+  cell *cdest;
+
+  err=amx_GetAddr(amx,addr,&cdest);
+  if (err!=AMX_ERR_NONE)
+    amx_RaiseError(amx,err);
+  return err;
+}
+
+static cell AMX_NATIVE_CALL core_strlen(AMX *amx,cell *params)
+{
+  cell *cptr;
+  int len = 0;
+
+  if (amx_GetAddr(amx,params[1],&cptr)==AMX_ERR_NONE)
+    amx_StrLen(cptr,&len);
+  return len;
+}
+
+static cell AMX_NATIVE_CALL strpack(AMX *amx,cell *params)
+{
+  cell *cdest,*csrc;
+  int len,needed,lastaddr,err;
+
+  /* calculate number of cells needed for (packed) destination */
+  amx_GetAddr(amx,params[2],&csrc);
+  amx_StrLen(csrc,&len);
+  needed=(len+sizeof(cell))/sizeof(cell);     /* # of cells needed */
+  assert(needed>0);
+  lastaddr=params[1]+sizeof(cell)*needed-1;
+  if (verify_addr(amx,(cell)lastaddr)!=AMX_ERR_NONE)
+    return 0;
+
+  amx_GetAddr(amx,params[1],&cdest);
+  err=amx_StrPack(cdest,csrc);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+static cell AMX_NATIVE_CALL strunpack(AMX *amx,cell *params)
+{
+  cell *cdest,*csrc;
+  int len,err,lastaddr;
+
+  /* calculate number of cells needed for (packed) destination */
+  amx_GetAddr(amx,params[2],&csrc);
+  amx_StrLen(csrc,&len);
+  assert(len>=0);
+  lastaddr=params[1]+sizeof(cell)*(len+1)-1;
+  if (verify_addr(amx,(cell)lastaddr)!=AMX_ERR_NONE)
+    return 0;
+
+  amx_GetAddr(amx,params[1],&cdest);
+  err=amx_StrUnpack(cdest,csrc);
+  if (err!=AMX_ERR_NONE)
+    return amx_RaiseError(amx,err);
+
+  return len;
+}
+
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL swapchars(AMX *amx,cell *params)
 {
   union {
     cell c;
-    #if PAWN_CELL_SIZE==16
+    #if defined BIT16
       uchar b[2];
-    #elif PAWN_CELL_SIZE==32
-      uchar b[4];
-    #elif PAWN_CELL_SIZE==64
-      uchar b[8];
     #else
-	  #error Unsupported cell size
+      uchar b[4];
     #endif
   } value;
   uchar t;
 
-  (void)amx;
   assert((size_t)params[0]==sizeof(cell));
   value.c = params[1];
-  #if PAWN_CELL_SIZE==16
+  #if defined BIT16
     t = value.b[0];
     value.b[0] = value.b[1];
     value.b[1] = t;
-  #elif PAWN_CELL_SIZE==32
+  #else
     t = value.b[0];
     value.b[0] = value.b[3];
     value.b[3] = t;
     t = value.b[1];
     value.b[1] = value.b[2];
     value.b[2] = t;
-  #elif PAWN_CELL_SIZE==64
-    t = value.b[0];
-    value.b[0] = value.b[7];
-    value.b[7] = t;
-	t = value.b[1];
-	value.b[1] = value.b[6];
-	value.b[6] = t;
-	t = value.b[2];
-	value.b[2] = value.b[5];
-	value.b[5] = t;
-	t = value.b[3];
-    value.b[3] = value.b[4];
-    value.b[4] = t;
-  #else
-    #error Unsupported cell size
   #endif
   return value.c;
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_tolower(AMX *amx,cell *params)
 {
-  (void)amx;
+  assert((size_t)params[0]==sizeof(cell));
-  #if defined __WIN32__ || defined _WIN32 || defined WIN32
-    return (cell)CharLower((LPTSTR)params[1]);
-  #elif defined _Windows
-    return (cell)AnsiLower((LPSTR)params[1]);
-  #else
   return tolower((int)params[1]);
-  #endif
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_toupper(AMX *amx,cell *params)
 {
-  (void)amx;
+  assert((size_t)params[0]==sizeof(cell));
-  #if defined __WIN32__ || defined _WIN32 || defined WIN32
-    return (cell)CharUpper((LPTSTR)params[1]);
-  #elif defined _Windows
-    return (cell)AnsiUpper((LPSTR)params[1]);
-  #else
   return toupper((int)params[1]);
-  #endif
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_min(AMX *amx,cell *params)
 {
-  (void)amx;
   return params[1] <= params[2] ? params[1] : params[2];
 }
 
+#if defined __BORLANDC__ || defined __WATCOMC__
+  #pragma argsused
+#endif
 static cell AMX_NATIVE_CALL core_max(AMX *amx,cell *params)
 {
-  (void)amx;
   return params[1] >= params[2] ? params[1] : params[2];
 }
 
@@ -312,7 +374,7 @@ static cell AMX_NATIVE_CALL core_clamp(AMX *amx,cell *params)
   return value;
 }
 
-#if !defined AMX_NOPROPLIST
+#if !defined NOPROPLIST
 static char *MakePackedString(cell *cptr)
 {
   int len;
@@ -320,21 +382,10 @@ static char *MakePackedString(cell *cptr)
 
   amx_StrLen(cptr,&len);
   dest=(char *)malloc(len+sizeof(cell));
-  amx_GetString(dest,cptr,0,UNLIMITED);
+  amx_GetString(dest,cptr);
   return dest;
 }
 
-static int verify_addr(AMX *amx,cell addr)
-{
-  int err;
-  cell *cdest;
-
-  err=amx_GetAddr(amx,addr,&cdest);
-  if (err!=AMX_ERR_NONE)
-    amx_RaiseError(amx,err);
-  return err;
-}
-
 static cell AMX_NATIVE_CALL getproperty(AMX *amx,cell *params)
 {
   cell *cstr;
@@ -352,7 +403,7 @@ static cell AMX_NATIVE_CALL getproperty(AMX *amx,cell *params)
       return 0;
     } /* if */
     amx_GetAddr(amx,params[4],&cstr);
-    amx_SetString(cstr,item->name,1,0,UNLIMITED);
+    amx_SetString(cstr,item->name,1);
   } /* if */
   free(name);
   return (item!=NULL) ? item->value : 0;
@@ -417,14 +468,12 @@ static cell AMX_NATIVE_CALL existproperty(AMX *amx,cell *params)
 }
 #endif
 
-#if !defined AMX_NORANDOM
 /* This routine comes from the book "Inner Loops" by Rick Booth, Addison-Wesley
  * (ISBN 0-201-47960-5). This is a "multiplicative congruential random number
  * generator" that has been extended to 31-bits (the standard C version returns
  * only 15-bits).
  */
-#define INITIAL_SEED  0xcaa938dbL
+static unsigned long IL_StandardRandom_seed = 0L;
-static unsigned long IL_StandardRandom_seed = INITIAL_SEED; /* always use a non-zero seed */
 #define IL_RMULT 1103515245L
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
@@ -436,7 +485,7 @@ static cell AMX_NATIVE_CALL core_random(AMX *amx,cell *params)
 
     /* one-time initialization (or, mostly one-time) */
     #if !defined SN_TARGET_PS2 && !defined _WIN32_WCE
-        if (IL_StandardRandom_seed == INITIAL_SEED)
+        if (IL_StandardRandom_seed == 0L)
             IL_StandardRandom_seed=(unsigned long)time(NULL);
     #endif
   
@@ -453,8 +502,23 @@ static cell AMX_NATIVE_CALL core_random(AMX *amx,cell *params)
         result %= params[1];
     return (cell)result;
 }
-#endif
 
+#if 0
+
+void core_Init(void)
+{
+  /* reduced to a do-nothing routine */
+}
+
+void core_Exit(void)
+{
+  #if !defined NOPROPLIST
+    while (proproot.next!=NULL)
+      list_delete(&proproot,proproot.next);
+  #endif
+}
+
+#endif
 
 AMX_NATIVE_INFO core_Natives[] = {
   { "numargs",       numargs },
@@ -462,28 +526,23 @@ AMX_NATIVE_INFO core_Natives[] = {
   { "setarg",        setarg },
   { "heapspace",     heapspace },
   { "funcidx",       funcidx },
+  { "strlen",        core_strlen },
+  { "strpack",       strpack },
+  { "strunpack",     strunpack },
   { "swapchars",     swapchars },
   { "tolower",       core_tolower },
   { "toupper",       core_toupper },
+  { "random",        core_random },
   { "min",           core_min },
   { "max",           core_max },
   { "clamp",         core_clamp },
-  { "random",        core_random },
+#if !defined NOPROPLIST
+  { "getproperty",   getproperty },
+  { "setproperty",   setproperty },
+  { "deleteproperty",delproperty },
+  { "existproperty", existproperty },
+#endif
   { NULL, NULL }        /* terminator */
 };
 
-int AMXEXPORT amx_CoreInit(AMX *amx)
-{
-  return amx_Register(amx, core_Natives, -1);
-}
 
-int AMXEXPORT amx_CoreCleanup(AMX *amx)
-{
-  (void)amx;
-  #if !defined AMX_NOPROPLIST
-    //??? delete only the properties owned by the AMX
-    while (proproot.next!=NULL)
-      list_delete(&proproot,proproot.next);
-  #endif
-  return AMX_ERR_NONE;
-}

amxmodx/amxdbg.cpp

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

amxmodx/amxdbg.h

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

amxmodx/amxdefn.asm

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

amxmodx/amxmod.h

@@ -29,31 +29,12 @@
 *  version.
 */
 
-#ifndef AMXMODX_H
+#ifndef AMXMOD_H
-#define AMXMODX_H
+#define AMXMOD_H
 
-
-#ifdef __linux__
-#include <unistd.h>
-#include <stdlib.h>
-#include "sclinux.h"
-#endif
-#include <ctype.h> //tolower, etc
-#include "string.h"
-#include <extdll.h>
-#include <meta_api.h>
-#include "mm_pextensions.h"			// metamod-p extensions
-
-#ifdef MEMORY_TEST
-#include "mmgr/mmgr.h"
-#endif
-
-#include "md5.h"
-#include "CVector.h"
-#include "CList.h"
-#include "CQueue.h"
 #include "modules.h"
 #include "CString.h"
+#include "CList.h"
 #include "CPlugin.h"
 #include "CMisc.h"
 #include "CVault.h"
@@ -64,16 +45,18 @@
 #include "CCmd.h"
 #include "CMenu.h"
 #include "CEvent.h"
-#include "CLang.h"
-#include "fakemeta.h"
-#include "amxxlog.h"
 
-#define AMXXLOG_Log g_log.Log
+#define AMX_VERSION     "0.1"
-#define AMX_VERSION     "1.55"
 
-extern AMX_NATIVE_INFO  core_Natives[];
+#ifdef  __cplusplus
-extern AMX_NATIVE_INFO  time_Natives[];
+extern "C" {
-extern AMX_NATIVE_INFO  power_Natives[];
+#endif
+  extern AMX_NATIVE_INFO  core_Natives[];
+  extern AMX_NATIVE_INFO  time_Natives[];
+  extern AMX_NATIVE_INFO  power_Natives[];
+#ifdef  __cplusplus
+}
+#endif
 extern  AMX_NATIVE_INFO amxmod_Natives[];
 extern  AMX_NATIVE_INFO file_Natives[];
 extern  AMX_NATIVE_INFO float_Natives[];
@@ -82,13 +65,13 @@ extern  AMX_NATIVE_INFO vault_Natives[];
 
 
 #ifndef __linux__
-#define DLLOAD(path) (DLHANDLE)LoadLibrary(path)
+#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)
+#define DLFREE(m) FreeLibrary(m);
 #else
-#define DLLOAD(path) (DLHANDLE)dlopen(path, RTLD_NOW)
+#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)
+#define DLFREE(m) dlclose(m);
 #endif
 
 #ifndef __linux__
@@ -117,8 +100,8 @@ void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pM
 void UTIL_IntToString(int value, char *output);
 void UTIL_ShowMOTD( edict_t *client , char *motd, int mlen, const char *name);
 void UTIL_ShowMenu( edict_t* pEntity, int slots, int time, char *menu, int mlen );
-char *UTIL_VarArgs(const char *fmt, ...);
+void UTIL_MakeNewLogFile();
-
+void UTIL_Log(const char *fmt, ...);
 
 #define GET_PLAYER_POINTER(e)   (&g_players[ENTINDEX(e)])
 //#define GET_PLAYER_POINTER(e)   (&g_players[(((int)e-g_edict_point)/sizeof(edict_t ))])
@@ -138,9 +121,7 @@ struct fakecmd_t {
   bool fake;
 };
 
-extern bool g_IsNewMM;
+
-extern pextension_funcs_t *gpMetaPExtFuncs;
-extern CLog g_log;
 extern CPluginMngr g_plugins;
 extern CTaskMngr g_tasksMngr;
 extern CPlayer g_players[33];
@@ -150,13 +131,12 @@ extern CList<CCVar> g_cvars;
 extern CList<ForceObject> g_forcemodels;
 extern CList<ForceObject> g_forcesounds;
 extern CList<ForceObject> g_forcegeneric;
-extern CList<CModule,const char *> g_modules;
+extern CList<CModule> g_modules;
 extern CList<CPlayer*> g_auth;
 extern EventsMngr g_events;
 extern Grenades g_grenades;
 extern LogEventsMngr g_logevents;
 extern MenuMngr g_menucmds;
-extern CLangMngr g_langMngr;
 extern String g_log_dir;
 extern String g_mod_name;
 extern TeamIds g_teamsIds;
@@ -167,7 +147,9 @@ extern XVars g_xvars;
 extern bool g_bmod_cstrike;
 extern bool g_bmod_dod;
 extern bool g_dontprecache;
+extern bool g_initialized;
 extern int g_srvindex;
+extern cvar_t* amx_version;
 extern cvar_t* amxmodx_version;
 extern cvar_t* hostname;
 extern cvar_t* mp_timelimit;
@@ -227,33 +209,22 @@ void plugin_srvcmd();
 const char* stristr(const char* a,const char* b);
 char *strptime(const char *buf, const char *fmt, struct tm *tm, short addthem);
 
-int loadModules(const char* filename, PLUG_LOADTIME now);
+int loadModules(const char* filename);
-void detachModules();
+void dettachModules();
-void detachReloadModules();
+void dettachReloadModules();
-#ifdef FAKEMETA
 void attachModules();
-#endif
+void attachMetaModModules( const char* filename );
-
+void dettachMetaModModules( const char* filename );
-// Count modules
-enum CountModulesMode
-{
-	CountModules_Running = 0,
-	CountModules_All,
-	CountModules_Stopped
-};
-
-int countModules(CountModulesMode mode);
-void modules_callPluginsLoaded();
 
+int add_amxnatives(module_info_s* info,AMX_NATIVE_INFO*natives);
 cell* get_amxaddr(AMX *amx,cell amx_addr);
 char* build_pathname(char *fmt, ... );
-char* build_pathname_r(char *buffer, size_t maxlen, char *fmt, ...);
 char* format_amxstring(AMX *amx, cell *params, int parm,int& len);
 AMX* get_amxscript(int, void**,const char**);
 const char* get_amxscriptname(AMX* amx);
 char* get_amxstring(AMX *amx,cell amx_addr,int id,int& len);
 int amxstring_len(cell* cstr);
-int load_amxscript(AMX* amx, void** program, const char* path, char error[64], int debug);
+int load_amxscript(AMX* amx, void** program, const char* path, char error[64]);
 int set_amxnatives(AMX* amx,char error[64]);
 int set_amxstring(AMX *amx,cell amx_addr,const char *source,int max);
 int unload_amxscript(AMX* amx,void** program);
@@ -263,52 +234,7 @@ void print_srvconsole( 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 );
-cell AMX_NATIVE_CALL require_module(AMX *amx, cell *params);
-void LogError(AMX *amx, int err, const char *fmt, ...);
 
-enum ModuleCallReason
-{
-	ModuleCall_NotCalled = 0,			// nothing
-	ModuleCall_Query,					// in Query func
-	ModuleCall_Attach,					// in Attach func
-	ModuleCall_Detach,					// in Detach func
-};
 
-extern ModuleCallReason g_ModuleCallReason;		// modules.cpp
+#endif // AMXMOD_H
-extern CModule *g_CurrentlyCalledModule;		// modules.cpp
-extern const char *g_LastRequestedFunc;			// modules.cpp
-void Module_CacheFunctions();
-void Module_UncacheFunctions();
-
-void *Module_ReqFnptr(const char *funcName);	// modules.cpp
-
-// standard forwards
-// defined in meta_api.cpp
-extern int FF_ClientCommand;
-extern int FF_ClientConnect;
-extern int FF_ClientDisconnect;
-extern int FF_ClientInfoChanged;
-extern int FF_ClientPutInServer;
-extern int FF_PluginInit;
-extern int FF_PluginCfg;
-extern int FF_PluginPrecache;
-extern int FF_PluginLog;
-extern int FF_PluginEnd;
-extern int FF_InconsistentFile;
-extern int FF_ClientAuthorized;
-extern bool g_coloredmenus;
-
-#ifdef FAKEMETA
-extern CFakeMeta g_FakeMeta;
-#endif
-
-struct func_s
-{
-	void *pfn;
-	const char *desc;
-};
-
-#endif // AMXMODX_H
 

amxmodx/amxtime.c

@@ -11,20 +11,6 @@
   #include <windows.h>
   #include <mmsystem.h>
 #endif
-
-#ifdef __GNUC__
-#	ifndef CLK_TCK
-#		define CLK_TCK	CLOCKS_PER_SEC
-#	endif
-#endif
-
-#include <stdlib.h>
-
-// this file does not include amxmodx.h, so we have to include the memory manager here
-#ifdef MEMORY_TEST
-#include "mmgr/mmgr.h"
-#endif // MEMORY_TEST
-
 #include "amx.h"
 
 #if defined __BORLANDC__ || defined __WATCOMC__

amxmodx/amxxfile.cpp

@@ -1,342 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#include "amxmodx.h"
-#include "amxxfile.h"
-#include "zlib/zlib.h"
-
-/**********************
- ****** AMXXFILE ******
- **********************/
-#if defined __GNUC__
-  #define PACKED        __attribute__((packed))
-#else
-  #define PACKED
-#endif
-
-#if defined __linux__
-  #pragma pack(1)         /* structures must be packed (byte-aligned) */
-#else
-  #pragma pack(1)         /* structures must be packed (byte-aligned) */
-  #if defined __TURBOC__
-    #pragma option -a-    /* "pack" pragma for older Borland compilers */
-  #endif
-#endif
-
-struct TableEntry
-{
-	mint8_t cellSize PACKED;
-	mint32_t origSize PACKED;			// contains AMX_HEADER->stp
-	mint32_t offset PACKED;
-};
-
-#define DATAREAD(addr, itemsize, itemcount) \
-	if (fread((addr), (itemsize), (itemcount), (m_pFile)) != (itemcount)) \
-	{ \
-		if (feof(m_pFile)) \
-			m_Status = Err_FileInvalid; \
-		else \
-			m_Status = Err_FileRead; \
-		fclose(m_pFile); \
-		m_pFile = NULL; \
-		return; \
-	}
-
-CAmxxReader::CAmxxReader(const char *filename, int cellsize)
-{
-	m_Bh.plugins = NULL;
-	m_AmxxFile = false;
-	if (!filename)
-	{
-		m_Status = Err_InvalidParam;
-		return;
-	}
-
-	m_Status = Err_None;
-	m_CellSize = cellsize;
-
-	m_pFile = fopen(filename, "rb");
-	if (!m_pFile)
-	{
-		m_Status = Err_FileOpen;
-		return;
-	}
-
-	mint32_t magic;
-	DATAREAD(&magic, sizeof(magic), 1);
-
-	m_OldFile = false;
-	if ( magic == 0x524C4542 ) {
-		//we have an invalid, old, RLEB file
-		m_Status = Err_OldFile;
-		fclose(m_pFile);
-		m_pFile = NULL;
-		return;
-	} else if ( magic == MAGIC_HEADER2 ) {
-		DATAREAD(&m_Bh.version, sizeof(int16_t), 1);
-		if (m_Bh.version != MAGIC_VERSION)
-		{
-			m_Status = Err_OldFile;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			return;
-		}
-		m_AmxxFile = true;
-		DATAREAD(&m_Bh.numPlugins, sizeof(mint8_t), 1);
-		m_Bh.plugins = new PluginEntry[m_Bh.numPlugins];
-		PluginEntry *pe;
-		m_SectionHdrOffset = 0;
-		m_Entry = -1;
-		for (mint8_t i=0; i<m_Bh.numPlugins; i++)
-		{
-			pe = &(m_Bh.plugins[i]);
-			DATAREAD(&pe->cellsize, sizeof(mint8_t), 1);
-			DATAREAD(&pe->disksize, sizeof(int32_t), 1);
-			DATAREAD(&pe->imagesize, sizeof(int32_t), 1);
-			DATAREAD(&pe->memsize, sizeof(int32_t), 1);
-			DATAREAD(&pe->offs, sizeof(int32_t), 1);
-		}
-		for (mint8_t i=0; i<m_Bh.numPlugins; i++)
-		{
-			pe = &(m_Bh.plugins[i]);
-			if (pe->cellsize == m_CellSize)
-			{
-				m_Entry = i;
-				break;
-			}
-		}
-		if (m_Entry == -1)
-		{
-			m_Status = Err_SectionNotFound;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			return;
-		}
-		pe = &(m_Bh.plugins[m_Entry]);
-		m_SectionLength = pe->disksize;
-	} else if (magic == MAGIC_HEADER) {
-
-		// try to find the section
-		mint8_t numOfPlugins;
-		DATAREAD(&numOfPlugins, sizeof(numOfPlugins), 1);
-	
-		TableEntry entry;
-	
-		m_SectionHdrOffset = 0;
-		int i = 0;
-		for (i = 0; i < static_cast<int>(numOfPlugins); ++i)
-		{
-			DATAREAD(&entry, sizeof(entry), 1);
-			if (entry.cellSize == m_CellSize)
-			{
-				m_SectionHdrOffset = ftell(m_pFile) - sizeof(entry);
-				break;
-			}
-		}
-		if (!m_SectionHdrOffset)
-		{
-			m_Status = Err_SectionNotFound;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			return;
-		}
-
-		// compute section length
-		if ((i+1) < static_cast<int>(numOfPlugins))
-		{
-			// there is a next section
-			TableEntry nextEntry;
-			DATAREAD(&nextEntry, sizeof(nextEntry), 1);
-			m_SectionLength = nextEntry.offset - entry.offset;
-		}
-		else
-		{
-			fseek(m_pFile, 0, SEEK_END);
-			m_SectionLength = ftell(m_pFile) - (long)entry.offset;
-		}
-	} else {
-		// check for old file
-		AMX_HEADER hdr;
-		rewind(m_pFile);
-		fread(&hdr, sizeof(hdr), 1, m_pFile);
-		amx_Align16(&hdr.magic);
-		if (hdr.magic == AMX_MAGIC)
-		{
-			if (cellsize != 4)
-			{
-				m_Status = Err_SectionNotFound;
-				fclose(m_pFile);
-				m_pFile = NULL;
-				return;
-			}
-
-			m_OldFile = true;
-			return;
-		}
-		else
-		{
-			// no known file format
-			m_Status = Err_FileInvalid;
-			fclose(m_pFile);
-			m_pFile = NULL;
-			return;
-		}
-	} 
-}
-
-CAmxxReader::~CAmxxReader()
-{
-	if (m_pFile)
-	{
-		fclose(m_pFile);
-		m_pFile = NULL;
-	}
-	if (m_Bh.plugins)
-	{
-		delete [] m_Bh.plugins;
-		m_Bh.plugins = NULL;
-	}
-}
-
-CAmxxReader::Error CAmxxReader::GetStatus()
-{
-	return m_Status;
-}
-
-#undef DATAREAD
-#define DATAREAD(addr, itemsize, itemcount) \
-	if (fread(addr, itemsize, itemcount, m_pFile) != itemcount) \
-	{ \
-		if (feof(m_pFile)) \
-			m_Status = Err_FileInvalid; \
-		else \
-			m_Status = Err_FileRead; \
-		fclose(m_pFile); \
-		m_pFile = NULL; \
-		return 0; \
-	}
-
-size_t CAmxxReader::GetBufferSize()
-{
-	if (!m_pFile)
-		return 0;
-
-	long save = ftell(m_pFile);
-
-	if (m_OldFile)
-	{
-		rewind(m_pFile);
-		AMX_HEADER hdr;
-		DATAREAD(&hdr, sizeof(hdr), 1);
-		fseek(m_pFile, save, SEEK_SET);
-		return hdr.stp;
-	} else if (m_AmxxFile) {
-		PluginEntry *pe = &(m_Bh.plugins[m_Entry]);
-		if (pe->imagesize > pe->memsize)
-			return pe->imagesize + 1;
-		return pe->memsize + 1;
-	}
-
-	fseek(m_pFile, m_SectionHdrOffset, SEEK_SET);
-
-	TableEntry entry;
-	DATAREAD(&entry, sizeof(entry), 1);
-	fseek(m_pFile, save, SEEK_SET);
-	return entry.origSize + 1;			// +1 : safe
-}
-
-#undef DATAREAD
-#define DATAREAD(addr, itemsize, itemcount) \
-	if (fread(addr, itemsize, itemcount, m_pFile) != itemcount) \
-	{ \
-		if (feof(m_pFile)) \
-			m_Status = Err_FileInvalid; \
-		else \
-			m_Status = Err_FileRead; \
-		fclose(m_pFile); \
-		m_pFile = NULL; \
-		return m_Status; \
-	}
-
-CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
-{
-	if (!m_pFile)
-		return m_Status;
-
-	if (m_OldFile)
-	{
-		// get file size
-		fseek(m_pFile, 0, SEEK_END);
-		long filesize = ftell(m_pFile);
-		rewind(m_pFile);
-		DATAREAD(buffer, 1, filesize);
-		m_Status = Err_None;
-		return m_Status;
-	} else if (m_AmxxFile) {
-		PluginEntry *pe = &(m_Bh.plugins[m_Entry]);
-		char *tempBuffer = new char[m_SectionLength + 1];
-		fseek(m_pFile, pe->offs, SEEK_SET);
-		DATAREAD((void *)tempBuffer, 1, m_SectionLength);
-		uLongf destLen = GetBufferSize();
-		int result = uncompress((Bytef *)buffer, &destLen, 
-			(Bytef *)tempBuffer, m_SectionLength);
-		delete [] tempBuffer;
-		if (result != Z_OK)
-		{
-			AMXXLOG_Log("[AMXX] Zlib error encountered: %d(%d)", result, m_SectionLength);
-			m_Status = Err_Decompress;
-			return Err_Decompress;
-		}
-		return Err_None;
-	} else {
-		// new file type: go to the section table entry
-		fseek(m_pFile, m_SectionHdrOffset, SEEK_SET);
-		// go to the offset
-		TableEntry entry;
-		DATAREAD(&entry, sizeof(entry), 1);
-		fseek(m_pFile, entry.offset, SEEK_SET);
-		uLongf destLen = GetBufferSize();
-		// read the data to a temporary buffer
-		char *tempBuffer = new char[m_SectionLength + 1];
-		//fread(tempBuffer, sizeof(char), m_SectionLength, m_pFile);
-		DATAREAD((void*)tempBuffer, 1, m_SectionLength);
-		// decompress
-		int result = uncompress((Bytef *)buffer, &destLen,
-				(Bytef *)tempBuffer, m_SectionLength);
-		delete [] tempBuffer;
-		if (result != Z_OK)
-		{
-			AMXXLOG_Log("[AMXX] Zlib error encountered: %d(%d)", result, m_SectionLength);
-			m_Status = Err_Decompress;
-			return Err_Decompress;
-		}
-		return Err_None;
-	}
-}

amxmodx/amxxfile.h

@@ -1,98 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#ifndef __AMXXFILE_H__
-#define __AMXXFILE_H__
-
-#define MAGIC_HEADER		0x414D5842
-#define MAGIC_HEADER2		0x414D5858
-#define	MAGIC_VERSION		0x0300
-
-typedef char		mint8_t;
-typedef int16_t		mint16_t;
-typedef int32_t		mint32_t;
-
-struct PluginEntry
-{
-	mint8_t cellsize;	//cell size
-	int32_t imagesize;	//uncompressed image size
-	int32_t disksize;	//compressed image size
-	int32_t memsize;	//memory image size
-	int32_t offs;		//file offset
-};
-
-struct BinHeader
-{
-	int32_t		magic;
-	mint16_t	version;
-	mint8_t		numPlugins;
-	PluginEntry *plugins;
-};
-
-class CAmxxReader
-{
-public:
-	enum Error
-	{
-		Err_None=0,
-		Err_InvalidParam,
-		Err_FileOpen,
-		Err_FileRead,
-		Err_FileInvalid,
-		Err_SectionNotFound,
-		Err_DecompressorInit,
-		Err_Decompress,
-		Err_OldFile,
-	};
-
-private:
-	Error m_Status;
-	FILE *m_pFile;
-
-	bool m_OldFile;					// old .amx file
-	bool m_AmxxFile;				// new 'AMXX' header format
-	BinHeader m_Bh;					// binary header
-	int m_Entry;					// entry #
-
-	int m_CellSize;
-	int m_SectionHdrOffset;			// offset to the table in the header that describes the required section
-	int m_SectionLength;
-public:
-	CAmxxReader(const char *filename, int cellsize);
-	~CAmxxReader();
-
-	Error GetStatus();						// Get the current status
-	size_t GetBufferSize();					// Get the size for the buffer
-	Error GetSection(void *buffer);			// Copy the currently selected section to the buffer
-};
-
-#endif // __AMXXFILE_H__
-

amxmodx/amxxlog.cpp

@@ -1,219 +0,0 @@
-/* AMX Mod X
-*
-* by the AMX Mod X Development Team
-*
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-// amxx_logging localinfo:
-//  0 = no logging
-//  1 = one logfile / day
-//  2 = one logfile / map
-//  3 = HL Logs
-
-#include <time.h>
-#ifndef __linux__
-#include <io.h>
-#endif
-#include "amxmodx.h"
-
-#ifndef __linux__
-#define	vsnprintf	_vsnprintf
-#endif
-
-CLog::CLog()
-{
-	m_LogType = 0;
-	m_LogFile.clear();
-}
-
-CLog::~CLog()
-{
-	CloseFile();
-}
-
-void CLog::CloseFile()
-{
-	// log "log file closed" to old file, if any
-	if (!m_LogFile.empty())
-	{
-		FILE *fp = fopen(m_LogFile.c_str(), "r");
-		if (fp)
-		{
-			fclose(fp);
-			fp = fopen(m_LogFile.c_str(), "a+");
-
-			// get time
-			time_t td;
-			time(&td);
-			tm *curTime = localtime(&td);
-
-			char date[32];
-			strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
-
-			fprintf(fp, "L %s: %s\n", date, "Log file closed.");
-			fclose(fp);
-		}
-		m_LogFile.clear();
-	}
-}
-
-void CLog::CreateNewFile()
-{
-	CloseFile();
-	// build filename
-	time_t td;
-	time(&td);
-	tm *curTime = localtime(&td);
-
-	int i = 0;
-	while (true)
-	{
-		FILE *pTmpFile = fopen(m_LogFile.c_str(), "r");		// open for reading to check whether the file exists
-		if (!pTmpFile)
-			break;
-		fclose(pTmpFile);
-		++i;
-	}
-	// Log logfile start
-	FILE *fp = fopen(m_LogFile.c_str(), "w");
-	if (!fp)
-	{
-		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
-		SET_LOCALINFO("amxx_logging", "0");
-	}
-	else
-	{
-		fprintf(fp, "AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")\n", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
-		fclose(fp);
-	}
-}
-
-void CLog::UseFile(const String &fileName)
-{
-	static char file[256];
-	m_LogFile.assign(build_pathname_r(file, sizeof(file)-1, "%s/%s", g_log_dir.c_str(), fileName.c_str()));
-}
-
-void CLog::MapChange()
-{
-	// create dir if not existing
-	char file[256];
-#ifdef __linux
-	mkdir(build_pathname_r(file, sizeof(file)-1,"%s", g_log_dir.c_str()), 0700);
-#else
-	mkdir(build_pathname_r(file, sizeof(file)-1,"%s", g_log_dir.c_str()));
-#endif
-
-	m_LogType = atoi(get_localinfo("amxx_logging", "1"));
-	if (m_LogType < 0 || m_LogType > 3)
-	{
-		SET_LOCALINFO("amxx_logging", "1");
-		m_LogType = 1;
-		print_srvconsole("[AMXX] Invalid amxx_logging value; setting back to 1...");
-	}
-
-	if (m_LogType == 2)
-	{
-		// create new logfile
-		CreateNewFile();
-	}
-	else if (m_LogType == 1)
-	{
-		Log("-------- Mapchange --------");
-	}
-	else
-		return;
-}
-
-void CLog::Log(const char *fmt, ...)
-{
-	static char file[256];
-	if (m_LogType == 1 || m_LogType == 2)
-	{
-		// get time
-		time_t td;
-		time(&td);
-		tm *curTime = localtime(&td);
-
-		char date[32];
-		strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
-
-		// msg
-		static char msg[3072];
-
-		va_list arglst;
-		va_start(arglst, fmt);
-		vsnprintf(msg, 3071, fmt, arglst);
-		va_end(arglst);
-
-		FILE *pF = NULL;
-		if (m_LogType == 2)
-		{
-			pF = fopen(m_LogFile.c_str(), "a+");
-			if (!pF)
-			{
-				CreateNewFile();
-				pF = fopen(m_LogFile.c_str(), "a+");
-				if (!pF)
-				{
-					ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Logging disabled for this map.\n", m_LogFile.c_str());
-					m_LogType = 0;
-					return;
-				}
-			}
-		}
-		else
-		{
-			build_pathname_r(file, sizeof(file)-1, "%s/L%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday);
-			pF = fopen(file, "a+");
-		}
-		if (pF)
-		{
-			fprintf(pF, "L %s: %s\n", date, msg);
-			fclose(pF);
-		}
-		else
-		{
-			ALERT(at_logged, "[AMXX] Unexpected fatal logging error (couldn't open %s for a+). AMXX Logging disabled for this map.\n", file);
-			m_LogType = 0;
-			return;
-		}
-
-		// print on server console
-		print_srvconsole("L %s: %s\n", date, msg);
-	}
-	else if (m_LogType == 3)
-	{
-		// build message
-		static char msg_[3072];
-		va_list arglst;
-		va_start(arglst, fmt);
-		vsnprintf(msg_, 3071, fmt, arglst);
-		va_end(arglst);
-		ALERT(at_logged, "%s\n", msg_);
-	}
-}

amxmodx/emsg.cpp

@@ -29,7 +29,9 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
 
 int gmsgAmmoPickup;
 int gmsgAmmoX;
@@ -90,7 +92,7 @@ void Client_TeamInfo(void* mValue)
   case 1:
 	if ( index < 1 || index > gpGlobals->maxClients ) break;
 	char* msg = (char*)mValue;
-    g_players[ index ].team.assign( msg );
+    g_players[ index ].team.set( msg );
 	g_teamsIds.registerTeam( msg , -1 );
   }
 }
@@ -153,12 +155,23 @@ void Client_WeaponList(void* mValue)
     break;
   case 7:
     int iId = *(int*)mValue;
+	/*int* blocker;
+
+	int iwpn = iId;
+	
+	if (iId > 31) {
+		iwpn -= 31;
+		blocker = &wpnList2;
+	}
+	else
+		blocker = &wpnList;*/
+
     if ( (iId < 0 || iId >= MAX_WEAPONS ) || (wpnList & (1<<iId)) )
       break;
     wpnList |= (1<<iId);
     g_weaponsData[iId].iId = iId;
     g_weaponsData[iId].ammoSlot = iSlot;
-    g_weaponsData[iId].fullName.assign(wpnName);
+    g_weaponsData[iId].fullName.set(wpnName);
 
   }
 }
@@ -232,7 +245,7 @@ void Client_ScoreInfo(void* mValue)
     pPlayer->deaths = deaths;
     pPlayer->teamId = *(int*)mValue;
     if ( g_teamsIds.isNewTeam() )
-      g_teamsIds.registerTeam( pPlayer->team.c_str() , pPlayer->teamId );
+      g_teamsIds.registerTeam( pPlayer->team.str() , pPlayer->teamId );
   }
 }
 
@@ -246,7 +259,7 @@ void Client_DamageEnd(void* mValue)
 		g_events.parseValue( dead->death_killer  );
 		g_events.parseValue( dead->index  );
 		g_events.parseValue( dead->death_headshot  );
-		g_events.parseValue( dead->death_weapon.c_str()  );
+		g_events.parseValue( dead->death_weapon.str()  );
 		g_events.parseValue( dead->death_tk ? 1 : 0  );
 		g_events.executeEvents();
 		dead->death_killer = 0;
@@ -280,7 +293,7 @@ void Client_DeathMsg(void* mValue)
 		if (  !killer || !victim ) break;
 
 		victim->death_killer = killer_id;
-		victim->death_weapon.assign((char*)mValue);
+		victim->death_weapon.set((char*)mValue);
 		victim->death_headshot = hs;
 		victim->death_tk = (killer->teamId == victim->teamId);
 	}
@@ -313,4 +326,3 @@ void Client_ResetHUD(void* mValue)
 
 }
 */
-

amxmodx/fakemeta.h

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

@@ -35,44 +35,25 @@
 	#define _INTPTR_T_DEFINED
 #endif
 
-#ifdef __GNUC__
+#include <extdll.h>
-#include <stdio.h>
+#include <meta_api.h>
-#include <sys/types.h>
+#include "amxmod.h"
-#include <sys/stat.h>
-#include <dirent.h>
-#endif
 
 // header file for unlink()
 #ifdef __linux__
 #include <unistd.h>
 #else
-#define WINDOWS_LEAN_AND_MEAN
-#include <windows.h>
 #include <io.h>
 #endif
 
-#include <extdll.h>
+#ifdef __GNUC__
-#include <meta_api.h>
-#include "amxmodx.h"
 
-CVector<FILE *> FileList;
+//#include <stddef.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <dirent.h>
 
-class AutoFilePtr
+#endif
-{
-	FILE *m_FP;
-public:
-	AutoFilePtr(FILE *fp) : m_FP(fp)
-	{ }
-	~AutoFilePtr()
-	{
-		if (m_FP)
-			fclose(m_FP);
-	}
-	operator FILE* ()
-	{
-		return m_FP;
-	}
-};
 
 static cell AMX_NATIVE_CALL read_dir(AMX *amx, cell *params)
 {
@@ -185,7 +166,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 
   // adding a new line in a middle of already existing file
   FILE* pTemp;
-  char buffor[2048];
+  char buffor[1024];
 
   if ( (pTemp = tmpfile()) == NULL ){
     amx_RaiseError(amx,AMX_ERR_NATIVE);
@@ -194,11 +175,11 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
 
   for(i=0;;++i){
     if (  i == iLine ){
-      fgets(buffor,2047,pFile);
+      fgets(buffor,1023,pFile);
       fputs( sText , pTemp );
       fputc( '\n', pTemp );
     }
-    else if ( fgets(buffor,2047,pFile) ){
+    else if ( fgets(buffor,1023,pFile) ){
       fputs(buffor , pTemp );
     }
     else if ( i < iLine ) {
@@ -216,7 +197,7 @@ static cell AMX_NATIVE_CALL write_file(AMX *amx, cell *params) /* 3 param */
     return 0;
   }
 
-  while(fgets(buffor,2047,pTemp))
+  while(fgets(buffor,1023,pTemp))
     fputs(buffor,pFile );
 
   fclose(pTemp);
@@ -234,65 +215,30 @@ static cell AMX_NATIVE_CALL delete_file(AMX *amx, cell *params) /* 1 param */
 static cell AMX_NATIVE_CALL file_exists(AMX *amx, cell *params) /* 1 param */
 {
   int iLen;
-  char *sFile = get_amxstring(amx,params[1],0,iLen);
+  char* sFile = get_amxstring(amx,params[1],0,iLen);
-  char *file = build_pathname("%s",sFile);
+  FILE* fp = fopen(build_pathname("%s",sFile),"r");
-#if defined WIN32 || defined _WIN32
+  if ( fp != NULL) {
-  DWORD attr = GetFileAttributes(file);
+    fclose(fp);
-  if (attr == INVALID_FILE_ATTRIBUTES)
-	  return 0;
-  if (attr == FILE_ATTRIBUTE_DIRECTORY)
-	  return 0;
     return 1;
-#else
+  }
-  struct stat s;
-  if (stat(file, &s) != 0)
   return 0;
-  if (S_ISDIR(s.st_mode))
-	  return 0;
-  return 1;
-#endif
-}
-
-static cell AMX_NATIVE_CALL dir_exists(AMX *amx, cell *params) /* 1 param */
-{
-  int iLen;
-  char *sFile = get_amxstring(amx,params[1],0,iLen);
-  char *file = build_pathname("%s",sFile);
-#if defined WIN32 || defined _WIN32
-  DWORD attr = GetFileAttributes(file);
-  if (attr == INVALID_FILE_ATTRIBUTES)
-	  return 0;
-  if (attr == FILE_ATTRIBUTE_DIRECTORY)
-	  return 1;
-  return 0;
-#else
-  struct stat s;
-  if (stat(file, &s) != 0)
-	  return 0;
-  if (S_ISDIR(s.st_mode))
-	  return 1;
-  return 0;
-#endif
 }
 
 static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
 {
   int iLen;
   char* sFile = get_amxstring(amx,params[1],0,iLen);
-	AutoFilePtr fp(fopen(build_pathname("%s",sFile),"r"));
+  FILE* fp = fopen(build_pathname("%s",sFile),"r");
-	if ( fp != NULL)
+  if ( fp != NULL) {
-	{
+  if ( params[0] < 2 || params[2] == 0 ){
-		if ( params[0] < 2 || params[2] == 0 )
-		{
     fseek(fp,0,SEEK_END);
     int size = ftell(fp);
+    fclose(fp);
     return size;
   }
-		else if ( params[2] == 1 )
+  else if ( params[2] == 1 ){
-		{
     int a = 0,lines = 0;
-			while( a != EOF )
+    while( a != EOF ){
-			{
       ++lines;
       while ( (a = fgetc(fp)) != '\n'  && a != EOF )
         ;
@@ -317,406 +263,6 @@ static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
   return -1;
 }
 
-//ported from Sanji's file access module by BAILOPAN
-// Important update - now uses new handles
-static cell AMX_NATIVE_CALL amx_fopen(AMX *amx, cell *params)
-{
-	unsigned int i;
-	int len, j=-1;
-	char *file = build_pathname("%s", get_amxstring(amx, params[1], 1, len));
-	char *flags = get_amxstring(amx, params[2], 0, len);
-
-	FILE *fp = fopen(file, flags);
-	if (fp == NULL) {
-		// Failed
-		return 0;
-	}
-
-	for (i=0; i<FileList.size(); i++)
-	{
-		if (FileList.at(i) == NULL)
-		{
-			j = i;
-			break;
-		}
-	}
-	if (j==-1)
-	{
-		FileList.push_back(fp);
-		j = FileList.size() - 1;
-	} else {
-		FileList.at(j) = fp;
-	}
-
-	return j+1;
-}
-
-static cell AMX_NATIVE_CALL amx_fclose(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-	if (fp) {
-		return fclose(fp);
-	} else {
-		return -1;
-	}
-}
-
-static cell AMX_NATIVE_CALL amx_fread(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-	char *buffer;
-	if (fp) {
-		buffer = new char[params[3]];			// SLOW!!! :TODO: Find a better way (auto pointers?)
-		fread(buffer, sizeof(char), params[3], fp);
-		set_amxstring(amx, params[2], buffer, params[3]);
-		delete [] buffer;
-		return 1;
-	}
-	return -1;
-}
-
-#ifdef UNUSED
-static cell AMX_NATIVE_CALL amx_fgetc(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-	if (fp) {
-		return fgetc(fp);
-	} else {
-		return -1;
-	}
-}
-
-static cell AMX_NATIVE_CALL amx_fwrite(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-	char *buf;
-	int len;
-	if (fp) {
-		buf = format_amxstring(amx, params, 2, len);
-		return fwrite(buf, sizeof(char), strlen(buf), fp);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_feof(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-	if (fp) {
-		if (feof(fp)) {
-			return 1;
-		}
-		return 0;
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fseek(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	if (fp) {
-		return fseek(fp, (long)params[2], params[3]);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputc(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	if (fp) {
-		return fputc(params[2], fp);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_rewind(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	if (fp) {
-		rewind(fp);
-		return 1;
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fflush(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	if (fp) {
-		return fflush(fp);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fscanf(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	char *buf;
-	int len;
-	buf = format_amxstring(amx, params, 2, len);
-	if (fp) {
-		return fscanf(fp, "%s", buf);
-	}
-
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_ftell(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	if (fp) {
-		return ftell(fp);
-	}
-	return -1;
-}
-#endif //UNUSED
-
-static cell AMX_NATIVE_CALL amx_filesize(AMX *amx, cell *params)
-{
-	int len;
-	char *file = build_pathname("%s", format_amxstring(amx, params, 1, len));
-	long size;
-	AutoFilePtr fp(fopen(file, "rb"));
-	if (fp) {
-		fseek(fp, 0, SEEK_END);
-		size = ftell(fp);
-		return size;
-	}
-	return -1;
-}
-
-#ifdef UNUSED
-static cell AMX_NATIVE_CALL amx_fgetl(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	long t;
-	if (fp) {
-		fread(&t, sizeof(long), 1, fp);
-		return t;
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fgeti(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	int t;
-	if (fp) {
-		fread(&t, sizeof(int), 1, fp);
-		return t;
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fgets(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	short t;
-	if (fp) {
-		fread(&t, sizeof(short), 1, fp);
-		return t;
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputs(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	short size = params[2];
-	if (fp) {
-		return fwrite(&size, sizeof(short), 1, fp);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputl(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	long size = params[2];
-	if (fp) {
-		return fwrite(&size, sizeof(long), 1, fp);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputi(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	int size = params[2];
-	if (fp) {
-		return fwrite(&size, sizeof(int), 1, fp);
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fgetf(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	float t;
-	if (fp) {
-		fread(&t, sizeof(float), 1, fp);
-		return *(cell*)&t;
-	}
-	return -1;
-}
-
-static cell AMX_NATIVE_CALL amx_fputf(AMX *amx, cell *params)
-{
-	unsigned int id = params[1] - 1;
-	if (id >= FileList.size() || FileList.at(id) == NULL)
-		return 0;
-	FILE *fp = FileList.at(id);
-
-	float size = *(float *)((void *)&params[2]);
-	if (fp) {
-		return fwrite(&size, sizeof(float), 1, fp);
-	}
-	return -1;
-}
-#endif //UNUSED
-
-static cell AMX_NATIVE_CALL amx_build_pathname(AMX *amx, cell *params)
-{
-	int len;
-	char *szPath = get_amxstring(amx, params[1], 0, len);
-	return set_amxstring(amx, params[2], build_pathname("%s", szPath), params[3]);
-}
-
-static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
-{
-	int len;
-	char *path = get_amxstring(amx, params[1], 0, len);
-
-#if defined WIN32 || defined _WIN32
-	char *dirname = build_pathname("%s\\*", path);
-	WIN32_FIND_DATA fd;
-	HANDLE hFile = FindFirstFile(dirname, &fd);
-	if (hFile == INVALID_HANDLE_VALUE)
-		return 0;
-	set_amxstring(amx, params[2], fd.cFileName, params[3]);
-	return (DWORD)hFile;
-#else
-	char *dirname = build_pathname("%s", path);
-	DIR *dp = opendir(dirname);
-	if (!dp)
-		return NULL;
-	struct dirent *ep = readdir(dp);
-	if (!ep)
-	{
-		closedir(dp);
-		return NULL;
-	}
-	set_amxstring(amx,params[2], ep->d_name,params[3]);
-	return (cell)dp;
-#endif
-}
-
-static cell AMX_NATIVE_CALL amx_close_dir(AMX *amx, cell *params)
-{
-#if defined WIN32 || defined _WIN32
-	HANDLE hFile = (HANDLE)((DWORD)params[1]);
-	if (hFile == INVALID_HANDLE_VALUE || hFile == NULL)
-		return 0;
-	FindClose(hFile);
-	return 1;
-#else
-	DIR *dp = (DIR *)params[1];
-	if (!dp)
-		return 0;
-	closedir(dp);
-	return 1;
-#endif
-}
-
-static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
-{
-#if defined WIN32 || defined _WIN32
-	HANDLE hFile = (HANDLE)((DWORD)params[1]);
-	if (hFile == INVALID_HANDLE_VALUE || hFile == NULL)
-		return 0;
-	WIN32_FIND_DATA fd;
-	if (!FindNextFile(hFile, &fd))
-        return 0;
-	set_amxstring(amx, params[2], fd.cFileName, params[3]);
-	return 1;
-#else
-	DIR *dp = (DIR *)params[1];
-	if (!dp)
-		return 0;
-	struct dirent *ep = readdir(dp);
-	if (!ep)
-		return 0;
-	set_amxstring(amx,params[2], ep->d_name,params[3]);
-	return 1;
-#endif
-}
-
 AMX_NATIVE_INFO file_Natives[] = {
   { "delete_file",    delete_file },
   { "file_exists",    file_exists },
@@ -724,38 +270,6 @@ AMX_NATIVE_INFO file_Natives[] = {
   { "read_dir",     read_dir },
   { "read_file",      read_file },
   { "write_file",     write_file },
-  //Sanji's File Natives
-  { "fopen",		amx_fopen },
-  { "fclose",		amx_fclose },
-  { "fread",		amx_fread },
-  { "filesize",		amx_filesize },
-#ifdef UNUSED
-  { "fgetc",		amx_fgetc },
-  { "fwrite",		amx_fwrite },
-  { "feof",			amx_feof },
-  { "fseek",		amx_fseek },
-  { "fputc",		amx_fputc },
-  { "rewind",		amx_rewind },
-  { "fflush",		amx_fflush },
-  { "fscanf",		amx_fscanf },
-  { "ftell",		amx_ftell },
-  { "fgetl",		amx_fgetl },
-  { "fgeti",		amx_fgeti },
-  { "fgets",		amx_fgets },
-  { "fputs",		amx_fputs },
-  { "fputl",		amx_fputl },
-  { "fputi",		amx_fputi },
-  { "fgetf",		amx_fgetf },
-  { "fputf",		amx_fputf },
-#endif
-  { "unlink",		delete_file },
-  { "build_pathname", amx_build_pathname},
-  { "dir_exists",	dir_exists },
-  { "open_dir",		amx_open_dir },
-  { "close_dir",	amx_close_dir },
-  { "next_file",	amx_get_dir },
-  
   { NULL, NULL }
 };
 
-

amxmodx/float.cpp

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

amxmodx/md5.cpp

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

amxmodx/md5.h

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

amxmodx/mm_pextensions.h

@@ -1,116 +0,0 @@
-/*
- * 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/mmgr/mmgr.h

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

amxmodx/mmgr/nommgr.h

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

amxmodx/modules.h

@@ -45,9 +45,135 @@
 #undef C_DLLEXPORT
 #define C_DLLEXPORT extern "C" DLLEXPORT
 
+#define AMX_INTERFACE_VERSION 6
+
 #define RELOAD_MODULE 0
 #define STATIC_MODULE 1
 
-int CheckModules(AMX *amx, char error[128]);
+struct module_info_s {
+  const char* name;
+  const char* author;
+  const char* version;
+  int ivers;
+  int type;
+  long int serial;
+};
+
+// Small scripting language
+struct pfnamx_engine_g {
+  uint16_t*   (*pfnamx_Align16)(uint16_t *);                    // value
+  uint32_t*   (*pfnamx_Align32)(uint32_t *);                    // value
+  int     (*pfnamx_Allot)(AMX*, int, cell*, cell**);              // amx, length, amx_addr, phys_addr
+  int     (*pfnamx_Callback)(AMX*, cell , cell*, cell*);            // amx, index,result,params
+  int     (*pfnamx_Clone)(AMX*, AMX*, void*);                 // amxClone, amxSrc, data
+  int     (*pfnamx_Debug)(AMX*); // default debug procedure, does nothing   // amx
+  int     (*pfnamx_Exec)(AMX*, cell*, int , int , ...);           // amx, return val, index, num_params, ...
+  int     (*pfnamx_Execv)(AMX*, cell*, int , int, cell[]);          // amx, return val, index, num_params, param[]
+  int     (*pfnamx_FindPublic)(AMX*, char*, int*);              // amx, func name, index
+  int     (*pfnamx_FindPubVar)(AMX*, char*, cell*);             // anx, var name, amx_addr
+  int     (*pfnamx_FindTagId)(AMX*, cell , char*);              // amx. tag_id, tagname
+  int     (*pfnamx_Flags)(AMX*,uint16_t *);                 // amx, flags
+  int     (*pfnamx_GetAddr)(AMX*,cell ,cell**);               // amx, amx_addr, phys_addr
+  int     (*pfnamx_GetPublic)(AMX*, int , char*);               // amx, index, funcname
+  int     (*pfnamx_GetPubVar)(AMX*, int , char*, cell*);            // amx, index, varname, amx_addr
+  int     (*pfnamx_GetString)(char*dest,cell*);               // dest, source
+  int     (*pfnamx_GetTag)(AMX*, int , char*, cell*);             // amx, index, tagname, tag_id
+  int     (*pfnamx_GetUserData)(AMX*, long , void **);            // amx, tag, ptr
+  int     (*pfnamx_Init)(AMX*, void *);                   // amx, program
+  int     (*pfnamx_InitJIT)(AMX*, void *, void *);              // amx, reloc_table, native_code
+  int     (*pfnamx_MemInfo)(AMX*, long*, long*, long*);           // amx, codesize, datasize, stackheap
+  int     (*pfnamx_NameLength)(AMX*, int*);                 // amx, length
+  AMX_NATIVE_INFO * (*pfnamx_NativeInfo)(char*,AMX_NATIVE );            // name, func
+  int     (*pfnamx_NumPublics)(AMX*, int*);                 // amx, number
+  int     (*pfnamx_NumPubVars)(AMX*, int*);                 // amx, number
+  int     (*pfnamx_NumTags)(AMX*, int*);                    // amx, number
+  int     (*pfnamx_RaiseError)(AMX*, int );                 // amx, error
+  int     (*pfnamx_Register)(AMX*, AMX_NATIVE_INFO*, int );         // amx, nativelist, number
+  int     (*pfnamx_Release)(AMX*, cell );                   // amx, amx_addr
+  int     (*pfnamx_SetCallback)(AMX*, AMX_CALLBACK );             // amx, callback
+  int     (*pfnamx_SetDebugHook)(AMX*, AMX_DEBUG );             // amx, debug
+  int     (*pfnamx_SetString)(cell*, char*, int );              // dest, source, pack
+  int     (*pfnamx_SetUserData)(AMX*, long , void*);              // amx, tag, prt
+  int     (*pfnamx_StrLen)(cell*, int*);                    // amx, cstring, length
+};
+extern pfnamx_engine_g* g_engAmxFunc;
+
+#define AMX_ALIGN16       (*g_engAmxFunc->pfnamx_Align16)
+#define AMX_ALIGN32       (*g_engAmxFunc->pfnamx_Align32)
+#define AMX_ALLOT         (*g_engAmxFunc->pfnamx_Allot)
+#define AMX_CALLBACK      (*g_engAmxFunc->pfnamx_Callback)
+#define AMX_CLONE         (*g_engAmxFunc->pfnamx_Clone)
+#define AMX_DEBUG         (*g_engAmxFunc->pfnamx_Debug)
+#define AMX_EXEC          (*g_engAmxFunc->pfnamx_Exec)
+#define AMX_EXECV         (*g_engAmxFunc->pfnamx_Execv)
+#define AMX_FINDPUBLIC    (*g_engAmxFunc->pfnamx_FindPublic)
+#define AMX_FINDPUBVAR    (*g_engAmxFunc->pfnamx_FindPubVar)
+#define AMX_FINDTAGID     (*g_engAmxFunc->pfnamx_FindTagId)
+#define AMX_FLAGS         (*g_engAmxFunc->pfnamx_Flags)
+#define AMX_GETADDR       (*g_engAmxFunc->pfnamx_GetAddr)
+#define AMX_GETPUBLIC     (*g_engAmxFunc->pfnamx_GetPublic)
+#define AMX_GETPUBVAR     (*g_engAmxFunc->pfnamx_GetPubVar)
+#define AMX_GETSTRING     (*g_engAmxFunc->pfnamx_GetString)
+#define AMX_GETTAG        (*g_engAmxFunc->pfnamx_GetTag)
+#define AMX_GETUSERDATA   (*g_engAmxFunc->pfnamx_GetUserData)
+#define AMX_INIT          (*g_engAmxFunc->pfnamx_Init)
+#define AMX_INITJIT       (*g_engAmxFunc->pfnamx_InitJIT)
+#define AMX_MEMINFO       (*g_engAmxFunc->pfnamx_MemInfo)
+#define AMX_NAMELENGTH    (*g_engAmxFunc->pfnamx_NameLength)
+#define AMX_NATIVEINFO    (*g_engAmxFunc->pfnamx_NativeInfo)
+#define AMX_NUMPUBLICS    (*g_engAmxFunc->pfnamx_NumPublics)
+#define AMX_NUMPUBVARS    (*g_engAmxFunc->pfnamx_NumPubVars)
+#define AMX_NUMTAGS       (*g_engAmxFunc->pfnamx_NumTags)
+#define AMX_RAISEERROR    (*g_engAmxFunc->pfnamx_RaiseError)
+#define AMX_REGISTER      (*g_engAmxFunc->pfnamx_Register)
+#define AMX_RELEASE       (*g_engAmxFunc->pfnamx_Release)
+#define AMX_SETCALLBACK   (*g_engAmxFunc->pfnamx_SetCallback)
+#define AMX_SETDEBUGHOOK  (*g_engAmxFunc->pfnamx_SetDebugHook)
+#define AMX_SETSTRING     (*g_engAmxFunc->pfnamx_SetString)
+#define AMX_SETUSERDATA   (*g_engAmxFunc->pfnamx_SetUserData)
+#define AMX_STRLEN        (*g_engAmxFunc->pfnamx_StrLen)
+
+// Modules API
+struct pfnmodule_engine_g {
+  int         (*pfnadd_amxnatives)(module_info_s*,AMX_NATIVE_INFO*);      // list
+  char*       (*pfnbuild_pathname)(char*, ...);                           // format, ....
+  void        (*pfncopy_amxmemory)(cell*,cell*,int);                      // dest, src, len
+  char*       (*pfnformat_amxstring)(AMX*, cell*, int ,int& );            // amx, format, start pos, len
+  cell*       (*pfnget_amxaddr)(AMX*,cell );                              // amx, cell
+  AMX*        (*pfnget_amxscript)(int, void**,const char**);              // id, code, name
+  const char* (*pfnget_amxscriptname)(AMX* amx);                          // amx
+  char*       (*pfnget_amxstring)(AMX*,cell,int, int&);                   // amx, src, buffer (0-3), len
+  void        (*pfnget_modname)(char*);                                   // modname
+  int         (*pfnload_amxscript)(AMX*, void**, const char*, char[64]);  // amx, code, path, error info
+  void        (*pfnprint_console)(char*, ...);                            // format, ....
+  void      (*pfnreport_error)(int code, char*, ... );
+  int         (*pfnset_amxnatives)(AMX*,char[64]);                        // amx, error info
+  int         (*pfnset_amxstring)(AMX*,cell ,const char*,int);            // amx, dest, string, maxlen
+  int         (*pfnamxstring_length)(cell*);                              // src
+  int         (*pfnunload_amxscript)(AMX* amx,void**);                    // amx, code
+  void*     (*pfnalloc_amxmemory)(void**,int size);
+  void      (*pfnfree_amxmemory)(void**);
+};
+extern pfnmodule_engine_g* g_engModuleFunc;
+
+#define ADD_AMXNATIVES          (*g_engModuleFunc->pfnadd_amxnatives)
+#define AMXSTRING_LENGTH        (*g_engModuleFunc->pfnamxstring_length)
+#define BUILD_PATHNAME          (*g_engModuleFunc->pfnbuild_pathname)
+#define COPY_AMXMEMORY          (*g_engModuleFunc->pfncopy_amxmemory)
+#define FORMAT_AMXSTRING        (*g_engModuleFunc->pfnformat_amxstring)
+#define GET_AMXADDR             (*g_engModuleFunc->pfnget_amxaddr)
+#define GET_AMXSCRIPT           (*g_engModuleFunc->pfnget_amxscript)
+#define GET_AMXSCRIPTNAME       (*g_engModuleFunc->pfnget_amxscriptname)
+#define GET_AMXSTRING           (*g_engModuleFunc->pfnget_amxstring)
+#define GET_MODNAME             (*g_engModuleFunc->pfnget_modname)
+#define LOAD_AMXSCRIPT          (*g_engModuleFunc->pfnload_amxscript)
+#define PRINT_CONSOLE           (*g_engModuleFunc->pfnprint_console)
+#define REPORT_ERROR      (*g_engModuleFunc->pfnreport_error)
+#define SET_AMXNATIVES          (*g_engModuleFunc->pfnset_amxnatives)
+#define SET_AMXSTRING           (*g_engModuleFunc->pfnset_amxstring)
+#define UNLOAD_AMXSCRIPT        (*g_engModuleFunc->pfnunload_amxscript)
+#define ALLOC_AMXMEMORY         (*g_engModuleFunc->pfnalloc_amxmemory)
+#define FREE_AMXMEMORY        (*g_engModuleFunc->pfnfree_amxmemory)
+
 
 #endif // __MODULES_H__

amxmodx/msvc/.cvsignore

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

amxmodx/msvc/amxmod_mm.def

@@ -1,4 +1,4 @@
-LIBRARY amxx_mm
+LIBRARY amx_mm
 EXPORTS
 	GiveFnptrsToDll			@1
 	

amxmodx/msvc/amxmod_mm.dsp

@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="amxmodx_mm" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="amxmod_mm" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=amxmodx_mm - Win32 Debug
+CFG=amxmod_mm - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "amxmodx_mm.mak".
+!MESSAGE NMAKE /f "amxmod_mm.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "amxmodx_mm.mak" CFG="amxmodx_mm - Win32 Debug"
+!MESSAGE NMAKE /f "amxmod_mm.mak" CFG="amxmod_mm - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "amxmodx_mm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "amxmod_mm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "amxmodx_mm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "amxmod_mm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "amxmodx_mm - Win32 Release"
+!IF  "$(CFG)" == "amxmod_mm - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /c
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmod_mm_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\metamod\metamod" /I "..\..\hlsdk\sourcecode\common" /I "..\..\hlsdk\sourcecode\engine" /I "..\..\hlsdk\sourcecode\dlls" /I "..\..\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\metamod\metamod" /I "..\..\hlsdk\sourcecode\common" /I "..\..\hlsdk\sourcecode\engine" /I "..\..\hlsdk\sourcecode\dlls" /I "..\..\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmod_mm_EXPORTS" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -53,11 +53,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\amxmodx_mm.def" /out:"release/amxx_mm.dll" /libpath:"..\extra\lib_win32"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\amxmod_mm.def" /out:"release/amx_mm.dll" /libpath:"..\extra\lib_win32"
 # Begin Custom Build
-TargetPath=.\release\amxx_mm.dll
+TargetPath=.\release\amx_mm.dll
-TargetName=amxx_mm
+TargetName=amx_mm
-InputPath=.\release\amxx_mm.dll
+InputPath=.\release\amx_mm.dll
 SOURCE="$(InputPath)"
 
 "$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -65,7 +65,7 @@ SOURCE="$(InputPath)"
 
 # End Custom Build
 
-!ELSEIF  "$(CFG)" == "amxmodx_mm - Win32 Debug"
+!ELSEIF  "$(CFG)" == "amxmod_mm - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -78,8 +78,8 @@ SOURCE="$(InputPath)"
 # PROP Intermediate_Dir "debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /GZ /c
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmod_mm_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /Zp4 /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod\metamod" /I "..\...\hlsdk\sourcecode\common" /I "..\...\hlsdk\sourcecode\engine" /I "..\...\hlsdk\sourcecode\dlls" /I "..\...\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /Zp4 /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod\metamod" /I "..\...\hlsdk\sourcecode\common" /I "..\...\hlsdk\sourcecode\engine" /I "..\...\hlsdk\sourcecode\dlls" /I "..\...\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmod_mm_EXPORTS" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -89,12 +89,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\amxmodx_mm.def" /out:"debug/amxx_mm.dll" /pdbtype:sept /libpath:"..\extra\lib_win32"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\amxmod_mm.def" /out:"debug/amx_mm.dll" /pdbtype:sept /libpath:"..\extra\lib_win32"
 # SUBTRACT LINK32 /incremental:no /nodefaultlib
 # Begin Custom Build
-TargetPath=.\debug\amxx_mm.dll
+TargetPath=.\debug\amx_mm.dll
-TargetName=amxx_mm
+TargetName=amx_mm
-InputPath=.\debug\amxx_mm.dll
+InputPath=.\debug\amx_mm.dll
 SOURCE="$(InputPath)"
 
 "$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -106,8 +106,8 @@ SOURCE="$(InputPath)"
 
 # Begin Target
 
-# Name "amxmodx_mm - Win32 Release"
+# Name "amxmod_mm - Win32 Release"
-# Name "amxmodx_mm - Win32 Debug"
+# Name "amxmod_mm - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -121,7 +121,7 @@ SOURCE=..\amxcore.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\amxmodx.cpp
+SOURCE=..\amxmod.cpp
 # End Source File
 # Begin Source File
 
@@ -129,10 +129,6 @@ SOURCE=..\amxtime.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\amxxlog.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\CCmd.cpp
 # End Source File
 # Begin Source File
@@ -229,7 +225,7 @@ SOURCE=..\vault.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\amxmodx.h
+SOURCE=..\amxmod.h
 # End Source File
 # Begin Source File
 

amxmodx/msvc/amxmod_mm.dsw

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

amxmodx/msvc/amxmodx_mm.dsw

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

amxmodx/msvc/amxmodx_mm.sln

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

amxmodx/msvc/amxmodx_mm.vcproj

@@ -1,867 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="amxmodx"
-	ProjectGUID="{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\debug/amxmodx.pch"
-				AssemblerListingLocation=".\debug/"
-				ObjectFile=".\debug/"
-				ProgramDataBaseFileName=".\debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
-				OutputFile="debug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\debug/amxx_mm.pdb"
-				ImportLibrary=".\debug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\release/amxmodx.pch"
-				AssemblerListingLocation=".\release/"
-				ObjectFile=".\release/"
-				ProgramDataBaseFileName=".\release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
-				OutputFile="release/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="LIBC"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\release/amxx_mm.pdb"
-				ImportLibrary=".\release/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MemtestDebug|Win32"
-			OutputDirectory="MemtestDebug"
-			IntermediateDirectory="MemtestDebug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\memtestdebug/amxmodx.pch"
-				AssemblerListingLocation=".\memtestdebug/"
-				ObjectFile=".\memtestdebug/"
-				ProgramDataBaseFileName=".\memtestdebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
-				OutputFile="memtestdebug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\memtestdebug/amxx_mm.pdb"
-				ImportLibrary=".\memtestdebug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MemtestRelease|Win32"
-			OutputDirectory="MemtestRelease"
-			IntermediateDirectory="MemtestRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\memtestrelease/amxmodx.pch"
-				AssemblerListingLocation=".\memtestrelease/"
-				ObjectFile=".\memtestrelease/"
-				ProgramDataBaseFileName=".\memtestrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib ..\JIT\natives-x86.obj"
-				OutputFile="memtestrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="LIBC"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\memtestrelease/amxx_mm.pdb"
-				GenerateMapFile="TRUE"
-				MapExports="TRUE"
-				ImportLibrary=".\memtestrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITDebug|Win32"
-			OutputDirectory="JITDebug"
-			IntermediateDirectory="JITDebug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&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"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitdebug/amxmodx.pch"
-				AssemblerListingLocation=".\jitdebug/"
-				ObjectFile=".\jitdebug/"
-				ProgramDataBaseFileName=".\jitdebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="jitdebug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
-				ImportLibrary=".\jitdebug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITRelease|Win32"
-			OutputDirectory="JITRelease"
-			IntermediateDirectory="JITRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="TRUE"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32"
-				IgnoreStandardIncludePath="FALSE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitrelease/amxmodx.pch"
-				AssemblerListingLocation=".\jitrelease/"
-				ObjectFile=".\jitrelease/"
-				ProgramDataBaseFileName=".\jitrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="jitrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitrelease/amxx_mm.pdb"
-				GenerateMapFile="FALSE"
-				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITMemtestRelease|Win32"
-			OutputDirectory="JITMemtestRelease"
-			IntermediateDirectory="JITMemtestRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST;JIT;ASM32;PAWN_CELL_SIZE=32"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitmemtestrelease/amxmodx.pch"
-				AssemblerListingLocation=".\jitmemtestrelease/"
-				ObjectFile=".\jitmemtestrelease/"
-				ProgramDataBaseFileName=".\jitmemtestrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\zlib\zlib.lib ..\JIT\amxjitsn.obj ..\JIT\amxexecn.obj ..\JIT\natives-x86.obj"
-				OutputFile="jitmemtestrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				IgnoreDefaultLibraryNames="MSVCRT"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitmemtestrelease/amxx_mm.pdb"
-				ImportLibrary=".\jitmemtestrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MaximalSpeed|Win32"
-			OutputDirectory="MaximalSpeed"
-			IntermediateDirectory="MaximalSpeed"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="1"
-				OptimizeForProcessor="2"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\MaximalSpeed/amxmodx.pch"
-				AssemblerListingLocation=".\MaximalSpeed/"
-				ObjectFile=".\MaximalSpeed/"
-				ProgramDataBaseFileName=".\MaximalSpeed/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
-				OutputFile="MaximalSpeed/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\MaximalSpeede/amxx_mm.pdb"
-				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\amx.cpp">
-			</File>
-			<File
-				RelativePath="..\amxcore.cpp">
-			</File>
-			<File
-				RelativePath="..\amxdbg.cpp">
-			</File>
-			<File
-				RelativePath="..\amxmodx.cpp">
-			</File>
-			<File
-				RelativePath="..\amxtime.cpp">
-			</File>
-			<File
-				RelativePath="..\amxxfile.cpp">
-			</File>
-			<File
-				RelativePath="..\amxxlog.cpp">
-			</File>
-			<File
-				RelativePath="..\CCmd.cpp">
-			</File>
-			<File
-				RelativePath="..\CEvent.cpp">
-			</File>
-			<File
-				RelativePath="..\CFile.cpp">
-			</File>
-			<File
-				RelativePath="..\CForward.cpp">
-			</File>
-			<File
-				RelativePath="..\CLang.cpp">
-			</File>
-			<File
-				RelativePath="..\CLogEvent.cpp">
-			</File>
-			<File
-				RelativePath="..\CMenu.cpp">
-			</File>
-			<File
-				RelativePath="..\CMisc.cpp">
-			</File>
-			<File
-				RelativePath="..\CModule.cpp">
-			</File>
-			<File
-				RelativePath="..\CPlugin.cpp">
-			</File>
-			<File
-				RelativePath="..\CTask.cpp">
-			</File>
-			<File
-				RelativePath="..\CVault.cpp">
-			</File>
-			<File
-				RelativePath="..\emsg.cpp">
-			</File>
-			<File
-				RelativePath="..\fakemeta.cpp">
-				<FileConfiguration
-					Name="MemtestDebug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						GeneratePreprocessedFile="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\file.cpp">
-			</File>
-			<File
-				RelativePath="..\float.cpp">
-			</File>
-			<File
-				RelativePath="..\md5.cpp">
-			</File>
-			<File
-				RelativePath="..\meta_api.cpp">
-			</File>
-			<File
-				RelativePath="..\modules.cpp">
-			</File>
-			<File
-				RelativePath="..\natives.cpp">
-			</File>
-			<File
-				RelativePath="..\newmenus.cpp">
-			</File>
-			<File
-				RelativePath="..\power.cpp">
-			</File>
-			<File
-				RelativePath="..\srvcmd.cpp">
-			</File>
-			<File
-				RelativePath="..\string.cpp">
-			</File>
-			<File
-				RelativePath="..\strptime.cpp">
-			</File>
-			<File
-				RelativePath="..\util.cpp">
-			</File>
-			<File
-				RelativePath="..\vault.cpp">
-			</File>
-			<Filter
-				Name="mmgr"
-				Filter="">
-				<File
-					RelativePath="..\mmgr\mmgr.cpp">
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITDebug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITRelease|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MaximalSpeed|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\amx.h">
-			</File>
-			<File
-				RelativePath="..\amxdbg.h">
-			</File>
-			<File
-				RelativePath="..\amxmodx.h">
-			</File>
-			<File
-				RelativePath="..\amxxfile.h">
-			</File>
-			<File
-				RelativePath="..\amxxlog.h">
-			</File>
-			<File
-				RelativePath="..\CCmd.h">
-			</File>
-			<File
-				RelativePath="..\CEvent.h">
-			</File>
-			<File
-				RelativePath="..\CFile.h">
-			</File>
-			<File
-				RelativePath="..\CForward.h">
-			</File>
-			<File
-				RelativePath="..\CLang.h">
-			</File>
-			<File
-				RelativePath="..\CList.h">
-			</File>
-			<File
-				RelativePath="..\CLogEvent.h">
-			</File>
-			<File
-				RelativePath="..\CMenu.h">
-			</File>
-			<File
-				RelativePath="..\CMisc.h">
-			</File>
-			<File
-				RelativePath="..\CModule.h">
-			</File>
-			<File
-				RelativePath="..\CPlugin.h">
-			</File>
-			<File
-				RelativePath="..\CQueue.h">
-			</File>
-			<File
-				RelativePath="..\CStack.h">
-			</File>
-			<File
-				RelativePath="..\CString.h">
-			</File>
-			<File
-				RelativePath="..\CTask.h">
-			</File>
-			<File
-				RelativePath="..\CVault.h">
-			</File>
-			<File
-				RelativePath="..\CVector.h">
-			</File>
-			<File
-				RelativePath="..\fakemeta.h">
-			</File>
-			<File
-				RelativePath="..\md5.h">
-			</File>
-			<File
-				RelativePath="..\menus.h">
-			</File>
-			<File
-				RelativePath="..\modules.h">
-			</File>
-			<File
-				RelativePath="..\natives.h">
-			</File>
-			<File
-				RelativePath="..\newmenus.h">
-			</File>
-			<File
-				RelativePath="..\resource.h">
-			</File>
-			<File
-				RelativePath="..\zlib\zconf.h">
-			</File>
-			<File
-				RelativePath="..\zlib\zlib.h">
-			</File>
-			<Filter
-				Name="mmgr"
-				Filter="">
-				<File
-					RelativePath="..\mmgr\mmgr.h">
-				</File>
-				<File
-					RelativePath="..\mmgr\nommgr.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc">
-			<File
-				RelativePath="..\version.rc">
-			</File>
-		</Filter>
-		<Filter
-			Name="Assembly"
-			Filter="">
-			<File
-				RelativePath="..\amxdefn.asm">
-			</File>
-			<File
-				RelativePath="..\amxexecn.asm">
-			</File>
-			<File
-				RelativePath="..\amxjitsn.asm">
-			</File>
-			<File
-				RelativePath="..\natives-amd64.asm">
-			</File>
-			<File
-				RelativePath="..\natives-x86.asm">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

amxmodx/natives-amd64.asm

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

amxmodx/natives-x86.asm

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

amxmodx/natives.cpp

@@ -1,438 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#include "amxmodx.h"
-#include "CStack.h"
-#include "natives.h"
-
-#ifdef __linux__
-#include <malloc.h>
-#include <stdlib.h>
-#include <sys/mman.h>
-#include "sclinux.h"
-#endif
-
-//Written by David "BAILOPAN" Anderson
-//With the exception for param_convert, which was written by
-// Julien "dJeyL" Laurent
-
-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)
-{
-	if (idx < 0 || idx >= (int)g_RegNatives.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Invalid dynamic native called");
-		return 0;
-	}
-
-	regnative *pNative = g_RegNatives[idx];
-	int numParams = params[0] / sizeof(cell);
-
-	if (numParams > CALLFUNC_MAXPARAMS)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Called dynanative with too many parameters (%d)", CALLFUNC_MAXPARAMS);
-		return 0;
-	}
-
-	//parameter stack
-	pNative->caller = amx;
-
-	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(amx);
-
-	int err = 0;
-	cell ret = 0;
-	g_errorNum = 0;
-	g_NativeStack.push(pNative);
-	if (pNative->style == 0)
-	{
-		amx_Push(pNative->amx, numParams);
-		amx_Push(pNative->amx, pPlugin->getId());
-		for (int i=numParams; i>=1; i--)
-			pNative->params[i] = params[i];
-	} else if (pNative->style == 1) {
-		//use dJeyL's system .. very clever!
-		for (int i=numParams; i>=1; i--)
-			amx_Push(pNative->amx, params[i]);
-	}
-	if ( (err=amx_Exec(pNative->amx, &ret, pNative->func)) != AMX_ERR_NONE)
-	{
-		g_NativeStack.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;
-}
-
-AMX_NATIVE_INFO *BuildNativeTable()
-{
-	if (g_RegNatives.size() < 1)
-		return NULL;
-
-	AMX_NATIVE_INFO *pNatives = new AMX_NATIVE_INFO[g_RegNatives.size() + 1];
-
-	AMX_NATIVE_INFO info;
-	regnative *pNative;
-	for (size_t i=0; i<g_RegNatives.size(); i++)
-	{
-		pNative = g_RegNatives[i];
-		info.name = pNative->name.c_str();
-		info.func = (AMX_NATIVE)((void *)(pNative->pfn));
-		pNatives[i] = info;
-	}
-	pNatives[g_RegNatives.size()].name = NULL;
-	pNatives[g_RegNatives.size()].func = NULL;
-
-	//this needs to be deleted
-	return pNatives;
-}
-
-static cell AMX_NATIVE_CALL log_error(AMX *amx, cell *params)
-{
-	int len;
-	char *err = format_amxstring(amx, params, 2, len);
-
-	_snprintf(g_errorStr, sizeof(g_errorStr), "%s", err);
-	g_errorNum = params[1];
-
-	return 1;
-}
-
-//get_string(param, dest[], len)
-static cell AMX_NATIVE_CALL get_string(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	int len;
-	char *str = get_amxstring(pNative->caller, pNative->params[p], 0, len);
-	return set_amxstring(amx, params[2], str, params[3]);
-}
-
-//set_string(param, source[], maxlen)
-static cell AMX_NATIVE_CALL set_string(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	int len;
-	char *str = get_amxstring(amx, params[2], 0, len);
-
-	return set_amxstring(pNative->caller, pNative->params[p], str, params[3]);
-}
-
-//get a byvalue parameter
-//get_param(num)
-static cell AMX_NATIVE_CALL get_param(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	return pNative->params[p];
-}
-
-//get_param_byref(num)
-static cell AMX_NATIVE_CALL get_param_byref(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
-
-	return addr[0];
-}
-
-//set_param_byref(num, val)
-static cell AMX_NATIVE_CALL set_param_byref(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *addr = get_amxaddr(pNative->caller, pNative->params[p]);
-
-	addr[0] = params[2];
-
-	return 1;
-}
-
-//get_array(param, dest[], size)
-static cell AMX_NATIVE_CALL get_array(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *source = get_amxaddr(pNative->caller, pNative->params[p]);
-	cell *dest = get_amxaddr(amx, params[2]);
-
-	int size = params[3];
-
-	while (size-->0)
-		*dest = *source;
-
-	return 1;
-}
-
-//set_array(param, source[], size)
-static cell AMX_NATIVE_CALL set_array(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	int p = params[1];
-
-	cell *dest = get_amxaddr(pNative->caller, pNative->params[p]);
-	cell *source = get_amxaddr(amx, params[2]);
-
-	int size = params[3];
-
-	while (size-->0)
-		*dest = *source;
-
-	return 1;
-}
-
-//This is basically right from dJeyL's lib_convert function
-//This awesome hack modifies the stack frame to have an address offset
-// that will align to the other plugin's memory.
-//I've no idea how he thought of this, but it's great.  No idea how well it works.
-static cell AMX_NATIVE_CALL param_convert(AMX *amx, cell *params)
-{
-	if (!g_NativeStack.size())
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Not currently in a dynamic native");
-		return 0;
-	}
-	regnative *pNative = g_NativeStack.top();
-	if (pNative->style != 1)
-	{
-		LogError(amx, AMX_ERR_NATIVE, "Wrong style of dynamic native");
-		return 0;
-	}
-	cell p = params[1];
-
-	AMX *caller = pNative->caller;
-
-	unsigned char *data =amx->base+(int)((AMX_HEADER *)amx->base)->dat;
-	unsigned char *realdata = caller->base+(int)((AMX_HEADER *)caller->base)->dat;
-
-	* (cell *)(data+(int)amx->frm+(p+2)*sizeof(cell)) -= (cell)data-(cell)realdata;
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL register_library(AMX *amx, cell *params)
-{
-	int len;
-	char *lib = get_amxstring(amx, params[1], 0, len);
-
-	AddPluginLibrary(lib);
-
-	return 1;
-}
-
-//register_native(const name[], const handler[])
-static cell AMX_NATIVE_CALL register_native(AMX *amx, cell *params)
-{
-	if (!g_Initialized)
-		amxx_DynaInit((void *)(amxx_DynaCallback));
-
-	g_Initialized = true;
-
-	int len;
-	char *name = get_amxstring(amx, params[1], 0, len);
-	char *func = get_amxstring(amx, params[2], 1, len);
-
-	int idx, err;
-	if ( (err=amx_FindPublic(amx, func, &idx)) != AMX_ERR_NONE)
-	{
-		LogError(amx, err, "Function \"%s\" was not found", func);
-		return 0;
-	}
-
-	regnative *pNative = new regnative;
-	pNative->amx = amx;
-	pNative->func = idx;
-	
-	//we'll apply a safety buffer too
-	//make our function
-	int size = amxx_DynaCodesize();
-#ifndef __linux__
-	DWORD temp;
-	pNative->pfn = new char[size + 10];
-	VirtualProtect(pNative->pfn, size+10, PAGE_EXECUTE_READWRITE, &temp);
-#else
-	pNative->pfn = (char *)memalign(sysconf(_SC_PAGESIZE), size+10);
-	mprotect((void *)pNative->pfn, size+10, PROT_READ|PROT_WRITE|PROT_EXEC);
-#endif
-
-	int id = (int)g_RegNatives.size();
-	
-	amxx_DynaMake(pNative->pfn, id);
-	pNative->func = idx;
-	pNative->style = params[3];
-
-	g_RegNatives.push_back(pNative);
-
-	pNative->name.assign(name);
-
-	return 1;
-}
-
-bool LibraryExists(const char *name)
-{
-	for (size_t i=0; i<g_Libraries.size(); i++)
-	{
-		if (stricmp(g_Libraries[i].c_str(), name)==0)
-			return true;
-	}
-
-	return false;
-}
-
-void AddPluginLibrary(const char *name)
-{
-	String f(name);
-	g_Libraries.push_back(f);
-}
-
-void ClearPluginLibraries()
-{
-	g_Libraries.clear();
-
-	for (size_t i=0; i<g_RegNatives.size(); i++)
-	{
-		delete [] g_RegNatives[i]->pfn;
-		delete g_RegNatives[i];
-	}
-	g_RegNatives.clear();
-}
-
-AMX_NATIVE_INFO g_NativeNatives[] = {
-	{"register_native",	register_native},
-	{"log_error",		log_error},
-	{"register_library",register_library},
-	{"get_string",		get_string},
-	{"set_string",		set_string},
-	{"get_param",		get_param},
-	{"get_param_byref",	get_param_byref},
-	{"set_param_byref",	set_param_byref},
-	{"get_array",		set_array},
-	{"set_array",		set_array},
-	//these are dummy functions for floats ;p
-	{"get_param_f",		get_param},
-	{"get_float_byref",	get_param_byref},
-	{"set_float_byref", set_param_byref},
-	{"get_array_f",		get_array},
-	{"set_array_f",		set_array},
-	{"param_convert",	param_convert},
-	//////////////////////////
-	{NULL,				NULL},
-};

amxmodx/natives.h

@@ -1,69 +0,0 @@
-/* AMX Mod X 
-*
-* by the AMX Mod X Development Team
-*  originally developed by OLO
-*
-*  This program is free software; you can redistribute it and/or modify it
-*  under the terms of the GNU General Public License as published by the
-*  Free Software Foundation; either version 2 of the License, or (at
-*  your option) any later version.
-*
-*  This program is distributed in the hope that it will be useful, but
-*  WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-*  General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program; if not, write to the Free Software Foundation,
-*  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*
-*  In addition, as a special exception, the author gives permission to
-*  link the code of this program with the Half-Life Game Engine ("HL
-*  Engine") and Modified Game Libraries ("MODs") developed by Valve,
-*  L.L.C ("Valve"). You must obey the GNU General Public License in all
-*  respects for all of the code used other than the HL Engine and MODs
-*  from Valve. If you modify this file, you may extend this exception
-*  to your version of the file, but you are not obligated to do so. If
-*  you do not wish to do so, delete this exception statement from your
-*  version.
-*/
-
-#ifndef _INCLUDE_NATIVES_H
-#define _INCLUDE_NATIVES_H
-
-//only 16 for now sorry
-#define CALLFUNC_MAXPARAMS 16
-
-#define CALLFUNC_FLAG_BYREF			1
-#define CALLFUNC_FLAG_BYREF_REUSED	2
-
-#define N_CELL		1
-#define	N_ARRAY		2
-#define N_BYREF		3
-#define	N_VARARG	4
-
-struct regnative
-{
-	AMX *amx;
-	String name;
-	char *pfn;
-	int func;
-	AMX *caller;
-	int style;
-	cell params[CALLFUNC_MAXPARAMS];
-};
-
-extern "C" void amxx_DynaInit(void *ptr);
-extern "C" void amxx_DynaMake(char *buffer, int id);
-extern "C" int amxx_DynaFunc(AMX *amx, cell *params);
-extern "C" int amxx_DynaCodesize();
-
-AMX_NATIVE_INFO *BuildNativeTable();
-void AddPluginLibrary(const char *name);
-void ClearPluginLibraries();
-bool LibraryExists(const char *name);
-
-//I couldn't resist :)
-extern AMX_NATIVE_INFO g_NativeNatives[];
-
-#endif //_INCLUDE_NATIVES_H

amxmodx/newmenus.cpp

@@ -1,432 +0,0 @@
-#include "amxmodx.h"
-#include "newmenus.h"
-
-CVector<Menu *> g_NewMenus;
-
-void ClearMenus()
-{
-	for (size_t i=0; i<g_NewMenus.size(); i++)
-		delete g_NewMenus[i];
-	g_NewMenus.clear();
-}
-
-Menu::Menu(const char *title, int mid, int tid)
-{
-	m_Title.assign(title);
-	menuId = mid;
-	thisId = tid;
-}
-
-Menu::~Menu()
-{
-	for (size_t i=0; i<m_Items.size(); i++)
-		delete m_Items[i];
-	m_Items.clear();
-}
-
-menuitem *Menu::AddItem(const char *name, const char *cmd, int access)
-{
-	menuitem *pItem = new menuitem;
-
-	pItem->name.assign(name);
-	pItem->cmd.assign(cmd);
-	pItem->access = access;
-	pItem->id = m_Items.size();
-	pItem->handler = -1;
-	pItem->pfn = NULL;
-
-	m_Items.push_back(pItem);
-
-	return pItem;
-}
-
-menuitem *Menu::GetMenuItem(item_t item)
-{
-	if (item >= m_Items.size())
-		return NULL;
-
-	return m_Items[item];
-}
-
-size_t Menu::GetItemCount()
-{
-	return m_Items.size();
-}
-
-size_t Menu::GetPageCount()
-{
-	size_t items = GetItemCount();
-	page_t numPages = (items / MENUITEMS) + 1;
-
-	if (!items)
-		return 0;
-
-	if (numPages % MENUITEMS == 0)
-		numPages--;
-
-	return numPages;
-}
-
-int Menu::PagekeyToItem(page_t page, item_t key)
-{
-	page_t pages = GetPageCount();
-	item_t numItems = GetItemCount();
-
-	if (page >= pages)
-		return MENU_EXIT;
-
-	item_t start = page * 7;
-
-	if (page == 0)
-	{
-		item_t rem = numItems >= 7 ? 7 : numItems;
-		if (key == rem)
-		{
-			if (pages > 1)
-				return MENU_MORE;
-			else
-				return MENU_EXIT;
-		} else if (key == rem+1) {
-			return MENU_EXIT;
-		}
-	} else if (page == pages - 1) {
-		//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 MENU_EXIT;
-		} else if (key == rem+1) {
-			return MENU_BACK;
-		}
-	} else {
-		if (key == 7)
-		{
-			return MENU_MORE;
-		} else if (key == 8) {
-			return MENU_BACK;
-		}
-	}
-
-	return (start + key);
-}
-
-bool Menu::Display(int player, page_t page)
-{
-	int keys = 0;
-	const char *str = GetTextString(player, page, keys);
-
-	if (!str)
-		return false;
-
-	static char buffer[2048];
-	int len = _snprintf(buffer, sizeof(buffer)-1, "%s", str);
-
-	CPlayer *pPlayer = GET_PLAYER_POINTER_I(player);
-
-	pPlayer->keys = keys;
-	pPlayer->menu = menuId;
-	pPlayer->newmenu = thisId;
-	pPlayer->page = (int)page;
-
-	UTIL_ShowMenu(pPlayer->pEdict, keys, -1, buffer, len);
-
-	return true;
-}
-
-const char *Menu::GetTextString(int player, page_t page, int &keys)
-{
-	page_t pages = GetPageCount();
-	item_t numItems = GetItemCount();
-
-	if (page >= pages)
-		return NULL;
-
-	m_Text.clear();
-
-	char buffer[255];
-	if (g_coloredmenus)
-		_snprintf(buffer, sizeof(buffer)-1, "\\y%s %d/%d\n\\w\n", m_Title.c_str(), page+1, pages);
-	else
-		_snprintf(buffer, sizeof(buffer)-1, "%s %d/%d\n\n", m_Title.c_str(), page+1, pages);
-	m_Text.append(buffer);
-
-	item_t start = page * 7;
-	item_t end = 0;
-	if (start + 7 <= numItems)
-	{
-		end = start + 7;
-	} else {
-		end = numItems;
-	}
-
-	menuitem *pItem = NULL;
-	int option = 0;
-	keys = 0;
-	bool enabled = true;
-	int ret = 0;
-	for (item_t i=start; i<end; i++)
-	{
-		pItem = m_Items[i];
-		if (pItem->access && !(pItem->access & g_players[player].flags[0]))
-			enabled = false;
-		if (pItem->handler != -1)
-		{
-			ret = executeForwards(pItem->handler, 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);
-			if (ret == ITEM_ENABLED)
-				enabled = true;
-			else if (ret == ITEM_DISABLED)
-				enabled = false;
-		}
-		if (enabled)
-		{
-			keys |= (1<<option);
-			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
-		} else {
-			if (g_coloredmenus)
-			{
-				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", ++option, pItem->name.c_str());
-			} else {
-				_snprintf(buffer, sizeof(buffer)-1, "#. %s\n", pItem->name.c_str());
-				option++;
-			}
-		}
-		m_Text.append(buffer);
-	}
-	//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)
-	{
-		keys |= (1<<option++);
-		if (pages == 0)
-		{
-			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Exit");
-		} else {
-			_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option, "Back");
-		}
-		m_Text.append(buffer);
-	}
-
-	return m_Text.c_str();
-}
-
-#define GETMENU(p) if (p >= (int)g_NewMenus.size() || p < 0) { \
-	LogError(amx, AMX_ERR_NATIVE, "Invalid menu id %d", p); \
-	return 0; } \
-	Menu *pMenu = g_NewMenus[p];
-
-//Makes a new menu handle (-1 for failure)
-//native csdm_makemenu(title[]);
-static cell AMX_NATIVE_CALL menu_create(AMX *amx, cell *params)
-{
-	int len;
-	char *title = get_amxstring(amx, params[1], 0, len);
-	char *handler = get_amxstring(amx, params[2], 1, len);
-
-	int func = registerSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
-	if (func == -1)
-	{
-		LogError(amx, AMX_ERR_NOTFOUND, "Invalid function \"%s\"", handler);
-		return 0;
-	}
-
-	int id = g_menucmds.registerMenuId(title, amx);
-	g_menucmds.registerMenuCmd( g_plugins.findPluginFast(amx), id, 1023, func );
-
-	Menu *pMenu = new Menu(title, id, (int)g_NewMenus.size());
-	g_NewMenus.push_back(pMenu);
-
-	return (int)g_NewMenus.size() - 1;
-}
-
-//Adds an item to the menu (returns current item count - 1)
-//native menu_additem(menu, const name[], const command[]="", access=0);
-static cell AMX_NATIVE_CALL menu_additem(AMX *amx, cell *params)
-{
-	int len;
-	char *name, *cmd;
-	int access;
-
-	GETMENU(params[1]);
-
-	name = get_amxstring(amx, params[2], 0, len);
-	cmd = get_amxstring(amx, params[3], 1, len);
-	access = params[4];
-    
-	menuitem *pItem = pMenu->AddItem(name, cmd, access);
-
-	pItem->handler = params[5];
-
-	return 1;
-}
-
-//Returns the number of pages in a menu
-//native csdm_menu_pages(menu);
-static cell AMX_NATIVE_CALL menu_pages(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-	return pMenu->GetPageCount();
-}
-
-//Returns the number of items in a menu
-//native csdm_menu_items(menu);
-static cell AMX_NATIVE_CALL menu_items(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	return pMenu->GetItemCount();
-}
-
-//Builds the menu string for a specific page (set title to 0 to not include title)
-//page indices start at 0!
-static cell AMX_NATIVE_CALL menu_display(AMX *amx, cell *params)
-{
-	GETMENU(params[2]);
-
-	int player = params[1];
-	int page = params[3];
-
-	return pMenu->Display(player, page);
-}
-
-//Finds the id of a menu item for a specific page and key value.
-//Note that key should be from 0-6, as it only displays 7 per page.
-//page indices start at 0
-//native menu_keyid(menu, page, key);
-static cell AMX_NATIVE_CALL menu_find_id(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	page_t page = static_cast<page_t>(params[2]);
-	item_t key = static_cast<item_t>(params[3]);
-
-	return pMenu->PagekeyToItem(page, key);
-}
-
-//Gets info about a menu option
-//native menu_item_getinfo(menu, item, &access, command[], cmdlen, name[]="", namelen=0, &callback);
-static cell AMX_NATIVE_CALL menu_item_getinfo(AMX *amx, cell *params)
-{
-	GETMENU(params[1]);
-
-	menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-	if (!pItem)
-		return 0;
-
-	cell *addr = get_amxaddr(amx, params[3]);
-	addr[0] = pItem->access;
-
-	set_amxstring(amx, params[4], pItem->cmd.c_str(), params[5]);
-	set_amxstring(amx, params[6], pItem->name.c_str(), params[7]);
-
-	if (params[8])
-	{
-		addr = get_amxaddr(amx, params[8]);
-		if (addr)
-			addr[0] = pItem->handler;
-	}
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_makecallback(AMX *amx, cell *params)
-{
-	int len;
-	char *name = get_amxstring(amx, params[1], 0, len);
-
-	int id = registerSPForwardByName(amx, name, FP_CELL, FP_CELL, FP_CELL, FP_DONE);
-
-	if (id == -1)
-	{
-		LogError(amx, AMX_ERR_NOTFOUND, "Invalid function %s", name);
-		return -1;
-	}
-
-	return id;
-}
-
-static cell AMX_NATIVE_CALL menu_item_setname(AMX *amx, cell *params)
-{
-    GETMENU(params[1]);
-
-    menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-    if (!pItem)
-        return 0;
-
-    int len;
-    char *name;
-
-    name = get_amxstring(amx, params[3], 0, len);
-
-    pItem->name.assign(name);
-
-    return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_item_setcmd(AMX *amx, cell *params)
-{
-    GETMENU(params[1]);
-
-    menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-    if (!pItem)
-        return 0;
-
-    int len;
-    char *cmd;
-
-    cmd = get_amxstring(amx, params[3], 0, len);
-
-    pItem->cmd.assign(cmd);
-
-    return 1;
-}
-
-static cell AMX_NATIVE_CALL menu_item_setcall(AMX *amx, cell *params)
-{
-    GETMENU(params[1]);
-
-    menuitem *pItem = pMenu->GetMenuItem(static_cast<item_t>(params[2]));
-
-    if (!pItem)
-        return 0;
-
-    pItem->handler = params[3];
-
-    return 1;
-} 
-
-AMX_NATIVE_INFO g_NewMenuNatives[] = 
-{
-	{"menu_create",				menu_create},
-	{"menu_additem",			menu_additem},
-	{"menu_pages",				menu_pages},
-	{"menu_items",				menu_items},
-	{"menu_display",			menu_display},
-	{"menu_find_id",			menu_find_id},
-	{"menu_item_getinfo",		menu_item_getinfo},
-	{"menu_makecallback",		menu_makecallback},
-	{"menu_item_setcall",		menu_item_setcall},
-	{"menu_item_setcmd",		menu_item_setcmd},
-	{"menu_item_setname",		menu_item_setname},
-	{NULL,						NULL},
-};

amxmodx/newmenus.h

@@ -1,68 +0,0 @@
-#ifndef _INCLUDE_NEWMENUS_H
-#define _INCLUDE_NEWMENUS_H
-
-#define	MENU_EXIT	-3
-#define	MENU_BACK	-2
-#define	MENU_MORE	-1
-#define	ITEM_IGNORE		0
-#define	ITEM_ENABLED	1
-#define ITEM_DISABLED	2
-
-#define	MENUITEMS	7
-
-typedef int (*MENUITEM_CALLBACK)(int, int, int);
-
-struct menuitem
-{
-	String name;
-	String cmd;
-	int access;
-	int handler;
-	MENUITEM_CALLBACK pfn;
-	size_t id;
-};
-
-typedef unsigned int	menu_t;
-typedef unsigned int	item_t;
-typedef unsigned int	page_t;
-
-class Menu
-{
-public:
-	Menu(const char *title, int menuId, int thisId);
-	~Menu();
-	menuitem *GetMenuItem(item_t item);
-	size_t GetPageCount();
-	size_t GetItemCount();
-	menuitem *AddItem(const char *name, const char *cmd, int access);
-	const char *GetTextString(int player, page_t page, int &keys);
-	bool Display(int player, page_t page);
-	int PagekeyToItem(page_t page, item_t key);
-	int GetMenuMenuid();
-private:
-	CVector<menuitem * > m_Items;
-	String m_Title;
-	String m_Text;
-	int menuId;
-	int thisId;
-};
-
-/*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;
-extern AMX_NATIVE_INFO g_NewMenuNatives[];
-
-#endif //_INCLUDE_NEWMENUS_H

amxmodx/power.c

@@ -5,13 +5,6 @@
  *  Copyright (c) ITB CompuPhase, 1998, 1999
  *  This file may be freely used. No warranties of any kind.
  */
-
-#include <stdlib.h>
-// this file does not include amxmodx.h, so we have to include the memory manager here
-#ifdef MEMORY_TEST
-#include "mmgr/mmgr.h"
-#endif // MEMORY_TEST
-
 #include "amx.h"
 
 static cell power(AMX *amx, cell *params)

amxmodx/sclinux.h

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

amxmodx/sdk/howto.txt

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

amxmodx/sdk/moduleconfig.h

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

amxmodx/srvcmd.cpp

@@ -29,7 +29,9 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
+#include "amxmod.h"
 
 void amx_command(){
 	
@@ -62,18 +64,6 @@ void amx_command(){
 			++a;
 		}
 
-				a = g_plugins.begin();
-
-				while (a)
-				{
-					if ( (*a).getStatusCode() == ps_bad_load )
-					{
-						//error
-						print_srvconsole("Load fails: %s\n", (*a).getError());
-					}
-					++a;
-				}
-
 		print_srvconsole( "%d plugins, %d running\n",plugins,running );
 
 	}
@@ -97,15 +87,12 @@ void amx_command(){
 
 		CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin);
 
-				if ( plugin && plugin->isValid() && plugin->isPaused() ) 
+		if ( plugin && plugin->isValid() ) 
 		{
 			plugin->unpausePlugin();
 			print_srvconsole("Unpaused plugin \"%s\"\n",plugin->getName() );
-				} else if (!plugin) {
-					print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin);
-				} else {
-					print_srvconsole("Plugin %s can't be unpaused right now.", sPlugin);
 		}
+		else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin);
 
 	}
 	else if (!strcmp(cmd,"cvars")) 
@@ -151,28 +138,20 @@ void amx_command(){
 	{
 
 		print_srvconsole( "%s %s\n", Plugin_info.name, Plugin_info.version);
-				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(   "author: %s (%s)\n", Plugin_info.author, Plugin_info.url);
-				print_srvconsole(   "Compiled: %s\n", __DATE__ ", " __TIME__);
+		print_srvconsole(   "compiled: %s\n", __DATE__ ", " __TIME__);
-#if defined JIT && !defined ASM32
+	
-				print_srvconsole(   "Core mode: JIT Only\n");
-#elif !defined JIT && defined ASM32
-				print_srvconsole(	"Core mode: ASM32 Only\n");
-#elif defined JIT && defined ASM32
-				print_srvconsole(	"Core mode: JIT+ASM32\n");
-#else
-				print_srvconsole(	"Core mode: Normal\n");
-#endif
 	}
 	else if (!strcmp(cmd,"modules"))
 	{
 		print_srvconsole( "Currently loaded modules:\n");
-				print_srvconsole( "      %-23.22s %-8.7s %-20.19s %-11.10s\n",
+		print_srvconsole( "      %-23.22s %-7.8s %-8.7s %-20.19s %-11.10s\n",
-						"name", "version", "author", "status");
+			"name","type","version", "author", "status");
 
 		int running = 0;
 		int modules = 0;
 
-				CList<CModule,const char *>::iterator a = g_modules.begin();
+		CList<CModule>::iterator a = g_modules.begin();
 
 		while ( a )
 		{
@@ -181,70 +160,13 @@ void amx_command(){
 
 			++modules;
 
-						print_srvconsole( " [%2d] %-23.22s %-8.7s %-20.19s %-11.10s\n", modules,
+			print_srvconsole( " [%2d] %-23.22s %-7.6s %-8.7s %-20.19s %-11.10s\n",modules,
-								(*a).getName(), (*a).getVersion(), (*a).getAuthor() , (*a).getStatus() );
+				(*a).getName(), (*a).getType(), (*a).getVersion(), (*a).getAuthor() , (*a).getStatus() );
 		
 			++a;
 		}
 
 		print_srvconsole( "%d modules, %d correct\n",modules,running);
-		} else if (!strcmp(cmd, "gpl"))
-		{
-			print_srvconsole("AMX Mod X\n");
-			print_srvconsole("\n");
-			print_srvconsole(" by the AMX Mod X Development Team\n");
-			print_srvconsole("  originally developed by OLO\n");
-			print_srvconsole("\n");
-			print_srvconsole("\n");
-			print_srvconsole("  This program is free software; you can redistribute it and/or modify it\n");
-			print_srvconsole("  under the terms of the GNU General Public License as published by the\n");
-			print_srvconsole("  Free Software Foundation; either version 2 of the License, or (at\n");
-			print_srvconsole("  your option) any later version.\n");
-			print_srvconsole("\n");
-			print_srvconsole("  This program is distributed in the hope that it will be useful, but\n");
-			print_srvconsole("  WITHOUT ANY WARRANTY; without even the implied warranty of\n");
-			print_srvconsole("  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n");
-			print_srvconsole("  General Public License for more details.\n");
-			print_srvconsole("\n");
-			print_srvconsole("  You should have received a copy of the GNU General Public License\n");
-			print_srvconsole("  along with this program; if not, write to the Free Software Foundation,\n");
-			print_srvconsole("  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n");
-			print_srvconsole("\n");
-			print_srvconsole("  In addition, as a special exception, the author gives permission to\n");
-			print_srvconsole("  link the code of this program with the Half-Life Game Engine (\"HL\n");
-			print_srvconsole("  Engine\") and Modified Game Libraries (\"MODs\") developed by Valve,\n");
-			print_srvconsole("  L.L.C (\"Valve\"). You must obey the GNU General Public License in all\n");
-			print_srvconsole("  respects for all of the code used other than the HL Engine and MODs\n");
-			print_srvconsole("  from Valve. If you modify this file, you may extend this exception\n");
-			print_srvconsole("  to your version of the file, but you are not obligated to do so. If\n");
-			print_srvconsole("  you do not wish to do so, delete this exception statement from your\n");
-			print_srvconsole("  version.\n");
-			print_srvconsole("\n");
-		}
-		else if (!strcmp(cmd, "\x74\x75\x72\x74\x6C\x65"))		// !! Hidden Command :D !!
-		{
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2E\x2E\x3A\x3A\x3E\x3E\x3A\x3A\x3B\x3E\x5E\x27\x2E\x27\x27\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x27\x3A\x3A\x3F\x3D\x3E\x3E\x3E\x3E\x3E\x3D\x3F\x3E\x78\x2B\x3F\x3E\x3E\x3E\x3D\x3E\x3F\x2B\x3F\x3E\x3B\x2E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x2E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x27\x2C\x3A\x3E\x3B\x3F\x3D\x3E\x3B\x2E\x27\x5E\x5E\x3B\x3B\x2C\x3A\x3F\x3F\x3D\x78\x3F\x3B\x3E\x3A\x3B\x3A\x5E\x3B\x3D\x3E\x2B\x2B\x2B\x2B\x3D\x2C\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x2C\x3E\x37\x24\x24\x78\x3D\x3D\x3D\x3F\x3A\x27\x20\x20\x20\x20\x20\x20\x20\x2E\x3A\x3B\x3D\x3E\x3A\x3A\x3A\x3A\x3F\x3F\x3F\x3E\x5E\x2C\x2E\x2E\x2C\x2C\x2C\x2C\x3A\x3B\x3D\x3D\x3B\x5E\x2C\x2C\x2C\x3A\x5E\x3A\x3F\x3F\x3E\x3D\x3D\x3E\x3E\x2B\x3B\x27\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x2C\x3D\x2B\x3E\x2C\x5E\x3D\x79\x24\x33\x78\x33\x24\x5A\x24\x3B\x20\x20\x3A\x3E\x2B\x3E\x3D\x3F\x5E\x2C\x2C\x2C\x5E\x5E\x3E\x3D\x3E\x3B\x3B\x3A\x5E\x5E\x3E\x3F\x3D\x2B\x37\x3D\x3F\x3E\x3E\x3E\x3F\x3D\x3F\x3F\x3D\x3D\x3D\x3D\x3E\x3F\x3D\x3E\x3E\x3E\x3D\x5A\x78\x3E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x3D\x5A\x24\x37\x78\x66\x68\x78\x5A\x5A\x24\x79\x79\x71\x23\x23\x4D\x71\x3B\x3A\x3B\x3A\x3E\x3B\x3B\x2C\x5E\x3E\x3F\x3D\x3F\x3A\x2C\x2C\x3A\x3B\x3B\x3E\x3E\x3D\x2B\x3D\x3E\x3D\x3B\x3A\x3E\x3D\x2B\x3D\x2B\x37\x2B\x3D\x2B\x37\x37\x2B\x2B\x33\x33\x33\x37\x37\x24\x5A\x79\x3A\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x5E\x2B\x5A\x2B\x3E\x3D\x37\x5A\x66\x40\x40\x23\x40\x48\x23\x23\x23\x38\x5E\x3B\x3D\x3F\x2B\x3E\x3B\x3E\x5E\x5E\x2C\x27\x2E\x27\x2E\x2E\x5E\x3F\x3D\x3D\x3F\x3A\x3B\x3A\x3A\x3A\x5E\x5E\x3E\x3E\x3F\x3D\x37\x37\x3D\x3D\x37\x2B\x3D\x37\x2B\x37\x78\x24\x79\x38\x68\x45\x48\x79\x3E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x2C\x3E\x3E\x78\x33\x68\x48\x23\x23\x40\x40\x48\x45\x66\x33\x20\x2C\x3A\x3E\x3E\x3E\x3B\x3B\x3A\x3A\x2C\x2E\x2C\x5E\x3A\x2C\x5E\x3B\x3E\x37\x37\x3F\x3B\x3A\x2E\x3A\x3A\x3B\x3D\x3B\x3B\x3D\x2B\x3D\x78\x33\x37\x3E\x3D\x3D\x2B\x37\x2B\x78\x78\x78\x78\x5A\x66\x71\x68\x38\x45\x27\x20\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x3A\x37\x37\x24\x66\x71\x45\x45\x71\x45\x3A\x3A\x2C\x5E\x3A\x3E\x3A\x3A\x3B\x3B\x5E\x3A\x2C\x5E\x5E\x2C\x2C\x5E\x3A\x3E\x2B\x33\x3D\x3E\x3A\x3A\x3A\x3D\x2B\x2B\x3D\x3F\x3F\x37\x37\x2B\x37\x3D\x3D\x5A\x33\x78\x33\x37\x78\x24\x5A\x33\x37\x38\x40\x71\x38\x66\x40\x2C\x20\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x2B\x5A\x45\x40\x5E\x5E\x5E\x3A\x2C\x3A\x3B\x3E\x3A\x5E\x5E\x2C\x2E\x2E\x2C\x5E\x3B\x3B\x3A\x2B\x3E\x3F\x3B\x3F\x3F\x3F\x3F\x3E\x3F\x3D\x37\x3B\x3B\x3D\x33\x2B\x3D\x3D\x78\x78\x5A\x78\x33\x78\x5A\x5A\x5A\x24\x71\x48\x79\x5A\x24\x79\x45\x3E\x20\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x27\x3B\x2C\x2C\x27\x5E\x5E\x2C\x3A\x5E\x3A\x3A\x5E\x3A\x3B\x3F\x3E\x3F\x3E\x3B\x3E\x3E\x3F\x3D\x2B\x37\x37\x2B\x2B\x3D\x2B\x37\x2B\x37\x37\x2B\x3B\x3D\x33\x2B\x2B\x37\x37\x2B\x3D\x78\x78\x66\x78\x78\x37\x33\x66\x78\x38\x23\x23\x27\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3A\x3F\x3B\x5E\x2C\x3B\x3F\x3D\x3F\x3F\x3B\x3A\x3A\x3A\x3E\x3F\x3E\x3E\x3F\x3A\x3F\x33\x78\x78\x33\x24\x24\x33\x2B\x37\x78\x24\x78\x33\x3D\x2B\x2B\x5A\x24\x78\x24\x78\x33\x33\x24\x5A\x79\x24\x24\x24\x68\x45\x48\x38\x68\x45\x40\x3E\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2C\x3A\x3E\x3F\x37\x3D\x3E\x3F\x2B\x3F\x3F\x3E\x3F\x3F\x3F\x3D\x3F\x3E\x3F\x3D\x37\x2B\x3E\x3E\x2B\x37\x37\x33\x37\x33\x78\x33\x33\x33\x78\x37\x37\x37\x78\x5A\x78\x5A\x79\x79\x5A\x24\x79\x79\x79\x79\x79\x68\x71\x38\x38\x71\x23\x23\x45\x37\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x2B\x2B\x3F\x2B\x78\x40\x38\x3F\x3B\x3E\x3B\x3B\x3E\x3F\x37\x2B\x3F\x3F\x3D\x3D\x3E\x3F\x2B\x37\x37\x37\x37\x33\x33\x78\x78\x33\x37\x24\x5A\x78\x5A\x5A\x78\x24\x33\x3D\x37\x37\x37\x78\x24\x5A\x78\x37\x37\x78\x66\x79\x66\x71\x66\x40\x45\x40\x3A\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2B\x3A\x3F\x2B\x3D\x2B\x79\x23\x79\x3B\x2C\x3A\x3A\x3A\x37\x78\x3F\x3E\x3B\x3E\x3B\x3E\x3D\x37\x24\x33\x37\x33\x37\x78\x78\x33\x24\x68\x79\x33\x24\x78\x2B\x33\x33\x5A\x79\x24\x5A\x79\x24\x5A\x37\x24\x5A\x5A\x66\x38\x66\x79\x66\x40\x71\x45\x48\x5A\x3A\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x37\x3D\x37\x37\x33\x37\x37\x66\x45\x5A\x3F\x5E\x5E\x78\x37\x3D\x3F\x3E\x3B\x3B\x3E\x2B\x2B\x24\x78\x37\x2B\x37\x2B\x37\x78\x78\x71\x79\x33\x33\x24\x24\x78\x24\x5A\x3F\x37\x78\x24\x78\x79\x66\x5A\x78\x79\x66\x79\x68\x79\x66\x5A\x33\x3F\x3D\x3D\x20\x20\x20\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x2B\x3D\x3F\x37\x37\x78\x33\x5A\x4E\x4D\x23\x38\x33\x3F\x3E\x3B\x3E\x3B\x3D\x3D\x33\x66\x24\x78\x33\x2B\x78\x24\x5A\x24\x5A\x71\x79\x78\x33\x33\x78\x79\x5A\x5A\x33\x66\x24\x78\x78\x24\x79\x5A\x24\x79\x5A\x37\x66\x24\x3D\x3B\x66\x23\x4D\x4D\x4D\x79\x3B\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3A\x33\x37\x37\x24\x78\x66\x79\x48\x4D\x4D\x4D\x4D\x23\x71\x68\x5A\x24\x5A\x79\x68\x68\x5A\x5A\x24\x79\x66\x68\x78\x5A\x4E\x45\x66\x66\x45\x45\x45\x24\x5A\x40\x71\x68\x5A\x68\x5A\x37\x66\x79\x78\x37\x78\x37\x68\x38\x38\x71\x48\x40\x23\x45\x3A\x3D\x37\x45\x27\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x37\x37\x78\x37\x33\x38\x45\x45\x71\x20\x5E\x3D\x2B\x3F\x2B\x2B\x79\x71\x45\x48\x40\x45\x45\x45\x45\x45\x71\x40\x40\x71\x38\x38\x79\x66\x38\x68\x48\x48\x45\x66\x37\x2B\x3A\x37\x3F\x3B\x3A\x2C\x27\x2C\x27\x78\x4D\x23\x48\x48\x48\x79\x2B\x3A\x3F\x79\x27\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x3A\x78\x78\x24\x40\x4E\x4E\x4D\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x5E\x3E\x3E\x3F\x3E\x3E\x3E\x3E\x3B\x3B\x3B\x3A\x3A\x3F\x3E\x3A\x2E\x2E\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2E\x45\x4D\x40\x45\x78\x5E\x33\x68\x33\x2B\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x24\x48\x45\x48\x78\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2B\x4E\x40\x2B\x66\x33\x78\x20\x20\n");
-			print_srvconsole("\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x2B\x2C\x20\x3A\x20\x20\n");
 	}
 	else 
 	{
@@ -253,7 +175,6 @@ void amx_command(){
 		print_srvconsole("Usage: amxx < command > [ argument ]\n");
 		print_srvconsole("Commands:\n");
 		print_srvconsole("   version                - display amxx version info\n");
-				print_srvconsole("   gpl                    - print the license\n");
 		print_srvconsole("   plugins                - list plugins currently loaded\n");
 		print_srvconsole("   modules                - list modules currently loaded\n");
 		print_srvconsole("   cvars                  - list cvars registered by plugins\n");
@@ -261,15 +182,22 @@ void amx_command(){
 		print_srvconsole("   pause < plugin >       - pause a running plugin\n");
 		print_srvconsole("   unpause < plugin >     - unpause a previously paused plugin\n");
 
+	
 	}
 }
 
 
 void plugin_srvcmd()
 {
+
 	cell ret = 0;
+	int err;
 	const char* cmd = CMD_ARGV(0);
 	
+#ifdef ENABLEEXEPTIONS
+	try{
+#endif
+		
 		CmdMngr::iterator a = g_commands.srvcmdbegin();
 		
 		while ( a )
@@ -277,9 +205,24 @@ void plugin_srvcmd()
 			if (  (*a).matchCommand( cmd )  && 
 				(*a).getPlugin()->isExecutable( (*a).getFunction() ) )
 			{
-			cell ret = executeForwards((*a).getFunction(), g_srvindex, (*a).getFlags(), (*a).getId());
+				
+				if ((err = amx_Exec( (*a).getPlugin()->getAMX(), &ret , (*a).getFunction() 
+					, 3 , g_srvindex , (*a).getFlags() , (*a).getId() )) != AMX_ERR_NONE)
+					
+					UTIL_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+					err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName());
+				
 				if ( ret ) break;
 			}
+			
 			++a;
 		}
+		
+#ifdef ENABLEEXEPTIONS
+	}catch( ... )
+	{
+		UTIL_Log( "[AMXX] fatal error at forward function execution");
+	}
+#endif
+	
 }

amxmodx/string.cpp

@@ -29,8 +29,10 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include <ctype.h>
-#include "amxmodx.h"
+#include "amxmod.h"
 
 const char* stristr(const char* str,const char* substr)
 {
@@ -55,7 +57,39 @@ const char* stristr(const char* str,const char* substr)
 
 char* format_amxstring(AMX *amx, cell *params, int parm,int& len)
 {
-	return g_langMngr.FormatAmxString(amx, params, parm, len);
+  static char buffer[2][3072];
+  static char format[16];
+  char *ptr,*arg;
+  char *dest = *buffer;
+  cell *src = get_amxaddr(amx, params[parm++]);
+  int numparam = *params/sizeof(cell);
+  while(*src) {
+    if (*src=='%'&&*(src+1)) {
+      ptr = format;
+      *ptr++ = *src++;
+      if (*src=='%'){
+        *dest++=*src++;
+        continue;
+      }
+      while (!isalpha(*ptr++=*src++))
+        ;
+      *ptr=0;
+      if (numparam < parm) continue;
+      arg = buffer[1];
+      switch(*(ptr-1)){
+      case 's':  sprintf(arg,format,get_amxstring(amx, params[parm++],2,len)); break;
+      case 'f': case 'g': sprintf(arg,format,*(float*)get_amxaddr(amx, params[parm++])); break;
+      default: sprintf(arg,format,(int)*get_amxaddr(amx, params[parm++]));
+      }
+      while(*arg) *dest++=*arg++;
+      continue;
+    }
+    *dest++=*src++;
+
+  }
+  *dest=0;
+  len = dest - *buffer;
+  return *buffer;
 }
 
 int amxstring_len(cell* a)
@@ -89,7 +123,7 @@ char* get_amxstring(AMX *amx,cell amx_addr,int id, int& len)
   register cell* source = (cell *)(amx->base + (int)(((AMX_HEADER *)amx->base)->dat + amx_addr));
   register char* dest = buffor[id];
   char* start = dest;
-  while ((*dest++=(char)(*source++)))
+  while (*dest++=(char)*source++)
     ;
   len = --dest - start;
   return start;
@@ -393,7 +427,7 @@ float fo_getargfloat(AMX *amx, int pos)
   unsigned char *data =amx->base+(int)((AMX_HEADER *)amx->base)->dat;
   cell value = * (cell *)(data+(int)amx->frm+(pos+3)*sizeof(cell));
   cell number = *(cell *)(data+(int)value);
-  return *(REAL *)((void *)&number);
+  return *(float *)((void *)&number);
 }
 
 char* fo_getargstr(AMX *amx, int swap, int pos)
@@ -448,119 +482,6 @@ char* format_arguments(AMX *amx, int parm,int& len)
   return *buffer;
 }
 
-//added by BAILOPAN for jtp10181
-//takes a string and breaks it into a 1st param and rest params
-//different from strbreak because it's more crafted for control
-static cell AMX_NATIVE_CALL amx_strtok(AMX *amx, cell *params)
-{
-	int left_pos = 0;
-	int right_pos = 0;
-	unsigned int i = 0;
-	bool done_flag = false;
-	int len = 0;
-
-	//string[]
-	char *string = get_amxstring(amx, params[1], 0, len);
-	//left[]
-	char *left = new char[len+1];
-	//right[]
-	char *right = new char[len+1];
-	int leftMax = params[3];
-	int rightMax = params[5];
-	//token
-	char token = params[6];
-	//trim
-	int trim = params[7];
-	for (i=0; i<(unsigned int)len; i++)
-	{
-		if (trim && !done_flag)
-		{
-			if (isspace(string[i]))
-			{
-				while (isspace(string[++i]));
-				done_flag = true;
-			}
-		}
-		if (!done_flag && string[i] == token)
-		{
-			done_flag = true;
-			i++;
-		}
-		if (done_flag)
-		{
-			right[right_pos++] = string[i];
-		} else {
-			left[left_pos++] = string[i];
-		}
-	}
-	right[right_pos] = 0;
-	left[left_pos] = 0;
-	set_amxstring(amx, params[2], left, leftMax);
-	set_amxstring(amx, params[4], right, rightMax);
-	delete [] left;
-	delete [] right;
-	return 1;
-}
-
-//added by BAILOPAN
-//Takes a string and breaks it into a 1st param and rest params
-//strbreak(String[], First[], FirstLen, Rest[], RestLen)
-static cell AMX_NATIVE_CALL strbreak(AMX *amx, cell *params)	/* 5 param */
-{
-	bool quote_flag = false;
-	bool done_flag = false;
-	int left_pos = 0;
-	int right_pos = 0;
-	int l=0;
-	unsigned int i=0;
-	char hold = '"';
-
-	char *string = get_amxstring(amx, params[1], 0, l);
-	char *left = new char[strlen(string)+1];
-	char *right = new char[strlen(string)+1];
-	int LeftMax = params[3];
-	int RightMax = params[5];
-
-	for (i=0; i<(unsigned int)l; i++) {
-		if (string[i] == '"' && !quote_flag) {
-			quote_flag = true;
-		} else if (string[i] == '"' && quote_flag) {
-			quote_flag = false;
-		}
-		if (isspace(string[i]) && !quote_flag && !done_flag) {
-			done_flag = true;
-			i++;
-		}
-		if (!done_flag && string[i]!='"') {
-			if (left_pos < LeftMax) {
-				left[left_pos] = string[i];
-				if (left[left_pos] == '\'') {
-					left[left_pos] = hold;
-				}
-				left_pos++;
-			} else {
-				done_flag = true;
-			}
-		} else {
-			if (right_pos < RightMax && string[i]!='"') {
-				right[right_pos] = string[i];
-				if (right[right_pos] == '\'') {
-					right[right_pos] = hold;
-				}
-				right_pos++;
-			}
-		}
-	}
-	left[left_pos] = '\0';
-	right[right_pos] = '\0';
-	set_amxstring(amx, params[2], left, params[3]);
-	set_amxstring(amx, params[4], right, params[5]);
-	delete [] left;
-	delete [] right;
-
-	return 1;
-}
-
 static cell AMX_NATIVE_CALL format_args(AMX *amx, cell *params)
 {
   int len;
@@ -593,131 +514,6 @@ static cell AMX_NATIVE_CALL is_alpha(AMX *amx, cell *params)
   return isalpha( params[1] );
 }
 
-static cell AMX_NATIVE_CALL amx_ucfirst(AMX *amx, cell *params)
-{
-	int len = 0;
-	cell *str = get_amxaddr(amx, params[1]);
-	if (!isalpha((char)str[0]) || !(str[0]&(1<<5)))
-		return 0;
-	str[0] &= ~(1<<5);
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL amx_strlen(AMX *amx, cell *params)
-{
-	int len;
-	char *str = get_amxstring(amx, params[1], 0, len);
-
-	return strlen(str);
-}
-
-static cell AMX_NATIVE_CALL amx_trim(AMX *amx, cell *params)
-{
-	cell *asdf = get_amxaddr(amx, params[1]);
-	cell *cptr = asdf;
-	int len = 0;
-	while (*cptr++) len++;
-	int flag = 0, incr = 0;
-	register int i = 0;
-	for (i=len-1; i>=0; i--)
-	{
-		if (!isspace(asdf[i]))
-		{
-			break;
-		} else {
-			asdf[i] = 0;
-			len--;
-		}
-	}
-	
-	for (i=0; i<len; i++)
-	{
-		if (isspace(asdf[i]) && !flag)
-		{
-			incr++;
-			if (incr+i<len)
-				asdf[i] = asdf[incr+i];
-		} else {
-			if (!flag)
-				flag = 1;
-			if (incr)
-				asdf[i] = asdf[incr+i];
-		}
-	}
-	asdf[len] = 0;
-
-	return incr;
-}
-
-static cell AMX_NATIVE_CALL n_strcat(AMX *amx,cell *params)
-{
-  cell *cdest,*csrc;
-
-  cdest = get_amxaddr(amx, params[1]);
-  csrc = get_amxaddr(amx, params[2]);
-  int num = params[3];
-  while (*cdest && num)
-  {
-	  cdest++;
-	  num--;
-  }
-  if (!num)
-	  return 0;
-  while (*csrc && num)
-  {
-	  *cdest++ = *csrc++;
-	  num--;
-  }
-  *cdest = 0;
-
-  return params[3] - num;
-}
-
-static cell AMX_NATIVE_CALL n_strcmp(AMX *amx, cell *params)
-{
-	int len;
-	char *str1 = get_amxstring(amx, params[1], 0, len);
-	char *str2 = get_amxstring(amx, params[2], 1, len);
-
-	if (params[1])
-		return stricmp(str1, str2);
-	else
-		return strcmp(str1, str2);
-}
-
-static cell AMX_NATIVE_CALL n_strfind(AMX *amx, cell *params)
-{
-	int len;
-	char *str = get_amxstring(amx, params[1], 0, len);
-	int sublen;
-	char *sub = get_amxstring(amx, params[2], 1, sublen);
-
-	bool found = false;
-	bool igcase = params[3] ? true : false;
-	if (igcase)
-	{
-		for (int i=0; i<len; i++)
-		{
-			if (str[i] & (1<<5))
-				str[i] &= ~(1<<5);
-		}
-		for (int i=0; i<sublen; i++)
-		{
-			if (str[i] & (1<<5))
-				str[i] &= ~(1<<5);			
-		}
-	}
-	if (params[4] > len)
-		return -1;
-	char *pos = &(str[ params[4] ]);
-	char *find = strstr(str, sub);
-
-	if (!find)
-		return -1;
-
-	return (find - str);
-}
-
 AMX_NATIVE_INFO string_Natives[] = {
   { "add",    add },
   { "contain",  contain },
@@ -733,22 +529,11 @@ AMX_NATIVE_INFO string_Natives[] = {
   { "isspace", is_space },
   { "isalpha", is_alpha },
   { "num_to_str", numtostr },
-  { "numtostr",		numtostr },
   { "parse",    parse },
   { "replace",  replace },
   { "setc",   setc },
-  { "strbreak",		strbreak},
   { "strtolower", strtolower },
   { "strtoupper", strtoupper },
   { "str_to_num", strtonum },
-  { "strtonum",		strtonum },
-  { "trim",			amx_trim },
-  { "ucfirst",		amx_ucfirst },
-  { "strtok",		amx_strtok },
-  { "strlen",		amx_strlen },
-  { "strcat",		n_strcat },
-  { "strfind",		n_strfind },
-  { "strcmp",		n_strcmp },
-
   { NULL, NULL }
 };

amxmodx/strptime.cpp

@@ -14,11 +14,6 @@
 #define strnicmp strncasecmp
 #endif
 
-// this file does not include amxmodx.h, so we have to include the memory manager here
-#ifdef MEMORY_TEST
-#include "mmgr/mmgr.h"
-#endif // MEMORY_TEST
-
 const char *_lc_Wday_ [2][ 7],
                   *_lc_Month_[2][12],
                   *_lc_AmPm_ [2][ 2];

amxmodx/util.cpp

@@ -29,25 +29,11 @@
 *  version.
 */
 
+#include <extdll.h>
+#include <meta_api.h>
 #include <time.h>
 
-#include "amxmodx.h"
+#include "amxmod.h"
-
-#ifdef __linux__
-#define _vsnprintf vsnprintf
-#endif
-
-char *UTIL_VarArgs(const char *fmt, ...)
-{
-	va_list ap;
-	static char string[4096];
-
-	va_start(ap, fmt);
-	_vsnprintf(string, sizeof(string)-1, fmt, ap);
-	va_end(ap);
-
-	return string;
-}
 
 int UTIL_ReadFlags(const char* c) 
 {
@@ -72,9 +58,6 @@ void UTIL_ShowMenu( edict_t* pEdict, int slots, int time, char *menu, int mlen )
   char c = 0;
   int a;
 
-	if (!gmsgShowMenu)
-		return;							// some games don't support ShowMenu (Firearms)
-
   while ( *n ) {
     a = mlen;
     if ( a > 175 ) a = 175;
@@ -95,15 +78,9 @@ 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)
 {
-	if (!gmsgMOTD)
-		return;				// :TODO: Maybe output a warning log?
-
-	if (gmsgServerName)
-	{
   MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
     WRITE_STRING(name);
   MESSAGE_END();
-	}
 
   char *n = motd;
   char c = 0;
@@ -123,12 +100,9 @@ void UTIL_ShowMOTD( edict_t *client , char *motd, int mlen, const char *name)
     motd = n;
   }
 
-	if (gmsgServerName)
-	{
   MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
     WRITE_STRING( hostname->string );
   MESSAGE_END();
-	}
 }
 
 void UTIL_IntToString(int value, char *output)
@@ -195,7 +169,7 @@ char* UTIL_SplitHudMessage(const char *src)
 
 unsigned short FixedUnsigned16( float value, float scale )
 {
-	int output = (int)(value * scale);
+  int output = value * scale;
 
   if ( output < 0 )
     output = 0;
@@ -207,7 +181,7 @@ unsigned short FixedUnsigned16( float value, float scale )
 
 short FixedSigned16( float value, float scale )
 {
-	int output = (int)(value * scale);
+  int output = value * scale;
 
   if ( output > 32767 )
     output = 32767;
@@ -247,12 +221,9 @@ void UTIL_HudMessage(edict_t *pEntity, const hudtextparms_t &textparms, char *pM
 }
 
 /* warning - buffer of msg must be longer than 190 chars!
-(here in AMX it is always longer) */
+  (here in AMX it is always longer) */
 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 )
@@ -265,56 +236,97 @@ void UTIL_ClientPrint( edict_t *pEntity, int msg_dest,  char *msg )
   msg[190] = c;
 }
 
-// UTIL_FakeClientCommand
+void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1, const char *arg2) {
-// PURPOSE: Sends a fake client command to GameDLL
+	if (!cmd) return;
-// HOW DOES IT WORK:
+	//strncpy(g_fakecmd.argv[0], cmd, 127 );
-//  1) Stores command and arguments into a global and sets the global "fake" flag to true
+	//g_fakecmd.argv[0][ 127 ] = 0;
-//  2) Invokes ClientCommand in GameDLL
-//  3) meta_api.cpp overrides Cmd_Args, Cmd_Argv, Cmd_Argc and gives them fake values if the "fake" flag is set
-//  4) unsets the global "fake" flag
-void UTIL_FakeClientCommand(edict_t *pEdict, const char *cmd, const char *arg1, const char *arg2)
-{
-	if (!cmd) 
-		return;                              // no command 
-
-	// store command
 	g_fakecmd.argv[0] = cmd;
-	// if only arg2 is passed, swap the arguments
+	if (arg2){
-	if (!arg1 && arg2)
+		g_fakecmd.argc = 3;
-	{
-		arg1 = arg2;
-		arg2 = NULL;
-	}
-
-	// store arguments
-	if (arg2)
-	{								// both arguments passed
-		g_fakecmd.argc = 3;			// 2 arguments + 1 command
-		// store arguments
 		g_fakecmd.argv[1] = arg1;
 		g_fakecmd.argv[2] = arg2;
-		// build argument line
+		snprintf( g_fakecmd.args ,255 ,  "%s %s",arg1,arg2 );
-		snprintf(g_fakecmd.args, 255, "%s %s", arg1, arg2);
-		// if snprintf reached 255 chars limit, this will make sure there will be no access violation
 		g_fakecmd.args[255] = 0;
+		//strncpy(g_fakecmd.argv[1], arg1 , 127 );
+		//g_fakecmd.argv[1][ 127 ] = 0;
+		//strncpy(g_fakecmd.argv[2], arg2 , 127 );
+		//g_fakecmd.argv[2][ 127 ] = 0;
+		//snprintf(g_fakecmd.args, 255 , "%s %s",arg1,arg2);
+		//g_fakecmd.args[255] = 0;
 	}
-	else if (arg1)
+	else if (arg1){
-	{								// only one argument passed
+		g_fakecmd.argc = 2;
-		g_fakecmd.argc = 2;			// 1 argument + 1 command
-		// 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;
+		//strncpy(g_fakecmd.argv[1], arg1, 127 );
+		//g_fakecmd.argv[1][ 127 ] = 0;
+		//*g_fakecmd.argv[2] = 0;
+		//snprintf(g_fakecmd.args, 255 ,"%s",arg1);
+		//g_fakecmd.args[255] = 0;
 	}
 	else
-		g_fakecmd.argc = 1;			// no argmuents -> only one command
+		g_fakecmd.argc = 1;
-
-	// set the global "fake" flag so the Cmd_Arg* functions will be superceded
 	g_fakecmd.fake = true;
-	// tell the GameDLL that the client sent a command
 	MDLL_ClientCommand(pEdict);
-	// unset the global "fake" flag
 	g_fakecmd.fake = false;
 }
+
+std::string g_UTIL_LogFile;
+
+void UTIL_MakeNewLogFile()
+{
+	// build filename
+
+	time_t td;
+	time(&td);
+	tm *curTime = localtime(&td);
+
+	// create dir if not existing
+#ifdef __linux
+	mkdir(build_pathname("%s", g_log_dir.str()), 0700);
+#else
+	mkdir(build_pathname("%s", g_log_dir.str()));
+#endif
+
+	int i = 0;
+	while (true)
+	{
+		g_UTIL_LogFile = build_pathname("%s/L%02d%02d%03d.log", g_log_dir.str(), curTime->tm_mon + 1, curTime->tm_mday, i);
+		FILE *pTmpFile = fopen(g_UTIL_LogFile.c_str(), "r");		// open for reading to check whether the file exists
+		if (!pTmpFile)
+			break;
+		fclose(pTmpFile);
+		++i;
+	}
+	// Log logfile start
+	UTIL_Log("AMX Mod X log file started (file \"%s/L%02d%02d%03d.log\") (version \"%s\")", g_log_dir.str(), curTime->tm_mon + 1, curTime->tm_mday, i, AMX_VERSION);
+}
+
+void UTIL_Log(const char *fmt, ...)
+{
+	// build message
+	// :TODO: Overflow possible here
+	char msg[3072];
+	va_list arglst;
+	va_start(arglst, fmt);
+	vsprintf(msg, fmt, arglst);
+	va_end(arglst);
+
+	// get time
+	time_t td;
+	time(&td);
+	tm *curTime = localtime(&td);
+
+	char date[32];
+	strftime(date, 31, "%m/%d/%Y - %H:%M:%S", curTime);
+
+	// log msg now
+	FILE *pF = fopen(g_UTIL_LogFile.c_str(), "a+");
+	if (!pF)
+		return;		// don't try to create a new logfile to prevent recursion crashes if there is an unforseen error
+
+	fprintf(pF, "L %s: %s\n", date, msg);
+	fclose(pF);
+	print_srvconsole("L %s: %s\n", date, msg);
+}

amxmodx/vault.cpp

@@ -29,8 +29,10 @@
 *  version.
 */
 
-#include "amxmodx.h"
+#include <extdll.h>
+#include <meta_api.h>
 #include "CVault.h"
+#include "amxmod.h"
 
 Vault g_vault;
 
@@ -81,5 +83,3 @@ AMX_NATIVE_INFO vault_Natives[] = {
   { "vaultdata_exists", vaultdata_exists  },
   { 0, 0 }
 };
-
-

amxmodx/version.rc

@@ -1,102 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,5,0
- PRODUCTVERSION 1,5,5,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "Comments", "AMX Mod X"
-            VALUE "FileDescription", "AMX Mod X"
-            VALUE "FileVersion", "1.55"
-            VALUE "InternalName", "amxmodx"
-            VALUE "LegalCopyright", "Copyright (c) 2004-2005, AMX Mod X Dev Team"
-            VALUE "OriginalFilename", "amxmodx_mm.dll"
-            VALUE "ProductName", "AMX Mod X"
-            VALUE "ProductVersion", "1.55"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

amxmodx/zlib/zconf.h

@@ -1,323 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2003 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_  z_deflateInit_
-#  define deflate       z_deflate
-#  define deflateEnd    z_deflateEnd
-#  define inflateInit_  z_inflateInit_
-#  define inflate       z_inflate
-#  define inflateEnd    z_inflateEnd
-#  define deflateInit2_ z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy   z_deflateCopy
-#  define deflateReset  z_deflateReset
-#  define deflatePrime  z_deflatePrime
-#  define deflateParams z_deflateParams
-#  define deflateBound  z_deflateBound
-#  define inflateInit2_ z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync   z_inflateSync
-#  define inflateSyncPoint z_inflateSyncPoint
-#  define inflateCopy   z_inflateCopy
-#  define inflateReset  z_inflateReset
-#  define compress      z_compress
-#  define compress2     z_compress2
-#  define compressBound z_compressBound
-#  define uncompress    z_uncompress
-#  define adler32       z_adler32
-#  define crc32         z_crc32
-#  define get_crc_table z_get_crc_table
-
-#  define Byte          z_Byte
-#  define uInt          z_uInt
-#  define uLong         z_uLong
-#  define Bytef         z_Bytef
-#  define charf         z_charf
-#  define intf          z_intf
-#  define uIntf         z_uIntf
-#  define uLongf        z_uLongf
-#  define voidpf        z_voidpf
-#  define voidp         z_voidp
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if 0           /* HAVE_UNISTD_H -- this line is updated by ./configure */
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  ifdef VMS
-#    include <unixio.h>   /* for off_t */
-#  endif
-#  define z_off_t  off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define  z_off_t long
-#endif
-
-#if defined(__OS400__)
-#define NO_vsnprintf
-#endif
-
-#if defined(__MVS__)
-#  define NO_vsnprintf
-#  ifdef FAR
-#    undef FAR
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(deflateBound,"DEBND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(compressBound,"CMBND")
-#   pragma map(inflate_table,"INTABL")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

compiler/amxxpc/Binary.cpp

@@ -1,143 +0,0 @@
-#include "Binary.h"
-
-BinaryWriter::BinaryWriter(FILE *fp)
-{
-	m_Fp = fp;
-}
-
-bool BinaryWriter::WriteAddr(void *buffer, size_t size)
-{
-	if (fwrite(buffer, size, 1, m_Fp) != 1)
-		return false;
-
-	return true;
-}
-
-void BinaryWriter::WriteUInt32(uint32_t num)
-{
-	if ( !WriteAddr(&num, sizeof(uint32_t)) )
-		throw -1;
-}
-
-void BinaryWriter::WriteInt32(int32_t num)
-{
-	if ( !WriteAddr(&num, sizeof(int32_t)) )
-		throw -1;
-}
-
-void BinaryWriter::WriteUInt16(uint16_t num)
-{
-	if ( !WriteAddr(&num, sizeof(uint16_t)) )
-		throw -1;
-}
-
-void BinaryWriter::WriteInt16(int16_t num)
-{
-	if ( !WriteAddr(&num, sizeof(int16_t)) )
-		throw -1;
-}
-
-void BinaryWriter::WriteUInt8(uint8_t num)
-{
-	if ( !WriteAddr(&num, sizeof(uint8_t)) )
-		throw -1;
-}
-
-void BinaryWriter::WriteInt8(int8_t num)
-{
-	if ( !WriteAddr(&num, sizeof(int8_t)) )
-		throw -1;
-}
-
-void BinaryWriter::WriteChars(const char buffer[], size_t chars)
-{
-	if (!chars)
-		return;
-
-	if (fwrite(buffer, sizeof(char), chars, m_Fp) != chars)
-		throw -1;
-}
-
-BinaryReader::BinaryReader(FILE *fp)
-{
-	m_Fp = fp;
-}
-
-bool BinaryReader::ReadAddr(void *buffer, size_t size)
-{
-	if (fread(buffer, size, 1, m_Fp) != 1)
-		return false;
-
-	return true;
-}
-
-uint32_t BinaryReader::ReadUInt32()
-{
-	uint32_t num;
-
-	if ( !ReadAddr(&num, sizeof(uint32_t)) )
-		throw -1;
-
-	return num;
-}
-
-int32_t BinaryReader::ReadInt32()
-{
-	int32_t num;
-
-	if ( !ReadAddr(&num, sizeof(int32_t)) )
-		throw -1;
-
-	return num;
-}
-
-uint16_t BinaryReader::ReadUInt16()
-{
-	uint16_t num;
-
-	if ( !ReadAddr(&num, sizeof(uint16_t)) )
-		throw -1;
-
-	return num;
-}
-
-int16_t BinaryReader::ReadInt16()
-{
-	int16_t num;
-
-	if ( !ReadAddr(&num, sizeof(int16_t)) )
-		throw -1;
-
-	return num;
-}
-
-uint8_t BinaryReader::ReadUInt8()
-{
-	uint8_t num;
-
-	if ( !ReadAddr(&num, sizeof(uint8_t)) )
-		throw -1;
-
-	return num;
-}
-
-int8_t BinaryReader::ReadInt8()
-{
-	int8_t num;
-
-	if ( !ReadAddr(&num, sizeof(int8_t)) )
-		throw -1;
-
-	return num;
-}
-
-char *BinaryReader::ReadChars(char buffer[], size_t chars)
-{
-	if (!chars)
-		return buffer;
-
-	if (fread(buffer, sizeof(char), chars, m_Fp) != chars)
-		throw -1;
-
-	return buffer;
-}

compiler/amxxpc/Binary.h

@@ -1,54 +0,0 @@
-#ifndef _INCLUDE_BINARY_H
-#define _INCLUDE_BINARY_H
-
-#include <stdio.h>
-#include "amx.h"
-
-#ifdef WIN32
-	typedef	__int8	int8_t;
-	typedef	unsigned __int8 uint8_t;
-	typedef	__int16	int16_t;
-	typedef	unsigned __int16 uint16_t;
-#else
-#include <stdint.h>
-#endif
-
-class BinaryReader
-{
-public:
-	BinaryReader(FILE *fp);
-	//~BinaryReader();
-public:
-	uint32_t ReadUInt32();
-	int32_t ReadInt32();
-	uint16_t ReadUInt16();
-	int16_t ReadInt16();
-	uint8_t ReadUInt8();
-	int8_t ReadInt8();
-	char *ReadChars(char buffer[], size_t chars);
-private:
-	bool ReadAddr(void *buffer, size_t size);
-private:
-	FILE *m_Fp;
-};
-
-class BinaryWriter
-{
-public:
-	BinaryWriter(FILE *fp);
-public:
-	void WriteUInt32(uint32_t num);
-	void WriteInt32(int32_t num);
-	void WriteUInt16(uint16_t num);
-	void WriteInt16(int16_t num);
-	void WriteUInt8(uint8_t num);
-	void WriteInt8(int8_t num);
-	void WriteChars(const char buffer[], size_t chars);
-private:
-	bool WriteAddr(void *buffer, size_t size);
-private:
-	FILE *m_Fp;
-};
-
-#endif //_INCLUDE_BINARY_H
-

compiler/amxxpc/Makefile

@@ -1,46 +0,0 @@
-#(C)2004-2005 AMX Mod X Development Team
-# Makefile written by David "BAILOPAN" Anderson
-
-### EDIT BELOW FOR OTHER PROJECTS ###
-
-OPT_FLAGS = -O3 -funroll-loops -s -pipe
-DEBUG_FLAGS = -g -ggdb3
-CPP = gcc
-BINARY = amxxpc
-
-OBJECTS = amx.cpp amxxpc.cpp Binary.cpp
-
-LINK = -lz /lib/libstdc++.a
-
-INCLUDE = -I.  -L.
-
-ifeq "$(DEBUG)" "true"
-	BIN_DIR = Debug
-	CFLAGS = $(DEBUG_FLAGS)
-else
-	BIN_DIR = Release
-	CFLAGS = $(OPT_FLAGS)
-endif
-
-CFLAGS += -DLINUX -DNDEBUG -Wno-deprecated -fexceptions -DHAVE_STDINT_H -DAMX_ANSIONLY -fno-rtti -static-libgcc
-
-OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o)
-
-$(BIN_DIR)/%.o: %.cpp
-	$(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $<
-
-all:
-	mkdir -p $(BIN_DIR)
-	$(MAKE) amxxpc
-
-amxxpc: $(OBJ_LINUX)
-	$(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -ldl -lm -o$(BIN_DIR)/$(BINARY)
-
-default: all
-
-clean:
-	rm -rf Release/*.o
-	rm -rf Release/$(BINARY)
-	rm -rf Debug/*.o
-	rm -rf Debug/$(BINARY)
-