Merge branch 'master' into cached_property

Author: jordanbriere

addons/source-python/data/source-python/entities/csgo/CBasePlayer.ini

@@ -75,7 +75,7 @@ srv_check = False
     # print('Offset of Player.assists is:', offset)
     [[assists]]
         offset_windows = 3172
-        offset_linux = 3192
+        offset_linux = 3196
         type = INT
 
 

addons/source-python/data/source-python/entities/csgo/CCSPlayer.ini

@@ -60,8 +60,8 @@ srv_check = False
 [instance_attribute]
 
     [[mvps]]
-        offset_windows = 12148
-        offset_linux = 12172
+        offset_windows = 12168
+        offset_linux = 12192
         type = INT
 
     [[clan_tag]]

addons/source-python/packages/source-python/__init__.py

@@ -158,26 +158,25 @@ def setup_data():
         'BaseEntityOutput',
         GameConfigObj(SP_DATA_PATH / 'entity_output' / 'CBaseEntityOutput.ini'))
 
+    from _entities import BaseEntityOutput
     try:
         _fire_output = entities._BaseEntityOutput.fire_output
 
-        from _entities import BaseEntityOutput
         BaseEntityOutput.fire_output = _fire_output
     except ValueError:
         from warnings import warn
         warn(
             'Did not find address for BaseEntityOutput.fire_output. '
             'OnEntityOutput listener will not fire.'
         )
+        BaseEntityOutput.fire_output = NotImplemented
     except AttributeError:
         from warnings import warn
         warn(
             'BaseEntityOutput.fire_output not found. '
             'OnEntityOutput listener will not fire.'
         )
-    else:
-        import listeners
-        _fire_output.add_pre_hook(listeners._pre_fire_output)
+        BaseEntityOutput.fire_output = NotImplemented
 
 
 # =============================================================================

addons/source-python/packages/source-python/listeners/__init__.py

@@ -24,6 +24,8 @@
 from cvars import cvar
 #   Engines
 from engines.server import server_game_dll
+#   Entities
+from entities import BaseEntityOutput
 from entities.datamaps import Variant
 from entities.helpers import find_output_name
 #   Memory
@@ -91,6 +93,7 @@
            'OnEntityCreated',
            'OnEntityDeleted',
            'OnEntityOutput',
+           'OnEntityOutputListenerManager',
            'OnEntityPreSpawned',
            'OnEntitySpawned',
            'OnLevelInit',
@@ -157,7 +160,6 @@
 on_plugin_loading_manager = ListenerManager()
 on_plugin_unloading_manager = ListenerManager()
 on_level_end_listener_manager = ListenerManager()
