Tagged 1.76c

Neither is still as accurate as I want them to be though :\

amxmodx/CForward.cpp

@@ -33,7 +33,7 @@
 #include "debugger.h"
 #include "binlog.h"
 
-CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes)
+CForward::CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam *paramTypes, int fwd_type)
 {
 	m_FuncName = name;
 	m_ExecType = et;
@@ -47,6 +47,13 @@ CForward::CForward(const char *name, ForwardExecType et, int numParams, const Fo
 	
 	for (CPluginMngr::iterator iter = g_plugins.begin(); iter; ++iter)
 	{
+		if ((fwd_type != FORWARD_ALL) &&
+			((fwd_type == FORWARD_ONLY_NEW && ((*iter).getAMX()->flags & AMX_FLAG_OLDFILE))
+			|| (fwd_type == FORWARD_ONLY_OLD && !((*iter).getAMX()->flags & AMX_FLAG_OLDFILE))
+			))
+		{
+			continue;
+		}
 		if ((*iter).isValid() && amx_FindPublic((*iter).getAMX(), name, &func) == AMX_ERR_NONE)
 		{
 			AMXForward tmp;
@@ -219,6 +226,8 @@ void CSPForward::Set(int func, AMX *amx, int numParams, const ForwardParam *para
 	name[0] = '\0';
 	amx_GetPublic(amx, func, name);
 	m_Name.assign(name);
+	m_ToDelete = false;
+	m_InExec = false;
 }
 
 void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const ForwardParam *paramTypes)
@@ -229,6 +238,8 @@ void CSPForward::Set(const char *funcName, AMX *amx, int numParams, const Forwar
 	m_HasFunc = (amx_FindPublic(amx, funcName, &m_Func) == AMX_ERR_NONE);
 	isFree = false;
 	m_Name.assign(funcName);
+	m_ToDelete = false;
+	m_InExec = false;
 }
 
 cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
@@ -241,13 +252,15 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 	cell realParams[FORWARD_MAX_PARAMS];
 	cell *physAddrs[FORWARD_MAX_PARAMS];
 
-	if (!m_HasFunc)
+	if (!m_HasFunc || m_ToDelete)
 		return 0;
-	
+
 	CPluginMngr::CPlugin *pPlugin = g_plugins.findPluginFast(m_Amx);
 	if (!pPlugin->isExecutable(m_Func))
 		return 0;
 
+	m_InExec = true;
+
 	Debugger *pDebugger = (Debugger *)m_Amx->userdata[UD_DEBUGGER];
 	if (pDebugger)
 		pDebugger->BeginExec();
@@ -349,16 +362,20 @@ cell CSPForward::execute(cell *params, ForwardPreparedArray *preparedArrays)
 		}
 	}
 
+	m_InExec = false;
+
 	return retVal;
 }
 
-int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam * paramTypes)
+int CForwardMngr::registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam * paramTypes, int fwd_type)
 {
 	int retVal = m_Forwards.size() << 1;
-	CForward *tmp = new CForward(funcName, et, numParams, paramTypes);
+	CForward *tmp = new CForward(funcName, et, numParams, paramTypes, fwd_type);
 	
 	if (!tmp)
+	{
 		return -1;				// should be invalid
+	}
 	
 	m_Forwards.push_back(tmp);
 	
@@ -443,7 +460,20 @@ bool CForwardMngr::isIdValid(int id) const
 
 cell CForwardMngr::executeForwards(int id, cell *params)
 {
-	int retVal = (id & 1) ? m_SPForwards[id >> 1]->execute(params, m_TmpArrays) : m_Forwards[id >> 1]->execute(params, m_TmpArrays);
+	int retVal;
+	if (id & 1)
+	{
+		CSPForward *fwd = m_SPForwards[id >> 1];
+		retVal = fwd->execute(params, m_TmpArrays);
+		if (fwd->m_ToDelete)
+		{
+			fwd->m_ToDelete = false;
+			unregisterSPForward(id);
+		}
+	} else {
+		retVal = m_Forwards[id >> 1]->execute(params, m_TmpArrays);
+	}
+
 	m_TmpArraysNum = 0;
 	
 	return retVal;
@@ -515,18 +545,27 @@ void CForwardMngr::unregisterSPForward(int id)
 	if (!isIdValid(id) || m_SPForwards.at(id >> 1)->isFree)
 		return;
 
-	m_SPForwards.at(id >> 1)->isFree = true;
-	m_FreeSPForwards.push(id);
+	CSPForward *fwd = m_SPForwards.at(id >> 1);
+
+	if (fwd->m_InExec)
+	{
+		fwd->m_ToDelete = true;
+	} else {
+		fwd->isFree = true;
+		m_FreeSPForwards.push(id);
+	}
 }
 
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num)
+int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num, int fwd_type)
 {
 	ForwardParam params[FORWARD_MAX_PARAMS];
 	
 	for (size_t i=0; i<num; i++)
+	{
 		params[i] = static_cast<ForwardParam>(list[i]);
+	}
 	
-	return g_forwards.registerForward(funcName, et, num, params);
+	return g_forwards.registerForward(funcName, et, num, params, fwd_type);
 }
 
 int registerForward(const char *funcName, ForwardExecType et, ...)

amxmodx/CForward.h

@@ -51,6 +51,10 @@
 
 const int FORWARD_MAX_PARAMS = 32;
 
+#define FORWARD_ONLY_OLD	1
+#define FORWARD_ONLY_NEW	2
+#define FORWARD_ALL			3
+
 enum ForwardExecType
 {
 	ET_IGNORE = 0,					// Ignore return vaue
@@ -107,7 +111,7 @@ class CForward
 	ForwardParam m_ParamTypes[FORWARD_MAX_PARAMS];
 
 public:
-	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes);
+	CForward(const char *name, ForwardExecType et, int numParams, const ForwardParam * paramTypes, int fwd_type=FORWARD_ALL);
 	CForward() {}		// leaves everything unitialized'
 	
 	cell execute(cell *params, ForwardPreparedArray *preparedArrays);
@@ -139,6 +143,7 @@ public:
 // Single plugin forward
 class CSPForward
 {
+	friend class CForwardMngr;
 	const char *m_FuncName;
 	int m_NumParams;
 	
@@ -148,6 +153,8 @@ class CSPForward
 	int m_Func;
 	bool m_HasFunc;
 	String m_Name;
+	bool m_InExec;
+	bool m_ToDelete;
 
 public:
 	bool isFree;
@@ -203,7 +210,7 @@ public:
 
 	// Interface
 	// Register normal forward
-	int registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam *paramTypes);
+	int registerForward(const char *funcName, ForwardExecType et, int numParams, const ForwardParam *paramTypes, int fwd_type=FORWARD_ALL);
 	// Register single plugin forward
 	int registerSPForward(const char *funcName, AMX *amx, int numParams, const ForwardParam * paramTypes);
 	int registerSPForward(int func, AMX *amx, int numParams, const ForwardParam * paramTypes);
@@ -227,7 +234,7 @@ public:
 
 // (un)register forward
 int registerForward(const char *funcName, ForwardExecType et, ...);
-int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num);
+int registerForwardC(const char *funcName, ForwardExecType et, cell *list, size_t num, int fwd_type=FORWARD_ALL);
 int registerSPForwardByName(AMX *amx, const char *funcName, ...);
 int registerSPForwardByNameC(AMX *amx, const char *funcName, cell *list, size_t num);
 int registerSPForward(AMX *amx, int func, ...);

amxmodx/CMenu.cpp

@@ -87,6 +87,10 @@ void MenuMngr::removeMenuId(int id)
 	{
 		if (c->menuid == id)
 		{
+			if (m_watch_iter.a == c)
+			{
+				++m_watch_iter;
+			}
 			if (lc)
 				lc->next = c->next;
 			else
@@ -140,4 +144,13 @@ void MenuMngr::clear()
 	}
 }
 
+MenuMngr::iterator MenuMngr::SetWatchIter(MenuMngr::iterator iter)
+{
+	MenuMngr::iterator old = m_watch_iter;
+
+	m_watch_iter = iter;
+
+	return old;
+}
+
 int MenuMngr::MenuIdEle::uniqueid = 0;

amxmodx/CMenu.h

@@ -76,7 +76,8 @@ private:
 	} *headcmd;
 	
 public:
-	MenuMngr() { headid = 0; headcmd = 0; }
+	MenuMngr() : m_watch_iter(end())
+		{ headid = NULL; headcmd = NULL; }
 	~MenuMngr();
 
 	// Interface
@@ -89,6 +90,7 @@ public:
 
 	class iterator
 	{
+		friend class MenuMngr;
 		MenuCommand* a;
 	public:
 		iterator(MenuCommand*aa) : a(aa) {}
@@ -101,6 +103,11 @@ public:
 	
 	inline iterator begin() const { return iterator(headcmd); }
 	inline iterator end() const { return iterator(0); }
+
+	MenuMngr::iterator SetWatchIter(MenuMngr::iterator iter);
+	inline MenuMngr::iterator GetWatchIter() { return m_watch_iter; }
+private:
+	MenuMngr::iterator m_watch_iter;
 };
 
 #endif //MENUS_H

amxmodx/CPlugin.cpp

@@ -417,14 +417,16 @@ void CPluginMngr::CPlugin::pausePlugin()
 // Unpause a plugin
 void CPluginMngr::CPlugin::unpausePlugin()
 {
-	if (isValid())
+	if (isValid() && (getStatusCode() != ps_stopped))
 	{
 		// set status first so the function will be marked executable
 		setStatus(ps_running);
 		
 		// call plugin_unpause if provided
 		if (m_UnpauseFwd != -1)
+		{
 			executeForwards(m_UnpauseFwd);
+		}
 	}
 }
 

amxmodx/amxmodx.cpp

@@ -36,6 +36,8 @@
 #include "binlog.h"
 #include "libraries.h"
 
+const char *invis_cvar_list[5] = {"amxmodx_version", "amxmodx_modules", "amx_debug", "amx_mldebug", "amx_client_languages"};
+
 static cell AMX_NATIVE_CALL get_xvar_id(AMX *amx, cell *params)
 {
 	int len;
@@ -989,7 +991,9 @@ static cell AMX_NATIVE_CALL get_user_team(AMX *amx, cell *params) /* 3 param */
 		}
 		//
 		if (params[3])
+		{
 			set_amxstring(amx, params[2], pPlayer->team.c_str(), params[3]);
+		}
 
 		return pPlayer->teamId;
 	}
@@ -1215,7 +1219,7 @@ static cell AMX_NATIVE_CALL register_concmd(AMX *amx, cell *params) /* 4 param *
 	cmd->setCmdType(CMD_ConsoleCommand);
 	REG_SVR_COMMAND((char*)cmd->getCommand(), plugin_srvcmd);
 	
-	return 1;
+	return cmd->getId();
 }
 
 static cell AMX_NATIVE_CALL register_clcmd(AMX *amx, cell *params) /* 4 param */
@@ -1249,7 +1253,7 @@ static cell AMX_NATIVE_CALL register_clcmd(AMX *amx, cell *params) /* 4 param */
 	
 	cmd->setCmdType(CMD_ClientCommand);
 	
-	return 1;
+	return cmd->getId();
 }
 
 static cell AMX_NATIVE_CALL register_srvcmd(AMX *amx, cell *params) /* 2 param */
@@ -1284,7 +1288,7 @@ static cell AMX_NATIVE_CALL register_srvcmd(AMX *amx, cell *params) /* 2 param *
 	cmd->setCmdType(CMD_ServerCommand);
 	REG_SVR_COMMAND((char*)cmd->getCommand(), plugin_srvcmd);
 	
-	return 0;
+	return cmd->getId();
 }
 
 static cell AMX_NATIVE_CALL get_concmd(AMX *amx, cell *params) /* 7 param */
@@ -1588,6 +1592,19 @@ static cell AMX_NATIVE_CALL get_cvar_string(AMX *amx, cell *params) /* 3 param *
 {
 	int ilen;
 	char* sptemp = get_amxstring(amx, params[1], 0, ilen);
+
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		/* :HACKHACK: Pretend we're invisible to old plugins for backward compatibility */
+		char *cvar = sptemp;
+		for (unsigned int i=0; i<5; i++)
+		{
+			if (strcmp(cvar, invis_cvar_list[i]) == 0)
+			{
+				return 0;
+			}
+		}
+	}
 	
 	return set_amxstring(amx, params[2], CVAR_GET_STRING(sptemp), params[3]);
 }
@@ -1609,6 +1626,20 @@ static cell AMX_NATIVE_CALL get_pcvar_float(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_cvar_float(AMX *amx, cell *params) /* 1 param */
 {
 	int ilen;
+
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		/* :HACKHACK: Pretend we're invisible to old plugins for backward compatibility */
+		char *cvar = get_amxstring(amx, params[1], 0, ilen);
+		for (unsigned int i=0; i<5; i++)
+		{
+			if (strcmp(cvar, invis_cvar_list[i]) == 0)
+			{
+				return 0;
+			}
+		}
+	}
+
 	REAL pFloat = CVAR_GET_FLOAT(get_amxstring(amx, params[1], 0, ilen));
 	
 	return amx_ftoc(pFloat);
@@ -1651,6 +1682,18 @@ static cell AMX_NATIVE_CALL get_pcvar_num(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL get_cvar_num(AMX *amx, cell *params) /* 1 param */
 {
 	int ilen;
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		/* :HACKHACK: Pretend we're invisible to old plugins for backward compatibility */
+		char *cvar = get_amxstring(amx, params[1], 0, ilen);
+		for (unsigned int i=0; i<5; i++)
+		{
+			if (strcmp(cvar, invis_cvar_list[i]) == 0)
+			{
+				return 0;
+			}
+		}
+	}
 	return (int)CVAR_GET_FLOAT(get_amxstring(amx, params[1], 0, ilen));
 }
 
@@ -2221,6 +2264,18 @@ static cell AMX_NATIVE_CALL task_exists(AMX *amx, cell *params) /* 1 param */
 static cell AMX_NATIVE_CALL cvar_exists(AMX *amx, cell *params) /* 1 param */
 {
 	int ilen;
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		/* :HACKHACK: Pretend we're invisible to old plugins for backward compatibility */
+		char *cvar = get_amxstring(amx, params[1], 0, ilen);
+		for (unsigned int i=0; i<5; i++)
+		{
+			if (strcmp(cvar, invis_cvar_list[i]) == 0)
+			{
+				return 0;
+			}
+		}
+	}
 	return (CVAR_GET_POINTER(get_amxstring(amx, params[1], 0, ilen)) ? 1 : 0);
 }
 
@@ -2741,6 +2796,20 @@ static cell AMX_NATIVE_CALL get_cvar_flags(AMX *amx, cell *params)
 {
 	int ilen;
 	char* sCvar = get_amxstring(amx, params[1], 0, ilen);
+
+	if (amx->flags & AMX_FLAG_OLDFILE)
+	{
+		/* :HACKHACK: Pretend we're invisible to old plugins for backward compatibility */
+		char *cvar = sCvar;
+		for (unsigned int i=0; i<5; i++)
+		{
+			if (strcmp(cvar, invis_cvar_list[i]) == 0)
+			{
+				return 0;
+			}
+		}
+	}
+
 	cvar_t* pCvar = CVAR_GET_POINTER(sCvar);
 	
 	return pCvar ? pCvar->flags : 0;
@@ -3234,19 +3303,30 @@ static cell AMX_NATIVE_CALL get_func_id(AMX *amx, cell *params)
 	CPluginMngr::CPlugin *plugin;
 	
 	if (params[2] < 0)
+	{
 		plugin = g_plugins.findPluginFast(amx);
-	else
+	} else {
 		plugin = g_plugins.findPlugin(params[2]);
+	}
 
 	if (!plugin)
+	{
 		return -1;
+	}
+
+	if (!plugin->isValid())
+	{
+		return -1;
+	}
 
 	int len;
 	const char *funcName = get_amxstring(amx, params[1], 0, len);
 	int index, err;
 	
 	if ((err = amx_FindPublic(plugin->getAMX(), funcName, &index)) != AMX_ERR_NONE)
+	{
 		index = -1;
+	}
 
 	return index;
 }
@@ -3889,6 +3969,21 @@ static cell AMX_NATIVE_CALL CreateMultiForward(AMX *amx, cell *params)
 	return registerForwardC(funcname, static_cast<ForwardExecType>(params[2]), ps, count-2);
 }
 
+static cell AMX_NATIVE_CALL CreateMultiForwardEx(AMX *amx, cell *params)
+{
+	int len;
+	char *funcname = get_amxstring(amx, params[1], 0, len);
+
+	cell ps[FORWARD_MAX_PARAMS];
+	cell count = params[0] / sizeof(cell);
+	for (cell i=4; i<=count; i++)
+	{
+		ps[i-4] = *get_amxaddr(amx, params[i]);
+	}
+
+	return registerForwardC(funcname, static_cast<ForwardExecType>(params[2]), ps, count-3, params[3]);
+}
+
 static cell AMX_NATIVE_CALL CreateOneForward(AMX *amx, cell *params)
 {
 	CPluginMngr::CPlugin *p = g_plugins.findPlugin(params[1]);
@@ -4168,7 +4263,19 @@ static cell AMX_NATIVE_CALL is_user_hacking(AMX *amx, cell *params)
 
 static cell AMX_NATIVE_CALL arrayset(AMX *amx, cell *params)
 {
-	memset(get_amxaddr(amx, params[1]), params[2], params[3] * sizeof(cell));
+	cell value = params[2];
+
+	if (!value)
+	{
+		memset(get_amxaddr(amx, params[1]), 0, params[3] * sizeof(cell));
+	} else {
+		int size = params[3];
+		cell *addr = get_amxaddr(amx, params[1]);
+		for (int i=0; i<size; i++)
+		{
+			addr[i] = value;
+		}
+	}
 
 	return 1;
 }
@@ -4423,6 +4530,7 @@ AMX_NATIVE_INFO amxmodx_Natives[] =
 	{"CreateHudSyncObj",		CreateHudSyncObj},
 	{"CreateLangKey",			CreateLangKey},
 	{"CreateMultiForward",		CreateMultiForward},
+	{"CreateMultiForwardEx",	CreateMultiForwardEx},
 	{"CreateOneForward",		CreateOneForward},
 	{"DestroyForward",			DestroyForward},
 	{"ExecuteForward",			ExecuteForward},

amxmodx/amxmodx.h

@@ -73,7 +73,7 @@
 
 #define AMXXLOG_Log g_log.Log
 #define AMXXLOG_Error g_log.LogError
-#define AMX_VERSION	"1.76a"
+#define AMX_VERSION	"1.76c"
 
 extern AMX_NATIVE_INFO core_Natives[];
 extern AMX_NATIVE_INFO time_Natives[];

amxmodx/emsg.cpp

@@ -92,9 +92,10 @@ void Client_ShowMenu(void* mValue)
 	}
 }
 
