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

[Crestez Leonard]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Crestez Leonard <address@hidden>        03/10/09 13:59:30

Modified files:
        src/missile    : missile.c 

Log message:
        Change min to max, fix damage calculation code.

Patches:
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.85 
stratagus/src/missile/missile.c:1.86
--- stratagus/src/missile/missile.c:1.85        Thu Oct  9 07:31:47 2003
+++ stratagus/src/missile/missile.c     Thu Oct  9 13:59:29 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: missile.c,v 1.85 2003/10/09 11:31:47 n0body Exp $
+//     $Id: missile.c,v 1.86 2003/10/09 17:59:29 n0body Exp $
 
 //@{
 
@@ -466,9 +466,11 @@
        damage -= SyncRand() % ((damage + 2) / 2);
     }
 #else
-    damage = min(basic_damage-goal_stats->Armor,1)+piercing_damage;
+    damage = max(basic_damage-goal_stats->Armor,1)+piercing_damage;
     damage -= SyncRand() % ((damage+2)/2);
+    DebugCheck(damage<0);
 #endif
+       
     DebugLevel3Fn("\nDamage done [%d] %d %d ->%d\n" _C_ goal_stats->Armor _C_
            basic_damage _C_ piercing_damage _C_ damage);
 
@@ -1706,7 +1708,7 @@
     int i;
 
     CLprintf(file,"\n;;; -----------------------------------------\n");
-    CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.85 2003/10/09 
11:31:47 n0body Exp $\n\n");
+    CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.86 2003/10/09 
17:59:29 n0body Exp $\n\n");
 
     //
     // Original number to internal missile-type name.
@@ -1801,7 +1803,7 @@
     Missile* const* missiles;
 
     CLprintf(file,"\n;;; -----------------------------------------\n");
-    CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.85 2003/10/09 
11:31:47 n0body Exp $\n\n");
+    CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.86 2003/10/09 
17:59:29 n0body Exp $\n\n");
 
     for (missiles = GlobalMissiles; *missiles; ++missiles) {
        SaveMissile(*missiles, file);