Solid masks are now resolved dynamically.

Author: jordanbriere

addons/source-python/data/source-python/entities/bms/CBaseEntity.ini

@@ -49,6 +49,12 @@
         offset_windows = 109
         arguments = POINTER
 
+    # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
+    [[get_solid_mask]]
+        offset_linux = 181
+        offset_windows = 180
+        return_type = UINT
+
 
 [input]
 

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

@@ -51,3 +51,10 @@ srv_check = False
         offset_linux = 105
         offset_windows = 104
         arguments = POINTER
+
+    # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
+    # https://gist.github.com/jordanbriere/679e6d09ebaa9830979b6f60e61d4b9c
+    [[get_solid_mask]]
+        offset_linux = 169
+        offset_windows = 168
+        return_type = UINT

addons/source-python/data/source-python/entities/gmod/CBaseEntity.ini

@@ -48,3 +48,9 @@
         offset_linux = 103
         offset_windows = 102
         arguments = POINTER
+
+    # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
+    [[get_solid_mask]]
+        offset_linux = 173
+        offset_windows = 172
+        return_type = UINT

addons/source-python/data/source-python/entities/l4d2/CBaseEntity.ini

@@ -48,3 +48,9 @@
         offset_linux = 110
         offset_windows = 109
         arguments = POINTER
+
+    # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
+    [[get_solid_mask]]
+        offset_linux = 178
+        offset_windows = 177
+        return_type = UINT

addons/source-python/data/source-python/entities/orangebox/CBaseEntity.ini

@@ -49,6 +49,12 @@
         offset_windows = 100
         arguments = POINTER
 
+    # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
+    [[get_solid_mask]]
+        offset_linux = 168
+        offset_windows = 167
+        return_type = UINT
+
 
 [input]
 

addons/source-python/packages/source-python/entities/collisions.py

@@ -29,7 +29,6 @@
 # >> ALL DECLARATION
 # =============================================================================
 __all__ = [
-    'SOLID_MASKS',
     'BaseCollisionHash',
     'CollisionHash',
     'CollisionHook',
@@ -46,30 +45,6 @@
     BaseCollisionHash.__bases__ = (AutoUnload,) + BaseCollisionHash.__bases__
 
 
-# =============================================================================
-# >> GLOBAL VARIABLES
-# =============================================================================
-#: Masks that are considered solid.
-SOLID_MASKS = (
-    ContentMasks.SOLID,
-    ContentMasks.PLAYER_SOLID,
-    ContentMasks.NPC_SOLID,
-
-    # Teams
-    ContentMasks.PLAYER_SOLID | ContentFlags.TEAM1,
-    ContentMasks.PLAYER_SOLID | ContentFlags.TEAM2,
-)
-
-# Assign masks that are considered solid for the current game.
-if GAME_NAME == 'csgo':
-    SOLID_MASKS += (
-        # Projectiles
-        (ContentFlags.CURRENT_90 | ContentMasks.SOLID |
-            ContentMasks.VISIBLE_AND_NPCS | ContentFlags.HITBOX
-        ) & ~ContentFlags.DEBRIS,
-    )
-
-
 # =============================================================================
 # >> CLASSES
 # =============================================================================

src/core/modules/entities/entities_collisions.cpp

@@ -88,13 +88,6 @@ void CCollisionManager::Initialize()
 		return;
 	}
 
-	BEGIN_BOOST_PY()
-		static boost::python::tuple oSolidMasks(import("entities.collisions").attr("SOLID_MASKS"));
-		for (int i = 0; i < len(oSolidMasks); i++) {
-			m_setSolidMasks.insert(extract<unsigned long>(object(oSolidMasks[i])));
-		}
-	END_BOOST_PY()
-
 	RegisterHook(&IEngineTrace::TraceRay, 3, 2, "TraceRay");
 	RegisterHook(&IEngineTrace::TraceRayAgainstLeafAndEntityList, 4, 3, "TraceRayAgainstLeafAndEntityList");
 	RegisterHook(&IEngineTrace::SweepCollideable, 6, 5, "SweepCollideable");
@@ -121,7 +114,6 @@ void CCollisionManager::Finalize()
 	}
 
 	m_mapHooks.clear();
-	m_setSolidMasks.clear();
 
 	m_bInitialized = false;
 }
