diff --git a/addons/source-python/data/source-python/client/orangebox/CBaseClient.ini b/addons/source-python/data/source-python/client/orangebox/CBaseClient.ini index 666f18067..a426ba11a 100644 --- 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 = 17 + offset_windows = 18 arguments = STRING diff --git a/addons/source-python/data/source-python/entities/orangebox/CBaseCombatCharacter.ini b/addons/source-python/data/source-python/entities/orangebox/CBaseCombatCharacter.ini index 1d06c13a6..4c30ebf0a 100644 --- a/addons/source-python/data/source-python/entities/orangebox/CBaseCombatCharacter.ini +++ b/addons/source-python/data/source-python/entities/orangebox/CBaseCombatCharacter.ini @@ -2,14 +2,14 @@ # _ZN20CBaseCombatCharacter18OnTakeDamage_AliveERK15CTakeDamageInfo [[on_take_damage_alive]] - offset_linux = 273 - offset_windows = 272 + offset_linux = 279 + offset_windows = 278 arguments = POINTER return_type = INT # _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi [[weapon_switch]] - offset_linux = 265 - offset_windows = 264 + offset_linux = 271 + offset_windows = 270 arguments = POINTER, INT return_type = BOOL diff --git a/addons/source-python/data/source-python/entities/orangebox/CBaseEntity.ini b/addons/source-python/data/source-python/entities/orangebox/CBaseEntity.ini index fd1691d3d..1f0f9b63c 100755 --- a/addons/source-python/data/source-python/entities/orangebox/CBaseEntity.ini +++ b/addons/source-python/data/source-python/entities/orangebox/CBaseEntity.ini @@ -1,58 +1,58 @@ [virtual_function] + # _ZN11CBaseEntity11SetTransmitEP18CCheckTransmitInfob + [[set_transmit]] + offset_linux = 23 + offset_windows = 22 + arguments = POINTER, BOOL + # _ZN11CBaseEntity8SetModelEPKc [[set_model]] - offset_linux = 25 - offset_windows = 24 + offset_linux = 27 + offset_windows = 26 arguments = STRING # _ZN11CBaseEntity9SetParentEPS_i [[set_parent]] - offset_linux = 35 - offset_windows = 34 + offset_linux = 37 + offset_windows = 36 arguments = POINTER, INT # _ZN11CBaseEntity12OnTakeDamageERK15CTakeDamageInfo [[on_take_damage]] - offset_linux = 63 - offset_windows = 62 + offset_linux = 65 + offset_windows = 64 arguments = POINTER return_type = INT - # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_ - [[teleport]] - offset_linux = 109 - offset_windows = 108 - arguments = POINTER, POINTER, POINTER - - # _ZN11CBaseEntity11SetTransmitEP18CCheckTransmitInfob - [[set_transmit]] - offset_linux = 21 - offset_windows = 20 - arguments = POINTER, BOOL - # _ZN11CBaseEntity10StartTouchEPS_ [[start_touch]] - offset_linux = 99 - offset_windows = 98 + offset_linux = 101 + offset_windows = 100 arguments = POINTER # _ZN11CBaseEntity5TouchEPS_ [[touch]] - offset_linux = 100 - offset_windows = 99 + offset_linux = 102 + offset_windows = 101 arguments = POINTER # _ZN11CBaseEntity8EndTouchEPS_ [[end_touch]] - offset_linux = 101 - offset_windows = 100 + offset_linux = 103 + offset_windows = 102 arguments = POINTER + # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_ + [[teleport]] + offset_linux = 111 + offset_windows = 110 + arguments = POINTER, POINTER, POINTER + # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv [[get_solid_mask]] - offset_linux = 168 - offset_windows = 167 + offset_linux = 171 + offset_windows = 170 return_type = UINT diff --git a/addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini b/addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini index e236f9fac..3f3a05b2e 100644 --- a/addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini +++ b/addons/source-python/data/source-python/entities/orangebox/CBasePlayer.ini @@ -1,12 +1,12 @@ [function] [[increment_frag_count]] - identifier_windows = 55 8B EC 8B 45 08 01 81 F8 0C 00 00 + identifier_windows = 55 8B EC 8B 45 08 01 81 68 0E 00 00 identifier_linux = _ZN11CBasePlayer18IncrementFragCountEi arguments = INT [[increment_death_count]] - identifier_windows = 55 8B EC 8B 45 08 01 81 FC 0C 00 00 + identifier_windows = 55 8B EC 8B 45 08 01 81 6C 0E 00 00 identifier_linux = _ZN11CBasePlayer19IncrementDeathCountEi arguments = INT @@ -15,16 +15,16 @@ # _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_ [[drop_weapon]] - offset_linux = 264 - offset_windows = 263 + offset_linux = 270 + offset_windows = 269 arguments = POINTER, POINTER, POINTER # _ZN11CBasePlayer8PreThinkEv [[pre_think]] - offset_linux = 333 - offset_windows = 332 + offset_linux = 339 + offset_windows = 338 # _ZN11CBasePlayer9PostThinkEv [[post_think]] - offset_linux = 334 - offset_windows = 333 + offset_linux = 340 + offset_windows = 339 diff --git a/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseCombatWeapon.ini index 3f5922642..b80fbbfca 100644 --- a/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseCombatWeapon.ini +++ b/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseCombatWeapon.ini @@ -2,10 +2,10 @@ # _ZN17CBaseCombatWeapon13PrimaryAttackEv [[primary_attack]] - offset_linux = 274 - offset_windows = 273 + offset_linux = 280 + offset_windows = 279 # _ZN17CBaseCombatWeapon13SecondaryAttackEv [[secondary_attack]] - offset_linux = 275 - offset_windows = 274 + offset_linux = 281 + offset_windows = 280 diff --git a/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseGrenade.ini b/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseGrenade.ini index ed2065808..93370d81e 100644 --- a/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseGrenade.ini +++ b/addons/source-python/data/source-python/entities/orangebox/cstrike/CBaseGrenade.ini @@ -2,5 +2,5 @@ # _ZN12CBaseGrenade8DetonateEv [[detonate]] - offset_linux = 226 - offset_windows = 225 + offset_linux = 233 + offset_windows = 232 diff --git a/addons/source-python/data/source-python/entities/orangebox/cstrike/CBasePlayer.ini b/addons/source-python/data/source-python/entities/orangebox/cstrike/CBasePlayer.ini index 82be3db76..324389cf2 100644 --- a/addons/source-python/data/source-python/entities/orangebox/cstrike/CBasePlayer.ini +++ b/addons/source-python/data/source-python/entities/orangebox/cstrike/CBasePlayer.ini @@ -2,22 +2,22 @@ # _ZN11CBasePlayer10BumpWeaponEP17CBaseCombatWeapon [[bump_weapon]] - offset_linux = 398 - offset_windows = 397 + offset_linux = 405 + offset_windows = 404 arguments = POINTER return_type = BOOL # _ZN11CBasePlayer13GiveNamedItemEPKci [[give_named_item]] - offset_linux = 402 - offset_windows = 401 + offset_linux = 409 + offset_windows = 408 arguments = STRING, INT return_type = POINTER # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper [[run_command]] - offset_linux = 420 - offset_windows = 419 + offset_linux = 427 + offset_windows = 426 arguments = POINTER, POINTER 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 index 83d0e60cf..e5427ba3e 100644 --- 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 + 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 7C 89 4D FC + identifier_windows = 55 8B EC 83 EC 5C 89 4D FC identifier_linux = _ZN9CCSPlayer10SwitchTeamEi arguments = INT @@ -34,14 +34,14 @@ # _ZN9CCSPlayer12Weapon_EquipEP17CBaseCombatWeapon [[equip_weapon]] - offset_linux = 262 - offset_windows = 261 + offset_linux = 268 + offset_windows = 267 arguments = POINTER # _ZN9CCSPlayer5BlindEfff [[blind]] - offset_linux = 469 - offset_windows = 466 + offset_linux = 479 + offset_windows = 476 arguments = FLOAT, FLOAT, FLOAT @@ -50,20 +50,6 @@ on_rescue_zone_touch = OnRescueZoneTouch -# TODO: Remove when outdated. -[instance_attribute] - - [[mvps]] - offset_windows = 6384 - offset_linux = 6404 - type = INT - - [[clan_tag]] - offset_windows = 5628 - offset_linux = 5648 - type = STRING_ARRAY - - [based_attribute] [[mvps]] diff --git a/addons/source-python/data/source-python/entities/orangebox/dod/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/orangebox/dod/CBaseCombatWeapon.ini index 3f5922642..b80fbbfca 100644 --- a/addons/source-python/data/source-python/entities/orangebox/dod/CBaseCombatWeapon.ini +++ b/addons/source-python/data/source-python/entities/orangebox/dod/CBaseCombatWeapon.ini @@ -2,10 +2,10 @@ # _ZN17CBaseCombatWeapon13PrimaryAttackEv [[primary_attack]] - offset_linux = 274 - offset_windows = 273 + offset_linux = 280 + offset_windows = 279 # _ZN17CBaseCombatWeapon13SecondaryAttackEv [[secondary_attack]] - offset_linux = 275 - offset_windows = 274 + offset_linux = 281 + offset_windows = 280 diff --git a/addons/source-python/data/source-python/entities/orangebox/dod/CBasePlayer.ini b/addons/source-python/data/source-python/entities/orangebox/dod/CBasePlayer.ini index 11803bd32..f064286a1 100644 --- a/addons/source-python/data/source-python/entities/orangebox/dod/CBasePlayer.ini +++ b/addons/source-python/data/source-python/entities/orangebox/dod/CBasePlayer.ini @@ -9,6 +9,6 @@ # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper [[run_command]] - offset_linux = 419 - offset_windows = 418 + offset_linux = 426 + offset_windows = 425 arguments = POINTER, POINTER diff --git a/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini b/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini index 4ebd378b8..9550dcc29 100644 --- a/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini +++ b/addons/source-python/data/source-python/entities/orangebox/dod/CDODPlayer.ini @@ -11,7 +11,7 @@ # _ZN10CDODPlayer13GiveNamedItemEPKci [[give_named_item]] - offset_linux = 401 - offset_windows = 400 + offset_linux = 408 + offset_windows = 407 arguments = STRING, INT return_type = POINTER diff --git a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatCharacter.ini b/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatCharacter.ini deleted file mode 100755 index 326aefa94..000000000 --- a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatCharacter.ini +++ /dev/null @@ -1,15 +0,0 @@ -[virtual_function] - - # _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi - [[weapon_switch]] - offset_linux = 271 - offset_windows = 270 - arguments = POINTER, INT - return_type = BOOL - - # _ZN20CBaseCombatCharacter18OnTakeDamage_AliveERK15CTakeDamageInfo - [[on_take_damage_alive]] - offset_linux = 279 - offset_windows = 278 - arguments = POINTER - return_type = INT diff --git a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseEntity.ini b/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseEntity.ini deleted file mode 100755 index 17975eba6..000000000 --- a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseEntity.ini +++ /dev/null @@ -1,56 +0,0 @@ -[virtual_function] - - # _ZN11CBaseEntity11SetTransmitEP18CCheckTransmitInfob - [[set_transmit]] - offset_linux = 23 - offset_windows = 22 - arguments = POINTER, BOOL - - # _ZN11CBaseEntity8SetModelEPKc - [[set_model]] - offset_linux = 27 - offset_windows = 26 - arguments = STRING - - # _ZN11CBaseEntity9SetParentEPS_i - [[set_parent]] - offset_linux = 37 - offset_windows = 36 - arguments = POINTER, INT - - # _ZN11CBaseEntity12OnTakeDamageERK15CTakeDamageInfo - [[on_take_damage]] - offset_linux = 65 - offset_windows = 64 - arguments = POINTER - return_type = INT - - # _ZN11CBaseEntity10StartTouchEPS_ - [[start_touch]] - offset_linux = 101 - offset_windows = 100 - arguments = POINTER - - # _ZN11CBaseEntity5TouchEPS_ - [[touch]] - offset_linux = 102 - offset_windows = 101 - arguments = POINTER - - # _ZN11CBaseEntity8EndTouchEPS_ - [[end_touch]] - offset_linux = 103 - offset_windows = 102 - arguments = POINTER - - # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_ - [[teleport]] - offset_linux = 111 - offset_windows = 110 - arguments = POINTER, POINTER, POINTER - - # _ZNK11CBasePlayer25PhysicsSolidMaskForEntityEv - [[get_solid_mask]] - offset_linux = 171 - offset_windows = 170 - return_type = UINT diff --git a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBasePlayer.ini b/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBasePlayer.ini index 363f5c864..01fcc0e12 100755 --- a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBasePlayer.ini +++ b/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBasePlayer.ini @@ -13,22 +13,6 @@ [virtual_function] - # _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_ - [[drop_weapon]] - offset_linux = 270 - offset_windows = 269 - arguments = POINTER, POINTER, POINTER - - # _ZN11CBasePlayer8PreThinkEv - [[pre_think]] - offset_linux = 339 - offset_windows = 338 - - # _ZN11CBasePlayer9PostThinkEv - [[post_think]] - offset_linux = 340 - offset_windows = 339 - # _ZN11CBasePlayer10BumpWeaponEP17CBaseCombatWeapon [[bump_weapon]] offset_linux = 404 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 index fb75f4278..309e3cc86 100644 --- 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,36 +1,11 @@ [virtual_function] - # _ZN11CBaseEntity8SetModelEPKc - [[set_model]] - offset_linux = 27 - offset_windows = 26 - arguments = STRING - - # _ZN11CBaseEntity9SetParentEPS_i - [[set_parent]] - offset_linux = 37 - offset_windows = 36 - arguments = POINTER, INT - - # _ZN11CBaseEntity12OnTakeDamageERK15CTakeDamageInfo - [[on_take_damage]] - offset_linux = 65 - offset_windows = 64 - arguments = POINTER - return_type = INT - # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_ [[teleport]] offset_linux = 114 offset_windows = 113 arguments = POINTER, POINTER, POINTER - # _ZN11CBaseEntity11SetTransmitEP18CCheckTransmitInfob - [[set_transmit]] - offset_linux = 23 - offset_windows = 22 - arguments = POINTER, BOOL - # _ZN11CBaseEntity10StartTouchEPS_ [[start_touch]] offset_linux = 104 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 new file mode 100644 index 000000000..e5f7c8ecc --- /dev/null +++ b/addons/source-python/data/source-python/entity_output/orangebox/cstrike/CBaseEntityOutput.ini @@ -0,0 +1,7 @@ +# ../data/source-python/entity_output/orangebox/cstrike/CBaseEntityOutput.ini + +binary = server + +[function] + [[fire_output]] + identifier_windows = 55 8B EC 81 EC 2A 2A 2A 2A 53 8B C1