Patched KeyValues class

Author: Ayuto

src/core/modules/keyvalues/keyvalues_wrap_python.cpp

@@ -84,21 +84,11 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(is_empty_overload, IsEmpty, 0, 1);
 
 void export_keyvalues()
 {
-	// TODO: Add constructors. There are two possibilities:
-	// 1. Patch SDK and make destructor public. Then deleteThis() isn't required anymore
-	// 2. Create functions which construct a new object
-	class_<KeyValues, boost::noncopyable>("KeyValues", no_init)//init<const char *>())
-		/*
+	class_<KeyValues, boost::noncopyable>("KeyValues",init<const char *>())
 		.def(init<const char *, const char *, const char *>())
 		.def(init<const char *, const char *, int>())
 		.def(init<const char *, const char *, const char *, const char *, const char *>())
 		.def(init<const char *, const char *, int, const char *, int>())
-		*/
-
-		.def("delete",
-			&KeyValues::deleteThis,
-			"Ensures that KeyValues object is deleted from correct heap"
-		)
 
 		.def("get_name",
 			&KeyValues::GetName,

src/core/utility/patches/engine1/patches.cpp

@@ -37,4 +37,9 @@
 #include "eiface.h"
 #ifndef PATCH_EIFACE_H_BBOX_T
 #error "Implement struct bbox_t in public/eiface.h"
+#endif
+
+#include "KeyValues.h"
+#ifndef PATCH_KEYVALUES_DESTRUCTOR
+#error "Make KeyValues::~KeyValues() public."
 #endif

src/core/utility/patches/engine3/patches.cpp

@@ -22,4 +22,9 @@
 * by the Valve Corporation.  You must obey the GNU General Public License in
 * all respects for all other code used.  Additionally, the Source.Python
 * Development Team grants this exception to all derivative works.
-*/
+*/
+
+#include "KeyValues.h"
+#ifndef PATCH_KEYVALUES_DESTRUCTOR
+#error "Make KeyValues::~KeyValues() public.
+#endif

src/sdks/hl2sdk-csgo/public/tier1/KeyValues.h

@@ -281,8 +281,11 @@ class KeyValues
 private:
 	KeyValues( KeyValues& );	// prevent copy constructor being used
 
+#define PATCH_KEYVALUES_DESTRUCTOR
+public:
 	// prevent delete being called except through deleteThis()
 	~KeyValues();
+private:
 
 	KeyValues* CreateKey( const char *keyName );
 

src/sdks/hl2sdk-ob-valve/public/tier1/KeyValues.h

@@ -221,8 +221,11 @@ class KeyValues
 private:
 	KeyValues( KeyValues& );	// prevent copy constructor being used
 
+#define PATCH_KEYVALUES_DESTRUCTOR
+public:
 	// prevent delete being called except through deleteThis()
 	~KeyValues();
+private:
 
 	KeyValues* CreateKey( const char *keyName );