]> git.leopard-lacewing.eu Git - cgue_weave.git/commitdiff
Hebel gefixed
authorLockedLunatic <locked.lunatic@aon.at>
Fri, 24 Jun 2016 00:00:09 +0000 (02:00 +0200)
committerLockedLunatic <locked.lunatic@aon.at>
Fri, 24 Jun 2016 00:00:09 +0000 (02:00 +0200)
Weave/Scene/EventBox.cpp
Weave/Scene/Lever.cpp

index f83369b3cd5a33341006ff333d423b47c7687699..3048331c64db187f1d69287845b3c5b5423d9260 100644 (file)
@@ -98,7 +98,6 @@ void EventBox::collides(SceneObject* _other, btPersistentManifold* _contactManif
                Events::halt = true;
                break;
        case EB_LEVER:
-               Message::info("Sesam öffne dich!");
                ((Lever*)_other)->trigger();
                break;
        }
index 670545f9c92eb46b30ce90aabeb46c67bcdf341f..8588c2183ef1f90e6834d01434ddbf15a7873a72 100644 (file)
@@ -4,6 +4,7 @@
 
 Lever::Lever(const mat4& _modelMat, const vec4& _material, string _modelpath, string texturepath) : SceneObject(_modelMat, _material, _modelpath, texturepath)
 {
+       turned = false;
        recipient = nullptr;
        collide_group = COL_LEVER;
        collide_with = COL_EVENT;
@@ -29,11 +30,15 @@ void Lever::trigger()
        {
                this->startanimation((uint)0, 1.0f);
                recipient->startanimation((uint)0, 1.0f);
+
+               Message::info("Sesam öffne dich!");
        }
        else
        {
                this->startanimation((uint)0, -1.0f);
                recipient->startanimation((uint)0, -1.0f);
+
+               Message::info("Sesam schließe dich!");
        }
 }