1 files changed, 6 insertions, 14 deletions

@@ -39,13 +39,13 @@ int main(int argc, char** argv)
     throw sdl_error();
   }
 
-  Level level;
+  Level level(ren.get());
 
   std::unique_ptr<State> state;
 
   if (argc == 2 && !strcmp(argv[1], "--editor"))
   {
-    state.reset(new Editor());
+    state.reset(new Editor(ren.get()));
   } else {
     state.reset(new Simulation(level));
   }
@@ -63,20 +63,12 @@ int main(int argc, char** argv)
 
     while (SDL_PollEvent(&e))
     {
-      if (e.type == SDL_QUIT)
+      if (e.type == SDL_QUIT ||
+            (e.type == SDL_KEYDOWN &&
+             e.key.keysym.sym == SDLK_ESCAPE))
       {
         quit = true;
-      } else if (e.type == SDL_KEYDOWN)
-      {
-        switch (e.key.keysym.sym)
-        {
-          case SDLK_ESCAPE:
-          {
-            quit = true;
-
-            break;
-          }
-        }
+        break;
       }
     }