Strip remaining of sourcehook

Author: Kenzzer

core/UserMessagePBHelpers.h

@@ -32,7 +32,7 @@
 #ifndef _INCLUDE_SOURCEMOD_SMPBMESSAGE_H_
 #define _INCLUDE_SOURCEMOD_SMPBMESSAGE_H_
 
-#include <sh_list.h>
+#include <list>
 #include <google/protobuf/descriptor.h>
 #include <amtl/am-string.h>
 
@@ -85,7 +85,7 @@
 		return false;                                         \
 	}
 
-typedef List<Handle_t> PBHandleList;
+typedef std::list<Handle_t> PBHandleList;
 
 class SMProtobufMessage
 {
@@ -97,7 +97,7 @@ class SMProtobufMessage
 
 	~SMProtobufMessage()
 	{
-		PBHandleList::iterator iter = childHandles.begin();
+		auto iter = childHandles.begin();
 		while (iter != childHandles.end())
 		{
 			Handle_t &hndl = (*iter);

core/UserMessages.cpp

@@ -271,16 +271,15 @@ google::protobuf::Message *UserMessages::StartProtobufMessage(int msg_id, const
 		protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
 		switch (m_FakeMetaRes)
 		{
-		case MRES_IGNORED:
-		case MRES_HANDLED:
+		case KHook::Action::Ignore:
 			m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
 			buffer = m_FakeEngineBuffer;
 			break;		
 
-		case MRES_OVERRIDE:
+		case KHook::Action::Override:
 			m_FakeEngineBuffer = GetMessagePrototype(msg_id)->New();
 		// fallthrough
-		case MRES_SUPERCEDE:
+		case KHook::Action::Supersede:
 			buffer = msg;
 			break;
 		}
@@ -310,14 +309,13 @@ bool UserMessages::EndMessage()
 
 		switch (m_FakeMetaRes)
 		{
-		case MRES_IGNORED:
-		case MRES_HANDLED:
-		case MRES_OVERRIDE:
+		case KHook::Action::Ignore:
+		case KHook::Action::Override:
 			engine->SendUserMessage(static_cast<IRecipientFilter &>(m_CellRecFilter), m_CurId, *m_FakeEngineBuffer);
 			delete m_FakeEngineBuffer;
 			m_FakeEngineBuffer = NULL;
 			break;
-		//case MRES_SUPERCEDE:
+		//case KHook::Action::Supersede:
 		}
 
 		OnMessageEnd_Post();
@@ -500,7 +498,7 @@ void UserMessages::_DecRefCounter()
 }
 
 #if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_BLADE || SOURCE_ENGINE == SE_MCV
-void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
+KHook::Return<void> UserMessages::OnSendUserMessage_Pre(IVEngineServer*, IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
 {
 #if SOURCE_ENGINE == SE_CSGO
 	const char *pszName = g_Cstrike15UsermessageHelpers.GetName(msg_type);
@@ -512,7 +510,7 @@ void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type,
 
 	OnStartMessage_Pre(&filter, msg_type, pszName);
 
-	if (m_FakeMetaRes == MRES_SUPERCEDE)
+	if (m_FakeMetaRes == KHook::Action::Supersede)
 	{
 		int size = msg.ByteSize();
 		uint8 *data = (uint8 *)stackalloc(size);
@@ -527,16 +525,16 @@ void UserMessages::OnSendUserMessage_Pre(IRecipientFilter &filter, int msg_type,
 	OnStartMessage_Post(&filter, msg_type, pszName);
 
 	OnMessageEnd_Pre();
-	if (m_FakeMetaRes == MRES_SUPERCEDE)
-		RETURN_META(MRES_SUPERCEDE);
+	if (m_FakeMetaRes == KHook::Action::Supersede)
+		return { KHook::Action::Supersede };
 
-	RETURN_META(MRES_IGNORED);
+	return { KHook::Action::Ignore };
 }
 
-void UserMessages::OnSendUserMessage_Post(IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
+KHook::Return<void> UserMessages::OnSendUserMessage_Post(IVEngineServer*, IRecipientFilter &filter, int msg_type, const protobuf::Message &msg)
 {
 	OnMessageEnd_Post();
-	RETURN_META(MRES_IGNORED);
+	return { KHook::Action::Ignore };
 }
 #endif
 
@@ -611,7 +609,7 @@ KHook::Return<bf_write*> UserMessages::OnStartMessage_Post(IVEngineServer*, IRec
 	}
 
 #ifdef USE_PROTOBUF_USERMESSAGES
-	if (m_FakeMetaRes == MRES_SUPERCEDE)
+	if (m_FakeMetaRes == KHook::Action::Supersede)
 		m_OrigBuffer = m_InterceptBuffer;
 	else
 		m_OrigBuffer = m_FakeEngineBuffer;

core/UserMessages.h

@@ -142,7 +142,7 @@ class UserMessages :
 	// The engine used to provide this. Now we track it.
 	protobuf::Message *m_OrigBuffer;
 	protobuf::Message *m_FakeEngineBuffer;
-	META_RES m_FakeMetaRes;
+	KHook::Action m_FakeMetaRes;
 
 	protobuf::Message *m_InterceptBuffer;
 #endif

extensions/mysql/mysql/MyDriver.cpp

@@ -41,10 +41,9 @@ MyDriver::MyDriver()
 	m_MyHandle = BAD_HANDLE;
 }
 
-void CloseDBList(List<MyDatabase *> &l)
+void CloseDBList(std::list<MyDatabase *> &l)
 {
-	List<MyDatabase *>::iterator iter;
-	for (iter=l.begin(); iter!=l.end(); iter++)
+	for (auto iter=l.begin(); iter!=l.end(); iter++)
 	{
 		MyDatabase *db = (*iter);
 		while (!db->Close())
@@ -57,7 +56,6 @@ void CloseDBList(List<MyDatabase *> &l)
 
 void MyDriver::Shutdown()
 {
-	List<MyDatabase *>::iterator iter;
 	CloseDBList(m_PermDbs);
 
 	if (m_MyHandle != BAD_HANDLE)
@@ -165,8 +163,7 @@ IDatabase *MyDriver::Connect(const DatabaseInfo *info, bool persistent, char *er
 	if (persistent)
 	{
 		/* Try to find a matching persistent connection */
-		List<MyDatabase *>::iterator iter;
-		for (iter=m_PermDbs.begin();
+		for (auto iter=m_PermDbs.begin();
 			 iter!=m_PermDbs.end();
 			 iter++)
 		{

extensions/mysql/mysql/MyDriver.h

@@ -51,13 +51,11 @@
 # undef max
 #endif
 
-#include <sh_string.h>
-#include <sh_list.h>
-
+#include <string>
+#include <list>
 #include <mutex>
 
 using namespace SourceMod;
-using namespace SourceHook;
 
 #define M_CLIENT_MULTI_RESULTS    ((1) << 17)  /* Enable/disable multi-results */
 
@@ -82,8 +80,8 @@ class MyDriver : public IDBDriver
 private:
 	std::mutex m_Lock;
 	Handle_t m_MyHandle;
-	List<MyDatabase *> m_TempDbs;
-	List<MyDatabase *> m_PermDbs;
+	std::list<MyDatabase *> m_TempDbs;
+	std::list<MyDatabase *> m_PermDbs;
 };
 
 extern MyDriver g_MyDriver;

extensions/structs/Struct.h

@@ -33,7 +33,7 @@
 #define _INCLUDE_SOURCEMOD_STRUCT_H_
 
 #include "sm_trie_tpl.h"
-#include "sh_list.h"
+#include <list>
 
 enum MemberType
 {
@@ -75,7 +75,7 @@ struct StructInfo
 	char name[100];
 	int size;
 	KTrie<MemberInfo *> members;
-	SourceHook::List<MemberInfo *> membersList;
+	std::list<MemberInfo *> membersList;
 
 	bool getOffset(const char *member, int *offset);
 	bool getType(const char *member, MemberType*type);