r60 - unstable/rafkill/debian/patches

[Samuel Hocevar]

Author: sho
Date: 2007-02-11 02:03:42 +0100 (Sun, 11 Feb 2007)
New Revision: 60

Modified:
   unstable/rafkill/debian/patches/101_shatter_crash.diff
Log:
  * Fixed scatter patch.


Modified: unstable/rafkill/debian/patches/101_shatter_crash.diff
===================================================================
--- unstable/rafkill/debian/patches/101_shatter_crash.diff	2007-02-11 00:57:02 UTC (rev 59)
+++ unstable/rafkill/debian/patches/101_shatter_crash.diff	2007-02-11 01:03:42 UTC (rev 60)
@@ -23,3 +23,48 @@
  	}
  
  	return false;
+diff -puriN rafkill-1.2.2/src/hull.cpp rafkill-1.2.3/src/hull.cpp
+--- rafkill-1.2.2/src/hull.cpp	2006-05-02 05:39:39 +0200
++++ rafkill-1.2.3/src/hull.cpp	2006-09-29 03:28:21 +0200
+@@ -25,9 +25,9 @@ using namespace std;
+ HullObject::HullObject( Bitmap * _drawBitmap, double _life, double _strength, int num_guns, int level, int _drawing_plane, bool _trans, ECollide * ec):
+ crash( false ),
+ trans( _trans ),
+-strength( _strength ),
+ drawLevel( _drawing_plane ),
+ guns( NULL ),
++strength( _strength ),
+ max_guns( num_guns ) {
+ 	myBitmap = _drawBitmap;
+ 	Shadow_Bitmap = NULL;
+diff -puriN rafkill-1.2.2/src/hull.h rafkill-1.2.3/src/hull.h
+--- rafkill-1.2.2/src/hull.h	2006-05-02 05:39:36 +0200
++++ rafkill-1.2.3/src/hull.h	2006-09-29 03:28:50 +0200
+@@ -45,6 +45,10 @@ public:
+ 	//process: returns whether or not hull can be hit by bullets
+ 	bool Translucent();
+ 
++	virtual inline const double getStrength() const{
++		return strength;
++	}
++
+ 	virtual inline int getHeight(){
+ 		if ( myBitmap ) return myBitmap->getHeight();
+ 		if ( collide ) return collide->getHeight();
+@@ -111,7 +115,6 @@ public:
+ 	double original_life;
+ 	bool trans;
+ 
+-	double strength;
+ 
+ 	int drawNum;
+ 	int drawLevel;
+@@ -121,6 +124,8 @@ protected:
+ 	Bitmap * Shadow_Bitmap;
+ 	WeaponObject ** guns;
+ 	ECollide * collide;
++	
++	double strength;
+ 
+ public:
+