+extern bool g_bmod_tfc;
 void Client_TeamInfo(void* mValue)
 {
-	if (mPlayer) return;
+	if (mPlayer && !g_bmod_tfc) return;
 	static int index;
 
 	switch (mState++)
@@ -107,6 +108,7 @@ void Client_TeamInfo(void* mValue)
 			char* msg = (char*)mValue;
 			g_players[index].team.assign(msg);
 			g_teamsIds.registerTeam(msg, -1);
+			break;
 	}
 }
 

amxmodx/file.cpp

@@ -799,13 +799,25 @@ static cell AMX_NATIVE_CALL amx_rmdir(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL amx_rename(AMX *amx, cell *params)
 {
 	int len;
+	char f_old_r[260];
+	char f_new_r[260];
+
 	char *fold = get_amxstring(amx, params[1], 0, len);
 	char *fnew = get_amxstring(amx, params[2], 1, len);
 
+	if (params[0] / sizeof(cell) == 3 && params[3])
+	{
+		build_pathname_r(f_old_r, sizeof(f_old_r)-1, "%s", fold);
+		build_pathname_r(f_new_r, sizeof(f_new_r)-1, "%s", fnew);
+	} else {
+		snprintf(f_old_r, sizeof(f_old_r)-1, "%s", fold);
+		snprintf(f_new_r, sizeof(f_new_r)-1, "%s", fnew);
+	}
+
 #if defined __linux__
-	return (rename(fold, fnew) == 0);
+	return (rename(f_old_r, f_new_r) == 0);
 #elif defined WIN32
-	return MoveFileA(fold, fnew);
+	return MoveFileA(f_old_r, f_new_r);
 #endif
 }
 

amxmodx/meta_api.cpp

@@ -904,6 +904,7 @@ void C_ClientCommand(edict_t *pEntity)
 
 			while (a)
 			{
+				g_menucmds.SetWatchIter(a);
 				if ((*a).matchCommand(menuid, bit_key) && (*a).getPlugin()->isExecutable((*a).getFunction()))
 				{
 					if (pPlayer->newmenu != -1)
@@ -940,7 +941,12 @@ void C_ClientCommand(edict_t *pEntity)
 						if (ret & 1) RETURN_META(MRES_SUPERCEDE);
 					}
 				}
-				++a;
+				if (g_menucmds.GetWatchIter() != a)
+				{
+					a = g_menucmds.GetWatchIter();
+				} else {
+					++a;
+				}
 			}
 		}
 	}

amxmodx/modules.cpp

@@ -598,7 +598,7 @@ int set_amxnatives(AMX* amx, char error[128])
 		if ((err = amx_Exec(amx, &retval, idx)) != AMX_ERR_NONE)
 		{
 			Debugger::GenericMessage(amx, err);
-			AMXXLOG_Log("An error occurred in plugins_native. This is dangerous!");
+			AMXXLOG_Log("An error occurred in plugin_natives. This is dangerous!");
 		}
 	}
 

amxmodx/msvc8/amxmodx_mm.vcproj

@@ -778,10 +778,6 @@
 				RelativePath="..\md5.h"
 				>
 			</File>
-			<File
-				RelativePath="..\menus.h"
-				>
-			</File>
 			<File
 				RelativePath="..\messages.h"
 				>

amxmodx/newmenus.cpp

@@ -37,11 +37,15 @@ CStack<int> g_MenuFreeStack;
 void ClearMenus()
 {
 	for (size_t i = 0; i < g_NewMenus.size(); i++)
+	{
 		delete g_NewMenus[i];
+	}
 	
 	g_NewMenus.clear();
 	while (!g_MenuFreeStack.empty())
+	{
 		g_MenuFreeStack.pop();
+	}
 }
 
 void validate_menu_text(char *str)
@@ -64,11 +68,15 @@ void validate_menu_text(char *str)
 				}
 			}
 			if (offs)
+			{
 				*(str-offs) = *str;
+			}
 			str++;
 		}
 		if (offs)
+		{
 			*(str-offs) = '\0';
+		}
 	}
 }
 
@@ -99,7 +107,9 @@ Menu::Menu(const char *title, int mid, int tid)
 Menu::~Menu()
 {
 	for (size_t i = 0; i < m_Items.size(); i++)
+	{
 		delete m_Items[i];
+	}
 
 	unregisterSPForward(this->func);
 	
@@ -139,7 +149,9 @@ size_t Menu::GetPageCount()
 {
 	size_t items = GetItemCount();
 	if (items_per_page == 0)
+	{
 		return 1;
+	}
 
 	return ((items/items_per_page) + ((items % items_per_page) ? 1 : 0));
 }
@@ -159,15 +171,49 @@ int Menu::PagekeyToItem(page_t page, item_t key)
 		//first page
 		if (page == 0)
 		{
+			/* The algorithm for spaces here is same as a middle page. */
+			item_t new_key = key;
+			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
+			{
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j] == 1)
+					{
+						if (!new_key)
+						{
+							break;
+						}
+						new_key--;
+					}
+					if (!new_key)
+					{
+						break;
+					}
+				}
+			}
+			key = new_key;
 			if (key == items_per_page + 1)
+			{
 				return MENU_MORE;
-			else if (key == items_per_page + 2)
+			} else if (key == items_per_page + 2) {
 				return MENU_EXIT;
-			else
+			} else {
 				return (start + key - 1);
+			}
 		} else if (page == num_pages - 1) {
 			//last page
 			size_t remaining = m_Items.size() - start;
+			/* We have to add one remaining for each "bumping" space */
+			for (size_t i=m_Items.size() - remaining; i<m_Items.size(); i++)
+			{
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j] == 1)
+					{
+						remaining++;
+					}
+				}
+			}
 			if (key == remaining + 1)
 			{
 				return MENU_BACK;
@@ -177,6 +223,29 @@ int Menu::PagekeyToItem(page_t page, item_t key)
 				return (start + key - 1);
 			}
 		} else {
+			/* The algorithm for spaces here is a bit harder.  We have to subtract 
+			 * one from the key for each space we find along the way.
+			 */
+			item_t new_key = key;
+			for (size_t i=start; i<(start+key-1) && i<m_Items.size(); i++)
+			{
+				for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
+				{
+					if (m_Items[i]->blanks[j] == 1)
+					{
+						if (!new_key)
+						{
+							break;
+						}
+						new_key--;
+					}
+					if (!new_key)
+					{
+						break;
+					}
+				}
+			}
+			key = new_key;
 			if (key > items_per_page && (key-items_per_page<=3))
 			{
 				return m_OptOrders[key-items_per_page-1];
@@ -274,46 +343,65 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	bool enabled = true;
 	int ret = 0;
 	int slots = 0;
+	int option_display = 0;
 	
 	for (item_t i = start; i <= end; i++)
 	{
 		pItem = m_Items[i];
 		
 		if (pItem->access && !(pItem->access & g_players[player].flags[0]))
+		{
 			enabled = false;
+		}
 		
 		if (pItem->handler != -1)
 		{
 			ret = executeForwards(pItem->handler, static_cast<cell>(player), static_cast<cell>(thisId), static_cast<cell>(i));
 			if (ret == ITEM_ENABLED)
+			{
 				enabled = true;
-			else if (ret == ITEM_DISABLED)
+			} else if (ret == ITEM_DISABLED) {
 				enabled = false;
+			}
 		}
 		
 		if (pItem->pfn)
 		{
 			ret = (pItem->pfn)(player, thisId, i);
 			if (ret == ITEM_ENABLED)
+			{
 				enabled = true;
-			else if (ret == ITEM_DISABLED)
+			} else if (ret == ITEM_DISABLED) {
 				enabled = false;
+			}
+		}
+
+		if (enabled)
+		{
+			keys |= (1<<option);
 		}
 		
+		option_display = ++option;
+		if (option_display == 10)
+		{
+			option_display = 0;
+		}
+
 		if (enabled)
 		{
 			keys |= (1<<option);
 			if (m_AutoColors) 
-				_snprintf(buffer, sizeof(buffer)-1, "\\r%d.\\w %s\n", ++option, pItem->name.c_str());
-			else
-				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", ++option, pItem->name.c_str());
+			{
+				_snprintf(buffer, sizeof(buffer)-1, "\\r%d.\\w %s\n", option_display, pItem->name.c_str());
+			} else {
+				_snprintf(buffer, sizeof(buffer)-1, "%d. %s\n", option_display, pItem->name.c_str());
+			}
 		} else {
 			if (m_AutoColors)
 			{
-				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", ++option, pItem->name.c_str());
+				_snprintf(buffer, sizeof(buffer)-1, "\\d%d. %s\n\\w", option_display, pItem->name.c_str());
 			} else {
 				_snprintf(buffer, sizeof(buffer)-1, "#. %s\n", pItem->name.c_str());
-				option++;
 			}
 		}
 		slots++;
@@ -326,7 +414,9 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 			for (size_t j=0; j<pItem->blanks.size(); j++)
 			{
 				if (pItem->blanks[j] == 1)
+				{
 					option++;
+				}
 				m_Text.append("\n");
 				slots++;
 			}
@@ -337,11 +427,17 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
 	{
 		int pad = items_per_page;
 		if (flags & Display_Back)
+		{
 			pad--;
+		}
 		if (flags & Display_Next)
+		{
 			pad--;
+		}
 		if (flags & Display_Exit)
+		{
 			pad--;
+		}
 		for (int i=slots+1; i<=pad; i++)
 		{
 			m_Text.append("\n");

amxmodx/sdk/amxxmodule.cpp

@@ -2327,7 +2327,7 @@ C_DLLEXPORT int Meta_Detach(PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
 	}
 
 #ifdef FN_META_DETACH
-	return FN_META_DETACH();
+	FN_META_DETACH();
 #endif	// FN_META_DETACH
 	return TRUE;
 }

amxmodx/sdk/amxxmodule.h

@@ -1077,7 +1077,7 @@ void FN_AlertMessage(ALERT_TYPE atype, char *szFmt, ...);
 #endif // FN_AlertMessage
 
 #ifdef FN_EngineFprintf
-void FN_EngineFprintf(FILE *pfile, char *szFmt, ...);
+void FN_EngineFprintf(void *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf
 
 #ifdef FN_PvAllocEntPrivateData
@@ -1141,11 +1141,11 @@ void FN_GetBonePosition(const edict_t *pEdict, int iBone, float *rgflOrigin, flo
 #endif // FN_GetBonePosition
 
 #ifdef FN_FunctionFromName
-unsigned long FN_FunctionFromName(const char *pName);
+uint32 FN_FunctionFromName(const char *pName);
 #endif // FN_FunctionFromName
 
 #ifdef FN_NameForFunction
-const char *FN_NameForFunction(unsigned long function);
+const char *FN_NameForFunction(uint32);
 #endif // FN_NameForFunction
 
 #ifdef FN_ClientPrintf
@@ -1189,7 +1189,7 @@ CRC32_t FN_CRC32_Final(CRC32_t pulCRC);
 #endif // FN_CRC32_Final
 
 #ifdef FN_RandomLong
-long FN_RandomLong(long lLow, long lHigh);
+int32 FN_RandomLong(int32 lLow, int32 lHigh);
 #endif // FN_RandomLong
 
 #ifdef FN_RandomFloat
@@ -1658,11 +1658,11 @@ void FN_AlertMessage_Post(ALERT_TYPE atype, char *szFmt, ...);
 #endif // FN_AlertMessage_Post
 
 #ifdef FN_EngineFprintf_Post
-void FN_EngineFprintf_Post(FILE *pfile, char *szFmt, ...);
+void FN_EngineFprintf_Post(void *pfile, char *szFmt, ...);
 #endif // FN_EngineFprintf_Post
 
 #ifdef FN_PvAllocEntPrivateData_Post
-void *FN_PvAllocEntPrivateData_Post(edict_t *pEdict, long cb);
+void *FN_PvAllocEntPrivateData_Post(edict_t *pEdict, int32 cb);
 #endif // FN_PvAllocEntPrivateData_Post
 
 #ifdef FN_PvEntPrivateData_Post
@@ -1722,11 +1722,11 @@ void FN_GetBonePosition_Post(const edict_t *pEdict, int iBone, float *rgflOrigin
 #endif // FN_GetBonePosition_Post
 
 #ifdef FN_FunctionFromName_Post
-unsigned long FN_FunctionFromName_Post(const char *pName);
+uint32 FN_FunctionFromName_Post(const char *pName);
 #endif // FN_FunctionFromName_Post
 
 #ifdef FN_NameForFunction_Post
-const char *FN_NameForFunction_Post(unsigned long function);
+const char *FN_NameForFunction_Post(uint32);
 #endif // FN_NameForFunction_Post
 
 #ifdef FN_ClientPrintf_Post
@@ -1770,7 +1770,7 @@ CRC32_t FN_CRC32_Final_Post(CRC32_t pulCRC);
 #endif // FN_CRC32_Final_Post
 
 #ifdef FN_RandomLong_Post
-long FN_RandomLong_Post(long lLow, long lHigh);
+int32 FN_RandomLong_Post(int32 lLow, int32 lHigh);
 #endif // FN_RandomLong_Post
 
 #ifdef FN_RandomFloat_Post

amxmodx/version.rc

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

dlls/csx/source/CMisc.cpp

@@ -244,9 +244,14 @@ void CPlayer::saveBDefused(){
 
 // *****************************************************
 
-bool ignoreBots (edict_t *pEnt, edict_t *pOther){
-	if ( !rankBots && ( pEnt->v.flags & FL_FAKECLIENT || ( pOther && pOther->v.flags & FL_FAKECLIENT ) ) )
+bool ignoreBots(edict_t *pEnt, edict_t *pOther)
+{
+	rankBots = (int)csstats_rankbots->value ? true : false;
+	if (!rankBots && (pEnt->v.flags & FL_FAKECLIENT || (pOther && pOther->v.flags & FL_FAKECLIENT)))
+	{
 		return true;
+	}
+
 	return false;
 }
 

dlls/csx/source/WinCSX/WinCSX.cpp

@@ -4,6 +4,7 @@
 #include "stdafx.h"
 #include "WinCSX.h"
 #include <stdio.h>
+#include "commctrl.h"
 
 int APIENTRY _tWinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
@@ -26,6 +27,8 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 		return FALSE;
 	}
 
+	InitCommonControls();
+
 	hAccelTable = LoadAccelerators(hInstance, (LPCTSTR)IDC_WINCSX);
 
 	// Show the dialog box now.

dlls/csx/source/WinCSX/WinCSX.vcproj

@@ -32,6 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="$(OutDir)/WinCSX.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -77,6 +78,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="$(OutDir)/WinCSX.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"

dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj

@@ -61,6 +61,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="$(OutDir)/WinCSX.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -136,6 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib"
 				OutputFile="$(OutDir)/WinCSX.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

dlls/csx/source/meta_api.cpp

@@ -58,7 +58,7 @@ cvar_t *csstats_rank;
 
 cvar_t* csstats_rankbots;
 cvar_t* csstats_pause;
-cvar_t init_csstats_rankbots ={"csstats_rankbots","1"};
+cvar_t init_csstats_rankbots ={"csstats_rankbots","0"};
 cvar_t init_csstats_pause = {"csstats_pause","0"};
 
 struct sUserMsg

dlls/csx/source/moduleconfig.h

@@ -5,7 +5,7 @@
 
 // Module info
 #define MODULE_NAME "CSX"
-#define MODULE_VERSION "1.76a"
+#define MODULE_VERSION "1.76c"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "CSX"

dlls/dod2/dodfun/moduleconfig.h

@@ -5,7 +5,7 @@
 
 // Module info
 #define MODULE_NAME "DoD Fun"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION "1.76b"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "DODFUN"

dlls/dod2/dodx/CRank.cpp

@@ -251,7 +251,7 @@ void RankSystem::loadRank(const char* filename)
 	}
 	
 	short int i = 0;
-	if (!fread(&i, sizeof(short int), 1, bfp) != 1)
+	if (fread(&i, sizeof(short int), 1, bfp) != 1)
 	{
 		fclose(bfp);
 		return;

dlls/dod2/dodx/amxxmodule.cpp

@@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 

dlls/dod2/dodx/moduleconfig.h

@@ -5,7 +5,7 @@
 
 // Module info
 #define MODULE_NAME "DoDX"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION "1.76b"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "DODX"

dlls/engine/engine.cpp

@@ -798,31 +798,42 @@ static cell AMX_NATIVE_CALL in_view_cone(AMX *amx, cell *params)
 	
 	CHECK_ENTITY(src);
 
-	Vector vecLOS;
+	edict_t *pEdictSrc = INDEXENT(src);
+
+	Vector vecLOS, vecForward;
 	float flDot;
 
-	edict_t *pEdictSrc = INDEXENT(src);
 	cell *addr = MF_GetAmxAddr(amx, params[2]);
-	float vecOrigin[3];
+	Vector origin(amx_ctof(addr[0]), amx_ctof(addr[1]), amx_ctof(addr[2]));
 
-	vecOrigin[0] = amx_ctof(addr[0]);
-	vecOrigin[1] = amx_ctof(addr[1]);
-	vecOrigin[2] = amx_ctof(addr[2]);
+	bool use2D = (params[0] / sizeof(cell)) == 2 || params[3] == 0;
 
-	Vector origin(vecOrigin[0], vecOrigin[1], vecOrigin[2]);
+	if (use2D)
+	{
+		MAKE_VECTORS(pEdictSrc->v.angles);
+		vecForward = gpGlobals->v_forward;
 
-	MAKE_VECTORS(pEdictSrc->v.v_angle);
+		vecLOS = origin - pEdictSrc->v.origin;
+
+		vecForward.z = 0;
+		vecLOS.z = 0;
+	} 
+	else 
+	{
+		MAKE_VECTORS(pEdictSrc->v.v_angle);
+		vecForward = gpGlobals->v_forward;
+
+		vecLOS = origin - (pEdictSrc->v.origin + pEdictSrc->v.view_ofs);
+	}
 
-	vecLOS = origin - (pEdictSrc->v.origin + pEdictSrc->v.view_ofs);
 	vecLOS = vecLOS.Normalize();
 
-	flDot = DotProduct(vecLOS, gpGlobals->v_forward);
+	flDot = DotProduct(vecLOS, vecForward);
 
 	if (flDot >= cos(pEdictSrc->v.fov * (M_PI / 360)))
 		return 1;
 	else
 		return 0;
-
 }
 
 static cell AMX_NATIVE_CALL traceresult(AMX *amx, cell *params)

dlls/fakemeta/forward.cpp

@@ -821,9 +821,9 @@ static cell AMX_NATIVE_CALL unregister_forward(AMX *amx, cell *params)
 
 	CVector<int> *peng = NULL;
 	if (post)
-		peng = &(Engine[func]);
-	else
 		peng = &(EnginePost[func]);
+	else
+		peng = &(Engine[func]);
 
 	CVector<int>::iterator begin, end=peng->end();
 

dlls/fakemeta/sdk/moduleconfig.h

@@ -5,7 +5,7 @@
 
 // Module info
 #define MODULE_NAME "FakeMeta"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION "1.76b"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org"
 #define MODULE_LOGTAG "FAKEMETA"

dlls/mysqlx/basic_sql.cpp

@@ -55,6 +55,10 @@ static cell AMX_NATIVE_CALL SQL_MakeDbTuple(AMX *amx, cell *params)
 	sql->user = strdup(MF_GetAmxString(amx, params[2], 0, &len));
 	sql->pass = strdup(MF_GetAmxString(amx, params[3], 0, &len));
 	sql->db = strdup(MF_GetAmxString(amx, params[4], 0, &len));
+	if (params[0] / sizeof(cell) >= 5)
+	{
+		sql->max_timeout = static_cast<unsigned int>(params[5]);
+	}
 
 	unsigned int num = MakeHandle(sql, Handle_Connection, FreeConnection);
 
@@ -87,11 +91,12 @@ static cell AMX_NATIVE_CALL SQL_Connect(AMX *amx, cell *params)
 	nfo.pass = sql->pass;
 	nfo.port = sql->port;
 	nfo.host = sql->host;
+	nfo.max_timeout = sql->max_timeout;
 
 	char buffer[512];
 	int errcode;
 
-	IDatabase *pDb = g_Mysql.Connect(&nfo, &errcode, buffer, sizeof(buffer)-1);
+	IDatabase *pDb = g_Mysql.Connect2(&nfo, &errcode, buffer, sizeof(buffer)-1);
 
 	if (!pDb)
 	{
@@ -378,13 +383,15 @@ static cell AMX_NATIVE_CALL SQL_GetQueryString(AMX *amx, cell *params)
 {
 	AmxQueryInfo *qInfo = (AmxQueryInfo *)GetHandle(params[1], Handle_Query);
 
-	if (!qInfo || !qInfo->pQuery)
+	if (!qInfo || (!qInfo->pQuery && !qInfo->opt_ptr))
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid query handle: %d", params[1]);
 		return 0;
 	}
 
-	return MF_SetAmxString(amx, params[2], qInfo->pQuery->GetQueryString(), params[3]);
+	const char *ptr = qInfo->pQuery ? qInfo->pQuery->GetQueryString() : qInfo->opt_ptr;
+
+	return MF_SetAmxString(amx, params[2], ptr, params[3]);
 }
 
 static cell AMX_NATIVE_CALL SQL_FieldNameToNum(AMX *amx, cell *params)

dlls/mysqlx/mysql/ISQLDriver.h

@@ -134,11 +134,13 @@ namespace SourceMod
 
 	struct DatabaseInfo
 	{
+		DatabaseInfo() : max_timeout(0) { };
 		const char *host;
 		const char *database;
 		const char *user;
 		const char *pass;
 		unsigned int port;
+		unsigned int max_timeout;
 	};
 
 	class ISQLDriver
@@ -147,6 +149,8 @@ namespace SourceMod
 		virtual ~ISQLDriver() { };
 	public:
 		virtual IDatabase *Connect(DatabaseInfo *info, int *errcode, char *error, size_t maxlength) =0;
+		//Supports the timeout clause
+		virtual IDatabase *Connect2(DatabaseInfo *info, int *errcode, char *error, size_t maxlength) =0;
 		virtual const char *NameString() =0;
 		virtual bool IsCompatDriver(const char *namestring) =0;
 	};

dlls/mysqlx/mysql/MysqlDriver.cpp

@@ -21,6 +21,16 @@ const char *MysqlDriver::NameString()
 }
 
 IDatabase *MysqlDriver::Connect(DatabaseInfo *info, int *errcode, char *error, size_t maxlength)
+{
+	return _Connect(info, errcode, error, maxlength, false);
+}
+
+IDatabase *MysqlDriver::Connect2(DatabaseInfo *info, int *errcode, char *error, size_t maxlength)
+{
+	return _Connect(info, errcode, error, maxlength, true);
+}
+
+IDatabase *MysqlDriver::_Connect(DatabaseInfo *info, int *errcode, char *error, size_t maxlength, bool do_timeout)
 {
 	MYSQL *mysql = mysql_init(NULL);
 
@@ -35,6 +45,11 @@ IDatabase *MysqlDriver::Connect(DatabaseInfo *info, int *errcode, char *error, s
 		return false;
 	}
 
+	if (do_timeout && info->max_timeout)
+	{
+		mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&(info->max_timeout));
+	}
+
 	if (mysql_real_connect(mysql, 
 							info->host, 
 							info->user, 
@@ -45,9 +60,13 @@ IDatabase *MysqlDriver::Connect(DatabaseInfo *info, int *errcode, char *error, s
 							0) == NULL)
 	{
 		if (errcode)
+		{
 			*errcode = mysql_errno(mysql);
+		}
 		if (error && maxlength)
+		{
 			snprintf(error, maxlength, "%s", mysql_error(mysql));
+		}
 		return false;
 	}
 

dlls/mysqlx/mysql/MysqlDriver.h

@@ -9,8 +9,11 @@ namespace SourceMod
 	{
 	public:
 		IDatabase *Connect(DatabaseInfo *info, int *errcode, char *error, size_t maxlength);
+		IDatabase *Connect2(DatabaseInfo *info, int *errcode, char *error, size_t maxlength);
 		const char *NameString();
 		bool IsCompatDriver(const char *namestring);
+	public:
+		IDatabase *_Connect(DatabaseInfo *info, int *errcode, char *error, size_t maxlength, bool do_timeout);
 	};
 };
 

dlls/mysqlx/mysql2_header.h

@@ -10,9 +10,11 @@
 
 struct AmxQueryInfo
 {
+	AmxQueryInfo() : opt_ptr(NULL) { };
 	IQuery *pQuery;
 	QueryInfo info;
 	char error[255];
+	char *opt_ptr;
 };
 
 enum HandleType
@@ -32,6 +34,7 @@ struct SQL_Connection
 	char *pass;
 	char *db;
 	int port;
+	unsigned int max_timeout;
 };
 
 typedef void (*FREEHANDLE)(void *, unsigned int);

dlls/mysqlx/sdk/moduleconfig.h

@@ -15,7 +15,7 @@
  *   to add multiple entries.
  */
 #define MODULE_NAME "MySQL"
-#define MODULE_VERSION "1.76a"
+#define MODULE_VERSION "1.76b"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "MySQL"

dlls/mysqlx/threading.cpp

@@ -58,7 +58,7 @@ static cell AMX_NATIVE_CALL SQL_ThreadQuery(AMX *amx, cell *params)
 
 	int len;
 	const char *handler = MF_GetAmxString(amx, params[2], 0, &len);
-	int fwd = MF_RegisterSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_STRING, FP_CELL, FP_ARRAY, FP_CELL, FP_DONE);
+	int fwd = MF_RegisterSPForwardByName(amx, handler, FP_CELL, FP_CELL, FP_STRING, FP_CELL, FP_ARRAY, FP_CELL, FP_CELL, FP_DONE);
 	if (fwd < 1)
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Function not found: %s", handler);
@@ -76,7 +76,7 @@ static cell AMX_NATIVE_CALL SQL_ThreadQuery(AMX *amx, cell *params)
 	}
 	g_QueueLock->Unlock();
 
-	kmThread->SetInfo(cn->host, cn->user, cn->pass, cn->db, cn->port);
+	kmThread->SetInfo(cn->host, cn->user, cn->pass, cn->db, cn->port, cn->max_timeout);
 	kmThread->SetForward(fwd);
 	kmThread->SetQuery(MF_GetAmxString(amx, params[3], 1, &len));
 	kmThread->SetCellData(MF_GetAmxAddr(amx, params[4]), (ucell)params[5]);
@@ -126,13 +126,15 @@ void MysqlThread::SetForward(int forward)
 	m_fwd = forward;
 }
 
-void MysqlThread::SetInfo(const char *host, const char *user, const char *pass, const char *db, int port)
+void MysqlThread::SetInfo(const char *host, const char *user, const char *pass, const char *db, int port, unsigned int max_timeout)
 {
 	m_host.assign(host);
 	m_user.assign(user);
 	m_pass.assign(pass);
 	m_db.assign(db);
+	m_max_timeout = m_max_timeout;
 	m_port = port;
+	m_qrInfo.queue_time = gpGlobals->time;
 }
 
 void MysqlThread::SetQuery(const char *query)
@@ -149,10 +151,15 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
 	info.user = m_user.c_str();
 	info.host = m_host.c_str();
 	info.port = m_port;
+	info.max_timeout = m_max_timeout;
+
+	float save_time = m_qrInfo.queue_time;
 
 	memset(&m_qrInfo, 0, sizeof(m_qrInfo));
 
-	IDatabase *pDatabase = g_Mysql.Connect(&info, &m_qrInfo.amxinfo.info.errorcode, m_qrInfo.amxinfo.error, 254);
+	m_qrInfo.queue_time = save_time;
+
+	IDatabase *pDatabase = g_Mysql.Connect2(&info, &m_qrInfo.amxinfo.info.errorcode, m_qrInfo.amxinfo.error, 254);
 	IQuery *pQuery = NULL;
 	if (!pDatabase)
 	{
@@ -172,14 +179,15 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
 	if (m_qrInfo.query_success && m_qrInfo.amxinfo.info.rs)
 	{
 		m_atomicResult.CopyFrom(m_qrInfo.amxinfo.info.rs);
-		m_qrInfo.amxinfo.pQuery = pQuery;
 		m_qrInfo.amxinfo.info.rs = &m_atomicResult;
+	}
+
+	if (pQuery)
+	{
+		m_qrInfo.amxinfo.pQuery = pQuery;
 	} else {
-		if (pQuery)
-		{
-			pQuery->FreeHandle();
-		}
-		pQuery = NULL;
+		m_qrInfo.amxinfo.opt_ptr = new char[m_query.size() + 1];
+		strcpy(m_qrInfo.amxinfo.opt_ptr, m_query.c_str());
 	}
 
 	if (pDatabase)
@@ -231,31 +239,37 @@ void MysqlThread::Execute()
 	} else if (!m_qrInfo.query_success) {
 		state = -1;
 	}
+	float diff = gpGlobals->time - m_qrInfo.queue_time;
+	cell c_diff = amx_ftoc(diff);
+	unsigned int hndl = MakeHandle(&m_qrInfo.amxinfo, Handle_Query, NullFunc);
 	if (state != 0)
 	{
 		MF_ExecuteForward(m_fwd, 
 			(cell)state, 
-			(cell)0, 
+			(cell)hndl, 
 			m_qrInfo.amxinfo.error, 
 			m_qrInfo.amxinfo.info.errorcode,
 			data_addr,
-			m_datalen);
+			m_datalen,
+			c_diff);
 	} else {
-		unsigned int hndl = MakeHandle(&m_qrInfo.amxinfo, Handle_Query, NullFunc);
 		MF_ExecuteForward(m_fwd,
 			(cell)0,
 			(cell)hndl,
 			"",
 			(cell)0,
 			data_addr,
-			m_datalen);
-		/* this should always be true I think */
-		if (m_qrInfo.amxinfo.pQuery)
-		{
-			m_qrInfo.amxinfo.pQuery->FreeHandle();
-		}
-		FreeHandle(hndl);
+			m_datalen,
+			c_diff);
 	}