-on_entity_output_listener_manager = ListenerManager()
 
 _check_for_update = ConVar(
     'sp_check_for_update',
@@ -281,6 +283,36 @@ class OnClientSettingsChanged(ListenerManagerDecorator):
     manager = on_client_settings_changed_listener_manager
 
 
+class OnEntityOutputListenerManager(ListenerManager):
+    """Register/unregister an EntityOutput listener."""
+
+    def initialize(self):
+        """Called when the first callback is being registered."""
+        # Get the fire_output method
+        fire_output = BaseEntityOutput.fire_output
+
+        # If the fire_output method is not implemented, exit the call
+        if fire_output is NotImplemented:
+            return
+
+        # Register the hook on fire_output
+        fire_output.add_pre_hook(_pre_fire_output)
+
+    def finalize(self):
+        """Called when the last callback is being unregistered."""
+        # Get the fire_output method
+        fire_output = BaseEntityOutput.fire_output
+
+        # If the fire_output method is not implemented, exit the call
+        if fire_output is NotImplemented:
+            return
+
+        # Unregister the hook on fire_output
+        fire_output.remove_pre_hook(_pre_fire_output)
+
+on_entity_output_listener_manager = OnEntityOutputListenerManager()
+
+
 class OnEntityOutput(ListenerManagerDecorator):
     """Register/unregister an EntityOutput listener."""
 

addons/source-python/packages/source-python/players/_base.py

@@ -657,7 +657,7 @@ def set_flashlight(self, enable):
     flashlight = property(get_flashlight, set_flashlight)
 
     def send_convar_value(self, cvar_name, value):
-        """Send a convar value.
+        """Send a server convar value to the client.
 
         :param str cvar_name:
             Name of the convar.
@@ -672,6 +672,10 @@ def send_convar_value(self, cvar_name, value):
         buffer.write_string(str(value))
         self.client.net_channel.send_data(buffer)
 
+    def get_client_convar_value(self, name):
+        """Wrapper for :meth:`engines.server.engine_server.get_client_convar_value`."""
+        return engine_server.get_client_convar_value(self.index, name)
+
     @property
     def spectators(self):
         """Return all players observing this player.

src/core/modules/entities/entities_entity.cpp

@@ -374,14 +374,8 @@ bool CBaseEntityWrapper::IsPlayer()
 
 bool CBaseEntityWrapper::IsWeapon()
 {
-	datamap_t *pDatamap = GetDataDescMap();
-	while (pDatamap)
-	{
-		if (strcmp(pDatamap->dataClassName, "CBaseCombatWeapon") == 0)
-			return true;
-		pDatamap = pDatamap->baseMap;
-	}
-	return false;
+	static object is_weapon = import("weapons").attr("manager").attr("weapon_manager").attr("__contains__");
+	return is_weapon(str(IServerUnknownExt::GetClassname(GetThis())));
 }
 
 IPhysicsObjectWrapper* CBaseEntityWrapper::GetPhysicsObject()

src/core/modules/listeners/listeners_manager.cpp

@@ -41,6 +41,9 @@ void CListenerManager::RegisterListener(PyObject* pCallable)
 	// Is the callable already in the vector?
 	if( !IsRegistered(oCallable) )
 	{
+		if (!GetCount())
+			Initialize();
+
 		m_vecCallables.AddToTail(oCallable);
 	}
 	else {
@@ -64,6 +67,9 @@ void CListenerManager::UnregisterListener(PyObject* pCallable)
 	}
 	else {
 		m_vecCallables.Remove(index);
+
+		if (!GetCount())
+			Finalize();
 	}
 }
 
@@ -73,11 +79,10 @@ void CListenerManager::UnregisterListener(PyObject* pCallable)
 //-----------------------------------------------------------------------------
 void CListenerManager::Notify(tuple args, dict kwargs)
 {
-	static object callback_caller = eval("lambda func, args, kwargs: func(*args, **kwargs)");
 	for(int i = 0; i < m_vecCallables.Count(); i++)
 	{
 		BEGIN_BOOST_PY()
-			callback_caller(m_vecCallables[i], args, kwargs);
+			m_vecCallables[i](*args, **kwargs);
 		END_BOOST_PY_NORET()
 	}
 }
@@ -92,6 +97,28 @@ int CListenerManager::GetCount()
 }
 
 
+//-----------------------------------------------------------------------------
+// Called when the first callback is being registered.
+//-----------------------------------------------------------------------------
+void CListenerManager::Initialize()
+{
+	override initialize = get_override("initialize");
+	if (!initialize.is_none())
+		initialize();
+}
+
+
+//-----------------------------------------------------------------------------
+// Called when the last callback is being unregistered.
+//-----------------------------------------------------------------------------
+void CListenerManager::Finalize()
+{
+	override finalize = get_override("finalize");
+	if (!finalize.is_none())
+		finalize();
+}
+
+
 //-----------------------------------------------------------------------------
 // Return whether or not the given callback is registered.
 //-----------------------------------------------------------------------------

src/core/modules/listeners/listeners_manager.h

@@ -79,7 +79,7 @@
 //-----------------------------------------------------------------------------
 // CListenerManager class.
 //-----------------------------------------------------------------------------
-class CListenerManager
+class CListenerManager: public wrapper<CListenerManager>
 {
 public:
 	void RegisterListener(PyObject* pCallable);
@@ -90,6 +90,9 @@ class CListenerManager
 	object __getitem__(unsigned int index);
 	void clear();
 
+	virtual void Initialize();
+	virtual void Finalize();
+
 	int FindCallback(object oCallback);
 
 public:

src/core/modules/listeners/listeners_wrap.cpp

@@ -119,6 +119,16 @@ void export_listener_managers(scope _listeners)
 			&CListenerManager::clear,
 			"Remove all registered callbacks."
 		)
+
+		.def("initialize",
+			&CListenerManager::Initialize,
+			"Called when the first callback is being registered."
+		)
+
+		.def("finalize",
+			&CListenerManager::Finalize,
+			"Called when the last callback is being unregistered."
+		)
 	;
 
 	_listeners.attr("on_client_active_listener_manager") = object(ptr(GetOnClientActiveListenerManager()));

src/core/modules/mathlib/mathlib.h

@@ -94,6 +94,12 @@ class VectorExt
 		vecCopy -= val;
 		return vecCopy;
 	}
+
+	static inline Vector __neg__(Vector vecCopy)
+	{
+		vecCopy.Negate();
+		return vecCopy;
+	}
 };