Merge branch 'master' into cached_property

Author: jordanbriere

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

@@ -3,6 +3,13 @@ srv_check = False
 
 [virtual_function]
 
+    # _ZNK20CBaseCombatCharacter15IsInFieldOfViewERK6Vector
+    [[is_in_field_of_view]]
+        offset_linux = 274
+        offset_windows = 273
+        arguments = POINTER
+        return_type = BOOL
+
     # _ZN20CBaseCombatCharacter18OnTakeDamage_AliveERK15CTakeDamageInfo
     [[on_take_damage_alive]]
         offset_linux = 299

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

@@ -64,6 +64,11 @@ srv_check = False
         offset_linux = 12192
         type = INT
 
+    [[score]]
+        offset_windows = 12216
+        offset_linux = 12240
+        type = INT
+
     [[clan_tag]]
         offset_windows = 10140
         offset_linux = 10164

addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseCombatWeapon.ini

@@ -9,3 +9,8 @@
     [[secondary_attack]]
         offset_linux = 275
         offset_windows = 274
+
+    # _ZN17CBaseCombatWeapon11MaterializeEv
+    [[materialize]]
+        offset_linux = 349
+        offset_windows = 348

addons/source-python/data/source-python/entities/orangebox/hl2mp/CBaseGrenade.ini

@@ -0,0 +1,6 @@
+[virtual_function]
+
+    # _ZN12CBaseGrenade8DetonateEv
+    [[detonate]]
+        offset_linux = 226
+        offset_windows = 225

addons/source-python/data/source-python/entities/orangebox/hl2mp/CItem.ini

@@ -0,0 +1,6 @@
+[virtual_function]
+    
+    # _ZN5CItem11MaterializeEv
+    [[materialize]]
+        offset_linux = 218
+        offset_windows = 217

addons/source-python/packages/source-python/players/engines/csgo/__init__.py

@@ -159,7 +159,8 @@ def spawn(self, force=False):
         self._spawn()
 
     @wrap_entity_mem_func
-    def give_named_item(self, item, sub_type=0, econ_item_view=None, unk=False, unk2=NULL):
+    def give_named_item(
+            self, item, sub_type=0, econ_item_view=None, unk=False, unk2=NULL):
         """Give the player a named item."""
         # TODO: What's the unk argument for?
         # unk2 is a Vector (position)? Should do some tests...

src/core/modules/physics/physics.h

@@ -55,6 +55,13 @@ class Wrapper
 	operator T*()
 	{ return GetWrapped(); }
 
+	template<class U>
+	static U *_obj(CPointer *pPtr)
+	{ return Wrap<U>(__obj__<T>(pPtr)); }
+
+	template<class U>
+	static CPointer *_ptr(U *pSelf)
+	{ return __ptr__<T>(pSelf->GetWrapped()); }
 private:
 	T* m_pWrapped;
 };

src/core/modules/physics/physics_wrap.cpp

@@ -303,4 +303,22 @@ void export_physics_object(scope _physics)
 		"output_debug_info",
 		&IPhysicsObjectWrapper::OutputDebugInfo
 	);
+
+
+	// Add memory tools...
+	// TODO: Add a macro to wrap these.
+	PhysicsObject.def(
+		GET_OBJ_NAME,
+		&IPhysicsObjectWrapper::_obj<IPhysicsObjectWrapper>,
+		manage_new_object_policy()
+	);
+
+	PhysicsObject.def(
+		GET_PTR_NAME,
+		&IPhysicsObjectWrapper::_ptr<IPhysicsObjectWrapper>,
+		manage_new_object_policy()
+	);
+
+	PhysicsObject ADD_SIZE(IPhysicsObject)
+	STORE_CLASS(IPhysicsObject, "PhysicsObject")
 }