Merge.
This commit is contained in:
commit
fe2721e04e
@ -509,6 +509,24 @@ static cell_t sm_ResetConVar(IPluginContext *pContext, const cell_t *params)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static cell_t GetConVarDefault(IPluginContext *pContext, const cell_t *params)
|
||||||
|
{
|
||||||
|
Handle_t hndl = static_cast<Handle_t>(params[1]);
|
||||||
|
HandleError err;
|
||||||
|
ConVar *pConVar;
|
||||||
|
|
||||||
|
if ((err=g_ConVarManager.ReadConVarHandle(hndl, &pConVar))
|
||||||
|
!= HandleError_None)
|
||||||
|
{
|
||||||
|
return pContext->ThrowNativeError("Invalid convar handle %x (error %d)", hndl, err);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t bytes;
|
||||||
|
pContext->StringToLocalUTF8(params[2], params[3], pConVar->GetDefault(), &bytes);
|
||||||
|
|
||||||
|
return bytes;
|
||||||
|
}
|
||||||
|
|
||||||
static cell_t sm_GetConVarFlags(IPluginContext *pContext, const cell_t *params)
|
static cell_t sm_GetConVarFlags(IPluginContext *pContext, const cell_t *params)
|
||||||
{
|
{
|
||||||
Handle_t hndl = static_cast<Handle_t>(params[1]);
|
Handle_t hndl = static_cast<Handle_t>(params[1]);
|
||||||
@ -1406,6 +1424,7 @@ REGISTER_NATIVES(consoleNatives)
|
|||||||
{"GetConVarBounds", sm_GetConVarBounds},
|
{"GetConVarBounds", sm_GetConVarBounds},
|
||||||
{"SetConVarBounds", sm_SetConVarBounds},
|
{"SetConVarBounds", sm_SetConVarBounds},
|
||||||
{"QueryClientConVar", sm_QueryClientConVar},
|
{"QueryClientConVar", sm_QueryClientConVar},
|
||||||
|
{"GetConVarDefault", GetConVarDefault},
|
||||||
{"RegServerCmd", sm_RegServerCmd},
|
{"RegServerCmd", sm_RegServerCmd},
|
||||||
{"RegConsoleCmd", sm_RegConsoleCmd},
|
{"RegConsoleCmd", sm_RegConsoleCmd},
|
||||||
{"GetCmdArgString", sm_GetCmdArgString},
|
{"GetCmdArgString", sm_GetCmdArgString},
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
"Burn"
|
"Burn"
|
||||||
{
|
{
|
||||||
"library" "server"
|
"library" "server"
|
||||||
"windows" "\x56\x8B\xF1\x8B\x8E\x2A\x2A\x00\x00\x8B\x01\x8B\x90\x2A\x2A\x00\x00\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x8B"
|
"windows" "\x56\x8B\xF1\x8B\x8E\x2A\x2A\x00\x00\x8B\x01\x8B\x90\x2A\x2A\x00\x00\xFF\xD2\x84\xC0\x0F\x2A\x2A\x2A\x2A\x2A\x8B\x2A\x2A\x2A\x2A\x2A\x8B\xC8\xC1"
|
||||||
"linux" "@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
|
"linux" "@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
|
||||||
"mac" "@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
|
"mac" "@_ZN15CTFPlayerShared4BurnEP9CTFPlayerP13CTFWeaponBase"
|
||||||
}
|
}
|
||||||
@ -67,14 +67,14 @@
|
|||||||
"AddCondition"
|
"AddCondition"
|
||||||
{
|
{
|
||||||
"library" "server"
|
"library" "server"
|
||||||
"windows" "\x56\x57\x8B\x7C\x2A\x2A\x8B\xF1\x8B\xCF\xBA\x01\x00\x00\x00\xD3\xE2\x8D\x46\x2A\x8D\x4C\x2A\x2A\x51\x0B\x10"
|
"windows" "\x56\x57\x8B\x7C\x2A\x2A\x8B\xF1\x8B\xCF\xBA\x01\x00\x00\x00\xD3\xE2\x8D\x86\x2A\x2A\x2A\x2A\x8D\x4C\x2A\x2A\x51\x0B\x10\x8B"
|
||||||
"linux" "@_ZN15CTFPlayerShared7AddCondEif"
|
"linux" "@_ZN15CTFPlayerShared7AddCondEif"
|
||||||
"mac" "@_ZN15CTFPlayerShared7AddCondEif"
|
"mac" "@_ZN15CTFPlayerShared7AddCondEif"
|
||||||
}
|
}
|
||||||
"RemoveCondition"
|
"RemoveCondition"
|
||||||
{
|
{
|
||||||
"library" "server"
|
"library" "server"
|
||||||
"windows" "\x56\x57\x8B\x7C\x2A\x2A\x8B\xF1\x8B\xCF\xBA\x01\x00\x00\x00\xD3\xE2\x8D\x46\x2A\x8D\x4C\x2A\x2A\x51\xF7\xD2"
|
"windows" "\x56\x57\x8B\x7C\x2A\x2A\x8B\xF1\x8B\xCF\xBA\x01\x00\x00\x00\xD3\xE2\x8D\x86\x2A\x2A\x2A\x2A\x8D\x4C\x2A\x2A\x51\xF7\xD2\x23"
|
||||||
"linux" "@_ZN15CTFPlayerShared10RemoveCondEi"
|
"linux" "@_ZN15CTFPlayerShared10RemoveCondEi"
|
||||||
"mac" "@_ZN15CTFPlayerShared10RemoveCondEi"
|
"mac" "@_ZN15CTFPlayerShared10RemoveCondEi"
|
||||||
}
|
}
|
||||||
|
@ -593,6 +593,17 @@ native SetConVarString(Handle:convar, const String:value[], bool:replicate=false
|
|||||||
*/
|
*/
|
||||||
native ResetConVar(Handle:convar, bool:replicate=false, bool:notify=false);
|
native ResetConVar(Handle:convar, bool:replicate=false, bool:notify=false);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves the default string value of a console variable.
|
||||||
|
*
|
||||||
|
* @param convar Handle to the convar.
|
||||||
|
* @param value Buffer to store the default value of the convar.
|
||||||
|
* @param maxlength Maximum length of string buffer.
|
||||||
|
* @return Number of bytes written to the buffer (UTF-8 safe).
|
||||||
|
* @error Invalid or corrupt Handle.
|
||||||
|
*/
|
||||||
|
native GetConVarDefault(Handle:convar, String:value[], maxlength);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the bitstring of flags on a console variable.
|
* Returns the bitstring of flags on a console variable.
|
||||||
*
|
*
|
||||||
|
@ -19,3 +19,4 @@ DS saves us from Valve again.
|
|||||||
Pants will save us from certain death.
|
Pants will save us from certain death.
|
||||||
Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS!
|
Invaders' blood marches through my veins, like GIANT RADIOACTIVE RUBBER PANTS!
|
||||||
THE PANTS COMMAND COMMAND ME! DO NOT IGNORE MY VEINS.
|
THE PANTS COMMAND COMMAND ME! DO NOT IGNORE MY VEINS.
|
||||||
|
This file sure has gotten big.
|
Loading…
Reference in New Issue
Block a user