Merge branch 'master' of https://github.com/Source-Python-Dev-Team/Source.Python

Author: Ayuto

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

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_
@@ -28,3 +15,7 @@
     [[post_think]]
         offset_linux = 340
         offset_windows = 339
+
+    # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
+    [[run_command]]
+        arguments = POINTER, POINTER

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
 

addons/source-python/data/source-python/entities/orangebox/tf/CBaseCombatCharacter.ini

@@ -2,12 +2,10 @@
 
     # _ZN20CBaseCombatCharacter18OnTakeDamage_AliveERK15CTakeDamageInfo
     [[on_take_damage_alive]]
-        offset_linux = 283
-        offset_windows = 282
-        arguments = POINTER
-        return_type = INT
+        offset_linux = 284
+        offset_windows = 283
 
     # _ZN20CBaseCombatCharacter13Weapon_SwitchEP17CBaseCombatWeaponi
     [[weapon_switch]]
-        offset_linux = 275
-        offset_windows = 274
+        offset_linux = 276
+        offset_windows = 275

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

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

@@ -1,31 +1,26 @@
 [virtual_function]
 
-    # _ZN11CBaseEntity8TeleportEPK6VectorPK6QAngleS2_
-    [[teleport]]
-        offset_linux = 114
-        offset_windows = 113
-        arguments = POINTER, POINTER, POINTER
-
     # _ZN11CBaseEntity10StartTouchEPS_
     [[start_touch]]
-        offset_linux = 104
-        offset_windows = 103
-        arguments = POINTER
+        offset_linux = 105
+        offset_windows = 104
 
     # _ZN11CBaseEntity5TouchEPS_
     [[touch]]
-        offset_linux = 105
-        offset_windows = 104
-        arguments = POINTER
+        offset_linux = 106
+        offset_windows = 105
 
     # _ZN11CBaseEntity8EndTouchEPS_
     [[end_touch]]
-        offset_linux = 106
-        offset_windows = 105
-        arguments = POINTER
+        offset_linux = 107
+        offset_windows = 106
+
+    # _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

addons/source-python/data/source-python/entities/orangebox/tf/CBasePlayer.ini

@@ -2,25 +2,23 @@
 
     # _ZN11CBasePlayer11Weapon_DropEP17CBaseCombatWeaponPK6VectorS4_
     [[drop_weapon]]
-        offset_linux = 274
-        offset_windows = 273
-        arguments = POINTER, POINTER, POINTER
+        offset_linux = 275
+        offset_windows = 274
 
     # _ZN11CBasePlayer8PreThinkEv
     [[pre_think]]
-        offset_linux = 344
-        offset_windows = 343
+        offset_linux = 345
+        offset_windows = 344
 
     # _ZN11CBasePlayer9PostThinkEv
     [[post_think]]
-        offset_linux = 345
-        offset_windows = 344
+        offset_linux = 346
+        offset_windows = 345
 
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
     [[run_command]]
-        offset_linux = 431
-        offset_windows = 430
-        arguments = POINTER, POINTER
+        offset_linux = 432
+        offset_windows = 431
 
 
 [property]

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
 

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