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

Ayuto · Ayuto · commit 0834c5811020 · 2017-01-24T21:43:07.000+01:00
diff --git a/addons/source-python/data/source-python/entities/bms/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/bms/CBaseCombatWeapon.ini
@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 294
+        offset_windows = 293
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 295
+        offset_windows = 294
diff --git a/addons/source-python/data/source-python/entities/csgo/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/csgo/CBaseCombatWeapon.ini
@@ -1,3 +1,19 @@
+srv_check = False
+
+
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 313
+        offset_windows = 307
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 314
+        offset_windows = 308
+
+
 [property]
 
     primary_ammo_count = m_iPrimaryReserveAmmoCount
diff --git a/addons/source-python/data/source-python/entities/csgo/CKnife.ini b/addons/source-python/data/source-python/entities/csgo/CKnife.ini
diff --git a/addons/source-python/data/source-python/entities/l4d2/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/l4d2/CBaseCombatWeapon.ini
@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 282
+        offset_windows = 281
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 283
+        offset_windows = 282
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
@@ -1,11 +1,11 @@
 [virtual_function]
 
-    # _ZN6CKnife13PrimaryAttackEv
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
     [[primary_attack]]
         offset_linux = 274
         offset_windows = 273
 
-    # _ZN6CKnife15SecondaryAttackEv
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
     [[secondary_attack]]
         offset_linux = 275
         offset_windows = 274
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
@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 274
+        offset_windows = 273
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 275
+        offset_windows = 274
diff --git a/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatWeapon.ini b/addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatWeapon.ini
@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 274
+        offset_windows = 273
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 275
+        offset_windows = 274
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
@@ -0,0 +1,11 @@
+[virtual_function]
+
+    # _ZN17CBaseCombatWeapon13PrimaryAttackEv
+    [[primary_attack]]
+        offset_linux = 283
+        offset_windows = 282
+
+    # _ZN17CBaseCombatWeapon13SecondaryAttackEv
+    [[secondary_attack]]
+        offset_linux = 284
+        offset_windows = 283
diff --git a/src/core/modules/memory/memory_hooks.cpp b/src/core/modules/memory/memory_hooks.cpp
@@ -28,6 +28,7 @@
 // >> INCLUDES
 // ============================================================================
 #include "memory_hooks.h"
+#include "memory_utilities.h"
 #include "memory_pointer.h"
 #include "utilities/wrap_macros.h"
 #include "utilities/call_python.h"
@@ -220,7 +221,7 @@ void CStackData::SetItem(unsigned int iIndex, object value)
 		case DATA_TYPE_DOUBLE:		SetArgument<double>(m_pHook, iIndex, value); break;
 		case DATA_TYPE_POINTER:
 		{
-			CPointer* pPtr = extract<CPointer*>(value);
+			CPointer* pPtr = ExtractPointer(value);
 			SetArgument<unsigned long>(m_pHook, iIndex, object(pPtr->m_ulAddr));
 		} break;
 		case DATA_TYPE_STRING:		SetArgument<const char *>(m_pHook, iIndex, value); break;
