Index: exec.c
==================================================================
--- exec.c
+++ exec.c
@@ -37,10 +37,11 @@
 char**levelstrings;
 Uint16 nlevelstrings;
 Value*array_data;
 Uint16 ndeadanim;
 DeadAnimation*deadanim;
+Uint8 no_dead_anim;
 
 typedef struct {
   Uint16 msg;
   Uint32 from;
   Value arg1,arg2,arg3;
@@ -163,10 +164,11 @@
 
 #define animfree free
 
 static void set_dead_animation(const Object*o) {
   DeadAnimation*d;
+  if(no_dead_anim) return;
   deadanim=realloc(deadanim,(ndeadanim+1)*sizeof(DeadAnimation));
   if(!deadanim) fatal("Allocation failed\n");
   d=deadanim+ndeadanim++;
   d->class=o->class;
   d->x=o->x;

Index: game.c
==================================================================
--- game.c
+++ game.c
@@ -183,10 +183,11 @@
       if(d->vimage<classes[d->class]->nimages)
        draw_picture((d->x-1)*picture_size+left_margin,(d->y-1)*picture_size,classes[d->class]->images[d->vimage]&0x7FFF);
       if(++d->vtime>=d->s.speed) {
         if(d->vimage==d->s.end) d->s.flag=0;
         if(d->s.end>=d->s.start) ++d->vimage; else --d->vimage;
+        d->vtime=0;
       }
     }
     for(i=0;i<ndeadanim;i++) while(i<ndeadanim && !deadanim[i].s.flag) {
       draw_cell(deadanim[i].x,deadanim[i].y);
       if(i<ndeadanim-1) deadanim[i]=deadanim[ndeadanim-1];
@@ -681,10 +682,11 @@
       if(number>=inputs_size) {
         inputs=realloc(inputs,inputs_size=number+1);
         if(!inputs) fatal("Allocation failed\n");
       }
       memcpy(inputs,replay_list,inputs_count=number);
+      no_dead_anim=1;
       return 1;
     case '^<': // Rewind to mark
       number=replay_mark;
       goto restart;
     case '^>': // Replay to mark
@@ -838,13 +840,13 @@
           SDL_SetTimer(0,0);
           return;
         }
       replay:
         if(inputs_count) {
-          //TODO: Check for solution replay
           for(i=0;i<inputs_count && !gameover;i++) if(inputs[i]) input_move(inputs[i]);
           inputs_count=0;
+          no_dead_anim=0;
         }
         redraw_game();
         timerflag=0; // ensure we have not missed a timer event
         break;
     }
@@ -856,10 +858,11 @@
 
 void run_auto_test(void) {
   Uint8 rc=0;
   int lvl,pro,i,n;
   const char*t;
+  no_dead_anim=1;
   setbuf(stdout,0);
   solution_replay=1;
   optionquery[1]=Q_progress;
   t=xrm_get_resource(resourcedb,optionquery,optionquery,2);
   pro=t?strtol(t,0,10):0;

Index: heromesh.h
==================================================================
--- heromesh.h
+++ heromesh.h
@@ -260,10 +260,11 @@
 extern char**levelstrings;
 extern Uint16 nlevelstrings;
 extern Value*array_data;
 extern Uint16 ndeadanim;
 extern DeadAnimation*deadanim;
+extern Uint8 no_dead_anim;
 
 const char*value_string_ptr(Value v);
 void pfunlink(Uint32 n);
 void pflink(Uint32 n);
 Uint32 objalloc(Uint16 c);

Index: main.c
==================================================================
--- main.c
+++ main.c
@@ -909,10 +909,11 @@
   optionquery[1]=Q_level;
   if(level_ord=strtol(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"",0,10)) log_if_error(load_level(-level_ord));
   if(main_options['a']) run_auto_test();
   if(main_options['x']) {
     fprintf(stderr,"Ready for executing SQL statements.\n");
+    no_dead_anim=1;
     do_sql_mode();
     return 0;
   }
   for(;;) { if(main_options['e']) run_editor(); else run_game(); }
 }