From 5452dfdfe079caa3394b746c7a70b0300212d4c5 Mon Sep 17 00:00:00 2001
From: Sakse Dalum <don.s@artescient.at>
Date: Tue, 7 Aug 2012 15:46:40 +0200
Subject: [PATCH] Main menu and loading somewhat finished.

---
 robotgame/game.py      | 22 ++++++++++++----------
 robotgame/main_menu.py |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/robotgame/game.py b/robotgame/game.py
index fab23f1..2dfdc53 100644
--- a/robotgame/game.py
+++ b/robotgame/game.py
@@ -40,18 +40,10 @@ class Game(object):
 
         self.clock = pygame.time.Clock()
 
-        self.jukebox = jukebox.Jukebox(
-            os.path.abspath(os.path.join("resources", "music")),
-            ["basshit.ogg"])
-
-        # Add main menu object to list of objects.
-        self.objs.append(main_menu.MainMenu(self, os.path.abspath(os.path.join(
-                        "resources", "graphics", "main_menu.png"))))
-
-        self.level = None
-
         self.ticks = self.prev_ticks = pygame.time.get_ticks()
 
+        self.load()
+
     def start(self):
         self.running = True
         self.run()
@@ -59,6 +51,16 @@ class Game(object):
     def stop(self):
         self.running = False
 
+    def load(self):
+        self.objs.append(main_menu.MainMenu(self, os.path.abspath(os.path.join(
+                        "resources", "graphics", "main_menu.png"))))
+        self.level = None
+        self.jukebox = jukebox.Jukebox(
+            os.path.abspath(os.path.join("resources", "music")),
+            ["basshit.ogg"])
+        self.jukebox.stop()
+        self.jukebox.play()
+
     def run(self):
         t = pygame.time.get_ticks()
         dt = 0
diff --git a/robotgame/main_menu.py b/robotgame/main_menu.py
index 7f27be4..c931411 100644
--- a/robotgame/main_menu.py
+++ b/robotgame/main_menu.py
@@ -43,6 +43,7 @@ class MainMenu(object):
             if event.type == pygame.KEYDOWN:
                 if event.key == pygame.K_SPACE:
                     self.game.goto_level(level.Level("landing"))
+                    self.game.objs.remove(self)
 
     def draw(self, window):
         window.blit(self.background_img, (0, 0))