GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-26 23:05:37 +03:00
Code Issues Projects Releases Wiki Activity

An optional array parameter (LIKE TEH TASKS ONE) can be now passed to cvar query handlers

Browse Source
This commit is contained in:
Pavol Marko 2005-09-06 10:12:02 +00:00
parent 2f27b7da8d
commit 6bebf37f1a
4 changed files with 133 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amxmodx/CMisc.cpp
View File

@ -64,6 +64,8 @@ void CPlayer::Disconnect() {
{ {
ClientCvarQuery_Info *pQuery = cvarQueryQueue.front(); ClientCvarQuery_Info *pQuery = cvarQueryQueue.front();
unregisterSPForward(pQuery->resultFwd); unregisterSPForward(pQuery->resultFwd);
if (pQuery->params)
delete [] pQuery->params;
delete pQuery; delete pQuery;
cvarQueryQueue.pop(); cvarQueryQueue.pop();
} }

3
amxmodx/CMisc.h
View File

@ -67,6 +67,9 @@ struct ClientCvarQuery_Info
bool querying; // Are we actually waiting for a response at the moment? bool querying; // Are we actually waiting for a response at the moment?
String cvarName; String cvarName;
int resultFwd; int resultFwd;
int paramLen;
cell *params;
}; };
class CPlayer class CPlayer

39
amxmodx/amxmodx.cpp
View File

@ -2928,6 +2928,13 @@ static cell AMX_NATIVE_CALL int3(AMX *amx, cell *params)
// native query_client_cvar(id, const cvar[], const resultfunc[]) // native query_client_cvar(id, const cvar[], const resultfunc[])
static cell AMX_NATIVE_CALL query_client_cvar(AMX *amx, cell *params) static cell AMX_NATIVE_CALL query_client_cvar(AMX *amx, cell *params)
{ {
int numParams = params[0] / sizeof(cell);
if (numParams != 3 && numParams != 5)
{
LogError(amx, AMX_ERR_NATIVE, "Invalid number of parameters passed!");
return 0;
}
if (!g_NewDLL_Available) if (!g_NewDLL_Available)
{ {
LogError(amx, AMX_ERR_NATIVE, "NewDLL functions are not available. Blame (your) metamod (version)"); LogError(amx, AMX_ERR_NATIVE, "NewDLL functions are not available. Blame (your) metamod (version)");
@ -2953,8 +2960,13 @@ static cell AMX_NATIVE_CALL query_client_cvar(AMX *amx, cell *params)
const char *cvarname = get_amxstring(amx, params[2], 0, dummy); const char *cvarname = get_amxstring(amx, params[2], 0, dummy);
const char *resultfuncname = get_amxstring(amx, params[3], 1, dummy); const char *resultfuncname = get_amxstring(amx, params[3], 1, dummy);
// public clientcvarquery_result(id, const cvar[], const result[]) // public clientcvarquery_result(id, const cvar[], const result[], [const param[]])
int iFunc = registerSPForwardByName(amx, resultfuncname, FP_CELL, FP_STRING, FP_STRING, FP_DONE); int iFunc;
if (numParams == 5 && params[4] != 0)
iFunc = registerSPForwardByName(amx, resultfuncname, FP_CELL, FP_STRING, FP_STRING, FP_ARRAY, FP_DONE);
else
iFunc = registerSPForwardByName(amx, resultfuncname, FP_CELL, FP_STRING, FP_STRING, FP_DONE);
if (iFunc == -1) if (iFunc == -1)
{ {
LogError(amx, AMX_ERR_NATIVE, "Function \"%s\" is not present", resultfuncname); LogError(amx, AMX_ERR_NATIVE, "Function \"%s\" is not present", resultfuncname);
@ -2966,6 +2978,29 @@ static cell AMX_NATIVE_CALL query_client_cvar(AMX *amx, cell *params)
queryObject->cvarName.assign(cvarname); queryObject->cvarName.assign(cvarname);
queryObject->resultFwd = iFunc; queryObject->resultFwd = iFunc;
if (numParams == 5 && params[4] != 0)
{
queryObject->paramLen = params[4] + 1;
queryObject->params = new cell[ queryObject->paramLen ];
if (!queryObject->params)
{
delete queryObject;
unregisterSPForward(iFunc);
LogError(amx, AMX_ERR_MEMORY, "Hmm. Out of memory?");
return 0;
}
memcpy(reinterpret_cast<void*>(queryObject->params),
reinterpret_cast<const void *>(get_amxaddr(amx, params[5])),
queryObject->paramLen * sizeof(cell));
queryObject->params[queryObject->paramLen - 1] = 0;
}
else
{
queryObject->params = NULL;
queryObject->paramLen = 0;
}
pPlayer->cvarQueryQueue.push(queryObject); pPlayer->cvarQueryQueue.push(queryObject);
return 1; return 1;

10
amxmodx/meta_api.cpp
View File

@ -1031,8 +1031,18 @@ void C_CvarValue(const edict_t *pEdict, const char *value)
if (pPlayer->cvarQueryQueue.front()->querying) if (pPlayer->cvarQueryQueue.front()->querying)
{ {
if (pQuery->paramLen)
{
cell arr = prepareCellArray(pQuery->params, pQuery->paramLen);
executeForwards(pQuery->resultFwd, ENTINDEX(pEdict), pQuery->cvarName.c_str(), value, arr);
}
else
executeForwards(pQuery->resultFwd, ENTINDEX(pEdict), pQuery->cvarName.c_str(), value); executeForwards(pQuery->resultFwd, ENTINDEX(pEdict), pQuery->cvarName.c_str(), value);
unregisterSPForward(pQuery->resultFwd); unregisterSPForward(pQuery->resultFwd);
if (pQuery->params)
delete [] pQuery->params;
delete pQuery; delete pQuery;
pPlayer->cvarQueryQueue.pop(); pPlayer->cvarQueryQueue.pop();
RETURN_META(MRES_HANDLED); RETURN_META(MRES_HANDLED);