From: Peter Schaefer Date: Fri, 24 Jun 2016 13:34:58 +0000 (+0200) Subject: update X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=a030bc9efed18f3e88c5c19c7143b593cdcecf3e;p=cgue_weave.git update --- diff --git a/Weave/Game.cpp b/Weave/Game.cpp index 672ed57..1189bc2 100644 --- a/Weave/Game.cpp +++ b/Weave/Game.cpp @@ -79,7 +79,7 @@ Game::Game() : playing(true) lever1->setup(door2); //Lever* lever2 = new Lever(translate(vec3(86.f, -18.f, 5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_duck_2D.png"); - Lever* lever2 = new Lever(translate(vec3(-5.f, 0.f, -5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_duck_2D.png"); + Lever* lever2 = new Lever(translate(vec3(-5.f, 0.f, -5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "default_2D.png"); current_world->addObject(lever2); lever2->setAnimationLoop(false); lever2->timeresistant = true; diff --git a/models/boar.blend b/models/boar.blend index 62c04f8..fb4275f 100644 Binary files a/models/boar.blend and b/models/boar.blend differ diff --git a/models/boar.blend1 b/models/boar.blend1 index 32cffb7..62c04f8 100644 Binary files a/models/boar.blend1 and b/models/boar.blend1 differ