[Stratagus-CVS] stratagus/src/missile missile.c

[Mohydine]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Mohydine <address@hidden>       03/10/17 22:39:07

Modified files:
        src/missile    : missile.c 

Log message:
        ----------------------------------------------------------------------
        Fixed bug: Parabolic Missile was not initialized correctly.

Patches:
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.93 
stratagus/src/missile/missile.c:1.94
--- stratagus/src/missile/missile.c:1.93        Fri Oct 17 18:27:36 2003
+++ stratagus/src/missile/missile.c     Fri Oct 17 22:39:07 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: missile.c,v 1.93 2003/10/17 22:27:36 jsalmon3 Exp $
+//     $Id: missile.c,v 1.94 2003/10/18 02:39:07 mohydine Exp $
 
 //@{
 
@@ -297,8 +297,8 @@
     missile->Y = sy - mtype->Height / 2;
     missile->DX = dx - mtype->Width / 2;
     missile->DY = dy - mtype->Height / 2;
-    missile->SourceX = sx;
-    missile->SourceY = sy;
+    missile->SourceX = missile->X;
+    missile->SourceY = missile->Y;
     missile->Type = mtype;
     missile->SpriteFrame = 0;
     missile->State = 0;
@@ -960,13 +960,13 @@
     int thetha;
 
     missile->Xl -= missile->Xstep;
-    missile->X = (missile->Xl + 500) / 1000;
+    missile->X = (missile->Xl ) / 1000;
 
     xmid = (missile->SourceX + missile->DX) / 2;
     sinu = (missile->X - xmid) * (missile->X - xmid);
     thetha = missile->SourceX - xmid;
     missile->Y = ((missile->Angle * (missile->X - missile->SourceX)) -
-       amplitude * isqrt(-sinu + thetha * thetha) + missile->SourceY * 1000 + 
500) / 1000;
+       amplitude * isqrt(-sinu + thetha * thetha) + missile->SourceY * 1000 + 
500 ) / 1000;
 
     return 0;
 }
@@ -1007,7 +1007,7 @@
        } else {
            missile->Angle = 1;
        }
-       missile->Xl = missile->X * 1000;
+       missile->Xl = missile->SourceX * 1000;
 
        MissileNewHeadingFromXY(missile, dx * xstep, dy * ystep);
 
@@ -1459,7 +1459,7 @@
     int i;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.93 2003/10/17 
22:27:36 jsalmon3 Exp $\n\n");
+    CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.94 2003/10/18 
02:39:07 mohydine Exp $\n\n");
 
     //
     // Original number to internal missile-type name.
@@ -1554,7 +1554,7 @@
     Missile* const* missiles;
 
     CLprintf(file, "\n;;; -----------------------------------------\n");
-    CLprintf(file, ";;; MODULE: missiles $Id: missile.c,v 1.93 2003/10/17 
22:27:36 jsalmon3 Exp $\n\n");
+    CLprintf(file, ";;; MODULE: missiles $Id: missile.c,v 1.94 2003/10/18 
02:39:07 mohydine Exp $\n\n");
 
     for (missiles = GlobalMissiles; *missiles; ++missiles) {
        SaveMissile(*missiles, file);