Replaced accessor functions with the objects themselves

Author: Ayuto

src/core/modules/cvar/cvar_wrap_python.cpp

@@ -59,8 +59,6 @@ DECLARE_SP_MODULE(cvar_c)
 //-----------------------------------------------------------------------------
 void export_cvar_interface()
 {
-	def("get_cvar_interface", make_getter(&g_pCVar, reference_existing_object_policy()));
-
 	// TODO: Rename it?
 	class_<ICvar, boost::noncopyable>("CCvar", no_init)
 		.def("register_con_command",
@@ -89,6 +87,8 @@ void export_cvar_interface()
 			reference_existing_object_policy()
 		)
 	;
+
+	scope().attr("cvar") = object(ptr(g_pCVar));
 }
 
 //-----------------------------------------------------------------------------

src/core/modules/effects/effects_wrap_python.cpp

@@ -182,5 +182,5 @@ void export_effects()
 		)
 	;
 
-	def("get_effects_interface", make_getter(&effects, reference_existing_object_policy()));
+	scope().attr("effects") = object(ptr(effects));
 }

src/core/modules/engine/eiface_wrap_python.cpp

@@ -90,15 +90,6 @@ BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(precache_generic_overload, PrecacheGeneri
 
 void export_engine_interface()
 {
-	// engine server interface accesor
-	def("get_engine_interface", make_getter(&engine, reference_existing_object_policy()));
-
-	// TODO
-	// Maybe we should create a new module called "interfaces" and then expose the objects
-	// as the following:
-	// scope().attr("engine") = ref(engine);
-
-
 	// Call engine specific implementation function
 	IVEngineServer_Visitor(
 
@@ -761,4 +752,6 @@ void export_engine_interface()
 		.NOT_IMPLEMENTED("get_engine_hltv_info")
 
 	); // IVEngineServer_Visitor
+
+	scope().attr("engine") = object(ptr(engine));
 }

src/core/modules/events/events_wrap_python.cpp

@@ -269,5 +269,5 @@ void export_igameeventmanager()
 		)
 	;
 
-	def("get_game_event_manager", make_getter(&gameeventmanager, reference_existing_object_policy()));
+	scope().attr("game_event_manager") = object(ptr(gameeventmanager));
 }

src/core/modules/globals/globals_wrap_python.cpp

@@ -189,5 +189,5 @@ void export_globals()
 		.NOT_IMPLEMENTED_ATTR("edicts")
 	);
 
-	def("get_globals", make_getter(&gpGlobals, reference_existing_object_policy()));
+	scope().attr("globals") = object(ptr(gpGlobals));
 }

src/core/modules/listeners/listeners_wrap_python.cpp

@@ -80,87 +80,24 @@ void export_listener_managers()
 	//-------------------------------------------------------------------------
 	// Expose the accessor functions
 	//-------------------------------------------------------------------------
-	def("get_client_active_listener_manager",
-		&GetClientActiveListenerManager,
-		"Returns the clientactive listener instance",
-		reference_existing_object_policy()
-	);
+	scope().attr("client_active_listener_manager") = object(ptr(GetClientActiveListenerManager()));
+	scope().attr("client_connect_listener_manager") = object(ptr(GetClientConnectListenerManager()));
+	scope().attr("client_disconnect_listener_manager") = object(ptr(GetClientDisconnectListenerManager()));
+	scope().attr("client_fully_connect_listener_manager") = object(ptr(GetClientFullyConnectListenerManager()));
+	scope().attr("client_put_in_server_listener_manager") = object(ptr(GetClientPutInServerListenerManager()));
+	scope().attr("client_settings_changed_listener_manager") = object(ptr(GetClientSettingsChangedListenerManager()));
 
-	def("get_client_connect_listener_manager",
-		&GetClientConnectListenerManager,
-		"Returns the clientconnect listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_client_disconnect_listener_manager",
-		&GetClientDisconnectListenerManager,
-		"Returns the clientdisconnect listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_client_fully_connect_listener_manager",
-		&GetClientFullyConnectListenerManager,
-		"Returns the clientfullyconnect listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_client_put_in_server_listener_manager",
-		&GetClientPutInServerListenerManager,
-		"Returns the clientputinserver listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_client_settings_changed_listener_manager",
-		&GetClientSettingsChangedListenerManager,
-		"Returns the clientsettingschanged listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_level_init_listener_manager",
-		&GetLevelInitListenerManager,
-		"Returns the levelinit listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_level_shutdown_listener_manager",
-		&GetLevelShutdownListenerManager,
-		"Returns the levelshutdown listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_networkid_validated_listener_manager",
-		&GetNetworkidValidatedListenerManager,
-		"Returns the networkidvalidated listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_on_edict_allocated_listener_manager",
-		&GetOnEdictAllocatedListenerManager,
-		"Returns the onedictallocated listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_on_edict_freed_listener_manager",
-		&GetOnEdictFreedListenerManager,
-		"Returns the onedictfreed listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_on_query_cvar_value_finished_listener_manager",
-		&GetOnQueryCvarValueFinishedListenerManager,
-		"Returns the onquerycvarvaluefinished listener instance",
-		reference_existing_object_policy()
-	);
-
-	def("get_server_activate_listener_manager",
-		&GetServerActivateListenerManager,
-		"Returns the serveractivate listener instance",
-		reference_existing_object_policy()
-	);
+	scope().attr("level_init_listener_manager") = object(ptr(GetLevelInitListenerManager()));
+	scope().attr("level_shutdown_listener_manager") = object(ptr(GetLevelShutdownListenerManager()));
+	
+	scope().attr("networkid_validated_listener_manager") = object(ptr(GetNetworkidValidatedListenerManager()));
+	
+	scope().attr("on_edict_allocated_listener_manager") = object(ptr(GetOnEdictAllocatedListenerManager()));
+	scope().attr("on_edict_freed_listener_manager") = object(ptr(GetOnEdictFreedListenerManager()));
+	
+	scope().attr("on_query_cvar_value_finished_listener_manager") = object(ptr(GetOnQueryCvarValueFinishedListenerManager()));
+	
+	scope().attr("server_activate_listener_manager") = object(ptr(GetServerActivateListenerManager()));
 
-	def("get_tick_listener_manager",
-		&GetTickListenerManager,
-		"Returns the tick listener instance",
-		reference_existing_object_policy()
-	);
+	scope().attr("tick_listener_manager") = object(ptr(GetTickListenerManager()));
 }