Fixed equality comparison on entities

Also moved it up in the hierachy, so comparison on BaseEntity is working
as well.

Author: Ayuto

addons/source-python/packages/source-python/entities/entity.py

@@ -78,10 +78,6 @@ def __init__(self, index):
         # Set the entity's base attributes
         object.__setattr__(self, '_index', index)
 
-    def __eq__(self, other):
-        """Return True if both entities have the same index."""
-        return self.index == other.index
-
     def __hash__(self):
         """Return a hash value based on the entity index."""
         # Required for sets, because we have implemented __eq__

src/core/modules/entities/entities_entity.cpp

@@ -195,6 +195,19 @@ CBaseEntity* CBaseEntityWrapper::GetThis()
 	return (CBaseEntity *) this;
 }
 
+bool CBaseEntityWrapper::operator==(object other)
+{
+	CBaseEntity* pOther = NULL;
+	try {
+		pOther = extract<CBaseEntity*>(other);
+	}
+	catch(...) {
+		PyErr_Clear();
+		return false;
+	}
+	return GetThis() == pOther;
+}
+
 void CBaseEntityWrapper::GetKeyValueStringRaw(const char* szName, char* szOut, int iLength)
 {
 	if (!servertools->GetKeyValue(GetThis(), szName, szOut, iLength))

src/core/modules/entities/entities_entity.h

@@ -106,6 +106,8 @@ class CBaseEntityWrapper: public IServerEntity
 
 	CBaseEntity* GetThis();
 
+	bool operator==(object other);
+
 	// Datamap methods
 	int FindDataMapOffset(const char* name);
 

src/core/modules/entities/entities_entity_wrap.cpp

@@ -64,6 +64,12 @@ void export_base_entity(scope _entity)
 			args("entity_index")
 		)
 	);
+	
+	BaseEntity.def(
+		"__eq__", 
+		&CBaseEntityWrapper::operator==,
+		"Return True if both entities are the same."
+	);
 
 	BaseEntity.def("create",
 		&CBaseEntityWrapper::create,