From 544b6d94aa82fefdda50f28556b2ef8dee7e06c4 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 25 Aug 2013 11:59:45 -0700
Subject: [PATCH] Switch HandleSys off KTrie (bug 5884 part 2, r=ds).

---
 core/logic/GameConfigs.h |  1 -
 core/logic/HandleSys.cpp | 19 ++++++-------------
 core/logic/HandleSys.h   |  6 +++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/core/logic/GameConfigs.h b/core/logic/GameConfigs.h
index fb5486ac..5d631ed1 100644
--- a/core/logic/GameConfigs.h
+++ b/core/logic/GameConfigs.h
@@ -36,7 +36,6 @@
 #include <IGameConfigs.h>
 #include <ITextParsers.h>
 #include "sm_memtable.h"
-#include <sm_trie_tpl.h>
 #include <am-refcounting.h>
 #include <sm_stringhashmap.h>
 #include <sm_namehashset.h>
diff --git a/core/logic/HandleSys.cpp b/core/logic/HandleSys.cpp
index 5ef76c15..8f3a16a9 100644
--- a/core/logic/HandleSys.cpp
+++ b/core/logic/HandleSys.cpp
@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -240,21 +240,14 @@ HandleType_t HandleSystem::CreateType(const char *name,
 	return index;
 }
 
-bool HandleSystem::FindHandleType(const char *name, HandleType_t *type)
+bool HandleSystem::FindHandleType(const char *name, HandleType_t *aResult)
 {
-	QHandleType **typepp = m_TypeLookup.retrieve(name);
-
-	if (!typepp)
-	{
+	QHandleType *type;
+	if (!m_TypeLookup.retrieve(name, &type))
 		return false;
-	}
 
-	unsigned int offset = *typepp - m_Types;
-
-	if (type)
-	{
-		*type = offset;
-	}
+	if (aResult)
+		*aResult = type - m_Types;
 
 	return true;
 }
diff --git a/core/logic/HandleSys.h b/core/logic/HandleSys.h
index 6d46bc9c..5a51326e 100644
--- a/core/logic/HandleSys.h
+++ b/core/logic/HandleSys.h
@@ -1,5 +1,5 @@
 /**
- * vim: set ts=4 :
+ * vim: set ts=4 sw=4 tw=99 noet :
  * =============================================================================
  * SourceMod
  * Copyright (C) 2004-2008 AlliedModders LLC.  All rights reserved.
@@ -34,7 +34,7 @@
 
 #include <IHandleSys.h>
 #include <stdio.h>
-#include <sm_trie_tpl.h>
+#include <sm_stringhashmap.h>
 #include "sm_memtable.h"
 #include "common_logic.h"
 
@@ -216,7 +216,7 @@ protected:
 private:
 	QHandle *m_Handles;
 	QHandleType *m_Types;
-	KTrie<QHandleType *> m_TypeLookup;
+	StringHashMap<QHandleType *> m_TypeLookup;
 	unsigned int m_TypeTail;
 	unsigned int m_FreeTypes;
 	unsigned int m_HandleTail;