Fixed CS:GO data for Linux

Author: Ayuto

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

@@ -5,13 +5,13 @@ srv_check = False
 
     # _ZN17CBaseCombatWeapon13PrimaryAttackEv
     [[primary_attack]]
-        offset_linux = 314
-        offset_windows = 308
+        offset_linux = 313
+        offset_windows = 307
 
     # _ZN17CBaseCombatWeapon13SecondaryAttackEv
     [[secondary_attack]]
-        offset_linux = 315
-        offset_windows = 309
+        offset_linux = 314
+        offset_windows = 308
 
 
 [property]

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

@@ -18,27 +18,27 @@ srv_check = False
 
     # _ZN11CBasePlayer13GiveNamedItemEPKciP13CEconItemViewb
     [[give_named_item]]
-        offset_linux = 450
-        offset_windows = 449
+        offset_linux = 451
+        offset_windows = 450
         arguments = STRING, INT, POINTER, BOOL
         return_type = POINTER
 
     # _ZN11CBasePlayer21IncrementAssistsCountEi
     [[increment_assists_count]]
-        offset_linux = 492
-        offset_windows = 491
+        offset_linux = 493
+        offset_windows = 492
         arguments = INT
 
     # _ZN11CBasePlayer19IncrementDeathCountEi
     [[increment_death_count]]
-        offset_linux = 493
-        offset_windows = 492
+        offset_linux = 494
+        offset_windows = 493
         arguments = INT
 
     # _ZN11CBasePlayer18IncrementFragCountEii
     [[increment_frag_count]]
-        offset_linux = 491
-        offset_windows = 490
+        offset_linux = 492
+        offset_windows = 491
         arguments = INT, INT
 
     # _ZN11CBasePlayer16PlayerRunCommandEP8CUserCmdP11IMoveHelper
@@ -61,8 +61,8 @@ srv_check = False
 [instance_attribute]
 
     [[assists]]
-        offset_windows = 3908
-        offset_linux = 3932
+        offset_windows = 3816
+        offset_linux = 3840
         type = INT
 
 

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

@@ -12,8 +12,8 @@ srv_check = False
     [[buy_internal]]
         identifier_windows = 55 8B EC 83 E4 F8 81 EC 7C 01 00 00 53 56 57
         # indentifier_linux = _ZN9CCSPlayer26HandleCommand_Buy_InternalEPKcib
-        identifier_linux = 55 89 E5 57 56 53 81 EC 9C 01 00 00 0F B6 55 14
-        arguments = STRING, INT, BOOL
+        identifier_linux = 55 89 E5 83 EC 68 0F B6 55 14
+        arguments = INT, STRING, BOOL
         return_type = INT
 
     [[deafen]]
@@ -43,8 +43,8 @@ srv_check = False
 
     # _ZN9CCSPlayer5BlindEfff
     [[blind]]
-        offset_linux = 541
-        offset_windows = 538
+        offset_linux = 542
+        offset_windows = 539
         arguments = FLOAT, FLOAT, FLOAT
 
 
@@ -56,13 +56,13 @@ srv_check = False
 [instance_attribute]
 
     [[mvps]]
-        offset_windows = 11752
-        offset_linux = 11776
+        offset_windows = 11472
+        offset_linux = 11496
         type = INT
 
     [[clan_tag]]
-        offset_windows = 10588
-        offset_linux = 10612
+        offset_windows = 9524
+        offset_linux = 9548
         type = STRING_ARRAY
 
 

addons/source-python/packages/source-python/weapons/restrictions.py

@@ -12,6 +12,7 @@
 # Source.Python Imports
 #   Core
 from core import AutoUnload
+from core import SOURCE_ENGINE
 #   Entities
 from entities.constants import INVALID_ENTITY_INDEX
 from entities.helpers import edict_from_pointer
@@ -391,8 +392,14 @@ def _on_weapon_bump(args):
 @EntityPreHook(EntityCondition.is_player, 'buy_internal')
 def _on_weapon_purchase(args):
     """Return whether the player is allowed to purchase the weapon."""
+    # TODO:
+    # In CS:GO it seems like the weapon isn't passed as a string anymore.
+    # Instead it's rather a pointer that might be NULL. If it's not NULL, the
+    # function sets it to some value:
+    #if ( a3 )
+    #        *(_DWORD *)a3 = v16;
     return weapon_restriction_manager.on_player_purchasing_weapon(
-        make_object(Player, args[0]), args[1])
+        make_object(Player, args[0]), args[1 if SOURCE_ENGINE != 'csgo' else 2])
 
 
 # =============================================================================