[SCM] ballz (platform/puzzle game) branch, master, updated. upstream/1.0-16-gd0996ce

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit f4e5897e6bba30497a8bb1368bd791e06bf88525
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sat Oct 11 14:56:09 2008 +0200

    Fix scrolling bug in level selection (2)

diff --git a/debian/patches/ballz-1.0-guichan081.patch b/debian/patches/ballz-1.0-guichan081.patch
index 3155383..6598ccc 100644
--- a/debian/patches/ballz-1.0-guichan081.patch
+++ b/debian/patches/ballz-1.0-guichan081.patch
@@ -1,7 +1,7 @@
 Index: ballz-debian/src/game.cpp
 ===================================================================
---- ballz-debian.orig/src/game.cpp	2008-10-11 13:55:52.000000000 +0200
-+++ ballz-debian/src/game.cpp	2008-10-11 13:55:57.000000000 +0200
+--- ballz-debian.orig/src/game.cpp	2008-10-11 14:57:22.000000000 +0200
++++ ballz-debian/src/game.cpp	2008-10-11 14:57:22.000000000 +0200
 @@ -144,7 +144,7 @@
                                      "up with the whole idea of making this game in Per's and\n"
                                      "Johanna's apartment.");
@@ -22,8 +22,8 @@ Index: ballz-debian/src/game.cpp
  
 Index: ballz-debian/src/gui/ballzscrollarea.cpp
 ===================================================================
---- ballz-debian.orig/src/gui/ballzscrollarea.cpp	2008-10-11 13:55:52.000000000 +0200
-+++ ballz-debian/src/gui/ballzscrollarea.cpp	2008-10-11 13:56:52.000000000 +0200
+--- ballz-debian.orig/src/gui/ballzscrollarea.cpp	2008-10-11 14:57:17.000000000 +0200
++++ ballz-debian/src/gui/ballzscrollarea.cpp	2008-10-11 14:57:22.000000000 +0200
 @@ -37,7 +37,7 @@
  	setScrollPolicy(SHOW_NEVER,	SHOW_ALWAYS);
  	addKeyListener(this);
@@ -51,8 +51,8 @@ Index: ballz-debian/src/gui/ballzscrollarea.cpp
 -}
 Index: ballz-debian/src/gui/ballzlistbox.cpp
 ===================================================================
---- ballz-debian.orig/src/gui/ballzlistbox.cpp	2008-10-11 13:55:52.000000000 +0200
-+++ ballz-debian/src/gui/ballzlistbox.cpp	2008-10-11 13:55:57.000000000 +0200
+--- ballz-debian.orig/src/gui/ballzlistbox.cpp	2008-10-11 14:57:22.000000000 +0200
++++ ballz-debian/src/gui/ballzlistbox.cpp	2008-10-11 14:57:22.000000000 +0200
 @@ -36,7 +36,7 @@
  
  BallzListBox::BallzListBox()
@@ -64,8 +64,8 @@ Index: ballz-debian/src/gui/ballzlistbox.cpp
  
 Index: ballz-debian/src/gui/levelselector.cpp
 ===================================================================
---- ballz-debian.orig/src/gui/levelselector.cpp	2008-10-11 13:55:52.000000000 +0200
-+++ ballz-debian/src/gui/levelselector.cpp	2008-10-11 13:55:57.000000000 +0200
+--- ballz-debian.orig/src/gui/levelselector.cpp	2008-10-11 14:57:22.000000000 +0200
++++ ballz-debian/src/gui/levelselector.cpp	2008-10-11 14:57:22.000000000 +0200
 @@ -40,7 +40,7 @@
  
  LevelSelector::LevelSelector()
@@ -84,3 +84,15 @@ Index: ballz-debian/src/gui/levelselector.cpp
          keyEvent.consume();
      }
      else if (key.getValue() == gcn::Key::UP)
+Index: ballz-debian/src/gui/ballzscrollarea.hpp
+===================================================================
+--- ballz-debian.orig/src/gui/ballzscrollarea.hpp	2008-10-11 14:57:30.000000000 +0200
++++ ballz-debian/src/gui/ballzscrollarea.hpp	2008-10-11 14:57:38.000000000 +0200
+@@ -38,7 +38,6 @@
+ public:
+ 	BallzScrollArea();
+ 	void draw(gcn::Graphics *graphics);
+-	void keyPressed(gcn::KeyEvent &keyEvent);
+ };
+ 
+ #endif

-- 
ballz (platform/puzzle game)