Added CBaseEntityWrapper::IsWeapon() (exported as BaseEntity.is_weapon()).

Fixed a TODO/WeaponMixin not properly raising when the given index wasn't a valid weapon.

Author: jordanbriere

src/core/modules/entities/entities_entity.cpp

@@ -370,6 +370,18 @@ bool CBaseEntityWrapper::IsPlayer()
 	return iEntityIndex > WORLD_ENTITY_INDEX && iEntityIndex <= (unsigned int) gpGlobals->maxClients;
 }
 
+bool CBaseEntityWrapper::IsWeapon()
+{
+	datamap_t *pDatamap = GetDataDescMap();
+	while (pDatamap)
+	{
+		if (strcmp(pDatamap->dataClassName, "CBaseCombatWeapon") == 0)
+			return true;
+		pDatamap = pDatamap->baseMap;
+	}
+	return false;
+}
+
 IPhysicsObjectWrapper* CBaseEntityWrapper::GetPhysicsObject()
 {
 	return Wrap<IPhysicsObjectWrapper>(GetDatamapProperty<IPhysicsObject*>("m_pPhysicsObject"));

src/core/modules/entities/entities_entity.h

@@ -240,6 +240,7 @@ class CBaseEntityWrapper: public IServerEntity
 
 	// Other methods
 	bool IsPlayer();
+	bool IsWeapon();
 
 	Vector GetOrigin();
 	void SetOrigin(Vector& vec);

src/core/modules/entities/entities_entity_wrap.cpp

@@ -100,6 +100,12 @@ void export_base_entity(scope _entity)
 		":rtype: bool"
 	);
 
+	BaseEntity.def("is_weapon",
+		&CBaseEntityWrapper::IsWeapon,
+		"Return True if the entity is a weapon.\n\n"
+		":rtype: bool"
+	);
+
 	BaseEntity.add_property(
 		"origin",
 		&CBaseEntityWrapper::GetOrigin,

src/core/modules/weapons/weapons_entity.cpp

@@ -38,9 +38,8 @@ boost::shared_ptr<WeaponMixin> WeaponMixin::__init__(unsigned int uiEntityIndex)
 {
 	CBaseEntityWrapper* pEntity = (CBaseEntityWrapper*) ExcBaseEntityFromIndex(uiEntityIndex);
 
-	// TODO
-	//if (!pEntity->IsPlayer())
-	//	BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Index '%d' is not a valid weapon.", uiEntityIndex);
+	if (!pEntity->IsWeapon())
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Index '%d' is not a valid weapon.", uiEntityIndex);
 
 	return WeaponMixin::wrap(pEntity->GetBaseEntity());
 }