@@ -148,6 +140,18 @@ void CCollisionManager::UnregisterHash(ICollisionHash *pHash)
 	DecRef();
 }
 
+void CCollisionManager::OnNetworkedEntityCreated(object oEntity)
+{
+	BEGIN_BOOST_PY()
+		unsigned int uiMask = extract<unsigned long>(oEntity.attr("get_solid_mask")());
+		if (m_setSolidMasks.find(uiMask) == m_setSolidMasks.end()) {
+			m_setSolidMasks.insert(uiMask);
+			m_setSolidMasks.insert(uiMask | CONTENTS_TEAM1);
+			m_setSolidMasks.insert(uiMask | CONTENTS_TEAM2);
+		}
+	END_BOOST_PY()
+}
+
 void CCollisionManager::OnNetworkedEntityDeleted(CBaseEntity *pEntity)
 {
 	FOR_EACH_VEC(m_vecHashes, i) {
@@ -167,6 +171,22 @@ void CCollisionManager::UnregisterCollisionHook(object oCallback)
 	DecRef();
 }
 
+list CCollisionManager::GetSolidMasks()
+{
+	list oMasks;
+
+	if (!m_setSolidMasks.size()) {
+		return oMasks;
+	}
+
+	static object ContentFlags = import("engines").attr("trace").attr("ContentFlags");
+	for (boost::unordered_set<unsigned long>::const_iterator it=m_setSolidMasks.begin(); it != m_setSolidMasks.end(); it++) {
+		oMasks.append(ContentFlags(*it));
+	}
+
+	return oMasks;
+}
+
 template<typename T>
 void CCollisionManager::RegisterHook(T tFunc, unsigned int uiFilterIndex, unsigned int uiMaskIndex, const char *szDebugName)
 {

src/core/modules/entities/entities_collisions.h

@@ -186,11 +186,14 @@ class CCollisionManager
 	void RegisterHash(ICollisionHash *pHash);
 	void UnregisterHash(ICollisionHash *pHash);
 
+	void OnNetworkedEntityCreated(object oEntity);
 	void OnNetworkedEntityDeleted(CBaseEntity *pEntity);
 
 	void RegisterCollisionHook(object oCallback);
 	void UnregisterCollisionHook(object oCallback);
 
+	list GetSolidMasks();
+
 protected:
 	void IncRef();
 	void DecRef();

src/core/modules/entities/entities_collisions_wrap.cpp

@@ -71,6 +71,13 @@ void export_collision_manager(scope _collisions)
 		"Unregisters a collision hook."
 	);
 
+	// Properties...
+	CollisionManager.add_property(
+		"solid_masks",
+		&CCollisionManager::GetSolidMasks,
+		"Returns a list containing the masks that are currently considered solid."
+	);
+
 	// Singleton...
 	_collisions.attr("collision_manager") = object(ptr(GetCollisionManager()));
 }

src/core/sp_main.cpp

@@ -647,16 +647,20 @@ void CSourcePython::OnEntityCreated( CBaseEntity *pEntity )
 
 	CALL_LISTENERS(OnEntityCreated, ptr((CBaseEntityWrapper*) pEntity));
 
-	GET_LISTENER_MANAGER(OnNetworkedEntityCreated, on_networked_entity_created_manager);
-	if (!on_networked_entity_created_manager->GetCount())
-		return;
-
 	unsigned int uiIndex;
 	if (!IndexFromBaseEntity(pEntity, uiIndex))
 		return;
 
 	static object Entity = import("entities").attr("entity").attr("Entity");
-	CALL_LISTENERS_WITH_MNGR(on_networked_entity_created_manager, Entity(uiIndex));
+	object oEntity = Entity(uiIndex);
+	
+	GET_LISTENER_MANAGER(OnNetworkedEntityCreated, on_networked_entity_created_manager);
+	if (on_networked_entity_created_manager->GetCount()) {
+		CALL_LISTENERS_WITH_MNGR(on_networked_entity_created_manager, oEntity);
+	}
+
+	static CCollisionManager *pCollisionManager = GetCollisionManager();
+	pCollisionManager->OnNetworkedEntityCreated(oEntity);
 }
 
 void CSourcePython::OnEntitySpawned( CBaseEntity *pEntity )