Updated TF2 data.

jordanbriere · jordanbriere · commit bf404c6a7b93 · 2025-05-02T00:54:16.000-04:00
Removed annoying signatures.
Removed an outdated workaround.
Fixed global entity listener removal.
Fixed Player.kills and Player.deaths not properly updating the player's state.
diff --git a/addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini b/addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini
@@ -1,16 +1,3 @@
-[function]
-
-    [[increment_frag_count]]
-        identifier_windows = 55 8B EC 8B 45 08 01 81 38 0E 00 00
-        identifier_linux = _ZN11CBasePlayer18IncrementFragCountEi
-        arguments = INT
-
-    [[increment_death_count]]
-        identifier_windows = 55 8B EC 8B 45 08 01 81 3C 0E 00 00
-        identifier_linux = _ZN11CBasePlayer19IncrementDeathCountEi
-        arguments = INT
-
-
 [virtual_function]
 
     # _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
diff --git a/addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatCharacter.ini b/addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatCharacter.ini
@@ -4,10 +4,8 @@
     [[on_take_damage_alive]]
         offset_linux = 284
         offset_windows = 283
-        arguments = POINTER
-        return_type = INT
 
     # _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi
     [[weapon_switch]]
-        offset_linux = 275
-        offset_windows = 274
+        offset_linux = 276
+        offset_windows = 275
diff --git a/addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatWeapon.ini
@@ -2,10 +2,10 @@
 
     # _ZN17CBaseCombatWeapon13PrimaryAttackEv
     [[primary_attack]]
-        offset_linux = 292
-        offset_windows = 291
+        offset_linux = 293
+        offset_windows = 287
 
     # _ZN17CBaseCombatWeapon15SecondaryAttackEv
     [[secondary_attack]]
-        offset_linux = 293
-        offset_windows = 292
+        offset_linux = 294
+        offset_windows = 288
diff --git a/addons/source-python/data/source-python/entities/orangebox/tf/CBaseEntity.ini b/addons/source-python/data/source-python/entities/orangebox/tf/CBaseEntity.ini
@@ -1,31 +1,26 @@
 [virtual_function]
 
-    # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_
-    [[teleport]]
-        offset_linux = 115
-        offset_windows = 114
-        arguments = POINTER, POINTER, POINTER
-
     # _ZN11CBaseEntity10StartTouchEPS_
     [[start_touch]]
         offset_linux = 105
         offset_windows = 104
-        arguments = POINTER
 
     # _ZN11CBaseEntity5TouchEPS_
     [[touch]]
         offset_linux = 106
         offset_windows = 105
-        arguments = POINTER
 
     # _ZN11CBaseEntity8EndTouchEPS_
     [[end_touch]]
         offset_linux = 107
         offset_windows = 106
-        arguments = POINTER
+
+    # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_
+    [[teleport]]
+        offset_linux = 115
+        offset_windows = 114
 
     # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv
     [[get_solid_mask]]
-        offset_linux = 174
-        offset_windows = 173
-        return_type = UINT
+        offset_linux = 175
+        offset_windows = 174
diff --git a/addons/source-python/data/source-python/entities/orangebox/tf/CBasePlayer.ini b/addons/source-python/data/source-python/entities/orangebox/tf/CBasePlayer.ini
@@ -4,7 +4,6 @@
     [[drop_weapon]]
         offset_linux = 275
         offset_windows = 274
-        arguments = POINTER, POINTER, POINTER
 
     # _ZN11CBasePlayer8PreThinkEv
     [[pre_think]]
@@ -18,9 +17,8 @@
 
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
-        offset_linux = 431
-        offset_windows = 430
-        arguments = POINTER, POINTER
+        offset_linux = 432
+        offset_windows = 431
 
 
 [property]
diff --git a/addons/source-python/data/source-python/entities/orangebox/tf/CTFPlayer.ini b/addons/source-python/data/source-python/entities/orangebox/tf/CTFPlayer.ini
@@ -2,8 +2,8 @@
 
     # _ZN9CTFPlayer10BumpWeaponEP17CBaseCombatWeapon
     [[bump_weapon]]
-        offset_linux = 409
-        offset_windows = 408
+        offset_linux = 410
+        offset_windows = 409
         arguments = POINTER
         return_type = BOOL
 
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,6 +1,6 @@
 # ../data/source-python/memory/bms/global_pointers.ini
 
