r29707 - in /desktop/unstable/gnome-games/debian: changelog patches/04_quadrapassel_range.patch patches/20_glchess_no3d.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 23 07:20:08 2011
New Revision: 29707

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29707
Log:
04_quadrapassel_range.patch: correctly move lines down from the 
upper row. Closes: #642496.

Added:
    desktop/unstable/gnome-games/debian/patches/04_quadrapassel_range.patch
Removed:
    desktop/unstable/gnome-games/debian/patches/20_glchess_no3d.patch
Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/patches/series

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=29707&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/changelog [utf-8] Fri Sep 23 07:20:08 2011
@@ -3,6 +3,8 @@
   * Description improvements:
     - Mention Tetris.
     - Mention popular solitaire games. Closes: #600364.
+  * 04_quadrapassel_range.patch: correctly move lines down from the 
+    upper row. Closes: #642496.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 19 Oct 2010 08:40:28 +0200
 

Added: desktop/unstable/gnome-games/debian/patches/04_quadrapassel_range.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/04_quadrapassel_range.patch?rev=29707&op=file
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/04_quadrapassel_range.patch (added)
+++ desktop/unstable/gnome-games/debian/patches/04_quadrapassel_range.patch [utf-8] Fri Sep 23 07:20:08 2011
@@ -1,0 +1,28 @@
+From fed9a37e62e7f69f8e410cb7f78126ee84c7ee22 Mon Sep 17 00:00:00 2001
+From: Craig Duncan <git at duncanc.co.uk>
+Date: Thu, 29 Jul 2010 22:16:46 +0000
+Subject: Changed the range of lines from (1..20) to (0..19)
+
+The code to move lines down after an explode was looping around an incorrect range of lines.
+It was checking line 20, which I don't believe exists.
+But more importantly it wasn't checking row 0, which is the top row.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=608341
+---
+(limited to 'quadrapassel/blockops.cpp')
+
+diff --git a/quadrapassel/blockops.cpp b/quadrapassel/blockops.cpp
+index b8c0b8d..411be19 100644
+--- a/quadrapassel/blockops.cpp
++++ b/quadrapassel/blockops.cpp
+@@ -363,7 +363,7 @@ BlockOps::checkFullLines()
+ 	clutter_behaviour_remove_all (explode_fade_behaviour);
+ 	clutter_behaviour_remove_all (explode_scale_behaviour);
+ 
+-	for (int y = MIN (posy + 4, LINES); y > 0; --y)
++	for (int y = MIN (posy + 4, LINES - 1); y >= 0; --y)
+ 	{
+ 		if (checkFullLine (y))
+ 		{
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/series?rev=29707&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/patches/series [utf-8] Fri Sep 23 07:20:08 2011
@@ -1,6 +1,6 @@
 01_string_exceptions.patch
 02_desktop-path.patch
 03_missing_icons.patch
+04_quadrapassel_range.patch
 10_libice.patch
-#20_glchess_no3d.patch
 90_automake_autoconf.patch