]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
small fix
authorPeter Schaefer <schaeferpm@gmail.com>
Mon, 22 Jun 2015 12:36:29 +0000 (14:36 +0200)
committerPeter Schaefer <schaeferpm@gmail.com>
Mon, 22 Jun 2015 12:36:29 +0000 (14:36 +0200)
Weave/Scene/EventBox.cpp

index 404b850afd8f30d6d07378b1cad5a2c2f1dc7435..9993ede6785aba86bd203dacb0460a8c4c877e42 100644 (file)
@@ -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;
                        }
-
-       }
 }