Reworked globals_c module

- Added new macro NOT_IMPLEMENTED_ATTR()
- Two CS:GO fixes

Author: Ayuto

src/CMakeLists.txt

@@ -196,15 +196,10 @@ Set(SOURCEPYTHON_ENTITY_MODULE_SOURCES
 # Globals module
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_GLOBALS_MODULE_HEADERS
-    core/modules/globals/globals_wrap.h
-    core/modules/globals/globals_engine_base.h
-    core/modules/globals/engine${SOURCE_ENGINE}/globals_engine_implementation.h
+    core/modules/globals/engine${SOURCE_ENGINE}/globals_wrap_python.h
 )
 
 Set(SOURCEPYTHON_GLOBALS_MODULE_SOURCES
-    core/modules/globals/globals_wrap.cpp
-    core/modules/globals/globals_engine_base.cpp
-    core/modules/globals/engine${SOURCE_ENGINE}/globals_engine_implementation.cpp
     core/modules/globals/globals_wrap_python.cpp
 )
 

src/core/core/sp_python.cpp

@@ -52,6 +52,8 @@ CPythonManager g_PythonManager;
 //---------------------------------------------------------------------------------
 // PyMODINIT_FUNC PyInit_sp( void );
 
+void InitConverters();
+
 //---------------------------------------------------------------------------------
 // Adds a path to sys.path (relative to g_GamePaths.GetSPDir()).
 //---------------------------------------------------------------------------------
@@ -117,6 +119,9 @@ bool CPythonManager::Initialize( void )
 	// And of course, the plugins directory for script imports.
 	AddToSysPath("/plugins");
 
+	// Initialize all converters
+	InitConverters();
+
 	// Initialize all submodules
 	modulsp_init();
 
@@ -140,3 +145,24 @@ bool CPythonManager::Shutdown( void )
 {
 	return true;
 }
+
+
+//---------------------------------------------------------------------------------
+// Converters
+//---------------------------------------------------------------------------------
+struct string_t_to_python_str
+{
+	static PyObject* convert(string_t const& s)
+	{
+		return incref(object(s.ToCStr()).ptr());
+	}
+};
+
+
+//---------------------------------------------------------------------------------
+// Initializes all converters
+//---------------------------------------------------------------------------------
+void InitConverters()
+{
+	to_python_converter< string_t, string_t_to_python_str >();
+}

src/core/modules/cvar/cvar_wrap_python.cpp

@@ -144,11 +144,6 @@ void export_concommandbase()
 			reference_existing_object_policy()
 		)
 
-		.def("set_next",
-			&ConCommandBase::SetNext,
-			"Sets the next ConCommandBase instance."
-		)
-
 		.def("is_registered",
 			&ConCommandBase::IsRegistered,
 			"Returns wheter the ConCommandBase instance is registered."

src/core/modules/effects/effects_wrap_python.cpp

@@ -29,6 +29,7 @@
 //-----------------------------------------------------------------------------
 // These includes are really important. Be careful if you try to change the
 // order or remove an include!
+#include "mathlib/vector.h"
 #include <stddef.h>
 #include "wchartypes.h"
 #include "string_t.h"

src/core/modules/globals/engine1/globals_engine_implementation.h

@@ -24,4 +24,12 @@
 * Development Team grants this exception to all derivative works.
 */
 
-#include "globals_engine_implementation.h"
+template<class T>
+void GlobalsBase_Visitor(T cls)
+{
+}
+
+template<class T>
+void Globals_Visitor(T cls)
+{
+}

…ngine1/globals_engine_implementation.cpp …es/globals/engine1/globals_wrap_python.hsrc/core/modules/globals/engine1/globals_engine_implementation.cpp renamed to src/core/modules/globals/engine1/globals_wrap_python.h src/core/modules/globals/engine1/globals_engine_implementation.cpp renamed to src/core/modules/globals/engine1/globals_wrap_python.h

@@ -24,4 +24,12 @@
 * Development Team grants this exception to all derivative works.
 */
 
-#include "globals_engine_implementation.h"
+template<class T>
+void GlobalsBase_Visitor(T cls)
+{
+}
+
+template<class T>
+void Globals_Visitor(T cls)
+{
+}

src/core/modules/globals/engine2/globals_engine_implementation.h

@@ -24,19 +24,33 @@
 * Development Team grants this exception to all derivative works.
 */
 
-//-----------------------------------------------------------------------------
-// Includes
-//-----------------------------------------------------------------------------
-#include "../globals_engine_base.h"
+#include "edict.h"
 
-//-----------------------------------------------------------------------------
-// Purpose: Source Engine 3 Specific engine implementation calls
-//-----------------------------------------------------------------------------
-class CGlobalServerImplementation : public CGlobalServerImplementationBase
+template<class T>
+void GlobalsBase_Visitor(T cls)
 {
-public:
-	virtual bool is_remote_client();
-	virtual const char* get_map_group_name();
-	virtual int get_server_count();
-	virtual CEdict* get_edicts();
-};
+	cls
+		.def("is_remote_client",
+			&CGlobalVarsBase::IsRemoteClient
+		)
+	;
+}
+
+template<class T>
+void Globals_Visitor(T cls)
+{
+	cls
+		.add_property("map_group_name",
+			make_getter(&CGlobalVars::mapGroupName, return_value_policy<return_by_value>())
+		)
+
+		// TODO: Is this a list?
+		.def_readonly("edicts",
+			&CGlobalVars::pEdicts
+		)
+
+		.def_readonly("server_count",
+			&CGlobalVars::serverCount
+		)
+	;
+}