Merge branch 'master' into sdk_test

Conflicts:
	src/sdks/hl2sdk-csgo/.hg_archival.txt
	src/sdks/hl2sdk-csgo/public/eiface.h
	src/sdks/hl2sdk-csgo/public/game/shared/csgo/protobuf/cstrike15_usermessages.pb.cc
	src/sdks/hl2sdk-csgo/public/game/shared/csgo/protobuf/cstrike15_usermessages.pb.h
	src/sdks/hl2sdk-csgo/public/game/shared/csgo/protobuf/cstrike15_usermessages.proto
	src/sdks/hl2sdk-ob-valve/public/tier1/KeyValues.h

Author: satoon101

src/core/modules/keyvalues/keyvalues_wrap_python.cpp

@@ -71,34 +71,33 @@ class KeyValuesExt
 	{
 		return pKeyValues->SaveToFile(filesystem, szFile);
 	}
+
+	static Color GetColor(KeyValues* pKeyValues, const char* szKeyName, const Color &defaultColor = Color())
+	{
+		if (!pKeyValues->FindKey(szKeyName))
+			return defaultColor;
+
+		return pKeyValues->GetColor(szKeyName);
+	}
 };
 
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(find_key_overload, FindKey, 1, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_int_overload, GetInt, 0, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_uint64_overload, GetUint64, 0, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_float_overload, GetFloat, 0, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_string_overload, GetString, 0, 2);
+BOOST_PYTHON_FUNCTION_OVERLOADS(get_color_overload, KeyValuesExt::GetColor, 2, 3);
 BOOST_PYTHON_FUNCTION_OVERLOADS(get_bool_overload, KeyValuesExt::GetBool, 2, 3);
 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,
@@ -238,6 +237,14 @@ void export_keyvalues()
 			)
 		)
 
