Menu Opimization

WinZone

diff --git a/Weave/Stage.cpp b/Weave/Stage.cpp
index 2b01cd739367c12176cdabc939f4b92d597a5557..f05a3580ef34c9de87d3d4f1b0bb9685f6188ed1 100644 (file)
--- a/Weave/Stage.cpp
+++ b/Weave/Stage.cpp
@@ -144,7 +144,7 @@ Stage::Stage(int num)
                current_world->addObject(new Boar(translate(vec3(16.71088f, 0.1f, 0.83976f)) * rotate(-1.6f, vec3(0, 1, 0))));
 
 
-               lever1 = new Lever(translate(vec3(2.55167f, 2.51451f, -5.54817f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png");
+               lever1 = new Lever(translate(vec3(2.55167f, 2.71451f, -5.54817f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png");
                current_world->addObject(lever1);
                lever1->setAnimationLoop(false);
 
@@ -266,6 +266,7 @@ Stage::Stage(int num)
                lever2->setup(door7);
                lever2->setup(door8);
 
+               current_world->addObject(new EventBox(translate(vec3(9.6f, 0.7f, -4.3f)), EB_WINZONE));
 
                current_world->addObject(new Boar(translate(vec3(-14.85444f, 0.1f, -19.04243f)) * rotate(-0.5f, vec3(0, 1, 0))));
                current_world->addObject(new Boar(translate(vec3(-5.81069f, 0.1f, -16.65352f)) * rotate(-1.8f, vec3(0, 1, 0))));

diff --git a/Weave/main.cpp b/Weave/main.cpp
index 1c23b1206ffb81b13e8c3137df15bbd78aae71d8..e2d02c505a20095fd6a9d4e63f50b9fe16021f18 100644 (file)
--- a/Weave/main.cpp
+++ b/Weave/main.cpp
@@ -54,22 +54,21 @@ int main(int argc, char *argv[])
 
        while (!Events::quit)
        {
-               if (play)
+               if (play && level != 3)
                {
-                       play = false;
-                       Stage spiel1(level);
+                               play = false;
+                               Stage spiel1(level);
 
-                       spiel1.play();
+                               spiel1.play();
 
-                       if (Events::halt == 2)
-                       {
-                               play = true;
-                               
-                               level++;
-                               Events::halt = 0;
-                               continue;
-                       }
+                               if (Events::halt == 2)
+                               {
+                                       play = true;
 
+                                       level++;
+                                       Events::halt = 0;
+                                       continue;
+                               }
                        Events::halt = 0;
                        Message::info("Press ESC to quit or R for a new Game.");
                }