From: Peter Schaefer <schaeferpm@gmail.com>
Date: Mon, 22 Jun 2015 12:36:29 +0000 (+0200)
Subject: small fix
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=a33b118c6d50a2ea1955d39ede4b8befe43ee701;p=cgue_weave.git

small fix
---

diff --git a/Weave/Scene/EventBox.cpp b/Weave/Scene/EventBox.cpp
index 404b850..9993ede 100644
--- a/Weave/Scene/EventBox.cpp
+++ b/Weave/Scene/EventBox.cpp
@@ -49,10 +49,6 @@ void EventBox::draw() const
 
 void EventBox::collides(SceneObject* _other, btPersistentManifold* _contactManifold, float _deltaT)
 {
-	if ((texture != nullptr && texture->operator std::string() == "model_player_2D.png") || _other->getTexture() != nullptr && (_other->getTexture()->operator std::string() == "model_player_2D.png"))
-	{
-		//if (!ignore && !_other->ignore)
-			
 			switch (eb_type)
 			{
 			default:
@@ -67,6 +63,4 @@ void EventBox::collides(SceneObject* _other, btPersistentManifold* _contactManif
 				Events::halt = true;
 				break;
 			}
-
-	}
 }