Fixed some erroneous data and removed the need to maintain some signatures.

jordanbriere · jordanbriere · commit da331510cc9f · 2025-04-29T16:54:16.000-04:00
diff --git a/addons/source-python/data/source-python/client/orangebox/CBaseClient.ini b/addons/source-python/data/source-python/client/orangebox/CBaseClient.ini
@@ -3,5 +3,5 @@
 [virtual_function]
     [[set_name]]
         offset_linux = 57
-        offset_windows = 18
+        offset_windows = 17
         arguments = STRING
diff --git a/addons/source-python/data/source-python/entities/orangebox/cstrike/CCSPlayer.ini b/addons/source-python/data/source-python/entities/orangebox/cstrike/CCSPlayer.ini
@@ -10,7 +10,7 @@
         identifier_linux = _ZN9CCSPlayer7AutoBuyEv
 
     [[buy_internal]]
-        identifier_windows =  55 8B EC 83 EC 28 89 4D F8 6A 00
+        identifier_windows = 55 8B EC 83 EC 28 89 4D F8 6A 00
         identifier_linux = _ZN9CCSPlayer26HandleCommand_Buy_InternalEPKc
         arguments = STRING
         return_type = INT
@@ -25,7 +25,7 @@
         arguments = FLOAT
 
     [[switch_team]]
-        identifier_windows =  55 8B EC 83 EC 5C 89 4D FC
+        identifier_windows = 55 8B EC 83 EC 5C 89 4D FC
         identifier_linux = _ZN9CCSPlayer10SwitchTeamEi
         arguments = INT
 
diff --git a/addons/source-python/data/source-python/entity_output/orangebox/CBaseEntityOutput.ini b/addons/source-python/data/source-python/entity_output/orangebox/CBaseEntityOutput.ini
@@ -5,6 +5,7 @@ binary = server
 [function]
     [[fire_output]]
         identifier_linux = _ZN17CBaseEntityOutput10FireOutputE9variant_tP11CBaseEntityS2_f
-        identifier_windows = 55 8B EC 81 EC 24 01 00 00 53 8B C1
+        # Reference string: (%0.2f) output: (%s,%s) -> (%s,%s,%.1f)
+        identifier_windows = 55 8B EC 81 EC 40 01 00 00 8B C1 53
         arguments_linux = POINTER, POINTER, POINTER, FLOAT
         arguments_windows = INT, INT, INT, INT, POINTER, POINTER, POINTER, FLOAT
diff --git a/addons/source-python/data/source-python/entity_output/orangebox/cstrike/CBaseEntityOutput.ini b/addons/source-python/data/source-python/entity_output/orangebox/cstrike/CBaseEntityOutput.ini
diff --git a/addons/source-python/data/source-python/entity_output/orangebox/hl2mp/CBaseEntityOutput.ini b/addons/source-python/data/source-python/entity_output/orangebox/hl2mp/CBaseEntityOutput.ini
diff --git a/addons/source-python/data/source-python/memory/blade/global_pointers.ini b/addons/source-python/data/source-python/memory/blade/global_pointers.ini
@@ -8,6 +8,7 @@ identifier_windows = B8 01 00 00 00 84 05 2A 2A 2A 2A 75 2A 09 05 2A 2A 2A 2A B9
 offset_windows = 20
 level_windows = 1
 
+# TODO: Remove when outdated.
 [CGlobalEntityList]
 binary = server
 identifier_linux = gEntList
@@ -24,6 +25,7 @@ offset_windows = 8
 level_windows = 1
 srv_check = False
 
+# TODO: Remove when outdated.
 [CBaseTempEntity]
 binary = server
 srv_check = False
diff --git a/addons/source-python/data/source-python/memory/bms/global_pointers.ini b/addons/source-python/data/source-python/memory/bms/global_pointers.ini
@@ -1,5 +1,6 @@
 # ../data/source-python/memory/bms/global_pointers.ini
 
+# TODO: Removed when outdated.
 [CGlobalEntityList]
 binary = server
 identifier_linux = gEntList
