From a33b118c6d50a2ea1955d39ede4b8befe43ee701 Mon Sep 17 00:00:00 2001 From: Peter Schaefer Date: Mon, 22 Jun 2015 14:36:29 +0200 Subject: [PATCH] small fix --- Weave/Scene/EventBox.cpp | 6 ------ 1 file changed, 6 deletions(-) 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; } - - } } -- 2.47.3