Declared some C++ objects as private since they are not directly interacted with. This includes classes that have a singleton instance as well as classes that are only exposed as an inherited class of another class.

Renamed GameEngine to EngineServer to match the name of the singleton to its class _EngineServer.  The same goes for Globals which is now GlobalVars.

Renamed a few engine module file names to use engine_ instead of eiface_.

Author: satoon101

src/CMakeLists.txt

@@ -158,11 +158,11 @@ Set(SOURCEPYTHON_EFFECTS_MODULE_SOURCES
 # Engine module.
 # ------------------------------------------------------------------
 Set(SOURCEPYTHON_ENGINE_MODULE_HEADERS
-    core/modules/engine/engine${SOURCE_ENGINE}/eiface_wrap_python.h
+    core/modules/engine/engine${SOURCE_ENGINE}/engine_wrap_python.h
 )
 
 Set(SOURCEPYTHON_ENGINE_MODULE_SOURCES
-    core/modules/engine/eiface_wrap_python.cpp
+    core/modules/engine/engine_wrap_python.cpp
 )
 
 # ------------------------------------------------------------------

src/core/modules/bot/bot_wrap_python.cpp

@@ -53,7 +53,7 @@ DECLARE_SP_MODULE(bot_c)
 
 void export_botmanager()
 {
-	class_<IBotManager, boost::noncopyable>("BotManager", no_init)
+	class_<IBotManager, boost::noncopyable>("_BotManager", no_init)
 		.def("get_bot_controller",
 			&IBotManager::GetBotController,
 			"Returns the BotController object for the given bot edict.",

src/core/modules/cvar/cvar_wrap_python.cpp

@@ -59,7 +59,7 @@ DECLARE_SP_MODULE(cvar_c)
 //-----------------------------------------------------------------------------
 void export_cvar_interface()
 {
-	class_<ICvar, boost::noncopyable>("Cvar", no_init)
+	class_<ICvar, boost::noncopyable>("_Cvar", no_init)
 		.def("register_con_command",
 			&ICvar::RegisterConCommand,
 			"Registers a console command.",
@@ -154,7 +154,7 @@ void export_concommandbase()
 	;
 
 	// TODO: Rename or move to ConVar
-	class_<IConVar, boost::noncopyable>("IConVar", no_init)
+	class_<IConVar, boost::noncopyable>("_IConVar", no_init)
 		.def("set_string",
 			GET_METHOD(void, IConVar, SetValue, const char*),
 			args("value")

src/core/modules/effects/effects_wrap_python.cpp

@@ -110,7 +110,7 @@ void export_effects()
 		*/
 	;
 
-	class_<IEffects, bases<IPredictionSystem>, boost::noncopyable>("Effects", no_init)
+	class_<IEffects, bases<IPredictionSystem>, boost::noncopyable>("_Effects", no_init)
 		.def("beam",
 			&IEffects::Beam,
 			"Creates a beam particle effect.",

src/core/modules/engine/engine1/eiface_wrap_python.h renamed to src/core/modules/engine/engine1/engine_wrap_python.h

@@ -45,7 +45,7 @@
 #include "inetchannelinfo.h"
 #include "eiface.h"
 
-#include ENGINE_INCLUDE_PATH(eiface_wrap_python.h)
+#include ENGINE_INCLUDE_PATH(engine_wrap_python.h)
 
 
 extern IVEngineServer* engine;
@@ -93,7 +93,7 @@ void export_engine_interface()
 	// Call engine specific implementation function
 	IVEngineServer_Visitor(
 
-	class_<IVEngineServer, boost::noncopyable>("EngineServer", no_init)
+	class_<IVEngineServer, boost::noncopyable>("_EngineServer", no_init)
 		.def("change_level",
 			&IVEngineServer::ChangeLevel,
 			"Tells the engine to change the level. If s2 is None, the engine will execute a \
@@ -752,5 +752,5 @@ void export_engine_interface()
 
 	); // IVEngineServer_Visitor
 
-	scope().attr("GameEngine") = object(ptr(engine));
+	scope().attr("EngineServer") = object(ptr(engine));
 }

src/core/modules/engine/engine2/eiface_wrap_python.h renamed to src/core/modules/engine/engine2/engine_wrap_python.h

@@ -235,7 +235,7 @@ void export_server_networkable()
 //-----------------------------------------------------------------------------
 void export_edict()
 {
-	class_< CBaseEdict >("BaseEdict")
+	class_< CBaseEdict >("_BaseEdict")
 		.def("get_server_entity",
 			GET_METHOD(IServerEntity*, CBaseEdict, GetIServerEntity),
 			"Returns its ServerEntity instance.",

src/core/modules/engine/engine3/eiface_wrap_python.h renamed to src/core/modules/engine/engine3/engine_wrap_python.h

@@ -24,20 +24,20 @@
 * Development Team grants this exception to all derivative works.
 */
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Includes
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 #include "igameevents.h"
 #include "modules/export_main.h"
 
 #ifndef EVENT_DEBUG_ID_INIT
 	#define EVENT_DEBUG_ID_INIT 42
 #endif
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // This is the IGameEventListener2 callback class. It allows python to subclass
 // IGameEventListener2 then pass an instance of that to CGameEventManager.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 class CGameEventListener2: public IGameEventListener2, public wrapper<IGameEventListener2>
 {
 public:
@@ -54,14 +54,14 @@ class CGameEventListener2: public IGameEventListener2, public wrapper<IGameEvent
 	}
 };
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Externals
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 extern IGameEventManager2* gameeventmanager;
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Exposes the Game Event module.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 void export_igameevent();
 void export_igameeventlistener();
 void export_igameeventmanager();
@@ -73,9 +73,9 @@ DECLARE_SP_MODULE(event_c)
 	export_igameeventmanager();
 }
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Exposes IGameEvent.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_bool_overload, GetBool, 1, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_int_overload, GetInt, 1, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(get_float_overload, GetFloat, 1, 2);
@@ -169,9 +169,9 @@ void export_igameevent()
 	;
 }
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Exposes the game event listener.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 void export_igameeventlistener()
 {
 	class_<CGameEventListener2, boost::noncopyable>("GameEventListener")
@@ -186,15 +186,15 @@ void export_igameeventlistener()
 	;
 }
 
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // Exposes the game event manager.
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(create_event_overload, CreateEvent, 1, 2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(fire_event_overload, FireEvent, 1, 2);
 
 void export_igameeventmanager()
 {
-	class_<IGameEventManager2, boost::noncopyable>("GameEventManager", no_init)
+	class_<IGameEventManager2, boost::noncopyable>("_GameEventManager", no_init)
 		.def("load_events_from_file",
 			&IGameEventManager2::LoadEventsFromFile,
 			"Loads game event descriptions from a file eg resource/gameevents.res",

src/core/modules/engine/eiface_wrap_python.cpp renamed to src/core/modules/engine/engine_wrap_python.cpp

@@ -63,7 +63,7 @@ void export_globals()
 {
 	GlobalsBase_Visitor(
 
-	class_<CGlobalVarsBase>("GlobalVarsBase", init<bool>())
+	class_<CGlobalVarsBase>("_GlobalVarsBase", init<bool>())
 		.def("is_client",
 			&CGlobalVarsBase::IsClient,
 			"Returns True if the game is a client."
@@ -135,7 +135,7 @@ void export_globals()
 
 	Globals_Visitor(
 
-	class_< CGlobalVars, bases< CGlobalVarsBase> >("GlobalVars", init<bool>())
+	class_< CGlobalVars, bases< CGlobalVarsBase> >("_GlobalVars", init<bool>())
 		.add_property("map_name",
 			make_getter(&CGlobalVars::mapname, return_value_policy<return_by_value>()),
             "Current map name."
@@ -188,5 +188,5 @@ void export_globals()
 		.NOT_IMPLEMENTED_ATTR("edicts")
 	);
 
-	scope().attr("Globals") = object(ptr(gpGlobals));
+	scope().attr("GlobalVars") = object(ptr(gpGlobals));
 }

src/core/modules/entity/entity_wrap_python.cpp

@@ -63,7 +63,7 @@ void export_listener_managers()
     //-------------------------------------------------------------------------
 	// Exposes ListenerManager
 	//-------------------------------------------------------------------------
-	class_<CListenerManager, boost::noncopyable>("ListenerManager", no_init)
+	class_<CListenerManager, boost::noncopyable>("_ListenerManager", no_init)
 		.def("register_listener",
 			&CListenerManager::RegisterListener,
 			"Registers a callable object. If it was already registered it will be ignored.",

src/core/modules/event/event_wrap_python.cpp

@@ -43,7 +43,7 @@ DECLARE_SP_MODULE(recipientfilter_c)
 void export_mrecipientfilter()
 {
 	// TODO: Rename class
-	class_<MRecipientFilter, boost::noncopyable>("CMRecipientFilter")
+	class_<MRecipientFilter, boost::noncopyable>("RecipientFilter")
 		.def("is_reliable",
 			&MRecipientFilter::IsReliable,
 			"Whether this recipient filter will be network reliable (sent in-order)"