rpms/rafkill/devel rafkill-1.2.2-shatter-crash.patch, 1.1, 1.2 rafkill.spec, 1.11, 1.12

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/rafkill/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14629

Modified Files:
	rafkill-1.2.2-shatter-crash.patch rafkill.spec 
Log Message:
Patch defuzzing.


rafkill-1.2.2-shatter-crash.patch:

Index: rafkill-1.2.2-shatter-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rafkill/devel/rafkill-1.2.2-shatter-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rafkill-1.2.2-shatter-crash.patch	20 Sep 2006 20:14:03 -0000	1.1
+++ rafkill-1.2.2-shatter-crash.patch	10 Dec 2008 19:56:35 -0000	1.2
@@ -1,48 +1,19 @@
---- rafkill-1.2.2/src/raptor.cpp~	2006-09-20 21:27:37.000000000 +0200
-+++ rafkill-1.2.2/src/raptor.cpp	2006-09-20 21:27:37.000000000 +0200
-@@ -772,6 +772,9 @@
- 	}
- }
- 
+--- rafkill-1.2.3/src/raptor.cpp~      2008-12-10 13:12:15.000000000 -0600
++++ rafkill-1.2.3/src/raptor.cpp       2008-12-10 13:12:15.000000000 -0600
+@@ -756,0 +757,3 @@
 +// HACK HACK HACK
 +Logic *globLogic;
 +
- void playLevel( PlayerObject * const player ){
- 	char file_level[ 64 ];
- 	sprintf( file_level, "level%d.lev", player->getLevel() );
-@@ -784,6 +787,7 @@
- 	// dumb_player.pause();
- 	Drawer draw;
- 	Logic logic;
-+	globLogic = &logic;
- 	LevelCreator level( file_level, player ); 
- 	draw.setDrawLand( Configuration::getBackground() );
- 				
---- rafkill-1.2.2/src/weapons/weapon_shatter.cpp~	2006-09-20 21:28:27.000000000 +0200
-+++ rafkill-1.2.2/src/weapons/weapon_shatter.cpp	2006-09-20 21:28:27.000000000 +0200
-@@ -6,6 +6,7 @@
- #include "sound.h"
- #include "hulls/hull_weapon_shatter.h"
- #include "hulls/hull_weapon_machine.h"
+@@ -768,0 +772 @@
++       globLogic = &logic;
+
+--- rafkill-1.2.3/src/weapons/weapon_shatter.cpp~	2008-12-10 13:26:50.000000000 -0600
++++ rafkill-1.2.3/src/weapons/weapon_shatter.cpp	2008-12-10 13:26:50.000000000 -0600
+@@ -8,0 +9 @@
 +#include "logic.h"
- 
- Shatter::Shatter( int qx, int qy, double kx, double ky, HullObject * hnew, int al, vector< SpaceObject * > * Ammo ):
- WeaponNode(qx,qy,kx,ky,hnew, al) {
-@@ -19,6 +20,8 @@
- 	// return ( getLife() <= 0 );
- }
- 
+@@ -21,0 +23,2 @@
 +extern Logic *globLogic;
 +
- void Shatter::Died(SpaceObject * check,ExplosionClass ** explr,int ME ){
- 
- 	Util::playSound( SND_SUSTAIN, 50 );
-@@ -30,7 +33,7 @@
- 
- 		HullObject * add_h = new Machine_WHull( 1 );
- 		add_h->life = 4;
--		myAmmo->push_back( new Bounce(getX(),getY(),Tcos(ang)*2.1,Tsine(ang)*2.1,add_h,alignment ) );
+@@ -29 +32 @@
+-		objects->push_back( new Bounce(getX(),getY(),Tcos(ang)*speed,Tsine(ang)*speed,add_h,alignment ) );
 +		globLogic->getObjects()->push_back( new Bounce(getX(),getY(),Tcos(ang)*2.1,Tsine(ang)*2.1,add_h,alignment ) );
- 
- 		//myAmmo->add( new Shatter(actualx,actualy,tcos[ang]*2.1,tsine[ang]*2.1, new Shatter_WHull(hull->strength/2), alignment, myAmmo ) );
- 	}


Index: rafkill.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rafkill/devel/rafkill.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rafkill.spec	12 Sep 2008 17:41:33 -0000	1.11
+++ rafkill.spec	10 Dec 2008 19:56:35 -0000	1.12
@@ -1,7 +1,6 @@
-%define _default_patch_fuzz 2
 Name:           rafkill
 Version:        1.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Top-down shooter with powerups
 Group:          Amusements/Games
 License:        GPLv2
@@ -90,8 +89,11 @@
 
 
 %changelog
+* Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.3-3
+- Re-diffed fuzzy shatter patch.
+
 * Fri Sep 12 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.3-2
-- Added patch fuxx workaround, will fix.
+- Added patch fuzz workaround, will fix.
 - Fixed license tag.
 
 * Wed Jul 09 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.3-1