[SCM] cute multiplayer platform game with bunnies branch, master, updated. debian/1.50+dfsg1-2-3-g332c988

[Paul Wise]

The following commit has been merged in the master branch:
commit 332c9884e572a9e8f6c2f71af0a3034963270aa6
Author: Paul Wise <pabs at debian.org>
Date:   Sun Nov 14 19:09:11 2010 +0700

    Add patch to the jumpnbump-menu program so that users can
    add new levels and play them (Closes: #602750)
    Patch by Stéphane Blondon <stephane.blondon at gmail.com>

diff --git a/debian/changelog b/debian/changelog
index fbd4abf..5d988a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jumpnbump (1.50+dfsg1-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Add patch to the jumpnbump-menu program so that users can
+    add new levels and play them (Closes: #602750)
+    Patch by Stéphane Blondon <stephane.blondon at gmail.com>
+
+ -- Paul Wise <pabs at debian.org>  Sun, 14 Nov 2010 19:00:46 +0700
+
 jumpnbump (1.50+dfsg1-2) unstable; urgency=low
 
   [ Francois Marier ]
diff --git a/debian/contrib/jumpnbump_menu/jumpnbump_menu.py b/debian/contrib/jumpnbump_menu/jumpnbump_menu.py
index 4977275..8c45d0c 100644
--- a/debian/contrib/jumpnbump_menu/jumpnbump_menu.py
+++ b/debian/contrib/jumpnbump_menu/jumpnbump_menu.py
@@ -25,24 +25,32 @@ gettext.install(application)
 
 def populate_treeview():
     levels = []
-    for file in os.listdir (RESOURCE_DIR):
-        if (file.endswith ('.dat')):
-            levels.append (file)
+    add_levels (levels, RESOURCE_DIR)
+    add_levels (levels, os.path.expanduser("~/.jumpnbump/levels"))
 
-    levels.sort()
+    levels = sorted(levels, key=lambda level: level[0])
 
     COLUMN_LEVEL = 0
-    store = gtk.ListStore (gobject.TYPE_STRING)
+    COLUMN_DIR = 1
+    store = gtk.ListStore (gobject.TYPE_STRING, gobject.TYPE_STRING)
 
     for level in levels:
         iter = store.append()
-        store.set (iter, COLUMN_LEVEL, level)
+        store.set (iter, COLUMN_LEVEL, level[0], COLUMN_DIR, level[1])
                         
     treeview.set_model (store)
 
     renderer = gtk.CellRendererText()
     treeview.append_column (gtk.TreeViewColumn (_('Level'), renderer, text=COLUMN_LEVEL))
 
+def add_levels(levels, dir):
+    try:
+        for file in os.listdir (dir):
+            if (file.endswith ('.dat') or file.endswith ('.DAT')):
+                levels.append ((file, dir))
+    except OSError, err:
+        print("%s not found (%s)." % (dir,  str(err)))
+
 def standalone_mode (widget):
     disable_enable_level (1)
     disable_enable_server (0)
@@ -85,7 +93,7 @@ def disable_enable_level (setting):
 def level_changed (widget):
     model, iter = treeview.get_selection().get_selected()
     global choosen_level
-    choosen_level = '%s/%s' % (RESOURCE_DIR, model.get_value (iter, 0))
+    choosen_level = '%s/%s' % (model.get_value (iter, 1), model.get_value (iter, 0))
     unpackdir = None
     try:
         unpackdir = tempfile.mkdtemp ("", "jumpnbump-menu-")
diff --git a/debian/jumpnbump.6 b/debian/jumpnbump.6
index f8b77c2..01fe2e0 100644
--- a/debian/jumpnbump.6
+++ b/debian/jumpnbump.6
@@ -84,7 +84,11 @@ You can type these while in the game
   bunniesinspace - gravity is lower, you can jump higher
   lordoftheflies - the flies are attracted
   bloodisthickerthanwater - water turns to blood
-.SH LEVELS
+.SH ADD LEVELS
+You can add levels in ~/.jumpnbump/levels directory (create it if necessary).
+To see the added level, you have to restart jumpnbump-menu. The extension name
+for level is ".dat".
+.SH CREATE LEVELS
 There are two programs in /usr/lib/jumpnbump to help you make
 your own levels: pack and unpack.
 .IP pack

-- 
cute multiplayer platform game with bunnies