diff --git a/addons/source-python/data/source-python/memory/orangebox/global_pointers.ini b/addons/source-python/data/source-python/memory/orangebox/global_pointers.ini
@@ -1,5 +1,6 @@
 # ../data/source-python/memory/orangebox/global_pointers.ini
 
+# TODO: Removed when outdated.
 [CGlobalEntityList]
 binary = server
 identifier_linux = gEntList
diff --git a/addons/source-python/packages/source-python/__init__.py b/addons/source-python/packages/source-python/__init__.py
@@ -404,17 +404,20 @@ def setup_entities_listener():
     """Set up entities listener."""
     _sp_logger.log_debug('Setting up entities listener...')
 
-    import sys
     from warnings import warn
     from _core import _sp_plugin
     from memory.manager import manager
 
     try:
-        manager.get_global_pointer('GlobalEntityList').add_entity_listener(
-            _sp_plugin
-        )
-    except NameError:
-        warn(str(sys.exc_info()[1]))
+        from _entities import _global_entity_list
+        _global_entity_list.add_entity_listener(_sp_plugin)
+    except ImportError:
+        try:
+            manager.get_global_pointer(
+                'GlobalEntityList'
+            ).add_entity_listener(_sp_plugin)
+        except NameError as e:
+            warn(e)
 
 
 def remove_entities_listener():
diff --git a/src/core/modules/effects/blade/effects_base_wrap.h b/src/core/modules/effects/blade/effects_base_wrap.h
@@ -27,13 +27,27 @@
 #ifndef _EFFECTS_BASE_WRAP_BLADE_H
 #define _EFFECTS_BASE_WRAP_BLADE_H
 
+//-----------------------------------------------------------------------------
+// Includes.
+//-----------------------------------------------------------------------------
+#include "game/shared/itempents.h"
+#include "toolframework/itoolentity.h"
+#include "game/server/basetempentity.h"
+
+
+//-----------------------------------------------------------------------------
+// External variables.
+//-----------------------------------------------------------------------------
+extern IServerTools *servertools;
+
+
 //-----------------------------------------------------------------------------
 // Exports CBaseTempEntity.
 //-----------------------------------------------------------------------------
 template<class T, class U>
-void export_engine_specific_temp_entity(T _base, U TempEntity)
+void export_engine_specific_temp_entity(T _effects, U TempEntity)
 {
-	// Nothing specific to Blade...
+	_effects.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
 }
 
 
diff --git a/src/core/modules/entities/blade/entities_wrap.h b/src/core/modules/entities/blade/entities_wrap.h
@@ -30,8 +30,18 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
+// Source.Python
 #include "entities.h"
 
+// SDK
+#include "toolframework/itoolentity.h"
+
+
+//-----------------------------------------------------------------------------
+// External variables.
+//-----------------------------------------------------------------------------
+extern IServerTools *servertools;
+
 
 //-----------------------------------------------------------------------------
 // Exports CTakeDamageInfo.
@@ -43,4 +53,17 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
 }
 
 
+
+
+//-----------------------------------------------------------------------------
+// Exports CGlobalEntityList.
+//-----------------------------------------------------------------------------
+template<class T, class U>
+void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
+{
+	// Singleton...
+	_entities.attr("_global_entity_list") = object(ptr(servertools->GetEntityList()));
+}
+
+
 #endif // _ENTITIES_WRAP_BLADE_H
diff --git a/src/core/modules/entities/bms/entities_wrap.h b/src/core/modules/entities/bms/entities_wrap.h
@@ -30,8 +30,18 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
+// Source.Python
 #include "entities.h"
 
+// SDK
+#include "toolframework/itoolentity.h"
+
+
+//-----------------------------------------------------------------------------
+// External variables.
+//-----------------------------------------------------------------------------
+extern IServerTools *servertools;
+
 
 //-----------------------------------------------------------------------------
 // Exports CTakeDamageInfo.
@@ -45,4 +55,15 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
 }
 
 
+//-----------------------------------------------------------------------------
+// Exports CGlobalEntityList.
+//-----------------------------------------------------------------------------
+template<class T, class U>
+void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
+{
+	// Singleton...
+	_entities.attr("_global_entity_list") = object(ptr(servertools->GetEntityList()));
+}
+
+
 #endif // _ENTITIES_WRAP_BMS_H
