r1997 - packages/trunk/wormux/debian/patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-11-22 17:37:56 +0100 (Wed, 22 Nov 2006)
New Revision: 1997

Modified:
   packages/trunk/wormux/debian/patches/000_fix_out_of_range_angles.patch
Log:
updated 000_fix_out_of_range_angles.patch to fit the 0.8alpha1 source

Modified: packages/trunk/wormux/debian/patches/000_fix_out_of_range_angles.patch
===================================================================
--- packages/trunk/wormux/debian/patches/000_fix_out_of_range_angles.patch	2006-11-19 00:29:11 UTC (rev 1996)
+++ packages/trunk/wormux/debian/patches/000_fix_out_of_range_angles.patch	2006-11-22 16:37:56 UTC (rev 1997)
@@ -1,43 +1,36 @@
---- wormux-0.7.4.orig/src/tool/vector2.h
-+++ wormux-0.7.4/src/tool/vector2.h
-@@ -335,7 +335,7 @@
- 
- 			if( !IsZero( x ) )
- 				if( !IsZero( y ) ){
--					angle = atan((double)y/x);
-+					angle = atan((double)(y/x));
- 					if( x < 0 )
- 						if( y > 0 )
- 							angle += M_PI;
---- wormux-0.7.4.orig/src/object/physics.cpp
-+++ wormux-0.7.4/src/object/physics.cpp
+diff -ruN wormux-0.8~alpha1.orig/src/object/physics.cpp wormux-0.8~alpha1/src/object/physics.cpp
+--- wormux-0.8~alpha1.orig/src/object/physics.cpp	2006-10-18 02:24:36.000000000 +0300
++++ wormux-0.8~alpha1/src/object/physics.cpp	2006-11-22 18:19:17.000000000 +0200
 @@ -191,7 +191,13 @@
  	angle = -angle ;
        break;
  
 +    case NoMotion:
-+  	  norm = 0.0;
++      norm = 0.0;
 +      angle = 0.0;
-+	  break ;
++    break ;
 +
      default:
 +      assert(false);
        break ;
    }
  }
---- wormux-0.7.4.orig/src/weapon/gnu.h
-+++ wormux-0.7.4/src/weapon/gnu.h
-@@ -39,6 +39,7 @@
-   int m_sens;
-   int save_x, save_y;
-   double angle;
-+  double norme;
- public:
-   Gnu(ExplosiveWeaponConfig& cfg);
-   void Shoot(double strength);
---- wormux-0.7.4.orig/src/weapon/gnu.cpp
-+++ wormux-0.7.4/src/weapon/gnu.cpp
-@@ -47,6 +47,8 @@
+diff -ruN wormux-0.8~alpha1.orig/src/tool/vector2.h wormux-0.8~alpha1/src/tool/vector2.h
+--- wormux-0.8~alpha1.orig/src/tool/vector2.h	2006-10-21 22:50:09.000000000 +0300
++++ wormux-0.8~alpha1/src/tool/vector2.h	2006-11-22 18:19:17.000000000 +0200
+@@ -343,7 +343,7 @@
+ 
+ 			if( !IsZero( x ) )
+ 				if( !IsZero( y ) ){
+-					angle = atan((double)y/x);
++					angle = atan((double)(y/x));
+ 					if( x < 0 )
+ 						if( y > 0 )
+ 							angle += M_PI;
+diff -ruN wormux-0.8~alpha1.orig/src/weapon/gnu.cpp wormux-0.8~alpha1/src/weapon/gnu.cpp
+--- wormux-0.8~alpha1.orig/src/weapon/gnu.cpp	2006-10-18 02:24:35.000000000 +0300
++++ wormux-0.8~alpha1/src/weapon/gnu.cpp	2006-11-22 18:19:17.000000000 +0200
+@@ -49,6 +49,8 @@
    save_y=GetY();
  
    double angle = ActiveTeam().crosshair.GetAngleRad();
@@ -46,7 +39,7 @@
  
    if(angle<M_PI/2 && angle>-M_PI/2)
      m_sens = 1;
-@@ -58,7 +60,6 @@
+@@ -60,7 +62,6 @@
  {
    WeaponProjectile::Refresh();
  
@@ -54,7 +47,7 @@
    //When we hit the ground, jump !
    if(!IsMoving()&& !FootsInVacuum())
    {
-@@ -77,11 +78,12 @@
+@@ -79,11 +80,12 @@
    }
  
    //Due to a bug in the physic engine
@@ -70,3 +63,14 @@
  
    angle *= 180.0 / M_PI;
    angle /= 2.0;
+diff -ruN wormux-0.8~alpha1.orig/src/weapon/gnu.h wormux-0.8~alpha1/src/weapon/gnu.h
+--- wormux-0.8~alpha1.orig/src/weapon/gnu.h	2006-10-18 02:24:35.000000000 +0300
++++ wormux-0.8~alpha1/src/weapon/gnu.h	2006-11-22 18:20:42.000000000 +0200
+@@ -39,6 +39,7 @@
+   int m_sens;
+   int save_x, save_y;
+   double angle;
++  double norme;
+  protected:
+   void SignalOutOfMap();
+ public: