Merge branch 'event_test2'

Author: satoon101

Diff for: src/core/modules/events/events.h

@@ -31,6 +31,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "igameevents.h"
+#include "modules/keyvalues/keyvalues.h"
 
 
 //-----------------------------------------------------------------------------
@@ -44,14 +45,33 @@
 //-----------------------------------------------------------------------------
 // IGameEvent extension class.
 //-----------------------------------------------------------------------------
-class IGameEventExt
+class IGameEventExt: public IGameEvent
 {
 public:
 	static PyObject* GetString(IGameEvent* pEvent, const char* szKey, const char* szDefault)
 	{
 		const char* szValue = pEvent->GetString(szKey, szDefault);
 		return PyUnicode_DecodeUTF8(szValue, strlen(szValue), "ignore");
 	}
+
+	static KeyValues* GetVariables(IGameEvent* pEvent)
+	{
+		return ((IGameEventExt *) pEvent)->m_pVariables;
+	}
+
+	static object __getitem__(IGameEvent* pEvent, const char* item)
+	{
+		return KeyValuesExt::__getitem__(GetVariables(pEvent), item);
+	}
+
+	static void __setitem__(IGameEvent* pEvent, const char* item, object value)
+	{
+		KeyValuesExt::__setitem__(GetVariables(pEvent), item, value);
+	}
+
+public:
+	void* m_pDescriptor;
+	KeyValues* m_pVariables;
 };
 
 //-----------------------------------------------------------------------------

Diff for: src/core/modules/events/events_wrap.cpp

@@ -133,6 +133,18 @@ void export_igameevent(scope _events)
 			args("key_name", "value")
 		)
 
+		.add_property("variables",
+			make_function(IGameEventExt::GetVariables, reference_existing_object_policy())
+		)
+
+		.def("__getitem__",
+			&IGameEventExt::__getitem__
+		)
+
+		.def("__setitem__",
+			&IGameEventExt::__setitem__
+		)
+
 		ADD_MEM_TOOLS(IGameEvent)
 	;