+		.def("get_color",
+			&KeyValuesExt::GetColor,
+			get_color_overload(
+				"Returns the color value of the given key name.",
+				args("key_name", "default_value")
+			)
+		)
+
 		.def("get_bool",
 			&KeyValuesExt::GetBool,
 			get_bool_overload(
@@ -278,6 +285,12 @@ void export_keyvalues()
 			args("key_name", "value")
 		)
 
+		.def("set_color",
+			&KeyValues::SetColor,
+			"Sets the given key's color value.",
+			args("key_name", "value")
+		)
+
 		.def("set_bool",
 			&KeyValuesExt::SetBool,
 			"Sets the given key's boolean value.",

src/core/modules/mathlib/mathlib_wrap_python.cpp

@@ -97,11 +97,11 @@ void export_vector()
 		)
 
 		.def("__getitem__",
-			static_cast< float(Vector::*)( int ) const >(&Vector::operator[])
+			&GetItemIndexer<Vector, float, 0, 2>
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<Vector, float>
+			&SetItemIndexer<Vector, float, 0, 2>
 		)
 
 		.def("as_vector_2D",
@@ -270,11 +270,11 @@ void export_qangle()
 		)
 
 		.def("__getitem__",
-			static_cast< float(QAngle::*)( int ) const >(&QAngle::operator[])
+			&GetItemIndexer<QAngle, float, 0, 2>
 		)
 
 		.def("__setitem__",
-			SetItemIndexer<QAngle, float>
+			&SetItemIndexer<QAngle, float, 0, 2>
 		)
 
 		.def(self == self)
@@ -326,11 +326,11 @@ void export_quaternion()
 		.def(self != self)
 
 		.def("__getitem__",
-			static_cast< float(Quaternion::*)( int ) const >(&Quaternion::operator[])
+			&GetItemIndexer<Quaternion, float, 0, 3>
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<Quaternion, float>
+			&SetItemIndexer<Quaternion, float, 0, 3>
 		)
 
 		.def_readwrite("x",
@@ -406,11 +406,11 @@ void export_radian_euler()
 		)
 
 		.def("__getitem__",
-			static_cast< float(RadianEuler::*)( int ) const >(&RadianEuler::operator[])
+			&GetItemIndexer<RadianEuler, float, 0, 2>
 		)
 
 		.def("__setitem__",
-			&SetItemIndexer<RadianEuler, float>
+			&SetItemIndexer<RadianEuler, float, 0, 2>
 		)
 
 		.def_readwrite("x",

src/core/modules/memory/memory_wrap_python.cpp

@@ -58,7 +58,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(find_binary_overload, find_binary, 1, 2);
 
 void export_binaryfile()
 {
-	BOOST_ABSTRACT_CLASS(CBinaryFile)
+	class_<CBinaryFile, boost::noncopyable>("CBinaryFile", no_init)
 
 		// Class methods
 		CLASS_METHOD(CBinaryFile,
@@ -76,36 +76,31 @@ void export_binaryfile()
 		)
 
 		// Special methods
-		CLASS_METHOD_SPECIAL(CBinaryFile,
-			"__getattr__",
-			find_address,
+		.def("__getattr__",
+			&CBinaryFile::find_address,
 			"Returns the address of a signature or symbol found in memory.",
 			args("identifier"),
 			manage_new_object_policy()
 		)
 
-		CLASS_METHOD_SPECIAL(CBinaryFile,
-			"__getitem__",
-			find_address,
+		.def("__getitem__",
+			&CBinaryFile::find_address,
 			"Returns the address of a signature or symbol found in memory.",
 			args("identifier"),
 			manage_new_object_policy()
 		)
-
+	
 		// Properties
-		CLASS_PROPERTY_READ_ONLY(CBinaryFile,
-			"addr",
-			get_address,
+		.add_property("addr",
+			&CBinaryFile::get_address,
 			"Returns the base address of this binary."
 		)
 
-		CLASS_PROPERTY_READ_ONLY(CBinaryFile,
-			"size",
-			get_size,
+		.add_property("size",
+			&CBinaryFile::get_size,
 			"Returns the size of this binary."
 		)
-
-	BOOST_END_CLASS()
+	;
 
 	def("find_binary",
 		&find_binary,
@@ -158,7 +153,7 @@ DECLARE_CLASS_METHOD_OVERLOAD(CPointer, set_string, 1, 4);
 
 void export_memtools()
 {
-	BOOST_CLASS_CONSTRUCTOR(CPointer, optional<unsigned long>)
+	class_<CPointer>("CPointer", init< optional<unsigned long> >())
 
 		// Class methods
 		CLASS_METHOD_OVERLOAD_RET(CPointer,
@@ -579,54 +574,48 @@ void export_memtools()
 		 )
 
 		// Special methods
-		CLASS_METHOD_SPECIAL(CPointer,
-			"__int__",
-			get_address,
+		.def("__int__",
+			&CPointer::get_address,
 			"Returns the address of this memory block."
 		)
 
-		CLASS_METHOD_SPECIAL(CPointer,
-			"__bool__",
-			is_valid,
+		.def("__bool__",
+			&CPointer::is_valid,
 			"Returns True if the address is not NULL."
 		)
 
-		CLASS_METHOD_SPECIAL(CPointer,
-			"__add__",
-			add,
+		.def("__add__",
+			&CPointer::add,
 			"Adds a value to the base address.",
 			manage_new_object_policy()
 		)
 
-		CLASS_METHOD_SPECIAL(CPointer,
-			"__sub__",
-			sub,
+		.def("__sub__",
+			&CPointer::sub,
 			"Subtracts a value from the base address.",
 			manage_new_object_policy()
 		)
 
 		// Properties
-		CLASS_PROPERTY_READ_ONLY(CPointer,
-			"addr",
-			get_address,
+		.add_property("addr",
+			&CPointer::get_address,
 			"Returns the address of this memory block."
 		)
 
-		CLASS_PROPERTY_READ_ONLY(CPointer,
-			"size",
-			get_size,
+		.add_property("size",
+			&CPointer::get_size,
 			"Returns the size of this memory block."
 		)
+	;
 
-	BOOST_END_CLASS()
-
-	BOOST_FUNCTION(alloc,
+	def("alloc",
+		alloc,
 		"Allocates a memory block.",
 		args("iSize"),
 		manage_new_object_policy()
 	);
 
-	BOOST_INHERITED_CLASS_CONSTRUCTOR(CFunction, CPointer, unsigned long, Convention_t, char*)
+	class_<CFunction, bases<CPointer> >("CFunction", init<unsigned long, Convention_t, char*>())
 
 		CLASS_METHOD_VARIADIC(CFunction,
 			__call__,
@@ -669,8 +658,7 @@ void export_memtools()
 			remove_post_hook,
 			"Removes a post-hook callback."
 		)
-
-	BOOST_END_CLASS()
+	;
 
 	DEFINE_CLASS_METHOD_VARIADIC(CFunction, __call__);
 	DEFINE_CLASS_METHOD_VARIADIC(CFunction, call_trampoline);
@@ -682,34 +670,33 @@ void export_memtools()
 void export_dyncall()
 {
 	enum_<Convention_t>("Convention")
-		ENUM_VALUE("CDECL", CONV_CDECL)
-		ENUM_VALUE("STDCALL", CONV_STDCALL)
-		ENUM_VALUE("THISCALL", CONV_THISCALL)
-	BOOST_END_CLASS()
+		.value("CDECL", CONV_CDECL)
+		.value("STDCALL", CONV_STDCALL)
+		.value("THISCALL", CONV_THISCALL)
+	;
 
 	// Other constants that are very useful.
-	BOOST_GLOBAL_ATTRIBUTE("DC_ERROR_NONE",             DC_ERROR_NONE);
-	BOOST_GLOBAL_ATTRIBUTE("DC_ERROR_UNSUPPORTED_MODE", DC_ERROR_UNSUPPORTED_MODE);
+	scope().attr("DC_ERROR_NONE") = DC_ERROR_NONE;
+	scope().attr("DC_ERROR_UNSUPPORTED_MODE") = DC_ERROR_UNSUPPORTED_MODE;
 
-	BOOST_FUNCTION(get_error,
+	def("get_error",
+		get_error,
 		"Returns the last DynCall error ID."
 	);
 }
 
 void export_dynamichooks()
 {
-	BOOST_CLASS_CONSTRUCTOR(CStackData, CHook*)
+	class_<CStackData>("CStackData", init<CHook*>())
 
 		// Special methods
-		CLASS_METHOD_SPECIAL(CStackData,
-			"__getitem__",
-			get_item,
+		.def("__getitem__",
+			&CStackData::get_item,
 			"Returns the argument at the specified index."
 		)
 
-		CLASS_METHOD_SPECIAL(CStackData,
-			"__setitem__",
-			set_item,
+		.def("__setitem__",
+			&CStackData::set_item,
 			"Sets the argument at the specified index."
 		)
 
@@ -721,6 +708,5 @@ void export_dynamichooks()
 			),
 			"Stack pointer register."
 		)
-
-	BOOST_END_CLASS()
+	;
 }

src/core/modules/usermessage/csgo/usermessage_implementation.h

@@ -29,8 +29,8 @@
 
 #include "../usermessage_implementation_base.h"
 
-#include "common/protobuf-2.3.0/src/google/protobuf/message.h"
-#include "common/protobuf-2.3.0/src/google/protobuf/descriptor.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/descriptor.h"
 
 class CUserMessageImplementation : public IUsermessageImplementationBase
 {