+	FreeHandle(hndl);
+	if (m_qrInfo.amxinfo.pQuery)
+	{
+		m_qrInfo.amxinfo.pQuery->FreeHandle();
+		m_qrInfo.amxinfo.pQuery = NULL;
+	}
+	delete [] m_qrInfo.amxinfo.opt_ptr;
+	m_qrInfo.amxinfo.opt_ptr = NULL;
 }
 
 /*****************

dlls/mysqlx/threading.h

@@ -12,6 +12,7 @@ struct QueuedResultInfo
 	AmxQueryInfo amxinfo;
 	bool connect_success;
 	bool query_success;
+	float queue_time;
 };
 
 class AtomicResult : 
@@ -59,7 +60,7 @@ public:
 	MysqlThread();
 	~MysqlThread();
 public:
-	void SetInfo(const char *host, const char *user, const char *pass, const char *db, int port);
+	void SetInfo(const char *host, const char *user, const char *pass, const char *db, int port, unsigned int max_timeout);
 	void SetQuery(const char *query);
 	void SetCellData(cell data[], ucell len);
 	void SetForward(int forward);
@@ -74,6 +75,7 @@ private:
 	SourceHook::String m_user;
 	SourceHook::String m_pass;
 	SourceHook::String m_db;
+	unsigned int m_max_timeout;
 	int m_port;
 	cell *m_data;
 	ucell m_datalen;

dlls/nvault/Journal.cpp

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdarg.h>
 #if defined __linux__
 #include <unistd.h>
 #endif
@@ -24,8 +25,8 @@ int Journal::Replay(VaultMap *pMap)
 	
 	BinaryReader br(m_fp);
 
-	int8_t len8;
-	int16_t len16;
+	uint8_t len8;
+	uint16_t len16;
 	char *key = NULL;
 	char *val = NULL;
 	String sKey;

dlls/nvault/amxxmodule.cpp

@@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, "");
 }
 #endif
 

dlls/nvault/moduleconfig.h

@@ -5,7 +5,7 @@
 
 // Module info
 #define MODULE_NAME "nVault"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION "1.76c"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "nVault"

dlls/nvault/sh_tinyhash.h

@@ -169,6 +169,8 @@ public:
 					} else {
 						iter++;
 					}
+				} else {
+					iter++;
 				}
 			}
 		}

dlls/sqlite/basic_sql.cpp

@@ -382,13 +382,16 @@ static cell AMX_NATIVE_CALL SQL_FieldNumToName(AMX *amx, cell *params)
 static cell AMX_NATIVE_CALL SQL_GetQueryString(AMX *amx, cell *params)
 {
 	AmxQueryInfo *qInfo = (AmxQueryInfo *)GetHandle(params[1], Handle_Query);
-	if (!qInfo)
+
+	if (!qInfo || (!qInfo->pQuery && !qInfo->opt_ptr))
 	{
 		MF_LogError(amx, AMX_ERR_NATIVE, "Invalid query handle: %d", params[1]);
 		return 0;
 	}
 
-	return MF_SetAmxString(amx, params[2], qInfo->pQuery->GetQueryString(), params[3]);
+	const char *ptr = qInfo->pQuery ? qInfo->pQuery->GetQueryString() : qInfo->opt_ptr;
+
+	return MF_SetAmxString(amx, params[2], ptr, params[3]);
 }
 
 static cell AMX_NATIVE_CALL SQL_FieldNameToNum(AMX *amx, cell *params)

dlls/sqlite/sdk/moduleconfig.h

@@ -5,7 +5,7 @@
 
 // Module info
 #define MODULE_NAME "SQLite"
-#define MODULE_VERSION "1.76"
+#define MODULE_VERSION "1.76b"
 #define MODULE_AUTHOR "AMX Mod X Dev Team"
 #define MODULE_URL "http://www.amxmodx.org/"
 #define MODULE_LOGTAG "SQLITE"

dlls/sqlite/sdk/sh_list.h

@@ -23,6 +23,7 @@
 
 namespace SourceHook
 {
+
 	//This class is from CSDM for AMX Mod X
 	/*
 		A circular, doubly-linked list with one sentinel node

dlls/sqlite/sqlite_header.h

@@ -10,9 +10,11 @@
 
 struct AmxQueryInfo
 {
+	AmxQueryInfo() : opt_ptr(NULL) { };
 	IQuery *pQuery;
 	QueryInfo info;
 	char error[255];
+	char *opt_ptr;
 };
 
 enum HandleType

dlls/sqlite/thread/ThreadWorker.cpp

@@ -54,6 +54,9 @@ void ThreadWorker::RunThread(IThreadHandle *pHandle)
 		/**
 		 * Check number of items in the queue
 		 */
