# HG changeset patch
# User Jeremy Thurgood <firxen@gmail.com>
# Date 1282589436 -7200
# Node ID d4bbb26099cc64a3a41e6f70efab53f5f48d4001
# Parent  158a13a48d481d93b2c0159717e0af058f4e5e32
Some debug object cleanup.

diff -r 158a13a48d48 -r d4bbb26099cc gamelib/gamescreen.py
--- a/gamelib/gamescreen.py	Mon Aug 23 20:34:38 2010 +0200
+++ b/gamelib/gamescreen.py	Mon Aug 23 20:50:36 2010 +0200
@@ -81,14 +81,6 @@
         self.state_widget = StateWidget(self.state)
         self.add(self.state_widget)
 
-        AddItemButton = Button('Add item', action = self.add_item)
-        menu = Column([
-            AddItemButton,
-            Button('Use hand', action = lambda: self.state.scenes['cryo'].things['cryo.door'].interact(None)),
-            Button('Use triangle', action = lambda: self.state.scenes['cryo'].things['cryo.door'].interact(self.state.items['triangle'])),
-            Button('Use titanium_leg', action = lambda: self.state.scenes['cryo'].things['cryo.door'].interact(self.state.items['titanium_leg'])),
-            ], align='l', spacing=20)
-        self.add_centered(menu)
         self.popup_menu = PopupMenu(shell)
         self.menubutton = Button('Menu', action=self.popup_menu.show_menu)
         self.menubutton.font = get_font(16, 'Vera.ttf')
@@ -108,7 +100,6 @@
 
         # Test items
         self.state.add_inventory_item('triangle')
-        self.state.add_inventory_item('titanium_leg')
 
 
     # Albow uses magic method names (command + '_cmd'). Yay.
@@ -121,6 +112,9 @@
     def main_menu_cmd(self):
         self.shell.show_screen(self.shell.menu_screen)
 
+    def quit_cmd(self):
+        self.shell.quit()
+
     def add_item(self):
         self.state.add_inventory_item("triangle")
 
diff -r 158a13a48d48 -r d4bbb26099cc gamelib/popupmenu.py
--- a/gamelib/popupmenu.py	Mon Aug 23 20:34:38 2010 +0200
+++ b/gamelib/popupmenu.py	Mon Aug 23 20:50:36 2010 +0200
@@ -13,6 +13,7 @@
         self.shell = shell
         items = [
                 ('Resume Game', 'hide'),
+                ('Quit Game', 'quit'),
                 ('Exit to Main Menu', 'main_menu'),
                 ]
         # albow.menu.Menu ignores title string