diff --git a/src/core/modules/entities/csgo/entities_wrap.h b/src/core/modules/entities/csgo/entities_wrap.h
@@ -46,4 +46,14 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
 }
 
 
+//-----------------------------------------------------------------------------
+// Exports CGlobalEntityList.
+//-----------------------------------------------------------------------------
+template<class T, class U>
+void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
+{
+	// Nothing specific to CS:GO...
+}
+
+
 #endif // _ENTITIES_WRAP_CSGO_H
diff --git a/src/core/modules/entities/entities_wrap.cpp b/src/core/modules/entities/entities_wrap.cpp
@@ -525,17 +525,22 @@ void export_take_damage_info(scope _entities)
 //-----------------------------------------------------------------------------
 void export_global_entity_list(scope _entities)
 {
-	class_<CGlobalEntityList, boost::noncopyable>("GlobalEntityList", no_init)
-		.def("add_entity_listener",
-			&CGlobalEntityList::AddListenerEntity
-		)
+	class_<CGlobalEntityList, boost::noncopyable> GlobalEntityList("GlobalEntityList", no_init);
 
-		.def("remove_entity_listener",
-			&CGlobalEntityList::RemoveListenerEntity
-		)
+	// Methods...
+	GlobalEntityList.def("add_entity_listener",
+		&CGlobalEntityList::AddListenerEntity
+	);
 
-		ADD_MEM_TOOLS(CGlobalEntityList);
-	;
+	GlobalEntityList.def("remove_entity_listener",
+		&CGlobalEntityList::RemoveListenerEntity
+	);
+
+	// Add memory tools...
+	GlobalEntityList ADD_MEM_TOOLS(CGlobalEntityList);
+
+	// Engine specific stuff...
+	export_engine_specific_global_entity_list(_entities, GlobalEntityList);
 }
 
 
diff --git a/src/core/modules/entities/gmod/entities_wrap.h b/src/core/modules/entities/gmod/entities_wrap.h
@@ -45,4 +45,14 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
 }
 
 
+//-----------------------------------------------------------------------------
+// Exports CGlobalEntityList.
+//-----------------------------------------------------------------------------
+template<class T, class U>
+void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
+{
+	// Nothing specific to GMOD...
+}
+
+
 #endif // _ENTITIES_WRAP_GMOD_H
diff --git a/src/core/modules/entities/l4d2/entities_wrap.h b/src/core/modules/entities/l4d2/entities_wrap.h
@@ -43,4 +43,14 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
 }
 
 
+//-----------------------------------------------------------------------------
+// Exports CGlobalEntityList.
+//-----------------------------------------------------------------------------
+template<class T, class U>
+void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
+{
+	// Nothing specific to Left4Dead2...
+}
+
+
 #endif // _ENTITIES_WRAP_L4D2_H
diff --git a/src/core/modules/entities/orangebox/entities_wrap.h b/src/core/modules/entities/orangebox/entities_wrap.h
@@ -30,8 +30,18 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
+// Source.Python
 #include "entities.h"
 
+// SDK
+#include "toolframework/itoolentity.h"
+
+
+//-----------------------------------------------------------------------------
+// External variables.
+//-----------------------------------------------------------------------------
+extern IServerTools *servertools;
+
 
 //-----------------------------------------------------------------------------
 // Exports CTakeDamageInfo.
@@ -45,4 +55,15 @@ void export_engine_specific_take_damage_info(T _entities, U TakeDamageInfo)
 }
 
 
+//-----------------------------------------------------------------------------
+// Exports CGlobalEntityList.
+//-----------------------------------------------------------------------------
+template<class T, class U>
+void export_engine_specific_global_entity_list(T _entities, U GlobalEntityList)
+{
+	// Singleton...
+	_entities.attr("_global_entity_list") = object(ptr(servertools->GetEntityList()));
+}
+
+
 #endif // _ENTITIES_WRAP_ORANGEBOX_H