-# TODO: Removed when outdated.
+# TODO: Remove 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,6 +1,6 @@
 # ../data/source-python/memory/orangebox/global_pointers.ini
 
-# TODO: Removed when outdated.
+# TODO: Remove 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
@@ -256,23 +256,6 @@ def setup_exception_hooks():
     from hooks.exceptions import except_hooks
     from hooks.warnings import warning_hooks
 
-    # Temporary workaround for sys.excepthook bug:
-    # https://bugs.python.org/issue1230540
-    import sys
-    import threading
-
-    run_old = threading.Thread.run
-
-    def run(*args, **kwargs):
-        try:
-            run_old(*args, **kwargs)
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except:
-            sys.excepthook(*sys.exc_info())
-
-    threading.Thread.run = run
-
 
 # =============================================================================
 # >> TRANSLATIONS
@@ -406,13 +389,13 @@ def setup_entities_listener():
 
     from warnings import warn
     from _core import _sp_plugin
-    from memory.manager import manager
 
     try:
         from _entities import _global_entity_list
         _global_entity_list.add_entity_listener(_sp_plugin)
     except ImportError:
         try:
+            from memory.manager import manager
             manager.get_global_pointer(
                 'GlobalEntityList'
             ).add_entity_listener(_sp_plugin)
@@ -425,13 +408,18 @@ def remove_entities_listener():
     _sp_logger.log_debug('Removing entities listener...')
 
     from _core import _sp_plugin
-    from memory.manager import manager
 
     try:
-        manager.get_global_pointer('GlobalEntityList').remove_entity_listener(
-            _sp_plugin)
-    except NameError:
-        pass
+        from _entities import _global_entity_list
+        _global_entity_list.remove_entity_listener(_sp_plugin)
+    except ImportError:
+        try:
+            from memory.manager import manager
+            manager.get_global_pointer(
+                'GlobalEntityList'
+            ).remove_entity_listener(_sp_plugin)
+        except NameError:
+            pass
 
 
 # =============================================================================
diff --git a/src/core/modules/effects/blade/effects_base_wrap.h b/src/core/modules/effects/blade/effects_base_wrap.h
@@ -45,9 +45,9 @@ extern IServerTools *servertools;
 // Exports CBaseTempEntity.
 //-----------------------------------------------------------------------------
 template<class T, class U>
-void export_engine_specific_temp_entity(T _effects, U TempEntity)
+void export_engine_specific_temp_entity(T _base, U TempEntity)
 {
-	_effects.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
+	_base.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
 }
 
 
diff --git a/src/core/modules/effects/orangebox/effects_base_wrap.h b/src/core/modules/effects/orangebox/effects_base_wrap.h
@@ -45,9 +45,9 @@ extern IServerTools *servertools;
 // Exports CBaseTempEntity.
 //-----------------------------------------------------------------------------
 template<class T, class U>
-void export_engine_specific_temp_entity(T _effects, U TempEntity)
+void export_engine_specific_temp_entity(T _base, U TempEntity)
 {
-	_effects.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
+	_base.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));
 }
 
 
diff --git a/src/core/modules/players/players_entity.cpp b/src/core/modules/players/players_entity.cpp
@@ -180,6 +180,11 @@ void PlayerMixin::SetDeaths(int value)
 {
 	static int offset = FindDatamapPropertyOffset("m_iDeaths");
 	SetDatamapPropertyByOffset<int>(offset, value);
+
+	CPlayerState *pState = servergameclients->GetPlayerState(GetEdict());
+	if (pState) {
+		pState->deaths = value;
+	}
 }
 
 
@@ -193,6 +198,11 @@ void PlayerMixin::SetKills(int value)
 {
 	static int offset = FindDatamapPropertyOffset("m_iFrags");
 	SetDatamapPropertyByOffset<int>(offset, value);
+
+	CPlayerState *pState = servergameclients->GetPlayerState(GetEdict());
+	if (pState) {
+		pState->frags = value;
+	}
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@ extern IServerTools *servertools;`
`45`	`45`	`// Exports CBaseTempEntity.`
`46`	`46`	`//-----------------------------------------------------------------------------`
`47`	`47`	`template<class T, class U>`
`48`		`-void export_engine_specific_temp_entity(T _effects, U TempEntity)`
	`48`	`+void export_engine_specific_temp_entity(T _base, U TempEntity)`
`49`	`49`	`{`
`50`		`- _effects.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));`
	`50`	`+ _base.attr("_first_temp_entity") = object(ptr(servertools->GetTempEntList()));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`