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

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit f6c924529239ccbf227265c1673f18cad5fb8e6c
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sat Oct 11 13:59:53 2008 +0200

    Fix scrolling bug in level selection

diff --git a/debian/patches/ballz-1.0-guichan081.patch b/debian/patches/ballz-1.0-guichan081.patch
index 24d7c88..3155383 100644
--- a/debian/patches/ballz-1.0-guichan081.patch
+++ b/debian/patches/ballz-1.0-guichan081.patch
@@ -1,5 +1,7 @@
---- ballz-1.0/src/game.cpp.orig	2008-07-28 19:49:24.000000000 -0700
-+++ ballz-1.0/src/game.cpp	2008-07-28 19:49:35.000000000 -0700
+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
 @@ -144,7 +144,7 @@
                                      "up with the whole idea of making this game in Per's and\n"
                                      "Johanna's apartment.");
@@ -18,8 +20,10 @@
      mMainMenuContainer->add(mInfoText, 110, 200);
  }
  
---- ballz-1.0/src/gui/ballzscrollarea.cpp.orig	2008-07-28 19:54:05.000000000 -0700
-+++ ballz-1.0/src/gui/ballzscrollarea.cpp	2008-07-28 19:54:18.000000000 -0700
+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
 @@ -37,7 +37,7 @@
  	setScrollPolicy(SHOW_NEVER,	SHOW_ALWAYS);
  	addKeyListener(this);
@@ -29,8 +33,26 @@
  }
  
  void BallzScrollArea::draw(gcn::Graphics *graphics)
---- ballz-1.0/src/gui/ballzlistbox.cpp.orig	2008-07-28 19:57:26.000000000 -0700
-+++ ballz-1.0/src/gui/ballzlistbox.cpp	2008-07-28 19:57:36.000000000 -0700
+@@ -58,15 +58,3 @@
+ 		graphics->fillRectangle(gcn::Rectangle(getWidth()-10, y+1, 6, 30));
+ 	}
+ }
+-
+-void BallzScrollArea::keyPressed(gcn::KeyEvent &keyEvent)
+-{
+-	if (keyEvent.getKey().getValue() == gcn::Key::DOWN)
+-	{
+-		setVerticalScrollAmount(getVerticalScrollAmount() + 16);
+-	}
+-	else if (keyEvent.getKey().getValue() == gcn::Key::UP)
+-	{
+-		setVerticalScrollAmount(getVerticalScrollAmount() - 16);
+-	}
+-}
+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
 @@ -36,7 +36,7 @@
  
  BallzListBox::BallzListBox()
@@ -40,8 +62,10 @@
      mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp");
  }
  
---- ballz-1.0/src/gui/levelselector.cpp.orig	2008-07-28 19:54:46.000000000 -0700
-+++ ballz-1.0/src/gui/levelselector.cpp	2008-07-28 19:54:54.000000000 -0700
+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
 @@ -40,7 +40,7 @@
  
  LevelSelector::LevelSelector()
@@ -51,7 +75,7 @@
      mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp");
      mSelected = -1;
      setWidth(300);
-@@ -170,7 +170,7 @@ void LevelSelector::keyPressed(gcn::KeyE
+@@ -170,7 +170,7 @@
  
      if (key.getValue() == gcn::Key::ENTER || key.getValue() == gcn::Key::SPACE)
      {

-- 
ballz (platform/puzzle game)