added amb858 and amb924, some new KV natives

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401407

core/msvc8/sourcemod_mm.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="sourcemod_mm"
 	ProjectGUID="{E39527CD-7CAB-4420-97CC-DA1B93B260BC}"
 	RootNamespace="sourcemod_mm"

core/smn_keyvalues.cpp

@@ -831,6 +831,96 @@ static cell_t smn_KvSavePosition(IPluginContext *pContext, const cell_t *params)
 	return 1;
 }
 
+static cell_t smn_CopySubkeys(IPluginContext *pContext, const cell_t *params)
+{
+	Handle_t hndl_copied = static_cast<Handle_t>(params[1]);
+	Handle_t hndl_parent = static_cast<Handle_t>(params[2]);
+	HandleError herr;
+	HandleSecurity sec;
+	KeyValueStack *pStk_copied, *pStk_parent;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=g_HandleSys.ReadHandle(hndl_copied, g_KeyValueType, &sec, (void **)&pStk_copied))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid key value handle %x (error %d)", hndl_copied, herr);
+	}
+	if ((herr=g_HandleSys.ReadHandle(hndl_parent, g_KeyValueType, &sec, (void **)&pStk_parent))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid key value handle %x (error %d)", hndl_parent, herr);
+	}
+
+	pStk_copied->pCurRoot.front()->CopySubkeys(pStk_parent->pCurRoot.front());
+
+	return 1;
+}
+
+static cell_t smn_GetNameSymbol(IPluginContext *pContext, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError herr;
+	HandleSecurity sec;
+	KeyValueStack *pStk;
+	cell_t *val;
+	char *key;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=g_HandleSys.ReadHandle(hndl, g_KeyValueType, &sec, (void **)&pStk))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid key value handle %x (error %d)", hndl, herr);
+	}
+
+	if (pStk->pCurRoot.size() < 2)
+	{
+		return 0;
+	}
+
+	pContext->LocalToString(params[2], &key);
+
+	KeyValues *pKv = pStk->pCurRoot.front()->FindKey(key);
+	if (!pKv)
+	{
+		return 0;
+	}
+	pContext->LocalToPhysAddr(params[3], &val);
+	*val = pKv->GetNameSymbol();
+
+	return 1;
+}
+
+static cell_t smn_FindKeyById(IPluginContext *pContext, const cell_t *params)
+{
+	Handle_t hndl = static_cast<Handle_t>(params[1]);
+	HandleError herr;
+	HandleSecurity sec;
+	KeyValueStack *pStk;
+
+	sec.pOwner = NULL;
+	sec.pIdentity = g_pCoreIdent;
+
+	if ((herr=g_HandleSys.ReadHandle(hndl, g_KeyValueType, &sec, (void **)&pStk))
+		!= HandleError_None)
+	{
+		return pContext->ThrowNativeError("Invalid key value handle %x (error %d)", hndl, herr);
+	}
+
+	KeyValues *pKv = pStk->pCurRoot.front()->FindKey(params[2]);
+	if (!pKv)
+	{
+		return 0;
+	}
+
+	pContext->StringToLocalUTF8(params[3], params[4], pKv->GetName(), NULL);
+
+	return 1;
+}
+
 static KeyValueNatives s_KeyValueNatives;
 
 REGISTER_NATIVES(keyvaluenatives)
@@ -863,5 +953,8 @@ REGISTER_NATIVES(keyvaluenatives)
 	{"KvDeleteKey",				smn_KvDeleteKey},
 	{"KvNodesInStack",			smn_KvNodesInStack},
 	{"KvSavePosition",			smn_KvSavePosition},
+	{"KvCopySubkeys",			smn_CopySubkeys},
+	{"KvFindKeyById",			smn_FindKeyById},
+	{"KvGetNameSymbol",			smn_GetNameSymbol},
 	{NULL,						NULL}
 };

plugins/include/keyvalues.inc

@@ -350,3 +350,38 @@ native KvSetEscapeSequences(Handle:kv, bool:useEscapes);
  * @error				Invalid Handle.
  */
 native KvNodesInStack(Handle:kv);
+
+/**
+ * Makes a new copy of all subkeys in the origin KeyValues to
+ * the destination KeyValues.
+ * NOTE: All KeyValues are processed from the current location not the root one.
+ *
+ * @param origin		Origin KeyValues Handle.
+ * @param dest			Destination KeyValues Handlee.
+ * @noreturn
+ * @error				Invalid Handle.
+ */
+native KvCopySubkeys(Handle:origin, Handle:dest);
+
+/** 
+ * Finds a KeyValues name by id.
+ *
+ * @param kv			KeyValues Handle.
+ * @param id			KeyValues id.
+ * @param name			Buffer to store the name.
+ * @param maxlength		Maximum length of the value buffer.
+ * @return			True on success, false if id not found.
+ * @error				Invalid Handle.
+ */
+native bool:KvFindKeyById(Handle:kv, id, String:name[], maxlength);
+
+/** 
+ * Finds a KeyValues id inside a KeyValues tree.
+ *
+ * @param kv			KeyValues Handle.
+ * @param key			Key name.
+ * @param id			Id of the found KeyValue.
+ * @return			True on success, false if key not found.
+ * @error				Invalid Handle.
+ */
+native bool:KvGetNameSymbol(Handle:kv, const String:key[], &id);