+		m_StateLock->Lock();
+		this_state = m_state;
+		m_StateLock->Unlock();
 		if (this_state != Worker_Stopped)
 		{
 			m_QueueLock->Lock();
@@ -65,6 +68,11 @@ void ThreadWorker::RunThread(IThreadHandle *pHandle)
 				 */
 				m_Waiting = true;
 				m_QueueLock->Unlock();
+				/* first check if we should end again */
+				if (this_state == Worker_Stopped)
+				{
+					break;
+				}
 				m_AddSignal->Wait();
 				m_Waiting = false;
 			} else {
@@ -80,7 +88,9 @@ void ThreadWorker::RunThread(IThreadHandle *pHandle)
 			{
 				//wait until the lock is cleared.
 				if (this_state == Worker_Paused)
+				{
 					m_PauseSignal->Wait();
+				}
 				if (this_state == Worker_Stopped)
 				{
 					//if we're supposed to flush cleanrly, 
@@ -187,9 +197,12 @@ bool ThreadWorker::Stop(bool flush_cancel)
 	{
 		Unpause();
 	} else {
-		m_AddSignal->Signal();
-		Pause();
-		Unpause();
+		m_QueueLock->Lock();
+		if (m_Waiting)
+		{
+			m_AddSignal->Signal();
+		}
+		m_QueueLock->Unlock();
 	}
 
 	me->WaitForThread();

dlls/sqlite/thread/WinThreads.cpp

@@ -97,7 +97,7 @@ IThreadHandle *WinThreader::MakeThread(IThread *pThread, const ThreadParams *par
 
 IEventSignal *WinThreader::MakeEventSignal()
 {
-	HANDLE event = CreateEventA(NULL, TRUE, TRUE, NULL);
+	HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL);
 
 	if (!event)
 		return NULL;
@@ -275,7 +275,6 @@ WinThreader::WinEvent::~WinEvent()
 void WinThreader::WinEvent::Wait()
 {
 	WaitForSingleObject(m_event, INFINITE);
-	ResetEvent(m_event);
 }
 
 void WinThreader::WinEvent::Signal()

dlls/sqlite/threading.cpp

@@ -129,6 +129,7 @@ void MysqlThread::SetForward(int forward)
 void MysqlThread::SetInfo(const char *db)
 {
 	m_db.assign(db);
+	m_qrInfo.queue_time = gpGlobals->time;
 }
 
 void MysqlThread::SetQuery(const char *query)
@@ -146,8 +147,12 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
 	info.host = "";
 	info.port = 0;
 
+	float save_time = m_qrInfo.queue_time;
+
 	memset(&m_qrInfo, 0, sizeof(m_qrInfo));
 
+	m_qrInfo.queue_time = save_time;
+
 	IDatabase *pDatabase = g_Sqlite.Connect(&info, &m_qrInfo.amxinfo.info.errorcode, m_qrInfo.amxinfo.error, 254);
 	IQuery *pQuery = NULL;
 	if (!pDatabase)
@@ -168,15 +173,17 @@ void MysqlThread::RunThread(IThreadHandle *pHandle)
 	if (m_qrInfo.query_success && m_qrInfo.amxinfo.info.rs)
 	{
 		m_atomicResult.CopyFrom(m_qrInfo.amxinfo.info.rs);
-		m_qrInfo.amxinfo.pQuery = NULL;
 		m_qrInfo.amxinfo.info.rs = &m_atomicResult;
 	}
 
 	if (pQuery)
 	{
-		pQuery->FreeHandle();
-		pQuery = NULL;
+		m_qrInfo.amxinfo.pQuery = pQuery;
+	} else {
+		m_qrInfo.amxinfo.opt_ptr = new char[m_query.size() + 1];
+		strcpy(m_qrInfo.amxinfo.opt_ptr, m_query.c_str());
 	}
+
 	if (pDatabase)
 	{
 		pDatabase->FreeHandle();
@@ -226,26 +233,37 @@ void MysqlThread::Execute()
 	} else if (!m_qrInfo.query_success) {
 		state = -1;
 	}
+	float diff = gpGlobals->time - m_qrInfo.queue_time;
+	cell c_diff = amx_ftoc(diff);
+	unsigned int hndl = MakeHandle(&m_qrInfo.amxinfo, Handle_Query, NullFunc);
 	if (state != 0)
 	{
 		MF_ExecuteForward(m_fwd, 
 			(cell)state, 
-			(cell)0, 
+			(cell)hndl, 
 			m_qrInfo.amxinfo.error, 
 			m_qrInfo.amxinfo.info.errorcode,
 			data_addr,
-			m_datalen);
+			m_datalen,
+			c_diff);
 	} else {
-		unsigned int hndl = MakeHandle(&m_qrInfo.amxinfo, Handle_Query, NullFunc);
 		MF_ExecuteForward(m_fwd,
 			(cell)0,
 			(cell)hndl,
 			"",
 			(cell)0,
 			data_addr,
-			m_datalen);
-		FreeHandle(hndl);
+			m_datalen,
+			c_diff);
 	}
+		FreeHandle(hndl);
+	if (m_qrInfo.amxinfo.pQuery)
+	{
+		m_qrInfo.amxinfo.pQuery->FreeHandle();
+		m_qrInfo.amxinfo.pQuery = NULL;
+	}
+	delete [] m_qrInfo.amxinfo.opt_ptr;
+	m_qrInfo.amxinfo.opt_ptr = NULL;
 }
 
 /*****************

dlls/sqlite/threading.h

@@ -12,6 +12,7 @@ struct QueuedResultInfo
 	AmxQueryInfo amxinfo;
 	bool connect_success;
 	bool query_success;
+	float queue_time;
 };
 
 class AtomicResult : 

editor/studio/AMXX_Studio.cfg

@@ -32,8 +32,8 @@
 -M
 -$M16384,1048576
 -K$00400000
--LE"c:\programme\borland\delphi7\Projects\Bpl"
--LN"c:\programme\borland\delphi7\Projects\Bpl"
+-LE"c:\program files\borland\delphi7\Projects\Bpl"
+-LN"c:\program files\borland\delphi7\Projects\Bpl"
 -DmadExcept
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

editor/studio/AMXX_Studio.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=1
 MinorVer=4
 Release=3
-Build=0
+Build=3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,11 +126,11 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=AMX Mod X Dev Team
 FileDescription=
-FileVersion=1.4.3.0
+FileVersion=1.4.3.3
 InternalName=
 LegalCopyright=AMX Mod X Dev Team
 LegalTrademarks=
 OriginalFilename=
 ProductName=AMXX-Studio
-ProductVersion=1.4.3.0
+ProductVersion=1.4.3 final
 Comments=

editor/studio/UnitCodeInspector.pas

@@ -800,6 +800,8 @@ begin
         eCurrLine := Between(eCurrLine, '(', ')', True);
       HideBracesAndStrings(eCurrLine, True);
       eStr2.Text := StringReplace(eCurrLine, ',', #13, [rfReplaceAll]);
+      if (Trim(eStr2.Text) = ')') then
+        eStr2.Clear;
 
       CreateCategory('Function Call');
       AddField('Function', 'Function Call', eVarName);

editor/studio/UnitCodeUtils.pas

@@ -176,7 +176,7 @@ begin
           eTempIndent := eTempIndent +1;
       end;
     end
-    else if (eStr[i] = 'else') or (Pos('else if', eStr[i]) = 1) and (Pos('{', eStr[i]) = 0) then
+    else if (eStr[i] = 'else') or ((Pos('else if', eStr[i]) = 1) or (Pos('case', eStr[i]) = 1) or (Pos('switch', eStr[i]) = 1)) and (Pos('{', eStr[i]) = 0) then
         eTempIndent := eTempIndent +1
     else if (Pos('{', eStr[i]) = 0) and (Length(eStr[i]) > 6) then begin
       if (IsAtStart('stock', eStr[i], False)) or (IsAtStart('while', eStr[i], True)) then begin

editor/studio/UnitMainTools.pas

@@ -80,7 +80,7 @@ function IEInstalled: Boolean;
 function GetAMXXDir(ListenServer: Boolean): String;
 
 function CloseDocument(eDocument: TDocument; SaveActiveDoc, RemoveTab: Boolean): Boolean;
-function AddExtension(eFilename, eHighlighter: String): String;
+function AddExtension(eFilename, eHighlighter: String; Document: TDocument): String;
 
 function ShowColorDialog(var Color: TColor; ePaintImage: TImage): Boolean;
 
@@ -468,11 +468,15 @@ begin
     Collection.Close(eDocument.Index, RemoveTab);
 end;
 
-function AddExtension(eFilename, eHighlighter: String): String;
+function AddExtension(eFilename, eHighlighter: String; Document: TDocument): String;
 begin
   if ExtractFileExt(eFilename) = '' then begin
-    if eHighlighter = 'Pawn' then
-      Result := eFilename + '.sma';
+    if eHighlighter = 'Pawn' then begin
+      if (ExtractFileExt(Document.Title) = '.inc') then
+        Result := eFilename + '.inc'
+      else
+        Result := eFilename + '.sma';
+    end;
     if eHighlighter = 'C++' then
       Result := eFilename + '.cpp';
     if eHighlighter = 'HTML' then
@@ -751,6 +755,8 @@ begin
   else
     eCPUSpeed := 1; // otherwise the program would hang up
   frmSettings.txtLangDir.Text := IncludeTrailingPathDelimiter(eConfig.ReadString('Misc', 'LangDir', ''));
+  if (frmSettings.txtLangDir.Text = '\') then
+    frmSettings.txtLangDir.Text := '';
   frmSettings.chkShowStatusbar.Checked := eConfig.ReadBool('Misc', 'ShowStatusbar', True);
   frmMain.sbStatus.Visible := frmSettings.chkShowStatusbar.Checked;
 end;

editor/studio/UnitTextAnalyze.pas

@@ -63,6 +63,7 @@ var i, k: integer;
     eTempResult: TPawnParseResult;
     eProcedureAdded: Boolean;
     eCActive: Boolean;
+    eTempBool: Boolean;
 begin
   Result := TPawnParseResult.Create;
   if not IsRecursive then
@@ -101,30 +102,39 @@ begin
     end;
 
     { Constants and Variables }
-    if (IsAtStart('new', eString, False)) or (IsAtStart('stock', eString, False)) then begin // const or variable
+    if (IsAtStart('new', eString, False)) or (IsAtStart('const', eString, False)) or (IsAtStart('stock', eString, False)) then begin // const or variable
       if (eBracesOpen = 0) and (not IsRecursive) and (Pos('(', eString) = Pos(')', eString)) then begin
-        Delete(eString, 1, Pos(#32, eString));
-        eString := Trim(eString);
         // we don't need braces so delete them...
         while (CountChars(eString, '{') <> 0) and (CountChars(eString, '}') <> 0) and (Pos('{', eString) < Pos('}', eString)) do
           eString := StringReplace(eString, '{' + Between(eString, '{', '}') + '}', '', [rfReplaceAll]);
         while (CountChars(eString, '[') <> 0) and (CountChars(eString, ']') <> 0) and (Pos('[', eString) < Pos(']', eString)) do
           eString := StringReplace(eString, '[' + Between(eString, '[', ']') + ']', '', [rfReplaceAll]);
         // done? okay, split all items if there are more than one; and if not, it's okay...
-        eStr.Text := StringReplace(eString, ',', #13, [rfReplaceAll]);
+        eStr.Text := StringReplace(Copy(eString, Pos(#32, eString)+1, Length(eString)), ',', #13, [rfReplaceAll]);
         for k := 0 to eStr.Count - 1 do begin
           if (Trim(eStr[k]) <> '') and (eStr[k] <> '}') then begin
             eTemp := Trim(RemoveSemicolon(eStr[k]));
 
-            if Pos(':', eTemp) <> 0 then
+            if (IsAtStart('const', eTemp, False)) then begin
+              Delete(eTemp, 1, 5);
+              eTemp := Trim(eTemp);
+              eTempBool := True;
+            end
+            else
+              eTempBool := (IsAtStart('const', eString, False));
+            
+            if (Pos(':', eTemp) <> 0) then
               eTemp := Copy(eTemp, Pos(':', eTemp) + 1, Length(eTemp));
 
-            if Pos('=', eTemp) <> 0 then begin // constant
+            if (Pos('=', eTemp) <> 0) then begin // constant
               Result.Constants.AddObject(Copy(eTemp, 1, Pos('=', eTemp) - 1), TObject(i));
               Result.AutoComplete.Add(Copy(eTemp, 1, Pos('=', eTemp) - 1));
             end
             else begin // variable
-              Result.Variables.AddObject(eTemp, TObject(i));
+              if (eTempBool) then
+                Result.Constants.AddObject(eTemp, TObject(i))
+              else
+                Result.Variables.AddObject(eTemp, TObject(i));
               Result.AutoComplete.Add(eTemp);
             end;
           end;
@@ -229,7 +239,7 @@ begin
             eStartLine := eStartLine - 1;
           eTemp := Trim(RemoveSemicolon(Trim(eCode[eStartLine])));
 
-        // Analyze type
+          // Analyze type
           k := 0;
           if IsAtStart('public', eTemp) then
             k := 1
@@ -243,7 +253,7 @@ begin
             k := 5;
 
 
-        // Remove type
+          // Remove type
           if Pos('@', eTemp) = 1 then begin
             eTemp := Copy(eTemp, 2, Length(eTemp));
             k := 1;
@@ -258,7 +268,7 @@ begin
           if eTemp[Length(eTemp)] = '{' then
             eTemp := Trim(Copy(eTemp, 1, Length(eTemp) - 1));
 
-        // Remove return-type
+          // Remove return-type
           if (Pos(':', eTemp) <> 0) and (Pos(':', eTemp) < Pos('(', eTemp)) then
             Delete(eTemp, 1, Pos(':', eTemp));
 
@@ -275,7 +285,7 @@ begin
               4: Result.CallTips.Add(eTemp + '-> ' + FileName + ', forward');
             end;
           end;
-        // Copy function-name
+          // Copy function-name
           if Pos('(', eTemp) <> 0 then
             eTemp := Copy(eTemp, 1, Pos('(', eTemp) - 1);
           eTemp := Trim(eTemp);

editor/studio/UnitfrmGoToLine.pas

@@ -9,13 +9,14 @@ uses
 
 type
   TfrmGoToLine = class(TForm)
+    pnlBG: TSpTBXPanel;
     lblCaption: TLabel;
-    txtGoToLine: TSpTBXEdit;
-    cmdOK: TSpTBXButton;
     cmdCancel: TSpTBXButton;
-    procedure txtGoToLineChange(Sender: TObject);
+    cmdOK: TSpTBXButton;
+    txtGoToLine: TSpTBXEdit;
     procedure txtGoToLineKeyPress(Sender: TObject; var Key: Char);
     procedure FormShow(Sender: TObject);
+    procedure txtGoToLineChange(Sender: TObject);
   end;
 
 var
@@ -27,14 +28,6 @@ uses UnitMainTools;
 
 {$R *.DFM}
 
-procedure TfrmGoToLine.txtGoToLineChange(Sender: TObject);
-begin
-  if not IsNumeric(txtGoToLine.Text) then
-    txtGoToLine.Text := '1'
-  else if txtGoToLine.Text = '0' then
-    txtGoToLine.Text := '1';
-end;
-
 procedure TfrmGoToLine.txtGoToLineKeyPress(Sender: TObject; var Key: Char);
 begin
   if Key = #13 then begin
@@ -46,6 +39,12 @@ end;
 procedure TfrmGoToLine.FormShow(Sender: TObject);
 begin
   txtGoToLine.SetFocus;
+  txtGoToLine.SelectAll;
+end;
+
+procedure TfrmGoToLine.txtGoToLineChange(Sender: TObject);
+begin
+  cmdOK.Enabled := StrToIntDef(txtGoToLine.Text, -1) > 0;
 end;
 
 end.

editor/studio/UnitfrmHudMsgGenerator.dfm

@@ -7375,8 +7375,8 @@ object frmHudMsgGenerator: TfrmHudMsgGenerator
     ColorHighLight = 8623776
     ColorShadow = 8623776
     Caption = 'Generate'
-    ModalResult = 1
     TabOrder = 4
+    ModalResult = 1
   end
   object cmdCancel: TFlatButton
     Left = 334
@@ -7388,8 +7388,8 @@ object frmHudMsgGenerator: TfrmHudMsgGenerator
     ColorHighLight = 8623776
     ColorShadow = 8623776
     Caption = 'Cancel'
-    ModalResult = 2
     TabOrder = 5
+    ModalResult = 2
   end
   object pnlText: TPanel
     Left = 6
@@ -7430,7 +7430,7 @@ object frmHudMsgGenerator: TfrmHudMsgGenerator
       ColorFlat = clWhite
       TabOrder = 1
       Text = '12,0'
-      OnChange = txtTimeToShowChange
+      OnExit = txtTimeToShowExit
       OnKeyPress = txtTimeToShowKeyPress
     end
   end

editor/studio/UnitfrmHudMsgGenerator.pas

@@ -47,10 +47,10 @@ type
     procedure cmdSelectColorClick(Sender: TObject);
     procedure txtTextChange(Sender: TObject);
     procedure txtTimeToShowKeyPress(Sender: TObject; var Key: Char);
-    procedure txtTimeToShowChange(Sender: TObject);
     procedure chkXCenterClick(Sender: TObject);
     procedure chkYCenterClick(Sender: TObject);
     procedure txtPosExit(Sender: TObject);
+    procedure txtTimeToShowExit(Sender: TObject);
   private
     eDown: Boolean;
     eStartPos: TPoint;
@@ -89,7 +89,7 @@ begin
         lblHudMsg.Left := 0
       else if lblHudMsg.Left > pnlHudmessage.Width then
         lblHudMsg.Left := pnlHudmessage.Width;
-      txtXPos.Text := FloatToStr(RoundTo(lblHudMsg.Left / pnlHudmessage.Width, -2));
+      txtXPos.Text := FloatToStrF(lblHudMsg.Left / pnlHudmessage.Width, ffFixed, -2, 2);
     end;
     
     { Y Pos }
@@ -99,7 +99,7 @@ begin
         lblHudMsg.Top := 0
       else if lblHudMsg.Top > pnlHudmessage.Height then
         lblHudMsg.Top := pnlHudmessage.Height;
-      txtYPos.Text := FloatToStr(RoundTo(lblHudMsg.Top / pnlHudmessage.Height, -2));
+      txtYPos.Text := FloatToStrF(lblHudMsg.Top / pnlHudmessage.Height, ffFixed, -2, 2);
     end;
   end;
 end;
@@ -169,7 +169,7 @@ procedure TfrmHudMsgGenerator.txtTextKeyPress(Sender: TObject;
   var Key: Char);
 begin
   if Key = #13 then begin
-    txtText.SelText := '\n';
+    txtText.SelText := '^n';
     Key := #0;
   end;
 end;
@@ -195,7 +195,7 @@ begin
   if txtText.Text = '' then
     lblHudMsg.Caption := 'Custom Hudmessage'
   else
-    lblHudMsg.Caption := StringReplace(txtText.Text, '\n', #13, [rfReplaceAll]);
+    lblHudMsg.Caption := StringReplace(txtText.Text, '^n', #13, [rfReplaceAll]);
 
   if chkXCenter.Checked then
     CenterX;
@@ -210,20 +210,6 @@ begin
     Key := ',';
 end;
 
-procedure TfrmHudMsgGenerator.txtTimeToShowChange(Sender: TObject);
-var eVal: Real;
-begin
-  try
-    eVal := Round(StrToFloat(txtTimeToShow.Text));
-    if eVal < 0 then begin
-      eVal := 0.0;
-      txtTimeToShow.Text := FloatToStr(eVal);
-    end;
-  except
-    txtTimeToShow.Text := '12,0';
-  end;
-end;
-
 procedure TfrmHudMsgGenerator.chkXCenterClick(Sender: TObject);
 var eChar: Char;
 begin
@@ -276,4 +262,16 @@ begin
     txtYPos.OnKeyPress(txtXPos, eChar);
 end;
 
+procedure TfrmHudMsgGenerator.txtTimeToShowExit(Sender: TObject);
+var eVal: Real;
+begin
+  try
+    eVal := Round(StrToFloat(txtTimeToShow.Text));
+    if eVal < 0 then
+      txtTimeToShow.Text := '0,0';
+  except
+    txtTimeToShow.Text := '12,0';
+  end;
+end;
+
 end.

editor/studio/UnitfrmMain.dfm

@@ -1,7 +1,7 @@
 object frmMain: TfrmMain
-  Left = 189
-  Top = 114
-  Width = 888
+  Left = 184
+  Top = 77
+  Width = 893
   Height = 648
   Caption = 'AMXX-Studio'
   Color = clBtnFace
@@ -45,13 +45,13 @@ object frmMain: TfrmMain
   PixelsPerInch = 96
   TextHeight = 13
   object splRight: TSplitter
-    Left = 669
+    Left = 674
     Top = 95
     Height = 501
     Align = alRight
   end
   object spcRight1: TImage
-    Left = 877
+    Left = 882
     Top = 95
     Width = 3
     Height = 501
@@ -67,7 +67,7 @@ object frmMain: TfrmMain
   object tbxTopDock: TSpTBXDock
     Left = 0
     Top = 0
-    Width = 880
+    Width = 885
     Height = 72
     object tbxMenu: TSpTBXToolbar
       Left = 0
@@ -680,11 +680,11 @@ object frmMain: TfrmMain
   object sbStatus: TSpTBXStatusBar
     Left = 0
     Top = 596
-    Width = 880
+    Width = 885
     Height = 25
     object mnuFilename: TSpTBXRightAlignSpacerItem
       Caption = 'Untitled.sma'
-      CustomWidth = 542
+      CustomWidth = 547
     end
     object sepStatus0: TSpTBXSeparatorItem
     end
@@ -728,7 +728,7 @@ object frmMain: TfrmMain
   object tbDocs: TJvTabBar
     Left = 0
     Top = 72
-    Width = 880
+    Width = 885
     RightClickSelect = False
     Tabs = <
       item
@@ -740,7 +740,7 @@ object frmMain: TfrmMain
     OnMouseDown = tbDocsMouseDown
   end
   object tcTools: TSpTBXTabControl
-    Left = 672
+    Left = 677
     Top = 95
     Width = 205
     Height = 501
@@ -950,7 +950,7 @@ object frmMain: TfrmMain
   object pnlParent: TPanel
     Left = 3
     Top = 95
-    Width = 666
+    Width = 671
     Height = 501
     Align = alClient
     BevelOuter = bvNone
@@ -958,7 +958,7 @@ object frmMain: TfrmMain
     object splOutput: TSplitter
       Left = 0
       Top = 416
-      Width = 666
+      Width = 671
       Height = 3
       Cursor = crVSplit
       Align = alBottom
@@ -967,7 +967,7 @@ object frmMain: TfrmMain
     object sciEditor: TScintilla
       Left = 0
       Top = 0
-      Width = 666
+      Width = 671
       Height = 416
       Color = clWhite
       Font.Charset = DEFAULT_CHARSET
@@ -4493,7 +4493,7 @@ object frmMain: TfrmMain
     object lstOutput: TListBox
       Left = 0
       Top = 419
-      Width = 666
+      Width = 671
       Height = 82
       Align = alBottom
       ItemHeight = 13
@@ -4544,7 +4544,6 @@ object frmMain: TfrmMain
         TabOrder = 1
         OnClick = cmdCancelClick
         CaptionGlowColor = clBtnFace
-        DropDownArrow = True
         LinkFont.Charset = DEFAULT_CHARSET
         LinkFont.Color = clBlue
         LinkFont.Height = -11
@@ -6569,6 +6568,7 @@ object frmMain: TfrmMain
   end
   object IdFTP: TIdFTP
     MaxLineAction = maSplit
+    ReadTimeout = 0
     ProxySettings.ProxyType = fpcmNone
     ProxySettings.Port = 0
     Left = 722

editor/studio/UnitfrmMain.pas

@@ -894,7 +894,7 @@ end;
 procedure TfrmMain.mnuSaveAsClick(Sender: TObject);
 begin
   if sdSave.Execute then begin
-    ActiveDoc.FileName := AddExtension(sdSave.FileName, ActiveDoc.Highlighter);
+    ActiveDoc.FileName := AddExtension(sdSave.FileName, ActiveDoc.Highlighter, ActiveDoc);
     ActiveDoc.Save;
     tbDocs.Tabs[ActiveDoc.Index].Caption := ActiveDoc.Title;
   end;
@@ -1071,9 +1071,30 @@ begin
 end;
 
 procedure TfrmMain.OnCodeSnippetClick(Sender: TObject);
+var Snippet, Indentation: String;
+    Line: Integer;
 begin
-  if Plugin_CodeSnippetClick(TSpTBXItem(Sender).Caption, GetCat, GetSnippet(GetCat, (Sender as TSpTBXItem).Caption)) then
-    sciEditor.SelText := GetSnippet(GetCat, (Sender as TSpTBXItem).Caption);
+  if Plugin_CodeSnippetClick(TSpTBXItem(Sender).Caption, GetCat, GetSnippet(GetCat, (Sender as TSpTBXItem).Caption)) then begin
+    Snippet := GetSnippet(GetCat, (Sender as TSpTBXItem).Caption);
+    if (Pos('!APPEND!' + #13, Snippet) = 1) then begin
+      Snippet := Copy(Snippet, Pos(#10, Snippet)+1, Length(Snippet));
+      Line := sciEditor.Lines.Add(Snippet);
+    end
+    else if (Pos('!INSERT!' + #13, Snippet) = 1) then begin
+      Indentation := sciEditor.Lines[sciEditor.GetCurrentLineNumber];
+      if (Trim(Indentation) <> '') then
+        Indentation := Copy(Indentation, 1, Pos(Copy(TrimLeft(Indentation), 1, 1), Indentation)-1);
+      Snippet := StringReplace(Snippet, #10, #10 + Indentation, [rfReplaceAll]);
+      Line := sciEditor.GetCurrentLineNumber;
+      sciEditor.Lines.Insert(Line, Copy(Snippet, Pos(#10, Snippet)+1, Length(Snippet)));
+    end
+    else begin
+      sciEditor.SelText := Snippet;
+      Line := sciEditor.GetCurrentLineNumber;
+    end;
+
+    sciEditor.GoToLine(Line);
+  end;
 end;
 
 procedure TfrmMain.mnuCopyMessageClick(Sender: TObject);
@@ -1275,7 +1296,7 @@ begin
         b := Integer(frmAllFilesForm.lstFiles.Items.Objects[a]);
         if TDocument(Collection.Items[b]).Untitled then begin
           if sdSave.Execute then begin
-            TDocument(Collection.Items[b]).FileName := AddExtension(sdSave.FileName, TDocument(Collection.Items[b]).Highlighter);
+            TDocument(Collection.Items[b]).FileName := AddExtension(sdSave.FileName, TDocument(Collection.Items[b]).Highlighter, TDocument(Collection.Items[b]));
             TDocument(Collection.Items[b]).Save;
             TJvTabBarItem(tbDocs.Tabs[b]).Caption := TDocument(Collection.Items[b]).Title;
           end
@@ -1526,7 +1547,7 @@ begin
                   else begin
                     frmMain.sdSave.FilterIndex := 1;
                     if frmMain.sdSave.Execute then begin
-                      eItem.FileName := AddExtension(frmMain.sdSave.FileName, eItem.Highlighter);
+                      eItem.FileName := AddExtension(frmMain.sdSave.FileName, eItem.Highlighter, eItem);
                       eItem.Save;
                     end
                     else begin
@@ -1550,7 +1571,7 @@ begin
                   else begin
                     frmMain.sdSave.FilterIndex := 2;
                     if frmMain.sdSave.Execute then begin
-                      eItem.FileName := AddExtension(frmMain.sdSave.FileName, eItem.Highlighter);
+                      eItem.FileName := AddExtension(frmMain.sdSave.FileName, eItem.Highlighter, eItem);
                       eItem.Save;
                     end
                     else begin
@@ -1574,7 +1595,7 @@ begin
                   else begin
                     frmMain.sdSave.FilterIndex := 0;
                     if frmMain.sdSave.Execute then begin
-                      eItem.FileName := AddExtension(frmMain.sdSave.FileName, eItem.Highlighter);
+                      eItem.FileName := AddExtension(frmMain.sdSave.FileName, eItem.Highlighter, eItem);
                       eItem.Save;
                     end
                     else begin
@@ -1685,6 +1706,7 @@ procedure TfrmMain.mnuHudmessageClick(Sender: TObject);
   function Dot(eIn: string): string;
   begin
     Result := StringReplace(eIn, ',', '.', [rfReplaceAll]);
+    Result := StringReplace(Result, '.00', '.0', [rfReplaceAll]);
   end;
 
 var eStr: string;
@@ -2210,7 +2232,7 @@ begin
     sciEditor.Lines.Add(#9 + 'if (socket_change(sck' + frmConnGen.txtName.Text + ', 100)) {');
     sciEditor.Lines.Add(#9 + #9 + 'new buf[512], lines[30][100], count = 0');
     sciEditor.Lines.Add(#9 + #9 + 'socket_recv(sck' + frmConnGen.txtName.Text + ', buf, 511)');
-    sciEditor.Lines.Add(#9 + #9 + 'count = ExplodeString(lines, 50, 119, buf, 13)');
+    sciEditor.Lines.Add(#9 + #9 + 'count = ExplodeString(lines, 29, 99, buf, 13)');
     sciEditor.Lines.Add(#9 + #9 + 'for(new i=0;i<count;i++) {');
     sciEditor.Lines.Add(#9 + #9 + #9 + '/* Process items here */');
     sciEditor.Lines.Add(#9 + #9 + '}');

editor/studio/UnitfrmSettings.dfm

@@ -64,7 +64,7 @@ object frmSettings: TfrmSettings
     Top = 0
     Width = 351
     Height = 260
-    ActivePage = jspCTSettings
+    ActivePage = jspCodeSnippets
     PropagateEnable = False
     Align = alClient
     OnChange = jplSettingsChange
@@ -760,6 +760,9 @@ object frmSettings: TfrmSettings
           ScrollBars = ssBoth
           TabOrder = 1
           WantTabs = True
+          OnChange = txtCodeSnippetChange
+          OnEnter = txtCodeSnippetEnter
+          OnExit = txtCodeSnippetExit
           OnKeyUp = txtCodeSnippetKeyUp
         end
         object cmdCSAdd: TFlatButton

editor/studio/UnitfrmSettings.pas

@@ -277,6 +277,9 @@ type
     procedure lvParamsDblClick(Sender: TObject);
     procedure cmdAddFunctionClick(Sender: TObject);
     procedure lstFunctionsClick(Sender: TObject);
+    procedure txtCodeSnippetEnter(Sender: TObject);
+    procedure txtCodeSnippetExit(Sender: TObject);
+    procedure txtCodeSnippetChange(Sender: TObject);
   public
     Foreground, Background: TColor;
     CaretFore, CaretBack: TColor;
@@ -339,9 +342,14 @@ begin
       eReg.OpenKey('SOFTWARE\Microsoft\Windows\CurrentVersion', False);
       { AMXX }
       AMXXDir := eReg.ReadString('ProgramFilesDir') + '\AMX Mod X\';
-      if not DirectoryExists(AMXXDir) then
+      if DirectoryExists(AMXXDir) then
+        AMXXDir := IncludeTrailingPathDelimiter(AMXXDir)
+      else
         AMXXDir := '';
       eReg.CloseKey;
+      { Language Files }
+      if (DirectoryExists(AMXXDir + 'files\base\data\lang')) then
+        txtLangDir.Text := AMXXDir + 'files\base\data\lang';
       { Steam }
       if eReg.KeyExists('SOFTWARE\Valve\Steam') then begin
         eReg.OpenKey('SOFTWARE\Valve\Steam', False);
@@ -421,7 +429,7 @@ begin
     eConfig.WriteString('Misc', 'DefaultPluginAuthor', GetUser);
     eConfig.WriteInteger('Misc', 'SaveNotesTo', 0);
     eConfig.WriteInteger('Misc', 'CPUSpeed', 5);
-    eConfig.WriteString('Misc', 'LangDir', '');
+    eConfig.WriteString('Misc', 'LangDir', txtLangDir.Text);
     eConfig.WriteInteger('Misc', 'ShowStatusbar', 1);
     eConfig.WriteInteger('Misc', 'WindowState', 0);
   end;
@@ -434,6 +442,8 @@ begin
     2: frmMain.WindowState := wsMinimized;
   end;
 
+  txtCodeSnippetExit(Sender);
+
   PaintForeground(clBlack);
   PaintBackground(clBlack);
   PaintCaretFore(clBlack);
@@ -778,6 +788,7 @@ begin
         lstCodeSnippets.ItemIndex := lstCodeSnippets.Items.Add(eStr);
         AddSnippet(ftcCodeSnippets.Tabs[ftcCodeSnippets.ActiveTab], eStr, '');
         txtCodeSnippet.Enabled := True;
+        lstCodeSnippets.SetFocus;
         lstCodeSnippetsClick(Sender);
       end
       else
@@ -805,7 +816,9 @@ procedure TfrmSettings.lstCodeSnippetsClick(Sender: TObject);
 begin
   cmdCSRemove.Enabled := lstCodeSnippets.ItemIndex <> -1;
   if cmdCSRemove.Enabled then
-    txtCodeSnippet.Lines.Text := GetSnippet(ftcCodeSnippets.Tabs[ftcCodeSnippets.ActiveTab], lstCodeSnippets.Items[lstCodeSnippets.ItemIndex]);
+    txtCodeSnippet.Lines.Text := GetSnippet(ftcCodeSnippets.Tabs[ftcCodeSnippets.ActiveTab], lstCodeSnippets.Items[lstCodeSnippets.ItemIndex])
+  else
+    txtCodeSnippetExit(Sender);
 end;
 
 procedure TfrmSettings.ftcCodeSnippetsTabChanged(Sender: TObject);
@@ -815,8 +828,8 @@ begin
     lstCodeSnippets.ItemIndex := 0
   else
     txtCodeSnippet.Clear;
-  lstCodeSnippetsClick(Sender);
   txtCodeSnippet.Enabled := lstCodeSnippets.Items.Count > 0;
+  lstCodeSnippetsClick(Sender);
   cmdCSRemove.Enabled := lstCodeSnippets.ItemIndex <> -1;
 end;
 
@@ -1250,4 +1263,28 @@ begin
   end;
 end;
 
+procedure TfrmSettings.txtCodeSnippetEnter(Sender: TObject);
+begin
+  if (txtCodeSnippet.Font.Color = $008396A0) and ((ActiveControl = txtCodeSnippet) or (txtCodeSnippet.Enabled)) then begin
+    txtCodeSnippet.Font.Color := clWindowText;
+    txtCodeSnippet.Text := '';
+  end;
+end;
+
+procedure TfrmSettings.txtCodeSnippetExit(Sender: TObject);
+begin
+  if (txtCodeSnippet.Text = '') then begin
+    txtCodeSnippet.Lines.Text := 'Use "!APPEND!" to append or'#13'"!INSERT!" to insert the code'#13'snippet into a new line on click...';
+    txtCodeSnippet.Font.Color := $008396A0;
+  end;
+end;
+
+procedure TfrmSettings.txtCodeSnippetChange(Sender: TObject);
+begin
+  if (txtCodeSnippet.Font.Color = $008396A0) then
+    txtCodeSnippet.Font.Color := clWindowText
+  else if (txtCodeSnippet.Text = '') and (ActiveControl <> txtCodeSnippet) then
+    txtCodeSnippetExit(Sender);
+end;
+
 end.

installer/AMXXRelease/linux32.info

@@ -3,4 +3,4 @@ source = /home/users/dvander/amxx
 makeopts = 
 output = /home/users/dvander/done
 devenv = /usr/bin/make
-release = amxmodx-1.76
+release = amxmodx-1.76c

installer/AMXXRelease/win32.info

@@ -3,4 +3,4 @@ source = R:\amxmodx
 makeopts = 
 output = c:\real\done
 devenv = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.com
-release = amxmodx-1.76
+release = amxmodx-1.76c

installer/amxmodx-installer.nsi

@@ -2,7 +2,7 @@
 ; Licensed under the GNU General Public License
 ; Originally written by -=HaXoMaTiC=-
 !define PRODUCT_NAME "AMX Mod X Installer"
-!define PRODUCT_VERSION "1.76a"
+!define PRODUCT_VERSION "1.76c"
 !define PRODUCT_PUBLISHER "AMX Mod X Dev Team"
 !define PRODUCT_WEB_SITE "http://www.amxmodx.org/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Installer.exe"
@@ -149,38 +149,27 @@ Section "MainSection" SEC01
   File "installer\files\base\data\lang\timeleft.txt"
   SetOutPath "$INSTDIR\files\base\dlls"
   File "installer\files\base\dlls\amxmodx_mm.dll"
-  File "installer\files\base\dlls\amxmodx_mm_amd64.so"
   File "installer\files\base\dlls\amxmodx_mm_i386.so"
   File "installer\files\base\dlls\metamod.dll"
-  File "installer\files\base\dlls\metamod_amd64.so"
   File "installer\files\base\dlls\metamod_i386.so"
   SetOutPath "$INSTDIR\files\base\modules"
   File "installer\files\base\modules\nvault_amxx.dll"
-  File "installer\files\base\modules\nvault_amxx_amd64.so"
   File "installer\files\base\modules\nvault_amxx_i386.so"
   File "installer\files\base\modules\engine_amxx.dll"
-  File "installer\files\base\modules\engine_amxx_amd64.so"
   File "installer\files\base\modules\engine_amxx_i386.so"
   File "installer\files\base\modules\fakemeta_amxx.dll"
-  File "installer\files\base\modules\fakemeta_amxx_amd64.so"
   File "installer\files\base\modules\fakemeta_amxx_i386.so"
   File "installer\files\base\modules\fun_amxx.dll"
-  File "installer\files\base\modules\fun_amxx_amd64.so"
   File "installer\files\base\modules\fun_amxx_i386.so"
   File "installer\files\base\modules\geoip_amxx.dll"
-  File "installer\files\base\modules\geoip_amxx_amd64.so"
   File "installer\files\base\modules\geoip_amxx_i386.so"
   File "installer\files\base\modules\sqlite_amxx.dll"
-  File "installer\files\base\modules\sqlite_amxx_amd64.so"
   File "installer\files\base\modules\sqlite_amxx_i386.so"
   File "installer\files\base\modules\mysql_amxx.dll"
-  File "installer\files\base\modules\mysql_amxx_amd64.so"
   File "installer\files\base\modules\mysql_amxx_i386.so"
   File "installer\files\base\modules\regex_amxx.dll"
-  File "installer\files\base\modules\regex_amxx_amd64.so"
   File "installer\files\base\modules\regex_amxx_i386.so"
   File "installer\files\base\modules\sockets_amxx.dll"
-  File "installer\files\base\modules\sockets_amxx_amd64.so"
   File "installer\files\base\modules\sockets_amxx_i386.so"
   SetOutPath "$INSTDIR\files\base\plugins"
   File "installer\files\base\plugins\admin.amxx"
@@ -329,10 +318,8 @@ Section "MainSection" SEC01
   File "installer\files\cstrike\data\WinCSX.exe"
   SetOutPath "$INSTDIR\files\cstrike\modules"
   File "installer\files\cstrike\modules\cstrike_amxx.dll"
-  File "installer\files\cstrike\modules\cstrike_amxx_amd64.so"
   File "installer\files\cstrike\modules\cstrike_amxx_i386.so"
   File "installer\files\cstrike\modules\csx_amxx.dll"
-  File "installer\files\cstrike\modules\csx_amxx_amd64.so"
   File "installer\files\cstrike\modules\csx_amxx_i386.so"
   SetOutPath "$INSTDIR\files\cstrike\plugins"
   File "installer\files\cstrike\plugins\miscstats.amxx"
@@ -585,10 +572,8 @@ Section Uninstall
   Delete "$INSTDIR\files\cstrike\plugins\restmenu.amxx"
   Delete "$INSTDIR\files\cstrike\plugins\miscstats.amxx"
   Delete "$INSTDIR\files\cstrike\modules\csx_amxx_i386.so"
-  Delete "$INSTDIR\files\cstrike\modules\csx_amxx_amd64.so"
   Delete "$INSTDIR\files\cstrike\modules\csx_amxx.dll"
   Delete "$INSTDIR\files\cstrike\modules\cstrike_amxx_i386.so"
-  Delete "$INSTDIR\files\cstrike\modules\cstrike_amxx_amd64.so"
   Delete "$INSTDIR\files\cstrike\modules\cstrike_amxx.dll"
   Delete "$INSTDIR\files\cstrike\data\csstats.amxx"
   Delete "$INSTDIR\files\cstrike\data\WinCSX.amxx"
@@ -729,37 +714,26 @@ Section Uninstall
   Delete "$INSTDIR\files\base\plugins\adminchat.amxx"
   Delete "$INSTDIR\files\base\plugins\admin.amxx"
   Delete "$INSTDIR\files\base\modules\nvault_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\nvault_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\nvault_amxx.dll"
   Delete "$INSTDIR\files\base\modules\sockets_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\sockets_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\sockets_amxx.dll"
   Delete "$INSTDIR\files\base\modules\regex_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\regex_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\regex_amxx.dll"
   Delete "$INSTDIR\files\base\modules\sqlite_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\sqlite_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\sqlite_amxx.dll"
   Delete "$INSTDIR\files\base\modules\mysql_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\mysql_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\mysql_amxx.dll"
   Delete "$INSTDIR\files\base\modules\geoip_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\geoip_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\geoip_amxx.dll"
   Delete "$INSTDIR\files\base\modules\fun_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\fun_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\fun_amxx.dll"
   Delete "$INSTDIR\files\base\modules\fakemeta_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\fakemeta_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\fakemeta_amxx.dll"
   Delete "$INSTDIR\files\base\modules\engine_amxx_i386.so"
-  Delete "$INSTDIR\files\base\modules\engine_amxx_amd64.so"
   Delete "$INSTDIR\files\base\modules\engine_amxx.dll"
   Delete "$INSTDIR\files\base\dlls\metamod_i386.so"
-  Delete "$INSTDIR\files\base\dlls\metamod_amd64.so"
   Delete "$INSTDIR\files\base\dlls\metamod.dll"
   Delete "$INSTDIR\files\base\dlls\amxmodx_mm_i386.so"
-  Delete "$INSTDIR\files\base\dlls\amxmodx_mm_amd64.so"
   Delete "$INSTDIR\files\base\dlls\amxmodx_mm.dll"
   Delete "$INSTDIR\files\base\data\lang\timeleft.txt"
   Delete "$INSTDIR\files\base\data\lang\time.txt"

installer/installer/UnitInstall.pas

@@ -3,10 +3,10 @@ unit UnitInstall;
 interface
 
 uses SysUtils, Classes, Windows, Graphics, Forms, ShellAPI, Controls, Messages,
-     TlHelp32, IdFTPCommon, ComCtrls, JclFileUtils, Dialogs;
+     TlHelp32, IdFTPCommon, ComCtrls, Dialogs, JclFileUtils;
 
 type TMod = (modNone, modCS, modDoD, modTFC, modNS, modTS, modESF);
-type TOS = (osWindows, osLinux32, osLinux64);
+type TOS = (osWindows, osLinux32{, osLinux64});
 
 procedure AddStatus(Text: String; Color: TColor; ShowTime: Boolean = True);
 procedure AddDone(Additional: String = '');
@@ -213,7 +213,7 @@ begin
       if Pos('_amd64', ExtractFileName(eFile)) <> 0 then
         Result := True;
     end;
-    osLinux64: begin
+    {osLinux64: begin
       if ExtractFileExt(eFile) = '.dll' then
         Result := True;
       if ExtractFileExt(eFile) = '.exe' then
@@ -221,7 +221,7 @@ begin
 
       if Pos('_i386', ExtractFileName(eFile)) <> 0 then
         Result := True;
-    end;
+    end;}
   end;
 end;
 
@@ -350,10 +350,10 @@ begin
           eStr[i] := '//' + eStr[i];
       end;
       eStr.Add('gamedll "addons\metamod\dlls\metamod.dll"');
-      if OS = osLinux64 then
-        eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"')
-      else
-        eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"');
+      //if OS = osLinux64 then
+      //  eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_amd64.so"')
+      //else
+      eStr.Add('gamedll_linux "addons/metamod/dlls/metamod_i386.so"');
       FileSetAttr(ePath + 'liblist.gam', 0);
       eStr.SaveToFile(ePath + 'liblist.gam');
       FileSetAttr(ePath + 'liblist.gam', faReadOnly); // important for listen servers
@@ -614,11 +614,13 @@ begin
 
   ePath := '/';
   CurNode := frmMain.trvDirectories.Selected;
-  repeat
-    ePath := '/' + CurNode.Text + ePath;
-    CurNode := CurNode.Parent;
-  until (not Assigned(CurNode));
-
+  if (Assigned(CurNode)) then begin
+    repeat
+      ePath := '/' + CurNode.Text + ePath;
+      CurNode := CurNode.Parent;
+    until (not Assigned(CurNode));
+  end;
+  
   Screen.Cursor := crAppStart;
   frmMain.cmdCancel.Show;
   frmMain.cmdCancel.Caption := '&Cancel';

installer/installer/UnitfrmMain.dfm

@@ -6101,14 +6101,14 @@ object frmMain: TfrmMain
       end
       object lblStep2: TLabel
         Left = 44
-        Top = 254
+        Top = 230
         Width = 244
         Height = 13
         Caption = '4. Connect to server and select the mod directory:'
       end
       object lblStep4: TLabel
         Left = 44
-        Top = 214
+        Top = 188
         Width = 117
         Height = 13
         Caption = '3. Select a game addon:'
@@ -6122,7 +6122,7 @@ object frmMain: TfrmMain
       end
       object lblStep5: TLabel
         Left = 44
-        Top = 358
+        Top = 334
         Width = 64
         Height = 13
         Caption = '5. Click Next.'
@@ -6312,7 +6312,7 @@ object frmMain: TfrmMain
       end
       object cmdConnect: TFlatButton
         Left = 416
-        Top = 269
+        Top = 247
         Width = 71
         Height = 20
         ColorFocused = 16245198
@@ -6326,30 +6326,34 @@ object frmMain: TfrmMain
       end
       object pnlDirectory: TPanel
         Left = 44
-        Top = 270
+        Top = 246
         Width = 367
         Height = 83
         BevelOuter = bvLowered
         TabOrder = 2
+        DesignSize = (
+          367
+          83)
         object trvDirectories: TTreeView
           Left = 1
           Top = 1
           Width = 365
           Height = 81
-          Align = alClient
+          Anchors = [akLeft, akTop, akRight, akBottom]
           BorderStyle = bsNone
           Images = ilImages
           Indent = 19
+          ReadOnly = True
           TabOrder = 0
-          OnChange = trvDirectoriesChange
           OnCollapsing = trvDirectoriesCollapsing
           OnExpanding = trvDirectoriesExpanding
           OnExpanded = trvDirectoriesExpanded
+          OnMouseDown = trvDirectoriesMouseDown
         end
       end
       object cboGameAddon: TFlatComboBox
         Left = 44
-        Top = 230
+        Top = 204
         Width = 443
         Height = 21
         Style = csDropDownList
@@ -6372,27 +6376,9 @@ object frmMain: TfrmMain
         Left = 44
         Top = 158
         Width = 441
-        Height = 50
+        Height = 25
         BevelOuter = bvLowered
         TabOrder = 5
-        object lblOSNote: TLabel
-          Left = 4
-          Top = 24
-          Width = 435
-          Height = 22
-          Caption = 
-            'Note: Most linux servers run on a 32-bit platform. If you are no' +
-            't sure what platform your server is using, you can still ask you' +
-            'r provider for further information about this topic.'
-          Enabled = False
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -9
-          Font.Name = 'Tahoma'
-          Font.Style = []
-          ParentFont = False
-          WordWrap = True
-        end
         object optWindows: TFlatRadioButton
           Left = 5
           Top = 5
@@ -6417,6 +6403,7 @@ object frmMain: TfrmMain
           Width = 82
           Height = 14
           Caption = 'Linux (64-bit)'
+          Enabled = False
           TabOrder = 2
         end
       end
@@ -6769,6 +6756,7 @@ object frmMain: TfrmMain
   object IdFTP: TIdFTP
     Intercept = IdLogFile
     MaxLineAction = maException
+    ReadTimeout = 0
     RecvBufferSize = 1024
     SendBufferSize = 1024
     OnWork = IdFTPWork

installer/installer/UnitfrmMain.pas

@@ -108,10 +108,9 @@ type
     pnlOS: TPanel;
     optWindows: TFlatRadioButton;
     optLinux32: TFlatRadioButton;
-    optLinux64: TFlatRadioButton;
-    lblOSNote: TLabel;
     lblStep5: TLabel;
     lblFTP: TLabel;
+    optLinux64: TFlatRadioButton;
     procedure jvwStepsCancelButtonClick(Sender: TObject);
     procedure cmdCancelClick(Sender: TObject);
     procedure cmdNextClick(Sender: TObject);
@@ -123,7 +122,6 @@ type
     procedure cmdProxySettingsClick(Sender: TObject);
     procedure txtPortChange(Sender: TObject);
     procedure trvDirectoriesExpanded(Sender: TObject; Node: TTreeNode);
-    procedure trvDirectoriesChange(Sender: TObject; Node: TTreeNode);
     procedure FormDestroy(Sender: TObject);
     procedure IdFTPWork(Sender: TObject; AWorkMode: TWorkMode;
       const AWorkCount: Integer);
@@ -137,6 +135,8 @@ type
     procedure frbFTPClick(Sender: TObject);
     procedure frbLocalClick(Sender: TObject);
     procedure trvModsClick(Sender: TObject);
+    procedure trvDirectoriesMouseDown(Sender: TObject;
+      Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
   private
     OldProgress: Integer;
     CurrProgress: Integer;
@@ -148,7 +148,7 @@ var
   frmMain: TfrmMain;
   gMultiAccount: Boolean;
 
-const VERSION = '1.76a';
+const VERSION = '1.76c';
 
 implementation
 
@@ -214,11 +214,13 @@ begin
     eStr := TStringList.Create;
     ePath := '/';
     CurNode := trvDirectories.Selected;
-    repeat
-      ePath := '/' + CurNode.Text + ePath;
-      CurNode := CurNode.Parent;
-    until (not Assigned(CurNode));
-
+    if (Assigned(CurNode)) then begin
+      repeat
+        ePath := '/' + CurNode.Text + ePath;
+        CurNode := CurNode.Parent;
+      until (not Assigned(CurNode));
+    end;
+    
     try
       IdFTP.ChangeDir(ePath);
     except
@@ -236,6 +238,7 @@ begin
     if eStr.IndexOf('liblist.gam') = -1 then begin
       MessageBox(Handle, 'Invalid directory. Please select your mod directory and try again.', PChar(Application.Title), MB_ICONWARNING);
       eStr.Free;
+      Screen.Cursor := crDefault;
       exit;
     end
     else
@@ -246,7 +249,7 @@ begin
     cmdConnect.Enabled := False;
     optWindows.Enabled := False;
     optLinux32.Enabled := False;
-    optLinux64.Enabled := False;
+    //optLinux64.Enabled := False;
     cboGameAddon.Enabled := False;
     // preinstall...
     MakeDir(ExtractFilePath(ParamStr(0)) + 'temp');
@@ -277,10 +280,10 @@ begin
 
     if optWindows.Checked then
       eOS := osWindows
-    else if optLinux32.Checked then
-      eOS := osLinux32
-    else
-      eOS := osLinux64;
+    else //if optLinux32.Checked then
+      eOS := osLinux32;
+    //else
+    //  eOS := osLinux64;
 
     jspInstallProgress.Show;
     frmMain.Height := 382;
@@ -576,7 +579,7 @@ begin
       end;
     end
     else if frbFTP.Checked then begin // FTP
-      frmMain.Height := 445;
+      frmMain.Height := 421;
       jspFTP.Show;
     end;
   end;
@@ -639,6 +642,7 @@ begin
       cmdConnect.Enabled := True;
       cmdConnect.Caption := 'Disconnect';
       cmdCancel.Caption := '&Close';
+      cmdNext.Enabled := True;
 
       CurNode := nil;
       if eStr.Count <> 0 then begin
@@ -816,10 +820,12 @@ begin
     // get complete path
     ePath := '/';
     CurNode := Node;
-    repeat
-      ePath := '/' + CurNode.Text + ePath;
-      CurNode := CurNode.Parent;
-    until (not Assigned(CurNode));
+    if (Assigned(CurNode)) then begin
+      repeat
+        ePath := '/' + CurNode.Text + ePath;
+        CurNode := CurNode.Parent;
+      until (not Assigned(CurNode));
+    end;
     // change dir and add directories in it
     try
       Repaint;
@@ -838,11 +844,6 @@ begin
   end;
 end;
 
-procedure TfrmMain.trvDirectoriesChange(Sender: TObject; Node: TTreeNode);
-begin
-  cmdNext.Enabled := Assigned(trvDirectories.Selected);
-end;
-
 procedure TfrmMain.FormDestroy(Sender: TObject);
 begin
   FileList.Free;
@@ -936,4 +937,15 @@ begin
     cmdNext.Enabled := (Assigned(trvMods.Selected));
 end;
 
+procedure TfrmMain.trvDirectoriesMouseDown(Sender: TObject;
+  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+var Node: TTreeNode;
+begin
+  Node := trvDirectories.GetNodeAt(X, Y);
+  if (Assigned(Node)) then begin
+    if (Node.DisplayRect(True).Right < X) then
+      trvDirectories.Selected := nil;
+  end;
+end;
+
 end.

plugins/admin.sma

@@ -460,7 +460,7 @@ public adminSql()
 		new qcolAccess = SQL_FieldNameToNum(query, "access")
 		new qcolFlags = SQL_FieldNameToNum(query, "flags")
 		
-		while (SQL_MoreResults(query))
+		while ((g_aNum < MAX_ADMINS) && (SQL_MoreResults(query)))
 		{
 			SQL_ReadResult(query, qcolAuth, g_aName[g_aNum], 31)
 			SQL_ReadResult(query, qcolPass, g_aPassword[g_aNum], 31)

plugins/adminchat.sma

@@ -60,22 +60,28 @@ public plugin_init()
 public cmdSayChat(id)
 {
 	if (!access(id, ADMIN_CHAT))
+	{
 		return PLUGIN_CONTINUE
+	}
 	
 	new said[6], i = 0
 	read_argv(1, said, 5)
 	
 	while (said[i] == '@')
+	{
 		i++
+	}
 	
 	if (!i || i > 3)
+	{
 		return PLUGIN_CONTINUE
+	}
 	
 	new message[192], a = 0
 	read_args(message, 191)
 	remove_quotes(message)
 	
-	switch(said[i])
+	switch (said[i])
 	{
 		case 'r': a = 1
 		case 'g': a = 2
@@ -85,6 +91,19 @@ public cmdSayChat(id)
 		case 'c': a = 6
 		case 'o': a = 7
 	}
+	
+	new n, s = i
+	if (a)
+	{
+		n++
+		s++
+	}
+	while (said[s] && isspace(said[s]))
+	{
+		n++
+		s++
+	}
+	
 
 	new name[32], authid[32], userid
 	
@@ -92,11 +111,13 @@ public cmdSayChat(id)
 	get_user_name(id, name, 31)
 	userid = get_user_userid(id)
 	
-	log_amx("Chat: ^"%s<%d><%s><>^" tsay ^"%s^"", name, userid, authid, message[i + 1])
-	log_message("^"%s<%d><%s><>^" triggered ^"amx_tsay^" (text ^"%s^") (color ^"%L^")", name, userid, authid, message[i + 1], "en", g_Colors[a])
+	log_amx("Chat: ^"%s<%d><%s><>^" tsay ^"%s^"", name, userid, authid, message[i + n])
+	log_message("^"%s<%d><%s><>^" triggered ^"amx_tsay^" (text ^"%s^") (color ^"%L^")", name, userid, authid, message[i + n], "en", g_Colors[a])
 	
 	if (++g_msgChannel > 6 || g_msgChannel < 3)
+	{
 		g_msgChannel = 3
+	}
 	
 	new Float:verpos = g_Pos[i][1] + float(g_msgChannel) / 35.0
 	
@@ -104,11 +125,11 @@ public cmdSayChat(id)
 
 	if (get_cvar_num("amx_show_activity") == 2)
 	{
-		show_hudmessage(0, "%s :   %s", name, message[i + 1])
-		client_print(0, print_notify, "%s :   %s", name, message[i + 1])
+		show_hudmessage(0, "%s :   %s", name, message[i + n])
+		client_print(0, print_notify, "%s :   %s", name, message[i + n])
 	} else {
-		show_hudmessage(0, "%s", message[i + 1])
-		client_print(0, print_notify, "%s", message[i + 1])
+		show_hudmessage(0, "%s", message[i + n])
+		client_print(0, print_notify, "%s", message[i + n])
 	}
 
 	return PLUGIN_HANDLED

plugins/amxmod_compat/vexdum.sma

@@ -40,17 +40,17 @@ VexdUM_Register()
 	register_forward(FM_ClientUserInfoChanged,	"Hook_ClientUserInfoChanged")
 	
 	/* Global Forwards */
-	g_FwdTouch = 			CreateMultiForward("entity_touch", ET_STOP, FP_CELL, FP_CELL)
-	g_FwdThink = 			CreateMultiForward("entity_think", ET_STOP, FP_CELL)
-	g_FwdSpawn = 			CreateMultiForward("entity_spawn", ET_STOP, FP_CELL)
-	g_FwdClientPreThink = 	CreateMultiForward("client_prethink", ET_IGNORE, FP_CELL)
-	g_FwdClientPostThink =	CreateMultiForward("client_postthink", ET_IGNORE, FP_CELL)
-	g_FwdEmitSound = 		CreateMultiForward("emitsound", ET_STOP, FP_CELL, FP_STRING)
-	g_FwdEmitAmbientSound = CreateMultiForward("emitambientsound", ET_STOP, FP_CELL, FP_STRING)
-	g_FwdSetModel = 		CreateMultiForward("set_model", ET_STOP, FP_CELL, FP_STRING)
-	g_FwdTraceLine = 		CreateMultiForward("traceline", ET_STOP, FP_CELL)
-	g_FwdSetCliKeyValue =	CreateMultiForward("setclientkeyvalue", ET_STOP, FP_CELL, FP_STRING, FP_STRING)
-	g_FwdKeyValue = 		CreateMultiForward("keyvalue", ET_STOP, FP_CELL)
+	g_FwdTouch = 			CreateMultiForwardEx("entity_touch", 		ET_STOP, FORWARD_ONLY_OLD, FP_CELL, FP_CELL)
+	g_FwdThink = 			CreateMultiForwardEx("entity_think", 		ET_STOP, FORWARD_ONLY_OLD, FP_CELL)
+	g_FwdSpawn = 			CreateMultiForwardEx("entity_spawn", 		ET_STOP, FORWARD_ONLY_OLD, FP_CELL)
+	g_FwdClientPreThink = 	CreateMultiForwardEx("client_prethink", 	ET_IGNORE, FORWARD_ONLY_OLD, FP_CELL)
+	g_FwdClientPostThink =	CreateMultiForwardEx("client_postthink", 	ET_IGNORE, FORWARD_ONLY_OLD, FP_CELL)
+	g_FwdEmitSound = 		CreateMultiForwardEx("emitsound", 			ET_STOP, FORWARD_ONLY_OLD, FP_CELL, FP_STRING)
+	g_FwdEmitAmbientSound = CreateMultiForwardEx("emitambientsound",	ET_STOP, FORWARD_ONLY_OLD, FP_CELL, FP_STRING)
+	g_FwdSetModel = 		CreateMultiForwardEx("set_model", 			ET_STOP, FORWARD_ONLY_OLD, FP_CELL, FP_STRING)
+	g_FwdTraceLine = 		CreateMultiForwardEx("traceline", 			ET_STOP, FORWARD_ONLY_OLD, FP_CELL)
+	g_FwdSetCliKeyValue =	CreateMultiForwardEx("setclientkeyvalue",	ET_STOP, FORWARD_ONLY_OLD, FP_CELL, FP_STRING, FP_STRING)
+	g_FwdKeyValue = 		CreateMultiForwardEx("keyvalue", 			ET_STOP, FORWARD_ONLY_OLD, FP_CELL)
 }
 
 VexdUM_Natives()

plugins/cstrike/miscstats.sma

@@ -34,6 +34,7 @@
 
 #include <amxmodx>
 #include <csx>
+#include <cstrike>
 
 public MultiKill
 public MultiKillSound
@@ -309,35 +310,55 @@ public client_death(killer, victim, wpnindex, hitplace, TK)
 		}
 	}
 
-	if (EnemyRemaining)
+	if (EnemyRemaining && is_user_connected(victim))
 	{
-		new ppl[32], pplnum = 0
-		new team = get_user_team(victim) - 1
+		new ppl[32], pplnum = 0, maxplayers = get_maxplayers()
+		new epplnum = 0
+		new CsTeams:team = cs_get_user_team(victim)
+		new CsTeams:other_team
+		new CsTeams:enemy_team = (team == CS_TEAM_T) ? CS_TEAM_CT : CS_TEAM_T
 		
-		if (team >= 0 && team < 4)
-			get_players(ppl, pplnum, "e", g_teamsNames[1 - team])
-		
-		if (pplnum)
+		if (team == CS_TEAM_T || team == CS_TEAM_CT)
 		{
-			new eppl[32], epplnum
-			
-			if (team >= 0 && team < 4)
+			for (new i=1; i<=maxplayers; i++)
 			{
-				get_players(eppl, epplnum, "ae", g_teamsNames[team])
-
-				if (epplnum)
+				if (!is_user_connected(i))
 				{
-					new message[128], team_name[32]
+					continue
+				}
+				if (i == victim)
+				{
+					continue
+				}
+				other_team = cs_get_user_team(i)
+				if (other_team == team && is_user_alive(i))
+				{
+					epplnum++
+				} else if (other_team == enemy_team) {
+					ppl[pplnum++] = i
+				}
+			}
+			
+			if (pplnum && epplnum)
+			{
+				new message[128], team_name[32]
 
-					set_hudmessage(255, 255, 255, 0.02, 0.85, 2, 0.05, 0.1, 0.02, 3.0, -1)
+				set_hudmessage(255, 255, 255, 0.02, 0.85, 2, 0.05, 0.1, 0.02, 3.0, -1)
+				
+				/* This is a pretty stupid thing to translate, but whatever */
+				new _teamname[32]
+				if (team == CS_TEAM_T)
+				{
+					format(_teamname, 31, "TERRORIST%s", (epplnum == 1) ? "" : "S")
+				} else if (team == CS_TEAM_CT) {
+					format(_teamname, 31, "CT%s", (epplnum == 1) ? "" : "S")
+				}
 
-					for (new a = 0; a < pplnum; ++a)
-					{
-						format(team_name, 31, "%L", ppl[a], (epplnum == 1) ? g_teamsNames[team] : g_teamsNames[team + 2])
-						format(message, 127, "%L", ppl[a], "REMAINING", epplnum, team_name)
-
-						ShowSyncHudMsg(ppl[a], g_bottom_sync, "%s", message)
-					}
+				for (new a = 0; a < pplnum; ++a)
+				{
+					format(team_name, 31, "%L", ppl[a], _teamname)
+					format(message, 127, "%L", ppl[a], "REMAINING", epplnum, team_name)
+					ShowSyncHudMsg(ppl[a], g_bottom_sync, "%s", message)
 				}
 			}
 		}
@@ -346,9 +367,23 @@ public client_death(killer, victim, wpnindex, hitplace, TK)
 	if (LastMan)
 	{
 		new cts[32], ts[32], ctsnum, tsnum
+		new maxplayers = get_maxplayers()
+		new CsTeams:team
 		
-		get_players(cts, ctsnum, "ae", g_teamsNames[1])
-		get_players(ts, tsnum, "ae", g_teamsNames[0])
+		for (new i=1; i<=maxplayers; i++)
+		{
+			if (!is_user_connected(i) || !is_user_alive(i))
+			{
+				continue
+			}
+			team = cs_get_user_team(i)
+			if (team == CS_TEAM_T)
+			{
+				ts[tsnum++] = i
+			} else if (team == CS_TEAM_CT) {
+				cts[ctsnum++] = i
+			}
+		}
 		
 		if (ctsnum == 1 && tsnum == 1)
 		{
@@ -364,19 +399,19 @@ public client_death(killer, victim, wpnindex, hitplace, TK)
 		}
 		else if (!g_LastAnnounce)
 		{
-			new oposite = 0, team = 0
+			new oposite = 0, _team = 0
 			
 			if (ctsnum == 1 && tsnum > 1)
 			{
 				g_LastAnnounce = cts[0]
 				oposite = tsnum
-				team = 0
+				_team = 0
 			}
 			else if (tsnum == 1 && ctsnum > 1)
 			{
 				g_LastAnnounce = ts[0]
 				oposite = ctsnum
-				team = 1
+				_team = 1
 			}
 
 			if (g_LastAnnounce)
@@ -386,10 +421,12 @@ public client_death(killer, victim, wpnindex, hitplace, TK)
 				get_user_name(g_LastAnnounce, name, 31)
 				
 				set_hudmessage(0, 255, 255, -1.0, 0.35, 0, 6.0, 6.0, 0.5, 0.15, -1)
-				ShowSyncHudMsg(0, g_center1_sync, "%s (%d HP) vs. %d %s%s: %L", name, get_user_health(g_LastAnnounce), oposite, g_teamsNames[team], (oposite == 1) ? "" : "S", LANG_PLAYER, g_LastMessages[random_num(0, 3)])
+				ShowSyncHudMsg(0, g_center1_sync, "%s (%d HP) vs. %d %s%s: %L", name, get_user_health(g_LastAnnounce), oposite, g_teamsNames[_team], (oposite == 1) ? "" : "S", LANG_PLAYER, g_LastMessages[random_num(0, 3)])
 				
 				if (!is_user_connecting(g_LastAnnounce))
+				{
 					client_cmd(g_LastAnnounce, "spk misc/oneandonly")
+				}
 			}
 		}
 	}
@@ -588,6 +625,11 @@ public checkKills(param[])
 		
 		if (a > -1)
 		{
+			if (a > 6)
+			{
+				a = 6
+			}
+			
 			if (MultiKill)
 			{
 				new name[32]
@@ -595,9 +637,6 @@ public checkKills(param[])
 				get_user_name(id, name, 31)
 				set_hudmessage(255, 0, 100, 0.05, 0.50, 2, 0.02, 6.0, 0.01, 0.1, -1)
 				
-				if (a > 6)
-					a = 6
-				
 				ShowSyncHudMsg(0, g_left_sync, g_MultiKillMsg[a], name, LANG_PLAYER, "WITH", g_multiKills[id][0], LANG_PLAYER, "KILLS", g_multiKills[id][1], LANG_PLAYER, "HS")
 			}
 			

plugins/cstrike/restmenu.sma

@@ -45,8 +45,20 @@ new g_Modified
 new g_blockPos[112]
 new g_saveFile[64]
 new g_Restricted[] = "* This item is restricted *"
-new g_szWeapRestr[27] = "0000000000000000000000000"
+new g_szWeapRestr[27] = "00000000000000000000000000"
 new g_szEquipAmmoRestr[10] = "000000000"
+new g_InBuyMenu[33]
+new g_RegisteredMenus[10]
+
+new g_menuStrings[6][] =
+{
+	"BuyPistol",
+	"BuyShotgun",
+	"BuySubMachineGun",
+	"BuyRifle",
+	"BuyMachineGun",
+	"BuyItem"
+}
 
 new g_menusNames[7][] =
 {
@@ -295,6 +307,19 @@ new g_Aliases2[MAXMENUPOS][] =
 new g_Autobuy[33][AUTOBUYLENGTH + 1]
 //new g_Rebuy[33][AUTOBUYLENGTH + 1]
 
+bool:IsOurMenuID(id)
+{
+	for (new i=1; i<=g_RegisteredMenus[0]; i++)
+	{
+		if (g_RegisteredMenus[i] == id)
+		{
+			return true
+		}
+	}
+	
+	return false
+}
+
 setWeapon(a, action)
 {
 	new b, m = g_Keys[a][0] * 8
@@ -605,7 +630,30 @@ public client_command(id)
 		new arg[13]
 
 		if (read_argv(0, arg, 12) > 11)		/* Longest buy command has 11 chars so if command is longer then don't care */
+		{
 			return PLUGIN_CONTINUE
+		}
+		
+		if (equali(arg, "menuselect") && is_user_connected(id))
+		{
+			new menu, newmenu
+			new inMenu = player_menu_info(id, menu, newmenu)
+			
+			if (!inMenu && g_InBuyMenu[id])
+			{
+				new key[12], num
+				
+				read_argv(1, key, 11)
+				num = str_to_num(key) - 1
+				
+				return checkRest(id, g_InBuyMenu[id], num)
+			} else if ((!menu || newmenu != -1) 
+					 || !IsOurMenuID(menu)) {
+				g_InBuyMenu[id] = 0
+			}
+
+			return PLUGIN_CONTINUE
+		}
 
 		new a = 0
 
@@ -631,7 +679,9 @@ public blockcommand(id)
 public cmdMenu(id, level, cid)
 {
 	if (cmd_access(id, level, cid, 1))
-			displayMenu(id, g_Position[id] = 0)
+	{
+		displayMenu(id, g_Position[id] = 0)
+	}
 	
 	return PLUGIN_HANDLED
 }
@@ -641,9 +691,18 @@ checkRest(id, menu, key)
 	new team = get_user_team(id)
 	
 	if (team != 1 && team != 2)
+	{
 		return PLUGIN_HANDLED
+	}
+		
+	new pos = (menu * 8 + key) + (get_user_team(id) - 1) * 56
 	
-	if (g_blockPos[(menu * 8 + key) + (get_user_team(id) - 1) * 56])
+	if (pos < 0 || pos >= 112)
+	{
+		return PLUGIN_CONTINUE
+	}
+	
+	if (g_blockPos[pos])
 	{
 		engclient_cmd(id, "menuselect", "10")
 		client_print(id, print_center, "%s", g_Restricted)
@@ -799,6 +858,70 @@ public fn_autobuy(id)
 	return PLUGIN_HANDLED
 }
 
+public HookEvent_ShowMenu(id)
+{
+	new menustring[24]
+	
+	read_data(4, menustring, 23)
+	
+	/* Early breakouts */
+	new curidx
+	if (menustring[curidx++] != '#')
+	{
+		g_InBuyMenu[id] = 0
+		return
+	}
+	
+	/* Strip D */
+	if (menustring[curidx] == 'D')
+	{
+		curidx++
+	}
+	
+	/* Strip AS_ */
+	if (menustring[curidx] == 'A'
+	    && menustring[curidx+1] == 'S'
+	    && menustring[curidx+2] == '_')
+	{
+		curidx += 3
+	}
+	
+	/* Strip any team tags */
+	if (menustring[curidx] == 'C'
+	    && menustring[curidx+1] == 'T'
+	    && menustring[curidx+2] == '_')
+	{
+		curidx += 3
+	} else if (menustring[curidx] == 'T'
+			 && menustring[curidx+1] == '_') {
+		curidx += 2
+	}
+	
+	if (menustring[curidx] != 'B')
+	{
+		g_InBuyMenu[id] = 0
+		return
+	}
+	
+	for (new i=0; i<6; i++)
+	{
+		if (equali(menustring[curidx], g_menuStrings[i]))
+		{
+			g_InBuyMenu[id] = i+1
+			return
+		}
+	}
+	
+	g_InBuyMenu[id] = 0
+}
+
+RegisterMenuID(const menuname[])
+{
+	new id = register_menuid(menuname, 1)
+	g_RegisteredMenus[++g_RegisteredMenus[0]] = id
+	return id
+}
+
 public plugin_init()
 {
 	register_plugin("Restrict Weapons", AMXX_VERSION_STR, "AMXX Dev Team")
@@ -811,12 +934,12 @@ public plugin_init()
 	register_clcmd("amx_restmenu", "cmdMenu", ADMIN_CFG, "- displays weapons restriction menu")
 	register_menucmd(register_menuid("#Buy", 1), 511, "menuBuy")
 	register_menucmd(register_menuid("Restrict Weapons"), 1023, "actionMenu")
-	register_menucmd(register_menuid("BuyPistol", 1), 511, "menuPistol")
-	register_menucmd(register_menuid("BuyShotgun", 1), 511, "menuShotgun")
-	register_menucmd(register_menuid("BuySub", 1), 511, "menuSub")
-	register_menucmd(register_menuid("BuyRifle", 1), 511, "menuRifle")
-	register_menucmd(register_menuid("BuyMachine", 1), 511, "menuMachine")
-	register_menucmd(register_menuid("BuyItem", 1), 511, "menuItem")
+	register_menucmd(RegisterMenuID("BuyPistol"), 511, "menuPistol")
+	register_menucmd(RegisterMenuID("BuyShotgun"), 511, "menuShotgun")
+	register_menucmd(RegisterMenuID("BuySub"), 511, "menuSub")
+	register_menucmd(RegisterMenuID("BuyRifle"), 511, "menuRifle")
+	register_menucmd(RegisterMenuID("BuyMachine"), 511, "menuMachine")
+	register_menucmd(RegisterMenuID("BuyItem"), 511, "menuItem")
 	register_menucmd(-28, 511, "menuBuy")
 	register_menucmd(-29, 511, "menuPistol")
 	register_menucmd(-30, 511, "menuShotgun")
@@ -828,6 +951,8 @@ public plugin_init()
 
 	register_cvar("amx_restrweapons", "00000000000000000000000000")
 	register_cvar("amx_restrequipammo", "000000000")
+	
+	register_event("ShowMenu", "HookEvent_ShowMenu", "b")
 
 	new configsDir[64];
 	get_configsdir(configsDir, 63);

plugins/cstrike/statsx.sma

@@ -204,7 +204,7 @@ public plugin_init()
 	register_clcmd("say /me", "cmdMe", 0, "- display current round stats (chat)")
 	register_clcmd("say /score", "cmdScore", 0, "- display last score (chat)")
 	register_clcmd("say /rank", "cmdRank", 0, "- display your rank (chat)")
-	register_clcmd("say /report", "cmdReport", 0, "- display waepon status (say_team)")
+	register_clcmd("say /report", "cmdReport", 0, "- display weapon status (say_team)")
 	register_clcmd("say /top15", "cmdTop15", 0, "- display top 15 players (MOTD)")
 	register_clcmd("say /stats", "cmdStats", 0, "- display players stats (menu/MOTD)")
 	register_clcmd("say /switch", "cmdSwitch", 0, "- switch client's stats on or off")
@@ -214,7 +214,7 @@ public plugin_init()
 	register_clcmd("say_team /me", "cmdMe", 0, "- display current round stats (chat)")
 	register_clcmd("say_team /score", "cmdScore", 0, "- display last score (chat)")
 	register_clcmd("say_team /rank", "cmdRank", 0, "- display your rank (chat)")
-	register_clcmd("say_team /report", "cmdReport", 0, "- display waepon status (say_team_team)")
+	register_clcmd("say_team /report", "cmdReport", 0, "- display weapon status (say_team_team)")
 	register_clcmd("say_team /top15", "cmdTop15", 0, "- display top 15 players (MOTD)")
 	register_clcmd("say_team /stats", "cmdStats", 0, "- display players stats (menu/MOTD)")
 	register_clcmd("say_team /switch", "cmdSwitch", 0, "- switch client's stats on or off")

plugins/dod/stats.sma

@@ -425,7 +425,7 @@ showStatsMenu(id,pos){
   }
 
   else len += format(menu_body[len],511-len,"^n0. %s" , pos ? "Back" : "Exit" )
-  show_menu(id,keys,menu_body)
+  show_menu(id,keys,menu_body,-1,"Server Stats")
   return PLUGIN_HANDLED
 }
 
@@ -758,6 +758,8 @@ public client_death(killer,victim,wpnindex,hitplace,TK)
 }
 
 public showDoubleKill(){ 
+  if (g_KillCount < 2)
+    return
   new pos = g_KillCount - 2
   if ( pos > 2 ) pos = 2
   if ( DoubleKill ) {

plugins/include/amxconst.inc

@@ -11,9 +11,9 @@
 #endif
 #define _amxconst_included
 
-#define AMXX_VERSION		1.761
+#define AMXX_VERSION		1.763
 #define AMXX_VERSION_NUM	176
-stock const AMXX_VERSION_STR[]="1.76a"
+stock const AMXX_VERSION_STR[]="1.76c"
 
 #define M_PI 3.1415926535
 
@@ -264,6 +264,7 @@ enum {
 #define AMX_ERR_DIVIDE		11
 #define AMX_ERR_NOTFOUND	19
 #define AMX_ERR_PARAMS		25
+#define AMX_ERR_GENERAL		27
 
 #define	INVALID_HANDLE		-1
 
@@ -277,6 +278,10 @@ enum {
 #define FP_STRING		2
 #define FP_ARRAY		4
 
+#define FORWARD_ONLY_OLD	1
+#define FORWARD_ONLY_NEW	2
+#define FORWARD_ALL		3
+
 #define MEXIT_ALL	1
 #define MEXIT_NORMAL	0
 #define MEXIT_NEVER	-1

plugins/include/amxmod_compat/VexdUM_stock.inc

@@ -71,8 +71,8 @@ stock can_see(ent1, ent2)
 			return 0;
 		} else {
 			new Float:flFraction;
-			get_tr2(0, TraceResult:TR_Fraction, flFraction);
-			if (flFraction == 1.0 || (get_tr2(0, TraceResult:TR_Hit) == ent2))
+			get_tr2(0, TraceResult:TR_flFraction, flFraction);
+			if (flFraction == 1.0 || (get_tr2(0, TraceResult:TR_pHit) == ent2))
 			{
 				return 1;
 			}

plugins/include/amxmod_compat/Vexd_Utilities.inc

@@ -11,6 +11,11 @@
 #define _Vexd_Utilities_included
 
 #include <engine>
+#if defined AMXMOD_BCOMPAT
+#if !defined _vexd_bcompat_included
+#include <VexdUM>
+#endif
+#endif
 
 stock Entvars_Get_Int(iIndex, iVariable)
 	return entity_get_int(iIndex, iVariable)

plugins/include/amxmod_compat/xtrafun.inc

@@ -81,6 +81,7 @@ enum {
    targetname
 }
 
+#if !defined _vexd_bcompat_included
 /* Find an entity ID from start_from_ent id (use 0 to start from
  * the beginning, category is either "classname", "target" or
  * "targetname", value is the name you are searching for */
@@ -91,5 +92,6 @@ stock find_entity(start_from_ent, category, value[]) {
 	}
 	return find_ent_by_class(start_from_ent, value)
 }
+#endif
 
 #endif // _xtrafun_included

plugins/include/amxmodx.inc

@@ -204,8 +204,10 @@ native is_jit_enabled();
 native get_amxx_verstring(buffer[], length);
 
 /* If player is not attacked function returns 0, in other
-* case returns index of attacking player. On second and third
-* parameter you may get info about weapon and body hit place. */
+ * case returns index of attacking player. On second and third
+ * parameter you may get info about weapon and body hit place.
+ * As of 1.75, get_user_attacker can return a non-player index if the player was attacked by a non-player entity. 
+ */
 native get_user_attacker(index,...);
 
 /* If player doesn't hit at anything function returns 0.0,
@@ -471,13 +473,19 @@ native get_user_flags(index,id=0);
 /* Removes flags for player. */
 native remove_user_flags(index,flags=-1,id=0);
 
-/* Registers function which will be called from client console. */
+/* Registers function which will be called from client console. 
+ * Returns the command ID.
+ */
 native register_clcmd(const client_cmd[],const function[],flags=-1, info[]="");
 
-/* Registers function which will be called from any console. */
+/* Registers function which will be called from any console. 
+ * Returns the command ID.
+ */
 native register_concmd(const cmd[],const function[],flags=-1, info[]="");
 
-/* Registers function which will be called from server console. */
+/* Registers function which will be called from server console. 
+ * Returns the command ID.
+ */
 native register_srvcmd(const server_cmd[],const function[],flags=-1, info[]="");
 
 /* Gets info about client command. */
@@ -1014,11 +1022,20 @@ native set_addr_val(addr, val);
 
 
 /**
- * creates a multi-plugin forward.
+ * Creates a multi-plugin forward.
+ * Stop type must be one of the ET_ values in amxconst.inc
  * results will be > 0 for success
  */
 native CreateMultiForward(const name[], stop_type, ...);
 
+/**
+ * Creates a multi-forward plugin that can filter between old/new plugins.
+ * Old plugins are used by the AMX Mod backwards compatibility layer.
+ * Stop type must be one of the ET_ values in amxconst.inc
+ * Forward type must be one of the FORWARD_ values in amxconst.inc.
+ */
+native CreateMultiForwardEx(const name[], stop_type, forward_type, ...);
+
 /**
  * Creates a forward for one plugin.
  * Results will be > 0 for success.

plugins/include/engine.inc

@@ -226,8 +226,10 @@ forward pfn_spawn(entid);
  */
 native find_sphere_class(aroundent, _lookforclassname[], Float:radius, entlist[], maxents, Float:origin[3] = {0.0, 0.0, 0.0});
 
-//SDK function - checks if an origin is in an entity's view cone
-native is_in_viewcone(entity, Float:origin[3]);
+/* SDK function - checks if an origin is in an entity's view cone
+ * Set use3d to 1 to do the calculation in 3D. Otherwise it will be in 2D.
+ */
+native is_in_viewcone(entity, Float:origin[3], use3d = 0);
 
 //SDK function - checks if an entity is visible to an entity
 native is_visible(entity, target);

plugins/include/file.inc

@@ -29,8 +29,11 @@ native delete_file(const file[]);
 native file_exists(const file[]);
 
 /* renames a file.  returns 0 on failure, 1 on success.
+ * if relative true, rename_file will act like other natives which 
+ * use the moddir as a base directory.  otherwise, the current directory is 
+ * undefined (but assumed to be hlds).
  */
-native rename_file(const oldname[], const newname[]);
+native rename_file(const oldname[], const newname[], relative=0);
 
 /* Checks if a directory exists */
 native dir_exists(const dir[]);

plugins/include/geoip.inc

@@ -3,7 +3,7 @@
    (C)Copyrighted under the GNU General Public License, Version 2
  */
 
-#if defined geoip_included
+#if defined _geoip_included
   #endinput
 #endif
 #define _geoip_included
@@ -22,7 +22,7 @@
 //get a two character country code (eg US, CA etc)
 native geoip_code2(ip[], ccode[3]);
 
-//get a three character country code (eg USA, cAN etc)
+//get a three character country code (eg USA, CAN etc)
 native geoip_code3(ip[], result[4]);
 
 //get a full country name.  max name is 45 chars

plugins/include/sqlx.inc

@@ -30,8 +30,12 @@ enum Handle
  * !!NOTE!! I have seen most people think that this connects to the DB.
  *   Nowhere does it say this, and in fact it does not.  It only caches
  *   the connection information, the host/user/pass/etc.
+ *
+ * The optional timeout parameter specifies how long connections should wait before
+ * giving up.  If 0, the default (which is undefined) is used.
+ *
  */
-native Handle:SQL_MakeDbTuple(const host[], const user[], const pass[], const db[]);
+native Handle:SQL_MakeDbTuple(const host[], const user[], const pass[], const db[], timeout=0);
 
 
 /**
@@ -74,8 +78,9 @@ native Handle:SQL_PrepareQuery(Handle:db, const fmt[], {Float,_}:...);
  * @param errnum - An error code, if any.
  * @param data - Data array you passed in.
  * @param size - Size of the data array you passed in.
+ * @param queuetime - Amount of gametime that passed while the query was resolving.
  * 
- * public QueryHandler(failstate, Handle:query, error[], errnum, data[], size)
+ * public QueryHandler(failstate, Handle:query, error[], errnum, data[], size, Float:queuetime)
  *
  * Note! The handle you pass in is a DB Tuple, NOT an active connection!
  * Note! The handle does not need to be freed.
@@ -313,7 +318,7 @@ stock Handle:SQL_MakeStdTuple()
 	get_cvar_string("amx_sql_type", set_type, 11)
 	get_cvar_string("amx_sql_db", db, 127)
 	
-	SQL_GetAffinity(get_type, 12)
+	SQL_GetAffinity(get_type, 11)
 	
 	if (!equali(get_type, set_type))
 	{

plugins/mapchooser.sma

@@ -88,8 +88,10 @@ public checkVotes()
 	for (new a = 0; a < g_mapVoteNum; ++a)
 		if (g_voteCount[b] < g_voteCount[a])
 			b = a
+
 	
-	if (g_voteCount[SELECTMAPS] > g_voteCount[b])
+	if (g_voteCount[SELECTMAPS] > g_voteCount[b]
+	    && g_voteCount[SELECTMAPS] > g_voteCount[SELECTMAPS+1])
 	{
 		new mapname[32]
 		
@@ -103,8 +105,10 @@ public checkVotes()
 	}
 	
 	if (g_voteCount[b] && g_voteCount[SELECTMAPS + 1] <= g_voteCount[b])
+	{
 		set_cvar_string("amx_nextmap", g_mapName[g_nextName[b]])
-	
+	}
+
 	new smap[32]
 	
 	get_cvar_string("amx_nextmap", smap, 31)

plugins/mapsmenu.sma

@@ -56,7 +56,7 @@ public plugin_init()
 	register_dictionary("mapsmenu.txt")
 	register_dictionary("common.txt")
 	register_clcmd("amx_mapmenu", "cmdMapsMenu", ADMIN_MAP, "- displays changelevel menu")
-	register_clcmd("amx_votemapmenu", "cmdVoteMapMenu", ADMIN_MAP, "- displays votemap menu")
+	register_clcmd("amx_votemapmenu", "cmdVoteMapMenu", ADMIN_VOTE, "- displays votemap menu")
 
 	register_menucmd(register_menuid("Changelevel Menu"), 1023, "actionMapsMenu")
 	register_menucmd(register_menuid("Which map do you want?"), 527, "voteCount")

plugins/menufront.sma

@@ -130,7 +130,7 @@ AddDefaultMenus()
 	AddMenuLang("SLAP_SLAY", "amx_slapmenu", ADMIN_SLAY, "Players Menu")
 	AddMenuLang("TEAM_PLAYER", "amx_teammenu", ADMIN_LEVEL_A, "Players Menu")
 	AddMenuLang("CHANGEL", "amx_mapmenu", ADMIN_MAP, "Maps Menu")
-	AddMenuLang("VOTE_MAPS", "amx_votemapmenu", ADMIN_MAP, "Maps Menu")
+	AddMenuLang("VOTE_MAPS", "amx_votemapmenu", ADMIN_VOTE, "Maps Menu")
 	AddMenuLang("SPECH_STUFF", "amx_speechmenu", ADMIN_MENU, "Commands Menu")
 	AddMenuLang("CLIENT_COM", "amx_clcmdmenu", ADMIN_LEVEL_A, "Players Menu")
 	AddMenuLang("SERVER_COM", "amx_cmdmenu", ADMIN_MENU, "Commands Menu")
@@ -140,7 +140,7 @@ AddDefaultMenus()
 	AddMenuLang("STATS_SET", "amx_statscfgmenu", ADMIN_CFG, "Stats Configuration")
 	AddMenuLang("PAUSE_PLUG", "amx_pausecfgmenu", ADMIN_CFG, "Pause Plugins")
 	AddMenuLang("RES_WEAP", "amx_restmenu", ADMIN_CFG, "Restrict Weapons")
-	AddMenuLang("TELE_PLAYER", "amx_teleportmenu", ADMIN_LEVEL_A, "Teleport Menu")
+	AddMenuLang("TELE_PLAYER", "amx_teleportmenu", ADMIN_CFG, "Teleport Menu")
 }
 
 public actionMenu(id, key)

plugins/ns/nscommands.sma

@@ -42,6 +42,7 @@ new g_ReadyRoomAck[12];
 new g_AutoAssignAck[12];
 new g_StopCommAck[12];
 
+
 enum {
   PLAYERCLASS_NONE = 0,
   PLAYERCLASS_ALIVE_MARINE,
@@ -72,6 +73,10 @@ enum {
 
 new g_Class[33]; // stored info from the "ScoreInfo" message
 new g_Team[33];
+
+new g_ScoreInfo_Class;
+new g_ScoreInfo_Team;
+
 public plugin_init() {
   register_plugin("NS Commands",AMXX_VERSION_STR,"AMXX Dev Team");
   // create our semi-random acknowledgement commands
@@ -103,6 +108,19 @@ public plugin_init() {
     i++;
   }
   
+  if (cvar_exists("sv_structurelimit"))
+  {
+    // ns 3.2 beta
+    g_ScoreInfo_Class=6;
+    g_ScoreInfo_Team=8;
+  }
+  else
+  {
+    // ns 3.1
+    g_ScoreInfo_Class=5;
+    g_ScoreInfo_Team=7;
+  }
+  
   // register ScoreInfo message..
   register_event("ScoreInfo","msgScoreInfo","a")
 }
@@ -112,8 +130,8 @@ public msgScoreInfo() {
     // just incase..
     return;
   }
-  g_Class[id]=read_data(5);
-  g_Team[id]=read_data(7);
+  g_Class[id]=read_data(g_ScoreInfo_Class);
+  g_Team[id]=read_data(g_ScoreInfo_Team);
 }
 public client_disconnect(id) {
   g_Class[id]=0;

plugins/pausecfg.sma

@@ -57,7 +57,7 @@ public plugin_init()
 	register_dictionary("common.txt")
 	register_dictionary("admincmd.txt")
 	
-	register_concmd("amx_pausecfg", "cmdPlugin", ADMIN_CFG, "- list commands for pause/unpause managment")
+	register_concmd("amx_pausecfg", "cmdPlugin", ADMIN_CFG, "- list commands for pause/unpause management")
 	register_clcmd("amx_pausecfgmenu", "cmdMenu", ADMIN_CFG, "- pause/unpause plugins with menu")
 #if defined DIRECT_ONOFF
 	register_concmd("amx_off", "cmdOFF", ADMIN_CFG, "- pauses some plugins")
@@ -144,11 +144,6 @@ public actionMenu(id, key)
 			{
 				case 'r': pause("ac", file)
 				case 'p':
-				{
-					g_Modified = 1
-					pause("dc", file)
-				}
-				case 's':
 				{
 					g_Modified = 1
 					unpause("ac", file)

plugins/testsuite/menutest.sma

@@ -6,6 +6,8 @@ public plugin_init()
 
 	register_clcmd("menu_test1", "Test_Menu1")
 	register_clcmd("menu_test2", "Test_Menu2")
+	register_clcmd("menu_test3", "Test_Menu3")
+	register_clcmd("menu_test4", "Test_Menu4")
 }
 
 public Test_Menu1(id, level, cid)
@@ -54,3 +56,73 @@ public Test_Menu1_Handler(id, menu, item)
 	return PLUGIN_HANDLED
 }
 
+public Test_Menu3(id)
+{
+   new mHandleID = menu_create("Test Menu 3", "Test_Menu3_Handler")
+   menu_additem(mHandleID, "test1", "1", 0)
+   menu_additem(mHandleID, "test2", "2", 0)
+   menu_additem(mHandleID, "test3", "3", 0)
+   menu_additem(mHandleID, "test4", "4", 0)
+   menu_additem(mHandleID, "test5", "5", 0)
+   menu_additem(mHandleID, "test6", "6", 0)
+   menu_additem(mHandleID, "test7", "7", 0)
+   menu_additem(mHandleID, "test8", "8", 0)
+   menu_additem(mHandleID, "test9", "9", 0)
+   menu_additem(mHandleID, "test10", "10", 0)
+   menu_additem(mHandleID, "test11", "11", 0)
+   menu_addblank(mHandleID, 1)  // add blank got problem
+
+   menu_display(id, mHandleID, 0)
+   
+   return PLUGIN_HANDLED
+}
+
+public Test_Menu3_Handler(id, menu, item)
+{
+   if (item == MENU_EXIT)
+   {
+	   menu_destroy(menu)
+	   return PLUGIN_HANDLED
+   }
+   
+   client_print(id, print_chat, "item = %d", item)
+   
+   menu_destroy(menu)
+   
+   return PLUGIN_HANDLED
+}
+
+public Test_Menu4(id)
+{
+   new mHandleID = menu_create("Test Menu 4", "Test_Menu4_Handler")
+   menu_setprop(mHandleID, MPROP_PERPAGE, 0)
+   menu_additem(mHandleID, "test1", "1", 0)
+   menu_additem(mHandleID, "test2", "2", 0)
+   menu_additem(mHandleID, "test3", "3", 0)
+   menu_additem(mHandleID, "test4", "4", 0)
+   menu_additem(mHandleID, "test5", "5", 0)
+   menu_additem(mHandleID, "test6", "6", 0)
+   menu_additem(mHandleID, "test7", "7", 0)
+   menu_additem(mHandleID, "test8", "8", 0)
+   menu_additem(mHandleID, "test9", "9", 0)
+   menu_additem(mHandleID, "test10", "10", 0)
+
+   menu_display(id, mHandleID, 0)
+   
+   return PLUGIN_HANDLED
+}
+
+public Test_Menu4_Handler(id, menu, item)
+{
+   if (item == MENU_EXIT)
+   {
+	   menu_destroy(menu)
+	   return PLUGIN_HANDLED
+   }
+   
+   client_print(id, print_chat, "item = %d", item)
+   
+   menu_destroy(menu)
+   
+   return PLUGIN_HANDLED
+}

plugins/testsuite/sqlxtest.sma

@@ -15,6 +15,7 @@ public plugin_init()
 	register_srvcmd("sqlx_test_old1", "SqlxTest_Old1")
 	register_srvcmd("sqlx_test_old2", "SqlxTest_Old2")
 	register_srvcmd("sqlx_test_thread_end", "SqlxTest_ThreadEnd")
+	register_srvcmd("sqlx_test_bad", "SqlxTest_Bad")
 	
 	new configsDir[64]
 	get_configsdir(configsDir, 63)
@@ -73,6 +74,22 @@ public plugin_cfg()
 	g_DbInfo = SQL_MakeDbTuple(host, user, pass, db)
 }
 
+public SqlxTest_Bad()
+{
+	new errnum, error[255]
+	new Handle:tempinfo = SQL_MakeDbTuple("1.2.3.4", "asdf", "gasdf", "gaben", 2)
+	new Handle:db = SQL_Connect(tempinfo, errnum, error, 254)
+	
+	if (db == Empty_Handle)
+	{
+		server_print(" --> Errored out! %d, %s", errnum, error)
+	} else {
+		server_print(" --> Something is wrong here.")
+	}
+	
+	return PLUGIN_HANDLED
+}
+
 /**
  * Note that this function works for both threaded and non-threaded queries.
  */
@@ -106,18 +123,22 @@ PrintQueryData(Handle:query)
 /**
  * Handler for when a threaded query is resolved.
  */
-public GetMyStuff(failstate, Handle:query, error[], errnum, data[], size)
+public GetMyStuff(failstate, Handle:query, error[], errnum, data[], size, Float:queuetime)
 {
-	server_print("Resolved query %d at: %f", data[0], get_gametime())
+	server_print(" --> Resolved query %d, took %f seconds", data[0], queuetime)
 	if (failstate)
 	{
 		if (failstate == TQUERY_CONNECT_FAILED)
 		{
-			server_print("Connection failed!")
+			server_print(" --> Connection failed!")
 		} else if (failstate == TQUERY_QUERY_FAILED) {
-			server_print("Query failed!")
+			server_print(" --> Query failed!")
 		}
-		server_print("Error code: %d (Message: ^"%s^")", errnum, error)
+		server_print(" --> Error code: %d (Message: ^"%s^")", errnum, error)
+		
+		new querystring[1024]
+		SQL_GetQueryString(query, querystring, 1023)
+		server_print(" --> Original query: %s", querystring)
 	} else {
 		PrintQueryData(query)
 	}