[Stratagus-CVS] stratagus/src/clone unit_draw.c

[Russell Smith]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Russell Smith <address@hidden>  03/10/02 23:28:53

Modified files:
        src/clone      : unit_draw.c 

Log message:
        Fixed Corpses drawing order.  Order was not determined with multiple 
corpses on the one tile

Patches:
Index: stratagus/src/clone/unit_draw.c
diff -u stratagus/src/clone/unit_draw.c:1.163 
stratagus/src/clone/unit_draw.c:1.164
--- stratagus/src/clone/unit_draw.c:1.163       Fri Sep 26 14:52:18 2003
+++ stratagus/src/clone/unit_draw.c     Thu Oct  2 23:28:53 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: unit_draw.c,v 1.163 2003/09/26 18:52:18 jsalmon3 Exp $
+//     $Id: unit_draw.c,v 1.164 2003/10/03 03:28:53 mr-russ Exp $
 
 //@{
 
@@ -577,7 +577,7 @@
 global void SaveDecorations(CLFile* file)
 {
     CLprintf(file,"\n;;; -----------------------------------------\n");
-    CLprintf(file,";;; MODULE: decorations $Id: unit_draw.c,v 1.163 2003/09/26 
18:52:18 jsalmon3 Exp $\n\n");
+    CLprintf(file,";;; MODULE: decorations $Id: unit_draw.c,v 1.164 2003/10/03 
03:28:53 mr-russ Exp $\n\n");
 
     CLprintf(file,"(mana-sprite \"%s\"  %d %d  %d %d)\n",
        ManaSprite.File,ManaSprite.HotX,ManaSprite.HotY,
@@ -1903,7 +1903,9 @@
        drawlevel2 = c2->Type->DrawLevel;
     }
     if( drawlevel1 == drawlevel2 ) {
-       return c1->Y*MaxMapWidth+c1->X < c2->Y*MaxMapWidth+c2->X ? -1 : 1;
+       return c1->Y*MaxMapWidth+c1->X - c2->Y*MaxMapWidth+c2->X ? 
+               c1->Y*MaxMapWidth+c1->X - c2->Y*MaxMapWidth+c2->X : 
+               c1->Slot - c2->Slot;
     } else {
        return drawlevel1 <= drawlevel2 ? -1 : 1;
     }