[Pkg-allegro-commits] r59 - in unstable/rafkill/debian: . patches

[Samuel Hocevar]

Author: sho
Date: 2007-02-11 01:57:02 +0100 (Sun, 11 Feb 2007)
New Revision: 59

Added:
   unstable/rafkill/debian/patches/101_shatter_crash.diff
   unstable/rafkill/debian/patches/102_fullscreen_crash.diff
Modified:
   unstable/rafkill/debian/changelog
   unstable/rafkill/debian/patches/series
Log:
rafkill (1.2.2-3) unstable; urgency=high

  * debian/patches/101_shatter_crash.diff:
    + New patch from upstream's 1.2.3 branch, don't crash when using the
      shatter gun (Closes: #379274).

  * debian/patches/102_fullscreen_crash.diff:
    + Exit gracefully if the video mode (eg. fullscreen) could not be set
      instead of crashing.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 10 Feb 2007 22:48:26 +0100


Modified: unstable/rafkill/debian/changelog
===================================================================
--- unstable/rafkill/debian/changelog	2007-02-10 13:22:39 UTC (rev 58)
+++ unstable/rafkill/debian/changelog	2007-02-11 00:57:02 UTC (rev 59)
@@ -1,3 +1,15 @@
+rafkill (1.2.2-3) unstable; urgency=high
+
+  * debian/patches/101_shatter_crash.diff:
+    + New patch from upstream's 1.2.3 branch, don't crash when using the
+      shatter gun (Closes: #379274).
+
+  * debian/patches/102_fullscreen_crash.diff:
+    + Exit gracefully if the video mode (eg. fullscreen) could not be set
+      instead of crashing.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sat, 10 Feb 2007 22:48:26 +0100
+
 rafkill (1.2.2-2) unstable; urgency=high
 
   * debian/control:
@@ -4,8 +16,8 @@
     + Added XS-Vcs-Svn field.
 
   * debian/patches/100_save_game_crash.diff:
-    + Save games in the home directory instead of $PWD and do not crash if
-      the directory is not writable (Closes: #406646).
+    + Save games in the home directory instead of $PWD (Closes: #406432) and
+      do not crash if the directory is not writable (Closes: #406646).
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri,  9 Feb 2007 23:43:28 +0100
 
@@ -56,7 +68,7 @@
   * debian/control:
     + Build-depend on liballegro4.2-dev (>= 2:4.2.0-4) to fix the missing
       libxcursor-dev build-dependency (Closes: #360195).
-    + Dropped the rafkill/rafkill-data circular dependency.
+    + Dropped the rafkill/rafkill-data circular dependency (Closes: #339892).
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 31 Mar 2006 11:22:22 +0200
 

Added: unstable/rafkill/debian/patches/101_shatter_crash.diff
===================================================================
--- unstable/rafkill/debian/patches/101_shatter_crash.diff	2007-02-10 13:22:39 UTC (rev 58)
+++ unstable/rafkill/debian/patches/101_shatter_crash.diff	2007-02-11 00:57:02 UTC (rev 59)
@@ -0,0 +1,25 @@
+diff -puriN rafkill-1.2.2/src/hulls/hull_weapon_shatter.cpp rafkill-1.2.3/src/hulls/hull_weapon_shatter.cpp
+--- rafkill-1.2.2/src/hulls/hull_weapon_shatter.cpp	2006-04-03 02:14:04 +0200
++++ rafkill-1.2.3/src/hulls/hull_weapon_shatter.cpp	2006-09-30 03:20:42 +0200
+@@ -18,13 +18,15 @@ bool Shatter_WHull::Collide( int mx, int
+ 	if ( check->HitMe( mx, my ) )
+ 		return true;
+ 
+-	for ( int ang = 0; ang < 360; ang += 65 ) {
+-
+-		int tx = (int)(mx + Tcos(ang)*strength );
+-		int ty = (int)(my + Tsine(ang)*strength );
+-		if ( check->HitMe( tx, ty ) )
+-			return true;
++	for ( double f = 2; f < getStrength(); f += 3 ){
++		for ( int ang = 0; ang < 360; ang += 60 ) {
+ 
++			int tx = (int)(mx + Tcos(ang) * f );
++			int ty = (int)(my + Tsine(ang) * f );
++			if ( check->HitMe( tx, ty ) ){
++				return true;
++			}
++		}
+ 	}
+ 
+ 	return false;

Added: unstable/rafkill/debian/patches/102_fullscreen_crash.diff
===================================================================
--- unstable/rafkill/debian/patches/102_fullscreen_crash.diff	2007-02-10 13:22:39 UTC (rev 58)
+++ unstable/rafkill/debian/patches/102_fullscreen_crash.diff	2007-02-11 00:57:02 UTC (rev 59)
@@ -0,0 +1,15 @@
+Index: rafkill-1.2.2/src/bitmap.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/bitmap.cpp	2007-02-11 00:37:39.000000000 +0100
++++ rafkill-1.2.2/src/bitmap.cpp	2007-02-11 00:38:44.000000000 +0100
+@@ -478,6 +478,10 @@
+ 
+ static int setGfxMode( int mode, int x, int y ){
+ 	int ret = ::set_gfx_mode( mode, x, y, 0, 0 );
++	if ( ::screen == NULL ){
++		cerr << "Could not set graphics mode! (try -w)" << endl;
++		exit(-1);
++	}
+ 	if ( Bitmap::Screen != NULL ){
+ 		delete Bitmap::Screen;
+ 	}

Modified: unstable/rafkill/debian/patches/series
===================================================================
--- unstable/rafkill/debian/patches/series	2007-02-10 13:22:39 UTC (rev 58)
+++ unstable/rafkill/debian/patches/series	2007-02-11 00:57:02 UTC (rev 59)
@@ -1,2 +1,4 @@
 000_install_path.diff
 100_save_game_crash.diff
+101_shatter_crash.diff -p1
+102_fullscreen_crash.diff