Added usermessage_c.create_message function to access IServerPluginHelpers->CreateMessage functionality. A fix for KeyValues instantiation and implementation of the Color class are needed in order to use the functionality.

Author: satoon101

src/core/core/sp_main.cpp

@@ -100,6 +100,7 @@ extern PLUGIN_RESULT DispatchClientCommand(edict_t *pEntity, const CCommand &com
 //---------------------------------------------------------------------------------
 CSourcePython g_SourcePythonPlugin;
 EXPOSE_SINGLE_INTERFACE_GLOBALVAR(CSourcePython, IServerPluginCallbacks, INTERFACEVERSION_ISERVERPLUGINCALLBACKS, g_SourcePythonPlugin );
+IServerPluginCallbacks *pPlugin;
 
 //---------------------------------------------------------------------------------
 // Helper console variable to tell scripters what engine version we are running
@@ -196,6 +197,8 @@ bool CSourcePython::Load(	CreateInterfaceFn interfaceFactory, CreateInterfaceFn
 	ConnectTier2Libraries( &interfaceFactory, 2 );
 #endif
 
+	pPlugin = this;
+
 	// Get all engine interfaces.
 	if( !GetInterfaces(gEngineInterfaces, interfaceFactory) ) {
 		return false;

src/core/modules/usermessage/usermessage.cpp

@@ -24,8 +24,22 @@
 * Development Team grants this exception to all derivative works.
 */
 
+//-----------------------------------------------------------------------------
+// Includes.
+//-----------------------------------------------------------------------------
 #include "usermessage.h"
-
+#include "public/engine/iserverplugin.h"
+#include "core/sp_main.h"
+
+//-----------------------------------------------------------------------------
+// Externals.
+//-----------------------------------------------------------------------------
+extern IServerPluginHelpers *helpers;
+extern IServerPluginCallbacks *pPlugin;
+
+//-----------------------------------------------------------------------------
+// CUserMessage implementation.
+//-----------------------------------------------------------------------------
 CUserMessage::CUserMessage(const MRecipientFilter &recipient_filter, const char *message_name ) :
 	CUserMessageImplementation(recipient_filter, message_name),
 	m_sent(false)
@@ -105,3 +119,11 @@ void CUserMessage::set_string( const char *field_name, const char *field_value,
 {
 	CUserMessageImplementation::set_string(field_name, field_value, index);
 }
+
+//-----------------------------------------------------------------------------
+// Functions.
+//-----------------------------------------------------------------------------
+void CreateMessage( edict_t *pEdict, DIALOG_TYPE type, KeyValues *data )
+{
+	helpers->CreateMessage(pEdict, type, data, pPlugin);
+}

src/core/modules/usermessage/usermessage.h

@@ -27,12 +27,17 @@
 #ifndef _USERMESSAGE_H_
 #define _USERMESSAGE_H_
 
+//-----------------------------------------------------------------------------
+// Includes.
+//-----------------------------------------------------------------------------
 #include "irecipientfilter.h"
-
 #include "utility/wrap_macros.h"
-
 #include GAME_INCLUDE_PATH(usermessage_implementation.h)
+#include "public/engine/iserverplugin.h"
 
+//-----------------------------------------------------------------------------
+// CUserMessage.
+//-----------------------------------------------------------------------------
 class CUserMessage : public CUserMessageImplementation
 {
 public:
@@ -64,4 +69,9 @@ class CUserMessage : public CUserMessageImplementation
 	bool m_sent;
 };
 
-#endif
+//-----------------------------------------------------------------------------
+// Functions.
+//-----------------------------------------------------------------------------
+void CreateMessage( edict_t *pEdict, DIALOG_TYPE type, KeyValues *data );
+
+#endif // _USERMESSAGE_H_

src/core/modules/usermessage/usermessage_wrap_python.cpp

@@ -24,22 +24,27 @@
 * Development Team grants this exception to all derivative works.
 */
 
+//-----------------------------------------------------------------------------
+// Includes.
+//-----------------------------------------------------------------------------
 #include "modules/export_main.h"
 #include "usermessage.h"
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Namespaces to use
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 using namespace boost::python;
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Exposer functions.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 void export_usermessage_interface();
+void export_message_functions();
+void export_dialog_enum();
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Method overloads
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 DECLARE_CLASS_METHOD_OVERLOAD(CUserMessage, set_char,	2, 3);
 DECLARE_CLASS_METHOD_OVERLOAD(CUserMessage, set_byte,	2, 3);
 DECLARE_CLASS_METHOD_OVERLOAD(CUserMessage, set_short,	2, 3);
@@ -49,12 +54,14 @@ DECLARE_CLASS_METHOD_OVERLOAD(CUserMessage, set_bool,	2, 3);
 DECLARE_CLASS_METHOD_OVERLOAD(CUserMessage, set_string,	2, 3);
 DECLARE_CLASS_METHOD_OVERLOAD(CUserMessage, set_buffer,	3, 4);
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Exposes the engine module.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 DECLARE_SP_MODULE(usermessage_c)
 {
 	export_usermessage_interface();
+	export_message_functions();
+	export_dialog_enum();
 }
 
 void export_usermessage_interface()
@@ -139,4 +146,23 @@ void export_usermessage_interface()
 		)
 
 	BOOST_END_CLASS()
-}
+}
+
+void export_message_functions()
+{
+	def("create_message",
+		CreateMessage,
+		"Creates an onscreen menu with various option buttons"
+	);
+}
+
+void export_dialog_enum()
+{
+	enum_<DIALOG_TYPE>("DialogType")
+		ENUM_VALUE("MSG", DIALOG_MSG)
+		ENUM_VALUE("MENU", DIALOG_MENU)
+		ENUM_VALUE("TEXT", DIALOG_TEXT)
+		ENUM_VALUE("ENTRY", DIALOG_ENTRY)
+		ENUM_VALUE("ASKCONNECT", DIALOG_ASKCONNECT)
+	BOOST_END_CLASS()
+}