X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fanim.c;h=08abd6680cc7b2bc30b4e0ade4711ce7e3732667;hb=3d6d570ac8fc55fa42441737d718f552c98238d2;hp=7f50b28bc84f902145e61c3f0f3b57174b6d1e13;hpb=e3411dc963e8820b2e4f87ec5a16e263111fcc55;p=rocksndiamonds.git

diff --git a/src/anim.c b/src/anim.c
index 7f50b28b..08abd668 100644
--- a/src/anim.c
+++ b/src/anim.c
@@ -315,7 +315,7 @@ int getAnimationFrame(int num_frames, int delay, int mode, int start_frame,
   }
   else if (mode & ANIM_LEVEL_NR)	// play frames by level number
   {
-    int level_pos = level_nr - leveldir_current->first_level;
+    int level_pos = level_nr - gfx.anim_first_level;
 
     frame = level_pos % num_frames;
   }
@@ -360,10 +360,8 @@ static int compareGlobalAnimPartControlInfo(const void *obj1, const void *obj2)
     (struct GlobalAnimPartControlInfo *)obj2;
   int compare_result;
 
-  if (o1->control_info.draw_order != o2->control_info.draw_order)
-    compare_result = o1->control_info.draw_order - o2->control_info.draw_order;
-  else
-    compare_result = o1->nr - o2->nr;
+  // do not sort animations parts by draw order (as it would be confusing)
+  compare_result = o1->nr - o2->nr;
 
   return compare_result;
 }