Tagged 0.20-TP3

amxmodx/CEvent.cpp

@@ -419,7 +419,8 @@ void EventsMngr::executeEvents()
 
 			if ((err = amx_Exec((*iter).m_Plugin->getAMX(), NULL, (*iter).m_Func, 1, m_ParseVault ? m_ParseVault[0].iValue : 0)) != AMX_ERR_NONE)
 			{
-				LogError((*iter).m_Plugin->getAMX(), err, "");
+				AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, 
+					(*iter).m_Plugin->getAMX()->curline, (*iter).m_Plugin->getName());
 			}
 		}
 

amxmodx/CForward.cpp

@@ -110,7 +110,7 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 			int err = amx_Execv(iter->pPlugin->getAMX(), &retVal, iter->func, m_NumParams, realParams);
 			// log runtime error, if any
 			if (err != AMX_ERR_NONE)
-				LogError(iter->pPlugin->getAMX(), err, "");
+				AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, iter->pPlugin->getAMX()->curline, iter->pPlugin->getName());
 
 			// cleanup strings & arrays
 			for (i = 0; i < m_NumParams; ++i)
@@ -128,19 +128,16 @@ cell CForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 				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)
 					{
-						cell *tmp = physAddrs[i];
+						memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-						if (preparedArrays[params[i]].type == Type_Cell)
+					}
-						{
+					else
-							memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
+					{
-						}
+						char *data = (char*)preparedArrays[params[i]].ptr;
-						else
+						for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
-						{
+							*data++ = static_cast<char>(*tmp++ & 0xFF);
-							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]);
 				}
@@ -177,7 +174,6 @@ void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *para
 	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)
@@ -186,14 +182,10 @@ void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const Forwar
 	m_NumParams = numParams;
 	memcpy((void *)m_ParamTypes, paramTypes, numParams * sizeof(ForwardParam));
 	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
-	isFree = false;
 }
 
 cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 {
-	if (isFree)
-		return 0;
-	
 	const int STRINGEX_MAXLENGTH = 128;
 
 	cell realParams[FORWARD_MAX_PARAMS];
@@ -201,7 +193,7 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 
 	if (!m_HasFunc)
 		return 0;
-	
+
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(m_Amx);
 	if (!pPlugin->isExecutable(m_Func))
 		return 0;
@@ -262,19 +254,16 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 		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)
 			{
-				cell *tmp = physAddrs[i];
+				memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
-				if (preparedArrays[params[i]].type == Type_Cell)
+			}
-				{
+			else
-					memcpy(preparedArrays[params[i]].ptr, tmp, preparedArrays[params[i]].size * sizeof(cell));
+			{
-				}
+				char *data = (char*)preparedArrays[params[i]].ptr;
-				else
+				for (unsigned int j = 0; j < preparedArrays[params[i]].size; ++j)
-				{
+					*data++ = static_cast<char>(*tmp++ & 0xFF);
-					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]);
 		}
@@ -295,30 +284,20 @@ int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int
 
 int CForwardMngr::registerSPForward(int func, AMX *amx, int numParams, const ForwardParam *paramTypes)
 {
-	int retVal = -1;
+	int retVal = (m_SPForwards.size() << 1) | 1;
 	CSPForward *pForward;
-	if (!m_FreeSPForwards.empty())
+	if (m_FreeSPForwards.size())
 	{
-		retVal = m_FreeSPForwards.front();
+		 pForward = m_SPForwards[m_FreeSPForwards.back()];
-		pForward = m_SPForwards[retVal >> 1];
+		 m_FreeSPForwards.pop_back();
-		pForward->Set(func, amx, numParams, paramTypes);
+		 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;
@@ -328,14 +307,11 @@ int CForwardMngr::registerSPForward(const char *funcName, AMX *amx, int numParam
 {
 	int retVal = (m_SPForwards.size() << 1) | 1;
 	CSPForward *pForward;
-	if (!m_FreeSPForwards.empty())
+	if (m_FreeSPForwards.size())
 	{
-		retVal = m_FreeSPForwards.front();
+		 pForward = m_SPForwards[m_FreeSPForwards.back()];
-		pForward = m_SPForwards[retVal>>1];		// >>1 because unregisterSPForward pushes the id which contains the sp flag
+		 m_FreeSPForwards.pop_back();
-		pForward->Set(funcName, amx, numParams, paramTypes);
+		 pForward->Set(funcName, amx, numParams, paramTypes);
-		if (pForward->getFuncsNum() == 0)
-			return -1;
-		m_FreeSPForwards.pop();
 	}
 	else
 	{
@@ -343,11 +319,6 @@ int CForwardMngr::registerSPForward(const char *funcName, AMX *amx, int numParam
 		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;
@@ -370,16 +341,10 @@ cell CForwardMngr::executeForwards(int id, cell *params)
 
 int CForwardMngr::getParamsNum(int id) const
 {
-	return (id & 1) ? m_SPForwards[id >> 1]->getParamsNum() :
+	return (id & 1) ? m_SPForwards[id >> 1]->getParamsNum() : 
 		m_Forwards[id >> 1]->getParamsNum();
 }
 
-ForwardParam CForwardMngr::getParamType(int id, int paramNum) const
-{
-	return (id & 1) ? m_SPForwards[id >> 1]->getParamType(paramNum) :
-		m_Forwards[id >> 1]->getParamType(paramNum);
-}
-
 void CForwardMngr::clear()
 {
 	for (ForwardVec::iterator iter = m_Forwards.begin(); iter != m_Forwards.end(); ++iter)
@@ -394,8 +359,7 @@ void CForwardMngr::clear()
 
 	m_Forwards.clear();
 	m_SPForwards.clear();
-	while (!m_FreeSPForwards.empty())
+	m_FreeSPForwards.clear();
-		m_FreeSPForwards.pop();
 	m_TmpArraysNum = 0;
 }
 
@@ -406,13 +370,7 @@ bool CForwardMngr::isSPForward(int id) const
 
 void CForwardMngr::unregisterSPForward(int id)
 {
-	//make sure the id is valid
+	m_FreeSPForwards.push_back(id);
-	if ( !isIdValid(id) || m_SPForwards.at(id >> 1)->isFree )
-		return;
-
-	m_SPForwards.at(id >> 1)->isFree = true;
-
-	m_FreeSPForwards.push(id);
 }
 
 int registerForward(const char *funcName, ForwardExecType et, ...)
@@ -489,45 +447,33 @@ cell executeForwards(int id, ...)
 	va_start(argptr, id);
 	for (int i = 0; i < paramsNum && i < FORWARD_MAX_PARAMS; ++i)
 	{
-		if (g_forwards.getParamType(id, i) == FP_FLOAT)
+		if (params[i] == FP_FLOAT)
 		{
 			REAL tmp = (REAL)va_arg(argptr, double);			// floats get converted to doubles
 			params[i] = *(cell*)&tmp;
 		}
-		else
+		params[i] = (cell)va_arg(argptr, cell);
-			params[i] = (cell)va_arg(argptr, cell);
 	}
 	va_end(argptr);
 	return g_forwards.executeForwards(id, params);
 }
 
-cell CForwardMngr::prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type, bool copyBack)
+cell CForwardMngr::prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type)
 {
-	if (m_TmpArraysNum >= FORWARD_MAX_PARAMS)
-	{
-		#ifdef MEMORY_TEST
-		m_validateAllAllocUnits();
-		#endif // MEMORY_TEST
-		AMXXLOG_Log("[AMXX] Forwards with more than 32 parameters are not supported (tried to prepare array # %d).", m_TmpArraysNum + 1);
-		m_TmpArraysNum = 0;
-		return -1;
-	}
 	m_TmpArrays[m_TmpArraysNum].ptr = ptr;
 	m_TmpArrays[m_TmpArraysNum].size = size;
 	m_TmpArrays[m_TmpArraysNum].type = type;
-	m_TmpArrays[m_TmpArraysNum].copyBack = copyBack;
-
 	return m_TmpArraysNum++;
 }
 
-cell prepareCellArray(cell *ptr, unsigned int size, bool copyBack)
+cell prepareCellArray(cell *ptr, unsigned int size)
 {
-	return g_forwards.prepareArray((void*)ptr, size, Type_Cell, copyBack);
+	return g_forwards.prepareArray((void*)ptr, size, Type_Cell);
 }
 
-cell prepareCharArray(char *ptr, unsigned int size, bool copyBack)
+cell prepareCharArray(char *ptr, unsigned int size)
 {
-	return g_forwards.prepareArray((void*)ptr, size, Type_Char, copyBack);
+	return g_forwards.prepareArray((void*)ptr, size, Type_Char);
 }
 
 void unregisterSPForward(int id)

amxmodx/CForward.h

@@ -46,7 +46,7 @@
 #ifndef FORWARD_H
 #define FORWARD_H
 
-const int FORWARD_MAX_PARAMS = 32;
+const int FORWARD_MAX_PARAMS = 16;
 
 enum ForwardExecType
 {
@@ -79,7 +79,6 @@ struct ForwardPreparedArray
 	void *ptr;
 	ForwardArrayElemType type;
 	unsigned int size;
-	bool copyBack;
 };
 
 // Normal forward
@@ -109,12 +108,6 @@ public:
 	{
 		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
@@ -126,8 +119,6 @@ class CSPForward
 	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);
@@ -142,19 +133,13 @@ public:
 	{
 		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
+	typedef CVector<int> FreeSPVec;					// Free SP Forwards
 
 	ForwardVec m_Forwards;
 
@@ -185,9 +170,7 @@ public:
 	bool isSPForward(int id) const;			// check whether forward is single plugin
 	int getParamsNum(int id) const;			// get num of params of a forward
 	int getFuncsNum(int id) const;			// get num of found functions of a forward
-	ForwardParam getParamType(int id, int paramId) const;
+	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type);		// prepare array
-	cell prepareArray(void *ptr, unsigned int size, ForwardArrayElemType type,
-		bool copyBack);		// prepare array
 };
 
 // (un)register forward
@@ -199,8 +182,8 @@ void unregisterSPForward(int id);
 // execute forwards
 cell executeForwards(int id, ...);
 // prepare array
-cell prepareCellArray(cell *ptr, unsigned int size, bool copyBack = false);
+cell prepareCellArray(cell *ptr, unsigned int size);
-cell prepareCharArray(char *ptr, unsigned int size, bool copyBack = false);
+cell prepareCharArray(char *ptr, unsigned int size);
 
 #endif
 

amxmodx/CLang.cpp

@@ -47,6 +47,15 @@
 #define FFHL_VERSION		4
 #define FFHL_MIN_VERSION	4
 
+#define NEXT_PARAM()		\
+	if (parm > paramCount) \
+	{ \
+		strcpy(outbuf, ""); \
+		len = 0; \
+		AMXXLOG_Log("[AMXX] Plugin did not format a string correctly (parameter %d (total %d), line %d, \"%s\")", parm, paramCount, amx->curline, g_plugins.findPluginFast(amx)); \
+		return outbuf; \
+	} 
+
 /*version history:
 	* 1 (BAILOPAN) - Simplest form possible, no reverse
 	* 2 (BAILOPAN) - One language per file with full reverse
@@ -341,7 +350,7 @@ void CLangMngr::CLang::MergeDefinitions(CQueue<sKeyDef*> &vec)
 				entry->SetKey(key);
 				entry->SetCache(false);
 			} else {
-				//AMXXLOG_Log("[AMXX] Language key %s[%s] defined twice", m_LMan->GetKey(key), m_LanguageName);
+				AMXXLOG_Log("[AMXX] Language key %s[%s] defined twice", m_LMan->GetKey(key), m_LanguageName);
 			}
 		}
 		delete vec.front();
@@ -497,36 +506,153 @@ int CLangMngr::GetKeyEntry(String &key)
 	return -1;
 }
 
-#define CHECK_PTR(ptr, start, bufsize) if ((ptr) - (start) >= (bufsize)) { \
+const char *CLangMngr::Format(const char *src, ...)
-	LogError(amx, AMX_ERR_STACKERR, "Buffer overflow in string formatting"); \
+{
-	outbuf[0] = 0; \
+	va_list argptr;
-	len = 0; \
+	va_start(argptr, src);
-	return outbuf; }
+	static char outbuf[4096];
-#define CHECK_OUTPTR(offset) CHECK_PTR(outptr+offset, outbuf, sizeof(outbuf))
+	char *outptr = outbuf;
-#define ZEROTERM(buf) buf[(sizeof(buf)/sizeof(buf[0]))-1]=0;
+	enum State
-#define NEXT_PARAM()		\
+	{
-	if (parm > paramCount) \
+		S_Normal,
-	{ \
+		S_PercentSign,
-		strcpy(outbuf, ""); \
+	};
-		len = 0; \
+
-		LogError(amx, AMX_ERR_PARAMS, "String formatted incorrectly - parameter %d (total %d)", parm, paramCount); \
+	State curState = S_Normal;
-		return outbuf; \
+	while (*src)
-	} 
+	{
+		if (*src == '%' && curState == S_Normal)
+			curState = S_PercentSign;
+		else if (curState == S_PercentSign)
+		{
+			switch (*src)
+			{
+			case 's':
+				{
+					char *tmpArg = va_arg(argptr, char*);
+					while (*tmpArg)
+						*outptr++ = *tmpArg++;
+					break;
+				}
+			case 'f':
+			case 'g':
+				{
+					char format[16];
+					format[0] = '%';
+					char *ptr = format+1;
+					while (!isalpha(*ptr++ = *src++))
+						/*nothing*/;
+					--src;
+					*ptr = 0;
+					sprintf(outptr, format, va_arg(argptr, double));
+					outptr += strlen(outptr);
+					break;
+				}
+			case 'L':
+				{
+					char *langName = va_arg(argptr, char*);
+					const char *cpLangName=NULL;
+					// Handle player ids (1-32) and server language
+					if ((int)langName == LANG_PLAYER)
+					{
+						langName = (char*)m_CurGlobId;
+					}
+					if ((int)langName == LANG_SERVER)
+					{
+						cpLangName = g_vault.get("server_language");
+					} else if ((int)langName >= 1 && (int)langName <= 32) {
+						if ((int)CVAR_GET_FLOAT("amx_client_languages"))
+						{
+							cpLangName = g_vault.get("server_language");
+						} else {
+							cpLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I((int)langName)->pEdict, "lang");
+						}
+					} else {
+						cpLangName = langName;
+					}
+					if (!cpLangName || strlen(cpLangName) < 1)
+						cpLangName = "en";
+					char *key = va_arg(argptr, char*);
+					const char *def = GetDef(cpLangName, key);
+					while (*def)
+					{
+						switch (*def)
+						{
+						case INSERT_NUMBER:
+							{
+								sprintf(outptr, "%d", va_arg(argptr, int));
+								outptr += strlen(outptr);
+								break;
+							}
+						case INSERT_STRING:
+							{
+								char *tmpArg = va_arg(argptr, char*);
+								while (*tmpArg)
+									*outptr++ = *tmpArg++;
+								break;
+							}
+						case INSERT_FLOAT:
+							{
+								double tmpArg = va_arg(argptr, double);
+								sprintf(outptr, "%f", tmpArg);
+								outptr += strlen(outptr);
+								break;
+							}
+						case INSERT_NEWLINE:
+							*outptr++ = '\n';
+							break;
+						default:
+							*outptr++ = *def;
+						}
+					}
+					break;
+				}
+			case 'd':
+				{
+					char format[16];
+					format[0] = '%';
+					char *ptr = format+1;
+					while (!isalpha(*ptr++ = *src++))
+						/*nothing*/;
+					--src;
+					*ptr = 0;
+					sprintf(outptr, format, va_arg(argptr, int));
+					outptr += strlen(outptr);
+					break;
+				}
+			default:
+				*outptr++ = '%';
+				*outptr++ = *src;
+			}
+			curState = S_Normal;
+		}
+		else
+			*outptr++ = *src;
+		++src;
+	}
+	*outptr++ = 0;
+	return outbuf;
+}
 
 char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 {
-	// number of parameters ( for NEXT_PARAM macro )
 	int paramCount = *params / sizeof(cell);
-	// the output buffer
 	static char outbuf[4096];
-	char *outptr = outbuf;
 	cell *src = get_amxaddr(amx, params[parm++]);
+	char *outptr = outbuf;
+	enum State
+	{
+		S_Normal,
+		S_PercentSign,
+	};
 
+	State curState = S_Normal;
 	while (*src)
 	{
-		if (*src == '%')
+		if (*src == '%' && curState == S_Normal)
+			curState = S_PercentSign;
+		else if (curState == S_PercentSign)
 		{
-			++src;
 			if (*src=='L')
 			{
 				cell langName = params[parm];		// "en" case (langName contains the address to the string)
@@ -536,7 +662,7 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 				// Handle player ids (1-32) and server language
 				if (*pAmxLangName == LANG_PLAYER)	// LANG_PLAYER
 				{
-					if ((int)CVAR_GET_FLOAT("amx_client_languages") == 0)
+					if ((int)CVAR_GET_FLOAT("amx_client_languages"))
 					{
 						cpLangName = g_vault.get("server_language");
 					} else {
@@ -545,21 +671,21 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 				} else if (*pAmxLangName == LANG_SERVER) {	// LANG_SERVER
 					cpLangName = g_vault.get("server_language");
 				} else if (*pAmxLangName >= 1 && *pAmxLangName <= 32) {	// Direct Client Id
-					if ((int)CVAR_GET_FLOAT("amx_client_languages") == 0)
+					if ((int)CVAR_GET_FLOAT("amx_client_languages"))
 					{
 						cpLangName = g_vault.get("server_language");
 					} else {
 						cpLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I(*pAmxLangName)->pEdict, "lang");
 					}
 				} else {	// Language Name
-					int tmplen = 0;
+					int len = 0;
-					cpLangName = get_amxstring(amx, langName, 2, tmplen);
+					cpLangName = get_amxstring(amx, langName, 2, len);
 				}
 				if (!cpLangName || strlen(cpLangName) < 1)
 					cpLangName = "en";
-				int tmplen = 0;
+				int len = 0;
 				NEXT_PARAM();
-				char *key = get_amxstring(amx, params[parm++], 1, tmplen);
+				char *key = get_amxstring(amx, params[parm++], 1, len);
 				const char *def = GetDef(cpLangName, key);
 				if (def == NULL)
 				{
@@ -573,8 +699,7 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 					}
 					if (!def)
 					{
-						static char buf[512];
+						static char buf[255];
-						CHECK_PTR((char*)(buf+17+strlen(key)), buf, sizeof(buf));
 						sprintf(buf, "ML_LNOTFOUND: %s", key);
 						def = buf;
 					}
@@ -584,28 +709,24 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 					if (*def == '%')
 					{
 						++def;
-						static char format[32];
+						char format[16];
 						format[0] = '%';
 						char *ptr = format+1;
-						while (ptr-format<sizeof(format) && !isalpha(*ptr++ = *def++))
+						while (!isalpha(*ptr++ = *def++))
 							/*nothing*/;
-						ZEROTERM(format);
-
 						*ptr = 0;
 						switch ( *(ptr-1) )
 						{
 						case 's':
 							{
-								static char tmpString[4096];
+								char tmpString[256];
 								char *tmpPtr = tmpString;
 								NEXT_PARAM();
 								cell *tmpCell = get_amxaddr(amx, params[parm++]);
-								while (tmpPtr-tmpString < sizeof(tmpString) && *tmpCell)
+								while (*tmpCell)
 									*tmpPtr++ = *tmpCell++;
-
 								*tmpPtr = 0;
 								sprintf(outptr, format, tmpString);
-								ZEROTERM(outbuf);
 								break;
 							}
 						case 'g':
@@ -613,22 +734,19 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 							{
 								NEXT_PARAM();
 								sprintf(outptr, format, *(REAL*)get_amxaddr(amx, params[parm++]));
-								ZEROTERM(outbuf);
 								break;
 							}
 						case 'i':
 						case 'd':
-						case 'c':
 							{
 								NEXT_PARAM();
 								sprintf(outptr, format, (int)*get_amxaddr(amx, params[parm++]));
-								ZEROTERM(outbuf);
 								break;
 							}
 						default:
 							{
-								CHECK_OUTPTR(strlen(format)+1);
+								*outptr++ = '%';
-								strcpy(outptr, format);
+								*outptr++ = *(ptr-1);
 								break;
 							}
 						}
@@ -640,19 +758,15 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 						switch (*def)
 						{
 						case 'n':
-							CHECK_OUTPTR(1);
 							*outptr++ = '\n';
 							break;
 						case 't':
-							CHECK_OUTPTR(1);
 							*outptr++ = '\t';
 							break;
 						case '^':
-							CHECK_OUTPTR(1);
 							*outptr++ = '^';
 							break;
 						default:
-							CHECK_OUTPTR(2);
 							*outptr++ = '^';
 							*outptr++ = *def;
 							break;
@@ -660,37 +774,33 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 						++def;
 					}
 					else
-					{
-						CHECK_OUTPTR(1);
 						*outptr++ = *def++;
-					}
 				}
 			}
 			else
 			{
-				static char tmpString[4096];
+				char tmpString[256];
 				char *tmpPtr = tmpString;
-				int tmpLen = 0;
+				int tmpLen =0;
-				static char format[32] = {'%'};
+				char format[16];
+				format[0] = '%';
 				char *ptr = format+1;
 				if (*src != '%')
 				{
-					while (*src != 0 && ptr-format<sizeof(format) && !isalpha(*ptr++ = *src++))
+					while (!isalpha(*ptr++ = *src++))
 						/*nothing*/;
-					*ptr = 0;
-					ZEROTERM(format);
 					--src;
+					*ptr = 0;
 					switch ( *(ptr-1) )
 					{
 					case 's':
 						{
 							NEXT_PARAM();
 							cell *tmpCell = get_amxaddr(amx, params[parm++]);
-							while (tmpPtr-tmpString<sizeof(tmpString) && *tmpCell)
+							while (*tmpCell)
 								*tmpPtr++ = *tmpCell++;
 							*tmpPtr = 0;
 							sprintf(outptr, format, tmpString);
-							ZEROTERM(outbuf);
 							break;
 						}
 					case 'g':
@@ -702,7 +812,6 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 						}
 					case 'i':
 					case 'd':
-					case 'c':
 						{
 							NEXT_PARAM();
 							sprintf(outptr, format, (int)*get_amxaddr(amx, params[parm++]));
@@ -710,225 +819,29 @@ char * CLangMngr::FormatAmxString(AMX *amx, cell *params, int parm, int &len)
 						}
 					default:
 						{
-							CHECK_OUTPTR(strlen(format)+1);
+							*outptr++ = '%';
-							strcpy(outptr, format);
+							*outptr++ = *(ptr-1);
 							break;
 						}
 					}
-					outptr += strlen(outptr);
 				} else {
-					CHECK_OUTPTR(1);
 					*outptr++ = '%';
+					*outptr++ = '%';
+					src++;
 				}
+				outptr += strlen(outptr);
 			}
+			curState = S_Normal;
 		}
 		else
-		{
-			CHECK_OUTPTR(1);
 			*outptr++ = *src;
-		}
 		++src;
 	}
 	len = outptr - outbuf;
-	CHECK_OUTPTR(1);
 	*outptr++ = 0;
 	return outbuf;
 }
 
-const char *CLangMngr::Format(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	const char *retVal = FormatString(fmt, ap);
-	va_end(ap);
-	return retVal;
-}
-
-#undef CHECK_PTR
-#undef CHECK_OUTPR
-#undef ZEROTERM
-#undef NEXT_PARAM
-
-#define CHECK_PTR(ptr, start, bufsize) if ((ptr) - (start) >= (bufsize)) { \
-	AMXXLOG_Log("[AMXX] Buffer overflow in formatting"); \
-	outbuf[0] = 0; \
-	return outbuf; }
-#define CHECK_OUTPTR(offset) CHECK_PTR(outptr+offset, outbuf, sizeof(outbuf))
-#define ZEROTERM(buf) buf[(sizeof(buf)/sizeof(buf[0]))-1]=0;
-#define NEXT_PARAM()
-
-char *CLangMngr::FormatString(const char *fmt, va_list &ap)
-{
-	// the output buffer
-	static char outbuf[4096];
-	char *outptr = outbuf;
-	const char *src = fmt;
-
-	while (*src)
-	{
-		if (*src == '%')
-		{
-			++src;
-			if (*src=='L')
-			{
-				NEXT_PARAM();
-				const char *pAmxLangName = va_arg(ap, const char*);
-				const char *cpLangName=NULL;
-				// Handle player ids (1-32) and server language
-				if (pAmxLangName == (const char *)LANG_PLAYER)	// LANG_PLAYER
-				{
-					if ((int)CVAR_GET_FLOAT("amx_client_languages"))
-					{
-						cpLangName = g_vault.get("server_language");
-					} else {
-						cpLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I(m_CurGlobId)->pEdict, "lang");
-					}
-				} else if (pAmxLangName == (const char *)LANG_SERVER) {	// LANG_SERVER
-					cpLangName = g_vault.get("server_language");
-				} else if (pAmxLangName >= (const char *)1 && pAmxLangName <= (const char *)32) {	// Direct Client Id
-					if ((int)CVAR_GET_FLOAT("amx_client_languages"))
-					{
-						cpLangName = g_vault.get("server_language");
-					} else {
-						cpLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I((int)pAmxLangName)->pEdict, "lang");
-					}
-				} else {	// Language Name
-					int tmplen = 0;
-					cpLangName = pAmxLangName;
-				}
-				if (!cpLangName || strlen(cpLangName) < 1)
-					cpLangName = "en";
-				int tmplen = 0;
-				const char *key = va_arg(ap, const char *);
-				const char *def = GetDef(cpLangName, key);
-				if (def == NULL)
-				{
-					if (pAmxLangName != LANG_SERVER)
-					{
-						def = GetDef(g_vault.get("server_language"), key);
-					}
-					if (strcmp(cpLangName, "en")!=0 && strcmp(g_vault.get("server_language"), "en")!=0)
-					{
-						def = GetDef("en", key);
-					}
-					if (!def)
-					{
-						static char buf[512];
-						CHECK_PTR((char*)(buf+17+strlen(key)), buf, sizeof(buf));
-						sprintf(buf, "ML_LNOTFOUND: %s", key);
-						def = buf;
-					}
-				}
-				while (*def)
-				{
-					if (*def == '%')
-					{
-						++def;
-						static char format[32];
-						format[0] = '%';
-						char *ptr = format+1;
-						while (ptr-format<sizeof(format) && !isalpha(*ptr++ = *def++))
-							/*nothing*/;
-						ZEROTERM(format);
-
-						*ptr = 0;
-						vsprintf(outptr, format, ap);
-						// vsprintf doesnt alter the ap, increment here
-						switch (*(ptr-1))
-						{
-						case 'f':
-							va_arg(ap, double);
-							break;
-						case 's':
-							va_arg(ap, char *);
-							break;
-						case 'c':
-						case 'd':
-						case 'i':
-						default:		// default: assume int-like parameter
-							va_arg(ap, int);
-							break;
-						}
-						outptr += strlen(outptr);
-					}
-					else if (*def == '^')
-					{
-						++def;
-						switch (*def)
-						{
-						case 'n':
-							CHECK_OUTPTR(1);
-							*outptr++ = '\n';
-							break;
-						case 't':
-							CHECK_OUTPTR(1);
-							*outptr++ = '\t';
-							break;
-						case '^':
-							CHECK_OUTPTR(1);
-							*outptr++ = '^';
-							break;
-						default:
-							CHECK_OUTPTR(2);
-							*outptr++ = '^';
-							*outptr++ = *def;
-							break;
-						}
-						++def;
-					}
-					else
-					{
-						CHECK_OUTPTR(1);
-						*outptr++ = *def++;
-					}
-				}
-			}
-			else
-			{
-				static char format[32] = {'%'};
-				char *ptr = format+1;
-				if (*src != '%')
-				{
-					while (*src != 0 && ptr-format<sizeof(format) && !isalpha(*ptr++ = *src++))
-						/*nothing*/;
-					*ptr = 0;
-					ZEROTERM(format);
-					--src;
-					vsprintf(outptr, format, ap);
-					// vsprintf doesnt alter the ap, increment here
-					switch (*(ptr-1))
-					{
-					case 'f':
-						va_arg(ap, double);
-						break;
-					case 's':
-						va_arg(ap, char *);
-						break;
-					case 'c':
-					case 'd':
-					case 'i':
-					default:		// default: assume int-like parameter
-						va_arg(ap, int);
-						break;
-					}
-					outptr += strlen(outptr);
-				} else {
-					CHECK_OUTPTR(1);
-					*outptr++ = '%';
-				}
-			}
-		}
-		else
-		{
-			CHECK_OUTPTR(1);
-			*outptr++ = *src;
-		}
-		++src;
-	}
-	CHECK_OUTPTR(1);
-	*outptr++ = 0;
-	return outbuf;
-}
 void CLangMngr::MergeDefinitions(const char *lang, CQueue<sKeyDef*> &tmpVec)
 {
 	CLang * language = GetLang(lang);
@@ -957,7 +870,7 @@ int CLangMngr::MergeDefinitionFile(const char *file)
 		return 0;
 	}
 	MD5 md5;
-	md5.update(fp);		// closes for us
+	md5.update(fp);
 	md5.finalize();
 	char md5buffer[33];
 	md5.hex_digest(md5buffer);
@@ -1025,7 +938,7 @@ int CLangMngr::MergeDefinitionFile(const char *file)
 			language[0] = buf[1];
 			language[1] = buf[2];
 			language[2] = 0;
-		} else {
+		} else if (buf.size() > 4) {
 			if (!multiline)
 			{
 				pos = buf.find('=');
@@ -1084,7 +997,6 @@ int CLangMngr::MergeDefinitionFile(const char *file)
 	{
 		MergeDefinitions(language, Defq);
 	}
-	fclose(fp);
 	return 1;
 }
 

amxmodx/CLang.h

@@ -171,7 +171,6 @@ public:
 	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

amxmodx/CLogEvent.cpp

@@ -153,11 +153,9 @@ 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 ){
@@ -165,15 +163,28 @@ void LogEventsMngr::executeLogEvents()
 					break;
 				}
 			}
-			if (!valid) 
+			if (!valid) break;
-				break;
 		}
 		
-		if (valid)
+#ifdef ENABLEEXEPTIONS
+		try
 		{
-			if ((err = amx_Exec(a->plugin->getAMX(), NULL , a->func , 0)) != AMX_ERR_NONE)
+#endif
-				LogError(a->plugin->getAMX(), err, "");
+			
+			if (valid){
+				if ((err = amx_Exec(a->plugin->getAMX(), NULL , a->func , 0)) != AMX_ERR_NONE)
+					AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+						err,a->plugin->getAMX()->curline,a->plugin->getName());
+			}
+			
+#ifdef ENABLEEXEPTIONS
 		}
+		catch( ... )
+		{
+			AMXXLOG_Log( "[AMXX] fatal error at log forward function execution");
+		}
+#endif
+		
     }
 }
 
@@ -237,4 +248,4 @@ LogEventsMngr::CLogEvent *LogEventsMngr::getValidLogEvent( CLogEvent * a )
 		return a;
 	}
 	return 0;
-}
+}

amxmodx/CModule.cpp

@@ -126,9 +126,8 @@ pfnmodule_engine_g engModuleFunc = {
 // class CModule
 // *****************************************************
 
-CModule::CModule(const char* fname)
+CModule::CModule(const char* fname) : m_Filename(fname)
 {
-	m_Filename.assign(fname);
 	clear(false);
 }
 

amxmodx/CModule.h

@@ -95,7 +95,7 @@ public:
 	inline module_info_s* getInfo() const { return m_InfoOld; }	// old
 	inline const amxx_module_info_s* getInfoNew() const { return &m_InfoNew; }	// new
 	inline int getStatusValue() { return m_Status; }
-	inline bool operator==( const char* fname ) { return !strcmp( m_Filename.c_str() , fname );  }
+	inline bool operator==( void* fname ) { return !strcmp( m_Filename.c_str() , (char*)fname );  }
 	inline bool isReloadable() { return m_Amxx ? ((m_Status == MODULE_LOADED) && (m_InfoNew.reload != 0)) : ( (m_Status==MODULE_LOADED) && (m_InfoOld->type==RELOAD_MODULE)); }
 	inline bool isAmxx() const { return m_Amxx; }
 	inline const char *getMissingFunc() const { return m_MissingFunc; }

amxmodx/CPlugin.cpp

@@ -34,11 +34,11 @@
 #include "CForward.h"
 #include "CFile.h"
 
-CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error, int debug) {	
+CPluginMngr::CPlugin* CPluginMngr::loadPlugin(const char* path, const char* name, char* error) {	
 	CPlugin** a = &head;
 	while( *a ) a = &(*a)->next;
-	*a = new CPlugin( pCounter++ ,path,name,error, debug);
+	*a = new CPlugin( pCounter++ ,path,name,error);
-	return (*a);
+	return *error ? 0 : *a;
 }
 
 void CPluginMngr::unloadPlugin( CPlugin** a ) {
@@ -50,7 +50,7 @@ void CPluginMngr::unloadPlugin( CPlugin** a ) {
 
 int  CPluginMngr::loadPluginsFromFile( const char* filename )
 {
-	FILE *fp = fopen(build_pathname("%s",filename) , "rt");
+	File fp( build_pathname("%s",filename) , "r" );
 
 	if ( !fp ) 
 	{
@@ -59,40 +59,22 @@ int  CPluginMngr::loadPluginsFromFile( const char* filename )
 	}
 	
 	// Find now folder
-	char pluginName[256], error[256], debug[256];
+	char pluginName[256], line[256], error[256];
-	int debugFlag = 0;
+	const char *pluginsDir = get_localinfo("amxx_pluginsdir", "addons/amxx/plugins");
-	const char *pluginsDir = get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins");
 	
-	String line;
+	
-
+	while ( fp.getline(line , 255 ) ) 
-	while ( !feof(fp) ) 
 	{
 		*pluginName = 0;
-		*debug = 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  );
-		{
-			debugFlag = 1;
-		}
-
-		CPlugin* plugin = loadPlugin( pluginsDir , pluginName  , error,  debugFlag);
 		
-		if (plugin->getStatusCode() == ps_bad_load)
+		if (!plugin)
-		{
+			AMXXLOG_Log("[AMXX] %s (plugin \"%s\")", error, pluginName );
-			char errorMsg[255];
-			sprintf(errorMsg, "%s (plugin \"%s\")", error, pluginName);
-			plugin->setError(errorMsg);
-			AMXXLOG_Log("[AMXX] %s", plugin->getError());
-		}
 	}
 
-	fclose(fp);
-
 	return pCounter;
 }
 
@@ -105,6 +87,10 @@ void CPluginMngr::clear() {
 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) {
@@ -133,16 +119,7 @@ CPluginMngr::CPlugin* CPluginMngr::findPlugin(const char* name) {
 
 const char* CPluginMngr::CPlugin::getStatus() const {
 	switch(status){
-	case ps_running: 
+	case ps_running: return "running";
-			{
-					if (getAMX()->flags & AMX_FLAG_DEBUG)
-					{
-						return "debug";
-					} else {
-						return "running";
-					}
-					break;
-			}
 	case ps_paused: return "paused";
 	case ps_bad_load: return "bad load";
 	case ps_stopped: return "stopped";
@@ -151,20 +128,16 @@ 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);
 	author.assign(unk);
 	version.assign(unk);
 	char* path = build_pathname("%s/%s",p,n);
 	code = 0;
-	int err = load_amxscript(&amx,&code,path,e, d);
+	int err = load_amxscript(&amx,&code,path,e );
-	if ( err == AMX_ERR_NONE )
+	if ( err == AMX_ERR_NONE ) status = ps_running;
-	{
+	else status = ps_bad_load;
-		status = ps_running;
-	} else {
-		status = ps_bad_load;
-	}
 	amx.userdata[3] = this;
 	paused_fun = 0;
 	next = 0;
@@ -233,4 +206,4 @@ void CPluginMngr::CPlugin::unpausePlugin()
 			}
 		}
 	}
-}
+}

amxmodx/CPlugin.h

@@ -63,12 +63,11 @@ public:
 		String version;
 		String title;
 		String author;
-		String errorMsg;
 		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( );
 
 	public:
@@ -77,15 +76,11 @@ public:
 		inline const char* getVersion() { return version.c_str();}
 		inline const char* getTitle() { return title.c_str();}
 		inline const char* getAuthor() { return author.c_str();}
-		inline const char* getError() { return errorMsg.c_str();}
-		inline int getStatusCode() { return status; }
 		inline int getId() const { return id; }
 		inline AMX* getAMX() { return &amx; }
-		inline const AMX* getAMX() const { return &amx; }
 		inline void setTitle( const char* n ) { title.assign(n); }
 		inline void setAuthor( const char* n ) { author.assign(n); }
 		inline void setVersion( const char* n ) { version.assign(n); }
-		inline void setError( const char* n ) { errorMsg.assign(n); }
 		inline bool isValid() const { return ((status != ps_bad_load) && (status != ps_locked)); }
 		inline bool isPaused() const { return ( (status == ps_paused) || (status == ps_stopped)); }
 		inline bool isFunctionPaused( int id ) const { return (paused_fun & (1<<id)) ? true : false; 	}
@@ -109,7 +104,7 @@ public:
 
 	// 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);

amxmodx/CString.h

@@ -71,7 +71,7 @@ public:
 
 	void append(const char *t)
 	{
-		Grow(cSize + strlen(t) + 1);
+		Grow(cSize + strlen(t));
 		strcat(v, t);
 		cSize = strlen(v);
 	}
@@ -187,7 +187,7 @@ public:
 	{
 		if (c == '\f' || c == '\n' ||
 			c == '\t' || c == '\r' ||
-			c == '\v' || c == ' ')
+			c == 'v' || c == ' ')
 		{
 			return true;
 		}

amxmodx/CTask.cpp

@@ -61,11 +61,14 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 
 	if (iParamsLen)
 	{
+		// also add a cell to the back with the value 0
 		m_iParamLen = iParamsLen + 1;
 		m_pParams = new cell[m_iParamLen];
 		memcpy(m_pParams, pParams, sizeof(cell)*iParamsLen);
 		m_pParams[iParamsLen] = 0;
-	} else {
+	}
+	else
+	{
 		m_iParamLen = 0;
 		m_pParams = NULL;
 	}
@@ -73,17 +76,9 @@ void CTaskMngr::CTask::set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags,
 
 void CTaskMngr::CTask::clear()
 {
-	if (m_iFunc >= 0)
-	{
-		unregisterSPForward(m_iFunc);
-		m_iFunc = -1;
-	}
 	m_bFree = true;
 	if (m_pParams)
-	{
 		delete [] m_pParams;
-		m_pParams = NULL;
-	}
 }
 
 bool CTaskMngr::CTask::isFree() const
@@ -119,16 +114,29 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 
 	if (execute)
 	{
-		if (m_iParamLen)	// call with parameters
+		if (m_pPlugin->isExecutable(m_iFunc))
 		{
-			cell arr = prepareCellArray(m_pParams, m_iParamLen);
+			int err;
-			executeForwards(m_iFunc, arr, m_iId);
+			if (m_iParamLen)	// call with parameters
-		} else {
+			{
-			executeForwards(m_iFunc, m_iId);
+				cell amx_addr, *phys_addr;
-		}
+				if (amx_Allot(m_pPlugin->getAMX(), m_iParamLen, &amx_addr, &phys_addr) != AMX_ERR_NONE)
+					AMXXLOG_Log("[AMXX] Failed to allocate AMX memory (task \"%d\") (plugin \"%s\")", m_iId, m_pPlugin->getName());
+				else
+				{
+					copy_amxmemory(phys_addr, m_pParams, m_iParamLen);
+					if ((err = amx_Exec(m_pPlugin->getAMX(), NULL, m_iFunc, 2, amx_addr, m_iId)) != AMX_ERR_NONE)
+						AMXXLOG_Log("[AMXX] Run time error %d on line %ld (task \"%d\") (plugin \"%s\")", err, m_pPlugin->getAMX()->curline, m_iId, m_pPlugin->getName());
 
-		if (isFree())
+					amx_Release(m_pPlugin->getAMX(), amx_addr);
-			return;
+				}
+			}
+			else
+			{
+				if ((err = amx_Exec(m_pPlugin->getAMX(), NULL, m_iFunc, 1, m_iId)) != AMX_ERR_NONE)
+					AMXXLOG_Log("[AMXX] Run time error %d on line %ld (task \"%d\") (plugin \"%s\")", err, m_pPlugin->getAMX()->curline, m_iId, m_pPlugin->getName());
+			}
+		}
 
 		// set new exec time OR remove the task if needed
 		if (m_bLoop || (--m_iRepeat > 0))
@@ -137,8 +145,6 @@ void CTaskMngr::CTask::executeIfRequired(float fCurrentTime, float fTimeLimit, f
 		}
 		else
 		{
-			unregisterSPForward(m_iFunc);
-			m_iFunc = -1;
 			m_bFree = true;
 		}
 	}
@@ -236,4 +242,4 @@ void CTaskMngr::startFrame()
 void CTaskMngr::clear()
 {
 	m_Tasks.clear();
-}
+}

amxmodx/CTask.h

@@ -54,19 +54,19 @@ private:
 		// execution
 		float m_fNextExecTime;
 	public:
-		 void set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime);
+		inline void set(CPluginMngr::CPlugin *pPlugin, int iFunc, int iFlags, int iId, float fBase, int iParamsLen, const cell *pParams, int iRepeat, float fCurrentTime);
-		 void clear();
+		inline void clear();
-		 bool isFree() const;
+		inline bool isFree() const;
 
-		 CPluginMngr::CPlugin *getPlugin() const;
+		inline CPluginMngr::CPlugin *getPlugin() const;
-		 int getTaskId() const;
+		inline int getTaskId() const;
 
-		 void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
+		inline void executeIfRequired(float fCurrentTime, float fTimeLimit, float fTimeLeft);	// also removes the task if needed
 
-		 void changeBase(float fNewBase);
+		inline void changeBase(float fNewBase);
-		 void resetNextExecTime(float fCurrentTime);
+		inline void resetNextExecTime(float fCurrentTime);
 
-		 bool shouldRepeat();
+		inline bool shouldRepeat();
 
 		CTask();
 		~CTask();

amxmodx/CVector.h

@@ -32,8 +32,6 @@
 #ifndef __CVECTOR_H__
 #define __CVECTOR_H__
 
-#include <assert.h>
-
 // Vector
 template <class T> class CVector
 {
@@ -286,7 +284,7 @@ public:
 	iterator iterAt(size_t pos)
 	{
 		if (pos > m_CurrentUsedSize)
-			assert(0);
+			ASSERT(0);
 		return iterator(m_Data + pos);
 	}
 
@@ -333,7 +331,7 @@ public:
 	{
 		if (pos > m_CurrentUsedSize)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[pos];
 	}
@@ -342,7 +340,7 @@ public:
 	{
 		if (pos > m_CurrentUsedSize)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[pos];
 	}
@@ -361,7 +359,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[0];
 	}
@@ -370,7 +368,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[0];
 	}
@@ -379,7 +377,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[m_CurrentUsedSize - 1];
 	}
@@ -388,7 +386,7 @@ public:
 	{
 		if (m_CurrentUsedSize < 1)
 		{
-			assert(0);
+			ASSERT(0);
 		}
 		return m_Data[m_CurrentUsedSize - 1];
 	}

amxmodx/JIT/jits.asm

@@ -42,12 +42,6 @@
 
 ; Revision History
 ;------------------
-; 16 September 2004 by David "BAILOPAN" Anderson
-;     Implemented a compile time toggleable debug hook on OP_CALL and OP_RET.
-;     NOTE: JIT has not had debug hooks since 1999.
-;  8 September 2004 by David "BAILOPAN" Anderson
-;     Changed OP_LINE call to be compile-time toggle-able between compiling
-;	  line ops or not.
 ; 29 June 2004  by G.W.M. Vissers
 ;	Translated the thing into NASM. The actual generation of the code is 
 ;	put into the data section because the code modifies itself whereas the 
@@ -107,6 +101,15 @@
 ;         to compute the destination address: It searches backwards now.
 ; 1999/07/08    MP - initial revision
 
+
+; Controls generation of LINE op-codes: 0 - no,  all other values - yes
+; Beware that, if set to 1, this makes the compiled code slower by a factor of
+; up to 3!
+;
+; GWMV: to generate LINE opcode, %define ALLOWOPLINE
+;
+%undef ALLOWOPLINE
+
 ;
 ; If this is set to 1 the JIT generates relocatable code for case tables, too.
 ; If set to 0, a faster variant for switch (using absolute addresses) is
@@ -153,24 +156,16 @@ _dbgcode:    resd 1
 _dbgaddr:    resd 1
 _dbgparam:   resd 1
 _dbgname:    resd 1
-;usertags and userdata are 16 bytes on AMX Mod X
+_usertags:   resd 4	; 4 = AMX_USERNUM (#define'd in amx.h)
-_usertags1:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
+_userdata:   resd 4	; 4 = AMX_USERNUM (#define'd in amx.h)
-_usertags2:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
-_usertags3:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
-_usertags4:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
-_userdata1:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
-_userdata2:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
-_userdata3:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
-_userdata4:  resd 1	; 4 = AMX_USERNUM (#define'd in amx.h)
 _error:      resd 1
 _pri:        resd 1
 _alt:        resd 1
 _reset_stk:  resd 1
 _reset_hea:  resd 1
 _syscall_d:  resd 1
-; the two fields below are for the JIT
+; the two fields below are for the JIT; they do not exist in
-; they are included in the non-JIT version for AMX Mod X
+; the non-JIT version of the abstract machine
-;  this is to make sure that the structs match universally!
 _reloc_size: resd 1          ; memory block for relocations
 _code_size:  resd 1          ; memory size of the native code
 	endstruc
@@ -235,7 +230,6 @@ DBG_SYMTAG		equ 9
 
 AMX_FLAG_CHAR16		equ 0001h ; characters are 16-bit
 AMX_FLAG_DEBUG		equ 0002h ; symbolic info. available
-AMX_FLAG_LINEOPS	equ 0020h ; line ops should be parsed [load time only flag] - ~dvander
 AMX_FLAG_BROWSE		equ 4000h
 AMX_FLAG_RELOC		equ 8000h ; jump/call addresses relocated
 
@@ -278,14 +272,6 @@ AMX_FLAG_RELOC		equ 8000h ; jump/call addresses relocated
 
 ;
 ; This is the work horse of the whole JIT: It actually copies the code.
-; Notes from ~dvander (with help of dJeyL)
-;  This takes a source and ending address pointer in the assembled JIT code.
-;  Then it subtracts them and copies the code in between.
-;  The last parameter is the number of bytes the opcode is so it can jump 
-;    to the next one.
-;  Also note that the "in between" code is NEVER executed during the compile 
-;    phase of the JIT.  It's only assembled in memory, and copied into the 
-;    final output bytecode by this function.
 %macro GO_ON 2-3 4
         mov     esi, %1         ;get source address of JIT code
         mov     ecx,%2-%1            ;get number of bytes to copy
@@ -301,8 +287,6 @@ AMX_FLAG_RELOC		equ 8000h ; jump/call addresses relocated
 ; Nasm can't handle the determination of the maximum code size as was done
 ; in the Masm implementation, since it only does two passes. This macro is
 ; called *after* the code for each Small instruction.
-; Notes by ~dvander: This just substracts a label's ip from the current ip.
-;  Therefore you get an instant size check - see RELOC
 %macro CHECKCODESIZE 1
 	%if MAXCODESIZE < $-%1
         	%assign MAXCODESIZE $-%1
@@ -313,11 +297,6 @@ AMX_FLAG_RELOC		equ 8000h ; jump/call addresses relocated
 ; Modify the argument of an x86 instruction with the Small opcode's parameter
 ; before copying the code.
 ;
-; Notes by ~dvander (thanks to dJeyL) - this will take an address and modify
-;   the dword at it.  Since the JIT copies already assembled code, you see
-;   things like "call   12345678h".  This is an arbitrary value as putval
-;   will modify it in memory and then GO_ON will add it to the program.
-;   It is important to get the putval address right - it's in bytes.
 %macro putval 1
         mov     eax,[ebx+4]
         mov     dword [%1],eax
@@ -326,12 +305,7 @@ AMX_FLAG_RELOC		equ 8000h ; jump/call addresses relocated
 ;
 ; Add an entry to the table of addresses which have to be relocated after the
 ; code compilation is done.
-; Notes by ~dvander: This is sort of what amx_BrowseRelocate() does, although
+;
-;   relocation is actually done after code generation (this just adds to a 
-;   table).  Like putval, this takes in an address and marks it to be 
-;   rewritten.  It is a good idea to just use labels to find relocation
-;   offsets (see OP_CALL and OP_RETN).  After code generation, this table
-;   is browsed and the correct threaded jumps are placed.
 %macro RELOC 1-2 ;   adr, dest
         mov     ebp,[reloc_num]
         %if %0 < 2
@@ -817,7 +791,7 @@ OP_ALIGN_PRI:
 	CHECKCODESIZE j_align_pri
 
 OP_ALIGN_ALT:
-;nop
+;nop;
         mov     eax,4
         sub     eax,[ebx+4]
         mov     dword [j_align_alt+1],eax
@@ -1073,119 +1047,22 @@ OP_RET:
 ;good
 OP_RETN:
 ;nop;
-        ;save registers
+        GO_ON   j_retn, OP_CALL
-        push    eax
-        push    ebp
-        ;get .amx flags
-        mov     ebp,[amxhead]
-        mov	    eax,[ebp+_h_flags]
-        ;check to see if the flag has line ops 
-        and     eax,AMX_FLAG_DEBUG
-        cmp     eax,AMX_FLAG_DEBUG
-        ;restore registers
-        pop     ebp
-        pop     eax
-        ;if so, skip down to debug compiler
-        jmp     _go_jit_retn_debug
 
-_go_jit_retn_nodebug:
+        j_retn:
-        GO_ON   j_retn_nodebug, _go_jit_retn_go
-      j_retn_nodebug:
         jmp     [jit_retn]
-		CHECKCODESIZE j_retn_nodebug
+	CHECKCODESIZE j_retn
-_go_jit_retn_go:
-		jmp		_go_jit_retn_end
-
-_go_jit_retn_debug:
-		GO_ON	j_retn, OP_CALL
-	  j_retn:
-	  	push	ebp
-		push	eax
-		push	edx
-		;get AMX
-		mov		ebp,amx
-		;get debug call ptr
-		mov		eax,[ebp+_userdata2]
-		;check validity
-		mov		edx, dword 0
-		cmp		eax, edx
-		je		_go_jit_skip_debug
-		xchg	esp,esi		;switch stack
-		push	1			;param 2 mode 1 = pop
-		push	ebp			;param 1 - amx
-		call	eax			;indirect debug call
-		add		esp, 8		;restore stack
-		xchg	esp,esi		;return to AMX stack
-		mov		ebp,amx		;restore AMX [necessary?]
-	  _go_jit_skip_debug:
-	    pop		edx
-		pop		eax
-		pop		ebp
-	  	jmp		[jit_retn]
-		CHECKCODESIZE j_retn
-_go_jit_retn_end:
 
 ;good
 OP_CALL:
 ;nop;
-        ;save registers
+        RELOC   1
-        push    eax
+        GO_ON   j_call, OP_CALL_I, 8
-        push    ebp
-        ;get .amx flags
-        mov     ebp,[amxhead]
-        mov	    eax,[ebp+_h_flags]
-        ;check to see if the flag has line ops 
-        and     eax,AMX_FLAG_DEBUG
-        cmp     eax,AMX_FLAG_DEBUG
-        ;restore registers
-        pop     ebp
-        pop     eax
-        ;if so, skip down to debug compiler
-        jmp     _go_jit_debug
 
-_go_jit_nodebug:
+        j_call:
-		RELOC 1
+        ;call   12345678h ; tasm chokes on this out of a sudden
-		GO_ON	j_call_nodebug, _j_call_go_on, 8
+        db      0e8h, 0, 0, 0, 0
-		j_call_nodebug:
+	CHECKCODESIZE j_call
-		db      0e8h, 0, 0, 0, 0
-		CHECKCODESIZE j_call_nodebug
-
-_j_call_go_on:
-		jmp _opcall_end
-
-_go_jit_debug:
-		;thanks to Julien "dJeyL" Laurent for code relocation explanation
-		RELOC   _go_jit_reloc-j_call+1
-		GO_ON	j_call, OP_CALL_I, 8
-		j_call:
-		; save some registers
-		push	ebp
-		push	eax
-		push	edx
-		; get AMX
-		mov		ebp,amx
-		; get debug call pointer
-		mov		eax,[ebp+_userdata2]
-		; check to see if it's valid
-		mov		edx, dword 0
-		cmp		eax,edx		
-		je		_go_jit_skip_call
-		xchg	esp,esi		;switch to caller stack
-		push	2			;param mode=2, push
-		push	ebp			;param amx
-		call	eax			;indirect call
-		add		esp, 8		;restore stack
-		xchg	esp,esi		;return to AMX stack
-		mov		ebp,amx		;restore AMX [necessary?]
-	_go_jit_skip_call:
-		;restore original registers
-		pop		edx
-		pop		eax
-		pop		ebp
-	_go_jit_reloc:
-		db      0e8h, 0, 0, 0, 0
-		CHECKCODESIZE j_call
-_opcall_end:
 
 OP_CALL_I:
 ;nop;
@@ -1857,29 +1734,13 @@ OP_FILE:                                ;opcode is simply ignored
 
 OP_LINE:
 ;nop;
-;~dvander - opline is now variable on compile time :]
+%ifndef ALLOWOPLINE
-        ;save registers
-        push    eax
-        push    ebp
-        ;get .amx flags
-        mov     ebp,[amxhead]
-        mov	    eax,[ebp+_h_flags]
-        ;check to see if the flag has line ops 
-        and     eax,AMX_FLAG_LINEOPS
-        cmp     eax,AMX_FLAG_LINEOPS
-        ;restore registers
-        pop     ebp
-        pop     eax
-        ;if so, skip down to debug compiler
-        je      _go_debug
-
         mov     [ebx],edi               ; no line number support: ignore opcode
         add     ebx,12                  ; move on to next opcode
         cmp     ebx,[end_code]
         jae     code_gen_done
         jmp     dword [ebx]         ; go on with the next opcode
-
+%else
-_go_debug:
         putval  j_line+6
         mov     eax,[ebx+8]
         mov     [j_line_sm],eax
@@ -1889,6 +1750,7 @@ _go_debug:
                 DD      0               ; space for curline
 j_line_sm       DD      0               ; space for curfile
 	CHECKCODESIZE j_line
+%endif
 
 OP_SYMBOL:                              ;ignored
         mov     [ebx],edi
@@ -2353,6 +2215,7 @@ JIT_OP_LINE:
         pop     eax
         jmp     ecx                     ; jump back
 
+
 JIT_OP_SWITCH:
         pop     ebp             ; pop return address = table address
         mov     ecx,[ebp]       ; ECX = number of records
@@ -2370,6 +2233,7 @@ JIT_OP_SWITCH:
         jmp     ebp
 %endif
 
+
 ; The caller of asm_runJIT() can determine the maximum size of the compiled
 ; code by multiplying the result of this function by the number of opcodes in
 ; Small module.

amxmodx/JIT/jits.def

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

amxmodx/Makefile.pl

@@ -12,38 +12,23 @@
 # amd64 - compile for AMD64 (impiles no jit)
 # proc=ix86 - assumed not amd64
 # clean - clean the specifications above
-# asm - for ASM implementation
-# !! TODO - add memory mananger support
-# lineop - for JIT only, uses slow version
 
-$PROJECT = "amxmodx_mm";
+$PROJECT = "amxx_mm";
 $sdk = "../hlsdk/SourceCode";
 $mm = "../metamod/metamod";
-$gccf = "gcc";
-$ccf = "cc";
-$amd64_lstdc = "-lstdc++";
 
-@CPP_SOURCE_FILES = ("meta_api.cpp", "CFile.cpp", "CVault.cpp", "vault.cpp", "float.cpp", "file.cpp", "modules.cpp", "CMisc.cpp", "CTask.cpp", "string.cpp", "amxmodx.cpp", "CEvent.cpp", "CCmd.cpp", "CLogEvent.cpp", "srvcmd.cpp", "strptime.cpp", "amxcore.cpp", "amxtime.cpp", "power.cpp", "amxxlog.cpp", "fakemeta.cpp", "amxxfile.cpp", "CLang.cpp", "md5.cpp", "emsg.cpp", "CForward.cpp", "CPlugin.cpp", "CModule.cpp", "CMenu.cpp", "util.cpp");
+@CPP_SOURCE_FILES = ("meta_api.cpp", "CFile.cpp", "CVault.cpp", "vault.cpp", "float.cpp", "file.cpp", "modules.cpp", "CMisc.cpp", "CTask.cpp", "string.cpp", "amxmodx.cpp", "CEvent.cpp", "CCmd.cpp", "CLogEvent.cpp", "srvcmd.cpp", "strptime.cpp", "amxcore.cpp", "amxtime.cpp", "power.cpp", "amxxlog.cpp", "fakemeta.cpp", "MMGR/MMGR.cpp", "amxxfile.cpp", "CLang.cpp", "md5.cpp", "emsg.cpp", "CForward.cpp", "CPlugin.cpp", "CModule.cpp", "CMenu.cpp", "util.cpp");
 
 @C_SOURCE_FILES = ();
 my %OPTIONS, %OPT;
 
 $OPT{"debug"} = "-g -ggdb";
-$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\" -fno-exceptions -fno-rtti";
+$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\"";
 
 $OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_shared -I$sdk/dlls";
 
 while ($cmd = shift)
 {
-	if ($cmd =~ /asm/)
-	{
-		if ($OPTIONS{"amd64"})
-		{
-			die "You cannot compile the ASM core with AMD64 yet.\n";
-		} else {
-			$OPTIONS{"asm"} = 1;
-		}
-	}
 	if ($cmd =~ /jit/)
 	{
 		if ($OPTIONS{"amd64"})
@@ -53,9 +38,9 @@ while ($cmd = shift)
 			$OPTIONS{"jit"} = 1;
 		}
 	} elsif ($cmd =~ /amd64/) {
-		if ($OPTIONS{"jit"} || $OPTIONS{"asm"})
+		if ($OPTIONS{"jit"})
 		{
-			die "You cannot compile the JIT or ASM and AMD64 yet.\n";
+			die "You cannot compile the JIT and AMD64 yet.\n";
 		} else {
 			$OPTIONS{"amd64"} = 1;
 		}
@@ -71,26 +56,19 @@ while ($cmd = shift)
 		}
 	} elsif ($cmd =~ /clean/) {
 		$OPTIONS{"clean"} = 1;		
-	} elsif ($cmd =~ /lineop/) {
-		$OPTIONS{"lineop"} = 1;
 	}
 }
 
-$gcc = `$gccf --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
-	#if ($OPTIONS{"jit"})
+	`ln -s amx.cpp amx.c`;
-	#{
+	push(@C_SOURCE_FILES, "amx.c");
-#		push(@CPP_SOURCE_FILES, "amx.cpp");
+	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
-#		$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
-#	} else {
-		`ln -s amx.cpp amx.c`;
-		push(@C_SOURCE_FILES, "amx.c");
-#	}
 } else {
 	if ($OPTIONS{"amd64"})
 	{
-		`ln -s amx.cpp amx.c`;
+		`cp amx.cpp amx.c`;
 		push(@C_SOURCE_FILES, "amx.c");
 	} else {
 		push(@CPP_SOURCE_FILES, "amx.cpp");
@@ -117,17 +95,12 @@ if ($OPTIONS{"debug"})
 
 if ($OPTIONS{"amd64"})
 {
-	$cflags = " -m64 -DSMALL_CELL_SIZE=64 -DHAVE_I64 $cflags";
+	$cflags .= " -m64 -DSMALL_CELL_SIZE=64 -DHAVE_I64 $cflags";
 }
 
 if ($OPTIONS{"jit"})
 {
-	$cflags .= " -DJIT";
+	$cflags .= "-DJIT";
-}
-
-if ($OPTIONS{"asm"})
-{
-	$cflags .= " -DASM32";
 }
 
 if ($OPTIONS{"debug"})
@@ -156,6 +129,8 @@ if ($OPTIONS{"amd64"})
 if ($OPTIONS{"clean"})
 {
 	`rm $outdir/*.o`;
+	`rm $outdir/MMGR/*.o`;
+	`rm $outdir/minilzo/*.o`;
 	`rm $outdir/$bin`;
 	die("Project cleaned.\n");
 }
@@ -177,32 +152,25 @@ for ($i=0; $i<=$#C_SOURCE_FILES; $i++)
 }
 if ($OPTIONS{"jit"})
 {
-	if ($OPTIONS{"lineop"}) {
+	push(@LINK, "JIT/jits.o");
-		push(@LINK, "JIT/jits-lineop.o");
-	} else {
-		push(@LINK, "JIT/jits.o");
-	}	 
-}
-if ($OPTIONS{"amd64"})
-{
-	push(@LINK, "zlib/libz64.a");
-	push(@LINK, $amd64_lstdc);
-} else {
-	push(@LINK, "zlib/libz.a");
-}
-if ($OPTIONS{"asm"})
-{
-	push(@LINK, "amxexecn.o");
 }
 
 if (!(-d $outdir))
 {
 	mkdir($outdir);
 }
+if (!(-d "$outdir/MMGR"))
+{
+	mkdir("$outdir/MMGR");
+}
 if (!(-d "$outdir/JIT"))
 {
 	mkdir("$outdir/JIT");
 }
+if (!(-d "$outdir/minilzo"))
+{
+	mkdir("$outdir/minilzo");
+}
 
 $inc = $OPTIONS{"include"};
 
@@ -212,14 +180,13 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
+		$ofile_time = (stat($file))[9];
 		if ($file_time > $ofile_time)
 		{
-			`rm $ofile`;
 			print "$gcc\n";
 			`$gcc`;
 		}
@@ -235,11 +202,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.c/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "$ccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
+		$ofile_time = (stat($file))[9];
 		if ($file_time > $ofile_time)
 		{
 			print "$gcc\n";
@@ -251,6 +218,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -Lzlib/ -shared -ldl -lm @LINK -lz -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;

amxmodx/amx.cpp

@@ -21,9 +21,9 @@
  *  Version: $Id$
  */
 
-// not used
+#include <stdio.h>
 #define AMX_NODYNALOAD
-
+ 
 // bad bad workaround but we have to prevent a compiler crash :/
 #if (BUILD_PLATFORM== WINDOWS) && (BUILD_TYPE== RELEASE) && (BUILD_COMPILER== MSVC) && (SMALL_CELL_SIZE== 64)
   #pragma optimize("g",off)
@@ -39,13 +39,11 @@
 # endif
 #endif
 
-#include <stdio.h>
 #include <assert.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stddef.h>     /* for wchar_t */
 #include <string.h>
-#include <malloc.h>
 #include "osdefs.h"
 #if defined LINUX
   #include <sclinux.h>
@@ -53,30 +51,27 @@
     #include <dlfcn.h>
   #endif
 #endif
-#if defined __LCC__ || defined __GNUC__
+#if defined __LCC__ || defined __linux__
   #include <wchar.h>    /* for wcslen() */
 #endif
-#if (defined _Windows && !defined AMX_NODYNALOAD) || (defined JIT && !defined __linux__)
-  #include <windows.h>
-#endif
 
-// this file does not include amxmodx.h, so we have to include the memory manager here
+// this file does not include amxmodx.h so we have to include the mem mngr here
 #ifdef MEMORY_TEST
 #include "mmgr/mmgr.h"
-#endif // MEMORY_TEST
+#endif //MEMORY_TEST
 
 #include "amx.h"
 
 #ifdef JIT
 # ifdef __WIN32__
-#  include <windows.h>		// DWORD, VirtualProtect, ...
+#  include <windows.h>
 # elif defined __linux__
-#  include <sys/mman.h>		// mprotect, PROT_*
+#  include <sys/mman.h>
 #  include <unistd.h>
 # else
    // :TODO:
 # endif
-#endif // JIT
+#endif //JIT
 
 /* When one or more of the AMX_funcname macris are defined, we want
  * to compile only those functions. However, when none of these macros
@@ -428,7 +423,6 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
   AMX_HEADER *hdr;
   AMX_FUNCSTUB *func;
   AMX_NATIVE f;
-  int i =0;
 
   assert(amx!=NULL);
   hdr=(AMX_HEADER *)amx->base;
@@ -438,7 +432,6 @@ int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params)
   assert(index>=0 && index<(cell)NUMENTRIES(hdr,natives,libraries));
   func=GETENTRY(hdr,natives,index);
   f=(AMX_NATIVE)func->address;
-  amx->userdata[2] = (char *)GETENTRYNAME(hdr, func);
   assert(f!=NULL);
 
   /* now that we have found the function, patch the program so that any
@@ -483,70 +476,9 @@ int AMXAPI amx_Debug(AMX *amx)
   return AMX_ERR_DEBUG;
 }
 
-//Here is the actual debugger that AMX Mod X uses
-int AMXAPI amx_DebugCall(AMX *amx, int mode)
-{
-	//right away, check for debugging
-	AMX_HEADER *hdr;
-	AMX_DBG *p = 0;
-	AMX_TRACE *t = 0;
-	hdr = (AMX_HEADER *)amx->base;
-	if ( !(amx->flags & AMX_FLAG_DEBUG) || !(amx->flags & AMX_FLAG_LINEOPS))
-		return AMX_ERR_NONE;
-	p = (AMX_DBG *)(amx->userdata[0]);
-	if ( !p )
-		return AMX_ERR_NONE;
-	if (mode == 2)
-	{
-		//mode  - push onto the stack
-		t = (AMX_TRACE *)malloc(sizeof(AMX_TRACE));
-		memset(t, 0, sizeof(AMX_TRACE));
-		if (!p->head)
-		{
-			p->head = t;
-			t->prev = NULL;
-		} else {
-			t->prev = p->tail;
-			p->tail->next = t;
-		}
-		p->tail = t;
-		t->line = amx->curline;
-		t->file = amx->curfile;
-	} else if (mode == 1) {
-		//mode <0 - pop from the stack	
-		t = p->tail;
-		if (t)
-		{
-			p->tail = t->prev;
-			free(t);
-		}
-		if (p->tail == NULL)
-			p->head = NULL;
-	} else if (mode == 0) {
-		AMX_TRACE *m;
-		//mode == 0 - clear stack
-		t = p->head;
-		while (t)
-		{
-			m = t->next;
-			free(t);
-			t = m;
-		}
-		p->head = 0;
-		p->tail = 0;
-	}
-
-	return AMX_ERR_NONE;
-}
-
 #if defined JIT
-#if defined WIN32 || defined __cplusplus
   extern "C" int AMXAPI getMaxCodeSize(void);
   extern "C" int AMXAPI asm_runJIT(void *sourceAMXbase, void *jumparray, void *compiledAMXbase);
-#else
-  extern int AMXAPI getMaxCodeSize(void);
-  extern int AMXAPI asm_runJIT(void *sourceAMXbase, void *jumparray, void *compiledAMXbase);
-#endif
 #endif
 
 #if SMALL_CELL_SIZE==16
@@ -568,6 +500,7 @@ static int amx_BrowseRelocate(AMX *amx)
   cell cip;
   long codesize;
   OPCODE op;
+  int debug;
   int last_sym_global = 0;
   #if defined __GNUC__ || defined ASM32 || defined JIT
     cell *opcode_list;
@@ -594,33 +527,27 @@ static int amx_BrowseRelocate(AMX *amx)
   assert(OP_MOVS==117);
   assert(OP_SYMBOL==126);
 
-  amx->flags=AMX_FLAG_BROWSE;
-
   /* check the debug hook */
-  if ((hdr->flags & AMX_FLAG_LINEOPS) && !(hdr->flags & AMX_FLAG_TRACED))
+  amx->dbgcode=DBG_INIT;
-  {
+  assert(amx->flags==0);
-    amx->userdata[0] = (AMX_DBG *)malloc(sizeof(AMX_DBG));
+  amx->flags=AMX_FLAG_BROWSE;
-	amx->userdata[1] = (void *)amx_DebugCall;
+  debug= amx->debug(amx)==AMX_ERR_NONE;
-	memset(amx->userdata[0], 0, sizeof(AMX_DBG));
+  if (debug)
-	amx->flags |= AMX_FLAG_LINEOPS;
+    amx->flags|=AMX_FLAG_DEBUG;
-	amx->flags |= AMX_FLAG_TRACED;
-	amx->flags |= AMX_FLAG_DEBUG;
-  } else {
-	amx->userdata[0] = 0;
-	amx->userdata[1] = 0;
-	amx->userdata[2] = 0;
-  }
 
-  #if defined __GNUC__ || defined ASM32 || defined JIT && !defined __64BIT__
+  #if (defined __GNUC__ || defined ASM32 || defined JIT) && !defined __64BIT__
     amx_Exec(amx, (cell*)&opcode_list, 0, 0);
     #if !defined JIT
-	  amx->sysreq_d=(sizeof(AMX_NATIVE)<=sizeof(cell)) ? opcode_list[OP_SYSREQ_D] : 0;
+      /* to use direct system requests, a function pointer must fit in a cell;
+       * because the native function's address will be stored as the parameter
+       * of SYSREQ.D
+       */
+      amx->sysreq_d= (sizeof(AMX_NATIVE)<=sizeof(cell)) ? opcode_list[OP_SYSREQ_D] : 0;
     #endif
   #else
     /* ANSI C
      * to use direct system requests, a function pointer must fit in a cell;
-     * because the native function's address will be stored as the parameter
+     * see the comment above
-     * of SYSREQ.D
      */
     amx->sysreq_d= (sizeof(AMX_NATIVE)<=sizeof(cell)) ? OP_SYSREQ_D : 0;
   #endif
@@ -790,25 +717,21 @@ static int amx_BrowseRelocate(AMX *amx)
       DBGPARAM(amx->curfile);
       amx->dbgname=(char *)(code+(int)cip);
       cip+=num - sizeof(cell);
-      if (!(hdr->flags & AMX_FLAG_TRACED) && amx->userdata[0] != NULL)
+      if (debug) {
-      {
+        assert(amx->flags==(AMX_FLAG_DEBUG | AMX_FLAG_BROWSE));
-        AMX_DBG *pDbg = (AMX_DBG *)(amx->userdata[0]);
+        amx->dbgcode=DBG_FILE;
-        if (pDbg->numFiles == 0)
+        amx->debug(amx);
-        {
-           pDbg->numFiles++;
-           pDbg->files = (char **)malloc(sizeof(char *) * 1);
-		} else {
-           pDbg->numFiles++;
-           pDbg->files = (char **)realloc(pDbg->files, pDbg->numFiles * sizeof(char*));
-        }
-        pDbg->files[pDbg->numFiles-1] = (char *)malloc((sizeof(char) * strlen(amx->dbgname)) + 1);
-        strcpy(pDbg->files[pDbg->numFiles-1], amx->dbgname);
       } /* if */
       break;
     } /* case */
     case OP_LINE:
       DBGPARAM(amx->curline);
       DBGPARAM(amx->curfile);
+      if (debug) {
+        assert(amx->flags==(AMX_FLAG_DEBUG | AMX_FLAG_BROWSE));
+        amx->dbgcode=DBG_LINE;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_SYMBOL: {
       cell num;
@@ -818,14 +741,29 @@ static int amx_BrowseRelocate(AMX *amx)
       amx->dbgname=(char *)(code+(int)cip);
       cip+=num - 2*sizeof(cell);
       last_sym_global = (amx->dbgparam >> 8)==0;
+      if (debug && last_sym_global) { /* do global symbols only */
+        assert(amx->flags==(AMX_FLAG_DEBUG | AMX_FLAG_BROWSE));
+        amx->dbgcode=DBG_SYMBOL;
+        amx->debug(amx);
+      } /* if */
       break;
     } /* case */
     case OP_SRANGE:
       DBGPARAM(amx->dbgaddr);   /* dimension level */
       DBGPARAM(amx->dbgparam);  /* length */
+      if (debug && last_sym_global) { /* do global symbols only */
+        assert(amx->flags==(AMX_FLAG_DEBUG | AMX_FLAG_BROWSE));
+        amx->dbgcode=DBG_SRANGE;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_SYMTAG:
       DBGPARAM(amx->dbgparam);  /* tag id */
+      if (debug && last_sym_global) { /* do global symbols only */
+        assert(amx->flags==(AMX_FLAG_DEBUG | AMX_FLAG_BROWSE));
+        amx->dbgcode=DBG_SYMTAG;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_CASETBL: {
       cell num;
@@ -854,7 +792,6 @@ static int amx_BrowseRelocate(AMX *amx)
 
   amx->flags &= ~AMX_FLAG_BROWSE;
   amx->flags |= AMX_FLAG_RELOC;
-  amx->flags |= AMX_FLAG_TRACED;
   return AMX_ERR_NONE;
 }
 
@@ -994,6 +931,8 @@ int AMXAPI amx_Init(AMX *amx,void *program)
   amx->stk=amx->stp;
   if (amx->callback==NULL)
     amx->callback=amx_Callback;
+  if (amx->debug==NULL)
+    amx->debug=amx_Debug;
   amx->curline=0;
   amx->curfile=0;
   amx->data=NULL;
@@ -1110,16 +1049,19 @@ int AMXAPI amx_Init(AMX *amx,void *program)
     }
 
   #else /* #if defined __WIN32 __ */
-	// DOS32 has no imposed limits on its segments.
-	#if defined __BORLANDC__ || defined __WATCOMC__
-		#pragma argsused
-	#endif
-	int memoryFullAccess( void* addr, int len ) { return 1; }
 
-	#if defined __BORLANDC__ || defined __WATCOMC__
+    // TODO: Add cases for Linux, Unix, OS/2, ...
-		#pragma argsused
+
-	#endif
+    // DOS32 has no imposed limits on its segments.
-	int memorySetAccess( void* addr, int len, int access ) { return 1; }
+    #if defined __BORLANDC__ || defined __WATCOMC__
+      #pragma argsused
+    #endif
+    int memoryFullAccess( void* addr, int len ) { return 1; }
+
+    #if defined __BORLANDC__ || defined __WATCOMC__
+      #pragma argsused
+    #endif
+    int memorySetAccess( void* addr, int len, int access ) { return 1; }
 
   #endif /* #if defined __WIN32 __ */
 
@@ -1161,7 +1103,7 @@ int AMXAPI amx_InitJIT(AMX *amx, void *reloc_table, void *native_code)
   *(cell *)((char*)native_code + hdr->dat + hdr->stp - sizeof(cell)) = 0;
   amx->stk = amx->stp;
 
-  memorySetAccess( (void*)asm_runJIT, 20000, mac );
+  memorySetAccess( asm_runJIT, 20000, mac );
   return AMX_ERR_NONE;
 }
 
@@ -1631,7 +1573,8 @@ static AMX_NATIVE findfunction(const char *name, AMX_NATIVE_INFO *list, int numb
   return NULL;
 }
 
-const char *no_function;			// PM: Nice hack ;)
+const char *no_function;
+
 int AMXAPI amx_Register(AMX *amx, AMX_NATIVE_INFO *list, int number)
 {
   AMX_FUNCSTUB *func;
@@ -1651,11 +1594,15 @@ int AMXAPI amx_Register(AMX *amx, AMX_NATIVE_INFO *list, int number)
     if (func->address==0) {
       /* this function is not yet located */
       funcptr=(list!=NULL) ? findfunction(GETENTRYNAME(hdr,func),list,number) : NULL;
+      /* on 64-bit architectures with, only the lower 32-bits of the address
+       * can be stored; hopefully, all addresses can be assumed to have the
+       * same value for the upper 32-bits
+       */
       if (funcptr!=NULL)
         func->address=(ucell)funcptr;
       else
       {
-        no_function = GETENTRYNAME(hdr,func);
+	    no_function = GETENTRYNAME(hdr,func);
         err=AMX_ERR_NOTFOUND;
       }
     } /* if */
@@ -1663,40 +1610,6 @@ int AMXAPI amx_Register(AMX *amx, AMX_NATIVE_INFO *list, int number)
   } /* for */
   return err;
 }
-
-static cell AMX_NATIVE_CALL null_native(AMX *amx, cell *params)
-{
-	return 0;
-}
-
-void amx_NullNativeTable(AMX *amx)
-{
-	AMX_FUNCSTUB *func;
-	AMX_HEADER *hdr;
-	int i, numnatives;
-
-	hdr=(AMX_HEADER *)amx->base;
-	if (hdr == NULL)
-		return;
-	if (hdr->magic!=AMX_MAGIC)
-		return;
-
-	numnatives = NUMENTRIES(hdr, natives, libraries);
-
-	func=GETENTRY(hdr, natives, 0);
-	
-	for (i=0; i<numnatives; i++)
-	{
-		if (strcmp(GETENTRYNAME(hdr,func), "require_module")==0)
-		{
-			func->address = NULL;
-		} else {
-			func->address = (ucell)null_native;
-		}
-		func=(AMX_FUNCSTUB*)((unsigned char*)func+hdr->defsize);
-	}
-}
-
 #endif /* AMX_REGISTER || AMX_EXEC || AMX_INIT */
 
 #if defined AMX_NATIVEINFO
@@ -1721,7 +1634,7 @@ AMX_NATIVE_INFO * AMXAPI amx_NativeInfo(const char *name, AMX_NATIVE func)
 #define CHKSTACK()      if (stk>amx->stp) return AMX_ERR_STACKLOW
 #define CHKHEAP()       if (hea<amx->hlw) return AMX_ERR_HEAPLOW
 
-#if defined __GNUC__ && !defined ASM32 && !defined JIT
+#if defined __GNUC__ && !defined ASM32
     /* GNU C version uses the "labels as values" extension to create
      * fast "indirect threaded" interpreter.
      */
@@ -1811,8 +1724,7 @@ static void *amx_opcodelist_nodebug[] = {
   ucell codesize;
   int num,i;
   va_list ap;
-  AMX_DEBUGCALL tracer = 0;
+  int debug;
-  AMX_DBG *pdbg = 0;
 
   /* HACK: return label table (for amx_BrowseRelocate) if amx structure
    * has the AMX_FLAG_BROWSE flag set.
@@ -1820,12 +1732,7 @@ static void *amx_opcodelist_nodebug[] = {
   if ((amx->flags & AMX_FLAG_BROWSE)==AMX_FLAG_BROWSE) {
     assert(sizeof(cell)==sizeof(void *));
     assert(retval!=NULL);
-	if (amx->flags & AMX_FLAG_DEBUG)
+    *retval=(cell)((amx->flags & AMX_FLAG_DEBUG)==0 ? amx_opcodelist_nodebug : amx_opcodelist);
-	{
-    	*retval=(cell)(amx_opcodelist);
-	} else {
-    	*retval=(cell)(amx_opcodelist_nodebug);
-	}
     return 0;
   } /* if */
 
@@ -1838,6 +1745,7 @@ static void *amx_opcodelist_nodebug[] = {
   if ((amx->flags & AMX_FLAG_RELOC)==0)
     return AMX_ERR_INIT;
   assert((amx->flags & AMX_FLAG_BROWSE)==0);
+  debug= (amx->flags & AMX_FLAG_DEBUG)!=0;
 
   /* set up the registers */
   hdr=(AMX_HEADER *)amx->base;
@@ -1879,6 +1787,15 @@ static void *amx_opcodelist_nodebug[] = {
   CHKHEAP();
   init_little_endian();
 
+  if (debug && index!=AMX_EXEC_CONT) {
+    /* set the entry point in the debugger by marking a "call" to the
+     * exported function
+     */
+    amx->dbgcode=DBG_CALL;
+    amx->dbgaddr=(ucell)((unsigned char*)cip-code);
+    amx->debug(amx);
+  } /* if */
+
   /* sanity checks */
   assert(OP_PUSH_PRI==36);
   assert(OP_PROC==46);
@@ -1921,20 +1838,6 @@ static void *amx_opcodelist_nodebug[] = {
   /* check stack/heap before starting to run */
   CHKMARGIN();
 
-  if ((amx->flags & AMX_FLAG_DEBUG) && (amx->flags & AMX_FLAG_LINEOPS))
-  {
-	if (amx->userdata[0])
-	{
-		tracer = (AMX_DEBUGCALL)amx->userdata[1];
-		pdbg = (AMX_DBG *)(amx->userdata[0]);
-		if (tracer)
-		{
-			//as a precaution, clear the call stack
-			(tracer)(amx, 0);
-		}
-	}
-  }
-
   /* start running */
   NEXT(cip);
 
@@ -2198,6 +2101,12 @@ static void *amx_opcodelist_nodebug[] = {
     stk+=offs;
     CHKMARGIN();
     CHKSTACK();
+    if (debug && offs>0) {
+      amx->dbgcode=DBG_CLRSYM;
+      amx->stk=stk;
+      amx->hea=hea;
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_stack_nodebug:
     GETPARAM(offs);
@@ -2219,16 +2128,19 @@ static void *amx_opcodelist_nodebug[] = {
     CHKMARGIN();
     NEXT(cip);
   op_ret:
-	if (tracer)
-	{
-        (tracer)(amx, 1);
-	}
     POP(frm);
     POP(offs);
     /* verify the return address */
     if ((ucell)offs>=codesize)
       ABORT(amx,AMX_ERR_MEMACCESS);
     cip=(cell *)(code+(int)offs);
+    if (debug) {
+      amx->stk=stk;
+      amx->hea=hea;
+      amx->dbgcode=DBG_RETURN;
+      amx->dbgparam=pri;    /* store "return value" */
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_ret_nodebug:
     POP(frm);
@@ -2239,10 +2151,6 @@ static void *amx_opcodelist_nodebug[] = {
     cip=(cell *)(code+(int)offs);
     NEXT(cip);
   op_retn:
-	if (tracer)
-	{
-        (tracer)(amx, 1);
-	}
     POP(frm);
     POP(offs);
     /* verify the return address */
@@ -2250,6 +2158,15 @@ static void *amx_opcodelist_nodebug[] = {
       ABORT(amx,AMX_ERR_MEMACCESS);
     cip=(cell *)(code+(int)offs);
     stk+= *(cell *)(data+(int)stk) + sizeof(cell); /* remove parameters from the stack */
+    if (debug) {
+      amx->stk=stk;
+      amx->hea=hea;
+      amx->dbgcode=DBG_RETURN;
+      amx->dbgparam=pri;    /* store "return value" */
+      amx->debug(amx);
+      amx->dbgcode=DBG_CLRSYM;
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_retn_nodebug:
     POP(frm);
@@ -2261,24 +2178,26 @@ static void *amx_opcodelist_nodebug[] = {
     stk+= *(cell *)(data+(int)stk) + sizeof(cell); /* remove parameters from the stack */
     NEXT(cip);
   op_call:
-	if (tracer)
-	{
-        (tracer)(amx, 2);
-	}
     PUSH(((unsigned char *)cip-code)+sizeof(cell));/* push address behind instruction */
     cip=JUMPABS(code, cip);                     /* jump to the address */
+    if (debug) {
+      amx->dbgcode=DBG_CALL;
+      amx->dbgaddr=(ucell)((unsigned char*)cip-code);
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_call_nodebug:
     PUSH(((unsigned char *)cip-code)+sizeof(cell));/* push address behind instruction */
     cip=JUMPABS(code, cip);                     /* jump to the address */
     NEXT(cip);
   op_call_pri:
-	if (tracer)
-	{
-        (tracer)(amx, 2);
-	}
     PUSH((unsigned char *)cip-code);
     cip=(cell *)(code+(int)pri);
+    if (debug) {
+      amx->dbgcode=DBG_CALL;
+      amx->dbgaddr=pri;
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_call_pri_nodebug:
     PUSH((unsigned char *)cip-code);
@@ -2610,6 +2529,12 @@ static void *amx_opcodelist_nodebug[] = {
     amx->pri=pri;
     amx->alt=alt;
     amx->cip=(cell)((unsigned char*)cip-code);
+    if (debug) {
+      amx->dbgcode=DBG_TERMINATE;
+      amx->dbgaddr=(cell)((unsigned char *)cip-code);
+      amx->dbgparam=offs;
+      amx->debug(amx);
+    } /* if */
     if (offs==AMX_ERR_SLEEP) {
       amx->reset_stk=reset_stk;
       amx->reset_hea=reset_hea;
@@ -2686,6 +2611,23 @@ static void *amx_opcodelist_nodebug[] = {
     assert((amx->flags & AMX_FLAG_BROWSE)==0);
     GETPARAM(amx->curline);
     GETPARAM(amx->curfile);
+    if (debug) {
+      amx->frm=frm;
+      amx->stk=stk;
+      amx->hea=hea;
+      amx->dbgcode=DBG_LINE;
+      num=amx->debug(amx);
+      if (num!=AMX_ERR_NONE) {
+        if (num==AMX_ERR_SLEEP) {
+          amx->pri=pri;
+          amx->alt=alt;
+          amx->cip=(cell)((unsigned char*)cip-code);
+          amx->reset_stk=reset_stk;
+          amx->reset_hea=reset_hea;
+        } /* if */
+        ABORT(amx,num);
+      } /* if */
+    } /* if */
     NEXT(cip);
   op_line_nodebug:
     assert((amx->flags & AMX_FLAG_BROWSE)==0);
@@ -2701,6 +2643,10 @@ static void *amx_opcodelist_nodebug[] = {
     cip=(cell *)((unsigned char *)cip + (int)offs - 2*sizeof(cell));
     amx->dbgcode=DBG_SYMBOL;
     assert((amx->dbgparam >> 8)>0);         /* local symbols only */
+    if (debug) {
+      amx->frm=frm;     /* debugger needs this to relocate the symbols */
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_symbol_nodebug:
     assert((amx->flags & AMX_FLAG_BROWSE)==0);
@@ -2712,6 +2658,10 @@ static void *amx_opcodelist_nodebug[] = {
     GETPARAM(amx->dbgaddr);     /* dimension level */
     GETPARAM(amx->dbgparam);    /* length */
     amx->dbgcode=DBG_SRANGE;
+    if (debug) {
+      amx->frm=frm;     /* debugger needs this to relocate the symbols */
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_srange_nodebug:
     assert((amx->flags & AMX_FLAG_BROWSE)==0);
@@ -2721,6 +2671,10 @@ static void *amx_opcodelist_nodebug[] = {
     assert((amx->flags & AMX_FLAG_BROWSE)==0);
     GETPARAM(amx->dbgparam);  /* tag id */
     amx->dbgcode=DBG_SYMTAG;
+    if (debug) {
+      amx->frm=frm;   /* debugger needs this to relocate the symbols */
+      amx->debug(amx);
+    } /* if */
     NEXT(cip);
   op_symtag_nodebug:
     assert((amx->flags & AMX_FLAG_BROWSE)==0);
@@ -2782,11 +2736,7 @@ static void *amx_opcodelist_nodebug[] = {
     #endif
   #elif defined __GNUC__
     /* force "cdecl" by adding an "attribute" to the declaration */
-	#if defined __cplusplus
     extern "C" cell amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea) __attribute__((cdecl));
-	#else
-    extern cell amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea) __attribute__((cdecl));
-	#endif
   #else
     /* force "cdecl" by specifying it as a "function class" with the "__cdecl" keyword */
     extern "C" cell __cdecl amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea);
@@ -2794,13 +2744,8 @@ static void *amx_opcodelist_nodebug[] = {
 #endif
 
 #if defined ASM32 || defined JIT
-#if defined WIN32 || defined __cplusplus
 	extern "C" void *amx_opcodelist[];
-    extern "C" void *amx_opcodelist_nodebug[];
+	extern "C" void *amx_opcodelist_nodebug[];
-#else
-	extern void *amx_opcodelist[];
-    extern void *amx_opcodelist_nodebug[];
-#endif
 #endif
 
 int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
@@ -2813,6 +2758,7 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
   ucell codesize;
   int i;
   va_list ap;
+  int debug;
   #if defined ASM32 || defined JIT
       #ifdef __WATCOMC__
         #pragma aux amx_opcodelist "_*"
@@ -2824,8 +2770,6 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
     cell offs;
     int num;
   #endif
-  AMX_DEBUGCALL tracer = 0;
-  AMX_DBG *pdbg = 0;
 
   #if defined ASM32 || defined JIT
     /* HACK: return label table (for amx_BrowseRelocate) if amx structure
@@ -2841,27 +2785,12 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
          */
         *retval=(cell)amx_opcodelist;
       #else
-		if (amx->flags & AMX_FLAG_DEBUG)
+        *retval=(cell)((amx->flags & AMX_FLAG_DEBUG)==0 ? amx_opcodelist_nodebug : amx_opcodelist);
-		{
-        	*retval=(cell)(amx_opcodelist);
-		} else {
-        	*retval=(cell)(amx_opcodelist_nodebug);
-		}
       #endif
       return 0;
     } /* if */
   #endif
 
-
-  if ((amx->flags & AMX_FLAG_DEBUG) && (amx->flags & AMX_FLAG_LINEOPS))
-  {
-	if (amx->userdata[0])
-	{
-		tracer = (AMX_DEBUGCALL)amx->userdata[1];
-		pdbg = (AMX_DBG *)(amx->userdata[0]);
-	}
-  }
-
   if (amx->callback==NULL)
     return AMX_ERR_CALLBACK;
   i=amx_Register(amx,NULL,0);   /* verify that all natives are registered */
@@ -2871,6 +2800,8 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
   if ((amx->flags & AMX_FLAG_RELOC)==0)
     return AMX_ERR_INIT;
   assert((amx->flags & AMX_FLAG_BROWSE)==0);
+  debug= (amx->flags & AMX_FLAG_DEBUG)!=0;
+
   /* set up the registers */
   hdr=(AMX_HEADER *)amx->base;
   assert(hdr->magic==AMX_MAGIC);
@@ -2911,6 +2842,15 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
   CHKHEAP();
   init_little_endian();
 
+  if (debug && index!=AMX_EXEC_CONT) {
+    /* set the entry point in the debugger by marking a "call" to the
+     * exported function
+     */
+    amx->dbgcode=DBG_CALL;
+    amx->dbgaddr=(ucell)((unsigned char *)cip-code);
+    amx->debug(amx);
+  } /* if */
+
   /* sanity checks */
   assert(OP_PUSH_PRI==36);
   assert(OP_PROC==46);
@@ -3248,6 +3188,12 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
       stk+=offs;
       CHKMARGIN();
       CHKSTACK();
+      if (debug && offs>0) {
+        amx->dbgcode=DBG_CLRSYM;
+        amx->hea=hea;
+        amx->stk=stk;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_HEAP:
       GETPARAM(offs);
@@ -3268,6 +3214,13 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
       if ((ucell)offs>=codesize)
         ABORT(amx,AMX_ERR_MEMACCESS);
       cip=(cell *)(code+(int)offs);
+      if (debug) {
+        amx->stk=stk;
+        amx->hea=hea;
+        amx->dbgcode=DBG_RETURN;
+        amx->dbgparam=pri;  /* store "return value" */
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_RETN:
       POP(frm);
@@ -3278,22 +3231,33 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
       cip=(cell *)(code+(int)offs);
       stk+= *(cell *)(data+(int)stk) + sizeof(cell); /* remove parameters from the stack */
       amx->stk=stk;
-	  if (tracer)
+      if (debug) {
-	  {
+        amx->stk=stk;
-		  (tracer)(amx, 1);
+        amx->hea=hea;
-	  }
+        amx->dbgcode=DBG_RETURN;
+        amx->dbgparam=pri;  /* store "return value" */
+        amx->debug(amx);
+        amx->dbgcode=DBG_CLRSYM;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_CALL:
       PUSH(((unsigned char *)cip-code)+sizeof(cell));/* skip address */
       cip=JUMPABS(code, cip);                   /* jump to the address */
-	  if (tracer)
+      if (debug) {
-	  {
+        amx->dbgcode=DBG_CALL;
-          (tracer)(amx, 2);
+        amx->dbgaddr=(ucell)((unsigned char *)cip-code);
-	  }
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_CALL_PRI:
       PUSH((unsigned char *)cip-code);
       cip=(cell *)(code+(int)pri);
+      if (debug) {
+        amx->dbgcode=DBG_CALL;
+        amx->dbgaddr=pri;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_JUMP:
       /* since the GETPARAM() macro modifies cip, you cannot
@@ -3621,6 +3585,12 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
       amx->pri=pri;
       amx->alt=alt;
       amx->cip=(cell)((unsigned char*)cip-code);
+      if (debug) {
+        amx->dbgcode=DBG_TERMINATE;
+        amx->dbgaddr=(cell)((unsigned char *)cip-code);
+        amx->dbgparam=offs;
+        amx->debug(amx);
+      } /* if */
       if (offs==AMX_ERR_SLEEP) {
         amx->reset_stk=reset_stk;
         amx->reset_hea=reset_hea;
@@ -3697,6 +3667,23 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
       assert((amx->flags & AMX_FLAG_BROWSE)==0);
       GETPARAM(amx->curline);
       GETPARAM(amx->curfile);
+      if (debug) {
+        amx->frm=frm;
+        amx->stk=stk;
+        amx->hea=hea;
+        amx->dbgcode=DBG_LINE;
+        num=amx->debug(amx);
+        if (num!=AMX_ERR_NONE) {
+          if (num==AMX_ERR_SLEEP) {
+            amx->pri=pri;
+            amx->alt=alt;
+            amx->cip=(cell)((unsigned char*)cip-code);
+            amx->reset_stk=reset_stk;
+            amx->reset_hea=reset_hea;
+          } /* if */
+          ABORT(amx,num);
+        } /* if */
+      } /* if */
       break;
     case OP_SYMBOL:
       assert((amx->flags & AMX_FLAG_BROWSE)==0);
@@ -3706,15 +3693,30 @@ int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)
       amx->dbgname=(char *)cip;
       cip=(cell *)((unsigned char *)cip + (int)offs - 2*sizeof(cell));
       assert((amx->dbgparam >> 8)>0);         /* local symbols only */
+      if (debug) {
+        amx->frm=frm;   /* debugger needs this to relocate the symbols */
+        amx->dbgcode=DBG_SYMBOL;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_SRANGE:
       assert((amx->flags & AMX_FLAG_BROWSE)==0);
       GETPARAM(amx->dbgaddr);   /* dimension level */
       GETPARAM(amx->dbgparam);  /* length */
+      if (debug) {
+        amx->frm=frm;   /* debugger needs this to relocate the symbols */
+        amx->dbgcode=DBG_SRANGE;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_SYMTAG:
       assert((amx->flags & AMX_FLAG_BROWSE)==0);
       GETPARAM(amx->dbgparam);  /* tag id */
+      if (debug) {
+        amx->frm=frm;   /* debugger needs this to relocate the symbols */
+        amx->dbgcode=DBG_SYMTAG;
+        amx->debug(amx);
+      } /* if */
       break;
     case OP_JUMP_PRI:
       cip=(cell *)(code+(int)pri);
@@ -4037,7 +4039,7 @@ static long utf8_lowmark[5] = { 0x80, 0x800, 0x10000, 0x200000, 0x4000000 };
      */
     if (result<utf8_lowmark[followup])
       goto error;
-    if ((result>=0xd800 && result<=0xdfff) || result==0xfffe || result==0xffff)
+    if (result>=0xd800 && result<=0xdfff || result==0xfffe || result==0xffff)
       goto error;
   } /* if */
 

amxmodx/amx.h

@@ -22,12 +22,14 @@
  */
 
 #if defined __linux__
-  #include <sclinux.h>
+  #include "sclinux.h"
 #endif
 
 #ifndef AMX_H_INCLUDED
 #define AMX_H_INCLUDED
 
+//#define JIT
+
 #if defined __LCC__ || defined __DMC__ || defined __linux__
   #include <stdint.h>
 #elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
@@ -134,7 +136,6 @@ typedef cell (AMX_NATIVE_CALL *AMX_NATIVE)(struct tagAMX *amx, cell *params);
 typedef int (AMXAPI *AMX_CALLBACK)(struct tagAMX *amx, cell index,
                                    cell *result, cell *params);
 typedef int (AMXAPI *AMX_DEBUG)(struct tagAMX *amx);
-typedef int (AMXAPI *AMX_DEBUGCALL)(struct tagAMX *amx, int mode);
 #if !defined _FAR
   #define _FAR
 #endif
@@ -218,9 +219,11 @@ typedef struct tagAMX {
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
   cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
-  int reloc_size      PACKED; /* required temporary buffer for relocations */
+    int reloc_size      PACKED; /* required temporary buffer for relocations */
-  long code_size      PACKED; /* estimated memory footprint of the native code */
+    long code_size      PACKED; /* estimated memory footprint of the native code */
+  #endif
 } AMX;
 
 /* The AMX_HEADER structure is both the memory format as the file format. The
@@ -247,23 +250,6 @@ typedef struct tagAMX_HEADER {
 } AMX_HEADER            PACKED;
 #define AMX_MAGIC       0xf1e0
 
-//double linked list for stack
-typedef struct tagAMX_TRACE
-{
-  cell					line	PACKED;
-  cell					file	PACKED;
-  struct tagAMX_TRACE	*next	PACKED;
-  struct tagAMX_TRACE	*prev	PACKED;
-} AMX_TRACE				PACKED;
-
-typedef struct tagAMX_DBG
-{
-  int32_t numFiles	PACKED;	/* number of chars in array */
-  char **files		PACKED; /* array of files */
-  AMX_TRACE *head		PACKED;	/* begin of link list */
-  AMX_TRACE *tail		PACKED; /* end of link list */
-} AMX_DBG				PACKED;
-
 enum {
   AMX_ERR_NONE,
   /* reserve the first 15 error codes for exit codes of the abstract machine */
@@ -311,8 +297,6 @@ enum {
 #define AMX_FLAG_COMPACT  0x04  /* compact encoding */
 #define AMX_FLAG_BIGENDIAN 0x08 /* big endian encoding */
 #define AMX_FLAG_NOCHECKS  0x10 /* no array bounds checking */
-#define AMX_FLAG_LINEOPS 0x20 /* line ops are parsed by the JIT [loadtime only flag] */
-#define	AMX_FLAG_TRACED	0x40  /* the file has already been traced */
 #define AMX_FLAG_BROWSE 0x4000  /* browsing/relocating or executing */
 #define AMX_FLAG_RELOC  0x8000  /* jump/call addresses relocated */
 
@@ -353,7 +337,6 @@ uint32_t * AMXAPI amx_Align32(uint32_t *v);
 #if defined _I64_MAX || defined HAVE_I64
   uint64_t * AMXAPI amx_Align64(uint64_t *v);
 #endif
-
 #if SMALL_CELL_SIZE==32
 #define amx_AlignCell amx_Align32
 #elif SMALL_CELL_SIZE==64
@@ -361,13 +344,11 @@ uint32_t * AMXAPI amx_Align32(uint32_t *v);
 #else
 #error Unsupported cell size
 #endif
-
 int AMXAPI amx_Allot(AMX *amx, int cells, cell *amx_addr, cell **phys_addr);
 int AMXAPI amx_Callback(AMX *amx, cell index, cell *result, cell *params);
 int AMXAPI amx_Cleanup(AMX *amx);
 int AMXAPI amx_Clone(AMX *amxClone, AMX *amxSource, void *data);
 int AMXAPI amx_Debug(AMX *amx); /* default debug procedure, does nothing */
-int AMXAPI amx_DebugCall(AMX *amx, int mode);
 int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...);
 int AMXAPI amx_Execv(AMX *amx, cell *retval, int index, int numparams, cell params[]);
 int AMXAPI amx_FindNative(AMX *amx, const char *name, int *index);
@@ -402,7 +383,7 @@ int AMXAPI amx_StrLen(cell *cstring, int *length);
 int AMXAPI amx_UTF8Get(const char *string, const char **endptr, cell *value);
 int AMXAPI amx_UTF8Put(char *string, char **endptr, int maxchars, cell value);
 int AMXAPI amx_UTF8Check(const char *string);
-void amx_NullNativeTable(AMX *amx);
+
 
 #if !defined AMX_NO_ALIGN
   #if defined __linux__

amxmodx/amxmodx.cpp

@@ -70,8 +70,8 @@ static cell AMX_NATIVE_CALL emit_sound(AMX *amx, cell *params) /* 7 param */
 
   int len;
   char* szSample = get_amxstring(amx,params[3],0,len);
-  REAL vol = amx_ctof(params[4]);
+  float vol = *(REAL *)((void *)&params[4]);
-  REAL att = amx_ctof(params[5]);
+  float att = *(REAL *)((void *)&params[5]);
   int channel = params[2];
   int pitch = params[7];
   int flags = params[6];
@@ -273,13 +273,13 @@ static cell AMX_NATIVE_CALL set_hudmessage(AMX *amx, cell *params)  /* 11 param
   g_hudset.r1 = params[1];
   g_hudset.g1 = params[2];
   g_hudset.b1 = params[3];
-  g_hudset.x = amx_ctof(params[4]);
+  g_hudset.x = *(REAL *)((void *)&params[4]);
-  g_hudset.y = amx_ctof(params[5]);
+  g_hudset.y = *(REAL *)((void *)&params[5]);
   g_hudset.effect = params[6];
-  g_hudset.fxTime = amx_ctof(params[7]);
+  g_hudset.fxTime = *(REAL *)((void *)&params[7]);
-  g_hudset.holdTime = amx_ctof(params[8]);
+  g_hudset.holdTime = *(REAL *)((void *)&params[8]);
-  g_hudset.fadeinTime = amx_ctof(params[9]);
+  g_hudset.fadeinTime = *(REAL *)((void *)&params[9]);
-  g_hudset.fadeoutTime = amx_ctof(params[10]);
+  g_hudset.fadeoutTime = *(REAL *)((void *)&params[10]);
   g_hudset.channel = params[11];
   return 1;
 }
@@ -351,15 +351,6 @@ static cell AMX_NATIVE_CALL is_linux_server(AMX *amx, cell *params)
 #endif
 }
 
-static cell AMX_NATIVE_CALL is_amd64_server(AMX *amx, cell *params)
-{
-#if SMALL_CELL_SIZE==64
-  return 1;
-#else
-  return 0;
-#endif
-}
-
 static cell AMX_NATIVE_CALL is_jit_enabled(AMX *amx, cell *params)		// PM: Useless ;P
 {
 #ifdef JIT
@@ -1168,13 +1159,13 @@ static cell AMX_NATIVE_CALL get_cvar_float(AMX *amx, cell *params) /* 1 param */
 {
   int ilen;
   REAL pFloat = CVAR_GET_FLOAT(get_amxstring(amx,params[1],0,ilen));
-  return amx_ftoc(pFloat);
+  return *(cell*)((void *)&pFloat);
 }
 
 static cell AMX_NATIVE_CALL set_cvar_float(AMX *amx, cell *params) /* 2 param */
 {
   int ilen;
-  CVAR_SET_FLOAT(get_amxstring(amx,params[1],0,ilen), amx_ctof(params[2]));
+  CVAR_SET_FLOAT(get_amxstring(amx,params[1],0,ilen),*(REAL *)((void *)&params[2]));
   return 1;
 }
 
@@ -1212,7 +1203,6 @@ static cell AMX_NATIVE_CALL message_begin(AMX *amx, cell *params) /* 4 param */
 	  MESSAGE_BEGIN( params[1], params[2],NULL );
 	  break;
   case MSG_PVS: case MSG_PAS:
-  case MSG_PVS_R: case MSG_PAS_R:
 	  if (numparam < 3) {
 		  amx_RaiseError(amx,AMX_ERR_NATIVE);
 		  return 0;
@@ -1223,13 +1213,12 @@ static cell AMX_NATIVE_CALL message_begin(AMX *amx, cell *params) /* 4 param */
 	  vecOrigin[2] = *(cpOrigin+2);
 	  MESSAGE_BEGIN( params[1], params[2] , vecOrigin );
 	  break;
-  case MSG_ONE_UNRELIABLE:
   case MSG_ONE:
 	  if (numparam < 4) {
 		  amx_RaiseError(amx,AMX_ERR_NATIVE);
 		  return 0;
 	  }
-	  MESSAGE_BEGIN( params[1], params[2], NULL, INDEXENT(params[4]) );
+	  MESSAGE_BEGIN( MSG_ONE, params[2], NULL, INDEXENT(params[4]) );
 	  break;
 	}
 
@@ -1595,7 +1584,7 @@ static cell AMX_NATIVE_CALL get_maxplayers(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_gametime(AMX *amx, cell *params)
 {
   REAL pFloat = gpGlobals->time;
-  return amx_ftoc(pFloat);
+  return *(cell*)((void *)&pFloat);
 }
 
 static cell AMX_NATIVE_CALL get_mapname(AMX *amx, cell *params) /* 2 param */
@@ -1678,16 +1667,6 @@ static cell AMX_NATIVE_CALL get_user_msgid(AMX *amx, cell *params) /* 1 param */
   return GET_USER_MSG_ID(PLID, sptemp , NULL );
 }
 
-static cell AMX_NATIVE_CALL get_user_msgname(AMX *amx, cell *params) /* get_user_msgname(msg, str[], len) = 3 params */
-{
-	const char* STRING = GET_USER_MSG_NAME(PLID, params[1], NULL);
-	if (STRING)
-		return set_amxstring(amx, params[2], STRING, params[3]);
-
-	// Comes here if GET_USER_MSG_NAME failed (ie, invalid msg id)
-	return 0;
-}
-
 static cell AMX_NATIVE_CALL set_task(AMX *amx, cell *params) /* 2 param */
 {
 
@@ -1697,27 +1676,23 @@ static cell AMX_NATIVE_CALL set_task(AMX *amx, cell *params) /* 2 param */
 
   char* stemp = get_amxstring(amx,params[2],1, a );
 
-  if (params[5])
+  if (amx_FindPublic(amx, stemp , &iFunc) != AMX_ERR_NONE){
-  {
-     iFunc = registerSPForwardByName(amx, stemp, FP_ARRAY, FP_CELL, FP_DONE);
-  } else {
-     iFunc = registerSPForwardByName(amx, stemp, FP_CELL, FP_DONE);
-  }
-  if (iFunc == -1)
-  {
     AMXXLOG_Log("[AMXX] Function is not present (function \"%s\") (plugin \"%s\")",stemp,plugin->getName() );
     amx_RaiseError(amx,AMX_ERR_NATIVE);
     return 0;
   }
 
-  float base = amx_ctof(params[1]);
+  float base = *(REAL *)((void *)&params[1]);
 
   if ( base < 0.1 )
     base = 0.1;
 
   char* temp = get_amxstring(amx,params[6],0,a);
 
-  g_tasksMngr.registerTask( plugin , iFunc , UTIL_ReadFlags(temp), params[3], base ,  params[5] ,  get_amxaddr(amx,params[4]) , params[7] );
+  g_tasksMngr.registerTask( plugin ,
+    iFunc , UTIL_ReadFlags(temp), params[3], base ,
+    params[5] ,
+    get_amxaddr(amx,params[4]) , params[7] );
 
   return 1;
 }
@@ -1753,7 +1728,7 @@ static cell AMX_NATIVE_CALL register_cvar(AMX *amx, cell *params) /* 3 param */
   {
   CPluginMngr::CPlugin *plugin = g_plugins.findPluginFast(amx);
   CCVar* cvar = new CCVar( temp , plugin->getName() , params[3] ,
-    amx_ctof(params[4])  );
+    *(REAL *)((void *)&params[4])  );
 
   if ( cvar == 0 )
     return 0;
@@ -1761,11 +1736,7 @@ static cell AMX_NATIVE_CALL register_cvar(AMX *amx, cell *params) /* 3 param */
   g_cvars.put( cvar );
 
   if ( CVAR_GET_POINTER(temp) == 0 )
-  {
+    CVAR_REGISTER( cvar->getCvar() );
-	  static cvar_t cvar_reg_helper;
-	  cvar_reg_helper = *(cvar->getCvar());
-	  CVAR_REGISTER( &cvar_reg_helper );
-  }
 
   CVAR_SET_STRING( temp ,get_amxstring(amx,params[2],1,i));
   return 1;
@@ -2040,10 +2011,10 @@ static cell AMX_NATIVE_CALL get_distance(AMX *amx, cell *params) /* 2 param */
 
 static cell AMX_NATIVE_CALL random_float(AMX *amx, cell *params) /* 2 param */
 {
-  float one = amx_ctof(params[1]);
+  float one = *(REAL *)((void *)&params[1]);
-  float two = amx_ctof(params[2]);
+  float two = *(REAL *)((void *)&params[2]);
   REAL fRnd = RANDOM_FLOAT(one,two);
-  return amx_ftoc(fRnd);
+  return *(cell*)((void *)&fRnd);
 }
 
 static cell AMX_NATIVE_CALL random_num(AMX *amx, cell *params) /* 2 param */
@@ -2282,7 +2253,7 @@ static cell AMX_NATIVE_CALL is_module_loaded(AMX *amx, cell *params)
 	int len;
 	char *name = get_amxstring(amx, params[1], 0, len);
 	int id = 0;
-	for (CList<CModule,const char *>::iterator iter = g_modules.begin(); iter; ++iter)
+	for (CList<CModule>::iterator iter = g_modules.begin(); iter; ++iter)
 	{
 		if (stricmp((*iter).getName(), name) == 0)
 			return id;
@@ -2315,7 +2286,7 @@ static cell AMX_NATIVE_CALL get_modulesnum(AMX *amx, cell *params)
 // native get_module(id, name[], nameLen, author[], authorLen, version[], versionLen, &status);
 static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params)
 {
-	CList<CModule,const char *>::iterator moduleIter;
+	CList<CModule>::iterator moduleIter;
 
 	// find the module
 	int i = params[1];
@@ -2329,16 +2300,16 @@ static cell AMX_NATIVE_CALL get_module(AMX *amx, cell *params)
 	if ((*moduleIter).isAmxx()) 	 
 	{ 	 
 		const amxx_module_info_s *info = (*moduleIter).getInfoNew(); 	 
-		set_amxstring(amx, params[2], info && info->name ? info->name : "unk", params[3]); 	 
+		set_amxstring(amx, params[2], info->name, params[3]); 	 
-		set_amxstring(amx, params[4], info && info->author ? info->author : "unk", params[5]); 	 
+		set_amxstring(amx, params[4], info->author, params[5]); 	 
-		set_amxstring(amx, params[6], info && info->version ? info->version : "unk", params[7]); 	 
+		set_amxstring(amx, params[6], info->version, params[7]); 	 
 	} 	 
 	else 	 
 	{
 		module_info_s *info = (*moduleIter).getInfo();
-		set_amxstring(amx, params[2], info && info->name ? info->name : "unk", params[3]);
+		set_amxstring(amx, params[2], info->name, params[3]);
-		set_amxstring(amx, params[4], info && info->author ? info->author : "unk", params[5]);
+		set_amxstring(amx, params[4], info->author, params[5]);
-		set_amxstring(amx, params[6], info && info->version ? info->version : "unk", params[7]);
+		set_amxstring(amx, params[6], info->version, params[7]);
 	}
 
 	// compatibility problem possible
@@ -2467,7 +2438,7 @@ static cell AMX_NATIVE_CALL callfunc_end(AMX *amx, cell *params)
 	// actual call
 	if ((err = amx_Execv(plugin->getAMX(), &retVal, func, curParam, gparams)) != AMX_ERR_NONE)
 	{
-		LogError(amx, err, "");
+		AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", err, curPlugin->getAMX()->curline, curPlugin->getName());
 		return 0;
 	}
 
@@ -2498,7 +2469,7 @@ static cell AMX_NATIVE_CALL callfunc_end(AMX *amx, cell *params)
 
 // native callfunc_push_int(value);
 // native callfunc_push_float(Float: value);
-static cell AMX_NATIVE_CALL callfunc_push_byval(AMX *amx, cell *params)
+static cell callfunc_push_byval(AMX *amx, cell *params)
 {
 	CPluginMngr::CPlugin *curPlugin = g_plugins.findPluginFast(amx);
 	if (!g_CallFunc_Plugin)
@@ -2524,7 +2495,7 @@ static cell AMX_NATIVE_CALL callfunc_push_byval(AMX *amx, cell *params)
 
 // native callfunc_push_intref(&value);
 // native callfunc_push_floatref(Float: &value);
-static cell AMX_NATIVE_CALL callfunc_push_byref(AMX *amx, cell *params)
+static cell callfunc_push_byref(AMX *amx, cell *params)
 {
 	CPluginMngr::CPlugin *curPlugin = g_plugins.findPluginFast(amx);
 	if (!g_CallFunc_Plugin)
@@ -2582,7 +2553,7 @@ static cell AMX_NATIVE_CALL callfunc_push_byref(AMX *amx, cell *params)
 }
 
 // native callfunc_push_str(value[]);
-static cell AMX_NATIVE_CALL callfunc_push_str(AMX *amx, cell *params)
+static cell callfunc_push_str(AMX *amx, cell *params)
 {
 	CPluginMngr::CPlugin *curPlugin = g_plugins.findPluginFast(amx);
 	if (!g_CallFunc_Plugin)
@@ -2643,83 +2614,34 @@ static cell AMX_NATIVE_CALL callfunc_push_str(AMX *amx, cell *params)
 }
 
 // get_langsnum();
-static cell AMX_NATIVE_CALL get_langsnum(AMX *amx, cell *params)
+static cell get_langsnum(AMX *amx, cell *params)
 {
 	return g_langMngr.GetLangsNum();
 }
 
 // get_lang(id, name[(at least 3)]);
-static cell AMX_NATIVE_CALL get_lang(AMX *amx, cell *params)
+static cell get_lang(AMX *amx, cell *params)
 {
 	set_amxstring(amx, params[2], g_langMngr.GetLangName(params[1]), 2);
 	return 0;
 }
 
 // register_dictionary(const filename[]);
-static cell AMX_NATIVE_CALL register_dictionary(AMX *amx, cell *params)
+static cell register_dictionary(AMX *amx, cell *params)
 {
 	int len;
 	int result = g_langMngr.MergeDefinitionFile(build_pathname("%s/lang/%s",
-		get_localinfo("amxx_datadir", "addons/amxmodx/data"), get_amxstring(amx, params[1], 1, len)));
+		get_localinfo("amxx_datadir", "addons/amxx/data"), get_amxstring(amx, params[1], 1, len)));
 	return result;
 }
 
-static cell AMX_NATIVE_CALL plugin_flags(AMX *amx, cell *params)
-{
-	AMX_HEADER *hdr;
-	hdr = (AMX_HEADER *)amx->base;
-	return hdr->flags;
-}
-
 // lang_exists(const name[]);
-static cell AMX_NATIVE_CALL lang_exists(AMX *amx, cell *params)
+static cell lang_exists(AMX *amx, cell *params)
 {
 	int len = 0;
 	return g_langMngr.LangExists(get_amxstring(amx, params[1], 1, len)) ? 1 : 0;
 }
 
-cell AMX_NATIVE_CALL require_module(AMX *amx, cell *params)
-{
-	int len = 0;
-	
-	String s;
-
-	s.assign(get_amxstring(amx, params[1], 0, len));
-
-	CurModuleList.push(s);
-
-	return 1;
-}
-
-static cell AMX_NATIVE_CALL lang_phrase(AMX *amx, cell *params)
-{
-	int len = 0;
-	int iLang = params[1];
-
-	const char *cpLangName=NULL;
-	// Handle player ids (1-32) and server language
-	if (iLang == LANG_SERVER) {	// LANG_SERVER
-		cpLangName = g_vault.get("server_language");
-	} else if (iLang >= 1 && iLang <= 32) {	// Direct Client Id
-		if ((int)CVAR_GET_FLOAT("amx_client_languages") == 0)
-		{
-			cpLangName = g_vault.get("server_language");
-		} else {
-			cpLangName = ENTITY_KEYVALUE(GET_PLAYER_POINTER_I(iLang)->pEdict, "lang");
-		}
-	}
-	if (!cpLangName || strlen(cpLangName) < 1)
-		cpLangName = "en";
-
-	const char *str = get_amxstring(amx, params[2], 0, len);
-
-	const char *dat = g_langMngr.GetDef(cpLangName, str);
-
-	set_amxstring(amx, params[3], dat?dat:"ML_LNOTFOUND", params[4]);
-
-	return 1;
-}
-
 AMX_NATIVE_INFO amxmod_Natives[] = {
   { "client_cmd",       client_cmd },
   { "client_print",     client_print },
@@ -2770,7 +2692,6 @@ AMX_NATIVE_INFO amxmod_Natives[] = {
   { "get_user_ip",      get_user_ip },
   { "get_user_menu",    get_user_menu},
   { "get_user_msgid",   get_user_msgid},
-  { "get_user_msgname",	get_user_msgname},
   { "get_user_name",    get_user_name },
   { "get_user_origin",  get_user_origin},
   { "get_user_ping",    get_user_ping },
@@ -2786,7 +2707,6 @@ AMX_NATIVE_INFO amxmod_Natives[] = {
   { "get_xvar_num",     get_xvar_num },
   { "is_dedicated_server",is_dedicated_server },
   { "is_linux_server",    is_linux_server },
-  { "is_amd64_server",	is_amd64_server },
   { "is_jit_enabled",		is_jit_enabled },
   { "is_user_authorized", is_user_authorized },
   { "is_map_valid",     is_map_valid },
@@ -2821,7 +2741,6 @@ AMX_NATIVE_INFO amxmod_Natives[] = {
   { "register_logevent",register_logevent},
   { "register_menucmd", register_menucmd },
   { "register_menuid",  register_menuid },
-  { "require_module",	require_module },
   { "register_plugin",  register_plugin },
   { "register_srvcmd",  register_srvcmd },
   { "remove_cvar_flags",    remove_cvar_flags },
@@ -2879,7 +2798,5 @@ AMX_NATIVE_INFO amxmod_Natives[] = {
   { "lang_exists",			lang_exists },
   { "md5",				amx_md5 },
   { "md5_file",			amx_md5_file },
-  { "plugin_flags",		plugin_flags},
-  { "lang_phrase",		lang_phrase},
   { NULL, NULL }
 };

amxmodx/amxmodx.h

@@ -140,7 +140,7 @@ extern CList<CCVar> g_cvars;
 extern CList<ForceObject> g_forcemodels;
 extern CList<ForceObject> g_forcesounds;
 extern CList<ForceObject> g_forcegeneric;
-extern CList<CModule,const char *> g_modules;
+extern CList<CModule> g_modules;
 extern CList<CPlayer*> g_auth;
 extern EventsMngr g_events;
 extern Grenades g_grenades;
@@ -157,6 +157,7 @@ extern XVars g_xvars;
 extern bool g_bmod_cstrike;
 extern bool g_bmod_dod;
 extern bool g_dontprecache;
+extern bool g_initialized;
 extern int g_srvindex;
 extern cvar_t* amxmodx_version;
 extern cvar_t* hostname;
@@ -242,7 +243,7 @@ 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);
@@ -254,8 +255,6 @@ void* alloc_amxmemory(void**, int size);
 void free_amxmemory(void **ptr);
 // get_localinfo
 const char* get_localinfo( const char* name , const char* def );
-cell AMX_NATIVE_CALL require_module(AMX *amx, cell *params);
-void LogError(AMX *amx, int err, const char *fmt, ...);
 
 enum ModuleCallReason
 {
@@ -268,7 +267,6 @@ enum ModuleCallReason
 extern ModuleCallReason g_ModuleCallReason;		// modules.cpp
 extern CModule *g_CurrentlyCalledModule;		// modules.cpp
 extern const char *g_LastRequestedFunc;			// modules.cpp
-extern CQueue<String> CurModuleList;
 
 void *Module_ReqFnptr(const char *funcName);	// modules.cpp
 

amxmodx/amxxfile.cpp

@@ -270,7 +270,6 @@ CAmxxReader::Error CAmxxReader::GetSection(void *buffer)
 //	AMXXLOG_Log("|||| First Bytes: %d %d %d %d", tempBuffer[0], tempBuffer[1], tempBuffer[2], tempBuffer[3]);
 	int result = uncompress((Bytef *)buffer, &destLen,
 			(Bytef *)tempBuffer, m_SectionLength);
-	delete [] tempBuffer;
 //	AMXXLOG_Log("|||| Result: %d, m_SectionLength=%d, destLen=%d", result, m_SectionLength, destLen);
 	if (result != Z_OK)
 	{

amxmodx/amxxlog.cpp

@@ -40,10 +40,6 @@
 #endif
 #include "amxmodx.h"
 
-#ifndef __linux__
-#define	vsnprintf	_vsnprintf
-#endif
-
 CLog::CLog()
 {
 	m_LogType = 0;
@@ -64,7 +60,7 @@ void CLog::CloseFile()
 		if (fp)
 		{
 			fclose(fp);
-			fp = fopen(m_LogFile.c_str(), "a+");
+			fopen(m_LogFile.c_str(), "a+");
 
 			// get time
 			time_t td;
@@ -106,11 +102,8 @@ void CLog::CreateNewFile()
 		ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n");
 		SET_LOCALINFO("amxx_logging", "0");
 	}
-	else
+	fprintf(fp, "AMX Mod X log file started (file \"%s/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);
-		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)
@@ -165,7 +158,7 @@ void CLog::Log(const char *fmt, ...)
 
 		va_list arglst;
 		va_start(arglst, fmt);
-		vsnprintf(msg, 3071, fmt, arglst);
+		vsprintf(msg, fmt, arglst);
 		va_end(arglst);
 
 		FILE *pF;
@@ -188,18 +181,9 @@ void CLog::Log(const char *fmt, ...)
 		{
 			pF = fopen(build_pathname("%s/L%02d%02d.log", g_log_dir.c_str(), curTime->tm_mon + 1, curTime->tm_mday), "a+");
 		}
-		if (pF)
+		fprintf(pF, "L %s: %s\n", date, msg);
-		{
-			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", m_LogFile.c_str());
-			m_LogType = 0;
-			return;
-		}
 
+		fclose(pF);
 		// print on server console
 		print_srvconsole("L %s: %s\n", date, msg);
 	}
@@ -210,7 +194,7 @@ void CLog::Log(const char *fmt, ...)
 		char msg[3072];
 		va_list arglst;
 		va_start(arglst, fmt);
-		vsnprintf(msg, 3071, fmt, arglst);
+		vsprintf(msg, fmt, arglst);
 		va_end(arglst);
 		ALERT(at_logged, "%s\n", msg);
 	}

amxmodx/fakemeta.cpp

@@ -320,7 +320,7 @@
 			prev_mres = mres; \
 			if (mres == MRES_UNSET) \
 				AMXXLOG_Log("[AMXX] Module \"%s\" (\"%s\") has not set meta result in \"%s\"", \
-				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnName); \
+				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnArgs); \
 		} \
 	} \
 	/* Set meta result to the highest value */ \
@@ -353,7 +353,7 @@
 			prev_mres = mres; \
 			if (mres == MRES_UNSET) \
 				AMXXLOG_Log("[AMXX] Module \"%s\" (\"%s\") has not set meta result in \"%s\"", \
-				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnName); \
+				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnArgs); \
 		} \
 	} \
 	/* Set meta result to the highest value */ \
@@ -379,7 +379,7 @@
 			prev_mres = mres; \
 			if (mres == MRES_UNSET) \
 				AMXXLOG_Log("[AMXX] Module \"%s\" (\"%s\") has not set meta result in \"%s\"", \
-				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnName); \
+				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnArgs); \
 		} \
 	} \
 	/* Set meta result to the highest value */ \
@@ -412,10 +412,7 @@
 			prev_mres = mres; \
 			if (mres == MRES_UNSET) \
 				AMXXLOG_Log("[AMXX] Module \"%s\" (\"%s\") has not set meta result in \"%s\"", \
-				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnName); \
+				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnArgs); \
-			if (mres == MRES_SUPERCEDE) \
-				AMXXLOG_Log("[AMXX] Module \"%s\" (\"%s\") has set meta result in \"%s\" to supercede", \
-				(*iter).GetInfo()->name, (*iter).GetPath(), #pfnName); \
 		} \
 	} \
 	/* Set meta result to the highest value */ \
@@ -2344,14 +2341,6 @@ CFakeMeta::CFakeMetaPlugin::~CFakeMetaPlugin()
 	}
 }
 
-// ghost_of_evilspy's "could not find memloc for cvar" fix
-void FakeMeta_New_CVarRegister(cvar_t *pCVar)
-{
-	static cvar_t tmpvar;
-	tmpvar = *pCVar;
-	CVAR_REGISTER(&tmpvar);
-}
-
 int CFakeMeta::CFakeMetaPlugin::Query(mutil_funcs_t *pMetaUtilFuncs)
 {
 	// Load the library
@@ -2398,13 +2387,7 @@ int CFakeMeta::CFakeMetaPlugin::Query(mutil_funcs_t *pMetaUtilFuncs)
 		m_Status = PL_BADFILE;
 		return 0;
 	}
-	
+	giveEngFuncsFn(&g_engfuncs, gpGlobals);
-	// ghost_of_evilspy's "Could not find memloc for cvar" fix
-	static enginefuncs_t fakemeta_engfuncs;
-	memcpy(&fakemeta_engfuncs, &g_engfuncs, sizeof(enginefuncs_t));
-	// Override cvar register to our own function
-	fakemeta_engfuncs.pfnCVarRegister = FakeMeta_New_CVarRegister;
-	giveEngFuncsFn(&fakemeta_engfuncs, gpGlobals);
 
 	if (queryFn(META_INTERFACE_VERSION, &m_Info, pMetaUtilFuncs) != 1)
 	{
@@ -2717,7 +2700,7 @@ int CFakeMeta::GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable, int *int
 		*interfaceVersion =	NEW_DLL_FUNCTIONS_VERSION;
 		return(FALSE);
 	}
-	memcpy( pNewFunctionTable, &g_NewDllFunctionTable, sizeof( NEW_DLL_FUNCTIONS ) );
+	memcpy( pNewFunctionTable, &g_NewDllFunctionTable, sizeof( DLL_FUNCTIONS ) );
 
 	// Make sure there is a core plugin
 	AddCorePlugin();
@@ -2752,7 +2735,7 @@ int CFakeMeta::GetNewDLLFunctions_Post(NEW_DLL_FUNCTIONS *pNewFunctionTable, int
 		*interfaceVersion =	NEW_DLL_FUNCTIONS_VERSION;
 		return(FALSE);
 	}
-	memcpy( pNewFunctionTable, &g_NewDllFunctionTable_Post, sizeof( NEW_DLL_FUNCTIONS ) );
+	memcpy( pNewFunctionTable, &g_NewDllFunctionTable_Post, sizeof( DLL_FUNCTIONS ) );
 
 	// Make sure there is a core plugin
 	AddCorePlugin();

amxmodx/file.cpp

@@ -57,23 +57,6 @@
 
 CVector<FILE *> FileList;
 
-class AutoFilePtr
-{
-	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)
 {
 #ifdef __GNUC__
@@ -245,44 +228,41 @@ static cell AMX_NATIVE_CALL file_exists(AMX *amx, cell *params) /* 1 param */
 
 static cell AMX_NATIVE_CALL file_size(AMX *amx, cell *params) /* 1 param */
 {
-	int iLen;
+  int iLen;
-	char* sFile = get_amxstring(amx,params[1],0,iLen);
+  char* sFile = get_amxstring(amx,params[1],0,iLen);
-	AutoFilePtr fp(fopen(build_pathname("%s",sFile),"r"));
+  FILE* fp = fopen(build_pathname("%s",sFile),"r");
-	if ( fp != NULL)
+  if ( fp != NULL) {
-	{
+  if ( params[0] < 2 || params[2] == 0 ){
-		if ( params[0] < 2 || params[2] == 0 )
+    fseek(fp,0,SEEK_END);
-		{
+    int size = ftell(fp);
-			fseek(fp,0,SEEK_END);
+    fclose(fp);
-			int size = ftell(fp);
+    return size;
-			return size;
+  }
-		}
+  else if ( params[2] == 1 ){
-		else if ( params[2] == 1 )
+    int a = 0,lines = 0;
-		{
+    while( a != EOF ){
-			int a = 0,lines = 0;
+      ++lines;
-			while( a != EOF )
+      while ( (a = fgetc(fp)) != '\n'  && a != EOF )
-			{
+        ;
-				++lines;
+    }
-				while ( (a = fgetc(fp)) != '\n'  && a != EOF )
+    //int a, b = '\n';
-					;
+    //while( (a = fgetc(fp)) != EOF ){
-			}
+    //  if ( a == '\n')
-			//int a, b = '\n';
+    //    ++lines;
-			//while( (a = fgetc(fp)) != EOF ){
+    //  b = a;
-			//  if ( a == '\n')
+    //}
-			//    ++lines;
+    //if ( b != '\n' )
-			//  b = a;
+    //  ++lines;
-			//}
+    return lines;
-			//if ( b != '\n' )
+  }
-			//  ++lines;
+  else if ( params[2] == 2 ){
-			return lines;
+    fseek(fp,-1,SEEK_END);
-		}
+    if ( fgetc(fp) == '\n' )
-		else if ( params[2] == 2 ){
+      return 1;
-			fseek(fp,-1,SEEK_END);
+    return 0;
-			if ( fgetc(fp) == '\n' )
+  }
-				return 1;
+  }
-			return 0;
+  return -1;
-		}
-	}
-	return -1;
 }
 
 //ported from Sanji's file access module by BAILOPAN
@@ -474,7 +454,7 @@ 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"));
+	FILE *fp = fopen(file, "rb");
 	if (fp) {
 		fseek(fp, 0, SEEK_END);
 		size = ftell(fp);

amxmodx/float.cpp

@@ -37,19 +37,6 @@
 
 #define PI  3.1415926535897932384626433832795
 
-static REAL FromRadians(REAL angle, int radix)
-{
-	switch (radix)
-	{
-		case 1:         /* degrees, sexagesimal system (technically: degrees/minutes/seconds) */
-			return (REAL)(angle / PI * 180.0);
-		case 2:         /* grades, centesimal system */
-			return (REAL)(angle / PI * 200.0);
-		default:        /* assume already radian */
-			return angle;
-	} /* switch */
-}
-
 #if defined __BORLANDC__ || defined __WATCOMC__
   #pragma argsused
 #endif
@@ -370,7 +357,6 @@ static cell AMX_NATIVE_CALL n_floatatan(AMX *amx, cell *params)
 	REAL fA = amx_ctof(params[1]);
 	fA = ToRadians(fA, params[2]);
 	fA = atan(fA);
-	fA = FromRadians(fA, params[2]);
 	return amx_ftoc(fA);
 }
 
@@ -385,8 +371,8 @@ static cell AMX_NATIVE_CALL n_floatacos(AMX *amx, cell *params)
 	 * params[2] = radix
 	 */
 	REAL fA = amx_ctof(params[1]);
+	fA = ToRadians(fA, params[2]);
 	fA = acos(fA);
-	fA = FromRadians(fA, params[2]);
 	return amx_ftoc(fA);
 }
 
@@ -401,8 +387,8 @@ static cell AMX_NATIVE_CALL n_floatasin(AMX *amx, cell *params)
 	 * params[2] = radix
 	 */
 	REAL fA = amx_ctof(params[1]);
+	fA = ToRadians(fA, params[2]);
 	fA = asin(fA);
-	fA = FromRadians(fA, params[2]);
 	return amx_ftoc(fA);
 }
 
@@ -421,7 +407,6 @@ static cell AMX_NATIVE_CALL n_floatatan2(AMX *amx, cell *params)
 	REAL fB = amx_ctof(params[2]);
 	REAL fC;
 	fC = atan2(fA, fB);
-	fC = FromRadians(fC, params[3]);
 	return amx_ftoc(fC);
 }
 

amxmodx/meta_api.cpp

@@ -57,7 +57,6 @@ void (*function)(void*);
 void (*endfunction)(void*);
 
 CLog g_log;
-CQueue<String> CurModuleList;
 CForwardMngr  g_forwards;
 CList<CPlayer*> g_auth;
 CList<CCVar> g_cvars;
@@ -82,12 +81,12 @@ bool g_bmod_dod;
 bool g_dontprecache;
 bool g_forcedmodules;
 bool g_forcedsounds;
+bool g_initialized;
 fakecmd_t g_fakecmd;
 float g_game_restarting;
 float g_game_timeleft;
 float g_task_time;
 float g_auth_time;
-bool g_initialized = false;
 
 #ifdef MEMORY_TEST
 float g_next_memreport_time;
@@ -106,7 +105,6 @@ int g_srvindex;
 
 cvar_t init_amxmodx_version = {"amxmodx_version", "", FCVAR_SERVER | FCVAR_SPONLY};
 cvar_t init_amxmodx_modules = {"amxmodx_modules", "", FCVAR_SPONLY};
-cvar_t init_amxmodx_debug = {"amx_debug", "1", FCVAR_SPONLY};
 cvar_t* amxmodx_version = NULL;
 cvar_t* amxmodx_modules = NULL;
 cvar_t* hostname = NULL;
@@ -130,8 +128,8 @@ int FF_ChangeLevel = -1;
 // fake metamod api
 CFakeMeta g_FakeMeta;
 
-// Precache	stuff from force consistency calls
+// Precache stuff from force consistency calls
-// or check	for	pointed	files won't	be done
+// or check for pointed	files won't be done
 int	C_PrecacheModel(char *s) {
   if ( !g_forcedmodules	){
 	g_forcedmodules	= true;
@@ -159,8 +157,8 @@ int	C_PrecacheSound(char *s) {
   RETURN_META_VALUE(MRES_IGNORED, 0);
 }
 
-// On InconsistentFile call	forward	function from plugins
+// On InconsistentFile call forward function from plugins
-int	C_InconsistentFile( const	edict_t	*player, const char	*filename, char	*disconnect_message	)
+int	C_InconsistentFile( const edict_t *player, const char *filename, char *disconnect_message )
 {
 	if (FF_InconsistentFile < 0)
 		RETURN_META_VALUE(MRES_IGNORED,	FALSE);
@@ -192,18 +190,19 @@ const char*	get_localinfo( const char* name	, const	char* def )
 {
   const	char* b	= LOCALINFO( (char*)name );
   if ( b ==	0 || *b	== 0 )
-	SET_LOCALINFO((char*)name,(char*)(b	= def) );
+	SET_LOCALINFO((char*)name,(char*)(b = def) );
   return b;
 }
 
-// Very	first point	at map load
+// Very	first point at map load
-// Load	AMX	modules	for	new	native functions
+// Load	AMX modules for	new native functions
 // Initialize AMX stuff	and	load it's plugins from plugins.ini list
 // Call	precache forward function from plugins
 int	C_Spawn( edict_t *pent ) {
-  if (g_initialized)
+
-	  RETURN_META_VALUE(MRES_IGNORED, 0);
+  if ( g_initialized ) RETURN_META_VALUE(MRES_IGNORED, 0);
-  g_initialized = true;
+
+  g_initialized	= true;
   g_forcedmodules =	false;
   g_forcedsounds = false;
 
@@ -212,35 +211,34 @@ int	C_Spawn( edict_t *pent ) {
   hostname = CVAR_GET_POINTER("hostname");
   mp_timelimit = CVAR_GET_POINTER("mp_timelimit");
 
-  g_forwards.clear();
 
   g_log.MapChange();
 
-  // ######	Initialize task	manager
+  // ###### Initialize task manager
-  g_tasksMngr.registerTimers( &gpGlobals->time,	&mp_timelimit->value,  &g_game_timeleft		);
+  g_tasksMngr.registerTimers( &gpGlobals->time,	&mp_timelimit->value,  &g_game_timeleft );
 
   //  ###### Load lang
-  g_langMngr.LoadCache(build_pathname("%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+  g_langMngr.LoadCache(build_pathname("%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxx/data")));
-  g_langMngr.Load(build_pathname("%s/languages.dat", get_localinfo("amxmodx_datadir", "addons/amxmodx/data")));
+  g_langMngr.Load(build_pathname("%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxx/data")));
-  // ######	Initialize commands	prefixes
+  // ###### Initialize commands prefixes
   g_commands.registerPrefix( "amx" );
-  g_commands.registerPrefix( "amxx"	);
+  g_commands.registerPrefix( "amxx" );
   g_commands.registerPrefix( "say" );
   g_commands.registerPrefix( "admin_" );
   g_commands.registerPrefix( "sm_" );
   g_commands.registerPrefix( "cm_" );
 
   // make sure localinfos are set
-  get_localinfo("amxx_basedir",	"addons/amxmodx");
+  get_localinfo("amxx_basedir",	"addons/amxx");
-  get_localinfo("amxx_pluginsdir", "addons/amxmodx/plugins");
+  get_localinfo("amxx_pluginsdir", "addons/amxx/plugins");
-  get_localinfo("amxx_modulesdir", "addons/amxmodx/modules");
+  get_localinfo("amxx_modulesdir", "addons/amxx/modules");
-  get_localinfo("amxx_configsdir", "addons/amxmodx/configs");
+  get_localinfo("amxx_configsdir", "addons/amxx/configs");
-  get_localinfo("amxx_customdir", "addons/amxmodx/custom");
+  get_localinfo("amxx_customdir", "addons/amxx/custom");
 
   //  ###### Load modules
-  loadModules(get_localinfo("amxx_modules",	"addons/amxmodx/configs/modules.ini"));
+  loadModules(get_localinfo("amxx_modules", "addons/amxx/configs/modules.ini"));
   attachModules();
-  int loaded = countModules(CountModules_Running);	// Call	after attachModules	so all modules don't have pending stat
+  int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat
   // Set some info about amx version and modules
   CVAR_SET_STRING(init_amxmodx_version.name, AMX_VERSION);
   char buffer[32];
@@ -248,7 +246,7 @@ int	C_Spawn( edict_t *pent ) {
   CVAR_SET_STRING(init_amxmodx_modules.name, buffer);
 
   //  ######  Load Vault
-  g_vault.setSource( build_pathname("%s", get_localinfo("amxx_vault", "addons/amxmodx/configs/vault.ini"))	);
+  g_vault.setSource( build_pathname("%s", get_localinfo("amxx_vault", "addons/amxx/configs/vault.ini"))	);
   g_vault.loadVault( );
   if (strlen(g_vault.get("server_language")) < 1)
   {
@@ -270,18 +268,18 @@ int	C_Spawn( edict_t *pent ) {
   memset(g_players[0].flags,-1,sizeof(g_players[0].flags));
 
   //  ###### Load AMX scripts
-  g_plugins.loadPluginsFromFile( get_localinfo("amxx_plugins", "addons/amxmodx/configs/plugins.ini") );
+  g_plugins.loadPluginsFromFile( get_localinfo("amxx_plugins", "addons/amxx/configs/plugins.ini") );
 
   // Register forwards
   FF_PluginInit = registerForward("plugin_init", ET_IGNORE, FP_DONE);
-  FF_ClientCommand = registerForward("client_command", ET_STOP, FP_CELL, FP_DONE);
+  FF_ClientCommand = registerForward("client_command", ET_IGNORE, FP_CELL, FP_DONE);
   FF_ClientConnect = registerForward("client_connect", ET_IGNORE, FP_CELL, FP_DONE);
   FF_ClientDisconnect = registerForward("client_disconnect", ET_IGNORE, FP_CELL, FP_DONE);
   FF_ClientInfoChanged = registerForward("client_infochanged", ET_IGNORE, FP_CELL, FP_DONE);
   FF_ClientPutInServer = registerForward("client_putinserver", ET_IGNORE, FP_CELL, FP_DONE);
   FF_PluginCfg = registerForward("plugin_cfg", ET_IGNORE, FP_DONE);
   FF_PluginPrecache = registerForward("plugin_precache", ET_IGNORE, FP_DONE);
-  FF_PluginLog = registerForward("plugin_log", ET_STOP, FP_DONE);
+  FF_PluginLog = registerForward("plugin_log", ET_IGNORE, FP_DONE);
   FF_PluginEnd = registerForward("plugin_end", ET_IGNORE, FP_DONE);
   FF_InconsistentFile = registerForward("inconsistent_file", ET_STOP, FP_CELL, FP_STRING, FP_STRINGEX, FP_DONE);
   FF_ClientAuthorized = registerForward("client_authorized", ET_IGNORE, FP_CELL, FP_DONE);
@@ -294,7 +292,7 @@ int	C_Spawn( edict_t *pent ) {
   executeForwards(FF_PluginPrecache);
   g_dontprecache = true;
 
-  for(CList<ForceObject>::iterator a =	g_forcegeneric.begin();	a ;	++a){
+  for(CList<ForceObject>::iterator a =	g_forcegeneric.begin();	a ; ++a){
 	  PRECACHE_GENERIC((char*)(*a).getFilename());
 	  ENGINE_FORCE_UNMODIFIED((*a).getForceType(),
 	  (*a).getMin(),(*a).getMax(),(*a).getFilename());
@@ -360,24 +358,24 @@ int	C_RegUserMsg_Post(const char *pszName, int iSize)
 }
 
 /*
-Much more later	after precache.	All	is precached, server
+Much more later	after precache.	All is precached, server
 will be	flaged as ready	to use so call
 plugin_init	forward	function from plugins
 */
-void C_ServerActivate( edict_t *pEdictList, int edictCount, int clientMax	){
+void C_ServerActivate( edict_t *pEdictList, int edictCount, int clientMax ){
 
   int id;
-  for (int i = 0; g_user_msg[ i	].name;	++i	)
+  for (int i = 0; g_user_msg[ i	].name;	++i )
   {
 	if ( (*g_user_msg[ i ].id == 0)	&&
-	  (id =	GET_USER_MSG_ID(PLID, g_user_msg[ i	].name , NULL ))!=0)
+	  (id =	GET_USER_MSG_ID(PLID, g_user_msg[ i ].name , NULL ))!=0)
 	{
 	  *g_user_msg[ i ].id =	id;
 
-	  if ( !g_user_msg[	i ].cstrike	|| g_bmod_cstrike  )
+	  if ( !g_user_msg[ i ].cstrike || g_bmod_cstrike )
 	  {
 		if ( g_user_msg[ i ].endmsg	)
-		  modMsgsEnd[ id  ]	= g_user_msg[ i	].func;
+		  modMsgsEnd[ id  ] = g_user_msg[ i	].func;
 		else
 		  modMsgs[ id  ] = g_user_msg[ i ].func;
 	  }
@@ -393,17 +391,17 @@ void C_ServerActivate_Post( edict_t *pEdictList, int edictCount, int clientMax )
 
   for(int i	= 1; i <= gpGlobals->maxClients; ++i) {
 	CPlayer	*pPlayer = GET_PLAYER_POINTER_I(i);
-	pPlayer->Init( pEdictList +	i ,	i );
+	pPlayer->Init( pEdictList + i , i );
   }
 
   executeForwards(FF_PluginInit);
   executeForwards(FF_PluginCfg);
 
   //  ###### Save lang
-  g_langMngr.Save(build_pathname("%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+  g_langMngr.Save(build_pathname("%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxx/data")));
-  g_langMngr.SaveCache(build_pathname("%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+  g_langMngr.SaveCache(build_pathname("%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxx/data")));
 
-// Correct time in Counter-Strike	and	other mods (except DOD)
+// Correct time in Counter-Strike and other mods (except DOD)
   if ( !g_bmod_dod)	 g_game_timeleft = 0;
 
   g_task_time =	gpGlobals->time;
@@ -418,8 +416,8 @@ void C_ServerActivate_Post( edict_t *pEdictList, int edictCount, int clientMax )
   RETURN_META(MRES_IGNORED);
 }
 
-// Call	plugin_end forward function	from plugins.
+// Call	plugin_end forward function from plugins.
-void C_ServerDeactivate()	{
+void C_ServerDeactivate() {
 
   for(int i	= 1; i <= gpGlobals->maxClients; ++i){
 	CPlayer	*pPlayer = GET_PLAYER_POINTER_I(i);
@@ -442,30 +440,27 @@ void C_ServerDeactivate()	{
 // However leave AMX modules which are loaded only once
 void C_ServerDeactivate_Post() {
 
+  g_initialized	= false;
+
   detachReloadModules();
+
   g_auth.clear();
+  g_forwards.clear();
   g_commands.clear();
   g_forcemodels.clear();
   g_forcesounds.clear();
   g_forcegeneric.clear();
   g_grenades.clear();
   g_tasksMngr.clear();
-  g_forwards.clear();
   g_logevents.clearLogEvents();
   g_events.clearEvents();
   g_menucmds.clear();
   g_vault.clear();
   g_xvars.clear();
   g_plugins.clear();
-  g_langMngr.Save(build_pathname("%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+  g_langMngr.Save(build_pathname("%s/languages.dat", get_localinfo("amxx_datadir", "addons/amxx/data")));
-  g_langMngr.SaveCache(build_pathname("%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxmodx/data")));
+  g_langMngr.SaveCache(build_pathname("%s/dictionary.cache", get_localinfo("amxx_datadir", "addons/amxx/data")));
   g_langMngr.Clear();
-  //clear module name cache
-  while (!CurModuleList.empty())
-  {
-	  CurModuleList.pop();
-  }
-
   // last memreport
 #ifdef MEMORY_TEST
 	if (g_memreport_enabled)
@@ -478,14 +473,14 @@ void C_ServerDeactivate_Post() {
 			tm *curTime = localtime(&td);
 			int i = 0;
 #ifdef __linux__
-			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxmodx")), 0700);
+			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxx")), 0700);
 #else
-			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxmodx")));
+			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxx")));
 #endif
 			while (true)
 			{
 				char buffer[256];
-				sprintf(buffer, "%s/memreports/D%02d%02d%03d", get_localinfo("amxx_basedir", "addons/amxmodx"), curTime->tm_mon + 1, curTime->tm_mday, i);
+				sprintf(buffer, "%s/memreports/D%02d%02d%03d", get_localinfo("amxx_basedir", "addons/amxx"), curTime->tm_mon + 1, curTime->tm_mday, i);
 #ifdef __linux__
 				mkdir(build_pathname("%s", g_log_dir.c_str()), 0700);
 				if (mkdir(build_pathname(buffer), 0700) < 0)
@@ -519,7 +514,6 @@ void C_ServerDeactivate_Post() {
 	}
 #endif // MEMORY_TEST
 
-  g_initialized = false;
   RETURN_META(MRES_IGNORED);
 }
 
@@ -534,7 +528,7 @@ BOOL C_ClientConnect_Post( edict_t *pEntity, const char *pszName,	const char *ps
 	if ( a )
 	{
 	  CPlayer**	aa = new CPlayer*(pPlayer);
-	  if ( aa )	g_auth.put(	aa );
+	  if ( aa )	g_auth.put( aa );
 	}
 	else
 	{
@@ -638,7 +632,8 @@ void C_ClientCommand(	edict_t	*pEntity ) {
 	  {
 
 		if ((err =amx_Exec((*aa).getPlugin()->getAMX(),	&ret , (*aa).getFunction()	 , 3, pPlayer->index, (*aa).getFlags(),(*aa).getId()  )) !=	AMX_ERR_NONE)
-			LogError((*aa).getPlugin()->getAMX(), err, "");
+		  AMXXLOG_Log("[AMXX] Run time error %d on line	%ld (plugin \"%s\")",
+		  err,(*aa).getPlugin()->getAMX()->curline,(*aa).getPlugin()->getName());
 
 		if ( ret & 2 )	result = MRES_SUPERCEDE;
 		if ( ret & 1 )	RETURN_META(MRES_SUPERCEDE);
@@ -677,7 +672,8 @@ void C_ClientCommand(	edict_t	*pEntity ) {
 		  {
 
 			if ( ( err = amx_Exec((*a).getPlugin()->getAMX(), &ret ,(*a).getFunction() , 2,	pPlayer->index,pressed_key)) !=	AMX_ERR_NONE)
-				LogError((*a).getPlugin()->getAMX(), err, "");
+			  AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
+			  err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName());
 
 			if ( ret & 2 ) result =	MRES_SUPERCEDE;
 			if ( ret & 1 ) RETURN_META(MRES_SUPERCEDE);
@@ -742,14 +738,14 @@ void C_StartFrame_Post( void ) {
 			tm *curTime = localtime(&td);
 			int i = 0;
 #ifdef __linux__
-			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxmodx")), 0700);
+			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxx")), 0700);
 #else
-			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxmodx")));
+			mkdir(build_pathname("%s/memreports", get_localinfo("amxx_basedir", "addons/amxx")));
 #endif
 			while (true)
 			{
 				char buffer[256];
-				sprintf(buffer, "%s/memreports/D%02d%02d%03d", get_localinfo("amxx_basedir", "addons/amxmodx"), curTime->tm_mon + 1, curTime->tm_mday, i);
+				sprintf(buffer, "%s/memreports/D%02d%02d%03d", get_localinfo("amxx_basedir", "addons/amxx"), curTime->tm_mon + 1, curTime->tm_mday, i);
 #ifdef __linux__
 				mkdir(build_pathname("%s", g_log_dir.c_str()), 0700);
 				if (mkdir(build_pathname(buffer), 0700) < 0)
@@ -882,7 +878,7 @@ void C_MessageEnd_Post(void) {
 	{
 
 	  if ((err = amx_Exec((*a).getPlugin()->getAMX(), NULL ,  (*a).getFunction() , 1, mPlayerIndex	/*g_events.getArgInteger(0)*/ )) !=	AMX_ERR_NONE)
-		LogError((*a).getPlugin()->getAMX(), err, "");
+		AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName());
 
 
 	  ++a;
@@ -985,9 +981,7 @@ void C_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...)
 		g_logevents.parseLogString(	);
 		if (g_logevents.logEventsExist())
 			g_logevents.executeLogEvents( );
-		cell retVal = executeForwards(FF_PluginLog);
+		executeForwards(FF_PluginLog);
-		if (retVal)
-			RETURN_META(MRES_HANDLED);
 	}
 
 	RETURN_META(MRES_IGNORED);
@@ -1029,14 +1023,13 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
   gMetaFunctionTable.pfnGetEntityAPI2_Post = GetEntityAPI2_Post;
   gMetaFunctionTable.pfnGetEngineFunctions = GetEngineFunctions;
   gMetaFunctionTable.pfnGetEngineFunctions_Post	= GetEngineFunctions_Post;
-  gMetaFunctionTable.pfnGetNewDLLFunctions = GetNewDLLFunctions;
+  //gMetaFunctionTable.pfnGetNewDLLFunctions = GetNewDLLFunctions;
-  gMetaFunctionTable.pfnGetNewDLLFunctions_Post = GetNewDLLFunctions_Post;
+  //gMetaFunctionTable.pfnGetNewDLLFunctions_Post = GetNewDLLFunctions_Post;
 
   memcpy(pFunctionTable, &gMetaFunctionTable, sizeof(META_FUNCTIONS));
   gpGamedllFuncs=pGamedllFuncs;
   CVAR_REGISTER(&init_amxmodx_version);
   CVAR_REGISTER(&init_amxmodx_modules);
-  CVAR_REGISTER(&init_amxmodx_debug);
   amxmodx_version =	CVAR_GET_POINTER(init_amxmodx_version.name);
   REG_SVR_COMMAND("amxx",amx_command);
 
@@ -1050,14 +1043,14 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
   g_mod_name.assign(a);
 
   // ###### Print short GPL
-  print_srvconsole(	"\n   AMX Mod X version %s Copyright (c) 2004 AMX Mod X Development Team \n"
+  print_srvconsole(	"\n  AMX Mod X version %s Copyright (c) 2004 AMX Mod X Development Team \n"
-					"   AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMX_VERSION);
+					"  AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMX_VERSION);
-  print_srvconsole(	"   This is free software and you are welcome to redistribute it under \n"
+  print_srvconsole(	"  This is free software and you are welcome to redistribute it under \n"
-					"   certain conditions; type 'amxx gpl' for details.\n  \n");
+					"  certain conditions; type 'amxx gpl' for details.\n  \n");
 
   // ######	Load custom	path configuration
   Vault	amx_config;
-  amx_config.setSource(build_pathname("%s",	get_localinfo("amxx_cfg", "addons/amxmodx/configs/core.ini")));
+  amx_config.setSource(build_pathname("%s",	get_localinfo("amxx_cfg", "addons/amxx/configs/core.ini")));
 
   if ( amx_config.loadVault() ){
 	Vault::iterator	a =	amx_config.begin();
@@ -1069,11 +1062,11 @@ C_DLLEXPORT	int	Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m
   }
 
   // ######	Initialize logging here
-  g_log_dir.assign(get_localinfo("amxx_logs", "addons/amxmodx/logs"));
+  g_log_dir.assign(get_localinfo("amxx_logs", "addons/amxx/logs"));
 
   //  ###### Now attach	metamod	modules
   // This will also call modules Meta_Query and Meta_Attach functions
-  attachMetaModModules(now,	get_localinfo("amxx_modules", "addons/amxmodx/configs/modules.ini") );
+  attachMetaModModules(now,	get_localinfo("amxx_modules", "addons/amxx/configs/modules.ini") );
 
   return(TRUE);
 }
@@ -1234,6 +1227,15 @@ C_DLLEXPORT	int	GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
   meta_engfuncs.pfnChangeLevel = C_ChangeLevel;
 
   return g_FakeMeta.GetEngineFunctions(pengfuncsFromEngine, interfaceVersion, &meta_engfuncs);
+  /*
+  if(*interfaceVersion!=ENGINE_INTERFACE_VERSION) {
+	LOG_ERROR(PLID,	"GetEngineFunctions	version	mismatch; requested=%d ours=%d", *interfaceVersion,	ENGINE_INTERFACE_VERSION);
+	*interfaceVersion =	ENGINE_INTERFACE_VERSION;
+	return(FALSE);
+  }
+  memcpy(pengfuncsFromEngine, &meta_engfuncs, sizeof(enginefuncs_t));
+  return(TRUE);
+  */
 }
 
 enginefuncs_t meta_engfuncs_post;
@@ -1276,6 +1278,15 @@ C_DLLEXPORT	int	GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine,	int
 	  ++iter;
   }
   return g_FakeMeta.GetEngineFunctions_Post(pengfuncsFromEngine, interfaceVersion, &meta_engfuncs_post);
+  /*
+  if(*interfaceVersion!=ENGINE_INTERFACE_VERSION) {
+	LOG_ERROR(PLID,	"GetEngineFunctions_Post version mismatch; requested=%d	ours=%d", *interfaceVersion, ENGINE_INTERFACE_VERSION);
+	*interfaceVersion = ENGINE_INTERFACE_VERSION;
+	return(FALSE);
+  }
+  memcpy(pengfuncsFromEngine, &meta_engfuncs_post, sizeof(enginefuncs_t));
+  return(TRUE);
+  */
 }
 
 NEW_DLL_FUNCTIONS gNewDLLFunctionTable;

amxmodx/modules.cpp

@@ -34,7 +34,7 @@
 #include "CFile.h"
 #include "amxxfile.h"
 
-CList<CModule,const char*> g_modules;
+CList<CModule> g_modules;
 CList<CScript,AMX*> g_loadedscripts;
 
 CModule *g_CurrentlyCalledModule = NULL;	// The module we are in at the moment; NULL otherwise
@@ -44,6 +44,7 @@ ModuleCallReason g_ModuleCallReason;
 
 extern const char* no_function; // stupid work around
 
+
 void report_error( int code, char* fmt, ... )
 {
 	va_list argptr;
@@ -87,7 +88,7 @@ void free_amxmemory(void **ptr)
 	*ptr = 0;
 }
 
-int load_amxscript(AMX *amx, void **program, const char *filename, char error[64], int debug)
+int load_amxscript(AMX *amx, void **program, const char *filename, char error[64])
 {
 	*error = 0;
 	CAmxxReader reader(filename, SMALL_CELL_SIZE / 8);
@@ -148,13 +149,6 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 		return (amx->error = AMX_ERR_FORMAT);
 	}
 
-	if ( (int)CVAR_GET_FLOAT("amx_debug") >= 2 || debug)
-	{
-		//automatic debug mode
-		hdr->flags |= AMX_FLAG_LINEOPS;
-		hdr->flags |= AMX_FLAG_DEBUG;
-	}
-
 	int err;
 	memset(amx, 0, sizeof(*amx));
 	if ((err = amx_Init( amx, *program )) != AMX_ERR_NONE)
@@ -163,6 +157,7 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 		return (amx->error = AMX_ERR_INIT);
 	}
 
+
 #ifdef JIT
 	void *np = new char[ amx->code_size ];
 	void *rt = new char[ amx->reloc_size ];
@@ -212,96 +207,9 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
 	return set_amxnatives(amx,error);
 }
 
-const char *StrCaseStr(const char *as, const char *bs)
-{
-	static char a[256];
-	static char b[256];
-	unsigned int i = 0;
-	unsigned int len = strlen(as);
-
-	if (len > 254)
-		len = 254;
-
-	for (i=0; i<len; i++)
-	{
-		a[i] = tolower(as[i]);
-	}
-	a[len] = 0;
-
-	len = strlen(bs);
-
-	if (len > 254)
-		len = 254;
-
-	for (i=0; i<len; i++)
-	{
-		b[i] = tolower(bs[i]);
-	}
-	b[len] = 0;
-
-	return strstr(a,b);
-}
-
-//BAILOPAN
-int CheckModules(AMX *amx, char error[64])
-{
-	int idx = 0, flag = -1;
-	if (amx_FindPublic(amx, "plugin_modules", &idx) == AMX_ERR_NONE)
-	{
-		cell retVal = 0;
-		int err = 0;
-		if ( (err = amx_Exec(amx, &retVal, idx, 0)) == AMX_ERR_NONE )
-		{
-			unsigned int i = 0;
-			while (!CurModuleList.empty())
-			{
-				if (!flag)
-				{
-					CurModuleList.pop();
-					continue;
-				}
-				//assume module is not found
-				flag = 0;
-				for (CList<CModule,const char *>::iterator pMod = g_modules.begin(); pMod; ++pMod)
-				{
-					if (strcmpi(CurModuleList.front().c_str(), "dbi") == 0)
-					{
-						if (StrCaseStr( (*pMod).getName(), "sql") || strstr( (*pMod).getName(), "dbi" ))
-						{
-							// the module checks in
-							flag = 1;
-							break;
-						}
-					} else {
-						if (strcmpi( (*pMod).getName(), CurModuleList.front().c_str() ) == 0)
-						{
-							flag = 1;
-							break;
-						}
-					}
-				}
-				//module was not found
-				if (!flag)
-				{
-					sprintf(error, "Module \"%s\" required for plugin.  Check modules.ini.", CurModuleList.front().c_str());
-				}
-				CurModuleList.pop();
-			}
-		} else {
-			AMXXLOG_Log("[AMXX] Run time error %d on line %ld during module check.", err, amx->curline);
-			//could not execute
-			return -1;	//bad! very bad!
-		}
-	} else {
-		return -1;
-	}
-
-	return flag;
-}
-
 int set_amxnatives(AMX* amx,char error[64])
 {
-	for ( CList<CModule,const char *>::iterator  a  = g_modules.begin(); a ; ++a )
+	for ( CList<CModule>::iterator  a  = g_modules.begin(); a ; ++a )
 	{
 		for( CList<AMX_NATIVE_INFO*>::iterator cc = 
 			(*a).m_Natives.begin(); cc; ++cc )
@@ -318,29 +226,14 @@ int set_amxnatives(AMX* amx,char error[64])
 
 	if ( amx_Register(amx, core_Natives, -1) != AMX_ERR_NONE )
 	{
-		//HACKHACK - if we get here, nullify the plugin's native table
+		sprintf(error,"Function not found (name \"%s\")",no_function);
-		//then reregister the one native we need
-		// - BAILOPAN
-		String save;
-		save.assign(no_function);
-		amx_NullNativeTable(amx);
-		AMX_NATIVE_INFO p[] = {
-			{ "require_module",	require_module },
-			{ NULL,				NULL },
-		};
-		amx_Register(amx, p, -1);
-		if (CheckModules(amx, error) == -1 || *error == 0)
-		{
-			sprintf(error,"Plugin uses an unknown function (name \"%s\") - check your modules.ini.",save.c_str());
-		}
 		return (amx->error = AMX_ERR_NATIVE);
 	}
 
-	CheckModules(amx, error);
-
 	return AMX_ERR_NONE;
 }
 
+
 int unload_amxscript(AMX* amx, void** program)
 {
 	CList<CScript,AMX*>::iterator a = g_loadedscripts.find( amx  );
@@ -439,7 +332,7 @@ char* build_pathname_addons(char *fmt, ... )
 
 int add_amxnatives(module_info_s* info,AMX_NATIVE_INFO*natives)
 {
-	CList<CModule,const char *>::iterator  a  = g_modules.begin();
+	CList<CModule>::iterator  a  = g_modules.begin();
 
 	while ( a )
 	{
@@ -471,109 +364,9 @@ bool validFile(const char* file)
 #endif
 }
 
-void ConvertModuleName(const char *pathString, String &path)
-{
-#if SMALL_CELL_SIZE==64
-	char *ptr = strstr(pathString, "i386");
-	if (ptr)
-	{
-		//attempt to fix the binary name
-		*ptr = 0;
-		path.assign(pathString);
-		path.append("amd64.so");
-	} else {
-		ptr = strstr(pathString, ".dll");
-		if (ptr)
-		{
-			*ptr = 0;
-			path.assign(pathString);
-			path.append("_amd64.so");
-		} else {
-			ptr = strstr(pathString, ".so");
-			if (ptr)
-			{
-				path.assign(pathString);
-			} else {
-				//no extension at all
-				path.assign(pathString);
-				path.append("_amd64.so");
-			}
-		}
-	}
-#else
-#ifdef __linux__
-	char *ptr = strstr(pathString, "amd64");
-	if (ptr) 
-	{
-		//attempt to fix the binary name
-		*ptr = 0;
-		path.assign(pathString);
-		path.append("i386.so");
-	} else {
-		ptr = strstr(pathString, ".dll");
-		if (ptr)
-		{
-			*ptr = 0;
-			path.assign(pathString);
-			path.append("_i386.so");
-		} else {
-			//check to see if this file even has an extension
-			ptr = strstr(pathString, ".so");
-			if (ptr)
-			{
-				path.assign(pathString);
-			} else {
-				path.assign(pathString);
-				path.append("_i386.so");
-			}
-		}
-	}
-#else
-	char *ptr = strstr(pathString, ".dll");
-	if (ptr)
-	{
-		path.assign(pathString);
-	} else {
-		//prevent this from loading .so too
-		ptr = strstr(pathString, ".so");
-		if (ptr)
-		{
-			int i = 0, len = strlen(pathString), c = -1;
-			for (i=len-1; i>=0; i--)
-			{
-				//cut off at first _
-				if (pathString[i] == '_')
-				{
-					//make sure this is a valid _
-					if (i == len-1 || strncmp(&(pathString[i+1]), "amxx", 4) == 0)
-						break;
-					c = i;
-					break;
-				}
-			}
-			*ptr = 0;
-			if (c == -1)
-			{
-				path.assign(pathString);
-				path.append(".dll");
-			} else {
-				ptr = (char *)&(pathString[c]);
-				*ptr = 0;
-				path.assign(pathString);
-				path.append(".dll");
-			}
-		} else {
-			path.assign(pathString);
-			path.append(".dll");
-		}
-	}
-#endif //__linux__
-#endif //SMALL_CELL_SIZE==64
-}
-
 int loadModules(const char* filename)
 {
-	FILE *fp = fopen(build_pathname("%s",filename), "rt");
+	File fp( build_pathname("%s",filename), "r"  );
 
 	if ( !fp )
 	{
@@ -581,90 +374,66 @@ int loadModules(const char* filename)
 		return 0;
 	}
 
-	char moduleName[256];
+	char line[256], moduleName[256];
-	char pathString[512];
-	String line;
 	int loaded = 0;
 
-	String path;
+	while ( fp.getline( line ,  255  ) )
-
-	while (!feof(fp))
 	{
-		if (!line._fread(fp) || line.size() < 1)
-			continue;
-		line.trim();
 		*moduleName = 0;
-		if (sscanf(line.c_str(),"%s",moduleName) == EOF)
+		sscanf(line,"%s",moduleName);
-			continue;
+		if (!isalnum(*moduleName) || !validFile(moduleName) )  
-		if (moduleName[0] == ';')  
 			continue;
 
+		char* pathname = build_pathname("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxx/modules"), line);
 
-		char* pathname = build_pathname("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), moduleName);
+		CList<CModule>::iterator a = g_modules.find(  pathname  );
-		strcpy(pathString, pathname);
-
-		path.assign("");
-
-		ConvertModuleName(pathString, path);	
-
-		if (!validFile(path.c_str()))
-			continue;
-
-		CList<CModule,const char *>::iterator a = g_modules.find(  path.c_str() );
 
 		if ( a ) continue; // already loaded
 
-		CModule* cc = new CModule( path.c_str() );
+		CModule* cc = new CModule( pathname  );
 
-		if ( cc == 0 )
+		if ( cc == 0 ) return loaded;
-		{
-			fclose(fp);
-			return loaded;
-		}
 
 		cc->queryModule();
 
 		switch(  cc->getStatusValue()  )  {
 	  case MODULE_BADLOAD:
-		  report_error( 1 , "[AMXX] Module is not a valid library (file \"%s\")", path.c_str());
+		  report_error( 1 , "[AMXX] Module is not a valid library (file \"%s\")",pathname );
 		  break;
 	  case MODULE_NOINFO:
-		  report_error( 1 ,"[AMXX] Couldn't find info. about module (file \"%s\")", path.c_str());
+		  report_error( 1 ,"[AMXX] Couldn't find info. about module (file \"%s\")",pathname );
 		  break;
 	  case MODULE_NOQUERY:
-		  report_error( 1 , "[AMXX] Couldn't find \"AMX_Query\" or \"AMXX_Query\" (file \"%s\")", path.c_str());
+		  report_error( 1 , "[AMXX] Couldn't find \"AMX_Query\" or \"AMXX_Query\" (file \"%s\")", pathname );
 		  break;
 	  case MODULE_NOATTACH:
-		  report_error( 1 , "[AMXX] Couldn't find \"%s\" (file \"%s\")", cc->isAmxx() ? "AMXX_Attach" : "AMX_Attach", path.c_str());
+		  report_error( 1 , "[AMXX] Couldn't find \"%s\" (file \"%s\")", cc->isAmxx() ? "AMXX_Attach" : "AMX_Attach", pathname );
 		  break;
 	  case MODULE_OLD:
-		  report_error( 1 , "[AMXX] Module has a different interface version (file \"%s\")",path.c_str());
+		  report_error( 1 , "[AMXX] Module has a different interface version (file \"%s\")",pathname );
 		  break;
 	  case MODULE_NEWER:
-		  report_error(1, "[AMXX] Module has a newer interface version (file \"%s\"). Please download a new amxmodx.", path.c_str());
+		  report_error(1, "[AMXX] Module has a newer interface version (file \"%s\"). Please download a new amxmodx.", pathname);
 		  break;
 	  case MODULE_INTERROR:
-		  report_error(1, "[AMXX] Internal error during module load (file \"%s\")", path.c_str());
+		  report_error(1, "[AMXX] Internal error during module load (file \"%s\")", pathname);
 		  break;
 	  case MODULE_NOT64BIT:
-		  report_error(1, "[AMXX] Module \"%s\" is not 64 bit compatible.", path.c_str());
+		  report_error(1, "[AMXX] Module \"%s\" is not 64 bit compatible.", pathname);
 		  break;
 	  default:
 		  ++loaded; 
 		}
 
 		g_modules.put( cc );
-
 	}
 
-	fclose(fp);
-
 	return loaded;
 }
 
 void detachModules()
 {
-	CList<CModule,const char *>::iterator  a  = g_modules.begin();
+	CList<CModule>::iterator  a  = g_modules.begin();
 
 	while ( a )
 	{
@@ -675,7 +444,7 @@ void detachModules()
 
 void detachReloadModules()
 {
-	CList<CModule,const char *>::iterator  a  = g_modules.begin();
+	CList<CModule>::iterator  a  = g_modules.begin();
 
 	while ( a )
 	{
@@ -693,7 +462,7 @@ void detachReloadModules()
 
 void attachModules()
 {
-	CList<CModule,const char *>::iterator  a  = g_modules.begin();
+	CList<CModule>::iterator  a  = g_modules.begin();
 
 	while ( a )
 	{
@@ -745,7 +514,6 @@ void attachMetaModModules(PLUG_LOADTIME now, const char* filename)
 	}
 
 	char line[256], moduleName[256];
-	String modPath, mmPath;
 	DLHANDLE module;
 
 	while ( fp.getline( line ,  255  ) )
@@ -753,34 +521,12 @@ void attachMetaModModules(PLUG_LOADTIME now, const char* filename)
 		*moduleName = 0;
 		sscanf(line,"%s",moduleName);
 
-		if (!isalnum(*moduleName))  
+		if (!isalnum(*moduleName) || !validFile(moduleName) )  
 			continue;
 
-		char* pathname = build_pathname("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), line);
+		char* pathname = build_pathname("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxx/modules"), line);
-		char* mmpathname = build_pathname_addons("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxmodx/modules"), line);
+		char* mmpathname = build_pathname_addons("%s/%s", get_localinfo("amxx_modulesdir", "addons/amxx/modules"), line);
-
+		module = DLLOAD( pathname ); // link dll
-		ConvertModuleName(pathname, modPath);
-		ConvertModuleName(mmpathname, mmPath);
-
-		CList<CFakeMeta::CFakeMetaPlugin>::iterator iter = g_FakeMeta.m_Plugins.begin();
-
-		//prevent double loading
-		int foundFlag = 0;
-
-		while (iter)
-		{
-			if ( strcmp( (*iter).GetPath(), mmPath.c_str() ) == 0 )
-			{
-				foundFlag = 1;
-				break;
-			}
-			++iter;
-		}
-
-		if (foundFlag)
-			continue;
-		
-		module = DLLOAD( modPath.c_str() ); // link dll
 
 		if ( module )
 		{
@@ -789,7 +535,7 @@ void attachMetaModModules(PLUG_LOADTIME now, const char* filename)
 
 			if ( a )
 			{
-				g_FakeMeta.AddPlugin(mmPath.c_str());
+				g_FakeMeta.AddPlugin(mmpathname);
 			}
 		}
 	}
@@ -802,7 +548,7 @@ void attachMetaModModules(PLUG_LOADTIME now, const char* filename)
 // Get the number of running modules
 int countModules(CountModulesMode mode)
 {
-	CList<CModule,const char *>::iterator iter;
+	CList<CModule>::iterator iter;
 	int num;
 	switch (mode)
 	{
@@ -835,7 +581,7 @@ int countModules(CountModulesMode mode)
 // Call all modules' AMXX_PluginsLoaded functions
 void modules_callPluginsLoaded()
 {
-	CList<CModule,const char *>::iterator iter = g_modules.begin();
+	CList<CModule>::iterator iter = g_modules.begin();
 	while (iter)
 	{
 		(*iter).CallPluginsLoaded();
@@ -847,7 +593,7 @@ void modules_callPluginsLoaded()
 
 int MNF_AddNatives(AMX_NATIVE_INFO* natives)
 {
-	CList<CModule,const char *>::iterator a = g_modules.begin();
+	CList<CModule>::iterator a = g_modules.begin();
 
 	if (!g_CurrentlyCalledModule || g_ModuleCallReason != ModuleCall_Attach)
 		return FALSE;				// may only be called from attach
@@ -957,14 +703,6 @@ char *MNF_FormatAmxString(AMX *amx, cell *params, int startParam, int *pLen)
 	return retVal;
 }
 
-int MNF_GetPlayerFlags(int id)
-{
-	if (id < 1 || id > gpGlobals->maxClients)
-		return 0;
-	CPlayer *pPlayer = GET_PLAYER_POINTER_I(id);
-	return (pPlayer->flags[0]);
-}
-
 void MNF_CopyAmxMemory(cell * dest, const cell * src, int len)
 {
 	memcpy((void*)dest, (const void *)src, (size_t)len*sizeof(cell));
@@ -1113,199 +851,11 @@ void MNF_Log(const char *fmt, ...)
 	AMXXLOG_Log("%s", msg);
 }
 
-//by BAILOPAN
-//  generic error printing routine
-void GenericError(AMX *amx, int err, int line, char buf[], const char *file)
-{
-	static const char *amx_errs[] =
-	{
-		NULL,
-		"forced exit",
-		"assertion failed",
-		"stack error",
-		"index out of bounds",
-		"memory access",
-		"invalid instruction",
-		"stack low",
-		"heap low",
-		"callback",
-		"native",
-		"divide",
-		"sleep",
-		NULL,
-		NULL,
-		NULL,
-		"out of memory", //16
-		"bad file format",
-		"bad file version",
-		"function not found",
-		"invalid entry point",
-		"debugger cannot run",
-		"plugin un or re-initialized",
-		"userdata table full",
-		"JIT failed to initialize",
-		"parameter error",
-		"domain error",
-	};
-	//does this plugin have line ops?
-	const char *geterr = NULL;
-	if (err > 26 || err < 0)
-		geterr = NULL;
-	else
-		geterr = amx_errs[err];
-	if (!(amx->flags & AMX_FLAG_LINEOPS))
-	{
-		if (geterr == NULL)
-		{
-			sprintf(buf, "Run time error %d (plugin \"%s\" - debug not enabled).", err, g_plugins.findPluginFast(amx)->getName());
-		} else {
-			sprintf(buf, "Run time error %d (%s) (plugin \"%s\") - debug not enabled.", err, geterr, g_plugins.findPluginFast(amx)->getName());
-		}
-	} else {
-		if (geterr == NULL)
-		{
-			sprintf(buf, "Run time error %d on line %d (%s \"%s\").", err, line, (file?"file":"plugin"), (file?file:g_plugins.findPluginFast(amx)->getName()));
-		} else {
-			if (err == AMX_ERR_NATIVE && amx->userdata[2])
-			{
-				geterr = (char *)(amx->userdata[2]);	
-				sprintf(buf, "Native error in \"%s\" on line %d (%s \"%s\").", geterr, line, (file?"file":"plugin"), (file?file:g_plugins.findPluginFast(amx)->getName()));
-			} else {
-				sprintf(buf, "Run time error %d (%s) on line %d (%s \"%s\").", err, geterr, line, (file?"file":"plugin"), (file?file:g_plugins.findPluginFast(amx)->getName()));
-			}
-		}
-	}
-}
-
-//by BAILOPAN
-// debugger engine front end
-void LogError(AMX *amx, int err, const char *fmt, ...)
-{
-	//does this plugin have debug info?
-	va_list arg;
-	AMX_DBG *dbg = (AMX_DBG *)(amx->userdata[0]);
-	static char buf[1024];
-	static char vbuf[1024];
-	*buf = 0;
-	*vbuf = 0;
-
-	va_start(arg, fmt);
-	vsprintf(vbuf, fmt, arg);
-	va_end(arg);
-
-	if (!dbg || !(dbg->tail))
-	{
-		if (dbg && amx->curfile < dbg->numFiles && amx->curfile >= 0)
-		{
-			GenericError(amx, err, amx->curline, buf, dbg->files[amx->curfile]);
-		} else {
-			GenericError(amx, err, amx->curline, buf, NULL);
-		}
-		AMXXLOG_Log("[AMXX] %s", buf);
-		if (*vbuf)
-		{
-			AMXXLOG_Log("%s", vbuf);
-		}
-		if (!dbg)
-		{
-			AMXXLOG_Log("[AMXX] To enable debug mode, add \" debug\" after the plugin name in plugins.ini (without quotes).");
-		}
-	} else {
-		AMX_TRACE *t = dbg->tail;
-		AMX_DEBUGCALL tracer = (AMX_DEBUGCALL)(amx->userdata[1]);
-		//actuall
-		cell line = amx->curline;
-		cell file = amx->curfile;
-		int i = 0;
-		GenericError(amx, err, line, buf, NULL);
-		AMXXLOG_Log("[AMXX] %s", buf);
-		if (*vbuf)
-		{
-			AMXXLOG_Log("%s", vbuf);
-		}
-		AMXXLOG_Log("[AMXX] Debug Trace =>");
-		//log the error right away
-		if (file >= dbg->numFiles || file < 0)
-		{
-            AMXXLOG_Log("[AMXX]       [%d] Line %d, File \"%s\"", i++, line, g_plugins.findPluginFast(amx)->getName());
-		} else {
-			AMXXLOG_Log("[AMXX]       [%d] Line %d, File \"%s\"", i++, line, dbg->files[file]);
-		}
-		while (t != NULL)
-		{
-			line = t->line;
-			file = t->file;
-			if (file >= dbg->numFiles)
-			{
-				AMXXLOG_Log("[AMXX]       [%d] Line %d, File \"%s\"", i++, line, g_plugins.findPluginFast(amx)->getName());	
-			} else {
-				AMXXLOG_Log("[AMXX]       [%d] Line %d, File \"%s\"", i++, line, dbg->files[file]);	
-			}
-			if (tracer)
-				(tracer)(amx, 1);		//pop	
-			t = dbg->tail;
-		}
-	}
-}
-
 void MNF_MergeDefinitionFile(const char *file)
 {
 	g_langMngr.MergeDefinitionFile(file);
 }
 
-edict_t* MNF_GetPlayerEdict(int id)
-{
-	if (id < 1 || id > gpGlobals->maxClients)
-		return NULL;
-	return (GET_PLAYER_POINTER_I(id)->pEdict);
-}
-
-const char *MNF_Format(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	const char *retVal = g_langMngr.FormatString(fmt, ap);
-	va_end(ap);
-	return retVal;
-}
-
-const char *MNF_GetPlayerTeam(int id)
-{
-	if (id < 1 || id > gpGlobals->maxClients)
-		return NULL;
-
-	return (GET_PLAYER_POINTER_I(id)->team.c_str());
-}
-
-#ifndef MEMORY_TEST
-void *MNF_Allocator(const char *sourceFile, const unsigned int sourceLine, const char *sourceFunc, const unsigned int allocationType, const size_t reportedSize)
-{
-	return malloc(reportedSize);
-}
-
-void *MNF_Reallocator(const char *sourceFile, const unsigned int sourceLine, const char *sourceFunc, const unsigned int reallocationType, const size_t reportedSize, void *reportedAddress)
-{
-	return realloc(reportedAddress, reportedSize);
-}
-
-void MNF_Deallocator(const char *sourceFile, const unsigned int sourceLine, const char *sourceFunc, const unsigned int deallocationType, void *reportedAddress)
-{
-	free(reportedAddress);
-}
-#endif
-
-// 09/18/2004 : added these two funcs that default to copyBack=false so we don't break all modules
-cell MNF_PrepareCellArray(cell *ptr, unsigned int size)
-{
-	return prepareCellArray(ptr, size, false);
-}
-
-cell MNF_PrepareCharArray(char *ptr, unsigned int size)
-{
-	return prepareCharArray(ptr, size, false);
-}
-
-
 // Fnptr Request function for the new interface
 const char *g_LastRequestedFunc = NULL;
 #define REGISTER_FUNC(name, func) { name, (void*)func },
@@ -1323,9 +873,7 @@ void *Module_ReqFnptr(const char *funcName)
 			REGISTER_FUNC("PrintSrvConsole", print_srvconsole)
 			REGISTER_FUNC("GetModname", MNF_GetModname)
 			REGISTER_FUNC("Log", MNF_Log)
-			REGISTER_FUNC("LogError", LogError)
 			REGISTER_FUNC("MergeDefinitionFile", MNF_MergeDefinitionFile)
-			REGISTER_FUNC("Format", MNF_Format)
 
 			// Amx scripts loading / unloading / managing
 			REGISTER_FUNC("GetAmxScript", MNF_GetAmxScript)
@@ -1358,13 +906,10 @@ void *Module_ReqFnptr(const char *funcName)
 			REGISTER_FUNC("RegisterSPForwardByName", registerSPForwardByName)
 			REGISTER_FUNC("UnregisterSPForward", unregisterSPForward)
 			REGISTER_FUNC("ExecuteForward", executeForwards)
-			REGISTER_FUNC("PrepareCellArray", MNF_PrepareCellArray)
+			REGISTER_FUNC("PrepareCellArray", prepareCellArray)
-			REGISTER_FUNC("PrepareCharArray", MNF_PrepareCharArray)
+			REGISTER_FUNC("PrepareCharArray", prepareCharArray)
-			REGISTER_FUNC("PrepareCellArrayA", prepareCellArray)
-			REGISTER_FUNC("PrepareCharArrayA", prepareCharArray)
 
 			// Player
-			REGISTER_FUNC("GetPlayerFlags", MNF_GetPlayerFlags)
 			REGISTER_FUNC("IsPlayerValid", MNF_IsPlayerValid)
 			REGISTER_FUNC("GetPlayerName", MNF_GetPlayerName)
 			REGISTER_FUNC("GetPlayerIP", MNF_GetPlayerIP)
@@ -1375,7 +920,6 @@ void *Module_ReqFnptr(const char *funcName)
 			REGISTER_FUNC("GetPlayerPlayTime", MNF_GetPlayerPlayTime)
 			REGISTER_FUNC("GetPlayerCurweapon", MNF_GetPlayerCurweapon)
 			REGISTER_FUNC("GetPlayerTeamID", MNF_GetPlayerTeamID)
-			REGISTER_FUNC("GetPlayerTeam", MNF_GetPlayerTeam)
 			REGISTER_FUNC("GetPlayerDeaths", MNF_GetPlayerDeaths)
 			REGISTER_FUNC("GetPlayerFrags", MNF_GetPlayerFrags)
 			REGISTER_FUNC("GetPlayerMenu", MNF_GetPlayerMenu)
@@ -1385,7 +929,6 @@ void *Module_ReqFnptr(const char *funcName)
 			REGISTER_FUNC("IsPlayerHLTV", MNF_IsPlayerHLTV)
 			REGISTER_FUNC("GetPlayerArmor", MNF_GetPlayerArmor)
 			REGISTER_FUNC("GetPlayerHealth", MNF_GetPlayerHealth)
-			REGISTER_FUNC("GetPlayerEdict", MNF_GetPlayerEdict)
 			REGISTER_FUNC("CellToReal", MNF_CellToReal)
 			REGISTER_FUNC("RealToCell", MNF_RealToCell)
 
@@ -1393,10 +936,6 @@ void *Module_ReqFnptr(const char *funcName)
 			REGISTER_FUNC("Allocator", m_allocator)
 			REGISTER_FUNC("Deallocator", m_deallocator)
 			REGISTER_FUNC("Reallocator", m_reallocator)
-#else
-			REGISTER_FUNC("Allocator", MNF_Allocator)
-			REGISTER_FUNC("Deallocator", MNF_Deallocator)
-			REGISTER_FUNC("Reallocator", MNF_Reallocator)
 #endif // MEMORY_TEST
 
 			REGISTER_FUNC("Haha_HiddenStuff", MNF_HiddenStuff)
@@ -1415,4 +954,4 @@ void *Module_ReqFnptr(const char *funcName)
 			return functions[i].ptr;
 	}
 	return NULL;
-}
+}

amxmodx/modules.h

@@ -144,7 +144,7 @@ struct pfnmodule_engine_g {
   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], int);  // amx, code, path, error info
+  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

amxmodx/msvc/amxmodx.vcproj

@@ -43,7 +43,7 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
-				OutputFile="debug/amxmodx_mm.dll"
+				OutputFile="debug/amxx_mm.dll"
 				Version="0.1"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -112,8 +112,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="release/amxmodx_mm.dll"
+				OutputFile="release/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
@@ -179,8 +179,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="memtestdebug/amxmodx_mm.dll"
+				OutputFile="memtestdebug/amxx_mm.dll"
 				Version="0.1"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -249,8 +249,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib"
-				OutputFile="memtestrelease/amxmodx_mm.dll"
+				OutputFile="memtestrelease/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
@@ -316,8 +316,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="jitdebug/amxmodx_mm.dll"
+				OutputFile="jitdebug/amxx_mm.dll"
 				Version="0.1"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -386,8 +386,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\jit\jits.obj ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
-				OutputFile="jitrelease/amxmodx_mm.dll"
+				OutputFile="jitrelease/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
@@ -454,8 +454,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="jitmemtestrelease/amxmodx_mm.dll"
+				OutputFile="jitmemtestrelease/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"
@@ -525,8 +525,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib"
-				OutputFile="MaximalSpeed/amxmodx_mm.dll"
+				OutputFile="MaximalSpeed/amxx_mm.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\extra\lib_win32"

amxmodx/msvc/amxmodx_mm.vcproj

@@ -1,804 +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"
-				OutputFile="release/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\release/amxx_mm.pdb"
-				ImportLibrary=".\release/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MemtestDebug|Win32"
-			OutputDirectory="MemtestDebug"
-			IntermediateDirectory="MemtestDebug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\memtestdebug/amxmodx.pch"
-				AssemblerListingLocation=".\memtestdebug/"
-				ObjectFile=".\memtestdebug/"
-				ProgramDataBaseFileName=".\memtestdebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
-				OutputFile="memtestdebug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\memtestdebug/amxx_mm.pdb"
-				ImportLibrary=".\memtestdebug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MemtestRelease|Win32"
-			OutputDirectory="MemtestRelease"
-			IntermediateDirectory="MemtestRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\memtestrelease/amxmodx.pch"
-				AssemblerListingLocation=".\memtestrelease/"
-				ObjectFile=".\memtestrelease/"
-				ProgramDataBaseFileName=".\memtestrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\zlib\zlib.lib"
-				OutputFile="memtestrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\memtestrelease/amxx_mm.pdb"
-				ImportLibrary=".\memtestrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITDebug|Win32"
-			OutputDirectory="JITDebug"
-			IntermediateDirectory="JITDebug"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\pm_shared&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\dlls&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\engine&quot;;&quot;C:\Hry\Half-Life\SDK\Multiplayer Source\common&quot;;C:\Files\Programming\metamod\metamod"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				StructMemberAlignment="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitdebug/amxmodx.pch"
-				AssemblerListingLocation=".\jitdebug/"
-				ObjectFile=".\jitdebug/"
-				ProgramDataBaseFileName=".\jitdebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\jit\jits.obj ..\zlib\zlib.lib"
-				OutputFile="jitdebug/amxmodx_mm.dll"
-				Version="0.1"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
-				ImportLibrary=".\jitdebug/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\debug/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITRelease|Win32"
-			OutputDirectory="JITRelease"
-			IntermediateDirectory="JITRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitrelease/amxmodx.pch"
-				AssemblerListingLocation=".\jitrelease/"
-				ObjectFile=".\jitrelease/"
-				ProgramDataBaseFileName=".\jitrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="..\jit\jits.obj ..\zlib\zlib.lib"
-				OutputFile="jitrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\jitrelease/amxx_mm.pdb"
-				ImportLibrary=".\jitrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="JITMemtestRelease|Win32"
-			OutputDirectory="JITMemtestRelease"
-			IntermediateDirectory="JITMemtestRelease"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;MEMORY_TEST;JIT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\jitmemtestrelease/amxmodx.pch"
-				AssemblerListingLocation=".\jitmemtestrelease/"
-				ObjectFile=".\jitmemtestrelease/"
-				ProgramDataBaseFileName=".\jitmemtestrelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\zlib\zlib.lib"
-				OutputFile="jitmemtestrelease/amxmodx_mm.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\extra\lib_win32"
-				ModuleDefinitionFile=""
-				ProgramDatabaseFile=".\jitmemtestrelease/amxx_mm.pdb"
-				ImportLibrary=".\jitmemtestrelease/amxx_mm.lib"/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\release/amxmodx.tlb"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="MaximalSpeed|Win32"
-			OutputDirectory="MaximalSpeed"
-			IntermediateDirectory="MaximalSpeed"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="TRUE"
-				FavorSizeOrSpeed="1"
-				OptimizeForProcessor="2"
-				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="amxmodx.h"
-				PrecompiledHeaderFile=".\MaximalSpeed/amxmodx.pch"
-				AssemblerListingLocation=".\MaximalSpeed/"
-				ObjectFile=".\MaximalSpeed/"
-				ProgramDataBaseFileName=".\MaximalSpeed/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="odbc32.lib odbccp32.lib ..\jit\jits.lib ..\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="..\amxmodx.cpp">
-			</File>
-			<File
-				RelativePath="..\amxtime.cpp">
-			</File>
-			<File
-				RelativePath="..\amxxfile.cpp">
-			</File>
-			<File
-				RelativePath="..\amxxlog.cpp">
-			</File>
-			<File
-				RelativePath="..\CCmd.cpp">
-			</File>
-			<File
-				RelativePath="..\CEvent.cpp">
-			</File>
-			<File
-				RelativePath="..\CFile.cpp">
-			</File>
-			<File
-				RelativePath="..\CForward.cpp">
-			</File>
-			<File
-				RelativePath="..\CLang.cpp">
-			</File>
-			<File
-				RelativePath="..\CLogEvent.cpp">
-			</File>
-			<File
-				RelativePath="..\CMenu.cpp">
-			</File>
-			<File
-				RelativePath="..\CMisc.cpp">
-			</File>
-			<File
-				RelativePath="..\CModule.cpp">
-			</File>
-			<File
-				RelativePath="..\CPlugin.cpp">
-			</File>
-			<File
-				RelativePath="..\CTask.cpp">
-			</File>
-			<File
-				RelativePath="..\CVault.cpp">
-			</File>
-			<File
-				RelativePath="..\emsg.cpp">
-			</File>
-			<File
-				RelativePath="..\fakemeta.cpp">
-				<FileConfiguration
-					Name="MemtestDebug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						GeneratePreprocessedFile="0"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\file.cpp">
-			</File>
-			<File
-				RelativePath="..\float.cpp">
-			</File>
-			<File
-				RelativePath="..\md5.cpp">
-			</File>
-			<File
-				RelativePath="..\meta_api.cpp">
-			</File>
-			<File
-				RelativePath="..\modules.cpp">
-			</File>
-			<File
-				RelativePath="..\power.cpp">
-			</File>
-			<File
-				RelativePath="..\srvcmd.cpp">
-			</File>
-			<File
-				RelativePath="..\string.cpp">
-			</File>
-			<File
-				RelativePath="..\strptime.cpp">
-			</File>
-			<File
-				RelativePath="..\util.cpp">
-			</File>
-			<File
-				RelativePath="..\vault.cpp">
-			</File>
-			<Filter
-				Name="mmgr"
-				Filter="">
-				<File
-					RelativePath="..\mmgr\mmgr.cpp">
-					<FileConfiguration
-						Name="Debug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITDebug|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="JITRelease|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="MaximalSpeed|Win32"
-						ExcludedFromBuild="TRUE">
-						<Tool
-							Name="VCCLCompilerTool"/>
-					</FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\amx.h">
-			</File>
-			<File
-				RelativePath="..\amxmodx.h">
-			</File>
-			<File
-				RelativePath="..\amxxfile.h">
-			</File>
-			<File
-				RelativePath="..\amxxlog.h">
-			</File>
-			<File
-				RelativePath="..\CCmd.h">
-			</File>
-			<File
-				RelativePath="..\CEvent.h">
-			</File>
-			<File
-				RelativePath="..\CFile.h">
-			</File>
-			<File
-				RelativePath="..\CForward.h">
-			</File>
-			<File
-				RelativePath="..\CLang.h">
-			</File>
-			<File
-				RelativePath="..\CList.h">
-			</File>
-			<File
-				RelativePath="..\CLogEvent.h">
-			</File>
-			<File
-				RelativePath="..\CMenu.h">
-			</File>
-			<File
-				RelativePath="..\CMisc.h">
-			</File>
-			<File
-				RelativePath="..\CModule.h">
-			</File>
-			<File
-				RelativePath="..\CPlugin.h">
-			</File>
-			<File
-				RelativePath="..\CQueue.h">
-			</File>
-			<File
-				RelativePath="..\CRList.h">
-			</File>
-			<File
-				RelativePath="..\CString.h">
-			</File>
-			<File
-				RelativePath="..\CTask.h">
-			</File>
-			<File
-				RelativePath="..\CVault.h">
-			</File>
-			<File
-				RelativePath="..\CVector.h">
-			</File>
-			<File
-				RelativePath="..\fakemeta.h">
-			</File>
-			<File
-				RelativePath="..\md5.h">
-			</File>
-			<File
-				RelativePath="..\modules.h">
-			</File>
-			<Filter
-				Name="mmgr"
-				Filter="">
-				<File
-					RelativePath="..\mmgr\mmgr.h">
-				</File>
-				<File
-					RelativePath="..\mmgr\nommgr.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc">
-			<File
-				RelativePath="..\version.rc">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

amxmodx/sdk/amxxmodule.cpp

@@ -45,16 +45,6 @@
 enginefuncs_t g_engfuncs;
 globalvars_t  *gpGlobals;
 
-
-
-DLL_FUNCTIONS *g_pFunctionTable;
-DLL_FUNCTIONS *g_pFunctionTable_Post;
-enginefuncs_t *g_pengfuncsTable;
-enginefuncs_t *g_pengfuncsTable_Post;
-NEW_DLL_FUNCTIONS *g_pNewFunctionsTable;
-NEW_DLL_FUNCTIONS *g_pNewFunctionsTable_Post;
-
-
 // GetEntityAPI2 functions
 static DLL_FUNCTIONS g_EntityAPI_Table = 
 {
@@ -2124,7 +2114,6 @@ C_DLLEXPORT int GetEntityAPI2(DLL_FUNCTIONS *pFunctionTable, int *interfaceVersi
 		return(FALSE);
 	}
 	memcpy(pFunctionTable, &g_EntityAPI_Table, sizeof(DLL_FUNCTIONS));
-	g_pFunctionTable=pFunctionTable;
 	return(TRUE);
 }
 
@@ -2142,7 +2131,7 @@ C_DLLEXPORT int GetEntityAPI2_Post(DLL_FUNCTIONS *pFunctionTable, int *interface
 		return(FALSE);
 	}
 	memcpy( pFunctionTable, &g_EntityAPI_Post_Table, sizeof( DLL_FUNCTIONS ) );
-	g_pFunctionTable_Post=pFunctionTable;
+
 	return(TRUE);
 }
 
@@ -2165,7 +2154,6 @@ C_DLLEXPORT int GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
 		return(FALSE);
 	}
 	memcpy(pengfuncsFromEngine, &g_EngineFuncs_Table, sizeof(enginefuncs_t));
-	g_pengfuncsTable=pengfuncsFromEngine;
 	return TRUE;
 }
 
@@ -2183,7 +2171,6 @@ C_DLLEXPORT int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine, int
 		return(FALSE);
 	}
 	memcpy(pengfuncsFromEngine, &g_EngineFuncs_Post_Table, sizeof(enginefuncs_t));
-	g_pengfuncsTable_Post=pengfuncsFromEngine;
 	return TRUE;
 
 }
@@ -2208,7 +2195,6 @@ C_DLLEXPORT int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable,
 		return(FALSE);
 	}
 	memcpy(pNewFunctionTable, &g_NewFuncs_Table, sizeof(NEW_DLL_FUNCTIONS));
-	g_pNewFunctionsTable=pNewFunctionTable;
 	return TRUE;
 }
 
@@ -2226,7 +2212,6 @@ C_DLLEXPORT int GetNewDLLFunctions_Post( NEW_DLL_FUNCTIONS *pNewFunctionTable, i
 		return(FALSE);
 	}
 	memcpy(pNewFunctionTable, &g_NewFuncs_Post_Table, sizeof(NEW_DLL_FUNCTIONS));
-	g_pNewFunctionsTable_Post=pNewFunctionTable;
 	return TRUE;
 }
 
@@ -2454,14 +2439,11 @@ PFN_GET_AMXSTRINGLEN		g_fn_GetAmxStringLen;
 PFN_FORMAT_AMXSTRING		g_fn_FormatAmxString;
 PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 PFN_LOG						g_fn_Log;
-PFN_LOG_ERROR				g_fn_LogErrorFunc;
 PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 PFN_REGISTER_FORWARD		g_fn_RegisterForward;
 PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
 PFN_PREPARE_CELLARRAY		g_fn_PrepareCellArray;
 PFN_PREPARE_CHARARRAY		g_fn_PrepareCharArray;
-PFN_PREPARE_CELLARRAY_A		g_fn_PrepareCellArrayA;
-PFN_PREPARE_CHARARRAY_A		g_fn_PrepareCharArrayA;
 PFN_IS_PLAYER_VALID			g_fn_IsPlayerValid;
 PFN_GET_PLAYER_NAME			g_fn_GetPlayerName;
 PFN_GET_PLAYER_IP			g_fn_GetPlayerIP;
@@ -2471,7 +2453,6 @@ PFN_IS_PLAYER_AUTHORIZED	g_fn_IsPlayerAuthorized;
 PFN_GET_PLAYER_TIME			g_fn_GetPlayerTime;
 PFN_GET_PLAYER_PLAYTIME		g_fn_GetPlayerPlayTime;
 PFN_GET_PLAYER_CURWEAPON	g_fn_GetPlayerCurweapon;
-PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 PFN_GET_PLAYER_TEAMID		g_fn_GetPlayerTeamID;
 PFN_GET_PLAYER_DEATHS		g_fn_GetPlayerDeaths;
 PFN_GET_PLAYER_MENU			g_fn_GetPlayerMenu;
@@ -2498,9 +2479,6 @@ PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 PFN_UNREGISTER_SPFORWARD	g_fn_UnregisterSPForward;
 PFN_MERGEDEFINITION_FILE	g_fn_MergeDefinition_File;
 PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-PFN_GETPLAYERFLAGS			g_fn_GetPlayerFlags;
-PFN_GET_PLAYER_EDICT		g_fn_GetPlayerEdict;
-PFN_FORMAT					g_fn_Format;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2544,9 +2522,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("PrintSrvConsole", g_fn_PrintSrvConsole, PFN_PRINT_SRVCONSOLE);
 	REQFUNC("GetModname", g_fn_GetModname, PFN_GET_MODNAME);
 	REQFUNC("Log", g_fn_Log, PFN_LOG);
-	REQFUNC("LogError", g_fn_LogErrorFunc, PFN_LOG_ERROR);
 	REQFUNC("MergeDefinitionFile", g_fn_MergeDefinition_File, PFN_MERGEDEFINITION_FILE);
-	REQFUNC("Format", g_fn_Format, PFN_FORMAT);
 
 	// Amx scripts
 	REQFUNC("GetAmxScript", g_fn_GetAmxScript, PFN_GET_AMXSCRIPT);
@@ -2554,7 +2530,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("FindAmxScriptByName", g_fn_FindAmxScriptByName, PFN_FIND_AMXSCRIPT_BYNAME);
 	REQFUNC("LoadAmxScript", g_fn_LoadAmxScript, PFN_LOAD_AMXSCRIPT);
 	REQFUNC("UnloadAmxScript", g_fn_UnloadAmxScript, PFN_UNLOAD_AMXSCRIPT);
-    REQFUNC("GetAmxScriptName", g_fn_GetAmxScriptName, PFN_GET_AMXSCRIPTNAME);
 
 	// String / mem in amx scripts support
 	REQFUNC("SetAmxString", g_fn_SetAmxString, PFN_SET_AMXSTRING);
@@ -2580,8 +2555,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("ExecuteForward", g_fn_ExecuteForward, PFN_EXECUTE_FORWARD);
 	REQFUNC("PrepareCellArray", g_fn_PrepareCellArray, PFN_PREPARE_CELLARRAY);
 	REQFUNC("PrepareCharArray", g_fn_PrepareCharArray, PFN_PREPARE_CHARARRAY);
-	REQFUNC("PrepareCellArrayA", g_fn_PrepareCellArrayA, PFN_PREPARE_CELLARRAY_A);
+
-	REQFUNC("PrepareCharArrayA", g_fn_PrepareCharArrayA, PFN_PREPARE_CHARARRAY_A);
 	// Player
 	REQFUNC("IsPlayerValid", g_fn_IsPlayerValid, PFN_IS_PLAYER_VALID);
 	REQFUNC("GetPlayerName", g_fn_GetPlayerName, PFN_GET_PLAYER_NAME);
@@ -2593,7 +2567,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("GetPlayerPlayTime", g_fn_GetPlayerPlayTime, PFN_GET_PLAYER_PLAYTIME);
 	REQFUNC("GetPlayerCurweapon", g_fn_GetPlayerCurweapon, PFN_GET_PLAYER_CURWEAPON);
 	REQFUNC("GetPlayerTeamID", g_fn_GetPlayerTeamID, PFN_GET_PLAYER_TEAMID);
-	REQFUNC("GetPlayerTeam",g_fn_GetPlayerTeam, PFN_GET_PLAYER_TEAM);
 	REQFUNC("GetPlayerDeaths", g_fn_GetPlayerDeaths, PFN_GET_PLAYER_DEATHS);
 	REQFUNC("GetPlayerMenu", g_fn_GetPlayerMenu, PFN_GET_PLAYER_MENU);
 	REQFUNC("GetPlayerKeys", g_fn_GetPlayerKeys, PFN_GET_PLAYER_KEYS);
@@ -2603,8 +2576,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("IsPlayerHLTV", g_fn_IsPlayerHLTV, PFN_IS_PLAYER_HLTV);
 	REQFUNC("GetPlayerArmor", g_fn_GetPlayerArmor, PFN_GET_PLAYER_ARMOR);
 	REQFUNC("GetPlayerHealth", g_fn_GetPlayerHealth, PFN_GET_PLAYER_HEALTH);
-	REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS);
-	REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT);
 
 	// Memory
 	REQFUNC_OPT("Allocator", g_fn_Allocator, PFN_ALLOCATOR);
@@ -2651,18 +2622,6 @@ void MF_Log(const char *fmt, ...)
 	g_fn_Log("[%s] %s", MODULE_NAME, msg);
 }
 
-void MF_LogError(AMX *amx, int err, const char *fmt, ...)
-{
-	// :TODO: Overflow possible here
-	char msg[3072];
-	va_list arglst;
-	va_start(arglst, fmt);
-	vsprintf(msg, fmt, arglst);
-	va_end(arglst);
-
-	g_fn_LogErrorFunc(amx, err, "[%s] %s", MODULE_NAME, msg);
-}
-
 
 #ifdef _DEBUG
 // validate macros
@@ -2683,14 +2642,11 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetAmxStringLen(NULL);
 	MF_CopyAmxMemory(NULL, NULL, 0);
 	MF_Log("str", "str", 0);
-	MF_LogError(NULL, 0, NULL);
 	MF_RaiseAmxError(NULL, 0);
 	MF_RegisterForward("str", (ForwardExecType)0, 0, 0, 0);
 	MF_ExecuteForward(0, 0, 0);
 	MF_PrepareCellArray(NULL, 0);
 	MF_PrepareCharArray(NULL, 0);
-	MF_PrepareCellArrayA(NULL, 0, true);
-	MF_PrepareCharArrayA(NULL, 0, true);
 	MF_IsPlayerValid(0);
 	MF_GetPlayerName(0);
 	MF_GetPlayerIP(0);
@@ -2701,7 +2657,6 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetPlayerPlayTime(0);
 	MF_GetPlayerCurweapon(0);
 	MF_GetPlayerTeamID(0);
-	MF_GetPlayerTeam(0);
 	MF_GetPlayerDeaths(0);
 	MF_GetPlayerMenu(0);
 	MF_GetPlayerKeys(0);
@@ -2715,14 +2670,11 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_AmxExecv(0, 0, 0, 0, 0);
 	MF_AmxFindPublic(0, 0, 0);
 	MF_AmxAllot(0, 0, 0, 0);
-	MF_LoadAmxScript(0, 0, 0, 0, 0);
+	MF_LoadAmxScript(0, 0, 0, 0);
 	MF_UnloadAmxScript(0, 0);
 	MF_RegisterSPForward(0, 0, 0, 0, 0, 0);
 	MF_RegisterSPForwardByName(0, 0, 0, 0, 0, 0);
 	MF_UnregisterSPForward(0);
-	MF_GetPlayerFrags(0);
-	MF_GetPlayerEdict(0);
-	MF_Format("", 4, "str");
 }
 #endif
 
@@ -2839,7 +2791,7 @@ void	*operator new(size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	*operator new[](size_t reportedSize)
@@ -2852,7 +2804,7 @@ void	*operator new[](size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 // Microsoft memory tracking operators
@@ -2866,7 +2818,7 @@ void	*operator new(size_t reportedSize, const char *sourceFile, int sourceLine)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine)
 {
@@ -2878,7 +2830,7 @@ void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	operator delete(void *reportedAddress)

amxmodx/sdk/amxxmodule.h

@@ -55,7 +55,7 @@ struct amxx_module_info_s
 // The next section is copied from the amx.h file
 // Copyright (c) ITB CompuPhase, 1997-2004
 
-#if defined __LCC__ || defined __DMC__ || defined __linux__ || defined __GNUC__
+#if defined __LCC__ || defined __DMC__ || defined __linux__
   #include <stdint.h>
 #elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
   /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
@@ -204,9 +204,11 @@ typedef struct tagAMX {
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
   cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
     int reloc_size      PACKED; /* required temporary buffer for relocations */
     long code_size      PACKED; /* estimated memory footprint of the native code */
+  #endif
 } AMX;
 
 enum {
@@ -238,14 +240,6 @@ enum {
   AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
 };
 
-#if !defined AMX_NO_ALIGN
-  #if defined __linux__
-    #pragma pack()    /* reset default packing */
-  #else
-    #pragma pack(pop) /* reset previous packing */
-  #endif
-#endif
-
 
 // ***** declare functions *****
 
@@ -929,7 +923,7 @@ void FN_EngineFprintf(FILE *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf
 
 #ifdef FN_PvAllocEntPrivateData
-void *FN_PvAllocEntPrivateData(edict_t *pEdict, int32 cb);
+void *FN_PvAllocEntPrivateData(edict_t *pEdict, long cb);
 #endif // FN_PvAllocEntPrivateData
 
 #ifdef FN_PvEntPrivateData
@@ -1919,14 +1913,11 @@ typedef int				(*PFN_GET_AMXSTRINGLEN)			(const cell *ptr);
 typedef char *			(*PFN_FORMAT_AMXSTRING)			(AMX * /*amx*/, cell * /*params*/, int /*startParam*/, int * /*pLen*/);
 typedef void			(*PFN_COPY_AMXMEMORY)			(cell * /*dest*/, const cell * /*src*/, int /*len*/);
 typedef void			(*PFN_LOG)						(const char * /*fmt*/, ...);
-typedef void			(*PFN_LOG_ERROR)				(AMX * /*amx*/, int /*err*/, const char * /*fmt*/, ...);
 typedef int				(*PFN_RAISE_AMXERROR)			(AMX * /*amx*/, int /*error*/);
 typedef int				(*PFN_REGISTER_FORWARD)			(const char * /*funcname*/, ForwardExecType /*exectype*/, ... /*paramtypes terminated by PF_DONE*/);
 typedef int				(*PFN_EXECUTE_FORWARD)			(int /*id*/, ... /*params*/);
 typedef cell			(*PFN_PREPARE_CELLARRAY)		(cell * /*ptr*/, unsigned int /*size*/);
 typedef cell			(*PFN_PREPARE_CHARARRAY)		(char * /*ptr*/, unsigned int /*size*/);
-typedef cell			(*PFN_PREPARE_CELLARRAY_A)		(cell * /*ptr*/, unsigned int /*size*/, bool /*copyBack*/);
-typedef cell			(*PFN_PREPARE_CHARARRAY_A)		(char * /*ptr*/, unsigned int /*size*/, bool /*copyBack*/);
 typedef int				(*PFN_IS_PLAYER_VALID)			(int /*id*/);
 typedef const char *	(*PFN_GET_PLAYER_NAME)			(int /*id*/);
 typedef const char *	(*PFN_GET_PLAYER_IP)			(int /*id*/);
@@ -1935,9 +1926,7 @@ typedef int				(*PFN_IS_PLAYER_BOT)			(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_AUTHORIZED)		(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_TIME)			(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_PLAYTIME)		(int /*id*/);
-typedef int				(*PFN_GETPLAYERFLAGS) 			(int /* id*/);
 typedef int				(*PFN_GET_PLAYER_CURWEAPON)		(int /*id*/);
-typedef const char *    (*PFN_GET_PLAYER_TEAM)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_TEAMID)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_DEATHS)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_MENU)			(int /*id*/);
@@ -1948,12 +1937,6 @@ typedef int				(*PFN_IS_PLAYER_CONNECTING)		(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_HLTV)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_ARMOR)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_HEALTH)		(int /*id*/);
-#ifdef USE_METAMOD
-typedef edict_t *		(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#else
-typedef void *			(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#endif
-
 typedef void *			(*PFN_ALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
 														 const unsigned int /*type*/, const size_t /*size*/);
 typedef void *			(*PFN_REALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
@@ -1965,7 +1948,7 @@ typedef int				(*PFN_AMX_EXECV)				(AMX* /*amx*/, cell* /*return val*/, int /*in
 typedef int				(*PFN_AMX_ALLOT)				(AMX* /*amx*/, int /*length*/, cell* /*amx_addr*/, cell** /*phys_addr*/);
 typedef int				(*PFN_AMX_FINDPUBLIC)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
 typedef int				(*PFN_AMX_FINDNATIVE)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
-typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/, int /* debug */);
+typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/);
 typedef int				(*PFN_UNLOAD_AMXSCRIPT)			(AMX* /*amx*/,void** /*code*/);
 typedef cell			(*PFN_REAL_TO_CELL)				(REAL /*x*/);
 typedef REAL			(*PFN_CELL_TO_REAL)				(cell /*x*/);
@@ -1973,7 +1956,6 @@ typedef int				(*PFN_REGISTER_SPFORWARD)		(AMX * /*amx*/, int /*func*/, ... /*pa
 typedef int				(*PFN_REGISTER_SPFORWARD_BYNAME)	(AMX * /*amx*/, const char * /*funcName*/, ... /*params*/);
 typedef void			(*PFN_UNREGISTER_SPFORWARD)		(int /*id*/);
 typedef	void			(*PFN_MERGEDEFINITION_FILE)		(const char * /*filename*/);
-typedef const char *	(*PFN_FORMAT)					(const char * /*fmt*/, ... /*params*/);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
@@ -1990,14 +1972,11 @@ extern PFN_GET_AMXSTRINGLEN			g_fn_GetAmxStringLen;
 extern PFN_FORMAT_AMXSTRING			g_fn_FormatAmxString;
 extern PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 extern PFN_LOG						g_fn_Log;
-extern PFN_LOG_ERROR				g_fn_LogErrorFunc;
 extern PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 extern PFN_REGISTER_FORWARD			g_fn_RegisterForward;
 extern PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
 extern PFN_PREPARE_CELLARRAY		g_fn_PrepareCellArray;
 extern PFN_PREPARE_CHARARRAY		g_fn_PrepareCharArray;
-extern PFN_PREPARE_CELLARRAY_A		g_fn_PrepareCellArrayA;
-extern PFN_PREPARE_CHARARRAY_A		g_fn_PrepareCharArrayA;
 extern PFN_IS_PLAYER_VALID			g_fn_IsPlayerValid;
 extern PFN_GET_PLAYER_NAME			g_fn_GetPlayerName;
 extern PFN_GET_PLAYER_IP			g_fn_GetPlayerIP;
@@ -2030,10 +2009,6 @@ extern PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 extern PFN_UNREGISTER_SPFORWARD		g_fn_UnregisterSPForward;
 extern PFN_MERGEDEFINITION_FILE		g_fn_MergeDefinition_File;
 extern PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-extern PFN_GETPLAYERFLAGS		g_fn_GetPlayerFlags;
-extern PFN_GET_PLAYER_EDICT			g_fn_GetPlayerEdict;
-extern PFN_FORMAT					g_fn_Format;
-extern PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
@@ -2053,14 +2028,11 @@ int				MF_GetAmxStringLen			(const cell *ptr) { }
 char *			MF_FormatAmxString			(AMX * amx, cell * params, int startParam, int * pLen) { }
 void			MF_CopyAmxMemory			(cell * dest, const cell * src, int len) { }
 void			MF_Log						(const char * fmt, ...) { }
-void			MF_LogError					(AMX * amx, int err, const char *fmt, ...) { }
 int				MF_RaiseAmxError			(AMX * amx, int error) { }
 int				MF_RegisterForward			(const char * funcname, ForwardExecType exectype, ...) { }
 int				MF_ExecuteForward			(int id, ...) { }
 cell			MF_PrepareCellArray			(cell * ptr, unsigned int size) { }
 cell			MF_PrepareCharArray			(char * ptr, unsigned int size) { }
-cell			MF_PrepareCellArrayA			(cell * ptr, unsigned int size, bool copyBack) { }
-cell			MF_PrepareCharArrayA			(char * ptr, unsigned int size, bool copyBack) { }
 int				MF_IsPlayerValid			(int id) { }
 const char *	MF_GetPlayerName			(int id) { }
 const char *	MF_GetPlayerIP				(int id) { }
@@ -2070,7 +2042,6 @@ int				MF_IsPlayerAuthorized		(int id) { }
 float			MF_GetPlayerTime			(int id) { }
 float			MF_GetPlayerPlayTime		(int id) { }
 int				MF_GetPlayerCurweapon		(int id) { }
-const char *	MF_GetPlayerTeam			(int id) { }
 int				MF_GetPlayerTeamID			(int id) { }
 int				MF_GetPlayerDeaths			(int id) { }
 int				MF_GetPlayerMenu			(int id) { }
@@ -2086,9 +2057,6 @@ cell			amx_ftoc					(float x) { }
 int				MF_RegisterSPForwardByName	(AMX * amx, const char *str, ...) { }
 int				MF_RegisterSPForward		(AMX * amx, int func, ...) { }
 void			MF_UnregisterSPForward		(int id) { }
-int				MF_GetPlayerFlags			(int id) { }
-edict_t*		MF_GetPlayerEdict			(int id) { }
-const char *	MF_Format					(const char *fmt, ...) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
@@ -2106,14 +2074,11 @@ const char *	MF_Format					(const char *fmt, ...) { }
 #define MF_GetAmxStringLen g_fn_GetAmxStringLen
 #define MF_CopyAmxMemory g_fn_CopyAmxMemory
 void MF_Log(const char *fmt, ...);
-void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_RaiseAmxError g_fn_RaiseAmxError
 #define MF_RegisterForward g_fn_RegisterForward
 #define MF_ExecuteForward g_fn_ExecuteForward
 #define MF_PrepareCellArray g_fn_PrepareCellArray
 #define MF_PrepareCharArray g_fn_PrepareCharArray
-#define MF_PrepareCellArrayA g_fn_PrepareCellArrayA
-#define MF_PrepareCharArrayA g_fn_PrepareCharArrayA
 #define MF_IsPlayerValid g_fn_IsPlayerValid
 #define MF_GetPlayerName g_fn_GetPlayerName
 #define MF_GetPlayerIP g_fn_GetPlayerIP
@@ -2123,7 +2088,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_GetPlayerTime g_fn_GetPlayerTime
 #define MF_GetPlayerPlayTime g_fn_GetPlayerPlayTime
 #define MF_GetPlayerCurweapon g_fn_GetPlayerCurweapon
-#define MF_GetPlayerTeam g_fn_GetPlayerTeam
 #define MF_GetPlayerTeamID g_fn_GetPlayerTeamID
 #define MF_GetPlayerDeaths g_fn_GetPlayerDeaths
 #define MF_GetPlayerMenu g_fn_GetPlayerMenu
@@ -2147,9 +2111,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_RegisterSPForwardByName g_fn_RegisterSPForwardByName
 #define MF_RegisterSPForward g_fn_RegisterSPForward
 #define MF_UnregisterSPForward g_fn_UnregisterSPForward
-#define MF_GetPlayerFlags g_fn_GetPlayerFlags
-#define MF_GetPlayerEdict g_fn_GetPlayerEdict
-#define MF_Format g_fn_Format
 
 /*** Memory ***/
 void	*operator new(size_t reportedSize);

amxmodx/srvcmd.cpp

@@ -62,18 +62,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 );
 
 		}
@@ -150,15 +138,7 @@ void amx_command(){
 				print_srvconsole( "%s %s\n", Plugin_info.name, Plugin_info.version);
 				print_srvconsole(   "author: %s (%s)\n", Plugin_info.author, Plugin_info.url);
 				print_srvconsole(   "compiled: %s\n", __DATE__ ", " __TIME__);
-#ifdef JIT
+		
-				print_srvconsole(   "Core mode: JIT\n");
-#else
-#ifdef ASM32
-				print_srvconsole(   "Core mode: ASM\n");
-#else
-				print_srvconsole(   "Core mode: Normal\n");
-#endif
-#endif
 		}
 		else if (!strcmp(cmd,"modules"))
 		{
@@ -169,7 +149,7 @@ void amx_command(){
 				int running = 0;
 				int modules = 0;
 
-				CList<CModule,const char *>::iterator a = g_modules.begin();
+				CList<CModule>::iterator a = g_modules.begin();
 
 				while ( a )
 				{
@@ -185,7 +165,8 @@ void amx_command(){
 				}
 
 				print_srvconsole( "%d modules, %d correct\n",modules,running);
-		} else if (!strcmp(cmd, "gpl"))
+		}
+		else if (!strcmp(cmd, "gpl"))
 		{
 			print_srvconsole("AMX Mod X\n");
 			print_srvconsole("\n");
@@ -283,9 +264,10 @@ void plugin_srvcmd()
 								
 								if ((err = amx_Exec( (*a).getPlugin()->getAMX(), &ret , (*a).getFunction() 
 										, 3 , g_srvindex , (*a).getFlags() , (*a).getId() )) != AMX_ERR_NONE)
-								{
+										
-									LogError((*a).getPlugin()->getAMX(), err, "");
+										AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")",
-								}
+										err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName());
+								
 								if ( ret ) break;
 						}
 						

amxmodx/string.cpp

@@ -448,60 +448,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<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)
@@ -521,7 +467,7 @@ static cell AMX_NATIVE_CALL strbreak(AMX *amx, cell *params)	/* 5 param */
 	int LeftMax = params[3];
 	int RightMax = params[5];
 
-	for (i=0; i<l; i++) {
+	for (i=0; i<strlen(string); i++) {
 		if (string[i] == '"' && !quote_flag) {
 			quote_flag = true;
 		} else if (string[i] == '"' && quote_flag) {
@@ -665,6 +611,5 @@ AMX_NATIVE_INFO string_Natives[] = {
   { "str_to_num", strtonum },
   { "trim", amx_trim },
   { "ucfirst", amx_ucfirst },
-  { "strtok", amx_strtok },
   { NULL, NULL }
 };

amxmodx/util.cpp

@@ -79,15 +79,12 @@ 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)
+	if (!gmsgServerName)
 		return;				// :TODO: Maybe output a warning log?
 
-	if (gmsgServerName)
+	MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
-	{
+	WRITE_STRING(name);
-		MESSAGE_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
+	MESSAGE_END();
-		WRITE_STRING(name);
-		MESSAGE_END();
-	}
 
 	char *n = motd;
 	char c = 0;
@@ -107,12 +104,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_BEGIN( MSG_ONE , gmsgServerName, NULL, client );
+	MESSAGE_END();
-		WRITE_STRING( hostname->string );
-		MESSAGE_END();
-	}
 }
 
 void UTIL_IntToString(int value, char *output)

compiler/scasm/Makefile.pl

@@ -1,176 +0,0 @@
-#!/usr/bin/perl
-#(C)2004 AMX Mod X Development Team
-# by David "BAILOPAN" Anderson
-
-# output will occur in bin.x.proc
-# where x is debug or opt and proc is ix86 or amd64
-# You must use this script from the project src dir
-
-#options = 
-# debug - enable gdb debugging
-# amd64 - compile for AMD64
-# proc=ix86 - assumed not amd64
-# clean - clean the specifications above
-
-$PROJECT = "sasm";
-$gccf = "gcc";
-
-@CPP_SOURCE_FILES = ("amx_compiler.cpp", "amx_data.cpp", "amx_define.cpp", "amx_error.cpp", "amx_label.cpp", "amx_macro.cpp", "amx_natives.cpp", "amx_proc.cpp", "amx_parser.cpp", "amx_symbol.cpp", "amxasm.cpp", "cexpr.cpp"); 
-
-@C_SOURCE_FILES = ();
-my %OPTIONS, %OPT;
-
-$OPT{"debug"} = "-g -ggdb";
-$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\"";
-
-$OPTIONS{"include"} = "";
-
-while ($cmd = shift)
-{
-	if ($cmd =~ /amd64/) {
-		$OPTIONS{"amd64"} = 1;
-	} elsif ($cmd =~ /debug/) {
-		$OPTIONS{"debug"} = 1;
-	} elsif ($cmd =~ /proc=i(\d)86/) {
-		$proc = $1;
-		if ($OPTIONS{"amd64"})
-		{
-			die "You cannot compile for i".$proc."86 and AMD64.\n";
-		} else {
-			$OPTIONS{"proc"} = "i".$proc."86";
-		}
-	} elsif ($cmd =~ /clean/) {
-		$OPTIONS{"clean"} = 1;		
-	}
-}
-
-$gcc = `$gccf --version`;
-if ($gcc =~ /2\.9/)
-{
-	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
-} else {
-	$OPT{"opt"} .= " -falign-loops=2 -falign-jumps=2 -falign-functions=2";
-}
-
-if ($OPTIONS{"debug"})
-{
-	$cflags = $OPT{"debug"};
-} else {
-	if (!$OPTIONS{"amd64"})
-	{
-		$proc = $OPTIONS{"proc"};
-		if (!$proc)
-		{
-			$proc = 3;
-		}
-		$cflags = "-march=i".$proc."86 ".$OPT{"opt"};
-	} else {
-		$cflags = $OPT{"opt"};
-	}
-}
-
-if ($OPTIONS{"amd64"})
-{
-	$cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags";
-}
-
-if ($OPTIONS{"debug"})
-{
-	$outdir = "bin.debug";
-} else {
-	$outdir = "bin.opt";
-}
-
-if ($OPTIONS{"amd64"})
-{
-	$outdir .= ".amd64";
-	$bin = $PROJECT."_amd64.so";
-} else {
-	$proc = $OPTIONS{"proc"};
-	if ($proc)
-	{
-		$outdir .= ".i".$proc."86";
-		$bin = $PROJECT."_i".$proc."86.so";
-	} else {
-		$outdir .= ".i386";
-		$bin = $PROJECT."_i386.so";
-	}
-}
-
-unlink("$outdir/$bin");
-if ($OPTIONS{"clean"})
-{
-	`rm $outdir/*.o`;
-	die("Project cleaned.\n");
-}
-
-#create the dirs
-#build link list
-my @LINK;
-for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
-{
-	$file = $CPP_SOURCE_FILES[$i];
-	$file =~ s/\.cpp/\.o/;
-	push(@LINK, $outdir."/".$file);
-}
-for ($i=0; $i<=$#C_SOURCE_FILES; $i++)
-{
-	$file = $C_SOURCE_FILES[$i];
-	$file =~ s/\.c/\.o/;
-	push(@LINK, $outdir."/".$file);
-}
-
-if (!(-d $outdir))
-{
-	mkdir($outdir);
-}
-
-$inc = $OPTIONS{"include"};
-
-for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
-{
-	$file = $CPP_SOURCE_FILES[$i];
-	$ofile = $file;
-	$ofile =~ s/\.cpp/\.o/;
-	$ofile = "$outdir/$ofile";
-	$gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
-	if (-e $ofile)
-	{
-		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
-		if ($file_time > $ofile_time)
-		{
-			print "$gcc\n";
-			`$gcc`;
-		}
-	} else {
-		print "$gcc\n";
-		`$gcc`;
-	}
-}
-
-for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
-{
-	$file = $C_SOURCE_FILES[$i];
-	$ofile = $file;
-	$ofile =~ s/\.c/\.o/;
-	$ofile = "$outdir/$ofile";
-	$gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
-	if (-e $ofile)
-	{
-		$file_time = (stat($file))[9];
-		$ofile_time = (stat($file))[9];
-		if ($file_time > $ofile_time)
-		{
-			print "$gcc\n";
-			`$gcc`;
-		}
-	} else {
-		print "$gcc\n";
-		`$gcc`;
-	}
-}
-
-$gcc = "$gccf $cflags -shared -lstdc++ -ldl -lm @LINK -o $outdir/$bin";
-print "$gcc\n";
-`$gcc`;

configs/amxx.cfg

@@ -69,11 +69,4 @@ amx_extendmap_max 90
 amx_extendmap_step 15
 
 //If you set this to 0, clients cannot chose their language
-amx_client_languages 1
+amx_client_languages 1
-
-// Plugin Debug mode
-// 0 - No debugging (garbage line numbers)
-// 1 - Plugins with "debug" option in plugins.ini are put into debug mode
-// 2 - All plugins are put in debug mode
-// Note - debug mode will affect JIT performance
-amx_debug 1

configs/clcmds.ini

@@ -14,4 +14,4 @@
 "Kick player" 		"amx_kick #%userid%"		"b"	"u"
 "Slay player" 		"amx_slay #%userid%"		"bd"	"u"
 "Slap with 1 dmg." 	"amx_slap #%userid% 1"		"bd"	"u"
-"Ban for 5 minutes" 	"amx_ban #%userid% 5"		"b"	"u"
+"Ban for 5 minutes" 	"amx_ban #%userid% id 5"	"b"	"u"

configs/core.ini

@@ -1,16 +1,16 @@
 ; Configuration file for AMX Mod X
-amxx_logdir	addons/amxmodx/logs
+amxx_logdir	addons/amxx/logs
-amxx_configsdir	addons/amxmodx/configs
+amxx_configsdir	addons/amxx/configs
-amxx_datadir	addons/amxmodx/data
+amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxmodx/configs/modules.ini
+amxx_modules	addons/amxx/configs/modules.ini
-amxx_plugins	addons/amxmodx/configs/plugins.ini
+amxx_plugins	addons/amxx/configs/plugins.ini
-amxx_pluginsdir	addons/amxmodx/plugins
+amxx_pluginsdir	addons/amxx/plugins
-amxx_modulesdir	addons/amxmodx/modules
+amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxmodx/data/vault.ini
+amxx_vault	addons/amxx/data/vault.ini
 
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
 ; 2 - one logfile / map
 ; 3 - HL Logs
-amxx_logging	1
+amx_logging	1

configs/cstrike/amxx.cfg

@@ -85,11 +85,4 @@ amx_statsx_duration 12.0
 amx_statsx_freeze -2.0
 
 //If you set this to 0, clients cannot chose their language
-amx_client_languages 1
+amx_client_languages 1
-
-// Plugin Debug mode
-// 0 - No debugging (garbage line numbers)
-// 1 - Plugins with "debug" option in plugins.ini are put into debug mode
-// 2 - All plugins are put in debug mode
-// Note - debug mode will affect JIT performance
-amx_debug 1

configs/cstrike/core.ini

@@ -1,18 +1,18 @@
 ; Configuration file for AMX Mod X
-amxx_logdir	addons/amxmodx/logs
+amxx_logdir	addons/amxx/logs
-amxx_configsdir	addons/amxmodx/configs
+amxx_configsdir	addons/amxx/configs
-amxx_datadir	addons/amxmodx/data
+amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxmodx/configs/modules.ini
+amxx_modules	addons/amxx/configs/modules.ini
-amxx_plugins	addons/amxmodx/configs/plugins.ini
+amxx_plugins	addons/amxx/configs/plugins.ini
-amxx_pluginsdir	addons/amxmodx/plugins
+amxx_pluginsdir	addons/amxx/plugins
-amxx_modulesdir	addons/amxmodx/modules
+amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxmodx/data/vault.ini
+amxx_vault	addons/amxx/data/vault.ini
-csstats_score	addons/amxmodx/data/csstats.amxx
+csstats_score	addons/amxx/data/csstats.amxx
-csstats		addons/amxmodx/data/csstats.dat
+csstats		addons/amxx/data/csstats.dat
 
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
 ; 2 - one logfile / map
 ; 3 - HL Logs
-amxx_logging	1
+amx_logging	1

configs/cstrike/modules.ini

@@ -50,20 +50,14 @@ fun_amxx.dll
 ;sockets_amxx_i386.so
 ;sockets_amxx.dll
 
-; --------------------------
-; Regular Expression support
-; --------------------------
-;regex_amxx_i386.so
-;regex_amxx.dll
-
 ; ----------------------------------------------------------
 ; Counter-Strike - adds functions specific to Counter-Strike
 ; ----------------------------------------------------------
 ;cstrike_amxx_i386.so
 ;cstrike_amxx.dll
 
-; -----------------------------------------------------
+; ------------------------------------------------
-; CSX - adds functionality for CS statistics and events
+; CS Stats - adds functionality for CS statistical
-; -----------------------------------------------------
+; ------------------------------------------------
-;csx_amxx_i386.so
+;csstats_amxx_i386.so
-;csx_amxx.dll
+;csstats_amxx.dll

configs/cstrike/plugins.ini

@@ -19,7 +19,7 @@ mapsmenu.amxx		; maps menu (vote, changelevel)
 
 ; Chat / Messages
 adminchat.amxx		; console chat commands
-antiflood.amxx		; prevent clients from chat-flooding the server
+;antiflood.amxx		; prevent clients from chat-flooding the server
 scrollmsg.amxx		; displays a scrolling message
 imessage.amxx		; displays information messages
 adminvote.amxx		; vote commands
@@ -35,9 +35,9 @@ statscfg.amxx		; allows to manage stats plugins via menu and commands
 
 ; Counter-Strike
 ;restmenu.amxx		; restrict weapons menu
-;statsx.amxx		; stats on death or round end (CSX Module required!)
+;statsx.amxx		; stats on death or round end (CSStats Module required!)
 ;miscstats.amxx		; bunch of events announcement for Counter-Strike
-;stats_logging.amxx	; weapons stats logging (CSX Module required!)
+;stats_logging.amxx	; weapons stats logging (CSStats Module required!)
 
 
 ; Custom - Add 3rd party plugins here

configs/cstrike/stats.ini

@@ -1,9 +0,0 @@
-;Generated by Stats Configuration Plugin. Do not modify!
-;Variable  Description
-ShowAttackers            ;Show Attackers
-ShowVictims              ;Show Victims
-ShowStats                ;HUD-stats default
-SayRankStats             ;Say /rankstats
-SayRank                  ;Say /rank
-SayTop15                 ;Say /top15
-ShowStats                ;HUD-stats default

configs/custommenuitems.cfg

@@ -1,13 +0,0 @@
-// Here you can add menu items from any plugin to Menus Front-End plugin, aka "amxmodmenu".
-//
-// Usage: "amx_addmenuitem <menu text> <menu command> <access flags> <plugin name>"
-//
-// <menu text>: This is the text displayed in the menu itself for this item.
-// <menu command>: This is the client command used to access the menu.
-// <access flags>: Specify what access flags admins must have to use this menu item. (Check users.ini for access flags.)
-// <plugin name>: This must be the _exact_ (though case insensitive) name of the plugin which holds the menu command. (Use "amxx plugins" in server console, plugin names are listed in Name column.)
-//
-// Example: (be sure to use quotes around parameters with spaces!)
-//
-// amx_addmenuitem "Weapon Arena" "weaponarena_menu" "hu" "Weapon Arena"
-

configs/dod/core.ini

@@ -1,19 +1,19 @@
 ; Configuration file for AMX Mod X
-amxx_logdir	addons/amxmodx/logs
+amxx_logdir	addons/amxx/logs
-amxx_configsdir	addons/amxmodx/configs
+amxx_configsdir	addons/amxx/configs
-amxx_datadir	addons/amxmodx/data
+amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxmodx/configs/modules.ini
+amxx_modules	addons/amxx/configs/modules.ini
-amxx_plugins	addons/amxmodx/configs/plugins.ini
+amxx_plugins	addons/amxx/configs/plugins.ini
-amxx_pluginsdir	addons/amxmodx/plugins
+amxx_pluginsdir	addons/amxx/plugins
-amxx_modulesdir	addons/amxmodx/modules
+amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxmodx/data/vault.ini
+amxx_vault	addons/amxx/data/vault.ini
 
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
 ; 2 - one logfile / map
 ; 3 - HL Logs
-amxx_logging	1
+amx_logging	1
 
-dodstats_score	addons/amxmodx/data/dodstats.amxx
+dodstats_score	addons/amxx/data/dodstats.amxx
-dodstats	addons/amxmodx/data/dodstats.dat
+dodstats	addons/amxx/data/dodstats.dat

configs/dod/cvars.ini

@@ -10,38 +10,29 @@
 "pausable"			"0" "1"					"u"
 "sv_voiceenable"		"0" "1"					"u"
 "mp_chattime"			"0" "1" "3"				"u"
+"mp_logmessages"		"0" "1"					"u"
 "mp_friendlyfire"		"0" "1"					"u"
 "mp_allowspectators"		"0" "1"					"u"
-"mp_flashlight"			"0" "1"					"u"
 "mp_deathmsg"			"0" "1"					"u"
 "mp_fadetoblack"		"0" "1"					"u"
-"mp_tkpenalty"			"0" "3" "6"				"u"
+"mp_tkpenalty"			"-1" "3" "6"				"u"
-"mp_spawnbazookas"		"0" "1"					"u"
+"mp_limitallies30cal"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitalliesgarand"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitalliesbar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitalliescarbine"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitalliesthompson"	"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitalliesgarand"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitalliesgreasegun"	"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitalliesspring"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitalliesbar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitalliesthompson"	"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitallies30cal"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitaxisfg42"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitalliesbazooka"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitaxisfg42s"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitalliesmortar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitaxiskar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitaxisk43"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitaxiskar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitaxismg34"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitaxismg42"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitaxismp40"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitaxismp44"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitaxisscopedkar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitaxisfg42"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitaxisfg42s"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitaxismg34"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitaxismg42"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_combinemglimits"		"0" "1"					"u"
-"mp_limitaxispschreck"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitaxismortar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitbritlight"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitbritassault"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitbritsniper"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitbritlight"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
 "mp_limitbritmg"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitbritpiat"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
+"mp_limitbritsniper"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-"mp_limitbritmortar"		"-1" "1" "2" "3" "4" "5" "6" "0"	"u"
-

configs/dod/modules.ini

@@ -50,12 +50,6 @@ fun_amxx.dll
 ;sockets_amxx_i386.so
 ;sockets_amxx.dll
 
-; --------------------------
-; Regular Expression support
-; --------------------------
-;regex_amxx_i386.so
-;regex_amxx.dll
-
 ; --------------------------------------------------
 ; Day of Defeat Fun - adds functions specific to DoD
 ; --------------------------------------------------

configs/dod/plugins.ini

@@ -19,7 +19,7 @@ mapsmenu.amxx		; maps menu (vote, changelevel)
 
 ; Chat / Messages
 adminchat.amxx		; console chat commands
-antiflood.amxx		; prevent clients from chat-flooding the server
+;antiflood.amxx		; prevent clients from chat-flooding the server
 scrollmsg.amxx		; displays a scrolling message
 imessage.amxx		; displays information messages
 adminvote.amxx		; vote commands

configs/modules.ini

@@ -49,9 +49,3 @@ fun_amxx.dll
 ; --------------------------------
 ;sockets_amxx_i386.so
 ;sockets_amxx.dll
-
-; --------------------------
-; Regular Expression support
-; --------------------------
-;regex_amxx_i386.so
-;regex_amxx.dll

configs/ns/amxx.cfg

@@ -68,23 +68,8 @@ amx_extendmap_max 90
 // Step for each extending
 amx_extendmap_step 15
 
-//If you set this to 0, clients cannot chose their language
-amx_client_languages 1
-
-// Plugin Debug mode
-// 0 - No debugging (garbage line numbers)
-// 1 - Plugins with "debug" option in plugins.ini are put into debug mode
-// 2 - All plugins are put in debug mode
-// Note - debug mode will affect JIT performance
-amx_debug 1
-
 // Ignore the minimum and maximum settings for maps in the mapcycle
 amx_mapnum_ignore 0
 
-// Idle Kicker Settings:
+//If you set this to 0, clients cannot chose their language
-amx_idle_time 120		// Time players must be idle to be kicked
+amx_client_languages 1
-amx_idle_min_players 8		// Minimum players on the server before kicking starts
-amx_idle_ignore_immunity 1	// Kick idle admins with immunity?
-
-// Change this value to alter the frequency (in seconds) players can say /stuck to free themselves.
-//amx_unstuck_frequency 4

configs/ns/maps.ini

@@ -4,26 +4,24 @@
 
 ; Add in your mod's maps here
 
-ns_metal
-ns_caged
-co_sava
 co_angst
+ns_caged
 ns_hera
+ns_metal
 ns_lost
 ns_nothing
 co_faceoff
 ns_mineshaft
 co_daimos
-ns_bast
 ns_origin
 co_kestrel
 ns_tanith
+co_rebirth
 ns_nancy
 ns_veil
 co_core
-co_ulysses
 ns_eclipse
 co_pulse
 ns_ayumi
 ns_agora
-ns_altair
+co_ulysses

configs/ns/modules.ini

@@ -5,8 +5,8 @@
 ; ------------------------------
 ; Fun - provides extra functions
 ; ------------------------------
-;fun_amxx_i386.so
+fun_amxx_i386.so
-;fun_amxx.dll
+fun_amxx.dll
 
 ; ----------------------------------------------------
 ; Engine - provides engine functions core to Half-Life
@@ -50,14 +50,8 @@
 ;sockets_amxx_i386.so
 ;sockets_amxx.dll
 
-; --------------------------
-; Regular Expression support
-; --------------------------
-;regex_amxx_i386.so
-;regex_amxx.dll
-
 ; -----------------
 ; Natural Selection
 ; -----------------
-ns_amxx_i386.so
+;ns_amxx_i386.so
-ns_amxx.dll
+;ns_amxx.dll

configs/ns/plugins.ini

@@ -1,40 +0,0 @@
-; AMX Mod X plugins
-
-; Admin Base - Always one has to be activated
-admin.amxx		; admin base (required for any admin-related)
-;admin_sql.amxx		; admin base - SQL version (comment admin.amxx)
-
-; Basic
-admincmd.amxx		; basic admin console commands
-adminhelp.amxx		; help command for admin console commands
-adminslots.amxx		; slot reservation
-multilingual.amxx	; Multi-Lingual management
-
-; Menus
-menufront.amxx		; front-end for admin menus
-cmdmenu.amxx		; command menu (speech, settings)
-plmenu.amxx		; players menu (kick, ban, client cmds.)
-;telemenu.amxx		; teleport menu (Fun Module required!)
-mapsmenu.amxx		; maps menu (vote, changelevel)
-
-; Chat / Messages
-adminchat.amxx		; console chat commands
-antiflood.amxx		; prevent clients from chat-flooding the server
-scrollmsg.amxx		; displays a scrolling message
-imessage.amxx		; displays information messages
-adminvote.amxx		; vote commands
-
-; Map related
-nextmap.amxx		; displays next map in mapcycle
-mapchooser.amxx		; allows to vote for next map
-timeleft.amxx		; displays time left on map
-
-; Configuration
-pausecfg.amxx		; allows to pause and unpause some plugins
-
-; NS Specific plugins
-idlekicker.amxx		; kicks idle players
-nscommands.amxx		; extra commands for Natural-Selection
-;unstuck.amxx		; Free stuck players (engine & ns modules required!)
-
-; Custom - Add 3rd party plugins here

configs/ns/users.ini

@@ -1,49 +0,0 @@
-; Users configuration file
-; File location: $moddir/addons/amxx/configs/users.ini
-
-; Line starting with ; is a comment
-
-; Access flags:
-; a - immunity (can't be kicked/baned/slayed/slaped and affected by other commmands)
-; b - reservation (can join on reserved slots)
-; c - amx_kick command
-; d - amx_ban and amx_unban commands
-; e - amx_slay and amx_slap commands
-; f - amx_map command
-; g - amx_cvar command (not all cvars will be available)
-; h - amx_cfg command
-; i - amx_chat and other chat commands
-; j - amx_vote and other vote commands
-; k - access to sv_password cvar (by amx_cvar command)
-; l - access to amx_rcon command and rcon_password cvar (by amx_cvar command)
-; m - custom level A (for additional plugins)
-; n - custom level B
-; o - custom level C
-; p - custom level D
-; q - custom level E
-; r - custom level F
-; s - custom level G
-; t - ns commands (amx_random, amx_readyroom, amx_uncomm, amx_alien, amx_marine)
-; u - menu access
-; z - user (no admin)
-
-; Account flags:
-; a - disconnect player on invalid password
-; b - clan tag
-; c - this is steamid/wonid
-; d - this is ip
-; e - password is not checked (only name/ip/steamid needed)
-
-; Password:
-; Add to your autoexec.cfg: setinfo _pw "<password>"
-; Change _pw to the value of amx_password_field
-
-; Format of admin account:
-; <name|ip|steamid> <password> <access flags> <account flags>
-
-; Examples of admin accounts:
-; "STEAM_0:0:123456" "" "abcdefghijklmnopqrstu" "ce"
-; "123.45.67.89" "" "abcdefghijklmnopqrstu" "de"
-; "My Name" "my_password" "abcdefghijklmnopqrstu" "a"
-
-"loopback" "" "abcdefghijklmnopqrstu" "de"

configs/plugins.ini

@@ -19,7 +19,7 @@ mapsmenu.amxx		; maps menu (vote, changelevel)
 
 ; Chat / Messages
 adminchat.amxx		; console chat commands
-antiflood.amxx		; prevent clients from chat-flooding the server
+;antiflood.amxx		; prevent clients from chat-flooding the server
 scrollmsg.amxx		; displays a scrolling message
 imessage.amxx		; displays information messages
 adminvote.amxx		; vote commands

configs/tfc/core.ini

@@ -1,18 +1,18 @@
 ; Configuration file for AMX Mod X
-amxx_logdir	addons/amxmodx/logs
+amxx_logdir	addons/amxx/logs
-amxx_configsdir	addons/amxmodx/configs
+amxx_configsdir	addons/amxx/configs
-amxx_datadir	addons/amxmodx/data
+amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxmodx/configs/modules.ini
+amxx_modules	addons/amxx/configs/modules.ini
-amxx_plugins	addons/amxmodx/configs/plugins.ini
+amxx_plugins	addons/amxx/configs/plugins.ini
-amxx_pluginsdir	addons/amxmodx/plugins
+amxx_pluginsdir	addons/amxx/plugins
-amxx_modulesdir	addons/amxmodx/modules
+amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxmodx/data/vault.ini
+amxx_vault	addons/amxx/data/vault.ini
-tfcstats_score	addons/amxmodx/data/tfcstats.amxx
+tfcstats_score	addons/amxx/data/tfcstats.amxx
-tfcstats	addons/amxmodx/data/tfcstats.dat
+tfcstats	addons/amxx/data/tfcstats.dat
 
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
 ; 2 - one logfile / map
 ; 3 - HL Logs
-amxx_logging	1
+amx_logging	1

configs/tfc/modules.ini

@@ -50,12 +50,6 @@ fun_amxx.dll
 ;sockets_amxx_i386.so
 ;sockets_amxx.dll
 
-; --------------------------
-; Regular Expression support
-; --------------------------
-;regex_amxx_i386.so
-;regex_amxx.dll
-
 ; ------------------------------------------------------------------
 ; Team Fortress Classic X - adds functions and stats specific to TFC
 ; ------------------------------------------------------------------

configs/tfc/plugins.ini

@@ -19,7 +19,7 @@ mapsmenu.amxx		; maps menu (vote, changelevel)
 
 ; Chat / Messages
 adminchat.amxx		; console chat commands
-antiflood.amxx		; prevent clients from chat-flooding the server
+;antiflood.amxx		; prevent clients from chat-flooding the server
 scrollmsg.amxx		; displays a scrolling message
 imessage.amxx		; displays information messages
 adminvote.amxx		; vote commands

configs/ts/core.ini

@@ -1,18 +1,18 @@
 ; Configuration file for AMX Mod X
-amxx_logdir	addons/amxmodx/logs
+amxx_logdir	addons/amxx/logs
-amxx_configsdir	addons/amxmodx/configs
+amxx_configsdir	addons/amxx/configs
-amxx_datadir	addons/amxmodx/data
+amxx_datadir	addons/amxx/data
-amxx_modules	addons/amxmodx/configs/modules.ini
+amxx_modules	addons/amxx/configs/modules.inia
-amxx_plugins	addons/amxmodx/configs/plugins.ini
+mxx_plugins	addons/amxx/configs/plugins.ini
-amxx_pluginsdir	addons/amxmodx/plugins
+amxx_pluginsdir	addons/amxx/plugins
-amxx_modulesdir	addons/amxmodx/modules
+amxx_modulesdir	addons/amxx/modules
-amxx_vault	addons/amxmodx/data/vault.ini
+amxx_vault	addons/amxx/data/vault.ini
-tsstats_score	addons/amxmodx/data/tsstats.amxx
+tsstats_score	addons/amxx/data/tsstats.amxx
-tsstats		addons/amxmodx/data/tsstats.dat
+tsstats		addons/amxx/data/tsstats.dat
 
 ; Logging mode
 ; 0 - no logging
 ; 1 - one logfile / day
 ; 2 - one logfile / map
 ; 3 - HL Logs
-amxx_logging	1
+amx_logging	1

configs/ts/modules.ini

@@ -50,12 +50,6 @@ fun_amxx.dll
 ;sockets_amxx_i386.so
 ;sockets_amxx.dll
 
-; --------------------------
-; Regular Expression support
-; --------------------------
-;regex_amxx_i386.so
-;regex_amxx.dll
-
 ; -----------------------------------------------------------
 ; The Specialists X - adds functions and stats specific to TS
 ; -----------------------------------------------------------

configs/ts/plugins.ini

@@ -19,7 +19,7 @@ mapsmenu.amxx		; maps menu (vote, changelevel)
 
 ; Chat / Messages
 adminchat.amxx		; console chat commands
-antiflood.amxx		; prevent clients from chat-flooding the server
+;antiflood.amxx		; prevent clients from chat-flooding the server
 scrollmsg.amxx		; displays a scrolling message
 imessage.amxx		; displays information messages
 adminvote.amxx		; vote commands

dlls/csstats2/csstats/CRank.cpp

@@ -130,7 +130,7 @@ void RankSystem::clear(){
 
 bool RankSystem::loadCalc(const char* filename, char* error)
 {
-	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error,0)!=AMX_ERR_NONE)||
+	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr1, &calc.physAddr1)!=AMX_ERR_NONE)||
 		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr2, &calc.physAddr2)!=AMX_ERR_NONE)||
 		(MF_AmxFindPublic(&calc.amx,"get_score",&calc.func)!=AMX_ERR_NONE)){
@@ -306,3 +306,4 @@ void RankSystem::saveRank( const char* filename )
 	
 	fclose(bfp);
 }
+

dlls/csstats2/csstats/CRank.h

@@ -119,4 +119,5 @@ public:
 };
 
 
-#endif
+#endif
+

dlls/csstats2/csstats/Makefile.pl

@@ -15,7 +15,6 @@
 $PROJECT = "csstats_amxx";
 $sdk = "../../../hlsdk/SourceCode";
 $mm = "../../../metamod/metamod";
-$gccf = "gcc";
 
 @CPP_SOURCE_FILES = ("amxxmodule.cpp", "CMisc.cpp", "usermsg.cpp", "meta_api.cpp", "rank.cpp", "CRank.cpp");
 
@@ -23,7 +22,7 @@ $gccf = "gcc";
 my %OPTIONS, %OPT;
 
 $OPT{"debug"} = "-g -ggdb";
-$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\" -fno-exceptions -fno-rtti";
+$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\"";
 
 $OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_shared -I$sdk/dlls";
 
@@ -46,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `$gccf --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -135,11 +134,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
+		$ofile_time = (stat($file))[9];
 		if ($file_time > $ofile_time)
 		{
 			print "$gcc\n";
@@ -161,7 +160,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
+		$ofile_time = (stat($file))[9];
 		if ($file_time > $ofile_time)
 		{
 			print "$gcc\n";
@@ -173,6 +172,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
 print "$gcc\n";
 `$gcc`;

dlls/csstats2/csstats/amxxmodule.cpp

@@ -2477,11 +2477,6 @@ PFN_CELL_TO_REAL			g_fn_CellToReal;
 PFN_REGISTER_SPFORWARD		g_fn_RegisterSPForward;
 PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 PFN_UNREGISTER_SPFORWARD	g_fn_UnregisterSPForward;
-PFN_MERGEDEFINITION_FILE	g_fn_MergeDefinition_File;
-PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-PFN_GETPLAYERFLAGS			g_fn_GetPlayerFlags;
-PFN_GET_PLAYER_EDICT		g_fn_GetPlayerEdict;
-PFN_FORMAT					g_fn_Format;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2525,8 +2520,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("PrintSrvConsole", g_fn_PrintSrvConsole, PFN_PRINT_SRVCONSOLE);
 	REQFUNC("GetModname", g_fn_GetModname, PFN_GET_MODNAME);
 	REQFUNC("Log", g_fn_Log, PFN_LOG);
-	REQFUNC("MergeDefinitionFile", g_fn_MergeDefinition_File, PFN_MERGEDEFINITION_FILE);
-	REQFUNC("Format", g_fn_Format, PFN_FORMAT);
 
 	// Amx scripts
 	REQFUNC("GetAmxScript", g_fn_GetAmxScript, PFN_GET_AMXSCRIPT);
@@ -2534,7 +2527,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("FindAmxScriptByName", g_fn_FindAmxScriptByName, PFN_FIND_AMXSCRIPT_BYNAME);
 	REQFUNC("LoadAmxScript", g_fn_LoadAmxScript, PFN_LOAD_AMXSCRIPT);
 	REQFUNC("UnloadAmxScript", g_fn_UnloadAmxScript, PFN_UNLOAD_AMXSCRIPT);
-    REQFUNC("GetAmxScriptName", g_fn_GetAmxScriptName, PFN_GET_AMXSCRIPTNAME);
 
 	// String / mem in amx scripts support
 	REQFUNC("SetAmxString", g_fn_SetAmxString, PFN_SET_AMXSTRING);
@@ -2548,7 +2540,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("amx_Execv", g_fn_AmxExecv, PFN_AMX_EXECV);
 	REQFUNC("amx_FindPublic", g_fn_AmxFindPublic, PFN_AMX_FINDPUBLIC);
 	REQFUNC("amx_Allot", g_fn_AmxAllot, PFN_AMX_ALLOT);
-	REQFUNC("amx_FindNative", g_fn_AmxFindNative, PFN_AMX_FINDNATIVE);
 
 	// Natives / Forwards
 	REQFUNC("AddNatives", g_fn_AddNatives, PFN_ADD_NATIVES);
@@ -2581,8 +2572,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("IsPlayerHLTV", g_fn_IsPlayerHLTV, PFN_IS_PLAYER_HLTV);
 	REQFUNC("GetPlayerArmor", g_fn_GetPlayerArmor, PFN_GET_PLAYER_ARMOR);
 	REQFUNC("GetPlayerHealth", g_fn_GetPlayerHealth, PFN_GET_PLAYER_HEALTH);
-	REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS);
-	REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT);
 
 	// Memory
 	REQFUNC_OPT("Allocator", g_fn_Allocator, PFN_ALLOCATOR);
@@ -2677,14 +2666,11 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_AmxExecv(0, 0, 0, 0, 0);
 	MF_AmxFindPublic(0, 0, 0);
 	MF_AmxAllot(0, 0, 0, 0);
-	MF_LoadAmxScript(0, 0, 0, 0, 0);
+	MF_LoadAmxScript(0, 0, 0, 0);
 	MF_UnloadAmxScript(0, 0);
 	MF_RegisterSPForward(0, 0, 0, 0, 0, 0);
 	MF_RegisterSPForwardByName(0, 0, 0, 0, 0, 0);
 	MF_UnregisterSPForward(0);
-	MF_GetPlayerFrags(0);
-	MF_GetPlayerEdict(0);
-	MF_Format("", 4, "str");
 }
 #endif
 
@@ -2801,7 +2787,7 @@ void	*operator new(size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	*operator new[](size_t reportedSize)
@@ -2814,7 +2800,7 @@ void	*operator new[](size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 // Microsoft memory tracking operators
@@ -2828,7 +2814,7 @@ void	*operator new(size_t reportedSize, const char *sourceFile, int sourceLine)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine)
 {
@@ -2840,7 +2826,7 @@ void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	operator delete(void *reportedAddress)

dlls/csstats2/csstats/amxxmodule.h

@@ -204,9 +204,11 @@ typedef struct tagAMX {
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
   cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
     int reloc_size      PACKED; /* required temporary buffer for relocations */
     long code_size      PACKED; /* estimated memory footprint of the native code */
+  #endif
 } AMX;
 
 enum {
@@ -238,14 +240,6 @@ enum {
   AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
 };
 
-#if !defined AMX_NO_ALIGN
-  #if defined __linux__
-    #pragma pack()    /* reset default packing */
-  #else
-    #pragma pack(pop) /* reset previous packing */
-  #endif
-#endif
-
 
 // ***** declare functions *****
 
@@ -1932,7 +1926,6 @@ typedef int				(*PFN_IS_PLAYER_BOT)			(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_AUTHORIZED)		(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_TIME)			(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_PLAYTIME)		(int /*id*/);
-typedef int			(*PFN_GETPLAYERFLAGS) 			(int /* id*/);
 typedef int				(*PFN_GET_PLAYER_CURWEAPON)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_TEAMID)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_DEATHS)		(int /*id*/);
@@ -1944,12 +1937,6 @@ typedef int				(*PFN_IS_PLAYER_CONNECTING)		(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_HLTV)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_ARMOR)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_HEALTH)		(int /*id*/);
-#ifdef USE_METAMOD
-typedef edict_t *		(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#else
-typedef void *			(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#endif
-
 typedef void *			(*PFN_ALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
 														 const unsigned int /*type*/, const size_t /*size*/);
 typedef void *			(*PFN_REALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
@@ -1960,16 +1947,13 @@ typedef int				(*PFN_AMX_EXEC)					(AMX* /*amx*/, cell* /*return val*/, int /*in
 typedef int				(*PFN_AMX_EXECV)				(AMX* /*amx*/, cell* /*return val*/, int /*index*/, int /*numparams*/, cell[] /*params*/);
 typedef int				(*PFN_AMX_ALLOT)				(AMX* /*amx*/, int /*length*/, cell* /*amx_addr*/, cell** /*phys_addr*/);
 typedef int				(*PFN_AMX_FINDPUBLIC)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
-typedef int				(*PFN_AMX_FINDNATIVE)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
+typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/);
-typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/, int /* debug */);
 typedef int				(*PFN_UNLOAD_AMXSCRIPT)			(AMX* /*amx*/,void** /*code*/);
 typedef cell			(*PFN_REAL_TO_CELL)				(REAL /*x*/);
 typedef REAL			(*PFN_CELL_TO_REAL)				(cell /*x*/);
 typedef int				(*PFN_REGISTER_SPFORWARD)		(AMX * /*amx*/, int /*func*/, ... /*params*/);
 typedef int				(*PFN_REGISTER_SPFORWARD_BYNAME)	(AMX * /*amx*/, const char * /*funcName*/, ... /*params*/);
 typedef void			(*PFN_UNREGISTER_SPFORWARD)		(int /*id*/);
-typedef	void			(*PFN_MERGEDEFINITION_FILE)		(const char * /*filename*/);
-typedef const char *	(*PFN_FORMAT)					(const char * /*fmt*/, ... /*params*/);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
@@ -2021,11 +2005,6 @@ extern PFN_CELL_TO_REAL				g_fn_CellToReal;
 extern PFN_REGISTER_SPFORWARD		g_fn_RegisterSPForward;
 extern PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 extern PFN_UNREGISTER_SPFORWARD		g_fn_UnregisterSPForward;
-extern PFN_MERGEDEFINITION_FILE		g_fn_MergeDefinition_File;
-extern PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-extern PFN_GETPLAYERFLAGS		g_fn_GetPlayerFlags;
-extern PFN_GET_PLAYER_EDICT			g_fn_GetPlayerEdict;
-extern PFN_FORMAT					g_fn_Format;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
@@ -2074,9 +2053,6 @@ cell			amx_ftoc					(float x) { }
 int				MF_RegisterSPForwardByName	(AMX * amx, const char *str, ...) { }
 int				MF_RegisterSPForward		(AMX * amx, int func, ...) { }
 void			MF_UnregisterSPForward		(int id) { }
-int				MF_GetPlayerFlags			(int id) { }
-edict_t*		MF_GetPlayerEdict			(int id) { }
-const char *	MF_Format					(const char *fmt, ...) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
@@ -2122,18 +2098,13 @@ void MF_Log(const char *fmt, ...);
 #define MF_AmxExecv g_fn_AmxExecv
 #define MF_AmxFindPublic g_fn_AmxFindPublic
 #define MF_AmxAllot g_fn_AmxAllot
-#define MF_AmxFindNative g_fn_AmxFindNative
 #define MF_LoadAmxScript g_fn_LoadAmxScript
 #define MF_UnloadAmxScript g_fn_UnloadAmxScript
-#define MF_MergeDefinitionFile g_fn_MergeDefinition_File
 #define amx_ctof g_fn_CellToReal
 #define amx_ftoc g_fn_RealToCell
 #define MF_RegisterSPForwardByName g_fn_RegisterSPForwardByName
 #define MF_RegisterSPForward g_fn_RegisterSPForward
 #define MF_UnregisterSPForward g_fn_UnregisterSPForward
-#define MF_GetPlayerFlags g_fn_GetPlayerFlags
-#define MF_GetPlayerEdict g_fn_GetPlayerEdict
-#define MF_Format g_fn_Format;
 
 /*** Memory ***/
 void	*operator new(size_t reportedSize);

dlls/csstats2/csstats/meta_api.cpp

@@ -26,6 +26,7 @@ bool rankBots;
 int gmsgCurWeapon;
 int gmsgDeathMsg;
 int gmsgDamage;
+int gmsgDamageEnd;
 int gmsgWeaponList;
 int gmsgResetHUD;
 int gmsgAmmoX;
@@ -56,6 +57,7 @@ struct sUserMsg {
 } g_user_msg[] = {
 	{ "CurWeapon" , &gmsgCurWeapon , Client_CurWeapon, false },
 	{ "Damage" , &gmsgDamage,Client_Damage, false  },	
+	{ "Damage" , &gmsgDamageEnd, Client_Damage_End, true },
 	{ "WeaponList" , &gmsgWeaponList, Client_WeaponList, false },
 	{ "ResetHUD" , &gmsgResetHUD,Client_ResetHUD, true },
 	{ "AmmoX" , &gmsgAmmoX, Client_AmmoX , false },
@@ -287,7 +289,7 @@ void OnMetaAttach() {
 
 void OnAmxxAttach(){
 	MF_AddNatives(stats_Natives);
-	const char* path =  get_localinfo("csstats_score");
+	const char* path =  get_localinfo("csstats_score","addons/amxx/data/csstats.amxx");
 	if ( path && *path ) 
 	{
 		char error[128];
@@ -297,7 +299,7 @@ void OnAmxxAttach(){
 	if ( !g_rank.begin() )
 	{		
 		g_rank.loadRank( MF_BuildPathname("%s",
-			get_localinfo("csstats") ) );
+			get_localinfo("csstats","addons/amxx/data/csstats.dat") ) );
 	}
 }
 

dlls/csstats2/csstats/moduleconfig.h

@@ -4,7 +4,7 @@
 #define __MODULECONFIG_H__
 
 // Module info
-#define MODULE_NAME "CSStats"
+#define MODULE_NAME "CS Stats"
 #define MODULE_VERSION "0.20"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"

dlls/csstats2/csstats/rank.h

@@ -52,6 +52,7 @@ extern int mPlayerIndex;
 extern int mState;
 
 extern int gmsgCurWeapon;
+extern int gmsgDamageEnd;
 extern int gmsgDamage;
 extern int gmsgWeaponList;
 extern int gmsgResetHUD;
@@ -68,6 +69,7 @@ void Client_CurWeapon(void*);
 void Client_Damage(void*);
 void Client_WeaponList(void*);
 void Client_AmmoPickup(void*);
+void Client_Damage_End(void*);
 void Client_ScoreInfo(void*);
 void Client_ResetHUD(void*);
 

dlls/csstats2/csstats/usermsg.cpp

@@ -5,6 +5,12 @@
 
 weaponsVault weaponData[MAX_WEAPONS];
 
+int damage;
+int TK;
+int weapon;
+int aim;
+CPlayer *pAttacker;
+
 int g_Planter;
 int g_Defuser;
 
@@ -46,13 +52,6 @@ void Client_WeaponList(void* mValue){
 
 void Client_Damage(void* mValue){
   static int bits;
-  static int damage;
-  static int TK;
-  static int weapon;
-  static int aim;
-  static bool ignore;
-  static CPlayer *pAttacker;
-
   switch (mState++) {
   case 1: 
     damage = *(int*)mValue;
@@ -61,7 +60,7 @@ void Client_Damage(void* mValue){
     bits = *(int*)mValue;
     break;
   case 3:
-    if ( ignore = (!mPlayer || !damage || !*(float*)mValue || bits) )  break;
+    if (!mPlayer || !damage || !*(float*)mValue || bits)  break;
     edict_t *enemy;
 	enemy = mPlayer->pEdict->v.dmg_inflictor;
     
@@ -80,19 +79,19 @@ void Client_Damage(void* mValue){
 	}
 	if( g_grenades.find(enemy , &pAttacker , &weapon ) )
 		pAttacker->saveHit( mPlayer , weapon , damage, aim );
-	break;
+  }
-  case 4:
+}
-	if ( ignore || mPlayer->IsAlive() )
+
-		break;
+void Client_Damage_End(void* mValue){
+	if ( !mPlayer || !damage || mPlayer->IsAlive() )
+		return;
+	 
 	if ( !pAttacker )
-		pAttacker = mPlayer;
+			pAttacker = mPlayer;
 	TK = 0;
 	if ( (mPlayer->teamId == pAttacker->teamId) && (mPlayer != pAttacker) )
-		TK = 1;
+			TK = 1;
 	pAttacker->saveKill(mPlayer,weapon,( aim == 1 ) ? 1:0 ,TK);
-
-	break;
-  }
 }
 
 void Client_CurWeapon(void* mValue){

dlls/cstrike/Makefile.pl

@@ -15,7 +15,6 @@
 $PROJECT = "cstrike_amxx";
 $sdk = "../hlsdk/SourceCode";
 $mm = "../metamod/metamod";
-$gccf = "gcc";
 
 @CPP_SOURCE_FILES = ("CstrikePlayer.cpp", "cstrike.cpp", "amxxmodule.cpp");
 
@@ -23,7 +22,7 @@ $gccf = "gcc";
 my %OPTIONS, %OPT;
 
 $OPT{"debug"} = "-g -ggdb";
-$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\" -fno-exceptions -fno-rtti";
+$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\"";
 
 $OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_shared -I$sdk/dlls";
 
@@ -46,7 +45,7 @@ while ($cmd = shift)
 	}
 }
 
-$gcc = `$gccf --version`;
+$gcc = `gcc --version`;
 if ($gcc =~ /2\.9/)
 {
 	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
@@ -73,7 +72,7 @@ if ($OPTIONS{"debug"})
 
 if ($OPTIONS{"amd64"})
 {
-	$cflags = " -m64 -DSMALL_CELL_SIZE=64 $cflags";
+	$cflags .= "-m64 -DSMALL_CELLSIZE=64 $cflags";
 }
 
 if ($OPTIONS{"debug"})
@@ -135,11 +134,11 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	$ofile = $file;
 	$ofile =~ s/\.cpp/\.o/;
 	$ofile = "$outdir/$ofile";
-	$gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
+	$gcc = "gcc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
+		$ofile_time = (stat($file))[9];
 		if ($file_time > $ofile_time)
 		{
 			print "$gcc\n";
@@ -161,7 +160,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	if (-e $ofile)
 	{
 		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
+		$ofile_time = (stat($file))[9];
 		if ($file_time > $ofile_time)
 		{
 			print "$gcc\n";
@@ -173,6 +172,5 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
 	}
 }
 
-$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
+$gcc = "gcc $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
-print "$gcc\n";
 `$gcc`;

dlls/cstrike/amxxmodule.cpp

@@ -45,16 +45,6 @@
 enginefuncs_t g_engfuncs;
 globalvars_t  *gpGlobals;
 
-
-
-DLL_FUNCTIONS *g_pFunctionTable;
-DLL_FUNCTIONS *g_pFunctionTable_Post;
-enginefuncs_t *g_pengfuncsTable;
-enginefuncs_t *g_pengfuncsTable_Post;
-NEW_DLL_FUNCTIONS *g_pNewFunctionsTable;
-NEW_DLL_FUNCTIONS *g_pNewFunctionsTable_Post;
-
-
 // GetEntityAPI2 functions
 static DLL_FUNCTIONS g_EntityAPI_Table = 
 {
@@ -2124,7 +2114,6 @@ C_DLLEXPORT int GetEntityAPI2(DLL_FUNCTIONS *pFunctionTable, int *interfaceVersi
 		return(FALSE);
 	}
 	memcpy(pFunctionTable, &g_EntityAPI_Table, sizeof(DLL_FUNCTIONS));
-	g_pFunctionTable=pFunctionTable;
 	return(TRUE);
 }
 
@@ -2142,7 +2131,7 @@ C_DLLEXPORT int GetEntityAPI2_Post(DLL_FUNCTIONS *pFunctionTable, int *interface
 		return(FALSE);
 	}
 	memcpy( pFunctionTable, &g_EntityAPI_Post_Table, sizeof( DLL_FUNCTIONS ) );
-	g_pFunctionTable_Post=pFunctionTable;
+
 	return(TRUE);
 }
 
@@ -2165,7 +2154,6 @@ C_DLLEXPORT int GetEngineFunctions(enginefuncs_t *pengfuncsFromEngine, int *inte
 		return(FALSE);
 	}
 	memcpy(pengfuncsFromEngine, &g_EngineFuncs_Table, sizeof(enginefuncs_t));
-	g_pengfuncsTable=pengfuncsFromEngine;
 	return TRUE;
 }
 
@@ -2183,7 +2171,6 @@ C_DLLEXPORT int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine, int
 		return(FALSE);
 	}
 	memcpy(pengfuncsFromEngine, &g_EngineFuncs_Post_Table, sizeof(enginefuncs_t));
-	g_pengfuncsTable_Post=pengfuncsFromEngine;
 	return TRUE;
 
 }
@@ -2208,7 +2195,6 @@ C_DLLEXPORT int GetNewDLLFunctions(NEW_DLL_FUNCTIONS *pNewFunctionTable,
 		return(FALSE);
 	}
 	memcpy(pNewFunctionTable, &g_NewFuncs_Table, sizeof(NEW_DLL_FUNCTIONS));
-	g_pNewFunctionsTable=pNewFunctionTable;
 	return TRUE;
 }
 
@@ -2226,7 +2212,6 @@ C_DLLEXPORT int GetNewDLLFunctions_Post( NEW_DLL_FUNCTIONS *pNewFunctionTable, i
 		return(FALSE);
 	}
 	memcpy(pNewFunctionTable, &g_NewFuncs_Post_Table, sizeof(NEW_DLL_FUNCTIONS));
-	g_pNewFunctionsTable_Post=pNewFunctionTable;
 	return TRUE;
 }
 
@@ -2454,14 +2439,11 @@ PFN_GET_AMXSTRINGLEN		g_fn_GetAmxStringLen;
 PFN_FORMAT_AMXSTRING		g_fn_FormatAmxString;
 PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 PFN_LOG						g_fn_Log;
-PFN_LOG_ERROR				g_fn_LogErrorFunc;
 PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 PFN_REGISTER_FORWARD		g_fn_RegisterForward;
 PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
 PFN_PREPARE_CELLARRAY		g_fn_PrepareCellArray;
 PFN_PREPARE_CHARARRAY		g_fn_PrepareCharArray;
-PFN_PREPARE_CELLARRAY_A		g_fn_PrepareCellArrayA;
-PFN_PREPARE_CHARARRAY_A		g_fn_PrepareCharArrayA;
 PFN_IS_PLAYER_VALID			g_fn_IsPlayerValid;
 PFN_GET_PLAYER_NAME			g_fn_GetPlayerName;
 PFN_GET_PLAYER_IP			g_fn_GetPlayerIP;
@@ -2471,7 +2453,6 @@ PFN_IS_PLAYER_AUTHORIZED	g_fn_IsPlayerAuthorized;
 PFN_GET_PLAYER_TIME			g_fn_GetPlayerTime;
 PFN_GET_PLAYER_PLAYTIME		g_fn_GetPlayerPlayTime;
 PFN_GET_PLAYER_CURWEAPON	g_fn_GetPlayerCurweapon;
-PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 PFN_GET_PLAYER_TEAMID		g_fn_GetPlayerTeamID;
 PFN_GET_PLAYER_DEATHS		g_fn_GetPlayerDeaths;
 PFN_GET_PLAYER_MENU			g_fn_GetPlayerMenu;
@@ -2496,11 +2477,6 @@ PFN_CELL_TO_REAL			g_fn_CellToReal;
 PFN_REGISTER_SPFORWARD		g_fn_RegisterSPForward;
 PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 PFN_UNREGISTER_SPFORWARD	g_fn_UnregisterSPForward;
-PFN_MERGEDEFINITION_FILE	g_fn_MergeDefinition_File;
-PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-PFN_GETPLAYERFLAGS			g_fn_GetPlayerFlags;
-PFN_GET_PLAYER_EDICT		g_fn_GetPlayerEdict;
-PFN_FORMAT					g_fn_Format;
 
 // *** Exports ***
 C_DLLEXPORT int AMXX_Query(int *interfaceVersion, amxx_module_info_s *moduleInfo)
@@ -2544,9 +2520,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("PrintSrvConsole", g_fn_PrintSrvConsole, PFN_PRINT_SRVCONSOLE);
 	REQFUNC("GetModname", g_fn_GetModname, PFN_GET_MODNAME);
 	REQFUNC("Log", g_fn_Log, PFN_LOG);
-	REQFUNC("LogError", g_fn_LogErrorFunc, PFN_LOG_ERROR);
-	REQFUNC("MergeDefinitionFile", g_fn_MergeDefinition_File, PFN_MERGEDEFINITION_FILE);
-	REQFUNC("Format", g_fn_Format, PFN_FORMAT);
 
 	// Amx scripts
 	REQFUNC("GetAmxScript", g_fn_GetAmxScript, PFN_GET_AMXSCRIPT);
@@ -2554,7 +2527,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("FindAmxScriptByName", g_fn_FindAmxScriptByName, PFN_FIND_AMXSCRIPT_BYNAME);
 	REQFUNC("LoadAmxScript", g_fn_LoadAmxScript, PFN_LOAD_AMXSCRIPT);
 	REQFUNC("UnloadAmxScript", g_fn_UnloadAmxScript, PFN_UNLOAD_AMXSCRIPT);
-    REQFUNC("GetAmxScriptName", g_fn_GetAmxScriptName, PFN_GET_AMXSCRIPTNAME);
 
 	// String / mem in amx scripts support
 	REQFUNC("SetAmxString", g_fn_SetAmxString, PFN_SET_AMXSTRING);
@@ -2568,7 +2540,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("amx_Execv", g_fn_AmxExecv, PFN_AMX_EXECV);
 	REQFUNC("amx_FindPublic", g_fn_AmxFindPublic, PFN_AMX_FINDPUBLIC);
 	REQFUNC("amx_Allot", g_fn_AmxAllot, PFN_AMX_ALLOT);
-	REQFUNC("amx_FindNative", g_fn_AmxFindNative, PFN_AMX_FINDNATIVE);
 
 	// Natives / Forwards
 	REQFUNC("AddNatives", g_fn_AddNatives, PFN_ADD_NATIVES);
@@ -2580,8 +2551,7 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("ExecuteForward", g_fn_ExecuteForward, PFN_EXECUTE_FORWARD);
 	REQFUNC("PrepareCellArray", g_fn_PrepareCellArray, PFN_PREPARE_CELLARRAY);
 	REQFUNC("PrepareCharArray", g_fn_PrepareCharArray, PFN_PREPARE_CHARARRAY);
-	REQFUNC("PrepareCellArrayA", g_fn_PrepareCellArrayA, PFN_PREPARE_CELLARRAY_A);
+
-	REQFUNC("PrepareCharArrayA", g_fn_PrepareCharArrayA, PFN_PREPARE_CHARARRAY_A);
 	// Player
 	REQFUNC("IsPlayerValid", g_fn_IsPlayerValid, PFN_IS_PLAYER_VALID);
 	REQFUNC("GetPlayerName", g_fn_GetPlayerName, PFN_GET_PLAYER_NAME);
@@ -2593,7 +2563,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("GetPlayerPlayTime", g_fn_GetPlayerPlayTime, PFN_GET_PLAYER_PLAYTIME);
 	REQFUNC("GetPlayerCurweapon", g_fn_GetPlayerCurweapon, PFN_GET_PLAYER_CURWEAPON);
 	REQFUNC("GetPlayerTeamID", g_fn_GetPlayerTeamID, PFN_GET_PLAYER_TEAMID);
-	REQFUNC("GetPlayerTeam",g_fn_GetPlayerTeam, PFN_GET_PLAYER_TEAM);
 	REQFUNC("GetPlayerDeaths", g_fn_GetPlayerDeaths, PFN_GET_PLAYER_DEATHS);
 	REQFUNC("GetPlayerMenu", g_fn_GetPlayerMenu, PFN_GET_PLAYER_MENU);
 	REQFUNC("GetPlayerKeys", g_fn_GetPlayerKeys, PFN_GET_PLAYER_KEYS);
@@ -2603,8 +2572,6 @@ C_DLLEXPORT int AMXX_Attach(PFN_REQ_FNPTR reqFnptrFunc)
 	REQFUNC("IsPlayerHLTV", g_fn_IsPlayerHLTV, PFN_IS_PLAYER_HLTV);
 	REQFUNC("GetPlayerArmor", g_fn_GetPlayerArmor, PFN_GET_PLAYER_ARMOR);
 	REQFUNC("GetPlayerHealth", g_fn_GetPlayerHealth, PFN_GET_PLAYER_HEALTH);
-	REQFUNC("GetPlayerFlags", g_fn_GetPlayerFlags, PFN_GETPLAYERFLAGS);
-	REQFUNC("GetPlayerEdict", g_fn_GetPlayerEdict, PFN_GET_PLAYER_EDICT);
 
 	// Memory
 	REQFUNC_OPT("Allocator", g_fn_Allocator, PFN_ALLOCATOR);
@@ -2651,18 +2618,6 @@ void MF_Log(const char *fmt, ...)
 	g_fn_Log("[%s] %s", MODULE_NAME, msg);
 }
 
-void MF_LogError(AMX *amx, int err, const char *fmt, ...)
-{
-	// :TODO: Overflow possible here
-	char msg[3072];
-	va_list arglst;
-	va_start(arglst, fmt);
-	vsprintf(msg, fmt, arglst);
-	va_end(arglst);
-
-	g_fn_LogErrorFunc(amx, err, "[%s] %s", MODULE_NAME, msg);
-}
-
 
 #ifdef _DEBUG
 // validate macros
@@ -2683,14 +2638,11 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetAmxStringLen(NULL);
 	MF_CopyAmxMemory(NULL, NULL, 0);
 	MF_Log("str", "str", 0);
-	MF_LogError(NULL, 0, NULL);
 	MF_RaiseAmxError(NULL, 0);
 	MF_RegisterForward("str", (ForwardExecType)0, 0, 0, 0);
 	MF_ExecuteForward(0, 0, 0);
 	MF_PrepareCellArray(NULL, 0);
 	MF_PrepareCharArray(NULL, 0);
-	MF_PrepareCellArrayA(NULL, 0, true);
-	MF_PrepareCharArrayA(NULL, 0, true);
 	MF_IsPlayerValid(0);
 	MF_GetPlayerName(0);
 	MF_GetPlayerIP(0);
@@ -2701,7 +2653,6 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_GetPlayerPlayTime(0);
 	MF_GetPlayerCurweapon(0);
 	MF_GetPlayerTeamID(0);
-	MF_GetPlayerTeam(0);
 	MF_GetPlayerDeaths(0);
 	MF_GetPlayerMenu(0);
 	MF_GetPlayerKeys(0);
@@ -2715,14 +2666,11 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_AmxExecv(0, 0, 0, 0, 0);
 	MF_AmxFindPublic(0, 0, 0);
 	MF_AmxAllot(0, 0, 0, 0);
-	MF_LoadAmxScript(0, 0, 0, 0, 0);
+	MF_LoadAmxScript(0, 0, 0, 0);
 	MF_UnloadAmxScript(0, 0);
 	MF_RegisterSPForward(0, 0, 0, 0, 0, 0);
 	MF_RegisterSPForwardByName(0, 0, 0, 0, 0, 0);
 	MF_UnregisterSPForward(0);
-	MF_GetPlayerFrags(0);
-	MF_GetPlayerEdict(0);
-	MF_Format("", 4, "str");
 }
 #endif
 
@@ -2839,7 +2787,7 @@ void	*operator new(size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	*operator new[](size_t reportedSize)
@@ -2852,7 +2800,7 @@ void	*operator new[](size_t reportedSize)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 // Microsoft memory tracking operators
@@ -2866,7 +2814,7 @@ void	*operator new(size_t reportedSize, const char *sourceFile, int sourceLine)
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine)
 {
@@ -2878,7 +2826,7 @@ void	*operator new[](size_t reportedSize, const char *sourceFile, int sourceLine
 		return ptr;
 
 	// allocation failed
-	return NULL;
+	throw std::bad_alloc();
 }
 
 void	operator delete(void *reportedAddress)

dlls/cstrike/amxxmodule.h

@@ -55,7 +55,7 @@ struct amxx_module_info_s
 // The next section is copied from the amx.h file
 // Copyright (c) ITB CompuPhase, 1997-2004
 
-#if defined __LCC__ || defined __DMC__ || defined __linux__ || defined __GNUC__
+#if defined __LCC__ || defined __DMC__ || defined __linux__
   #include <stdint.h>
 #elif !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
   /* The ISO C99 defines the int16_t and int_32t types. If the compiler got
@@ -204,9 +204,11 @@ typedef struct tagAMX {
   cell reset_stk        PACKED;
   cell reset_hea        PACKED;
   cell sysreq_d         PACKED; /* relocated address/value for the SYSREQ.D opcode */
+  #if defined JIT
     /* support variables for the JIT */
     int reloc_size      PACKED; /* required temporary buffer for relocations */
     long code_size      PACKED; /* estimated memory footprint of the native code */
+  #endif
 } AMX;
 
 enum {
@@ -238,14 +240,6 @@ enum {
   AMX_ERR_DOMAIN,       /* domain error, expression result does not fit in range */
 };
 
-#if !defined AMX_NO_ALIGN
-  #if defined __linux__
-    #pragma pack()    /* reset default packing */
-  #else
-    #pragma pack(pop) /* reset previous packing */
-  #endif
-#endif
-
 
 // ***** declare functions *****
 
@@ -263,9 +257,9 @@ void FN_META_QUERY(void);
 void FN_META_ATTACH(void);
 #endif // FN_META_ATTACH
 
-#ifdef FN_META_DETACH
+#ifdef FN_META_DETTACH
-void FN_META_DETACH(void);
+void FN_META_DETTACH(void);
-#endif // FN_META_DETACH
+#endif // FN_META_DETTACH
 
 
 
@@ -929,7 +923,7 @@ void FN_EngineFprintf(FILE *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf
 
 #ifdef FN_PvAllocEntPrivateData
-void *FN_PvAllocEntPrivateData(edict_t *pEdict, int32 cb);
+void *FN_PvAllocEntPrivateData(edict_t *pEdict, long cb);
 #endif // FN_PvAllocEntPrivateData
 
 #ifdef FN_PvEntPrivateData
@@ -1875,9 +1869,9 @@ void FN_AMXX_QUERY(void);
 void FN_AMXX_ATTACH(void);
 #endif // FN_AMXX_ATTACH
 
-#ifdef FN_AMXX_DETACH
+#ifdef FN_AMXX_DETTACH
-void FN_AMXX_DETACH(void);
+void FN_AMXX_DETTACH(void);
-#endif // FN_AMXX_DETACH
+#endif // FN_AMXX_DETTACH
 
 #ifdef FN_AMXX_PLUGINSLOADED
 void FN_AMXX_PLUGINSLOADED(void);
@@ -1919,14 +1913,11 @@ typedef int				(*PFN_GET_AMXSTRINGLEN)			(const cell *ptr);
 typedef char *			(*PFN_FORMAT_AMXSTRING)			(AMX * /*amx*/, cell * /*params*/, int /*startParam*/, int * /*pLen*/);
 typedef void			(*PFN_COPY_AMXMEMORY)			(cell * /*dest*/, const cell * /*src*/, int /*len*/);
 typedef void			(*PFN_LOG)						(const char * /*fmt*/, ...);
-typedef void			(*PFN_LOG_ERROR)				(AMX * /*amx*/, int /*err*/, const char * /*fmt*/, ...);
 typedef int				(*PFN_RAISE_AMXERROR)			(AMX * /*amx*/, int /*error*/);
 typedef int				(*PFN_REGISTER_FORWARD)			(const char * /*funcname*/, ForwardExecType /*exectype*/, ... /*paramtypes terminated by PF_DONE*/);
 typedef int				(*PFN_EXECUTE_FORWARD)			(int /*id*/, ... /*params*/);
 typedef cell			(*PFN_PREPARE_CELLARRAY)		(cell * /*ptr*/, unsigned int /*size*/);
 typedef cell			(*PFN_PREPARE_CHARARRAY)		(char * /*ptr*/, unsigned int /*size*/);
-typedef cell			(*PFN_PREPARE_CELLARRAY_A)		(cell * /*ptr*/, unsigned int /*size*/, bool /*copyBack*/);
-typedef cell			(*PFN_PREPARE_CHARARRAY_A)		(char * /*ptr*/, unsigned int /*size*/, bool /*copyBack*/);
 typedef int				(*PFN_IS_PLAYER_VALID)			(int /*id*/);
 typedef const char *	(*PFN_GET_PLAYER_NAME)			(int /*id*/);
 typedef const char *	(*PFN_GET_PLAYER_IP)			(int /*id*/);
@@ -1935,9 +1926,7 @@ typedef int				(*PFN_IS_PLAYER_BOT)			(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_AUTHORIZED)		(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_TIME)			(int /*id*/);
 typedef float			(*PFN_GET_PLAYER_PLAYTIME)		(int /*id*/);
-typedef int				(*PFN_GETPLAYERFLAGS) 			(int /* id*/);
 typedef int				(*PFN_GET_PLAYER_CURWEAPON)		(int /*id*/);
-typedef const char *    (*PFN_GET_PLAYER_TEAM)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_TEAMID)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_DEATHS)		(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_MENU)			(int /*id*/);
@@ -1948,12 +1937,6 @@ typedef int				(*PFN_IS_PLAYER_CONNECTING)		(int /*id*/);
 typedef int				(*PFN_IS_PLAYER_HLTV)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_ARMOR)			(int /*id*/);
 typedef int				(*PFN_GET_PLAYER_HEALTH)		(int /*id*/);
-#ifdef USE_METAMOD
-typedef edict_t *		(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#else
-typedef void *			(*PFN_GET_PLAYER_EDICT)			(int /*id*/);
-#endif
-
 typedef void *			(*PFN_ALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
 														 const unsigned int /*type*/, const size_t /*size*/);
 typedef void *			(*PFN_REALLOCATOR)				(const char* /*filename*/, const unsigned int /*line*/, const char* /*func*/,
@@ -1964,16 +1947,13 @@ typedef int				(*PFN_AMX_EXEC)					(AMX* /*amx*/, cell* /*return val*/, int /*in
 typedef int				(*PFN_AMX_EXECV)				(AMX* /*amx*/, cell* /*return val*/, int /*index*/, int /*numparams*/, cell[] /*params*/);
 typedef int				(*PFN_AMX_ALLOT)				(AMX* /*amx*/, int /*length*/, cell* /*amx_addr*/, cell** /*phys_addr*/);
 typedef int				(*PFN_AMX_FINDPUBLIC)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
-typedef int				(*PFN_AMX_FINDNATIVE)			(AMX* /*amx*/, char* /*func name*/, int* /*index*/);
+typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/);
-typedef int				(*PFN_LOAD_AMXSCRIPT)			(AMX* /*amx*/, void** /*code*/, const char* /*path*/, char[64] /*error info*/, int /* debug */);
 typedef int				(*PFN_UNLOAD_AMXSCRIPT)			(AMX* /*amx*/,void** /*code*/);
 typedef cell			(*PFN_REAL_TO_CELL)				(REAL /*x*/);
 typedef REAL			(*PFN_CELL_TO_REAL)				(cell /*x*/);
 typedef int				(*PFN_REGISTER_SPFORWARD)		(AMX * /*amx*/, int /*func*/, ... /*params*/);
 typedef int				(*PFN_REGISTER_SPFORWARD_BYNAME)	(AMX * /*amx*/, const char * /*funcName*/, ... /*params*/);
 typedef void			(*PFN_UNREGISTER_SPFORWARD)		(int /*id*/);
-typedef	void			(*PFN_MERGEDEFINITION_FILE)		(const char * /*filename*/);
-typedef const char *	(*PFN_FORMAT)					(const char * /*fmt*/, ... /*params*/);
 
 extern PFN_ADD_NATIVES				g_fn_AddNatives;
 extern PFN_BUILD_PATHNAME			g_fn_BuildPathname;
@@ -1990,14 +1970,11 @@ extern PFN_GET_AMXSTRINGLEN			g_fn_GetAmxStringLen;
 extern PFN_FORMAT_AMXSTRING			g_fn_FormatAmxString;
 extern PFN_COPY_AMXMEMORY			g_fn_CopyAmxMemory;
 extern PFN_LOG						g_fn_Log;
-extern PFN_LOG_ERROR				g_fn_LogErrorFunc;
 extern PFN_RAISE_AMXERROR			g_fn_RaiseAmxError;
 extern PFN_REGISTER_FORWARD			g_fn_RegisterForward;
 extern PFN_EXECUTE_FORWARD			g_fn_ExecuteForward;
 extern PFN_PREPARE_CELLARRAY		g_fn_PrepareCellArray;
 extern PFN_PREPARE_CHARARRAY		g_fn_PrepareCharArray;
-extern PFN_PREPARE_CELLARRAY_A		g_fn_PrepareCellArrayA;
-extern PFN_PREPARE_CHARARRAY_A		g_fn_PrepareCharArrayA;
 extern PFN_IS_PLAYER_VALID			g_fn_IsPlayerValid;
 extern PFN_GET_PLAYER_NAME			g_fn_GetPlayerName;
 extern PFN_GET_PLAYER_IP			g_fn_GetPlayerIP;
@@ -2028,12 +2005,6 @@ extern PFN_CELL_TO_REAL				g_fn_CellToReal;
 extern PFN_REGISTER_SPFORWARD		g_fn_RegisterSPForward;
 extern PFN_REGISTER_SPFORWARD_BYNAME	g_fn_RegisterSPForwardByName;
 extern PFN_UNREGISTER_SPFORWARD		g_fn_UnregisterSPForward;
-extern PFN_MERGEDEFINITION_FILE		g_fn_MergeDefinition_File;
-extern PFN_AMX_FINDNATIVE			g_fn_AmxFindNative;
-extern PFN_GETPLAYERFLAGS		g_fn_GetPlayerFlags;
-extern PFN_GET_PLAYER_EDICT			g_fn_GetPlayerEdict;
-extern PFN_FORMAT					g_fn_Format;
-extern PFN_GET_PLAYER_TEAM			g_fn_GetPlayerTeam;
 
 #ifdef MAY_NEVER_BE_DEFINED
 // Function prototypes for intellisense and similar systems
@@ -2053,14 +2024,11 @@ int				MF_GetAmxStringLen			(const cell *ptr) { }
 char *			MF_FormatAmxString			(AMX * amx, cell * params, int startParam, int * pLen) { }
 void			MF_CopyAmxMemory			(cell * dest, const cell * src, int len) { }
 void			MF_Log						(const char * fmt, ...) { }
-void			MF_LogError					(AMX * amx, int err, const char *fmt, ...) { }
 int				MF_RaiseAmxError			(AMX * amx, int error) { }
 int				MF_RegisterForward			(const char * funcname, ForwardExecType exectype, ...) { }
 int				MF_ExecuteForward			(int id, ...) { }
 cell			MF_PrepareCellArray			(cell * ptr, unsigned int size) { }
 cell			MF_PrepareCharArray			(char * ptr, unsigned int size) { }
-cell			MF_PrepareCellArrayA			(cell * ptr, unsigned int size, bool copyBack) { }
-cell			MF_PrepareCharArrayA			(char * ptr, unsigned int size, bool copyBack) { }
 int				MF_IsPlayerValid			(int id) { }
 const char *	MF_GetPlayerName			(int id) { }
 const char *	MF_GetPlayerIP				(int id) { }
@@ -2070,7 +2038,6 @@ int				MF_IsPlayerAuthorized		(int id) { }
 float			MF_GetPlayerTime			(int id) { }
 float			MF_GetPlayerPlayTime		(int id) { }
 int				MF_GetPlayerCurweapon		(int id) { }
-const char *	MF_GetPlayerTeam			(int id) { }
 int				MF_GetPlayerTeamID			(int id) { }
 int				MF_GetPlayerDeaths			(int id) { }
 int				MF_GetPlayerMenu			(int id) { }
@@ -2086,9 +2053,6 @@ cell			amx_ftoc					(float x) { }
 int				MF_RegisterSPForwardByName	(AMX * amx, const char *str, ...) { }
 int				MF_RegisterSPForward		(AMX * amx, int func, ...) { }
 void			MF_UnregisterSPForward		(int id) { }
-int				MF_GetPlayerFlags			(int id) { }
-edict_t*		MF_GetPlayerEdict			(int id) { }
-const char *	MF_Format					(const char *fmt, ...) { }
 #endif	// MAY_NEVER_BE_DEFINED
 
 #define MF_AddNatives g_fn_AddNatives
@@ -2106,14 +2070,11 @@ const char *	MF_Format					(const char *fmt, ...) { }
 #define MF_GetAmxStringLen g_fn_GetAmxStringLen
 #define MF_CopyAmxMemory g_fn_CopyAmxMemory
 void MF_Log(const char *fmt, ...);
-void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_RaiseAmxError g_fn_RaiseAmxError
 #define MF_RegisterForward g_fn_RegisterForward
 #define MF_ExecuteForward g_fn_ExecuteForward
 #define MF_PrepareCellArray g_fn_PrepareCellArray
 #define MF_PrepareCharArray g_fn_PrepareCharArray
-#define MF_PrepareCellArrayA g_fn_PrepareCellArrayA
-#define MF_PrepareCharArrayA g_fn_PrepareCharArrayA
 #define MF_IsPlayerValid g_fn_IsPlayerValid
 #define MF_GetPlayerName g_fn_GetPlayerName
 #define MF_GetPlayerIP g_fn_GetPlayerIP
@@ -2123,7 +2084,6 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_GetPlayerTime g_fn_GetPlayerTime
 #define MF_GetPlayerPlayTime g_fn_GetPlayerPlayTime
 #define MF_GetPlayerCurweapon g_fn_GetPlayerCurweapon
-#define MF_GetPlayerTeam g_fn_GetPlayerTeam
 #define MF_GetPlayerTeamID g_fn_GetPlayerTeamID
 #define MF_GetPlayerDeaths g_fn_GetPlayerDeaths
 #define MF_GetPlayerMenu g_fn_GetPlayerMenu
@@ -2138,18 +2098,13 @@ void MF_LogError(AMX *amx, int err, const char *fmt, ...);
 #define MF_AmxExecv g_fn_AmxExecv
 #define MF_AmxFindPublic g_fn_AmxFindPublic
 #define MF_AmxAllot g_fn_AmxAllot
-#define MF_AmxFindNative g_fn_AmxFindNative
 #define MF_LoadAmxScript g_fn_LoadAmxScript
 #define MF_UnloadAmxScript g_fn_UnloadAmxScript
-#define MF_MergeDefinitionFile g_fn_MergeDefinition_File
 #define amx_ctof g_fn_CellToReal
 #define amx_ftoc g_fn_RealToCell
 #define MF_RegisterSPForwardByName g_fn_RegisterSPForwardByName
 #define MF_RegisterSPForward g_fn_RegisterSPForward
 #define MF_UnregisterSPForward g_fn_UnregisterSPForward
-#define MF_GetPlayerFlags g_fn_GetPlayerFlags
-#define MF_GetPlayerEdict g_fn_GetPlayerEdict
-#define MF_Format g_fn_Format
 
 /*** Memory ***/
 void	*operator new(size_t reportedSize);

dlls/cstrike/cstrike.cpp

@@ -37,7 +37,11 @@
 
 bool UTIL_IsPlayer(AMX* amx, edict_t* pPlayer) {
 	bool player = false;
-
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 	if (strcmp(STRING(pPlayer->v.classname), "player") == 0)
 		player = true;
 
@@ -70,10 +74,20 @@ static cell AMX_NATIVE_CALL cs_set_user_money(AMX *amx, cell *params) // cs_set_
 	// params[3] = flash money?
 
 	// Check index
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Fetch player pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Give money
 	*((int *)pPlayer->pvPrivateData + OFFSET_CSMONEY) = params[2];
@@ -93,10 +107,20 @@ static cell AMX_NATIVE_CALL cs_get_user_money(AMX *amx, cell *params) // cs_get_
 	// params[1] = user
 
 	// Check index
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Fetch player pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Return money
 	return *((int *)pPlayer->pvPrivateData + OFFSET_CSMONEY);
@@ -108,10 +132,20 @@ static cell AMX_NATIVE_CALL cs_get_user_deaths(AMX *amx, cell *params) // cs_get
 	// params[1] = user
 
 	// Check index
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Fetch player pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	return *((int *)pPlayer->pvPrivateData + OFFSET_CSDEATHS);
 }
@@ -123,10 +157,20 @@ static cell AMX_NATIVE_CALL cs_set_user_deaths(AMX *amx, cell *params) // cs_set
 	// params[2] = new deaths
 
 	// Check index
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Fetch player pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Set deaths
 	*((int *)pPlayer->pvPrivateData + OFFSET_CSDEATHS) = params[2];
@@ -149,14 +193,24 @@ static cell AMX_NATIVE_CALL cs_get_hostage_id(AMX *amx, cell *params) // cs_get_
 	// params[1] = hostage entity index
 
 	// Valid entity should be within range
-	CHECK_ENTITY(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into class pointer
-	edict_t *pEdict = GETEDICT(params[1]);
+	edict_t *pEdict = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pEdict)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make sure this is a hostage.
 	if (strcmp(STRING(pEdict->v.classname), "hostage_entity") != 0) {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", params[1], STRING(pEdict->v.classname));
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -170,11 +224,21 @@ static cell AMX_NATIVE_CALL cs_get_weapon_silenced(AMX *amx, cell *params) // cs
 	// params[1] = weapon index
 
 	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t *pWeapon = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pWeapon)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	int weapontype = (int)*((int *)pWeapon->pvPrivateData + OFFSET_WEAPONTYPE);
 	int *silencemode = ((int *)pWeapon->pvPrivateData + OFFSET_SILENCER_FIREMODE);
 	switch (weapontype) {
@@ -190,20 +254,6 @@ static cell AMX_NATIVE_CALL cs_get_weapon_silenced(AMX *amx, cell *params) // cs
 	return 0;
 }
 
-static cell AMX_NATIVE_CALL cs_get_weapon_id(AMX *amx, cell *params) // cs_get_weapon_id(index); = 1 param
-{
-	// Get weapon type. Corresponds to CSW_*
-	// params[1] = weapon index
-
-	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
-
-	// Make into edict pointer
-	edict_t *pWeapon = INDEXENT(params[1]);
-
-	return *((int *)pWeapon->pvPrivateData + OFFSET_WEAPONTYPE);
-}
-
 static cell AMX_NATIVE_CALL cs_set_weapon_silenced(AMX *amx, cell *params) // cs_set_weapon_silenced(index, silence = 1); = 2 params
 {
 	// Silence/unsilence gun. Does only work on M4A1 and USP.
@@ -211,11 +261,21 @@ static cell AMX_NATIVE_CALL cs_set_weapon_silenced(AMX *amx, cell *params) // cs
 	// params[2] = 1, and we silence the gun, 0 and we unsilence gun.
 
 	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t *pWeapon = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pWeapon)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	int weapontype = (int)*((int *)pWeapon->pvPrivateData + OFFSET_WEAPONTYPE);
 	int *silencemode = ((int *)pWeapon->pvPrivateData + OFFSET_SILENCER_FIREMODE);
 
@@ -265,11 +325,21 @@ static cell AMX_NATIVE_CALL cs_get_weapon_burstmode(AMX *amx, cell *params) // c
 	// params[1] = weapon index
 
 	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t *pWeapon = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pWeapon)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	int weapontype = (int)*((int *)pWeapon->pvPrivateData + OFFSET_WEAPONTYPE);
 	int* firemode = ((int *)pWeapon->pvPrivateData + OFFSET_SILENCER_FIREMODE);
 	switch (weapontype) {
@@ -292,11 +362,21 @@ static cell AMX_NATIVE_CALL cs_set_weapon_burstmode(AMX *amx, cell *params) // c
 	// params[2] = 1, and we set burstmode, 0 and we unset it.
 
 	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t *pWeapon = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pWeapon)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	int weapontype = (int)*((int *)pWeapon->pvPrivateData + OFFSET_WEAPONTYPE);
 
 	int* firemode = ((int *)pWeapon->pvPrivateData + OFFSET_SILENCER_FIREMODE);
@@ -352,10 +432,20 @@ static cell AMX_NATIVE_CALL cs_get_user_vip(AMX *amx, cell *params) // cs_get_us
 	// params[1] = user index
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	if ( *((int *)pPlayer->pvPrivateData + OFFSET_VIP) & PLAYER_IS_VIP )
 		return 1;
@@ -370,10 +460,20 @@ static cell AMX_NATIVE_CALL cs_set_user_vip(AMX *amx, cell *params) // cs_set_us
 	// params[2] = if 1, activate vip, else deactivate vip.
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	if (params[2] == 1) {
 		// Set to "be" vip.
@@ -422,10 +522,20 @@ static cell AMX_NATIVE_CALL cs_get_user_team(AMX *amx, cell *params) // cs_get_u
 	// params[1] = user index
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	return *((int *)pPlayer->pvPrivateData + OFFSET_TEAM);
 }
@@ -438,10 +548,20 @@ static cell AMX_NATIVE_CALL cs_set_user_team(AMX *amx, cell *params) // cs_set_u
 	// params[3] = model = 0
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	int model = params[3];
 
@@ -469,8 +589,7 @@ static cell AMX_NATIVE_CALL cs_set_user_team(AMX *amx, cell *params) // cs_set_u
 			strcpy(teaminfo, "SPECTATOR");
 			break;
 		default:
-			int team_nr = (int)params[2];
+			sprintf(teaminfo, "TEAM_%d", params[2]);
-			sprintf(teaminfo, "TEAM_%i", team_nr);
 	}
 	MESSAGE_BEGIN(MSG_ALL, GET_USER_MSG_ID(PLID, "TeamInfo", NULL));
 	WRITE_BYTE(params[1]);
@@ -486,10 +605,20 @@ static cell AMX_NATIVE_CALL cs_get_user_inside_buyzone(AMX *amx, cell *params) /
 	// params[1] = user index
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	return (int)*((int *)pPlayer->pvPrivateData + OFFSET_BUYZONE); // This offset is 0 when outside, 1 when inside.
 }
@@ -500,10 +629,20 @@ static cell AMX_NATIVE_CALL cs_get_user_plant(AMX *amx, cell *params) // cs_get_
 	// params[1] = user index
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	if ((int)*((int *)pPlayer->pvPrivateData + OFFSET_DEFUSE_PLANT) & CAN_PLANT_BOMB)
 		return 1;
@@ -519,10 +658,20 @@ static cell AMX_NATIVE_CALL cs_set_user_plant(AMX *amx, cell *params) // cs_set_
 	// params[3] = show bomb icon?
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 	
 	int* plantskill = ((int *)pPlayer->pvPrivateData + OFFSET_DEFUSE_PLANT);
 
@@ -565,10 +714,20 @@ static cell AMX_NATIVE_CALL cs_get_user_defusekit(AMX *amx, cell *params) // cs_
 	// params[1] = user index
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	if ((int)*((int *)pPlayer->pvPrivateData + OFFSET_DEFUSE_PLANT) & HAS_DEFUSE_KIT)
 		return 1;
@@ -588,10 +747,20 @@ static cell AMX_NATIVE_CALL cs_set_user_defusekit(AMX *amx, cell *params) // cs_
 	// params[7] = flash = 0
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 	
 	int* defusekit = ((int *)pPlayer->pvPrivateData + OFFSET_DEFUSE_PLANT);
 
@@ -653,10 +822,20 @@ static cell AMX_NATIVE_CALL cs_get_user_backpackammo(AMX *amx, cell *params) //
 	// params[2] = weapon, as in CSW_*
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	int offset;
 
@@ -718,7 +897,7 @@ static cell AMX_NATIVE_CALL cs_get_user_backpackammo(AMX *amx, cell *params) //
 			offset = OFFSET_C4_AMMO;
 			break;
 		default:
-			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %d", params[2]);
+			MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 			return 0;
 	}
 
@@ -735,10 +914,20 @@ static cell AMX_NATIVE_CALL cs_set_user_backpackammo(AMX *amx, cell *params) //
 	// params[3] = new amount
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	int offset;
 
@@ -800,7 +989,7 @@ static cell AMX_NATIVE_CALL cs_set_user_backpackammo(AMX *amx, cell *params) //
 			offset = OFFSET_C4_AMMO;
 			break;
 		default:
-			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid weapon id %d", params[2]);
+			MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 			return 0;
 	}
 
@@ -815,10 +1004,20 @@ static cell AMX_NATIVE_CALL cs_get_user_nvg(AMX *amx, cell *params) // cs_get_us
 	// params[1] = user index
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	if ((int)*((int *)pPlayer->pvPrivateData + OFFSET_NVGOGGLES) & HAS_NVGOGGLES)
 		return 1;
@@ -833,10 +1032,20 @@ static cell AMX_NATIVE_CALL cs_set_user_nvg(AMX *amx, cell *params) // cs_set_us
 	// params[2] = 1 = give, 0 = remove
 
 	// Valid entity should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 	
 	int* defusekit = ((int *)pPlayer->pvPrivateData + OFFSET_NVGOGGLES);
 
@@ -864,9 +1073,20 @@ static cell AMX_NATIVE_CALL cs_get_user_model(AMX *amx, cell *params) // cs_get_
 	// params[3] = max length to set
 
 	// Valid player index should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	return MF_SetAmxString(amx, params[2], GETCLIENTKEYVALUE(GETINFOKEYBUFFER(pPlayer), "model"), params[3]);
 }
@@ -878,13 +1098,23 @@ static cell AMX_NATIVE_CALL cs_set_user_model(AMX *amx, cell *params) // cs_set_
 	// params[2] = model
 
 	// Valid player index should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t* pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t* pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	if (params[2] == -1) {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid model %d", params[2]);
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -907,10 +1137,20 @@ static cell AMX_NATIVE_CALL cs_reset_user_model(AMX *amx, cell *params) // cs_re
 	// params[1] = user index
 
 	// Valid player index should be within range
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t* pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t* pPlayer = INDEXENT(params[1]);
+
+	// Check entity validity
+	if (FNullEnt(pPlayer)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	g_players[params[1]].SetModelled(false);
 
@@ -925,22 +1165,29 @@ static cell AMX_NATIVE_CALL cs_get_hostage_follow(AMX *amx, cell *params) // cs_
 	// params[1] = hostage index
 
 	// Valid index should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t* pHostage = INDEXENT(params[1]);
 
-	// Make sure this is a hostage.
+	// Check entity validity
-	if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) {
+	if (FNullEnt(pHostage)) {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", params[1], STRING(pHostage->v.classname));
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
+	// Make sure this is a hostage.
+	if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
-#if !defined __amd64__
 	int following = *((int *)pHostage->pvPrivateData + OFFSET_HOSTAGEFOLLOW);
-#else
+
-	long following = *((long *)pHostage->pvPrivateData + OFFSET_HOSTAGEFOLLOW);
-#endif
 	if (following == 0)
 		return following;
 
@@ -948,7 +1195,7 @@ static cell AMX_NATIVE_CALL cs_get_hostage_follow(AMX *amx, cell *params) // cs_
 	edict_t* pEntity = (edict_t*)following;
 
 	if (FNullEnt(pEntity)) {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Unknown error finding hostage parameter");
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
@@ -962,39 +1209,51 @@ static cell AMX_NATIVE_CALL cs_set_hostage_follow(AMX *amx, cell *params) // cs_
 	// params[2] = index to follow, if -1 then set hostage to not follow anything
 
 	// Valid index should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t* pHostage = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pHostage)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	// Make sure this is a hostage.
 	if (strcmp(STRING(pHostage->v.classname), "hostage_entity") != 0) {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Entity %d (\"%s\") is not a hostage", params[1], STRING(pHostage->v.classname));
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
 		return 0;
 	}
 
 	// Set to not follow anything?
 	if (params[2] == 0) {
-#if !defined __amd64__
 		*((int *)pHostage->pvPrivateData + OFFSET_HOSTAGEFOLLOW) = 0;
-#else
-		*((long *)pHostage->pvPrivateData + OFFSET_HOSTAGEFOLLOW) = 0;
-#endif
-
 		return 1;
 	}
 
 	// Valid index should be within range
-	CHECK_ENTITY(params[2]);
+	if (params[2] < 1 || params[2] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t* pEntity = GETEDICT(params[2]);
+	edict_t* pEntity = INDEXENT(params[2]);
+
+	// Check entity validity
+	if (FNullEnt(pEntity)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
-#if !defined __amd64__
 	*((int *)pHostage->pvPrivateData + OFFSET_HOSTAGEFOLLOW) = (int)pEntity;
-#else
+
-	*((long *)pHostage->pvPrivateData + OFFSET_HOSTAGEFOLLOW) = (long)pEntity;
-#endif
 	return 1;
 }
 
@@ -1004,11 +1263,21 @@ static cell AMX_NATIVE_CALL cs_get_weapon_ammo(AMX *amx, cell *params) // cs_get
 	// params[1] = weapon index
 
 	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t *pWeapon = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pWeapon)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	return *((int *)pWeapon->pvPrivateData + OFFSET_CLIPAMMO);
 }
 
@@ -1019,11 +1288,21 @@ static cell AMX_NATIVE_CALL cs_set_weapon_ammo(AMX *amx, cell *params) // cs_set
 	// params[2] = newammo
 
 	// Valid entity should be within range
-	CHECK_NONPLAYER(params[1]);
+	if (params[1] <= gpGlobals->maxClients || params[1] > gpGlobals->maxEntities)
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
 	edict_t *pWeapon = INDEXENT(params[1]);
 
+	// Check entity validity
+	if (FNullEnt(pWeapon)) {
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
+
 	*((int *)pWeapon->pvPrivateData + OFFSET_CLIPAMMO) = params[2];
 
 	return 1;
@@ -1035,10 +1314,14 @@ static cell AMX_NATIVE_CALL cs_get_user_hasprimary(AMX *amx, cell *params) // cs
 	// params[1] = user index
 
 	// Check player
-	CHECK_PLAYER(params[1]);
+	if (!MF_IsPlayerIngame(params[1]))
+	{
+		MF_RaiseAmxError(amx, AMX_ERR_NATIVE);
+		return 0;
+	}
 
 	// Make into edict pointer
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]);
+	edict_t *pPlayer = INDEXENT(params[1]);
 
 	return *((int *)pPlayer->pvPrivateData + OFFSET_PRIMARYWEAPON);
 }
@@ -1057,104 +1340,6 @@ static cell AMX_NATIVE_CALL cs_set_no_knives(AMX *amx, cell *params) // cs_set_n
 	return 1;
 }
 
-// Damaged Soul
-static cell AMX_NATIVE_CALL cs_get_user_tked(AMX *amx, cell *params) // cs_get_user_tked(index); = 1 param 
-{ 
-	// Return 1 if user has committed a team killing) 
-	// params[1] = user index 
-
-	// Check player 
-	CHECK_PLAYER(params[1]);
-
-	// Make into edict pointer 
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]); 
-
-	return *((int *)pPlayer->pvPrivateData + OFFSET_TK); 
-}
-
-// Damaged Soul
-static cell AMX_NATIVE_CALL cs_set_user_tked(AMX *amx, cell *params) // cs_set_user_tked(index, tk = 1, subtract = 1); = 2 arguments 
-{ 
-	// Sets whether or not player has committed a TK. 
-	// params[1] = user 
-	// params[2] = 1: player has TKed, 0: player hasn't TKed 
-	// params[3] = number of frags to subtract 
-
-	// Check index 
-	CHECK_PLAYER(params[1]);
-
-	// Fetch player pointer 
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]); 
-
-	if (params[2]) { 
-		*((int *)pPlayer->pvPrivateData + OFFSET_TK) = 1; 
-	} else { 
-		*((int *)pPlayer->pvPrivateData + OFFSET_TK) = 0; 
-	} 
-
-	if (params[3]) { 
-		pPlayer->v.frags = pPlayer->v.frags - params[3]; 
-
-		MESSAGE_BEGIN(MSG_ALL, GET_USER_MSG_ID(PLID, "ScoreInfo", NULL)); 
-		WRITE_BYTE(params[1]); // user index 
-		WRITE_SHORT((int)pPlayer->v.frags); // frags 
-		WRITE_SHORT(*((int *)pPlayer->pvPrivateData + OFFSET_CSDEATHS)); // deaths 
-		WRITE_SHORT(0); // ? 
-		WRITE_SHORT(*((int *)pPlayer->pvPrivateData + OFFSET_TEAM)); // team 
-		MESSAGE_END(); 
-	} 
-
-	return 1; 
-}
-
-static cell AMX_NATIVE_CALL cs_get_user_driving(AMX *amx, cell *params) // cs_get_user_driving(index); = 1 param 
-{ 
-	// Returns different values depending on if user is driving a value - and if so at what speed.
-	// 0: no driving
-	// 1: driving, but standing still
-	// 2-4: different positive speeds
-	// 5: negative speed (backing)
-	// params[1] = user index 
-
-	// Check player 
-	CHECK_PLAYER(params[1]);
-
-	// Make into edict pointer 
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]); 
-
-	// If player driving, return 1, if not, return 0 
-	return *((int *)pPlayer->pvPrivateData + OFFSET_ISDRIVING); 
-}
-
-static cell AMX_NATIVE_CALL cs_get_user_stationary(AMX *amx, cell *params) // cs_get_user_stationary(index); = 1 param 
-{ 
-	// Returns 1 if client is using a stationary guns (maybe also other stuff)
-
-	// Check player 
-	CHECK_PLAYER(params[1]);
-
-	// Make into edict pointer 
-	edict_t *pPlayer = MF_GetPlayerEdict(params[1]); 
-
-	// If player driving, return 1, if not, return 0
-#if !defined __amd64__
-	return *((int *)pPlayer->pvPrivateData + OFFSET_STATIONARY); 
-#else
-	// The 32 bit server return 0 and 1 by itself from this offset, but the amd64 server has 2 and 3 respectively
-	// Doing a simple checking of these defined constants here, and mapping to 0 and 1, to keep our plugin authors sane.
-	// If an unexpected value is encountered, this will be logged.
-	if (AMD64_STATIONARY_NO == *((int *)pPlayer->pvPrivateData + OFFSET_STATIONARY))
-		return 0;
-	else if (AMD64_STATIONARY_YES == *((int *)pPlayer->pvPrivateData + OFFSET_STATIONARY))
-		return 1;
-	else {
-		MF_LogError(amx, AMX_ERR_NATIVE, "Unexpected value at offset. Please report this to development team @ www.amxmodx.org!");
-
-		return 0; 
-	}
-#endif
-}
-
 AMX_NATIVE_INFO cstrike_Exports[] = {
 	{"cs_set_user_money",			cs_set_user_money},
 	{"cs_get_user_money",			cs_get_user_money},
@@ -1188,11 +1373,6 @@ AMX_NATIVE_INFO cstrike_Exports[] = {
 	{"cs_get_user_hasprim",			cs_get_user_hasprimary},
 	{"cs_get_no_knives",			cs_get_no_knives},
 	{"cs_set_no_knives",			cs_set_no_knives},
-	{"cs_get_weapon_id",			cs_get_weapon_id},
-	{"cs_get_user_tked",			cs_get_user_tked},
-	{"cs_set_user_tked",			cs_set_user_tked},
-	{"cs_get_user_driving",			cs_get_user_driving},
-	{"cs_get_user_stationary",		cs_get_user_stationary},
 	//------------------- <-- max 19 characters!
 	{NULL,							NULL}
 };

dlls/cstrike/cstrike.h

@@ -1,4 +1,4 @@
-/* AMX Mod X 
+ /* AMX Mod X 
    *   Counter-Strike Module 
    * 
    * by the AMX Mod X Development Team 
@@ -51,81 +51,38 @@
 #endif // defined __linux__
 
 // "player" entities
-#if !defined __amd64__
+#define OFFSET_TEAM					114 + EXTRAOFFSET
-	// 32 bit offsets here
+#define OFFSET_CSMONEY				115 + EXTRAOFFSET
-	#define OFFSET_TEAM					114 + EXTRAOFFSET
+#define OFFSET_PRIMARYWEAPON		116 + EXTRAOFFSET
-	#define OFFSET_CSMONEY				115 + EXTRAOFFSET
+#define OFFSET_INTERNALMODEL		126 + EXTRAOFFSET
-	#define OFFSET_PRIMARYWEAPON		116 + EXTRAOFFSET
+#define OFFSET_NVGOGGLES			129 + EXTRAOFFSET
-	#define OFFSET_INTERNALMODEL		126 + EXTRAOFFSET
+#define OFFSET_DEFUSE_PLANT			193 + EXTRAOFFSET
-	#define OFFSET_NVGOGGLES			129 + EXTRAOFFSET
+#define OFFSET_VIP					215 + EXTRAOFFSET
-	#define OFFSET_DEFUSE_PLANT			193 + EXTRAOFFSET
+#define OFFSET_BUYZONE				241 + EXTRAOFFSET
-	#define OFFSET_VIP					209 + EXTRAOFFSET
-	#define OFFSET_TK					216 + EXTRAOFFSET // 040926
-	#define OFFSET_BUYZONE				235 + EXTRAOFFSET
-	#define OFFSET_ISDRIVING			350 + EXTRAOFFSET // 040926
-	#define OFFSET_STATIONARY			362 + EXTRAOFFSET // 040927 (363 works also!)
 
-	#define OFFSET_AWM_AMMO				382 + EXTRAOFFSET
+#define OFFSET_AWM_AMMO				382 + EXTRAOFFSET
-	#define OFFSET_SCOUT_AMMO			383 + EXTRAOFFSET
+#define OFFSET_SCOUT_AMMO			383 + EXTRAOFFSET
-	#define OFFSET_PARA_AMMO			384 + EXTRAOFFSET
+#define OFFSET_PARA_AMMO			384 + EXTRAOFFSET
-	#define OFFSET_FAMAS_AMMO			385 + EXTRAOFFSET
+#define OFFSET_FAMAS_AMMO			385 + EXTRAOFFSET
-	#define OFFSET_M3_AMMO				386 + EXTRAOFFSET
+#define OFFSET_M3_AMMO				386 + EXTRAOFFSET
-	#define OFFSET_USP_AMMO				387 + EXTRAOFFSET
+#define OFFSET_USP_AMMO				387 + EXTRAOFFSET
-	#define OFFSET_FIVESEVEN_AMMO		388 + EXTRAOFFSET
+#define OFFSET_FIVESEVEN_AMMO		388 + EXTRAOFFSET
-	#define OFFSET_DEAGLE_AMMO			389 + EXTRAOFFSET
+#define OFFSET_DEAGLE_AMMO			389 + EXTRAOFFSET
-	#define OFFSET_P228_AMMO			390 + EXTRAOFFSET
+#define OFFSET_P228_AMMO			390 + EXTRAOFFSET
-	#define OFFSET_GLOCK_AMMO			391 + EXTRAOFFSET
+#define OFFSET_GLOCK_AMMO			391 + EXTRAOFFSET
-	#define OFFSET_FLASH_AMMO			392 + EXTRAOFFSET
+#define OFFSET_FLASH_AMMO			392 + EXTRAOFFSET
-	#define OFFSET_HE_AMMO				393 + EXTRAOFFSET
+#define OFFSET_HE_AMMO				393 + EXTRAOFFSET
-	#define OFFSET_SMOKE_AMMO			394 + EXTRAOFFSET
+#define OFFSET_SMOKE_AMMO			394 + EXTRAOFFSET
-	#define OFFSET_C4_AMMO				395	+ EXTRAOFFSET
+#define OFFSET_C4_AMMO				395	+ EXTRAOFFSET
 
-	#define OFFSET_CSDEATHS				444 + EXTRAOFFSET // 040926
+#define OFFSET_CSDEATHS				449 + EXTRAOFFSET
-	// "weapon_*" entities
+// "weapon_*" entities
-	#define OFFSET_WEAPONTYPE			43 + EXTRAOFFSET
+#define OFFSET_WEAPONTYPE			43 + EXTRAOFFSET
-	#define OFFSET_CLIPAMMO				51 + EXTRAOFFSET
+#define OFFSET_CLIPAMMO				51 + EXTRAOFFSET
-	#define OFFSET_SILENCER_FIREMODE	74 + EXTRAOFFSET
+#define OFFSET_SILENCER_FIREMODE	74 + EXTRAOFFSET
-	// "hostage_entity" entities
+// "hostage_entity" entities
-	#define OFFSET_HOSTAGEFOLLOW		86 + EXTRAOFFSET
+#define OFFSET_HOSTAGEFOLLOW		86 + EXTRAOFFSET
-	#define OFFSET_HOSTAGEID			487 + EXTRAOFFSET
+#define OFFSET_HOSTAGEID			487 + EXTRAOFFSET
-#else
-	// Amd64 offsets here
-	#define OFFSET_TEAM					139 + EXTRAOFFSET // +25
-	#define OFFSET_CSMONEY				140 + EXTRAOFFSET // +25
-	#define OFFSET_PRIMARYWEAPON		141 + EXTRAOFFSET // +25
-	#define OFFSET_INTERNALMODEL		152 + EXTRAOFFSET // +26
-	#define OFFSET_NVGOGGLES			155 + EXTRAOFFSET // +26
-	#define OFFSET_DEFUSE_PLANT			219 + EXTRAOFFSET // +26
-	#define OFFSET_VIP					242 + EXTRAOFFSET // +27
-	#define OFFSET_TK					249 + EXTRAOFFSET // +33 040927
-	#define OFFSET_BUYZONE				268 + EXTRAOFFSET // +27
-	#define OFFSET_ISDRIVING			386 + EXTRAOFFSET // 040927
-	#define OFFSET_STATIONARY			400 + EXTRAOFFSET // 040927 (401 works also)
-
-	#define OFFSET_AWM_AMMO				426 + EXTRAOFFSET // +44
-	#define OFFSET_SCOUT_AMMO			427 + EXTRAOFFSET // +44
-	#define OFFSET_PARA_AMMO			428 + EXTRAOFFSET // +44
-	#define OFFSET_FAMAS_AMMO			429 + EXTRAOFFSET // +44
-	#define OFFSET_M3_AMMO				430 + EXTRAOFFSET // +44
-	#define OFFSET_USP_AMMO				431 + EXTRAOFFSET // +44
-	#define OFFSET_FIVESEVEN_AMMO		432 + EXTRAOFFSET // +44
-	#define OFFSET_DEAGLE_AMMO			433 + EXTRAOFFSET // +44
-	#define OFFSET_P228_AMMO			434 + EXTRAOFFSET // +44
-	#define OFFSET_GLOCK_AMMO			435 + EXTRAOFFSET // +44
-	#define OFFSET_FLASH_AMMO			436 + EXTRAOFFSET // +44
-	#define OFFSET_HE_AMMO				437 + EXTRAOFFSET // +44
-	#define OFFSET_SMOKE_AMMO			438 + EXTRAOFFSET // +44
-	#define OFFSET_C4_AMMO				439	+ EXTRAOFFSET // +44
-
-	#define OFFSET_CSDEATHS				493 + EXTRAOFFSET // +49
-	// "weapon_*" entities
-	#define OFFSET_WEAPONTYPE			57 + EXTRAOFFSET // +14
-	#define OFFSET_CLIPAMMO				65 + EXTRAOFFSET // +14
-	#define OFFSET_SILENCER_FIREMODE	88 + EXTRAOFFSET // +14
-	// "hostage_entity" entities
-	#define OFFSET_HOSTAGEFOLLOW		51 + EXTRAOFFSET // +21, long=51, int=107! (must use the long* offset because pointers on amd64 are stored the size of longs, 8 bytes, instead of the usual int 4 bytes.)
-	#define OFFSET_HOSTAGEID			516 + EXTRAOFFSET // +29
-#endif
 
 // Ids of weapons in CS
 #define CSW_P228						1
@@ -192,9 +149,6 @@
 #define SCOREATTRIB_BOMB				2 // t only
 #define SCOREATTRIB_VIP					4 // ct only
 
-#define AMD64_STATIONARY_NO				2
-#define AMD64_STATIONARY_YES			3
-
 enum CS_Internal_Models {
 	CS_DONTCHANGE = 0,
 	CS_CT_URBAN = 1,
@@ -213,46 +167,3 @@ CCstrikePlayer g_players[33];
 bool g_precachedknife = false;
 bool g_noknives = false;
 // Globals above
-
-#define CHECK_ENTITY(x) \
-	if (x < 0 || x > gpGlobals->maxEntities) { \
-		MF_LogError(amx, AMX_ERR_NATIVE, "Entity out of range (%d)", x); \
-		return 0; \
-	} else { \
-		if (x <= gpGlobals->maxClients) { \
-			if (!MF_IsPlayerIngame(x)) { \
-				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d (not in-game)", x); \
-				return 0; \
-			} \
-		} else { \
-			if (x != 0 && FNullEnt(INDEXENT(x))) { \
-				MF_LogError(amx, AMX_ERR_NATIVE, "Invalid entity %d", x); \
-				return 0; \
-			} \
-		} \
-	}
-
-#define CHECK_PLAYER(x) \
-	if (x < 1 || x > gpGlobals->maxClients) { \
-		MF_LogError(amx, AMX_ERR_NATIVE, "Player out of range (%d)", x); \
-		return 0; \
-	} else { \
-		if (!MF_IsPlayerIngame(x) || FNullEnt(MF_GetPlayerEdict(x))) { \
-			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid player %d", x); \
-			return 0; \
-		} \
-	}
-
-#define CHECK_NONPLAYER(x) \
-	if (x < 1 || x <= gpGlobals->maxClients || x > gpGlobals->maxEntities) { \
-		MF_LogError(amx, AMX_ERR_NATIVE, "Non-player entity %d out of range", x); \
-		return 0; \
-	} else { \
-		if (FNullEnt(INDEXENT(x))) { \
-			MF_LogError(amx, AMX_ERR_NATIVE, "Invalid non-player entity %d", x); \
-			return 0; \
-		} \
-	}
-
-#define GETEDICT(n) \
-	((n >= 1 && n <= gpGlobals->maxClients) ? MF_GetPlayerEdict(n) : INDEXENT(n))

dlls/cstrike/cstrike.vcproj

@@ -118,8 +118,6 @@
 				TargetEnvironment="1"
 				TypeLibraryName=".\Release/cstrike.tlb"
 				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -214,9 +212,6 @@
 				RelativePath=".\moduleconfig.h">
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\plugins\include\cstrike.inc">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>

dlls/csx/plugins/tp/amx_csx_gasnades.sma

@@ -1,177 +0,0 @@
-/* Gasnades */
-
-#include <amxmodx>
-#include <fun>
-#include <engine>
-#include <csx>
-
-new g_Gas
-//----------------------------------------------------------------------------------------------
-public plugin_init()
-{
-	register_plugin("Gasgrenades", "1.3 (CSX)", "RichoDemus/AssKicR/T(+)rget")
-
-	register_cvar("amx_gasnades", "1")
-	register_cvar("amx_gasdmg", "10")
-	register_cvar("amx_gascheck", "3")
-	register_cvar("amx_gasradius", "200")
-	register_cvar("amx_smokegasp", "1")
-	register_cvar("amx_gasobeyFF", "1")
-
-	g_Gas = custom_weapon_add("gasnade",0,"gasnade")
-}
-//----------------------------------------------------------------------------------------------
-public plugin_precache()
-{ 
-   precache_sound("player/gasp1.wav")
-   precache_sound("player/gasp2.wav")
-}
-
-public gas(par[])
-{ 
-	new grenadeid = par[1]
-	new id = par[0]
-
-	if ( !is_valid_ent(grenadeid) )
-		return
-
-	new player[3], inum, Float:temp_grenade[3], grenade[3], players[32]
-	if(get_cvar_num("amx_gasobeyFF") != 1)
-		get_players(players, inum) // Get number of players
-	else{
-		new FFOn = get_cvar_num("mp_friendlyfire")
-		if(FFOn == 0){
-			new team[33]
-			get_user_team(id, team, 32)
-			if(equali(team, "CT"))
-				get_players(players, inum, "ae", "TERRORIST")
-			else
-				get_players(players, inum, "ae", "CT")
-		}
-		else
-			get_players(players, inum) // Get number of players
-	}
-	entity_get_vector(grenadeid, EV_VEC_origin, temp_grenade) // Get the position of the grenade
-	grenade[0] = floatround(temp_grenade[0])
-	grenade[1] = floatround(temp_grenade[1])
-	grenade[2] = floatround(temp_grenade[2])
-	for(new i = 0; i < inum; ++i){ // Loop through all players
-		get_user_origin(players[i],player,0)
-		new distance = get_distance(grenade, player)
-
-		if((distance < get_cvar_num("amx_gasradius"))){ // Check who is standing close
-			if(get_cvar_num("amx_smokegasp") != 0){
-				if(get_cvar_num("amx_gascheck") >= 1){
-					new number = random_num(1, 2)
-					if(is_user_alive(players[i])){
-						switch (number){
-							case 1:emit_sound(players[i], CHAN_VOICE, "player/gasp1.wav", 1.0, ATTN_NORM, 0, PITCH_NORM)
-							case 2:emit_sound(players[i], CHAN_VOICE, "player/gasp2.wav", 1.0, ATTN_NORM, 0, PITCH_NORM)
-						}
-					}
-				}
-			}
-			message_begin(MSG_ONE, get_user_msgid("Damage"), {0,0,0}, players[i])
-			write_byte(30) // dmg_save
-			write_byte(30) // dmg_take
-			write_long((1 << 16)) // visibleDamageBits
-			write_coord(grenade[0]) // damageOrigin.x
-			write_coord(grenade[1]) // damageOrigin.y
-			write_coord(grenade[2]) // damageOrigin.z
-			message_end()
-			if(is_user_alive(id))
-				ExtraDamage(players[i], id, get_cvar_num("amx_gasdmg"), "gasgrenade")
-		}
-	}
-	set_task(get_cvar_float("amx_gascheck"), "gas",grenadeid,par,2) // If the grenade still exists we do a new check in get_cvar_num("amx_gascheck") second
-}
-//----------------------------------------------------------------------------------------------
-public grenade_throw(index,greindex,wId){
-	if ( task_exists(greindex) )
-		remove_task(greindex)
-	if( get_cvar_num("amx_gasnades") !=1 || wId != CSW_SMOKEGRENADE )
-		return PLUGIN_CONTINUE
-	if (g_Gas) custom_weapon_shot(g_Gas,index)
-	new par[2]
-	par[0] = index
-	par[1] = greindex
-	set_task(1.5, "gas", greindex,par,2)
-	return PLUGIN_CONTINUE
-}
-//----------------------------------------------------------------------------------------------
-stock ExtraDamage(id, attacker, damage, weaponDescription[])
-{
-	if(is_user_alive(id)) 
-	{
-		new userHealth = get_user_health(id)
-		set_user_health(id, userHealth - damage)
-		if (g_Gas)
-			custom_weapon_dmg(g_Gas,attacker,id,damage)
-
-		if(userHealth - damage <= 0)
-		{
-			logKill(attacker, id, weaponDescription)
-			if(get_user_team(id) != get_user_team(attacker))
-			{
-				// The person dying shouldn't get negative credit for this kill (so add it back)
-				set_user_frags(id, get_user_frags(id) + 1)
-				// The killing should get credit for the frag
-				set_user_frags(attacker, get_user_frags(attacker) + 1)
-			}
-			else
-			{
-				// The person dying shouldn't get negative credit for this kill (so add it back)
-				set_user_frags(id, get_user_frags(id) + 1)
-				// The killer killed a teammember or self
-				// Engine gives credit for the kill so let's take away that + 1
-				set_user_frags(attacker, get_user_frags(attacker) - 2)
-			}
-		}else{
-			if(get_cvar_num("mp_logdetail") == 3){
-				logDmg(attacker, id, weaponDescription,"body",damage,userHealth-damage)
-			}
-		}
-	}
-}
-//----------------------------------------------------------------------------------------------
-/* Log a kill using standard HL-logging format */
-stock logKill(attacker, victim, weaponDescription[])
-{
-	// Save Hummiliation
-	new namea[24], namev[24], authida[20], authidv[20], teama[10], teamv[10]
-
-	// Info On Attacker
-	get_user_name(attacker, namea, 23)
-	get_user_team(attacker, teama, 9)
-	get_user_authid(attacker, authida, 19)
-	// Info On Victim
-	get_user_name(victim, namev, 23)
-	get_user_team(victim, teamv, 9)
-	get_user_authid(victim, authidv, 19)
-	// Log This Kill
-	log_message("^"%s<%d><%s><%s>^" killed ^"%s<%d><%s><%s>^" with ^"%s^"",
-	namea, get_user_userid(attacker), authida, teama, namev, get_user_userid(victim), authidv, teamv, weaponDescription)
-}
-
-/* Log damage using standard HL-logging format */
-stock logDmg(attacker, victim, weaponDescription[],hit[],damage,health)
-{
-	// Save Hummiliation
-	new namea[24], namev[24], authida[20], authidv[20], teama[10], teamv[10]
-
-	// Info On Attacker
-	get_user_name(attacker, namea, 23)
-	get_user_team(attacker, teama, 9)
-	get_user_authid(attacker, authida, 19)
-	// Info On Victim
-	get_user_name(victim, namev, 23)
-	get_user_team(victim, teamv, 9)
-	get_user_authid(victim, authidv, 19)
-	// Log This Damage
-	log_message("^"%s<%d><%s><%s>^" attacked ^"%s<%d><%s><%s>^" with ^"%s^" (hit ^"%s^") (damage ^"%d^") (health ^"%d^")",
-	namea,get_user_userid(attacker),authida,teama,namev,get_user_userid(victim),authidv,teamv,weaponDescription,hit,damage,health)
-}
-
-
-
-//----------------------------------------------------------------------------------------------

dlls/csx/source/CMisc.cpp

@@ -1,299 +0,0 @@
-
-
-#include "CMisc.h"
-#include "rank.h"
-
-// *****************************************************
-// class Grenades
-// *****************************************************
-void Grenades::put( edict_t* grenade, float time, int type, CPlayer* player  )
-{
-  Obj* a = new Obj;
-  if ( a == 0 ) return;
-  a->player = player;
-  a->grenade = grenade;
-  a->time = gpGlobals->time + time;
-  a->type = type;
-  a->prev = 0;
-  a->next = head;
-  if ( head ) head->prev = a;
-  head = a;
-}
-
-bool Grenades::find( edict_t* enemy, CPlayer** p, int* type )
-{
-  bool found = false;
-  Obj* a = head;
-  while ( a ){
-    if ( a->time > gpGlobals->time ) {
-      if ( a->grenade == enemy ) {
-        found = true;
-        *p = a->player;
-        *type = a->type;
-      }
-    }
-    else {
-      Obj* next = a->next;
-      if (a->prev)  a->prev->next = next;
-      else  head = next;
-      if (next) next->prev = a->prev;
-      delete a;
-      a = next;
-      continue;
-    }
-    a = a->next;
-  }
-
-  return found;
-}
-
-
-
-void Grenades::clear()
-{
-  while(head){
-    Obj* a = head->next;
-    delete head;
-    head = a;
-  }
-}
-
-// *****************************************************
-// class CPlayer
-// *****************************************************
-
-void CPlayer::Disconnect(){
-
-	if ( ignoreBots(pEdict) || !isModuleActive() ) // ignore if he is bot and bots rank is disabled or module is paused
-		return;
-
-	rank->updatePosition( &life );
-	rank = 0;
-}
-
-void CPlayer::PutInServer(){
-
-	if ( ignoreBots(pEdict) )
-		return;
-
-	restartStats();
-	const char* name = STRING(pEdict->v.netname);
-	const char* unique = name;
-	switch((int)csstats_rank->value) {
-	case 1: 
-		if ( (unique = GETPLAYERAUTHID(pEdict)) == 0 )
-			unique = name; // failed to get authid
-		break;
-	case 2:
-		unique = ip;
-	}
-	rank = g_rank.findEntryInRank( unique , name );
-}
-
-void CPlayer::Connect(const char* address ){
-	bot = IsBot();
-	strcpy(ip,address);
-	rank = 0;
-	clearStats = 0.0f;
-}
-
-void CPlayer::restartStats(bool all)
-{
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
-	memset(&life,0,sizeof(life));
-}
-
-void CPlayer::Init( int pi, edict_t* pe )
-{
-    pEdict = pe;
-    index = pi;
-	current = 0;
-	clearStats = 0.0f;
-	rank = 0;
-}
-
-void CPlayer::saveKill(CPlayer* pVictim, int wweapon, int hhs, int ttk){
-
-	if ( ignoreBots(pEdict,pVictim->pEdict) )
-		return;
-
-	if ( pVictim->index == index ){ // killed self
-		pVictim->weapons[0].deaths++;
-		pVictim->life.deaths++;
-		pVictim->weaponsRnd[0].deaths++;       // DEC-Weapon (round) stats
-		return;
-	}
-
-	pVictim->attackers[index].name = weaponData[wweapon].name;
-	pVictim->attackers[index].kills++;
-	pVictim->attackers[index].hs += hhs;
-	pVictim->attackers[index].tks += ttk;
-	pVictim->attackers[0].kills++;
-	pVictim->attackers[0].hs += hhs;
-	pVictim->attackers[0].tks += ttk;
-	pVictim->weapons[pVictim->current].deaths++;
-	pVictim->weapons[0].deaths++;
-	pVictim->life.deaths++;
-	
-	
-	pVictim->weaponsRnd[pVictim->current].deaths++; // DEC-Weapon (round) stats
-	pVictim->weaponsRnd[0].deaths++;                   // DEC-Weapon (round) stats
-	
-	int vi = pVictim->index;
-	victims[vi].name = weaponData[wweapon].name;
-	victims[vi].deaths++;
-	victims[vi].hs += hhs;
-	victims[vi].tks += ttk;
-	victims[0].deaths++;
-	victims[0].hs += hhs;
-	victims[0].tks += ttk;
-	
-	weaponsRnd[wweapon].kills++;                // DEC-Weapon (round) stats
-	weaponsRnd[wweapon].hs += hhs;         // DEC-Weapon (round) stats
-	weaponsRnd[wweapon].tks += ttk;     // DEC-Weapon (round) stats
-	weaponsRnd[0].kills++;                     // DEC-Weapon (round) stats
-	weaponsRnd[0].hs += hhs;              // DEC-Weapon (round) stats
-	weaponsRnd[0].tks += ttk;          // DEC-Weapon (round) stats
-	
-	weapons[wweapon].kills++;
-	weapons[wweapon].hs += hhs;
-	weapons[wweapon].tks += ttk;
-	weapons[0].kills++;
-	weapons[0].hs += hhs;
-	weapons[0].tks += ttk;
-	life.kills++;
-	life.hs += hhs;
-	life.tks += ttk;
-}
-
-void CPlayer::saveHit(CPlayer* pVictim, int wweapon, int ddamage, int bbody){
-
-	if ( ignoreBots(pEdict,pVictim->pEdict) )
-		return;
-
-	if ( index == pVictim->index ) return;
-
-	pVictim->attackers[index].hits++;
-	pVictim->attackers[index].damage += ddamage;
-	pVictim->attackers[index].bodyHits[bbody]++;
-	pVictim->attackers[0].hits++;
-	pVictim->attackers[0].damage += ddamage;
-	pVictim->attackers[0].bodyHits[bbody]++;
-
-
-	int vi = pVictim->index;
-	victims[vi].hits++;
-	victims[vi].damage += ddamage;
-	victims[vi].bodyHits[bbody]++;
-	victims[0].hits++;
-	victims[0].damage += ddamage;
-	victims[0].bodyHits[bbody]++;
-
-	weaponsRnd[wweapon].hits++;              // DEC-Weapon (round) stats
-	weaponsRnd[wweapon].damage += ddamage;    // DEC-Weapon (round) stats
-	weaponsRnd[wweapon].bodyHits[bbody]++;   // DEC-Weapon (round) stats
-	weaponsRnd[0].hits++;                   // DEC-Weapon (round) stats
-	weaponsRnd[0].damage += ddamage;         // DEC-Weapon (round) stats
-	weaponsRnd[0].bodyHits[bbody]++;        // DEC-Weapon (round) stats
-
-	weapons[wweapon].hits++;
-	weapons[wweapon].damage += ddamage;
-	weapons[wweapon].bodyHits[bbody]++;
-	weapons[0].hits++;
-	weapons[0].damage += ddamage;
-	weapons[0].bodyHits[bbody]++;
-
-	life.hits++;
-	life.damage += ddamage;
-	life.bodyHits[bbody]++;
-}
-
-
-void CPlayer::saveShot(int weapon){
-
-	if ( ignoreBots(pEdict) )
-		return;
-
-	victims[0].shots++;
-	weapons[weapon].shots++;
-	weapons[0].shots++;
-	life.shots++;
-	weaponsRnd[weapon].shots++;       // DEC-Weapon (round) stats
-	weaponsRnd[0].shots++;            // DEC-Weapon (round) stats
-}
-
-
-void CPlayer::saveBPlant(){
-	life.bPlants++;
-}
-
-void CPlayer::saveBExplode(){
-	life.bExplosions++;
-}
-
-void CPlayer::saveBDefusing(){
-	life.bDefusions++;
-}
-
-void CPlayer::saveBDefused(){
-	life.bDefused++;
-}
-
-
-// *****************************************************
-// class Forward
-// *****************************************************
-
-void Forward::put( AMX *a , int i ){
-	head = new AmxCall( a, i , head );
-}
-
-
-void Forward::clear(){
-	while ( head )  {
-		AmxCall* a = head->next;
-		delete head;
-		head = a;
-	}
-}
-
-void Forward::exec(int p1,int p2,int p3,int p4,int p5,int p6){
-	AmxCall* a = head;
-	while ( a ){
-		MF_AmxExec(a->amx, NULL, a->iFunctionIdx, 6,p1, p2, p3, p4, p5, p6);
-		a = a->next;
-	}
-}
-
-void Forward::exec(int p1,int p2,int p3,int p4,int p5){
-	AmxCall* a = head;
-	while ( a ){
-		MF_AmxExec(a->amx, NULL, a->iFunctionIdx, 5,p1, p2, p3, p4, p5);
-		a = a->next;
-	}
-}
-
-void Forward::exec(int p1,int p2){
-	AmxCall* a = head;
-	while ( a ){
-		MF_AmxExec(a->amx, NULL, a->iFunctionIdx, 2,p1, p2);
-		a = a->next;
-	}
-}
-
-// *****************************************************
-
-bool ignoreBots (edict_t *pEnt, edict_t *pOther){
-	if ( !rankBots && ( pEnt->v.flags & FL_FAKECLIENT || ( pOther && pOther->v.flags & FL_FAKECLIENT ) ) )
-		return true;
-	return false;
-}
-
-bool isModuleActive(){
-	if ( !(int)CVAR_GET_FLOAT("csstats_pause") )
-		return true;
-	return false;
-}

dlls/csx/source/CMisc.h

@@ -1,116 +0,0 @@
-
-
-#ifndef CMISC_H
-#define CMISC_H
-
-#include "amxxmodule.h"
-#include "CRank.h"
-
-#define MAX_CWEAPONS		6
-
-#define CSW_HEGRENADE		4
-#define CSW_C4				6
-#define CSW_SMOKEGRENADE	9
-#define CSW_FLASHBANG		25
-
-// *****************************************************
-// class CPlayer
-// *****************************************************
-
-struct CPlayer {
-	edict_t* pEdict;
-	char ip[32];
-	int index;
-	int aiming;
-	int current;
-	bool bot;
-	float clearStats;
-	RankSystem::RankStats*	rank;
-
-	struct PlayerWeapon : Stats {
-		const char* name;
-		int	ammo;
-		int	clip;
-	};
-
-	PlayerWeapon	weapons[MAX_WEAPONS+MAX_CWEAPONS];
-	PlayerWeapon	attackers[33];
-	PlayerWeapon	victims[33];
-	Stats			weaponsRnd[MAX_WEAPONS+MAX_CWEAPONS]; // DEC-Weapon (Round) stats
-	Stats			life;
-
-	int teamId;
-
-	void Init(  int pi, edict_t* pe );
-	void Connect(const char* ip );
-	void PutInServer();
-	void Disconnect();
-	void saveKill(CPlayer* pVictim, int weapon, int hs, int tk);
-	void saveHit(CPlayer* pVictim, int weapon, int damage, int aiming);
-	void saveShot(int weapon);
-
-	void saveBPlant();
-	void saveBExplode();
-	void saveBDefusing();
-	void saveBDefused();
-
-	void restartStats(bool all = true);
-	inline bool IsBot(){
-		const char* auth= (*g_engfuncs.pfnGetPlayerAuthId)(pEdict);
-		return ( auth && !strcmp( auth , "BOT" ) );
-	}
-	inline bool IsAlive(){
-		return ((pEdict->v.deadflag==DEAD_NO)&&(pEdict->v.health>0));
-	}
-};
-
-// *****************************************************
-// class Grenades
-// *****************************************************
-
-class Grenades
-{
-  struct Obj 
-  {
-    CPlayer* player;
-    edict_t* grenade;
-    float time;
-    int type;
-    Obj* next;
-    Obj* prev;
-  } *head;
-
-public:
-  Grenades() { head = 0; }
-  ~Grenades() { clear(); }
-  void put( edict_t* grenade, float time, int type, CPlayer* player  );
-  bool find( edict_t* enemy, CPlayer** p, int* type );
-  void clear();
-};
-
-// *****************************************************
-// class Forward
-// *****************************************************
-
-class Forward
-{
-	struct AmxCall {
-		AMX *amx;
-		int iFunctionIdx;
-		AmxCall* next;
-		AmxCall( AMX *a , int i, AmxCall* n ): amx(a), iFunctionIdx(i), next(n) {}
-	} *head;
-public:
-	Forward() { head = 0; }
-	~Forward() { clear(); }
-	void clear();
-	void put( AMX *a , int i );
-	void exec(int p1,int p2,int p3,int p4,int p5,int p6);
-	void exec(int p1,int p2,int p3,int p4,int p5);
-	void exec(int p1,int p2);
-};
-
-#endif // CMISC_H
-
-
-

dlls/csx/source/CRank.cpp

@@ -1,308 +0,0 @@
-
-
-#include "amxxmodule.h"
-#include "CRank.h"
-#include "rank.h"
-
-// *****************************************************
-// class Stats
-// *****************************************************
-Stats::Stats(){
-	hits = shots = damage = hs = tks = kills = deaths = bDefusions = bDefused = bPlants = bExplosions = 0;
-	memset( bodyHits , 0 ,sizeof( bodyHits ) );
-}
-void Stats::commit(Stats* a){
-	hits += a->hits;
-	shots += a->shots;
-	damage += a->damage;
-	hs += a->hs;
-	tks += a->tks;
-	kills += a->kills;
-	deaths += a->deaths;
-
-	bDefusions += a->bDefusions;
-	bDefused += a->bDefused;
-	bPlants += a->bPlants;
-	bExplosions += a->bExplosions;
-
-	for(int i = 1; i < 8; ++i)
-		bodyHits[i] += a->bodyHits[i];
-}
-
-
-// *****************************************************
-// class RankSystem
-// *****************************************************
-RankSystem::RankStats::RankStats( const char* uu, const char* nn, RankSystem* pp ) {
-	name = 0;
-	namelen = 0;
-	unique = 0;
-	uniquelen = 0;
-	score = 0;
-	parent = pp;
-	id = ++parent->rankNum;
-	next = prev = 0;
-	setName( nn );
-	setUnique( uu );
-}
-
-RankSystem::RankStats::~RankStats() {
-	delete[] name;
-	delete[] unique;
-	--parent->rankNum;
-}
-
-void RankSystem::RankStats::setName( const char* nn  )	{
-	delete[] name;
-	namelen = strlen(nn) + 1;
-	name = new char[namelen];
-	if ( name )
-		strcpy( name , nn );
-	else
-		namelen = 0;
-}
-
-void RankSystem::RankStats::setUnique( const char* nn  )	{
-	delete[] unique;
-	uniquelen = strlen(nn) + 1;
-	unique = new char[uniquelen];
-	if ( unique )
-		strcpy( unique , nn );	
-	else
-		uniquelen = 0;
-}
-
-RankSystem::RankSystem() { 
-	head = 0; 
-	tail = 0; 
-	rankNum = 0;
-	calc.code = 0;
-}
-
-RankSystem::~RankSystem() {
-	clear();
-}
-
-void RankSystem::put_before( RankStats* a, RankStats* ptr ){
-	a->next = ptr;
-	if ( ptr ){
-		a->prev = ptr->prev;
-		ptr->prev = a;
-	}
-	else{
-		a->prev = head;
-		head = a;
-	}
-	if ( a->prev )	a->prev->next = a;
-	else tail = a;
-}
-
-void  RankSystem::put_after( RankStats* a, RankStats* ptr ) {
-	a->prev = ptr;
-	if ( ptr ){
-		a->next = ptr->next;
-		ptr->next = a;
-	}
-	else{
-		a->next = tail;
-		tail = a;
-	}
-	if ( a->next )	a->next->prev = a;
-	else head = a;
-}
-
-void RankSystem::unlink( RankStats* ptr ){
-	if (ptr->prev) ptr->prev->next = ptr->next;
-	else tail = ptr->next;
-	if (ptr->next) ptr->next->prev = ptr->prev;
-	else head = ptr->prev;
-}
-
-void RankSystem::clear(){
-	while( tail ){
-		head = tail->next;
-		delete tail;
-		tail = head;
-	}
-}
-
-
-
-bool RankSystem::loadCalc(const char* filename, char* error)
-{
-	if ((MF_LoadAmxScript(&calc.amx,&calc.code,filename,error,0)!=AMX_ERR_NONE)||
-		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr1, &calc.physAddr1)!=AMX_ERR_NONE)||
-		(MF_AmxAllot(&calc.amx, 8 , &calc.amxAddr2, &calc.physAddr2)!=AMX_ERR_NONE)||
-		(MF_AmxFindPublic(&calc.amx,"get_score",&calc.func)!=AMX_ERR_NONE)){
-		LOG_CONSOLE( PLID, "Couldn't load plugin (file \"%s\")",filename);
-		MF_UnloadAmxScript(&calc.amx, &calc.code);
-		return false;
-	}
-	return true;
-}
-
-void RankSystem::unloadCalc()
-{
-	MF_UnloadAmxScript(&calc.amx , &calc.code);
-}
-
-RankSystem::RankStats* RankSystem::findEntryInRank(const char* unique, const char* name )
-{
-	RankStats* a = head;
-	
-	while ( a )
-	{
-		if (  strcmp( a->getUnique() ,unique ) == 0 )
-			return a;
-
-		a = a->prev;
-	}
-	a = new RankStats( unique ,name,this );
-	if ( a == 0 ) return 0;
-	put_after( a  , 0 );
-	return a;
-}
-
-void RankSystem::updatePos(  RankStats* rr ,  Stats* s )
-{
-	rr->addStats( s );
-	if ( calc.code ) {
-		calc.physAddr1[0] = rr->kills;
-		calc.physAddr1[1] = rr->deaths;
-		calc.physAddr1[2] = rr->hs;
-		calc.physAddr1[3] = rr->tks;
-		calc.physAddr1[4] = rr->shots;
-		calc.physAddr1[5] = rr->hits;
-		calc.physAddr1[6] = rr->damage;
-
-		calc.physAddr1[7] = rr->bDefusions;
-		calc.physAddr1[8] = rr->bDefused;
-		calc.physAddr1[9] = rr->bPlants;
-		calc.physAddr1[10] = rr->bExplosions;
-
-		for(int i = 1; i < 8; ++i)
-			calc.physAddr2[i] = rr->bodyHits[i];
-		cell result = 0;
-		int err;
-		if ((err = MF_AmxExec(&calc.amx,&result, calc.func ,2,calc.amxAddr1,calc.amxAddr2 )) != AMX_ERR_NONE)
-			LOG_CONSOLE( PLID, "Run time error %d on line %ld (plugin \"%s\")",	err,calc.amx.curline,LOCALINFO("csstats_score"));
-		rr->score = result;
-	}
-	else rr->score = rr->kills - rr->deaths;
-	
-
-	RankStats* aa = rr->next;
-	while ( aa && (aa->score <= rr->score) ) { // try to nominate
-		rr->goUp();
-		aa->goDown();
-		aa = aa->next;		// go to next rank
-	}
-	if ( aa != rr->next )
-	{
-		unlink( rr );
-		put_before( rr, aa );
-	}
-	else
-	{
-		aa = rr->prev;
-		while ( aa && (aa->score > rr->score) ) { // go down
-			rr->goDown();
-			aa->goUp();
-			aa = aa->prev;	// go to prev rank
-		}
-		if ( aa != rr->prev ){
-			unlink( rr );
-			put_after( rr, aa );
-		}
-	}
-
-}
-
-void RankSystem::loadRank( const char* filename )
-{
-	FILE *bfp = fopen( filename , "rb" );
-	
-	if ( !bfp ) return;
-	
-	short int i = 0;
-	fread(&i, 1 , sizeof(short int) , bfp);
-	
-	if (i == RANK_VERSION)
-	{
-		Stats d;
-		char unique[64], name[64];
-		fread(&i , 1, sizeof(short int), bfp);
-
-		while( i )
-		{
-			fread(name , i,sizeof(char) , bfp);
-			fread(&i , 1, sizeof(short int), bfp);
-			fread(unique , i,sizeof(char) , bfp);
-			fread(&d.tks, 1,sizeof(int), bfp);
-			fread(&d.damage, 1,sizeof(int), bfp);
-			fread(&d.deaths, 1,sizeof(int), bfp);
-			fread(&d.kills, 1,sizeof(int), bfp);
-			fread(&d.shots, 1,sizeof(int), bfp);
-			fread(&d.hits, 1,sizeof(int), bfp);
-			fread(&d.hs, 1,sizeof(int), bfp);
-
-			fread(&d.bDefusions, 1,sizeof(int), bfp);
-			fread(&d.bDefused, 1,sizeof(int), bfp);
-			fread(&d.bPlants, 1,sizeof(int), bfp);
-			fread(&d.bExplosions, 1,sizeof(int), bfp);
-
-			fread(d.bodyHits, 1,sizeof(d.bodyHits), bfp);
-			fread(&i , 1, sizeof(short int), bfp);
-
-			RankSystem::RankStats* a = findEntryInRank( unique , name );
-
-			if ( a ) a->updatePosition( &d );
-		}
-	}
-	fclose(bfp);
-}
-
-void RankSystem::saveRank( const char* filename )
-{
-	FILE *bfp = fopen(filename, "wb");
-	
-	if ( !bfp ) return;
-
-	short int i = RANK_VERSION;
-	
-	fwrite(&i, 1, sizeof(short int) , bfp);
-	
-	RankSystem::iterator a = front();
-	
-	while ( a )
-	{
-		if ( (*a).score != (1<<31) ) // score must be different than mincell
-		{
-			fwrite( &(*a).namelen , 1, sizeof(short int), bfp);
-			fwrite( (*a).name , (*a).namelen , sizeof(char) , bfp);
-			fwrite( &(*a).uniquelen , 1, sizeof(short int), bfp);
-			fwrite( (*a).unique ,  (*a).uniquelen , sizeof(char) , bfp);
-			fwrite( &(*a).tks, 1, sizeof(int), bfp);
-			fwrite( &(*a).damage, 1, sizeof(int), bfp);
-			fwrite( &(*a).deaths, 1, sizeof(int), bfp);
-			fwrite( &(*a).kills, 1, sizeof(int), bfp);
-			fwrite( &(*a).shots, 1, sizeof(int), bfp);
-			fwrite( &(*a).hits, 1, sizeof(int), bfp);
-			fwrite( &(*a).hs, 1, sizeof(int), bfp);
-
-			fwrite( &(*a).bDefusions, 1, sizeof(int), bfp);
-			fwrite( &(*a).bDefused, 1, sizeof(int), bfp);
-			fwrite( &(*a).bPlants, 1, sizeof(int), bfp);
-			fwrite( &(*a).bExplosions, 1, sizeof(int), bfp);
-
-			fwrite( (*a).bodyHits, 1, sizeof((*a).bodyHits), bfp);
-		}
-		
-		--a;
-	}
-
-	i = 0;
-	fwrite( &i , 1, sizeof(short int), bfp); // null terminator
-	
-	fclose(bfp);
-}

dlls/csx/source/CRank.h

@@ -1,122 +0,0 @@
-
-
-#ifndef CRANK_H
-#define CRANK_H
-
-#define RANK_VERSION 11
-
-#include "amxxmodule.h"
-
-// *****************************************************
-// class Stats
-// *****************************************************
-
-struct Stats {
-	int hits;
-	int shots;
-	int damage;
-	int hs;
-	int tks;
-	int kills;
-	int deaths;
-	int bodyHits[9]; ////////////////////
-	
-	// SiDLuke start
-	int bPlants;
-	int bExplosions;
-	int bDefusions;
-	int bDefused;
-	// SiDLuke end :D
-
-	Stats();
-	void commit(Stats* a);
-};
-
-// *****************************************************
-// class RankSystem
-// *****************************************************
-
-class RankSystem
-{
-public:
-	class RankStats;
-	friend class RankStats;
-	class iterator;
-
-	class RankStats : public Stats {
-		friend class RankSystem;
-		friend class iterator;
-		RankSystem*	parent;
-		RankStats*	next;
-		RankStats*	prev;
-		char*		unique;
-		short int	uniquelen;
-		char*		name;
-		short int	namelen;
-		int			score;
-		int			id;
-		RankStats( const char* uu, const char* nn,  RankSystem* pp );
-		~RankStats();
-		void setUnique( const char* nn  );
-		inline void goDown() {++id;}
-		inline void goUp() {--id;}
-		inline void addStats(Stats* a) { commit( a ); }
-	public:
-		void setName( const char* nn  );
-		inline const char* getName() const { return name ? name : ""; }
-		inline const char* getUnique() const { return unique ? unique : ""; }
-		inline int getPosition() const { return id; }
-		inline void updatePosition( Stats* points ) {
-			parent->updatePos( this , points );
-		}
-	};
-
-private:
-	RankStats* head;
-	RankStats* tail;
-	int rankNum;
-
-	struct scoreCalc{
-		AMX amx;
-		void* code;
-		int func;
-		cell amxAddr1;
-		cell amxAddr2;
-		cell *physAddr1;
-		cell *physAddr2;
-	} calc;
-
-	void put_before( RankStats* a, RankStats* ptr );
-	void put_after( RankStats* a, RankStats* ptr );
-	void unlink( RankStats* ptr );
-	void updatePos( RankStats* r ,  Stats* s );
-	
-public:
-
-	RankSystem();
-	~RankSystem();
-
-	void saveRank( const char* filename );
-	void loadRank( const char* filename );
-	RankStats* findEntryInRank(const char* unique, const char* name );
-	bool loadCalc(const char* filename, char* error);
-	inline int getRankNum( ) const { return rankNum; }
-	void clear();
-	void unloadCalc();
-
-	class iterator {
-		RankStats* ptr;
-	public:
-		iterator(RankStats* a): ptr(a){}
-		inline iterator& operator--() { ptr = ptr->prev; return *this;}
-		inline iterator& operator++() {	ptr = ptr->next; return *this; }
-		inline RankStats& operator*() {	return *ptr;}
-		operator bool () { return (ptr != 0); }
-	};
-
-	inline iterator front() {  return iterator(head);  }
-	inline iterator begin() {  return iterator(tail);  }
-};
-
-
-#endif

dlls/csx/source/Makefile

@@ -1,102 +0,0 @@
-MODNAME = csx_amxx
-SRCFILES = amxxmodule.cpp CMisc.cpp CRank.cpp meta_api.cpp rank.cpp usermsg.cpp
-
-EXTRA_LIBS_LINUX =
-EXTRA_LIBS_WIN32 =
-EXTRA_LIBDIRS_LINUX = -Lextra/lib_linux
-EXTRA_LIBDIRS_WIN32 = -Lextra/lib_win32
-
-EXTRA_INCLUDEDIRS = -Iextra/include -I../amx
-
-EXTRA_FLAGS = -Dstrcmpi=strcasecmp
-
-AMXDIR=../amx
-SDKSRC=../sdk
-METADIR=../metamod
-
-OBJDIR_LINUX=obj.linux
-OBJDIR_WIN32=obj.win32
-SRCDIR=.
-
-ifdef windir
-	OS=WIN32
-else
-	OS=LINUX
-endif
-
-CC_LINUX=gcc
-ifeq "$(OS)" "WIN32"
-	CC_WIN32=gcc
-	LD_WINDLL=dllwrap
-	DEFAULT=win32
-	CLEAN=clean_win32
-else
-	CC_WIN32=/usr/local/cross-tools/i386-mingw32msvc/bin/gcc
-	LD_WINDLL=/usr/local/cross-tools/bin/i386-mingw32msvc-dllwrap
-	DEFAULT=linux win32
-	CLEAN=clean_both
-endif
-
-
-LIBFILE_LINUX = $(MODNAME)_i386.so
-LIBFILE_WIN32 = $(MODNAME).dll
-TARGET_LINUX = $(OBJDIR_LINUX)/$(LIBFILE_LINUX)
-TARGET_WIN32 = $(OBJDIR_WIN32)/$(LIBFILE_WIN32)
-
-FILES_ALL = *.cpp *.h [A-Z]* *.rc
-ifeq "$(OS)" "LINUX"
-	ASRCFILES := $(shell ls -t $(SRCFILES))
-else
-	ASRCFILES := $(shell dir /b)
-endif
-OBJ_LINUX := $(SRCFILES:%.cpp=$(OBJDIR_LINUX)/%.o)
-OBJ_WIN32 := $(SRCFILES:%.cpp=$(OBJDIR_WIN32)/%.o)
-
-CCOPT = -march=i586 -O6 -ffast-math -funroll-loops \
-	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
-	-malign-jumps=2 -malign-functions=2 -s -DNDEBUG
-
-INCLUDEDIRS=-I../curl/include -I$(SRCDIR) -I$(AMXDIR) -I$(METADIR) -I$(SDKSRC)/engine -I$(SDKSRC)/common -I$(SDKSRC)/dlls -I$(SDKSRC) $(EXTRA_INCLUDEDIRS)
-CFLAGS=-Wall -Wno-unknown-pragmas
-ODEF = -DOPT_TYPE=\"optimized\"
-CFLAGS:=$(CCOPT) $(CFLAGS) $(ODEF) $(EXTRA_FLAGS)
-
-DO_CC_LINUX=$(CC_LINUX) $(CFLAGS) -fPIC $(INCLUDEDIRS) -o $@ -c $<
-DO_CC_WIN32=$(CC_WIN32) $(CFLAGS) $(INCLUDEDIRS) -o $@ -c $<
-LINK_LINUX=$(CC_LINUX) $(CFLAGS) -shared -ldl -lm $(OBJ_LINUX) $(EXTRA_LIBDIRS_LINUX) $(EXTRA_LIBS_LINUX) -o $@
-LINK_WIN32=$(LD_WINDLL) -mwindows --add-stdcall-alias $(OBJ_WIN32) $(EXTRA_LIBDIRS_WIN32) $(EXTRA_LIBS_WIN32) -o $@
-
-$(OBJDIR_LINUX)/%.o: $(SRCDIR)/%.cpp
-	$(DO_CC_LINUX)
-
-$(OBJDIR_WIN32)/%.o: $(SRCDIR)/%.cpp
-	$(DO_CC_WIN32)
-
-default: $(DEFAULT)
-
-$(TARGET_LINUX): $(OBJDIR_LINUX) $(OBJ_LINUX)
-	$(LINK_LINUX)
-
-$(TARGET_WIN32): $(OBJDIR_WIN32) $(OBJ_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)
-
-

dlls/csx/source/Makefile.pl

@@ -1,178 +0,0 @@
-#!/usr/bin/perl
-#(C)2004 AMX Mod X Development Team
-# by David "BAILOPAN" Anderson
-
-# output will occur in bin.x.proc
-# where x is debug or opt and proc is ix86 or amd64
-# You must use this script from the project src dir
-
-#options = 
-# debug - enable gdb debugging
-# amd64 - compile for AMD64
-# proc=ix86 - assumed not amd64
-# clean - clean the specifications above
-
-$PROJECT = "csx_amxx";
-$sdk = "../../../hlsdk/SourceCode";
-$mm = "../../../metamod/metamod";
-$gccf = "gcc";
-
-@CPP_SOURCE_FILES = ("amxxmodule.cpp", "CMisc.cpp", "usermsg.cpp", "meta_api.cpp", "rank.cpp", "CRank.cpp");
-
-@C_SOURCE_FILES = ();
-my %OPTIONS, %OPT;
-
-$OPT{"debug"} = "-g -ggdb";
-$OPT{"opt"} = "-O2 -ffast-math -funroll-loops -fomit-frame-pointer -s -DNDEBUG -Wall -Wno-unknown-pragmas -DOPT_TYPE=\"optimized\" -fno-exceptions -fno-rtti";
-
-$OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_shared -I$sdk/dlls";
-
-while ($cmd = shift)
-{
-	if ($cmd =~ /amd64/) {
-		$OPTIONS{"amd64"} = 1;
-	} elsif ($cmd =~ /debug/) {
-		$OPTIONS{"debug"} = 1;
-	} elsif ($cmd =~ /proc=i(\d)86/) {
-		$proc = $1;
-		if ($OPTIONS{"amd64"})
-		{
-			die "You cannot compile for i".$proc."86 and AMD64.\n";
-		} else {
-			$OPTIONS{"proc"} = "i".$proc."86";
-		}
-	} elsif ($cmd =~ /clean/) {
-		$OPTIONS{"clean"} = 1;		
-	}
-}
-
-$gcc = `$gccf --version`;
-if ($gcc =~ /2\.9/)
-{
-	$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
-} else {
-	$OPT{"opt"} .= " -falign-loops=2 -falign-jumps=2 -falign-functions=2";
-}
-
-if ($OPTIONS{"debug"})
-{
-	$cflags = $OPT{"debug"};
-} else {
-	if (!$OPTIONS{"amd64"})
-	{
-		$proc = $OPTIONS{"proc"};
-		if (!$proc)
-		{
-			$proc = 3;
-		}
-		$cflags = "-march=i".$proc."86 ".$OPT{"opt"};
-	} else {
-		$cflags = $OPT{"opt"};
-	}
-}
-
-if ($OPTIONS{"amd64"})
-{
-	$cflags .= " -m64 -DHAVE_I64 -DSMALL_CELL_SIZE=64 $cflags";
-}
-
-if ($OPTIONS{"debug"})
-{
-	$outdir = "bin.debug";
-} else {
-	$outdir = "bin.opt";
-}
-
-if ($OPTIONS{"amd64"})
-{
-	$outdir .= ".amd64";
-	$bin = $PROJECT."_amd64.so";
-} else {
-	$proc = $OPTIONS{"proc"};
-	if ($proc)
-	{
-		$outdir .= ".i".$proc."86";
-		$bin = $PROJECT."_i".$proc."86.so";
-	} else {
-		$outdir .= ".i386";
-		$bin = $PROJECT."_i386.so";
-	}
-}
-
-unlink("$outdir/$bin");
-if ($OPTIONS{"clean"})
-{
-	`rm $outdir/*.o`;
-	die("Project cleaned.\n");
-}
-
-#create the dirs
-#build link list
-my @LINK;
-for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
-{
-	$file = $CPP_SOURCE_FILES[$i];
-	$file =~ s/\.cpp/\.o/;
-	push(@LINK, $outdir."/".$file);
-}
-for ($i=0; $i<=$#C_SOURCE_FILES; $i++)
-{
-	$file = $C_SOURCE_FILES[$i];
-	$file =~ s/\.c/\.o/;
-	push(@LINK, $outdir."/".$file);
-}
-
-if (!(-d $outdir))
-{
-	mkdir($outdir);
-}
-
-$inc = $OPTIONS{"include"};
-
-for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
-{
-	$file = $CPP_SOURCE_FILES[$i];
-	$ofile = $file;
-	$ofile =~ s/\.cpp/\.o/;
-	$ofile = "$outdir/$ofile";
-	$gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
-	if (-e $ofile)
-	{
-		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
-		if ($file_time > $ofile_time)
-		{
-			print "$gcc\n";
-			`$gcc`;
-		}
-	} else {
-		print "$gcc\n";
-		`$gcc`;
-	}
-}
-
-for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
-{
-	$file = $C_SOURCE_FILES[$i];
-	$ofile = $file;
-	$ofile =~ s/\.c/\.o/;
-	$ofile = "$outdir/$ofile";
-	$gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile";
-	if (-e $ofile)
-	{
-		$file_time = (stat($file))[9];
-		$ofile_time = (stat($ofile))[9];
-		if ($file_time > $ofile_time)
-		{
-			print "$gcc\n";
-			`$gcc`;
-		}
-	} else {
-		print "$gcc\n";
-		`$gcc`;
-	}
-}
-
-$gcc = "$gccf $cflags -shared -ldl -lm @LINK -o $outdir/$bin";
-print "$gcc\n";
-`$gcc`;

dlls/csx/source/compile.bat

@@ -1,6 +0,0 @@
-@echo off
-PATH=D:\gcc\bin;%PATH%
-
-make
-
-pause

dlls/csx/source/meta_api.cpp

@@ -1,380 +0,0 @@
-#include "amxxmodule.h"
-#include "rank.h"
-
-funEventCall modMsgsEnd[MAX_REG_MSGS];
-funEventCall modMsgs[MAX_REG_MSGS];
-
-void (*function)(void*);
-void (*endfunction)(void*);
-
-CPlayer players[33];
-
-CPlayer* mPlayer;
-
-int mPlayerIndex;
-int mState;
-
-RankSystem g_rank;
-
-Grenades g_grenades;
-
-int iFGrenade;
-int iFDeath;
-int iFDamage;
-
-int iFBPlanted;
-int iFBDefused;
-int iFBPlanting;
-int iFBDefusing;
-int iFBExplode;
-
-int g_bombAnnounce;
-int g_Planter;
-int g_Defuser;
-
-bool rankBots;
-
-int gmsgCurWeapon;
-int gmsgDeathMsg;
-int gmsgDamage;
-int gmsgDamageEnd;
-int gmsgWeaponList;
-int gmsgResetHUD;
-int gmsgAmmoX;
-int gmsgScoreInfo;
-int gmsgAmmoPickup;
-
-int gmsgSendAudio;
-int gmsgTextMsg;
-int gmsgBarTime;
-
-cvar_t init_csstats_maxsize ={"csstats_maxsize","3500", 0 , 3500.0 };
-cvar_t init_csstats_reset ={"csstats_reset","0"};
-cvar_t init_csstats_rank ={"csstats_rank","0"};
-cvar_t *csstats_maxsize;
-cvar_t *csstats_reset;
-cvar_t *csstats_rank;
-
-cvar_t* csstats_rankbots;
-cvar_t* csstats_pause;
-cvar_t init_csstats_rankbots ={"csstats_rankbots","1"};
-cvar_t init_csstats_pause = {"csstats_pause","0"};
-
-struct sUserMsg {
-	const char* name;
-	int* id;
-	funEventCall func;
-	bool endmsg;
-} g_user_msg[] = {
-	{ "CurWeapon" , &gmsgCurWeapon , Client_CurWeapon, false },
-	{ "Damage" , &gmsgDamage,Client_Damage, false  },	
-	{ "Damage" , &gmsgDamageEnd, Client_Damage_End, true },
-	{ "WeaponList" , &gmsgWeaponList, Client_WeaponList, false },
-	{ "ResetHUD" , &gmsgResetHUD,Client_ResetHUD, true },
-	{ "AmmoX" , &gmsgAmmoX, Client_AmmoX , false },
-	{ "ScoreInfo" , &gmsgScoreInfo, Client_ScoreInfo, false },
-	{ "AmmoPickup" , &gmsgAmmoPickup, Client_AmmoPickup , false },
-
-	{ "SendAudio" , &gmsgSendAudio , Client_SendAudio , false },
-	{ "TextMsg" , &gmsgTextMsg , Client_TextMsg , false },
-	{ "BarTime" , &gmsgBarTime , Client_BarTime , false },
-
-	{ 0 , 0,0,false }
-};
-
-int RegUserMsg_Post(const char *pszName, int iSize)
-{
-	for (int i = 0; g_user_msg[ i ].name; ++i )
-	{
-		if ( !*g_user_msg[i].id && strcmp( g_user_msg[ i ].name , pszName  ) == 0 )
-		{
-			int id = META_RESULT_ORIG_RET( int );
-
-			*g_user_msg[ i ].id = id;
-		
-			if ( g_user_msg[ i ].endmsg )
-				modMsgsEnd[ id  ] = g_user_msg[ i ].func;
-			else
-				modMsgs[ id  ] = g_user_msg[ i ].func;
-			//break;
-		}
-	}
-	RETURN_META_VALUE(MRES_IGNORED, 0);
-}
-
-const char* get_localinfo( const char* name , const char* def = 0 )
-{
-	const char* b = LOCALINFO( (char*)name );
-	if (((b==0)||(*b==0)) && def )
-		SET_LOCALINFO((char*)name,(char*)(b = def) );
-	return b;
-}
-
-void ClientKill(edict_t *pEntity){
-	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	if ( !pPlayer->IsAlive())
-		RETURN_META(MRES_IGNORED);
-
-	MF_ExecuteForward( iFDamage,pPlayer->index , pPlayer->index , 0, 0, 0, 0 );
-	pPlayer->saveKill(pPlayer,0,0,0);
-	MF_ExecuteForward( iFDeath,pPlayer->index, pPlayer->index, 0, 0, 0 );
-
-	RETURN_META(MRES_IGNORED);
-}
-
-void ServerActivate_Post( edict_t *pEdictList, int edictCount, int clientMax ){
-
-	rankBots = (int)csstats_rankbots->value ? true:false;
-
-	for( int i = 1; i <= gpGlobals->maxClients; ++i)
-		GET_PLAYER_POINTER_I(i)->Init( i , pEdictList + i );
-	RETURN_META(MRES_IGNORED);
-}
-
-void PlayerPreThink_Post( edict_t *pEntity ) {
-    if ( !isModuleActive() )
-		return;
-
-	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	if (pPlayer->clearStats && pPlayer->clearStats < gpGlobals->time ){
-
-		if ( !ignoreBots(pEntity) ){
-			pPlayer->clearStats = 0.0f;
-			if (pPlayer->rank)
-				pPlayer->rank->updatePosition( &pPlayer->life );
-			pPlayer->restartStats(false);
-		}
-	}
-	RETURN_META(MRES_IGNORED);
-}
-
-void ServerDeactivate() {
-	int i;
-	for( i = 1;i<=gpGlobals->maxClients; ++i){
-		CPlayer *pPlayer = GET_PLAYER_POINTER_I(i);
-		if (pPlayer->rank) pPlayer->Disconnect();
-	}
-	if ( (g_rank.getRankNum() >= (int)csstats_maxsize->value) || ((int)csstats_reset->value == 1 ) ) {
-		CVAR_SET_FLOAT("csstats_reset",0.0);
-		g_rank.clear(); // clear before save to file
-	}
-	g_rank.saveRank( MF_BuildPathname("%s",get_localinfo("csstats")) );	
-
-	// clear custom weapons info
-	for ( i=MAX_WEAPONS;i<MAX_WEAPONS+MAX_CWEAPONS;i++)
-		weaponData[i].ammoSlot = 0;
-
-	RETURN_META(MRES_IGNORED);
-}
-
-BOOL ClientConnect_Post( edict_t *pEntity, const char *pszName, const char *pszAddress, char szRejectReason[ 128 ]  ){
-	GET_PLAYER_POINTER(pEntity)->Connect(pszAddress);
-	RETURN_META_VALUE(MRES_IGNORED, TRUE);
-}
-
-void ClientDisconnect( edict_t *pEntity ) {
-	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	if (pPlayer->rank) pPlayer->Disconnect();
-	RETURN_META(MRES_IGNORED);
-}
-
-void ClientPutInServer_Post( edict_t *pEntity ) {
-	GET_PLAYER_POINTER(pEntity)->PutInServer();
-	RETURN_META(MRES_IGNORED);
-}
-
-void ClientUserInfoChanged_Post( edict_t *pEntity, char *infobuffer ) {
-	CPlayer *pPlayer = GET_PLAYER_POINTER(pEntity);
-	const char* name = INFOKEY_VALUE(infobuffer,"name");
-	const char* oldname = STRING(pEntity->v.netname);
-
-	if ( pPlayer->rank ){
-		if ( strcmp(oldname,name) != 0 ) {
-			if ((int)csstats_rank->value == 0)
-				pPlayer->rank = g_rank.findEntryInRank( name, name );
-			else
-				pPlayer->rank->setName( name );
-		}
-	}
-	else if ( pPlayer->IsBot() ) {
-		pPlayer->Connect( "127.0.0.1" );
-		pPlayer->PutInServer();
-	}
-	RETURN_META(MRES_IGNORED);
-}
-
-void MessageBegin_Post(int msg_dest, int msg_type, const float *pOrigin, edict_t *ed) {
-	if (ed){
-		mPlayerIndex = ENTINDEX(ed);
-		mPlayer = GET_PLAYER_POINTER_I(mPlayerIndex);
-	} else {
-		mPlayerIndex = 0;
-		mPlayer = 0;
-	}
-	mState = 0;	
-	if ( msg_type < 0 || msg_type >= MAX_REG_MSGS )
-		msg_type = 0;
-	function=modMsgs[msg_type];
-	endfunction=modMsgsEnd[msg_type];
-	RETURN_META(MRES_IGNORED);
-}
-
-void MessageEnd_Post(void) {
-	if (endfunction) (*endfunction)(NULL);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteByte_Post(int iValue) {
-	if (function) (*function)((void *)&iValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteChar_Post(int iValue) {
-	if (function) (*function)((void *)&iValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteShort_Post(int iValue) {
-	if (function) (*function)((void *)&iValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteLong_Post(int iValue) {
-	if (function) (*function)((void *)&iValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteAngle_Post(float flValue) {
-	if (function) (*function)((void *)&flValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteCoord_Post(float flValue) {
-	if (function) (*function)((void *)&flValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteString_Post(const char *sz) {
-	if (function) (*function)((void *)sz);
-	RETURN_META(MRES_IGNORED);
-}
-
-void WriteEntity_Post(int iValue) {
-	if (function) (*function)((void *)&iValue);
-	RETURN_META(MRES_IGNORED);
-}
-
-void StartFrame_Post(){
-	if (g_bombAnnounce){
-		switch (g_bombAnnounce){
-		case BOMB_PLANTING:
-			MF_ExecuteForward( iFBPlanting,g_Planter );
-			break;
-		case BOMB_PLANTED:
-			MF_ExecuteForward( iFBPlanted,g_Planter );
-			break;
-		case BOMB_EXPLODE:
-			MF_ExecuteForward( iFBExplode,g_Planter,g_Defuser );
-			break;
-		case BOMB_DEFUSING:
-			MF_ExecuteForward( iFBDefusing,g_Defuser );
-			break;
-		case BOMB_DEFUSED:
-			MF_ExecuteForward( iFBDefused,g_Defuser );
-			break;
-		}
-		g_bombAnnounce = 0;
-	}
-	RETURN_META(MRES_IGNORED);
-}
-
-void SetModel_Post(edict_t *e, const char *m){
-
-	if ( !isModuleActive() )
-		return;
-
-	if ( e->v.owner && m[7]=='w' && m[8]=='_' ){
-		int w_id = 0;
-		CPlayer *pPlayer = GET_PLAYER_POINTER(e->v.owner);
-		switch(m[9]){
-		case 'h':
-			w_id = CSW_HEGRENADE;
-			g_grenades.put(e, 2.0, 4, pPlayer);
-			pPlayer->saveShot(CSW_HEGRENADE);
-			break;
-		case 'f':
-			if (m[10]=='l') w_id = CSW_FLASHBANG;
-			break;
-		case 's':
-			if (m[10]=='m') w_id = CSW_SMOKEGRENADE;
-			break;
-		}
-		if ( w_id )	
-			MF_ExecuteForward( iFGrenade, pPlayer->index, ENTINDEX(e) ,w_id );
-	}
-
-	RETURN_META(MRES_IGNORED);
-}
-
-void EmitSound_Post(edict_t *entity, int channel, const char *sample, /*int*/float volume, float attenuation, int fFlags, int pitch) {
-	if (sample[0]=='w'&&sample[1]=='e'&&sample[8]=='k'&&sample[9]=='n'&&sample[14]!='d'){
-		CPlayer*pPlayer = GET_PLAYER_POINTER(entity);
-		pPlayer->saveShot(pPlayer->current);
-	}
-	RETURN_META(MRES_IGNORED);
-}
-
-void TraceLine_Post(const float *v1, const float *v2, int fNoMonsters, edict_t *e, TraceResult *ptr) {
-	if (ptr->pHit&&(ptr->pHit->v.flags& (FL_CLIENT | FL_FAKECLIENT) )&&
-		e&&(e->v.flags& (FL_CLIENT | FL_FAKECLIENT) )&&ptr->iHitgroup)
-		GET_PLAYER_POINTER(e)->aiming = ptr->iHitgroup;
-	RETURN_META(MRES_IGNORED);
-}
-
-void OnMetaAttach() {
-
-	CVAR_REGISTER (&init_csstats_maxsize);
-	CVAR_REGISTER (&init_csstats_reset);
-	CVAR_REGISTER (&init_csstats_rank);
-	csstats_maxsize=CVAR_GET_POINTER(init_csstats_maxsize.name);
-	csstats_reset=CVAR_GET_POINTER(init_csstats_reset.name);
-	csstats_rank=CVAR_GET_POINTER(init_csstats_rank.name);
-
-	CVAR_REGISTER (&init_csstats_rankbots);
-	CVAR_REGISTER (&init_csstats_pause);
-	csstats_rankbots = CVAR_GET_POINTER(init_csstats_rankbots.name);
-	csstats_pause = CVAR_GET_POINTER(init_csstats_pause.name);
-}
-
-void OnAmxxAttach(){
-	MF_AddNatives(stats_Natives);
-	const char* path =  get_localinfo("csstats_score");
-	if ( path && *path ) 
-	{
-		char error[128];
-		g_rank.loadCalc( MF_BuildPathname("%s",path) , error  );
-	}
-	
-	if ( !g_rank.begin() )
-	{		
-		g_rank.loadRank( MF_BuildPathname("%s",
-			get_localinfo("csstats") ) );
-	}
-}
-
-void OnAmxxDetach() {
-	g_grenades.clear();
-	g_rank.clear();
-	g_rank.unloadCalc();
-}
-
-void OnPluginsLoaded(){
-	iFDeath = MF_RegisterForward("client_death",ET_IGNORE,FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_DONE);
-	iFDamage = MF_RegisterForward("client_damage",ET_IGNORE,FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_CELL,FP_DONE);
-	iFBPlanted = MF_RegisterForward("bomb_planted",ET_IGNORE,FP_CELL,FP_DONE);
-	iFBDefused = MF_RegisterForward("bomb_defused",ET_IGNORE,FP_CELL,FP_DONE);
-	iFBPlanting = MF_RegisterForward("bomb_planting",ET_IGNORE,FP_CELL,FP_DONE);
-	iFBDefusing = MF_RegisterForward("bomb_defusing",ET_IGNORE,FP_CELL,FP_DONE);
-	iFBExplode = MF_RegisterForward("bomb_explode",ET_IGNORE,FP_CELL,FP_CELL,FP_DONE);
-	iFGrenade = MF_RegisterForward("grenade_throw",ET_IGNORE,FP_CELL,FP_CELL,FP_CELL,FP_DONE);
-}

dlls/csx/source/moduleconfig.h

@@ -1,462 +0,0 @@
-// Configuration
-
-#ifndef __MODULECONFIG_H__
-#define __MODULECONFIG_H__
-
-// Module info
-#define MODULE_NAME "CSX"
-#define MODULE_VERSION "0.20"
-#define MODULE_AUTHOR "AMX Mod X Dev Team"
-#define MODULE_URL "http://www.amxmodx.org/"
-#define MODULE_LOGTAG "CSX"
-// 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
-
-// - 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__

dlls/csx/source/msvc/csx.dsp

@@ -1,149 +0,0 @@
-# Microsoft Developer Studio Project File - Name="csx" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=csx - 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 "csx.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 "csx.mak" CFG="csx - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "csx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "csx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "csx - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "release"
-# PROP Intermediate_Dir "release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /Zp4 /MT /W3 /GX /O2 /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /D "JIT" /FR /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/csx_amxx.dll"
-# SUBTRACT LINK32 /pdb:none
-
-!ELSEIF  "$(CFG)" == "csx - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "debug"
-# PROP Intermediate_Dir "debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /I "..\..\hlsdk\sourcecode\pm_shared" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"debug/csx_amxx.dll" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none
-
-!ENDIF 
-
-# Begin Target
-
-# Name "csx - Win32 Release"
-# Name "csx - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\amxxmodule.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CMisc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\CRank.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\meta_api.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\rank.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\usermsg.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\amxxmodule.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CMisc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\CRank.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\moduleconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\rank.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project

dlls/csx/source/msvc/csx.dsw

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

dlls/csx/source/msvc/csx.sln

@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "csx.vcproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.ActiveCfg = Debug|Win32
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.Build.0 = Debug|Win32
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.ActiveCfg = Release|Win32
-		{1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal